r780 - in /siretart/ffmpeg/debian: changelog control libavutil-dev.install patches/010_ffmpeg-config.diff patches/010_shared_library_versioning.diff patches/020_mmx_pic_code.diff patches/040_only_use_maltivec_when_needed.diff patches/series rules
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon May 28 21:52:48 UTC 2007
Author: siretart
Date: Mon May 28 21:52:48 2007
New Revision: 780
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=780
Log:
updated ffmpeg to svn.20070525
Modified:
siretart/ffmpeg/debian/changelog
siretart/ffmpeg/debian/control
siretart/ffmpeg/debian/libavutil-dev.install
siretart/ffmpeg/debian/patches/010_ffmpeg-config.diff
siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
siretart/ffmpeg/debian/patches/020_mmx_pic_code.diff
siretart/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
siretart/ffmpeg/debian/patches/series
siretart/ffmpeg/debian/rules
Modified: siretart/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/changelog?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/changelog (original)
+++ siretart/ffmpeg/debian/changelog Mon May 28 21:52:48 2007
@@ -1,3 +1,14 @@
+ffmpeg (0.svn20070525-1) unstable; urgency=low
+
+ * new upstream version
+ * removed patch 053_rm_demux_crash.diff, merged upstream
+ * ffmpeg has now native (built in) dts support. dropping dependencies on
+ external libdts
+ * no longer necessary to "make" explicitly in doc/ directory. It has
+ been merged with top-level makefile for now.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 28 May 2007 23:24:01 +0200
+
ffmpeg (0.svn20070307-5) unstable; urgency=low
* disable encoders. Document how to get a tarball without encoders in
Modified: siretart/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/control?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/control (original)
+++ siretart/ffmpeg/debian/control Mon May 28 21:52:48 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Loic Minier <lool at dooz.org>, Reinhard Tartler <siretart at tauware.de>
-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
+Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-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.debian.org/pkg-multimedia/experimental/ffmpeg
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/
@@ -87,7 +87,7 @@
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libavcodec1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Depends: libavcodec1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), libvorbis-dev, libogg-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4)
Replaces: libavformat-dev (<< 0.cvs20060329-4)
Description: development files for libavcodec
Modified: siretart/ffmpeg/debian/libavutil-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/libavutil-dev.install?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/libavutil-dev.install (original)
+++ siretart/ffmpeg/debian/libavutil-dev.install Mon May 28 21:52:48 2007
@@ -3,6 +3,7 @@
usr/lib/pkgconfig/libavutil.pc
usr/include/ffmpeg/avutil.h
usr/include/ffmpeg/adler32.h
+usr/include/ffmpeg/base64.h
usr/include/ffmpeg/common.h
usr/include/ffmpeg/fifo.h
usr/include/ffmpeg/integer.h
@@ -10,6 +11,7 @@
usr/include/ffmpeg/log.h
usr/include/ffmpeg/lzo.h
usr/include/ffmpeg/mathematics.h
+usr/include/ffmpeg/mem.h
usr/include/ffmpeg/md5.h
usr/include/ffmpeg/opt.h
usr/include/ffmpeg/random.h
Modified: siretart/ffmpeg/debian/patches/010_ffmpeg-config.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/010_ffmpeg-config.diff?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/010_ffmpeg-config.diff (original)
+++ siretart/ffmpeg/debian/patches/010_ffmpeg-config.diff Mon May 28 21:52:48 2007
@@ -76,7 +76,7 @@
+fi
+
+cflags="-I$include_dir"
-+link_libs="$link_libs -lvorbis -lvorbisenc -ltheora -logg -ldts -la52 @FIREWIRELIBS@ -lgsm -lz -lm"
++link_libs="$link_libs -lvorbis -lvorbisenc -ltheora -logg -la52 @FIREWIRELIBS@ -lgsm -lz -lm"
+
+if test "$lib_dir" != "/usr/lib"; then
+ libs="-L$lib_dir"
Modified: siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff (original)
+++ siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff Mon May 28 21:52:48 2007
@@ -1,8 +1,8 @@
Index: ffmpeg.unstable/configure
===================================================================
---- ffmpeg.unstable.orig/configure 2007-05-28 22:16:52.000000000 +0200
-+++ ffmpeg.unstable/configure 2007-05-28 22:16:56.000000000 +0200
-@@ -1965,11 +1965,11 @@
+--- ffmpeg.unstable.orig/configure 2007-05-28 22:46:23.000000000 +0200
++++ ffmpeg.unstable/configure 2007-05-28 22:46:27.000000000 +0200
+@@ -1995,11 +1995,11 @@
echo "BUILD_DOC=yes" >> config.mak
fi
@@ -19,7 +19,7 @@
-@@ -2098,9 +2098,9 @@
+@@ -2115,9 +2115,9 @@
pkgconfig_generate(){
name=$1
comment=$2
@@ -31,7 +31,7 @@
include=$6
cat <<EOF >$name.pc
prefix=$PREFIX
-@@ -2122,9 +2122,9 @@
+@@ -2139,9 +2139,9 @@
name=$1
shortname=${name#lib}
comment=$2
@@ -45,9 +45,9 @@
exec_prefix=
Index: ffmpeg.unstable/libavutil/avutil.h
===================================================================
---- ffmpeg.unstable.orig/libavutil/avutil.h 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/libavutil/avutil.h 2007-05-28 22:18:14.000000000 +0200
-@@ -35,7 +35,7 @@
+--- ffmpeg.unstable.orig/libavutil/avutil.h 2007-05-28 22:39:49.000000000 +0200
++++ ffmpeg.unstable/libavutil/avutil.h 2007-05-28 22:46:27.000000000 +0200
+@@ -31,7 +31,7 @@
#define AV_TOSTRING(s) #s
#define LIBAVUTIL_VERSION_INT ((49<<16)+(4<<8)+0)
@@ -58,35 +58,35 @@
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
Index: ffmpeg.unstable/libavcodec/avcodec.h
===================================================================
---- ffmpeg.unstable.orig/libavcodec/avcodec.h 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/libavcodec/avcodec.h 2007-05-28 22:18:49.000000000 +0200
-@@ -38,7 +38,7 @@
+--- ffmpeg.unstable.orig/libavcodec/avcodec.h 2007-05-28 22:39:52.000000000 +0200
++++ ffmpeg.unstable/libavcodec/avcodec.h 2007-05-28 22:49:21.000000000 +0200
+@@ -34,7 +34,7 @@
#define AV_TOSTRING(s) #s
- #define LIBAVCODEC_VERSION_INT ((51<<16)+(40<<8)+2)
--#define LIBAVCODEC_VERSION 51.40.2
-+#define LIBAVCODEC_VERSION 1d.51.40.2
+ #define LIBAVCODEC_VERSION_INT ((51<<16)+(40<<8)+4)
+-#define LIBAVCODEC_VERSION 51.40.4
++#define LIBAVCODEC_VERSION 1d.51.40.4
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
Index: ffmpeg.unstable/libavformat/avformat.h
===================================================================
---- ffmpeg.unstable.orig/libavformat/avformat.h 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/libavformat/avformat.h 2007-05-28 22:18:46.000000000 +0200
-@@ -26,7 +26,7 @@
- #endif
+--- ffmpeg.unstable.orig/libavformat/avformat.h 2007-05-28 22:39:53.000000000 +0200
++++ ffmpeg.unstable/libavformat/avformat.h 2007-05-28 22:49:22.000000000 +0200
+@@ -22,7 +22,7 @@
+ #define AVFORMAT_H
- #define LIBAVFORMAT_VERSION_INT ((51<<16)+(11<<8)+0)
--#define LIBAVFORMAT_VERSION 51.11.0
-+#define LIBAVFORMAT_VERSION 1d.51.11.0
+ #define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)
+-#define LIBAVFORMAT_VERSION 51.12.1
++#define LIBAVFORMAT_VERSION 1d.51.12.1
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
Index: ffmpeg.unstable/common.mak
===================================================================
---- ffmpeg.unstable.orig/common.mak 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/common.mak 2007-05-28 22:16:56.000000000 +0200
-@@ -68,7 +68,7 @@
+--- ffmpeg.unstable.orig/common.mak 2007-05-28 22:39:53.000000000 +0200
++++ ffmpeg.unstable/common.mak 2007-05-28 22:46:27.000000000 +0200
+@@ -69,7 +69,7 @@
cd "$(shlibdir)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(shlibdir)" && \
@@ -97,10 +97,10 @@
install-lib-static: $(LIB)
Index: ffmpeg.unstable/libpostproc/postprocess.h
===================================================================
---- ffmpeg.unstable.orig/libpostproc/postprocess.h 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/libpostproc/postprocess.h 2007-05-28 22:16:56.000000000 +0200
-@@ -32,7 +32,7 @@
- #endif
+--- ffmpeg.unstable.orig/libpostproc/postprocess.h 2007-05-28 22:39:52.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess.h 2007-05-28 22:46:27.000000000 +0200
+@@ -28,7 +28,7 @@
+ */
#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
-#define LIBPOSTPROC_VERSION 51.1.0
@@ -110,9 +110,9 @@
#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
Index: ffmpeg.unstable/libswscale/swscale.h
===================================================================
---- ffmpeg.unstable.orig/libswscale/swscale.h 2007-05-27 19:40:43.000000000 +0200
-+++ ffmpeg.unstable/libswscale/swscale.h 2007-05-28 22:16:56.000000000 +0200
-@@ -37,7 +37,7 @@
+--- ffmpeg.unstable.orig/libswscale/swscale.h 2007-05-28 22:39:54.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale.h 2007-05-28 22:46:27.000000000 +0200
+@@ -33,7 +33,7 @@
#define AV_TOSTRING(s) #s
#define LIBSWSCALE_VERSION_INT ((0<<16)+(5<<8)+0)
Modified: siretart/ffmpeg/debian/patches/020_mmx_pic_code.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/020_mmx_pic_code.diff?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/020_mmx_pic_code.diff (original)
+++ siretart/ffmpeg/debian/patches/020_mmx_pic_code.diff Mon May 28 21:52:48 2007
@@ -1,22 +1,22 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/mpegvideo_mmx_template.c
+Index: ffmpeg.unstable/libavcodec/i386/mpegvideo_mmx_template.c
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/i386/mpegvideo_mmx_template.c 2006-07-24 17:11:17.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/i386/mpegvideo_mmx_template.c 2006-07-24 17:22:08.000000000 +0200
-@@ -108,7 +108,12 @@
- SPREADW(%%mm3)
- "pxor %%mm7, %%mm7 \n\t" // 0
- "pxor %%mm4, %%mm4 \n\t" // 0
+--- ffmpeg.unstable.orig/libavcodec/i386/mpegvideo_mmx_template.c 2007-05-28 22:39:50.000000000 +0200
++++ ffmpeg.unstable/libavcodec/i386/mpegvideo_mmx_template.c 2007-05-28 23:09:10.000000000 +0200
+@@ -154,7 +154,12 @@
+ SPREADW(MM"3")
+ "pxor "MM"7, "MM"7 \n\t" // 0
+ "pxor "MM"4, "MM"4 \n\t" // 0
+#if defined(PIC) && !defined(ARCH_X86_64)
+ "movl %2, %%"REG_a" \n\t"
-+ "movq (%%"REG_a"), %%mm5 \n\t" // qmat[0]
++ "movq (%%"REG_a"), "MM"5 \n\t" // qmat[0]
+#else
- "movq (%2), %%mm5 \n\t" // qmat[0]
+ MOVQ" (%2), "MM"5 \n\t" // qmat[0]
+#endif
- "pxor %%mm6, %%mm6 \n\t"
- "psubw (%3), %%mm6 \n\t" // -bias[0]
+ "pxor "MM"6, "MM"6 \n\t"
+ "psubw (%3), "MM"6 \n\t" // -bias[0]
"mov $-128, %%"REG_a" \n\t"
-@@ -136,7 +141,11 @@
- "movd %%mm3, %%"REG_a" \n\t"
+@@ -178,10 +183,15 @@
+ "movd "MM"3, %%"REG_a" \n\t"
"movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1
: "+a" (last_non_zero_p1)
+#if defined(PIC) && !defined(ARCH_X86_64)
@@ -26,31 +26,27 @@
+#endif
"r" (inv_zigzag_direct16+64), "r" (temp_block+64)
);
- // note the asm is split cuz gcc doesnt like that many operands ...
-@@ -150,6 +159,7 @@
- : "g" (s->max_qcoeff)
- );
}else{ // FMT_H263
+ const uint16_t *qmat_64 = qmat + 64;
asm volatile(
- "movd %%"REG_a", %%mm3 \n\t" // last_non_zero_p1
- SPREADW(%%mm3)
-@@ -165,7 +175,13 @@
- "psubw %%mm1, %%mm0 \n\t" // ABS(block[i])
- "movq (%3, %%"REG_a"), %%mm6 \n\t" // bias[0]
- "paddusw %%mm6, %%mm0 \n\t" // ABS(block[i]) + bias[0]
+ "movd %%"REG_a", "MM"3 \n\t" // last_non_zero_p1
+ SPREADW(MM"3")
+@@ -194,7 +204,13 @@
+ SAVE_SIGN(MM"1", MM"0") // ABS(block[i])
+ MOVQ" (%3, %%"REG_a"), "MM"6 \n\t" // bias[0]
+ "paddusw "MM"6, "MM"0 \n\t" // ABS(block[i]) + bias[0]
+#if defined(PIC) && !defined(ARCH_X86_64)
+ "addl %2, %%"REG_a" \n\t"
-+ "movq (%%"REG_a"), %%mm5 \n\t" // qmat[i]
++ "movq (%%"REG_a"), "MM"5 \n\t" // qmat[i]
+ "subl %2, %%"REG_a" \n\t"
+#else
- "movq (%2, %%"REG_a"), %%mm5 \n\t" // qmat[i]
+ MOVQ" (%2, %%"REG_a"), "MM"5 \n\t" // qmat[i]
+#endif
- "pmulhw %%mm5, %%mm0 \n\t" // (ABS(block[i])*qmat[0] + bias[0]*qmat[0])>>16
- "por %%mm0, %%mm4 \n\t"
- "pxor %%mm1, %%mm0 \n\t"
-@@ -182,7 +198,11 @@
- "movd %%mm3, %%"REG_a" \n\t"
+ "pmulhw "MM"5, "MM"0 \n\t" // (ABS(block[i])*qmat[0] + bias[0]*qmat[0])>>16
+ "por "MM"0, "MM"4 \n\t"
+ RESTORE_SIGN(MM"1", MM"0") // out=((ABS(block[i])*qmat[0] - bias[0]*qmat[0])>>16)*sign(block[i])
+@@ -210,7 +226,11 @@
+ "movd "MM"3, %%"REG_a" \n\t"
"movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1
: "+a" (last_non_zero_p1)
+#if defined(PIC) && !defined(ARCH_X86_64)
@@ -60,12 +56,12 @@
+#endif
"r" (inv_zigzag_direct16+64), "r" (temp_block+64)
);
- // note the asm is split cuz gcc doesnt like that many operands ...
-Index: ffmpeg-0.cvs20060724/libpostproc/postprocess_template.c
+ }
+Index: ffmpeg.unstable/libpostproc/postprocess_template.c
===================================================================
---- ffmpeg-0.cvs20060724.orig/libpostproc/postprocess_template.c 2006-06-11 14:17:36.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libpostproc/postprocess_template.c 2006-07-24 17:22:08.000000000 +0200
-@@ -33,9 +33,11 @@
+--- ffmpeg.unstable.orig/libpostproc/postprocess_template.c 2007-05-28 22:39:52.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess_template.c 2007-05-28 22:51:31.000000000 +0200
+@@ -35,9 +35,11 @@
# define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
#else
# define REGa eax
Modified: siretart/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff (original)
+++ siretart/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff Mon May 28 21:52:48 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: ffmpeg.unstable/configure
===================================================================
---- ffmpeg-0.cvs20070307.orig/configure 2007-03-28 16:07:04.000000000 +0200
-+++ ffmpeg-0.cvs20070307/configure 2007-03-28 16:17:39.000000000 +0200
-@@ -1410,11 +1410,13 @@
+--- ffmpeg.unstable.orig/configure 2007-05-28 22:51:16.000000000 +0200
++++ ffmpeg.unstable/configure 2007-05-28 23:09:44.000000000 +0200
+@@ -1482,11 +1482,13 @@
if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
add_cflags "-faltivec"
else
@@ -17,7 +17,7 @@
check_header altivec.h
# check if our compiler supports Motorola AltiVec C API
-@@ -1461,6 +1463,7 @@
+@@ -1533,6 +1535,7 @@
}
EOF
fi
@@ -25,7 +25,7 @@
# mmi only available on mips
if test $mmi = "default"; then
-@@ -1862,6 +1865,7 @@
+@@ -1933,6 +1936,7 @@
fi
echo "OPTFLAGS=$CFLAGS" >> config.mak
@@ -33,11 +33,11 @@
echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak
-Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
+Index: ffmpeg.unstable/libavcodec/Makefile
===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile 2007-03-28 16:17:35.000000000 +0200
-+++ ffmpeg-0.cvs20070307/libavcodec/Makefile 2007-03-28 16:17:59.000000000 +0200
-@@ -310,7 +310,8 @@
+--- ffmpeg.unstable.orig/libavcodec/Makefile 2007-05-28 22:51:16.000000000 +0200
++++ ffmpeg.unstable/libavcodec/Makefile 2007-05-28 23:09:44.000000000 +0200
+@@ -320,7 +320,8 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -45,11 +45,11 @@
+OBJS += imgresample.o imgresample_altivec.o
+imgresample_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
- # i386 mmx specific stuff
+ # processor-specific code
ifeq ($(TARGET_MMX),yes)
-@@ -385,11 +386,22 @@
- ppc/fdct_altivec.o \
+@@ -393,11 +394,22 @@
ppc/float_altivec.o \
+ ppc/int_altivec.o \
+ppc/dsputil_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
+ppc/mpegvideo_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
@@ -70,11 +70,11 @@
endif
OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
-Index: ffmpeg-0.cvs20070307/libavcodec/dsputil.h
+Index: ffmpeg.unstable/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-28 16:17:39.000000000 +0200
-@@ -556,12 +556,6 @@
+--- ffmpeg.unstable.orig/libavcodec/dsputil.h 2007-05-28 22:39:52.000000000 +0200
++++ ffmpeg.unstable/libavcodec/dsputil.h 2007-05-28 23:15:11.000000000 +0200
+@@ -551,12 +551,6 @@
extern int mm_flags;
@@ -84,16 +84,16 @@
-#undef pixel
-#endif
-
- #define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16)))
+ #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v)
#define STRIDE_ALIGN 16
-Index: ffmpeg-0.cvs20070307/libavcodec/imgresample.c
+Index: ffmpeg.unstable/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-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libavcodec/imgresample.c 2007-05-28 22:42:44.000000000 +0200
++++ ffmpeg.unstable/libavcodec/imgresample.c 2007-05-28 23:14:39.000000000 +0200
@@ -284,133 +284,6 @@
}
- #endif
+ #endif /* HAVE_MMX */
-#ifdef HAVE_ALTIVEC
-typedef union {
@@ -220,15 +220,15 @@
- dst_width--;
- }
-}
--#endif
+-#endif /* HAVE_ALTIVEC */
-
/* slow version to handle limit cases. Does not need optimisation */
static void h_resample_slow(uint8_t *dst, int dst_width,
const uint8_t *src, int src_width,
-Index: ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c
+Index: ffmpeg.unstable/libavcodec/imgresample_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c 2007-03-28 16:17:39.000000000 +0200
++++ ffmpeg.unstable/libavcodec/imgresample_altivec.c 2007-05-28 23:09:44.000000000 +0200
@@ -0,0 +1,164 @@
+/*
+ * High quality image resampling with polyphase filters
@@ -394,10 +394,10 @@
+}
+#endif
+
-Index: ffmpeg-0.cvs20070307/libpostproc/Makefile
+Index: ffmpeg.unstable/libpostproc/Makefile
===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/Makefile 2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/Makefile 2007-03-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libpostproc/Makefile 2007-05-28 22:39:52.000000000 +0200
++++ ffmpeg.unstable/libpostproc/Makefile 2007-05-28 23:09:44.000000000 +0200
@@ -10,8 +10,10 @@
LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR)
@@ -418,10 +418,10 @@
+postprocess_altivec_pic.o: postprocess_altivec.c
+ $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.c
+Index: ffmpeg.unstable/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-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libpostproc/postprocess.c 2007-05-28 22:42:44.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess.c 2007-05-28 23:09:44.000000000 +0200
@@ -95,10 +95,6 @@
#include "mangle.h" //FIXME should be supressed
@@ -445,10 +445,10 @@
#endif
#endif //ARCH_POWERPC
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c
+Index: ffmpeg.unstable/libpostproc/postprocess_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c 2007-03-28 16:17:39.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess_altivec.c 2007-05-28 23:09:44.000000000 +0200
@@ -0,0 +1,614 @@
+/*
+ Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1064,10 +1064,10 @@
+#endif
+#endif //ARCH_POWERPC
+
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c
+Index: ffmpeg.unstable/libpostproc/postprocess_template.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess_template.c 2007-03-28 16:17:35.000000000 +0200
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c 2007-03-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libpostproc/postprocess_template.c 2007-05-28 22:51:31.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess_template.c 2007-05-28 23:09:44.000000000 +0200
@@ -3181,7 +3181,10 @@
}
#endif //HAVE_MMX
@@ -1091,12 +1091,12 @@
+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
-Index: ffmpeg-0.cvs20070307/libswscale/swscale.c
+ DECLARE_ALIGNED(8, PPContext, c)= *c2; //copy to stack for faster access
+Index: ffmpeg.unstable/libswscale/swscale.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale.c 2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale.c 2007-03-28 16:17:39.000000000 +0200
-@@ -849,7 +849,10 @@
+--- ffmpeg.unstable.orig/libswscale/swscale.c 2007-05-28 23:09:28.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale.c 2007-05-28 23:11:01.000000000 +0200
+@@ -915,7 +915,10 @@
#undef RENAME
#define HAVE_ALTIVEC
#define RENAME(a) a ## _altivec
@@ -1108,21 +1108,30 @@
#endif
#endif //ARCH_POWERPC
-@@ -2241,8 +2244,8 @@
- srcFilter->chrV, dstFilter->chrV, c->param);
+@@ -2323,14 +2326,14 @@
+ initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc,
+ c->chrSrcH, c->chrDstH, filterAlign, (1<<12)-4,
+ (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
+- srcFilter->chrV, dstFilter->chrV, c->param);
++ srcFilter->chrV, dstFilter->chrV, c->param);
#ifdef HAVE_ALTIVEC
-- c->vYCoeffsBank = av_malloc(sizeof (vector signed short)*c->vLumFilterSize*c->dstH);
-- c->vCCoeffsBank = av_malloc(sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH);
+- c->vYCoeffsBank = av_malloc(sizeof (vector signed short)*c->vLumFilterSize*c->dstH);
+- c->vCCoeffsBank = av_malloc(sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH);
+ c->vYCoeffsBank = av_malloc(16*c->vLumFilterSize*c->dstH);
+ c->vCCoeffsBank = av_malloc(16*c->vChrFilterSize*c->chrDstH);
- for (i=0;i<c->vLumFilterSize*c->dstH;i++) {
- int j;
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_altivec.c
+- for (i=0;i<c->vLumFilterSize*c->dstH;i++) {
+- int j;
++ for (i=0;i<c->vLumFilterSize*c->dstH;i++) {
++ int j;
+ short *p = (short *)&c->vYCoeffsBank[i];
+ for (j=0;j<8;j++)
+ p[j] = c->vLumFilter[i];
+Index: ffmpeg.unstable/libswscale/swscale_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_altivec.c 2007-03-28 16:17:39.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale_altivec.c 2007-05-28 23:09:44.000000000 +0200
@@ -0,0 +1,729 @@
+/*
+ * Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>
@@ -1853,32 +1862,33 @@
+#define RENAME(a) a ## _altivec
+#include "swscale_template.c"
+
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_altivec_template.c
+Index: ffmpeg.unstable/libswscale/swscale_altivec_template.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_altivec_template.c 2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_altivec_template.c 2007-03-28 16:17:39.000000000 +0200
-@@ -390,7 +390,7 @@
- }
+--- ffmpeg.unstable.orig/libswscale/swscale_altivec_template.c 2007-05-28 22:39:54.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale_altivec_template.c 2007-05-28 23:14:43.000000000 +0200
+@@ -387,13 +387,13 @@
+ }
+
+ }
+- }
++ }
}
-static inline int yv12toyuy2_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+- int srcSliceH, uint8_t* dstParam[], int dstStride_a[]) {
+- uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
+- // yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
+int yv12toyuy2_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
- int srcSliceH, uint8_t* dstParam[], int dstStride_a[]) {
- uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
- // yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
-@@ -469,7 +469,7 @@
- return srcSliceH;
- }
-
--static inline int yv12touyvy_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-+int yv12touyvy_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
- int srcSliceH, uint8_t* dstParam[], int dstStride_a[]) {
- uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
- // yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_internal.h
++ int srcSliceH, uint8_t* dstParam[], int dstStride_a[]) {
++ uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
++ // yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
+ uint8_t *ysrc = src[0];
+ uint8_t *usrc = src[1];
+ uint8_t *vsrc = src[2];
+Index: ffmpeg.unstable/libswscale/swscale_internal.h
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_internal.h 2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_internal.h 2007-03-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libswscale/swscale_internal.h 2007-05-28 22:39:54.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale_internal.h 2007-05-28 23:10:50.000000000 +0200
@@ -21,9 +21,11 @@
#ifndef SWSCALE_INTERNAL_H
#define SWSCALE_INTERNAL_H
@@ -1891,8 +1901,12 @@
#include "avutil.h"
-@@ -150,15 +152,20 @@
- uint64_t v_temp __attribute__((aligned(8)));
+@@ -147,22 +149,26 @@
+ uint64_t esp __attribute__((aligned(8)));
+ uint64_t vRounder __attribute__((aligned(8)));
+ uint64_t u_temp __attribute__((aligned(8)));
+- uint64_t v_temp __attribute__((aligned(8)));
++ uint64_t v_temp __attribute__((aligned(8)));
#ifdef HAVE_ALTIVEC
+#ifdef ABI_ALTIVEC
@@ -1908,7 +1922,7 @@
- vector signed short CGV;
- vector signed short OY;
- vector unsigned short CSHIFT;
-- vector signed short *vYCoeffsBank, *vCCoeffsBank;
+- vector signed short *vYCoeffsBank, *vCCoeffsBank;
+ VEC(signed short) CY;
+ VEC(signed short) CRV;
+ VEC(signed short) CBU;
@@ -1920,10 +1934,14 @@
#endif
-Index: ffmpeg-0.cvs20070307/libswscale/Makefile
+-
+ #ifdef ARCH_BFIN
+ uint32_t oy __attribute__((aligned(4)));
+ uint32_t oc __attribute__((aligned(4)));
+Index: ffmpeg.unstable/libswscale/Makefile
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/Makefile 2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/Makefile 2007-03-28 16:17:39.000000000 +0200
+--- ffmpeg.unstable.orig/libswscale/Makefile 2007-05-28 22:39:54.000000000 +0200
++++ ffmpeg.unstable/libswscale/Makefile 2007-05-28 23:09:44.000000000 +0200
@@ -9,8 +9,10 @@
OBJS= swscale.o rgb2rgb.o
@@ -1934,21 +1952,30 @@
+swscale_altivec.o: CFLAGS+= $(ALTIVECFLAGS) -DABI_ALTIVEC
+yuv2rgb_altivec.o: CFLAGS+= $(ALTIVECFLAGS) -DABI_ALTIVEC
- HEADERS = swscale.h rgb2rgb.h
-
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_template.c
+ OBJS-$(TARGET_ARCH_BFIN) += yuv2rgb_bfin.o
+ ASM_OBJS-$(TARGET_ARCH_BFIN) += internal_bfin.o
+Index: ffmpeg.unstable/libswscale/swscale_template.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_template.c 2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_template.c 2007-03-28 16:17:39.000000000 +0200
-@@ -2936,7 +2936,10 @@
- }
+--- ffmpeg.unstable.orig/libswscale/swscale_template.c 2007-05-28 22:39:54.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale_template.c 2007-05-28 23:10:47.000000000 +0200
+@@ -2918,13 +2918,16 @@
+ xpos+=xInc;
+ }
+ #endif
+- }
++ }
}
-static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+- int srcSliceH, uint8_t* dst[], int dstStride[]){
+#ifndef HAVE_ALTIVEC
+static
+#endif
+int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
- int srcSliceH, uint8_t* dst[], int dstStride[]){
-
- /* load a few things into local vars to make the code more readable? and faster */
++ int srcSliceH, uint8_t* dst[], int dstStride[]){
+
+- /* load a few things into local vars to make the code more readable? and faster */
++ /* load a few things into local vars to make the code more readable? and faster */
+ const int srcW= c->srcW;
+ const int dstW= c->dstW;
+ const int dstH= c->dstH;
Modified: siretart/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/series?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/series (original)
+++ siretart/ffmpeg/debian/patches/series Mon May 28 21:52:48 2007
@@ -15,7 +15,6 @@
020_fix_libswscale_pic_code
040_early_altivec_detection.diff
040_only_use_maltivec_when_needed.diff
-053_rm_demux_crash.diff
054_h264_mmx_chroma_mc_crash.diff
060_fix_avi_skip.diff
300_c++_compliant_headers.diff
Modified: siretart/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/rules?rev=780&op=diff
==============================================================================
--- siretart/ffmpeg/debian/rules (original)
+++ siretart/ffmpeg/debian/rules Mon May 28 21:52:48 2007
@@ -6,7 +6,7 @@
LIBS = libavutil libavcodec libpostproc libavformat libswscale
confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads --disable-encoders
-confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-liba52 --enable-libdts --enable-libgsm
+confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-liba52 --enable-libgsm
DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
@@ -51,16 +51,12 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
# Build and backup static libraries
- $(DEB_EXTRA_CONFIG_FLAGS) \
./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
- $(MAKE) -C doc
$(MAKE)
for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
# Build ffmpeg and shared libraries
- $(DEB_EXTRA_CONFIG_FLAGS) \
./configure $(confflags) --enable-shared --prefix=/usr
- sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
for d in $(LIBS); do \
$(MAKE) -C $$d clean && \
@@ -88,7 +84,6 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) -C doc clean
-$(MAKE) -C tests clean
-$(MAKE) distclean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
More information about the pkg-multimedia-commits
mailing list