r168 - in experimental/ffmpeg/debian: . patches

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

Author: sho
Date: 2007-03-07 23:47:21 +0000 (Wed, 07 Mar 2007)
New Revision: 168

Modified:
   experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
   experimental/ffmpeg/debian/rules
Log:
  * Fix swscale library versioning.


Modified: experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-07 21:07:18 UTC (rev 167)
+++ experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-07 23:47:21 UTC (rev 168)
@@ -1,7 +1,7 @@
 Index: ffmpeg-0.cvs20070307/configure
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/configure	2007-03-07 14:38:52.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -1924,11 +1924,11 @@
    echo "BUILD_DOC=yes" >> config.mak
  fi
@@ -21,47 +21,47 @@
  
 Index: ffmpeg-0.cvs20070307/libavutil/avutil.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavutil/avutil.h	2007-03-07 14:37:01.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavutil/avutil.h	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -35,7 +35,7 @@
  #define AV_TOSTRING(s) #s
  
  #define LIBAVUTIL_VERSION_INT   ((49<<16)+(3<<8)+0)
 -#define LIBAVUTIL_VERSION       49.3.0
-+#define LIBAVUTIL_VERSION       0d.49.3.0
++#define LIBAVUTIL_VERSION       1d.49.3.0
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #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 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -38,7 +38,7 @@
  #define AV_TOSTRING(s) #s
  
  #define LIBAVCODEC_VERSION_INT  ((51<<16)+(38<<8)+0)
 -#define LIBAVCODEC_VERSION      51.38.0
-+#define LIBAVCODEC_VERSION      0d.51.38.0
++#define LIBAVCODEC_VERSION      1d.51.38.0
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #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 14:37:06.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavformat/avformat.h	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -26,7 +26,7 @@
  #endif
  
  #define LIBAVFORMAT_VERSION_INT ((51<<16)+(10<<8)+0)
 -#define LIBAVFORMAT_VERSION     51.10.0
-+#define LIBAVFORMAT_VERSION     0d.51.10.0
++#define LIBAVFORMAT_VERSION     1d.51.10.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 Index: ffmpeg-0.cvs20070307/common.mak
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/common.mak	2007-03-07 14:37:06.000000000 +0100
-+++ ffmpeg-0.cvs20070307/common.mak	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -68,7 +68,7 @@
  	cd "$(shlibdir)" && \
  		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -73,14 +73,27 @@
  install-lib-static: $(LIB)
 Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.h	2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess.h	2007-03-07 14:43:54.000000000 +0100
+--- 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
 @@ -32,7 +32,7 @@
  #endif
  
  #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
 -#define LIBPOSTPROC_VERSION     51.1.0
-+#define LIBPOSTPROC_VERSION     0d.51.1.0
++#define LIBPOSTPROC_VERSION     1d.51.1.0
  #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
  
  #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
+@@ -37,7 +37,7 @@
+ #define AV_TOSTRING(s) #s
+ 
+ #define LIBSWSCALE_VERSION_INT  ((0<<16)+(5<<8)+0)
+-#define LIBSWSCALE_VERSION      0.5.0
++#define LIBSWSCALE_VERSION      1d.0.5.0
+ #define LIBSWSCALE_BUILD        LIBSWSCALE_VERSION_INT
+ 
+ #define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)

Modified: experimental/ffmpeg/debian/rules
===================================================================
--- experimental/ffmpeg/debian/rules	2007-03-07 21:07:18 UTC (rev 167)
+++ experimental/ffmpeg/debian/rules	2007-03-07 23:47:21 UTC (rev 168)
@@ -186,12 +186,13 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -p libavcodec1d -V 'libavcodec1d (>= 0.cvs20060823)'
-	dh_makeshlibs -p libavformat1d -V 'libavformat1d (>= 0.cvs20060823)'
-	dh_makeshlibs -p libswscale1d -V 'libswscale1d (>= 0.cvs20060823)'
-	dh_makeshlibs -p libpostproc1d -V 'libpostproc1d (>= 0.cvs20060823)'
+	dh_makeshlibs -p libavutil1d -V 'libavutil1d (>= 0.cvs20070307)'
+	dh_makeshlibs -p libavcodec1d -V 'libavcodec1d (>= 0.cvs20070307)'
+	dh_makeshlibs -p libavformat1d -V 'libavformat1d (>= 0.cvs20070307)'
+	dh_makeshlibs -p libswscale1d -V 'libswscale1d (>= 0.cvs20070307)'
+	dh_makeshlibs -p libpostproc1d -V 'libpostproc1d (>= 0.cvs20070307)'
 	dh_installdeb
-	dh_shlibdeps -L libavcodec1d -L libpostproc1d -L libavformat1d -L libswscale1d -l debian/libavcodec1d/usr/lib:debian/libavformat1d/usr/lib:debian/libpostproc1d/usr/lib
+	dh_shlibdeps -L libavutil1d -L libavcodec1d -L libpostproc1d -L libavformat1d -L libswscale1d -l debian/libavutil1d/usr/lib:debian/libavcodec1d/usr/lib:debian/libavformat1d/usr/lib:debian/libpostproc1d/usr/lib:debian/libswscale1d/usr/lib
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb

More information about the Pkg-multimedia-commits mailing list