[SCM] rtmpdump/master: 02_gnutls_requires.private.diff: Cleanup crypto dependencies

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 22 22:20:25 UTC 2014


The following commit has been merged in the master branch:
commit 33786cc891eea8fd46b92612955883bb9ef4f9fd
Author: Andreas Metzler <ametzler at debian.org>
Date:   Sun Jun 22 18:00:09 2014 -0400

    02_gnutls_requires.private.diff: Cleanup crypto dependencies
    
    In pkg-config file move gnutls, hogweed, and nettle from Requires to
    Requires.private. librtmp's headers do not expose these libraries.

diff --git a/debian/patches/02_gnutls_requires.private.diff b/debian/patches/02_gnutls_requires.private.diff
new file mode 100644
index 0000000..0a0b58e
--- /dev/null
+++ b/debian/patches/02_gnutls_requires.private.diff
@@ -0,0 +1,30 @@
+Description: Move gnutls/nettle/hogweed to .private
+ librtmp'headers do not expose gnutls' headers (or its dependencies), move
+ them from Requires to Requires.private.
+ .
+ Upstream agrees that this is correct but wants to support for broken
+ archs and static-lib-only installations:
+ * 0d44da9f5f5a4aa7cd64566c64d89d2fb392e3ef
+    "Include the nettle/hogweed crypto libraries in the pkg-config file
+ .
+    These libraries are linked and used as directly as we use gnutls
+    itself. This fixes linking for callers if librtmp is built
+    statically or if the linker doesn't support transitive linking."
+ .
+Author: Andreas Metzler <ametzler at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/745216
+Forwarded: not-needed
+Last-Update: 2014-04-26
+
+--- rtmpdump-2.4+20131018.git79459a2.orig/librtmp/librtmp.pc.in
++++ rtmpdump-2.4+20131018.git79459a2/librtmp/librtmp.pc.in
+@@ -6,7 +6,7 @@ incdir=${prefix}/include
+ Name: librtmp
+ Description: RTMP implementation
+ Version: @VERSION@
+-Requires: @CRYPTO_REQ@
++Requires.private: @CRYPTO_REQ@
+ URL: http://rtmpdump.mplayerhq.hu
+ Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@
+ Libs.private: @PRIVATE_LIBS@
diff --git a/debian/patches/series b/debian/patches/series
index cd7024e..c1ec762 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_unbreak_makefile.diff
+02_gnutls_requires.private.diff

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list