r174 - in experimental/ffmpeg/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:22:56 CET 2007 

Author: sho
Date: 2007-03-09 16:23:08 +0000 (Fri, 09 Mar 2007)
New Revision: 174

Modified:
   experimental/ffmpeg/debian/changelog
   experimental/ffmpeg/debian/patches/010_proper_rpath.diff
   experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
   experimental/ffmpeg/debian/rules
Log:
  * debian/patches/010_shared_library_versioning.diff:
    + Strip unneeded prefix from .pc files (Closes: #404758).

  * Fix ffmpeg/debian/patches/010_proper_rpath.diff so that it builds.


Modified: experimental/ffmpeg/debian/changelog
===================================================================
--- experimental/ffmpeg/debian/changelog	2007-03-09 14:51:02 UTC (rev 173)
+++ experimental/ffmpeg/debian/changelog	2007-03-09 16:23:08 UTC (rev 174)
@@ -32,6 +32,8 @@
     + New patch. Link vhook plugins with the appropriate libraries.
 
   * debian/patches/010_shared_library_versioning.diff:
+    + Strip unneeded prefix from .pc files (Closes: #404758).
+
   * debian/patches/020_mmx_optims.diff:
   * debian/patches/020_disable_snow_mmx_in_pic.diff:
     + Sync patches.

Modified: experimental/ffmpeg/debian/patches/010_proper_rpath.diff
===================================================================
--- experimental/ffmpeg/debian/patches/010_proper_rpath.diff	2007-03-09 14:51:02 UTC (rev 173)
+++ experimental/ffmpeg/debian/patches/010_proper_rpath.diff	2007-03-09 16:23:08 UTC (rev 174)
@@ -7,7 +7,7 @@
  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'
++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"

Modified: experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-09 14:51:02 UTC (rev 173)
+++ experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-09 16:23:08 UTC (rev 174)
@@ -1,7 +1,7 @@
 Index: ffmpeg-0.cvs20070307/configure
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/configure	2007-03-07 22:32:56.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 17:07:42.000000000 +0100
++++ ffmpeg-0.cvs20070307/configure	2007-03-09 17:18:29.000000000 +0100
 @@ -1924,11 +1924,11 @@
    echo "BUILD_DOC=yes" >> config.mak
  fi
@@ -19,10 +19,34 @@
  
  
  
+@@ -2057,9 +2057,9 @@
+ pkgconfig_generate(){
+ name=$1
+ comment=$2
+-version=$3
++version=$(echo $3 | sed 's/\<[0-9][0-9]*d[.]//g')
+ libs=$4
+-requires=$5
++requires=$(echo $5 | sed 's/\<[0-9][0-9]*d[.]//g')
+ include=$6
+ cat <<EOF >$name.pc
+ prefix=$PREFIX
+@@ -2081,9 +2081,9 @@
+ name=$1
+ shortname=${name#lib}
+ comment=$2
+-version=$3
++version=$(echo $3 | sed 's/\<[0-9][0-9]*d[.]//g')
+ libs=$4
+-requires=$5
++requires=$(echo $5 | sed 's/\<[0-9][0-9]*d[.]//g')
+ cat <<EOF >$name-uninstalled.pc
+ prefix=
+ exec_prefix=
 Index: ffmpeg-0.cvs20070307/libavutil/avutil.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavutil/avutil.h	2007-03-07 22:32:50.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavutil/avutil.h	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libavutil/avutil.h	2007-03-07 14:37:01.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavutil/avutil.h	2007-03-09 17:07:44.000000000 +0100
 @@ -35,7 +35,7 @@
  #define AV_TOSTRING(s) #s
  
@@ -34,8 +58,8 @@
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
 Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h	2007-03-07 22:32:50.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h	2007-03-07 14:37:04.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-03-09 17:07:44.000000000 +0100
 @@ -38,7 +38,7 @@
  #define AV_TOSTRING(s) #s
  
@@ -47,8 +71,8 @@
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
 Index: ffmpeg-0.cvs20070307/libavformat/avformat.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavformat/avformat.h	2007-03-07 22:32:50.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavformat/avformat.h	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libavformat/avformat.h	2007-03-07 14:37:06.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavformat/avformat.h	2007-03-09 17:07:44.000000000 +0100
 @@ -26,7 +26,7 @@
  #endif
  
@@ -60,8 +84,8 @@
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 Index: ffmpeg-0.cvs20070307/common.mak
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/common.mak	2007-03-07 22:32:50.000000000 +0100
-+++ ffmpeg-0.cvs20070307/common.mak	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/common.mak	2007-03-07 14:37:06.000000000 +0100
++++ ffmpeg-0.cvs20070307/common.mak	2007-03-09 17:07:44.000000000 +0100
 @@ -68,7 +68,7 @@
  	cd "$(shlibdir)" && \
  		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -73,8 +97,8 @@
  install-lib-static: $(LIB)
 Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.h	2007-03-07 22:32:50.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess.h	2007-03-07 22:32:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.h	2007-03-07 11:17:32.000000000 +0100
++++ ffmpeg-0.cvs20070307/libpostproc/postprocess.h	2007-03-09 17:07:44.000000000 +0100
 @@ -32,7 +32,7 @@
  #endif
  
@@ -86,8 +110,8 @@
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
 Index: ffmpeg-0.cvs20070307/libswscale/swscale.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale.h	2007-03-07 22:33:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale.h	2007-03-07 22:33:58.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libswscale/swscale.h	2007-03-07 11:17:32.000000000 +0100
++++ ffmpeg-0.cvs20070307/libswscale/swscale.h	2007-03-09 17:07:44.000000000 +0100
 @@ -37,7 +37,7 @@
  #define AV_TOSTRING(s) #s
  

Modified: experimental/ffmpeg/debian/rules
===================================================================
--- experimental/ffmpeg/debian/rules	2007-03-09 14:51:02 UTC (rev 173)
+++ experimental/ffmpeg/debian/rules	2007-03-09 16:23:08 UTC (rev 174)
@@ -47,7 +47,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	
 	# Build static libraries
-	./configure $(confflags) --disable-ffmpeg --disable-ffserver --disable-ffplay --prefix=/usr
+	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
 	cd doc && $(MAKE)
 	$(MAKE)

More information about the Pkg-multimedia-commits mailing list