r170 - in experimental/ffmpeg/debian: . patches

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

Author: sho
Date: 2007-03-09 10:01:50 +0000 (Fri, 09 Mar 2007)
New Revision: 170

Modified:
   experimental/ffmpeg/debian/changelog
   experimental/ffmpeg/debian/control
   experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
Log:
  * Merged 0.cvs20060823-7 unstable upload.


Modified: experimental/ffmpeg/debian/changelog
===================================================================
--- experimental/ffmpeg/debian/changelog	2007-03-08 17:18:49 UTC (rev 169)
+++ experimental/ffmpeg/debian/changelog	2007-03-09 10:01:50 UTC (rev 170)
@@ -44,6 +44,17 @@
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed,  7 Mar 2007 21:59:19 +0100
 
+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: experimental/ffmpeg/debian/control
===================================================================
--- experimental/ffmpeg/debian/control	2007-03-08 17:18:49 UTC (rev 169)
+++ experimental/ffmpeg/debian/control	2007-03-09 10:01:50 UTC (rev 170)
@@ -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/experimental/ffmpeg
+XS-Vcs-Browser: http://trac.videolan.org/pkg-multimedia/browser/experimental/ffmpeg
 
 Package: ffmpeg
 Section: graphics

Modified: experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
===================================================================
--- experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-08 17:18:49 UTC (rev 169)
+++ experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-09 10:01:50 UTC (rev 170)
@@ -1,7 +1,7 @@
 Index: ffmpeg-0.cvs20070307/configure
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/configure	2007-03-07 15:06:21.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure	2007-03-07 15:09:22.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 10:56:54.000000000 +0100
++++ ffmpeg-0.cvs20070307/configure	2007-03-09 10:56:54.000000000 +0100
 @@ -1410,11 +1410,13 @@
          if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
              add_cflags "-faltivec"
@@ -35,8 +35,8 @@
  echo "LDCONFIG=$LDCONFIG" >> config.mak
 Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile	2007-03-07 15:06:22.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/Makefile	2007-03-07 15:06:38.000000000 +0100
+--- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile	2007-03-09 10:56:54.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/Makefile	2007-03-09 10:58:57.000000000 +0100
 @@ -311,7 +311,8 @@
  OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
  
@@ -47,10 +47,27 @@
  endif
  
  # i386 mmx specific stuff
+@@ -386,12 +387,16 @@
+                                           ppc/gmc_altivec.o          \
+                                           ppc/fdct_altivec.o         \
+                                           ppc/float_altivec.o        \
++OBJS-$(TARGET_ALTIVEC): CFLAGS+= $(ALTIVECFLAGS)
+ 
+ ifeq ($(TARGET_ALTIVEC),yes)
+ OBJS-$(CONFIG_H264_DECODER)            += ppc/h264_altivec.o
+ OBJS-$(CONFIG_SNOW_DECODER)            += ppc/snow_altivec.o
+ OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
+ OBJS-$(CONFIG_WMV3_DECODER)            += ppc/vc1dsp_altivec.o
++ppc/h264_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
++ppc/snow_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
++ppc/vc1dsp_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
+ endif
+ 
+ OBJS-$(TARGET_ARCH_BFIN)               += bfin/dsputil_bfin.o \
 Index: ffmpeg-0.cvs20070307/libavcodec/dsputil.h
 ===================================================================
 --- ffmpeg-0.cvs20070307.orig/libavcodec/dsputil.h	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/dsputil.h	2007-03-07 15:06:38.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/dsputil.h	2007-03-09 10:56:54.000000000 +0100
 @@ -556,12 +556,6 @@
  
  extern int mm_flags;
@@ -67,7 +84,7 @@
 Index: ffmpeg-0.cvs20070307/libavcodec/imgresample.c
 ===================================================================
 --- ffmpeg-0.cvs20070307.orig/libavcodec/imgresample.c	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/imgresample.c	2007-03-07 15:06:38.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/imgresample.c	2007-03-09 10:56:54.000000000 +0100
 @@ -284,133 +284,6 @@
  }
  #endif
@@ -205,7 +222,7 @@
 Index: ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c	2007-03-07 15:06:38.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c	2007-03-09 10:56:54.000000000 +0100
 @@ -0,0 +1,164 @@
 +/*
 + * High quality image resampling with polyphase filters
@@ -374,7 +391,7 @@
 Index: ffmpeg-0.cvs20070307/libpostproc/Makefile
 ===================================================================
 --- ffmpeg-0.cvs20070307.orig/libpostproc/Makefile	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/Makefile	2007-03-07 15:10:20.000000000 +0100
++++ ffmpeg-0.cvs20070307/libpostproc/Makefile	2007-03-09 10:56:54.000000000 +0100
 @@ -10,8 +10,10 @@
  LIBVERSION=$(SPPVERSION)
  LIBMAJOR=$(SPPMAJOR)
@@ -398,7 +415,7 @@
 Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.c
 ===================================================================
 --- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.c	2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess.c	2007-03-07 15:10:42.000000000 +0100
++++ ffmpeg-0.cvs20070307/libpostproc/postprocess.c	2007-03-09 10:56:54.000000000 +0100
 @@ -95,10 +95,6 @@
  
  #include "mangle.h" //FIXME should be supressed
@@ -410,7 +427,7 @@
  #define GET_MODE_BUFFER_SIZE 500
  #define OPTIONS_ARRAY_SIZE 10
  #define BLOCK_SIZE 8
-@@ -614,8 +610,8 @@
+@@ -614,8 +610,9 @@
  #undef RENAME
  #define HAVE_ALTIVEC
  #define RENAME(a) a ## _altivec
@@ -418,13 +435,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.cvs20070307/libpostproc/postprocess_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c	2007-03-07 15:06:38.000000000 +0100
++++ ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c	2007-03-09 10:56:54.000000000 +0100
 @@ -0,0 +1,614 @@
 +/*
 +    Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1040,3 +1058,31 @@
 +#endif
 +#endif //ARCH_POWERPC
 +
+Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess_template.c	2007-03-09 10:56:54.000000000 +0100
++++ ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c	2007-03-09 10:56:54.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