diff --git a/media-video/ffmpeg/ffmpeg-2.3.recipe b/media-video/ffmpeg/ffmpeg-2.3.recipe index 71bd06062..a95ece19a 100644 --- a/media-video/ffmpeg/ffmpeg-2.3.recipe +++ b/media-video/ffmpeg/ffmpeg-2.3.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-2.3.tar.bz2" CHECKSUM_SHA256="6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e" REVISION="1" -ARCHITECTURES="x86 ?x86_64" +ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -36,6 +36,7 @@ PROVIDES=" lib:libavformat$secondaryArchSuffix = 55.47.100 compat >= 55 lib:libavdevice$secondaryArchSuffix = 55.13.100 compat >= 55 lib:libavfilter$secondaryArchSuffix = 4.10.100 compat >= 4 + lib:libavresample$secondaryArchSuffix = 1.3.0 compat >= 1 lib:libswscale$secondaryArchSuffix = 2.6.100 compat >= 2 lib:libswresample$secondaryArchSuffix = 0.19.100 compat >= 0 lib:libpostproc$secondaryArchSuffix = 52.3.100 compat >= 52 @@ -86,6 +87,7 @@ PROVIDES_devel=" devel:libavcodec$secondaryArchSuffix = 55.69.100 compat >= 55 devel:libavformat$secondaryArchSuffix = 55.47.100 compat >= 55 devel:libavdevice$secondaryArchSuffix = 55.13.100 compat >= 55 + devel:libavresample$secondaryArchSuffix = 1.3.0 compat >= 1 devel:libavfilter$secondaryArchSuffix = 4.10.100 compat >= 4 devel:libswscale$secondaryArchSuffix = 2.6.100 compat >= 2 devel:libswresample$secondaryArchSuffix = 0.19.100 compat >= 0 @@ -126,9 +128,16 @@ BUILD() --enable-libspeex \ --enable-libtheora \ --enable-libvpx \ - --enable-gpl + --enable-gpl \ + --enable-avresample - make $jobArgs CFLAGS="-fno-PIC -std=c99" + if [ $targetArchitecture = x86_64 ]; then + cflags="-fPIC -std=c99" + else + cflags="-fno-PIC -std=c99" + fi + + make $jobArgs CFLAGS="$cflags" } INSTALL() @@ -140,6 +149,7 @@ INSTALL() libavdevice \ libavfilter \ libavformat \ + libavresample \ libavutil \ libswresample \ libswscale \