r1318 - in /unstable/ffmpeg/debian: ./ changelog patches/10_fix_kfreebsd_libx11_linkage.diff patches/series

Wed Jul 16 08:58:57 UTC 2008

Author: siretart
Date: Wed Jul 16 08:58:57 2008
New Revision: 1318

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1318
Log:
bugfix: libraries linked with libX11 on GNU/kFreeBSD. Thanks to
Aurelien Jarno for the patch. (Closes: #487252)
Build-Conflicts on libdc1394-13-dev (Closes: #490319).

Added:
    unstable/ffmpeg/debian/patches/10_fix_kfreebsd_libx11_linkage.diff
Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/series

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------

--- bzr:file-ids (original)
+++ bzr:file-ids Wed Jul 16 08:58:57 2008
@@ -1,1 +1,1 @@
-patches/010_fix_ftbfs_hppa.diff	010_fix_ftbfs_hppa.d-20080713155856-sii1uudbydi1enu6-1
+patches/10_fix_kfreebsd_libx11_linkage.diff	10_fix_kfreebsd_libx-20080716083958-jbda4szvnlbdovjs-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Wed Jul 16 08:58:57 2008
@@ -48,3 +48,4 @@
 82 siretart at tauware.de-20080710200440-41s96a3igdpz9iah
 83 siretart at tauware.de-20080711105448-bttyc30pym9fe05w
 84 siretart at tauware.de-20080713160134-ecblyf05orfa8gw8
+86 siretart at tauware.de-20080716084217-0lfte8kgn1kiw78e

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Jul 16 08:58:57 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-07-13 18:01:34.729000092 +0200
+timestamp: 2008-07-16 10:42:17.124000072 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1318&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Wed Jul 16 08:58:57 2008
@@ -4,13 +4,15 @@
   * new patch: patches/010_fix_ftbfs_hppa.diff: On hppa shared objects
     do required object files to be build "-fPIC -DPIC". Patch taken
     from upstream svn.
+  * bugfix: libraries linked with libX11 on GNU/kFreeBSD. Thanks to
+    Aurelien Jarno for the patch. (Closes: #487252)
 
   [ Fabian Greffrath ]
   * debian/confflags, debian/control:
     + Build-Depend on libdc1394-22-dev explicitely and add
-      Build-Conflicts on libdc1394-13-dev (Closes: 490319).
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 14 Jul 2008 11:02:05 +0200
+      Build-Conflicts on libdc1394-13-dev (Closes: #490319).
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jul 2008 10:41:49 +0200
 
 ffmpeg-debian (0.svn20080206-10) unstable; urgency=high
 

Added: unstable/ffmpeg/debian/patches/10_fix_kfreebsd_libx11_linkage.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/10_fix_kfreebsd_libx11_linkage.diff?rev=1318&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/10_fix_kfreebsd_libx11_linkage.diff (added)
+++ unstable/ffmpeg/debian/patches/10_fix_kfreebsd_libx11_linkage.diff Wed Jul 16 08:58:57 2008
@@ -1,0 +1,29 @@
+From: Aurelien Jarno <aurel32 at debian.org>
+Subject: ffmpeg-free: libraries linked with libX11 on GNU/kFreeBSD
+Date: Fri, 20 Jun 2008 17:04:03 +0200
+
+Package: ffmpeg-free
+Version: 0.svn20080206-8
+Severity: normal
+Tags: patch
+
+ffmpeg-free links with -Wl,--as-needed on GNU/Linux, so the resulting
+libraries are not linked with libX11. This is something required by VLC.
+
+On GNU/kFreeBSD, -Wl,--as-needed is not used, so VLC fails to build.
+Please find below a patch to fix that.
+
+For full details c.f. http://bugs.debian.org/487252
+
+--- a/configure
++++ b/configure
+@@ -1289,6 +1289,9 @@ case $targetos in
+         SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib'
+         vhook="no"
+         ;;
++    gnu/kfreebsd)
++        LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
++        ;;
+ 
+     *)
+         targetos="${targetos}-UNKNOWN"

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1318&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Wed Jul 16 08:58:57 2008
@@ -1,4 +1,5 @@
 010_fix_ftbfs_hppa.diff
+10_fix_kfreebsd_libx11_linkage.diff
 010_proper_rpath.diff
 013_strip_unneeded_linker_flags.diff
 015_reenable-img_convert.diff


