r172 - in experimental/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-09 14:49:55 +0000 (Fri, 09 Mar 2007)
New Revision: 172

Added:
   experimental/ffmpeg/debian/patches/010_proper_rpath.diff
   experimental/ffmpeg/debian/patches/011_link_plugins.diff
Modified:
   experimental/ffmpeg/debian/changelog
   experimental/ffmpeg/debian/patches/series
Log:
  * debian/patches/010_proper_rpath.diff:
    + New patch. Link objects with the libraries that we generate, not the
      ones installed on the system.

  * debian/patches/011_link_plugins.diff:
    + New patch. Link vhook plugins with the appropriate libraries.


Modified: experimental/ffmpeg/debian/changelog
===================================================================
--- experimental/ffmpeg/debian/changelog	2007-03-09 14:13:32 UTC (rev 171)
+++ experimental/ffmpeg/debian/changelog	2007-03-09 14:49:55 UTC (rev 172)
@@ -24,6 +24,13 @@
 
   * New upstream snapshot (Closes: #403330, #404788).
 
+  * debian/patches/010_proper_rpath.diff:
+    + New patch. Link objects with the libraries that we generate, not the
+      ones installed on the system.
+
+  * debian/patches/011_link_plugins.diff:
+    + New patch. Link vhook plugins with the appropriate libraries.
+
   * debian/patches/010_shared_library_versioning.diff:
   * debian/patches/020_mmx_optims.diff:
   * debian/patches/020_disable_snow_mmx_in_pic.diff:

Added: experimental/ffmpeg/debian/patches/010_proper_rpath.diff
===================================================================
--- experimental/ffmpeg/debian/patches/010_proper_rpath.diff	2007-03-09 14:13:32 UTC (rev 171)
+++ experimental/ffmpeg/debian/patches/010_proper_rpath.diff	2007-03-09 14:49:55 UTC (rev 172)
@@ -0,0 +1,13 @@
+Index: ffmpeg-0.cvs20070307/configure
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 15:42:57.000000000 +0100
++++ ffmpeg-0.cvs20070307/configure	2007-03-09 15:44:13.000000000 +0100
+@@ -820,7 +820,7 @@
+ VHOOKSHFLAGS='$(SHFLAGS)'
+ LIBOBJFLAGS=""
+ FFLDFLAGS=-Wl,--warn-common
+-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
++LDLATEFLAGS='-L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavutil -L$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale'
+ FFSERVERLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+ LIBPREF="lib"

Added: experimental/ffmpeg/debian/patches/011_link_plugins.diff
===================================================================
--- experimental/ffmpeg/debian/patches/011_link_plugins.diff	2007-03-09 14:13:32 UTC (rev 171)
+++ experimental/ffmpeg/debian/patches/011_link_plugins.diff	2007-03-09 14:49:55 UTC (rev 172)
@@ -0,0 +1,41 @@
+Index: ffmpeg-0.cvs20070307/configure
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 15:34:27.000000000 +0100
++++ ffmpeg-0.cvs20070307/configure	2007-03-09 15:34:51.000000000 +0100
+@@ -820,7 +820,7 @@
+ VHOOKSHFLAGS='$(SHFLAGS)'
+ LIBOBJFLAGS=""
+ FFLDFLAGS=-Wl,--warn-common
+-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
++LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale'
+ FFSERVERLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+ LIBPREF="lib"
+Index: ffmpeg-0.cvs20070307/vhook/Makefile
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/vhook/Makefile	2007-03-09 15:15:49.000000000 +0100
++++ ffmpeg-0.cvs20070307/vhook/Makefile	2007-03-09 15:42:19.000000000 +0100
+@@ -9,16 +9,21 @@
+ HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
+ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
+ 
++LIBS_fish$(SLIBSUF) += -lavcodec -lswscale -lavformat
++LIBS_null$(SLIBSUF) += -lavcodec -lswscale
++LIBS_ppm$(SLIBSUF) += -lavcodec -lswscale -lavformat
++LIBS_watermark$(SLIBSUF) += -lavcodec -lswscale -lavformat
++
+ ifeq ($(HAVE_IMLIB2),yes)
+     HOOKS += imlib2$(SLIBSUF)
+     CFLAGS += `imlib2-config --cflags`
+-    LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++    LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` -lswscale -lavcodec
+ endif
+ 
+ ifeq ($(HAVE_FREETYPE2),yes)
+     HOOKS += drawtext$(SLIBSUF)
+     CFLAGS += `freetype-config --cflags`
+-    LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++    LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` -lavutil
+ endif
+ 
+ SRCS := $(HOOKS:$(SLIBSUF)=.c)

Modified: experimental/ffmpeg/debian/patches/series
===================================================================
--- experimental/ffmpeg/debian/patches/series	2007-03-09 14:13:32 UTC (rev 171)
+++ experimental/ffmpeg/debian/patches/series	2007-03-09 14:49:55 UTC (rev 172)
@@ -2,9 +2,11 @@
 005_altivec_flags.diff
 005_runtime_cpudetect.diff
 006_mips_pthreads.diff
+010_proper_rpath.diff
 010_ffmpeg-config.diff
 010_shared_library_versioning.diff
 #020_mmx_intrinsics.diff
+011_link_plugins.diff
 020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff