---------- Forwarded message ---------
De :Nicolas Chauvet <kwizart@gmail.com>
Date: mar. 7 mai 2019 07:07
Subject: Re: [x264/f29] Build /usr/bin/x264 with gpac shared lib instead static lib.
To: Sérgio M. Basto <sergiomb@rpmfusion.org>


Why this ?

Gpac shared library is a random collection of everything. X264 only needs few fonctions from it, so we determined to use the static version on purpose to avoid the Gpac shared dépendency and dependencies.

Revert this !




Le mar. 7 mai 2019 06:09, Sérgio M. Basto <sergiomb@rpmfusion.org> a écrit :
commit 808c02f2380dfd5c387cdc98ef682728cb62bccf
Author: Sérgio M. Basto <sergio@serjux.com>
Date:   Tue May 7 00:08:49 2019 +0100

    Build /usr/bin/x264 with gpac shared lib instead static lib.

 x264-gpac.patch | 16 +++++++---------
 x264.spec       |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/x264-gpac.patch b/x264-gpac.patch
index 19d1a4e..4b4604f 100644
--- a/x264-gpac.patch
+++ b/x264-gpac.patch
@@ -1,13 +1,11 @@
---- 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 @@
+--- ./configure.orig   2019-05-07 00:00:16.289260869 +0100
++++ ./configure        2019-05-07 00:03:39.415602593 +0100
+@@ -1199,7 +1199,7 @@ fi
+
  if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
      gpac="no"
-     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
+-    GPAC_LIBS="-lgpac_static"
++    GPAC_LIBS="-lgpac"
+     cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
      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 577a049..ce1f5aa 100644
--- a/x264.spec
+++ b/x264.spec
@@ -212,6 +212,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 * Mon May 06 2019 Sérgio Basto <sergio@serjux.com> - 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.
+- Build /usr/bin/x264 with gpac shared lib instead static lib.

 * Sun Apr 28 2019 Leigh Scott <leigh123linux@gmail.com> - 0.155-3.20180806git0a84d98
 - Fix opencl dlopen (rfbz#5185)