[x264/f29] Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."

commit a5fc59d6e20aa1c5b35b80a7c544e7c055b04dd9 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue May 7 02:52:00 2019 +0100 Revert "Build /usr/bin/x264 with gpac shared lib instead static lib." This reverts commit 808c02f2380dfd5c387cdc98ef682728cb62bccf. x264-gpac.patch | 16 +++++++++------- x264.spec | 5 ++++- 2 files changed, 13 insertions(+), 8 deletions(-) --- diff --git a/x264-gpac.patch b/x264-gpac.patch index 4b4604f..19d1a4e 100644 --- a/x264-gpac.patch +++ b/x264-gpac.patch @@ -1,11 +1,13 @@ ---- ./configure.orig 2019-05-07 00:00:16.289260869 +0100 -+++ ./configure 2019-05-07 00:03:39.415602593 +0100 -@@ -1199,7 +1199,7 @@ fi - +--- x264-0.140-20140122-de0bc36/configure.orig 2014-01-22 23:26:55.922650888 +0000 ++++ x264-0.140-20140122-de0bc36/configure 2014-02-24 02:35:19.263127505 +0000 +@@ -941,7 +941,9 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then gpac="no" -- GPAC_LIBS="-lgpac_static" -+ GPAC_LIBS="-lgpac" - cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" + GPAC_LIBS="-lgpac_static" +- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" ++ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do ++ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib" ++ done if [ "$SYS" = "WINDOWS" ] ; then cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32" + cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm" diff --git a/x264.spec b/x264.spec index ce1f5aa..a7175ea 100644 --- a/x264.spec +++ b/x264.spec @@ -31,7 +31,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -209,6 +209,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 0.155-5.20180806git0a84d98 +- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib." + * Mon May 06 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 0.155-4.20180806git0a84d98 - Enable opencl (which is default) only exist --disable-opencl option - Disable opencl on 10bit seems that is just prepared for 8bit.