packages: libx264/libx264.spec, libx264/libx264-ffmpeg.patch (NEW) - rel 2; ...

[arekm]

Author: arekm                        Date: Tue Jun 28 17:23:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix build with 0.7.1

---- Files affected:
packages/libx264:
   libx264.spec (1.40 -> 1.41) , libx264-ffmpeg.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libx264/libx264.spec
diff -u packages/libx264/libx264.spec:1.40 packages/libx264/libx264.spec:1.41
--- packages/libx264/libx264.spec:1.40	Tue Jun 28 18:47:46 2011
+++ packages/libx264/libx264.spec	Tue Jun 28 19:23:31 2011
@@ -19,6 +19,7 @@
 Patch0:		%{name}-alpha.patch
 Patch1:		altivec-no-vand.patch
 Patch2:		%{name}-gpac.patch
+Patch3:		%{name}-ffmpeg.patch
 URL:		http://www.videolan.org/developers/x264.html
 BuildRequires:	pkgconfig
 %ifarch %{ix86} %{x8664}
@@ -29,7 +30,7 @@
 # for full x264 CLI utility functionality it wants:
 # libswscale >= 0.9.0 (in pkgconfig file)
 # libav{format,codec,util} from ffmpeg >= r21854
-BuildRequires:	ffmpeg-devel >= 0.8
+BuildRequires:	ffmpeg-devel >= 0.7.1
 BuildRequires:	ffmpegsource-devel >= 2.15
 # gpac >= 2007-06-21
 BuildRequires:	gpac-devel >= 0.4.5-2
@@ -89,6 +90,7 @@
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -p1
 
 %build
 CC="%{__cc}" \
@@ -143,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/06/28 17:23:31  arekm
+- rel 2; fix build with 0.7.1
+
 Revision 1.40  2011/06/28 16:47:46  arekm
 - release 2
 

================================================================
Index: packages/libx264/libx264-ffmpeg.patch
diff -u /dev/null packages/libx264/libx264-ffmpeg.patch:1.1
--- /dev/null	Tue Jun 28 19:23:36 2011
+++ packages/libx264/libx264-ffmpeg.patch	Tue Jun 28 19:23:31 2011
@@ -0,0 +1,15 @@
+--- x264-snapshot-20110625-2245/configure~	2011-06-28 19:18:35.000000000 +0200
++++ x264-snapshot-20110625-2245/configure	2011-06-28 19:21:52.648341669 +0200
+@@ -719,9 +719,9 @@
+ 
+ if [ "$swscale" = "auto" ] ; then
+     swscale="no"
+-    if ${cross_prefix}pkg-config --exists libswscale 2>/dev/null; then
+-        SWSCALE_LIBS="$SWSCALE_LIBS $(${cross_prefix}pkg-config --libs libswscale)"
+-        SWSCALE_CFLAGS="$SWSCALE_CFLAGS $(${cross_prefix}pkg-config --cflags libswscale)"
++    if ${cross_prefix}pkg-config --exists libswscale libavutil 2>/dev/null; then
++        SWSCALE_LIBS="$SWSCALE_LIBS $(${cross_prefix}pkg-config --libs libswscale libavutil)"
++        SWSCALE_CFLAGS="$SWSCALE_CFLAGS $(${cross_prefix}pkg-config --cflags libswscale libavutil)"
+     fi
+     [ -z "$SWSCALE_LIBS" ] && SWSCALE_LIBS="-lswscale -lavutil"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libx264/libx264.spec?r1=1.40&r2=1.41&f=u