haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: bump version.

Browse Source 
* fix gcc5 build on x86.
This commit is contained in:
Jerome Duval
2016-04-09 20:08:46 +00:00
parent 4781fe16d3
commit 0984e8c03d
4 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-video/ffmpeg/ffmpeg-3.0.recipe → media-video/ffmpeg/ffmpeg-3.0.1.recipe
View File

@@ -8,10 +8,11 @@ LICENSE="GNU LGPL v2.1
COPYRIGHT="2000-2003 Fabrice Bellard COPYRIGHT="2000-2003 Fabrice Bellard
2003-2016 the FFmpeg developers" 2003-2016 the FFmpeg developers"
SOURCE_URI="http://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" SOURCE_URI="http://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470" CHECKSUM_SHA256="c389ca5e3c29e758dd82ee6981130fe79e73b06e26db1a3aa971daea63598bc1"
REVISION="1" REVISION="1"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
PATCHES="ffmpeg-$portVersion.patchset"
PROVIDES=" PROVIDES="
ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.0 ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.0
@@ -129,12 +130,6 @@ BUILD()
--enable-gpl \ --enable-gpl \
--enable-avresample --enable-avresample
if [ $targetArchitecture = x86_64 ]; then
cflags="-fPIC -std=c99"
else
cflags="-fno-PIC -std=c99"
fi
make $jobArgs CFLAGS="$cflags" make $jobArgs CFLAGS="$cflags"
} }

1
media-video/ffmpeg/ffmpeg2-2.8.6.recipe
View File

@@ -13,6 +13,7 @@ SOURCE_DIR="ffmpeg-$portVersion"
REVISION="1" REVISION="1"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
PATCHES="ffmpeg-$portVersion.patchset"
PROVIDES=" PROVIDES="
ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8 ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8

21
media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset Normal file
View File

@@ -0,0 +1,21 @@
From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 17:37:09 +0000
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 475c087..5a95b97 100755
--- a/configure
+++ b/configure
@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
--
2.7.0

21
media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset Normal file
View File

@@ -0,0 +1,21 @@
From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 17:37:09 +0000
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 475c087..5a95b97 100755
--- a/configure
+++ b/configure
@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
--
2.7.0