Control: tags 745216 patch
On 2014-04-19 Alessandro Ghedini <gh...@debian.org> wrote:
> On sab, apr 19, 2014 at 02:49:59 +0930, Arthur Marsh wrote:
> > Package: librtmp-dev
> > Version: 2.4+20131018.git79459a2-2
[...]
> > Trying to install the package on a system with libgnutls28-dev installed.
> > Is there a fundamental conflict between these packages, or is this just
> > a packaging issue.
> Indeed, this is preventing me to switch curl to libgnutls28. AFAICT, the only
> reason librtmp-dev depends on libgnutls-dev is because librtmp.pc has a
> "Requires: gnutls", but it doesn't seem to actually need it (i.e. none of the
> librtmp-dev headers #includes gnutls.h, and librtmp.pc doesn't have -lgnutls
> anywhere), but I may be wrong.
Hello,
Afaict this is really the case and upstream also thinks so:
-------------
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.
------------
For static lining there is "pkg-config --libs --static" and Debian's
linker does support transitive linking.
Find attached a suggested patch.
FWIW afaict gmp and zlib shouldn't be in Libs either.
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru rtmpdump-2.4+20131018.git79459a2/debian/changelog rtmpdump-2.4+20131018.git79459a2/debian/changelog
--- rtmpdump-2.4+20131018.git79459a2/debian/changelog 2014-04-12 04:08:18.000000000 +0200
+++ rtmpdump-2.4+20131018.git79459a2/debian/changelog 2014-04-26 08:31:34.000000000 +0200
@@ -1,3 +1,14 @@
+rtmpdump (2.4+20131018.git79459a2-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 02_gnutls_requires.private.diff: In pkg-config file move gnutls, hogweed,
+ and nettle from Requires to Requires.private. librtmp's headers do not
+ expose these libraries.
+ * Drop librtmp-dev dependency on libgnutls-dev and nettle-dev.
+ Closes: #745216
+
+ -- Andreas Metzler <ametz...@debian.org> Sat, 26 Apr 2014 08:10:35 +0200
+
rtmpdump (2.4+20131018.git79459a2-2) unstable; urgency=low
* Depends on libgmp-dev and nettle-dev to librtmpdev (Closes: #744242)
diff -Nru rtmpdump-2.4+20131018.git79459a2/debian/control rtmpdump-2.4+20131018.git79459a2/debian/control
--- rtmpdump-2.4+20131018.git79459a2/debian/control 2014-04-12 04:07:19.000000000 +0200
+++ rtmpdump-2.4+20131018.git79459a2/debian/control 2014-04-26 08:33:09.000000000 +0200
@@ -34,7 +34,7 @@
Package: librtmp-dev
Section: libdevel
-Depends: libgnutls-dev, librtmp1 (= ${binary:Version}), ${misc:Depends}, nettle-dev, libgmp-dev
+Depends: librtmp1 (= ${binary:Version}), ${misc:Depends}, libgmp-dev
Architecture: any
Multi-Arch: same
Description: toolkit for RTMP streams (development files)
diff -Nru rtmpdump-2.4+20131018.git79459a2/debian/patches/02_gnutls_requires.private.diff rtmpdump-2.4+20131018.git79459a2/debian/patches/02_gnutls_requires.private.diff
--- rtmpdump-2.4+20131018.git79459a2/debian/patches/02_gnutls_requires.private.diff 1970-01-01 01:00:00.000000000 +0100
+++ rtmpdump-2.4+20131018.git79459a2/debian/patches/02_gnutls_requires.private.diff 2014-04-26 08:30:20.000000000 +0200
@@ -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 <ametz...@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 -Nru rtmpdump-2.4+20131018.git79459a2/debian/patches/series rtmpdump-2.4+20131018.git79459a2/debian/patches/series
--- rtmpdump-2.4+20131018.git79459a2/debian/patches/series 2014-04-12 04:02:42.000000000 +0200
+++ rtmpdump-2.4+20131018.git79459a2/debian/patches/series 2014-04-26 07:56:29.000000000 +0200
@@ -1 +1,2 @@
01_unbreak_makefile.diff
+02_gnutls_requires.private.diff
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
