haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: bump to 6.1.1 (#10000)

Browse Source
This commit is contained in:
kenmays
2024-02-15 05:07:38 -08:00
committed by GitHub
parent 200a42bf8c
commit 8b9bc1654a
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media-video/ffmpeg/ffmpeg6-6.1.recipe → media-video/ffmpeg/ffmpeg6-6.1.1.recipe
View File

@@ -4,11 +4,11 @@ and stream audio and video. It includes libavcodec - the leading audio/video \
codec library."
HOMEPAGE="https://ffmpeg.org/"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2023 the FFmpeg developers"
2003-2024 the FFmpeg developers"
LICENSE="GNU LGPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270"
CHECKSUM_SHA256="8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
PATCHES="ffmpeg-$portVersion.patchset"
SOURCE_DIR="ffmpeg-$portVersion"
ADDITIONAL_FILES="gcc_runtime.c"
@@ -342,5 +342,12 @@ INSTALL()
TEST()
{
export LIBRARY_PATH="$sourceDir/libavutil${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libavcodec${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libswresample${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libavdevice${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libavfilter${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libavformat${LIBRARY_PATH:+:$LIBRARY_PATH}"
export LIBRARY_PATH="$sourceDir/libswscale${LIBRARY_PATH:+:$LIBRARY_PATH}"
make check
}

12
media-video/ffmpeg/patches/ffmpeg-6.1.patchset → media-video/ffmpeg/patches/ffmpeg-6.1.1.patchset
View File

@@ -1,14 +1,14 @@
From 85e880e21a277ee6afc1b13551aa4860f054d278 Mon Sep 17 00:00:00 2001
From 98a46d8fdfbe4fa7fe54d175891f6ca57767069b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 7 Aug 2019 16:21:12 +0300
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 1f0b949..12f64e2 100755
index a89cfa6..4a291d1 100755
--- a/configure
+++ b/configure
@@ -7508,6 +7508,7 @@ case $target_os in
@@ -7510,6 +7510,7 @@ case $target_os in
haiku)
disable memalign
disable posix_memalign
@@ -20,7 +20,7 @@ index 1f0b949..12f64e2 100755
2.42.1
From 59467d4c2ed3868aa22f6941ce837b8ec3528023 Mon Sep 17 00:00:00 2001
From f5655ed87323c7bcf3e95389cb91693587a2cda0 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 7 Aug 2019 16:21:32 +0300
Subject: Re-enable memalign for Haiku
@@ -32,10 +32,10 @@ If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index 12f64e2..58ad366 100755
index 4a291d1..57f1944 100755
--- a/configure
+++ b/configure
@@ -7506,8 +7506,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
@@ -7508,8 +7508,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
case $target_os in
haiku)