r929 - in /experimental/ffmpeg/debian: changelog patches/010_shared_library_versioning.diff patches/051_mjpeg_gray_support.diff patches/053_rm_demux_crash.diff patches/060_fix_avi_skip.diff patches/series

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Dec 9 19:53:58 UTC 2007 

Author: siretart
Date: Sun Dec  9 19:53:58 2007
New Revision: 929

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=929
Log:
update patches for upstream version 20071007

Removed:
    experimental/ffmpeg/debian/patches/053_rm_demux_crash.diff
    experimental/ffmpeg/debian/patches/060_fix_avi_skip.diff
Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
    experimental/ffmpeg/debian/patches/051_mjpeg_gray_support.diff
    experimental/ffmpeg/debian/patches/series

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=929&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Sun Dec  9 19:53:58 2007
@@ -1,3 +1,11 @@
+ffmpeg-free (0.cvs20071007-2) unstable; urgency=low
+
+  * new upstream snapshot, using the same day as the mplayer release
+  * 053_rm_demux_crash.diff removed, applied upstream.
+  * 060_fix_avi_skip.diff removed, does not apply anymore
+
+ --
+
 ffmpeg-free (0.cvs20071025-1) UNRELEASED; urgency=low
 
   * new upstream snapshot. Refreshing patches:

Modified: experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff?rev=929&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff (original)
+++ experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff Sun Dec  9 19:53:58 2007
@@ -1,8 +1,8 @@
 Index: trunk/configure
 ===================================================================
---- trunk.orig/configure	2007-10-25 15:08:07.000000000 +0200
-+++ trunk/configure	2007-10-25 15:09:31.000000000 +0200
-@@ -1895,11 +1895,11 @@
+--- trunk.orig/configure	2007-12-09 20:34:48.000000000 +0100
++++ trunk/configure	2007-12-09 20:35:04.000000000 +0100
+@@ -1893,11 +1893,11 @@
    echo "BUILD_DOC=yes" >> config.mak
  fi
  
@@ -19,7 +19,7 @@
  
  
  
-@@ -2008,9 +2008,9 @@
+@@ -2003,9 +2003,9 @@
  pkgconfig_generate(){
  name=$1
  comment=$2
@@ -31,7 +31,7 @@
  include=$6
  cat <<EOF >$name.pc
  prefix=$PREFIX
-@@ -2032,9 +2032,9 @@
+@@ -2027,9 +2027,9 @@
  name=$1
  shortname=${name#lib}
  comment=$2
@@ -45,22 +45,22 @@
  exec_prefix=
 Index: trunk/libavformat/avformat.h
 ===================================================================
---- trunk.orig/libavformat/avformat.h	2007-10-25 14:59:05.000000000 +0200
-+++ trunk/libavformat/avformat.h	2007-10-25 15:13:31.000000000 +0200
+--- trunk.orig/libavformat/avformat.h	2007-12-09 18:40:11.000000000 +0100
++++ trunk/libavformat/avformat.h	2007-12-09 20:35:34.000000000 +0100
 @@ -22,7 +22,7 @@
- #define FFMPEG_AVFORMAT_H
+ #define AVFORMAT_H
  
- #define LIBAVFORMAT_VERSION_INT ((51<<16)+(17<<8)+0)
--#define LIBAVFORMAT_VERSION     51.17.0
-+#define LIBAVFORMAT_VERSION     1d.51.17.0
+ #define LIBAVFORMAT_VERSION_INT ((51<<16)+(14<<8)+0)
+-#define LIBAVFORMAT_VERSION     51.14.0
++#define LIBAVFORMAT_VERSION     1d.51.14.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 Index: trunk/common.mak
 ===================================================================
---- trunk.orig/common.mak	2007-10-25 14:59:05.000000000 +0200
-+++ trunk/common.mak	2007-10-25 15:25:48.000000000 +0200
-@@ -72,7 +72,7 @@
+--- trunk.orig/common.mak	2007-12-09 18:40:11.000000000 +0100
++++ trunk/common.mak	2007-12-09 20:35:04.000000000 +0100
+@@ -76,7 +76,7 @@
  	cd "$(SHLIBDIR)" && \
  		$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
  	cd "$(SHLIBDIR)" && \
@@ -68,11 +68,11 @@
 +		$(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
  	$(SLIB_INSTALL_EXTRA_CMD)
  
- install-lib-static: $(LIBNAME)
+ install-lib-static: $(LIB)
 Index: trunk/libpostproc/postprocess.h
 ===================================================================
---- trunk.orig/libpostproc/postprocess.h	2007-10-25 14:59:04.000000000 +0200
-+++ trunk/libpostproc/postprocess.h	2007-10-25 15:09:31.000000000 +0200
+--- trunk.orig/libpostproc/postprocess.h	2007-12-09 18:40:10.000000000 +0100
++++ trunk/libpostproc/postprocess.h	2007-12-09 20:35:04.000000000 +0100
 @@ -28,7 +28,7 @@
   */
  
@@ -84,8 +84,8 @@
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
 Index: trunk/libswscale/swscale.h
 ===================================================================
---- trunk.orig/libswscale/swscale.h	2007-10-25 14:59:06.000000000 +0200
-+++ trunk/libswscale/swscale.h	2007-10-25 15:09:31.000000000 +0200
+--- trunk.orig/libswscale/swscale.h	2007-12-09 18:40:18.000000000 +0100
++++ trunk/libswscale/swscale.h	2007-12-09 20:35:04.000000000 +0100
 @@ -33,7 +33,7 @@
  #define AV_TOSTRING(s) #s
  

Modified: experimental/ffmpeg/debian/patches/051_mjpeg_gray_support.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/051_mjpeg_gray_support.diff?rev=929&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/051_mjpeg_gray_support.diff (original)
+++ experimental/ffmpeg/debian/patches/051_mjpeg_gray_support.diff Sun Dec  9 19:53:58 2007
@@ -1,6 +1,8 @@
---- ffmpeg-orig/libavcodec/mjpeg.c	2007-06-23 16:14:45 +0200
-+++ ffmpeg-free-0.cvs20070307/libavcodec/mjpeg.c	2007-07-30 15:52:26 +0200
-@@ -1216,6 +1216,7 @@
+Index: trunk/libavcodec/mjpegdec.c
+===================================================================
+--- trunk.orig/libavcodec/mjpegdec.c	2007-12-09 20:38:06.000000000 +0100
++++ trunk/libavcodec/mjpegdec.c	2007-12-09 20:38:40.000000000 +0100
+@@ -291,6 +291,7 @@
      switch(pix_fmt_id){
      case 0x222222:
      case 0x111111:

Modified: experimental/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/series?rev=929&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/series (original)
+++ experimental/ffmpeg/debian/patches/series Sun Dec  9 19:53:58 2007
@@ -14,7 +14,5 @@
 020_fix_libswscale_pic_code
 040_only_use_maltivec_when_needed.diff
 051_mjpeg_gray_support.diff
-053_rm_demux_crash.diff
 054_h264_mmx_chroma_mc_crash.diff
-060_fix_avi_skip.diff
 300_c++_compliant_headers.diff

More information about the pkg-multimedia-commits mailing list