r169 - in unstable/ffmpeg/debian: . patches

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

Author: sho
Date: 2007-03-08 17:18:49 +0000 (Thu, 08 Mar 2007)
New Revision: 169

Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/control
   unstable/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
Log:
ffmpeg (0.cvs20060823-7) unstable; urgency=high

  * debian/patches/040_only_use_maltivec_when_needed.diff:
    + Fix a static function prototype that prevented programs using libpostproc
      from working on PowerPC (Closes: #412214).

  * debian/control:
    + Added Xs-Vcs-Browser and XS-Vcs-Svn fields.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu,  8 Mar 2007 17:51:37 +0100


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-03-07 23:47:21 UTC (rev 168)
+++ unstable/ffmpeg/debian/changelog	2007-03-08 17:18:49 UTC (rev 169)
@@ -1,3 +1,14 @@
+ffmpeg (0.cvs20060823-7) unstable; urgency=high
+
+  * debian/patches/040_only_use_maltivec_when_needed.diff:
+    + Fix a static function prototype that prevented programs using libpostproc
+      from working on PowerPC (Closes: #412214).
+
+  * debian/control:
+    + Added Xs-Vcs-Browser and XS-Vcs-Svn fields.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu,  8 Mar 2007 17:51:37 +0100
+
 ffmpeg (0.cvs20060823-6) unstable; urgency=high
 
   * Upload to unstable.

Modified: unstable/ffmpeg/debian/control
===================================================================
--- unstable/ffmpeg/debian/control	2007-03-07 23:47:21 UTC (rev 168)
+++ unstable/ffmpeg/debian/control	2007-03-08 17:18:49 UTC (rev 169)
@@ -5,6 +5,8 @@
 Uploaders: Loic Minier <lool at dooz.org>
 Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/ffmpeg
+XS-Vcs-Browser: http://trac.videolan.org/pkg-multimedia/browser/unstable/ffmpeg
 
 Package: ffmpeg
 Section: graphics

Modified: unstable/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
===================================================================
--- unstable/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-07 23:47:21 UTC (rev 168)
+++ unstable/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-08 17:18:49 UTC (rev 169)
@@ -1,7 +1,7 @@
 Index: ffmpeg-0.cvs20060823/configure
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/configure	2007-01-29 04:53:04.000000000 -0600
-+++ ffmpeg-0.cvs20060823/configure	2007-01-29 04:53:07.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/configure	2007-03-08 17:48:12.000000000 +0100
++++ ffmpeg-0.cvs20060823/configure	2007-03-08 17:48:12.000000000 +0100
 @@ -1136,11 +1136,13 @@
              CFLAGS="$CFLAGS -faltivec"
          else
@@ -35,8 +35,8 @@
  echo "LDCONFIG=$LDCONFIG" >> config.mak
 Index: ffmpeg-0.cvs20060823/libavcodec/Makefile
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/libavcodec/Makefile	2007-01-29 04:53:04.000000000 -0600
-+++ ffmpeg-0.cvs20060823/libavcodec/Makefile	2007-01-29 04:53:07.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/libavcodec/Makefile	2007-03-08 17:48:12.000000000 +0100
++++ ffmpeg-0.cvs20060823/libavcodec/Makefile	2007-03-08 17:48:12.000000000 +0100
 @@ -282,7 +282,8 @@
  OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
  
@@ -66,8 +66,8 @@
  OBJS += $(OBJS-yes)
 Index: ffmpeg-0.cvs20060823/libavcodec/dsputil.h
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/libavcodec/dsputil.h	2007-01-29 04:53:04.000000000 -0600
-+++ ffmpeg-0.cvs20060823/libavcodec/dsputil.h	2007-01-29 04:53:07.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/libavcodec/dsputil.h	2006-08-17 12:39:27.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/dsputil.h	2007-03-08 17:48:12.000000000 +0100
 @@ -541,12 +541,6 @@
  
  extern int mm_flags;
@@ -83,8 +83,8 @@
  
 Index: ffmpeg-0.cvs20060823/libavcodec/imgresample.c
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/libavcodec/imgresample.c	2007-01-29 04:53:04.000000000 -0600
-+++ ffmpeg-0.cvs20060823/libavcodec/imgresample.c	2007-01-29 04:53:07.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/libavcodec/imgresample.c	2006-08-23 12:00:03.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/imgresample.c	2007-03-08 17:48:12.000000000 +0100
 @@ -277,133 +277,6 @@
  }
  #endif
@@ -222,7 +222,7 @@
 Index: ffmpeg-0.cvs20060823/libavcodec/imgresample_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060823/libavcodec/imgresample_altivec.c	2007-01-29 04:53:07.000000000 -0600
++++ ffmpeg-0.cvs20060823/libavcodec/imgresample_altivec.c	2007-03-08 17:48:12.000000000 +0100
 @@ -0,0 +1,164 @@
 +/*
 + * High quality image resampling with polyphase filters
@@ -390,8 +390,8 @@
 +
 Index: ffmpeg-0.cvs20060823/libpostproc/Makefile
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/libpostproc/Makefile	2007-01-29 04:55:08.000000000 -0600
-+++ ffmpeg-0.cvs20060823/libpostproc/Makefile	2007-01-29 04:56:36.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/libpostproc/Makefile	2006-08-23 12:00:03.000000000 +0200
++++ ffmpeg-0.cvs20060823/libpostproc/Makefile	2007-03-08 17:48:12.000000000 +0100
 @@ -10,8 +10,10 @@
  LIBMAJOR=$(SPPMAJOR)
  endif
@@ -415,8 +415,8 @@
  
 Index: ffmpeg-0.cvs20060823/libpostproc/postprocess.c
 ===================================================================
---- ffmpeg-0.cvs20060823.orig/libpostproc/postprocess.c	2007-01-29 04:54:58.000000000 -0600
-+++ ffmpeg-0.cvs20060823/libpostproc/postprocess.c	2007-01-29 04:58:28.000000000 -0600
+--- ffmpeg-0.cvs20060823.orig/libpostproc/postprocess.c	2006-08-23 12:00:03.000000000 +0200
++++ ffmpeg-0.cvs20060823/libpostproc/postprocess.c	2007-03-08 17:48:53.000000000 +0100
 @@ -92,10 +92,6 @@
  
  #include "mangle.h" //FIXME should be supressed
@@ -428,7 +428,7 @@
  #ifndef HAVE_MEMALIGN
  #define memalign(a,b) malloc(b)
  #endif
-@@ -630,8 +626,8 @@
+@@ -630,8 +626,9 @@
  #undef RENAME
  #define HAVE_ALTIVEC
  #define RENAME(a) a ## _altivec
@@ -436,13 +436,14 @@
 -#include "postprocess_template.c"
 +//#include "postprocess_altivec_template.c"
 +//#include "postprocess_template.c"
++void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c);
  #endif
  #endif //ARCH_POWERPC
  
 Index: ffmpeg-0.cvs20060823/libpostproc/postprocess_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060823/libpostproc/postprocess_altivec.c	2007-01-29 04:59:29.000000000 -0600
++++ ffmpeg-0.cvs20060823/libpostproc/postprocess_altivec.c	2007-03-08 17:48:12.000000000 +0100
 @@ -0,0 +1,614 @@
 +/*
 +    Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1058,3 +1059,31 @@
 +#endif
 +#endif //ARCH_POWERPC
 +
+Index: ffmpeg-0.cvs20060823/libpostproc/postprocess_template.c
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libpostproc/postprocess_template.c	2007-03-08 17:48:19.000000000 +0100
++++ ffmpeg-0.cvs20060823/libpostproc/postprocess_template.c	2007-03-08 17:49:34.000000000 +0100
+@@ -3181,7 +3181,10 @@
+ }
+ #endif //HAVE_MMX
+ 
+-static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
++#ifndef HAVE_ALTIVEC
++static
++#endif
++void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
+         QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c);
+ 
+ /**
+@@ -3384,7 +3387,10 @@
+ /**
+  * Filters array of bytes (Y or U or V values)
+  */
+-static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
++#ifndef HAVE_ALTIVEC
++static
++#endif
++void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
+         QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c2)
+ {
+         PPContext __attribute__((aligned(8))) c= *c2; //copy to stack for faster access

More information about the Pkg-multimedia-commits mailing list