From f8c3809ea7ea2b2f8dc1ddf9aa9add22779cee08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 Sep 2013 02:04:56 +0000 Subject: [PATCH] =?UTF-8?q?*=20Mon=20Sep=2030=202013=20S=C3=A9rgio=20Basto?= =?UTF-8?q?=20=20-=200.133-3.20130709git585324f=20-=20F?= =?UTF-8?q?ix=20gpac=20detection.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x264-gpac.patch | 11 +++++++++++ x264.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 x264-gpac.patch diff --git a/x264-gpac.patch b/x264-gpac.patch new file mode 100644 index 0000000..cbf696e --- /dev/null +++ b/x264-gpac.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/x264.spec b/x264.spec index fd5d0d8..6824023 100644 --- a/x264.spec +++ b/x264.spec @@ -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 @@ BuildRequires: perl-Digest-MD5 # 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 @@ This package contains the development files. %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 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Mon Sep 30 2013 Sérgio Basto - 0.133-3.20130709git585324f +- Fix gpac detection. + * Thu Aug 15 2013 Nicolas Chauvet - 0.133-2.20130709git585324f - Rebuilt for FFmpeg 2.0.x