[SCM] x264/master: Link dynamically against libgpac

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon May 12 23:07:29 UTC 2014


The following commit has been merged in the master branch:
commit 3f85d96c6658af8c298641b19b167fb76647121d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon May 12 19:00:44 2014 -0400

    Link dynamically against libgpac

diff --git a/debian/changelog b/debian/changelog
index 2570be2..a64727f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x264 (2:0.142.2389+git956c8d8-5) unstable; urgency=medium
 
   [ Reinhard Tartler ]
   * Recompile against libav10
+  * Link dynamically against libgpac
 
  -- Reinhard Tartler <siretart at tauware.de>  Mon, 12 May 2014 18:52:02 -0400
 
diff --git a/debian/patches/link_gpac_dynamically.patch b/debian/patches/link_gpac_dynamically.patch
new file mode 100644
index 0000000..0de5d7b
--- /dev/null
+++ b/debian/patches/link_gpac_dynamically.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -940,7 +940,7 @@ fi
+ 
+ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
+     gpac="no"
+-    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"
diff --git a/debian/patches/series b/debian/patches/series
index 04e7c87..e251b81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 aarch64-pic.patch
 powerpcspe.patch
+link_gpac_dynamically.patch

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list