rpms/x264/devel x264-gpac.patch,NONE,1.1 x264.spec,1.59,1.60

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3324

Modified Files:
	x264.spec 
Added Files:
	x264-gpac.patch 
Log Message:
* Mon Sep 30 2013 Sérgio Basto <sergio at serjux.com> - 0.133-3.20130709git585324f
- Fix gpac detection.


x264-gpac.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE x264-gpac.patch ---
--- generic10/configure	2013-09-30 01:59:40.537691428 +0100
+++ generic/configure	2013-09-30 02:24:21.637654522 +0100
@@ -917,7 +917,7 @@ fi
 
 if [ "$gpac" = "auto" ] ; then
     gpac="no"
-    cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
+    cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz -lssl -lcrypto -lpng -ljpeg" || GPAC_LIBS="-lgpac_static"
     if [ "$SYS" = "WINDOWS" ] ; then
         GPAC_LIBS="$GPAC_LIBS -lwinmm"
     fi


Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- x264.spec	15 Aug 2013 10:19:41 -0000	1.59
+++ x264.spec	30 Sep 2013 02:04:57 -0000	1.60
@@ -24,7 +24,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 2%{?gver}%{?dist}
+Release: 3%{?gver}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
@@ -34,8 +34,9 @@
 
 # don't remove config.h and don't re-run version.sh
 Patch0: x264-nover.patch
+Patch10: x264-gpac.patch
 
-%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
 %{!?_without_libavformat:BuildRequires: ffmpeg-devel}
 %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
 %{?_with_visualize:BuildRequires: libX11-devel}
@@ -90,6 +91,7 @@
 %setup -q -c -n %{name}-0.%{api}-%{snapshot}
 pushd %{name}-0.%{api}-%{snapshot}
 %patch0 -p1 -b .nover
+%patch10 -p1 -b .gpac
 popd
 
 variants="generic generic10"
@@ -189,6 +191,9 @@
 %{_libdir}/libx26410b.so
 
 %changelog
+* Mon Sep 30 2013 Sérgio Basto <sergio at serjux.com> - 0.133-3.20130709git585324f
+- Fix gpac detection.
+
 * Thu Aug 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.133-2.20130709git585324f
 - Rebuilt for FFmpeg 2.0.x