packages: libx264/libx264.spec, libx264/libx264-gpac.patch (NEW) - added gp...

[qboosh]

Author: qboosh                       Date: Tue Jun 28 15:14:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gpac patch, build with gpac support (if !bootstrap)

---- Files affected:
packages/libx264:
   libx264.spec (1.38 -> 1.39) , libx264-gpac.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libx264/libx264.spec
diff -u packages/libx264/libx264.spec:1.38 packages/libx264/libx264.spec:1.39
--- packages/libx264/libx264.spec:1.38	Mon Jun 27 17:52:20 2011
+++ packages/libx264/libx264.spec	Tue Jun 28 17:14:27 2011
@@ -18,6 +18,7 @@
 # Source0-md5:	6463c144cd10c26d721fac212a747910
 Patch0:		%{name}-alpha.patch
 Patch1:		altivec-no-vand.patch
+Patch2:		%{name}-gpac.patch
 URL:		http://www.videolan.org/developers/x264.html
 BuildRequires:	pkgconfig
 %ifarch %{ix86} %{x8664}
@@ -28,9 +29,11 @@
 # 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.0
+BuildRequires:	ffmpeg-devel >= 0.8
 BuildRequires:	ffmpegsource-devel >= 2.15
 # gpac >= 2007-06-21
+BuildRequires:	gpac-devel >= 0.4.5-2
+Requires:	gpac >= 0.4.5-2
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,6 +88,7 @@
 %if "%{pld_release}" == "ac"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 CC="%{__cc}" \
@@ -139,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2011/06/28 15:14:27  qboosh
+- added gpac patch, build with gpac support (if !bootstrap)
+
 Revision 1.38  2011/06/27 15:52:20  qboosh
 - adjusted ffmpeg version for !bootstrap
 

================================================================
Index: packages/libx264/libx264-gpac.patch
diff -u /dev/null packages/libx264/libx264-gpac.patch:1.1
--- /dev/null	Tue Jun 28 17:14:32 2011
+++ packages/libx264/libx264-gpac.patch	Tue Jun 28 17:14:27 2011
@@ -0,0 +1,11 @@
+--- x264-snapshot-20110625-2245/configure.orig	2011-06-27 17:51:45.598468743 +0200
++++ x264-snapshot-20110625-2245/configure	2011-06-27 22:04:22.675642925 +0200
+@@ -806,7 +806,7 @@
+ 
+ if [ "$gpac" = "auto" ] ; then
+     gpac="no"
+-    cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
++    cc_check "" -lz && GPAC_LIBS="-lgpac -lz" || GPAC_LIBS="-lgpac"
+     if [ "$SYS" = "WINDOWS" ] ; then
+         GPAC_LIBS="$GPAC_LIBS -lwinmm"
+     fi
================================================================

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