Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=68a22aaea174180d91a7034c7d1ce7046bc52293
commit 68a22aaea174180d91a7034c7d1ce7046bc52293 Author: Marius Cirsta <[email protected]> Date: Mon Feb 3 16:17:16 2014 +0200 ffmpeg-2.1.3-1-x86_64 * version bump diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index 0d5dab7..9948fb4 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Cedrick Hannier alias Cedynamix <[email protected]> pkgname=ffmpeg -pkgver=1.0.6 -pkgrel=6 +pkgver=2.1.3 +pkgrel=1 pkgdesc="FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix." url="http://ffmpeg.sourceforge.net/"; depends=('alsa-lib' 'a52dec' 'amrnb' 'amrwb' 'faac>=1.28' 'lame' 'libtheora' 'libvorbis' \ @@ -15,7 +15,7 @@ makedepends=('freetype2' 'yasm') groups=('xmultimedia') archs=('i686' 'x86_64') up2date="Flasttar http://www.ffmpeg.org/releases/"; -source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 openjpeg-fixes.patch) +source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 openjpeg2.patch) signatures=("${source[0]}.asc" '') conflicts=('ffmpeg-compiletime' 'ffmpeg-presets') replaces=('ffmpeg-compiletime' 'ffmpeg-presets') @@ -51,7 +51,8 @@ build() { --enable-vaapi \ --enable-vdpau \ --enable-crystalhd \ - --enable-x11grab + --enable-x11grab \ + --extra-cflags="-DHAVE_OPENJPEG_2_0_OPENJPEG_H" make SHARED_PP="yes" || Fdie make DESTDIR=$Fdestdir install || Fdie } diff --git a/source/xmultimedia/ffmpeg/openjpeg-fixes.patch b/source/xmultimedia/ffmpeg/openjpeg-fixes.patch deleted file mode 100644 index 1180b28..0000000 --- a/source/xmultimedia/ffmpeg/openjpeg-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur a/configure b/configure ---- a/configure 2012-10-28 01:49:39.900620584 -0500 -+++ b/configure 2012-10-28 01:50:17.131630614 -0500 -@@ -3654,7 +3654,7 @@ - enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb - enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb - enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader --enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg -+enabled libopenjpeg && require libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg - enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create - enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new - enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket -diff -ur a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c ---- a/libavcodec/libopenjpegdec.c 2012-10-28 01:49:39.879620563 -0500 -+++ b/libavcodec/libopenjpegdec.c 2012-10-28 02:01:57.172098456 -0500 -@@ -25,7 +25,7 @@ - */ - - #define OPJ_STATIC --#include <openjpeg.h> -+#include <openjpeg-1.5/openjpeg.h> - - #include "libavutil/common.h" - #include "libavutil/intreadwrite.h" -diff -ur a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c ---- a/libavcodec/libopenjpegenc.c 2012-10-28 01:49:39.872620557 -0500 -+++ b/libavcodec/libopenjpegenc.c 2012-10-28 02:01:40.564093722 -0500 -@@ -25,7 +25,7 @@ - */ - - #define OPJ_STATIC --#include <openjpeg.h> -+#include <openjpeg-1.5/openjpeg.h> - - #include "libavutil/avassert.h" - #include "libavutil/common.h" diff --git a/source/xmultimedia/ffmpeg/openjpeg2.patch b/source/xmultimedia/ffmpeg/openjpeg2.patch new file mode 100644 index 0000000..8950330 --- /dev/null +++ b/source/xmultimedia/ffmpeg/openjpeg2.patch @@ -0,0 +1,42 @@ +--- ffmpeg-2.1.3/configure 2014-01-15 19:53:59.000000000 +0200 ++++ ffmpeg-2.1.3.new/configure 2014-02-03 11:59:10.482756079 +0200 +@@ -4294,7 +4294,8 @@ + enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb + enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb + enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader +-enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || ++enabled libopenjpeg && { check_lib openjpeg-2.0/openmj2.h opj_version -lopenmj2 || ++ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || + check_lib openjpeg.h opj_version -lopenjpeg || + die "ERROR: libopenjpeg not found"; } + enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create +--- ffmpeg-2.1.3/libavcodec/libopenjpegdec.c 2014-01-13 18:32:04.000000000 +0200 ++++ ffmpeg-2.1.3.new/libavcodec/libopenjpegdec.c 2014-02-03 12:08:09.873733223 +0200 +@@ -37,7 +37,11 @@ + #if HAVE_OPENJPEG_1_5_OPENJPEG_H + # include <openjpeg-1.5/openjpeg.h> + #else +-# include <openjpeg.h> ++ #if HAVE_OPENJPEG_2_0_OPENJPEG_H ++ # include <openjpeg-2.0/openmj2.h> ++ #else ++ # include <openjpeg.h> ++ #endif + #endif + + #define JP2_SIG_TYPE 0x6A502020 +--- ffmpeg-2.1.3/libavcodec/libopenjpegenc.c 2014-01-13 18:32:04.000000000 +0200 ++++ ffmpeg-2.1.3.new/libavcodec/libopenjpegenc.c 2014-02-03 12:26:56.496685485 +0200 +@@ -37,7 +37,11 @@ + #if HAVE_OPENJPEG_1_5_OPENJPEG_H + # include <openjpeg-1.5/openjpeg.h> + #else +-# include <openjpeg.h> ++ #if HAVE_OPENJPEG_2_0_OPENJPEG_H ++ # include <openjpeg-2.0/openmj2.h> ++ #else ++ # include <openjpeg.h> ++ #endif + #endif + + typedef struct { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
