r924 - in /experimental/ffmpeg/debian: ./ patches/
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed Dec 5 16:34:18 UTC 2007
Author: siretart
Date: Wed Dec 5 16:34:18 2007
New Revision: 924
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=924
Log:
WIP!!
this is a first try to rebase the current patches to a more recent
ffmpeg codebase.
will still need work
Removed:
experimental/ffmpeg/debian/patches/005_altivec_flags.diff
Modified:
experimental/ffmpeg/debian/changelog
experimental/ffmpeg/debian/patches/005_m68k_workaround.diff
experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff
experimental/ffmpeg/debian/patches/006_mips_pthreads.diff
experimental/ffmpeg/debian/patches/010_proper_rpath.diff
experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff
experimental/ffmpeg/debian/patches/011_link_plugins.diff
experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
experimental/ffmpeg/debian/patches/015_build_imgresample.diff
experimental/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code
experimental/ffmpeg/debian/patches/020_mmx_optims.diff
experimental/ffmpeg/debian/patches/020_mmx_pic_code.diff
experimental/ffmpeg/debian/patches/040_early_altivec_detection.diff
experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
experimental/ffmpeg/debian/patches/series
experimental/ffmpeg/debian/rules
Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Wed Dec 5 16:34:18 2007
@@ -1,3 +1,23 @@
+ffmpeg-free (0.cvs20071025-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot. Refreshing patches:
+ -005_m68k_workaround.diff: refreshed
+ -005_altivec_flags.diff: dropped, merged upstream
+ -005_runtime_cpudetect.diff: refreshed
+ -006_mips_pthreads.diff: refreshed
+ -010_proper_rpath.diff: refreshed
+ -010_shared_library_versioning.diff: refreshed
+ -011_link_plugins.diff: refreshed (moved to top level makefile)
+ -015_build_imgresample.diff: refreshed
+ -020_mmx_optims.diff: refreshed
+ -020_mmx_pic_code.diff: refreshed
+ -020_disable_snow_mmx_in_pic.diff: refreshed
+ -020_fix_libswscale_pic_code.diff: refreshed
+ -040_early_altivec_detection.diff: removed, doesn't apply anymore
+ -040_only_use_maltivec_when_needed.diff: refresh
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 05 Dec 2007 17:33:34 +0100
+
ffmpeg-free (0.cvs20070307-7) UNRELEASED; urgency=low
* debian/patches/051_mjpeg_gray_support.diff:
Modified: experimental/ffmpeg/debian/patches/005_m68k_workaround.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/005_m68k_workaround.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/005_m68k_workaround.diff (original)
+++ experimental/ffmpeg/debian/patches/005_m68k_workaround.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: trunk/configure
===================================================================
---- ffmpeg.svn.orig/configure 2007-03-05 20:57:08.000000000 +0100
-+++ ffmpeg.svn/configure 2007-03-05 20:57:28.000000000 +0100
-@@ -1827,6 +1827,8 @@
+--- trunk.orig/configure 2007-10-25 14:59:05.000000000 +0200
++++ trunk/configure 2007-10-25 15:04:56.000000000 +0200
+@@ -1707,6 +1707,8 @@
if test -n "`$cc -v 2>&1 | grep xlc`"; then
add_cflags "-O5"
add_ldflags "-O5"
Modified: experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff (original)
+++ experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: trunk/configure
===================================================================
---- ffmpeg.svn.orig/configure 2007-03-05 20:45:57.000000000 +0100
-+++ ffmpeg.svn/configure 2007-03-05 20:49:10.000000000 +0100
-@@ -2012,6 +2012,10 @@
+--- trunk.orig/configure 2007-10-25 15:04:56.000000000 +0200
++++ trunk/configure 2007-10-25 15:05:04.000000000 +0200
+@@ -1879,6 +1879,10 @@
echo "#define __CPU__ 586" >> $TMPH
fi
Modified: experimental/ffmpeg/debian/patches/006_mips_pthreads.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/006_mips_pthreads.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/006_mips_pthreads.diff (original)
+++ experimental/ffmpeg/debian/patches/006_mips_pthreads.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: trunk/configure
===================================================================
---- ffmpeg.svn.orig/configure 2007-03-05 20:57:37.000000000 +0100
-+++ ffmpeg.svn/configure 2007-03-05 20:57:39.000000000 +0100
-@@ -1551,6 +1551,10 @@
+--- trunk.orig/configure 2007-10-25 15:05:04.000000000 +0200
++++ trunk/configure 2007-10-25 15:05:46.000000000 +0200
+@@ -1523,6 +1523,10 @@
# check for some common methods of building with pthread support
# do this before the optional library checks as some of them require pthreads
if enabled pthreads; then
Modified: experimental/ffmpeg/debian/patches/010_proper_rpath.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/010_proper_rpath.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/010_proper_rpath.diff (original)
+++ experimental/ffmpeg/debian/patches/010_proper_rpath.diff Wed Dec 5 16:34:18 2007
@@ -1,11 +1,11 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: trunk/configure
===================================================================
---- ffmpeg-0.cvs20070307.orig/configure 2007-03-09 15:42:57.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure 2007-03-09 15:44:13.000000000 +0100
-@@ -820,7 +820,7 @@
+--- trunk.orig/configure 2007-10-25 15:05:46.000000000 +0200
++++ trunk/configure 2007-10-25 15:08:07.000000000 +0200
+@@ -890,7 +890,7 @@
+ # build settings
+ SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)'
- LIBOBJFLAGS=""
- FFLDFLAGS=-Wl,--warn-common
-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+LDLATEFLAGS='-L\$(BUILD_ROOT)/libavcodec -L\$(BUILD_ROOT)/libavformat -L\$(BUILD_ROOT)/libavutil -L\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale'
FFSERVERLDFLAGS=-Wl,-E
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=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff (original)
+++ experimental/ffmpeg/debian/patches/010_shared_library_versioning.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: trunk/configure
===================================================================
---- ffmpeg-0.cvs20070307.orig/configure 2007-03-09 17:07:42.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure 2007-03-09 17:18:29.000000000 +0100
-@@ -1924,11 +1924,11 @@
+--- 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 @@
echo "BUILD_DOC=yes" >> config.mak
fi
@@ -19,7 +19,7 @@
-@@ -2057,9 +2057,9 @@
+@@ -2008,9 +2008,9 @@
pkgconfig_generate(){
name=$1
comment=$2
@@ -31,7 +31,7 @@
include=$6
cat <<EOF >$name.pc
prefix=$PREFIX
-@@ -2081,9 +2081,9 @@
+@@ -2032,9 +2032,9 @@
name=$1
shortname=${name#lib}
comment=$2
@@ -43,64 +43,38 @@
cat <<EOF >$name-uninstalled.pc
prefix=
exec_prefix=
-Index: ffmpeg-0.cvs20070307/libavutil/avutil.h
+Index: trunk/libavformat/avformat.h
===================================================================
---- ffmpeg-0.cvs20070307.orig/libavutil/avutil.h 2007-03-07 14:37:01.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavutil/avutil.h 2007-03-09 17:07:44.000000000 +0100
-@@ -35,7 +35,7 @@
- #define AV_TOSTRING(s) #s
+--- 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
+@@ -22,7 +22,7 @@
+ #define FFMPEG_AVFORMAT_H
- #define LIBAVUTIL_VERSION_INT ((49<<16)+(3<<8)+0)
--#define LIBAVUTIL_VERSION 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-09 17:07:44.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 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-09 17:07:44.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 1d.51.10.0
+ #define LIBAVFORMAT_VERSION_INT ((51<<16)+(17<<8)+0)
+-#define LIBAVFORMAT_VERSION 51.17.0
++#define LIBAVFORMAT_VERSION 1d.51.17.0
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20070307/common.mak
+Index: trunk/common.mak
===================================================================
---- ffmpeg-0.cvs20070307.orig/common.mak 2007-03-07 14:37:06.000000000 +0100
-+++ ffmpeg-0.cvs20070307/common.mak 2007-03-09 17:07:44.000000000 +0100
-@@ -68,7 +68,7 @@
- cd "$(shlibdir)" && \
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
- cd "$(shlibdir)" && \
-- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
-+ ln -sf $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
+--- 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 @@
+ cd "$(SHLIBDIR)" && \
+ $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+ cd "$(SHLIBDIR)" && \
+- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
++ $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
$(SLIB_INSTALL_EXTRA_CMD)
- install-lib-static: $(LIB)
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.h
+ install-lib-static: $(LIBNAME)
+Index: trunk/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-09 17:07:44.000000000 +0100
-@@ -32,7 +32,7 @@
- #endif
+--- 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
+@@ -28,7 +28,7 @@
+ */
#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
-#define LIBPOSTPROC_VERSION 51.1.0
@@ -108,11 +82,11 @@
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
-Index: ffmpeg-0.cvs20070307/libswscale/swscale.h
+Index: trunk/libswscale/swscale.h
===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale.h 2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale.h 2007-03-09 17:07:44.000000000 +0100
-@@ -37,7 +37,7 @@
+--- 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
+@@ -33,7 +33,7 @@
#define AV_TOSTRING(s) #s
#define LIBSWSCALE_VERSION_INT ((0<<16)+(5<<8)+0)
Modified: experimental/ffmpeg/debian/patches/011_link_plugins.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/011_link_plugins.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/011_link_plugins.diff (original)
+++ experimental/ffmpeg/debian/patches/011_link_plugins.diff Wed Dec 5 16:34:18 2007
@@ -1,28 +1,23 @@
-Index: ffmpeg-0.cvs20070307/vhook/Makefile
+Index: trunk/Makefile
===================================================================
---- ffmpeg-0.cvs20070307.orig/vhook/Makefile 2007-03-09 15:15:49.000000000 +0100
-+++ ffmpeg-0.cvs20070307/vhook/Makefile 2007-03-09 15:42:19.000000000 +0100
-@@ -9,16 +9,21 @@
- HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
- ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
+--- trunk.orig/Makefile 2007-10-25 15:34:11.000000000 +0200
++++ trunk/Makefile 2007-10-25 15:34:17.000000000 +0200
+@@ -51,11 +51,16 @@
+
+ HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
+LIBS_fish$(SLIBSUF) += -lavcodec -lswscale -lavformat
+LIBS_null$(SLIBSUF) += -lavcodec -lswscale
+LIBS_ppm$(SLIBSUF) += -lavcodec -lswscale -lavformat
+LIBS_watermark$(SLIBSUF) += -lavcodec -lswscale -lavformat
+
- ifeq ($(HAVE_IMLIB2),yes)
- HOOKS += imlib2$(SLIBSUF)
- CFLAGS += `imlib2-config --cflags`
-- LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
-+ LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` -lswscale -lavcodec
- endif
+ VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
+-LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` -lswscale -lavcodec
- ifeq ($(HAVE_FREETYPE2),yes)
- HOOKS += drawtext$(SLIBSUF)
- CFLAGS += `freetype-config --cflags`
-- LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
-+ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` -lavutil
- endif
+ VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
+-LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` -lavutil
- SRCS := $(HOOKS:$(SLIBSUF)=.c)
+ VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
+
Modified: experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff (original)
+++ experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: trunk/configure
===================================================================
---- ffmpeg-0.cvs20070307.orig/configure 2007-03-09 17:23:30.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure 2007-03-09 17:25:58.000000000 +0100
-@@ -2103,11 +2103,11 @@
+--- trunk.orig/configure 2007-10-25 15:09:31.000000000 +0200
++++ trunk/configure 2007-10-25 15:34:59.000000000 +0200
+@@ -2054,11 +2054,11 @@
pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
Modified: experimental/ffmpeg/debian/patches/015_build_imgresample.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/015_build_imgresample.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/015_build_imgresample.diff (original)
+++ experimental/ffmpeg/debian/patches/015_build_imgresample.diff Wed Dec 5 16:34:18 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
+Index: trunk/libavcodec/Makefile
===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile 2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/Makefile 2007-03-28 16:54:03.000000000 +0200
-@@ -310,9 +310,7 @@
+--- trunk.orig/libavcodec/Makefile 2007-10-25 14:59:04.000000000 +0200
++++ trunk/libavcodec/Makefile 2007-10-25 15:35:16.000000000 +0200
+@@ -345,9 +345,7 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -10,15 +10,28 @@
OBJS += imgresample.o
-endif
- # i386 mmx specific stuff
- ifeq ($(TARGET_MMX),yes)
-Index: ffmpeg-0.cvs20070307/tests/Makefile
+ # processor-specific code
+ ifeq ($(HAVE_MMX),yes)
+Index: trunk/libavcodec/imgconvert.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/tests/Makefile 2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/tests/Makefile 2007-03-28 16:18:43.000000000 +0200
-@@ -43,14 +43,6 @@
- @echo
- endif
+--- trunk.orig/libavcodec/imgconvert.c 2007-10-25 14:59:32.000000000 +0200
++++ trunk/libavcodec/imgconvert.c 2007-10-25 15:35:16.000000000 +0200
+@@ -2324,7 +2324,7 @@
+ }
+ #endif
+
+-#ifndef CONFIG_SWSCALER
++#if 1
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+ const AVPicture *src, int src_pix_fmt,
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile 2007-10-25 15:36:47.000000000 +0200
++++ trunk/Makefile 2007-10-25 15:37:01.000000000 +0200
+@@ -291,15 +291,6 @@
+ seektest: tests/seek_test$(EXESUF)
+ $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
-ifeq ($(CONFIG_SWSCALER),yes)
-test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
@@ -28,19 +41,7 @@
- @echo
- @exit 1
-endif
-
- seektest: seek_test$(EXESUF)
- @$(SRC_DIR)/seek_test.sh $(SEEK_REFFILE)
-Index: ffmpeg-0.cvs20070307/libavcodec/imgconvert.c
-===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/imgconvert.c 2007-03-28 16:54:10.000000000 +0200
-+++ ffmpeg-0.cvs20070307/libavcodec/imgconvert.c 2007-03-28 16:54:20.000000000 +0200
-@@ -2317,7 +2317,7 @@
- }
- #endif
-
--#ifndef CONFIG_SWSCALER
-+#if 1
- /* XXX: always use linesize. Return -1 if not supported */
- int img_convert(AVPicture *dst, int dst_pix_fmt,
- const AVPicture *src, int src_pix_fmt,
+-
+ tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
+ mkdir -p tests/vsynth1
+ $(BUILD_ROOT)/$< 'tests/vsynth1/'
Modified: experimental/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff (original)
+++ experimental/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff Wed Dec 5 16:34:18 2007
@@ -1,29 +1,29 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c
+Index: trunk/libavcodec/i386/dsputil_mmx.c
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/i386/dsputil_mmx.c 2006-07-24 17:22:05.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c 2006-07-24 17:22:11.000000000 +0200
-@@ -3095,7 +3095,7 @@
- c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
- }
+--- trunk.orig/libavcodec/i386/dsputil_mmx.c 2007-10-25 14:59:01.000000000 +0200
++++ trunk/libavcodec/i386/dsputil_mmx.c 2007-10-25 15:53:59.000000000 +0200
+@@ -3743,7 +3743,7 @@
+ #endif
+ #endif
-#ifdef CONFIG_SNOW_DECODER
+#if defined(CONFIG_SNOW_DECODER) && (defined(ARCH_X86_64) || !defined(PIC))
- if(mm_flags & MM_SSE2){
+ if(mm_flags & MM_SSE2 & 0){
c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
- c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c
+ #ifdef HAVE_7REGS
+Index: trunk/libavcodec/i386/snowdsp_mmx.c
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/i386/snowdsp_mmx.c 2006-07-24 17:11:17.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c 2006-07-24 17:22:11.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "../snow.h"
+--- trunk.orig/libavcodec/i386/snowdsp_mmx.c 2007-10-25 14:59:01.000000000 +0200
++++ trunk/libavcodec/i386/snowdsp_mmx.c 2007-10-25 16:04:38.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "snow.h"
#include "x86_cpu.h"
+#if defined(ARCH_X86_64) || !defined(PIC)
- void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){
+ void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
const int w2= (width+1)>>1;
- // SSE2 code runs faster with pointers aligned on a 32-byte boundary.
-@@ -915,3 +916,4 @@
+ DECLARE_ALIGNED_16(IDWTELEM, temp[width>>1]);
+@@ -869,3 +870,4 @@
else
ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
}
Modified: experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code (original)
+++ experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code Wed Dec 5 16:34:18 2007
@@ -1,22 +1,22 @@
-Index: ffmpeg.feisty/libswscale/swscale.c
+Index: trunk/libswscale/swscale.c
===================================================================
---- ffmpeg.feisty.orig/libswscale/swscale.c 2007-03-16 17:40:54.000000000 +0100
-+++ ffmpeg.feisty/libswscale/swscale.c 2007-03-16 17:58:05.000000000 +0100
-@@ -1289,7 +1289,7 @@
- return 0;
+--- trunk.orig/libswscale/swscale.c 2007-10-25 14:59:06.000000000 +0200
++++ trunk/libswscale/swscale.c 2007-10-25 16:05:36.000000000 +0200
+@@ -1357,7 +1357,7 @@
+ return 0;
}
-#ifdef COMPILE_MMX2
+#if defined (COMPILE_MMX2) && !defined(ARCH_X86_64)
static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *filter, int32_t *filterPos, int numSplits)
{
- uint8_t *fragmentA;
-@@ -2200,7 +2200,7 @@
- srcFilter->chrH, dstFilter->chrH, c->param);
+ uint8_t *fragmentA;
+@@ -2300,7 +2300,7 @@
+ srcFilter->chrH, dstFilter->chrH, c->param);
#define MAX_FUNNY_CODE_SIZE 10000
-#if defined(COMPILE_MMX2)
+#if defined (COMPILE_MMX2) && !defined(ARCH_X86_64)
// can't downscale !!!
- if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
- {
+ if (c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
+ {
Modified: experimental/ffmpeg/debian/patches/020_mmx_optims.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/020_mmx_optims.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/020_mmx_optims.diff (original)
+++ experimental/ffmpeg/debian/patches/020_mmx_optims.diff Wed Dec 5 16:34:18 2007
@@ -1,12 +1,12 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/Makefile
+Index: trunk/libavcodec/Makefile
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/Makefile 2006-07-24 17:11:20.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/Makefile 2006-07-24 17:22:05.000000000 +0200
-@@ -285,6 +285,7 @@
+--- trunk.orig/libavcodec/Makefile 2007-10-25 15:35:16.000000000 +0200
++++ trunk/libavcodec/Makefile 2007-10-25 15:37:48.000000000 +0200
+@@ -360,6 +360,7 @@
i386/fft_3dn.o \
i386/fft_3dn2.o \
+i386/dsputil_mmx.o: CFLAGS+= -O3 # "-O2" isn't enough, nor is "-O2 -finline-functions -frename-registers" (so long for gcc documentation)
OBJS-$(CONFIG_GPL) += i386/idct_mmx.o
+
OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
- OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
Modified: experimental/ffmpeg/debian/patches/020_mmx_pic_code.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/020_mmx_pic_code.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/020_mmx_pic_code.diff (original)
+++ experimental/ffmpeg/debian/patches/020_mmx_pic_code.diff Wed Dec 5 16:34:18 2007
@@ -1,22 +1,22 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/mpegvideo_mmx_template.c
+Index: trunk/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
+--- trunk.orig/libavcodec/i386/mpegvideo_mmx_template.c 2007-10-25 15:49:30.000000000 +0200
++++ trunk/libavcodec/i386/mpegvideo_mmx_template.c 2007-10-25 15:51:18.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: trunk/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 @@
+--- trunk.orig/libpostproc/postprocess_template.c 2007-10-25 15:49:30.000000000 +0200
++++ trunk/libpostproc/postprocess_template.c 2007-10-25 15:50:05.000000000 +0200
+@@ -35,9 +35,11 @@
# define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
#else
# define REGa eax
@@ -77,7 +73,7 @@
# define REG_c "ecx"
# define REG_d "edx"
# define REG_SP "esp"
-@@ -3201,7 +3203,12 @@
+@@ -3202,7 +3204,12 @@
"movq (%%"REG_a"), %%mm2 \n\t" // packedYOffset
"movq 8(%%"REG_a"), %%mm3 \n\t" // packedYScale
"lea (%2,%4), %%"REG_a" \n\t"
@@ -90,7 +86,7 @@
"pxor %%mm4, %%mm4 \n\t"
#ifdef HAVE_MMX2
#define REAL_SCALED_CPY(src1, src2, dst1, dst2) \
-@@ -3257,12 +3264,22 @@
+@@ -3258,12 +3265,22 @@
#define SCALED_CPY(src1, src2, dst1, dst2)\
REAL_SCALED_CPY(src1, src2, dst1, dst2)
@@ -113,7 +109,7 @@
: "=&a" (packedOffsetAndScale)
-@@ -3271,7 +3288,10 @@
+@@ -3272,7 +3289,10 @@
"r"(dst),
"r" ((long)srcStride),
"r" ((long)dstStride)
@@ -124,7 +120,7 @@
);
#else //HAVE_MMX
for(i=0; i<8; i++)
-@@ -3284,7 +3304,12 @@
+@@ -3285,7 +3305,12 @@
#ifdef HAVE_MMX
asm volatile(
"lea (%0,%2), %%"REG_a" \n\t"
@@ -137,7 +133,7 @@
#define REAL_SIMPLE_CPY(src1, src2, dst1, dst2) \
"movq " #src1 ", %%mm0 \n\t"\
-@@ -3295,18 +3320,32 @@
+@@ -3296,18 +3321,32 @@
#define SIMPLE_CPY(src1, src2, dst1, dst2)\
REAL_SIMPLE_CPY(src1, src2, dst1, dst2)
Modified: experimental/ffmpeg/debian/patches/040_early_altivec_detection.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/040_early_altivec_detection.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/040_early_altivec_detection.diff (original)
+++ experimental/ffmpeg/debian/patches/040_early_altivec_detection.diff Wed Dec 5 16:34:18 2007
@@ -1,38 +1,9 @@
-Index: ffmpeg-0.cvs20070307/libavcodec/ppc/dsputil_altivec.c
+Index: trunk/libavcodec/dsputil.c
===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/ppc/dsputil_altivec.c 2007-03-07 11:17:31.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/ppc/dsputil_altivec.c 2007-03-07 15:04:26.000000000 +0100
-@@ -1419,7 +1419,7 @@
- return score;
- }
-
--int has_altivec(void)
-+static int has_altivec_inner(void)
- {
- #ifdef __AMIGAOS4__
- ULONG result = 0;
-@@ -1463,6 +1463,15 @@
- #endif /* __AMIGAOS4__ */
- }
-
-+int has_altivec(void)
-+{
-+ static int has_it = -1;
-+ if (has_it < 0) {
-+ has_it = has_altivec_inner();
-+ }
-+ return has_it;
-+}
-+
- static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
- int blocksize)
- {
-Index: ffmpeg-0.cvs20070307/libavcodec/dsputil.c
-===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/dsputil.c 2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/dsputil.c 2007-03-07 15:05:47.000000000 +0100
-@@ -34,6 +34,11 @@
- #include "faandct.h"
+--- trunk.orig/libavcodec/dsputil.c 2007-10-25 14:59:31.000000000 +0200
++++ trunk/libavcodec/dsputil.c 2007-10-25 16:08:59.000000000 +0200
+@@ -35,6 +35,11 @@
+ #include "h263.h"
#include "snow.h"
+/* For PPC Use */
@@ -43,7 +14,7 @@
/* snow.c */
void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count);
-@@ -3793,6 +3798,9 @@
+@@ -3813,6 +3818,9 @@
{
int i;
Modified: experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff (original)
+++ experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff Wed Dec 5 16:34:18 2007
@@ -1,43 +1,28 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: trunk/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 @@
- if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
- add_cflags "-faltivec"
- else
-- add_cflags "-maltivec"
-+ ALTIVECFLAGS="$ALTIVECFLAGS -maltivec"
- fi
- fi
- fi
-
-+save_flags
-+temp_cflags $ALTIVECFLAGS
- check_header altivec.h
-
- # check if our compiler supports Motorola AltiVec C API
-@@ -1461,6 +1463,7 @@
- }
+--- trunk.orig/configure 2007-10-25 09:34:59.000000000 -0400
++++ trunk/configure 2007-10-27 16:54:20.000000000 -0400
+@@ -1469,6 +1469,7 @@
+ }
EOF
fi
+restore_flags
- # mmi only available on mips
- if test $mmi = "default"; then
-@@ -1862,6 +1865,7 @@
- fi
+ enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
+ enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"'
+@@ -1858,6 +1859,7 @@
+ echo "STRIP=echo ignoring strip" >> config.mak
echo "OPTFLAGS=$CFLAGS" >> config.mak
+echo "ALTIVECFLAGS=$ALTIVECFLAGS" >> config.mak
echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak
- echo "LDCONFIG=$LDCONFIG" >> config.mak
-Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
+ echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
+Index: trunk/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 @@
+--- trunk.orig/libavcodec/Makefile 2007-10-25 09:37:48.000000000 -0400
++++ trunk/libavcodec/Makefile 2007-10-27 16:54:20.000000000 -0400
+@@ -345,7 +345,8 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -45,190 +30,12 @@
+OBJS += imgresample.o imgresample_altivec.o
+imgresample_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
- # i386 mmx specific stuff
- ifeq ($(TARGET_MMX),yes)
-@@ -385,11 +386,22 @@
- ppc/fdct_altivec.o \
- ppc/float_altivec.o \
-
-+ppc/dsputil_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/mpegvideo_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/idct_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/fft_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/gmc_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/fdct_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
-+ppc/float_altivec.o: 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-28 16:17:39.000000000 +0200
-@@ -556,12 +556,6 @@
-
- extern int mm_flags;
-
--#if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN)
--#define pixel altivec_pixel
--#include <altivec.h>
--#undef pixel
--#endif
--
- #define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16)))
- #define STRIDE_ALIGN 16
-
-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-28 16:17:39.000000000 +0200
-@@ -284,133 +284,6 @@
- }
- #endif
-
--#ifdef HAVE_ALTIVEC
--typedef union {
-- vector unsigned char v;
-- unsigned char c[16];
--} vec_uc_t;
--
--typedef union {
-- vector signed short v;
-- signed short s[8];
--} vec_ss_t;
--
--void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src,
-- int wrap, int16_t *filter)
--{
-- int sum, i;
-- const uint8_t *s;
-- vector unsigned char *tv, tmp, dstv, zero;
-- vec_ss_t srchv[4], srclv[4], fv[4];
-- vector signed short zeros, sumhv, sumlv;
-- s = src;
--
-- for(i=0;i<4;i++)
-- {
-- /*
-- The vec_madds later on does an implicit >>15 on the result.
-- Since FILTER_BITS is 8, and we have 15 bits of magnitude in
-- a signed short, we have just enough bits to pre-shift our
-- filter constants <<7 to compensate for vec_madds.
-- */
-- fv[i].s[0] = filter[i] << (15-FILTER_BITS);
-- fv[i].v = vec_splat(fv[i].v, 0);
-- }
--
-- zero = vec_splat_u8(0);
-- zeros = vec_splat_s16(0);
--
--
-- /*
-- When we're resampling, we'd ideally like both our input buffers,
-- and output buffers to be 16-byte aligned, so we can do both aligned
-- reads and writes. Sadly we can't always have this at the moment, so
-- we opt for aligned writes, as unaligned writes have a huge overhead.
-- To do this, do enough scalar resamples to get dst 16-byte aligned.
-- */
-- i = (-(int)dst) & 0xf;
-- while(i>0) {
-- sum = s[0 * wrap] * filter[0] +
-- s[1 * wrap] * filter[1] +
-- s[2 * wrap] * filter[2] +
-- s[3 * wrap] * filter[3];
-- sum = sum >> FILTER_BITS;
-- if (sum<0) sum = 0; else if (sum>255) sum=255;
-- dst[0] = sum;
-- dst++;
-- s++;
-- dst_width--;
-- i--;
-- }
--
-- /* Do our altivec resampling on 16 pixels at once. */
-- while(dst_width>=16) {
-- /*
-- Read 16 (potentially unaligned) bytes from each of
-- 4 lines into 4 vectors, and split them into shorts.
-- Interleave the multipy/accumulate for the resample
-- filter with the loads to hide the 3 cycle latency
-- the vec_madds have.
-- */
-- tv = (vector unsigned char *) &s[0 * wrap];
-- tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[i * wrap]));
-- srchv[0].v = (vector signed short) vec_mergeh(zero, tmp);
-- srclv[0].v = (vector signed short) vec_mergel(zero, tmp);
-- sumhv = vec_madds(srchv[0].v, fv[0].v, zeros);
-- sumlv = vec_madds(srclv[0].v, fv[0].v, zeros);
--
-- tv = (vector unsigned char *) &s[1 * wrap];
-- tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[1 * wrap]));
-- srchv[1].v = (vector signed short) vec_mergeh(zero, tmp);
-- srclv[1].v = (vector signed short) vec_mergel(zero, tmp);
-- sumhv = vec_madds(srchv[1].v, fv[1].v, sumhv);
-- sumlv = vec_madds(srclv[1].v, fv[1].v, sumlv);
--
-- tv = (vector unsigned char *) &s[2 * wrap];
-- tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[2 * wrap]));
-- srchv[2].v = (vector signed short) vec_mergeh(zero, tmp);
-- srclv[2].v = (vector signed short) vec_mergel(zero, tmp);
-- sumhv = vec_madds(srchv[2].v, fv[2].v, sumhv);
-- sumlv = vec_madds(srclv[2].v, fv[2].v, sumlv);
--
-- tv = (vector unsigned char *) &s[3 * wrap];
-- tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[3 * wrap]));
-- srchv[3].v = (vector signed short) vec_mergeh(zero, tmp);
-- srclv[3].v = (vector signed short) vec_mergel(zero, tmp);
-- sumhv = vec_madds(srchv[3].v, fv[3].v, sumhv);
-- sumlv = vec_madds(srclv[3].v, fv[3].v, sumlv);
--
-- /*
-- Pack the results into our destination vector,
-- and do an aligned write of that back to memory.
-- */
-- dstv = vec_packsu(sumhv, sumlv) ;
-- vec_st(dstv, 0, (vector unsigned char *) dst);
--
-- dst+=16;
-- s+=16;
-- dst_width-=16;
-- }
--
-- /*
-- If there are any leftover pixels, resample them
-- with the slow scalar method.
-- */
-- while(dst_width>0) {
-- sum = s[0 * wrap] * filter[0] +
-- s[1 * wrap] * filter[1] +
-- s[2 * wrap] * filter[2] +
-- s[3 * wrap] * filter[3];
-- sum = sum >> FILTER_BITS;
-- if (sum<0) sum = 0; else if (sum>255) sum=255;
-- dst[0] = sum;
-- dst++;
-- s++;
-- dst_width--;
-- }
--}
--#endif
--
- /* 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
+ # processor-specific code
+ ifeq ($(HAVE_MMX),yes)
+Index: trunk/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
++++ trunk/libavcodec/imgresample_altivec.c 2007-10-27 16:54:20.000000000 -0400
@@ -0,0 +1,164 @@
+/*
+ * High quality image resampling with polyphase filters
@@ -394,10 +201,10 @@
+}
+#endif
+
-Index: ffmpeg-0.cvs20070307/libpostproc/Makefile
+Index: trunk/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
+--- trunk.orig/libpostproc/Makefile 2007-10-25 08:59:04.000000000 -0400
++++ trunk/libpostproc/Makefile 2007-10-27 16:54:20.000000000 -0400
@@ -10,8 +10,10 @@
LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR)
@@ -411,20 +218,22 @@
HEADERS = postprocess.h
-@@ -21,4 +23,6 @@
+@@ -21,6 +23,8 @@
postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
+postprocess_altivec_pic.o: postprocess_altivec.c
+ $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.c
+ uninstall-headers::
+ -rmdir "$(prefix)/include/postproc"
+Index: trunk/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
-@@ -95,10 +95,6 @@
-
- #include "mangle.h" //FIXME should be supressed
+--- trunk.orig/libpostproc/postprocess.c 2007-10-25 08:59:04.000000000 -0400
++++ trunk/libpostproc/postprocess.c 2007-10-27 16:54:20.000000000 -0400
+@@ -90,10 +90,6 @@
+ #include "postprocess.h"
+ #include "postprocess_internal.h"
-#ifdef HAVE_ALTIVEC_H
-#include <altivec.h>
@@ -433,7 +242,7 @@
#define GET_MODE_BUFFER_SIZE 500
#define OPTIONS_ARRAY_SIZE 10
#define BLOCK_SIZE 8
-@@ -614,8 +610,9 @@
+@@ -609,8 +605,9 @@
#undef RENAME
#define HAVE_ALTIVEC
#define RENAME(a) a ## _altivec
@@ -445,10 +254,10 @@
#endif
#endif //ARCH_POWERPC
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c
+Index: trunk/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
++++ trunk/libpostproc/postprocess_altivec.c 2007-10-27 16:54:20.000000000 -0400
@@ -0,0 +1,614 @@
+/*
+ Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1064,11 +873,11 @@
+#endif
+#endif //ARCH_POWERPC
+
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c
+Index: trunk/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
-@@ -3181,7 +3181,10 @@
+--- trunk.orig/libpostproc/postprocess_template.c 2007-10-25 09:50:05.000000000 -0400
++++ trunk/libpostproc/postprocess_template.c 2007-10-27 16:54:20.000000000 -0400
+@@ -3182,7 +3182,10 @@
}
#endif //HAVE_MMX
@@ -1080,7 +889,7 @@
QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c);
/**
-@@ -3384,7 +3387,10 @@
+@@ -3385,7 +3388,10 @@
/**
* Filters array of bytes (Y or U or V values)
*/
@@ -1091,12 +900,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: trunk/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 @@
+--- trunk.orig/libswscale/swscale.c 2007-10-25 10:05:36.000000000 -0400
++++ trunk/libswscale/swscale.c 2007-10-27 16:55:05.000000000 -0400
+@@ -918,7 +918,10 @@
#undef RENAME
#define HAVE_ALTIVEC
#define RENAME(a) a ## _altivec
@@ -1108,21 +917,30 @@
#endif
#endif //ARCH_POWERPC
-@@ -2241,8 +2244,8 @@
- srcFilter->chrV, dstFilter->chrV, c->param);
+@@ -2339,14 +2342,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: trunk/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
++++ trunk/libswscale/swscale_altivec.c 2007-10-27 16:54:20.000000000 -0400
@@ -0,0 +1,729 @@
+/*
+ * Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>
@@ -1853,35 +1671,36 @@
+#define RENAME(a) a ## _altivec
+#include "swscale_template.c"
+
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_altivec_template.c
+Index: trunk/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 @@
- }
+--- trunk.orig/libswscale/swscale_altivec_template.c 2007-10-25 08:59:06.000000000 -0400
++++ trunk/libswscale/swscale_altivec_template.c 2007-10-27 16:55:30.000000000 -0400
+@@ -381,13 +381,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: trunk/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
+--- trunk.orig/libswscale/swscale_internal.h 2007-10-25 08:59:06.000000000 -0400
++++ trunk/libswscale/swscale_internal.h 2007-10-27 16:56:41.000000000 -0400
@@ -21,9 +21,11 @@
- #ifndef SWSCALE_INTERNAL_H
- #define SWSCALE_INTERNAL_H
+ #ifndef FFMPEG_SWSCALE_INTERNAL_H
+ #define FFMPEG_SWSCALE_INTERNAL_H
+#ifdef ABI_ALTIVEC
#ifdef HAVE_ALTIVEC_H
@@ -1891,8 +1710,12 @@
#include "avutil.h"
-@@ -150,15 +152,20 @@
- uint64_t v_temp __attribute__((aligned(8)));
+@@ -141,22 +143,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 +1731,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,35 +1743,47 @@
#endif
-Index: ffmpeg-0.cvs20070307/libswscale/Makefile
+-
+ #ifdef ARCH_BFIN
+ uint32_t oy __attribute__((aligned(4)));
+ uint32_t oc __attribute__((aligned(4)));
+Index: trunk/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
-@@ -9,8 +9,10 @@
-
- OBJS= swscale.o rgb2rgb.o
-
--OBJS-$(TARGET_ALTIVEC) += yuv2rgb_altivec.o
-+OBJS-$(TARGET_ALTIVEC) += swscale_altivec.o yuv2rgb_altivec.o
+--- trunk.orig/libswscale/Makefile 2007-10-25 08:59:06.000000000 -0400
++++ trunk/libswscale/Makefile 2007-10-27 16:59:03.000000000 -0400
+@@ -10,7 +10,9 @@
+ OBJS = rgb2rgb.o swscale.o
+
OBJS-$(CONFIG_GPL) += yuv2rgb.o
+-OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o
++OBJS-$(HAVE_ALTIVEC) += swscale_altivec.o yuv2rgb_altivec.o
+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-$(ARCH_BFIN) += swscale_bfin.o \
+ yuv2rgb_bfin.o \
+Index: trunk/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 @@
- }
+--- trunk.orig/libswscale/swscale_template.c 2007-10-25 08:59:06.000000000 -0400
++++ trunk/libswscale/swscale_template.c 2007-10-27 16:59:21.000000000 -0400
+@@ -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: experimental/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/series?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/series (original)
+++ experimental/ffmpeg/debian/patches/series Wed Dec 5 16:34:18 2007
@@ -1,5 +1,4 @@
005_m68k_workaround.diff
-005_altivec_flags.diff
005_runtime_cpudetect.diff
006_mips_pthreads.diff
010_proper_rpath.diff
@@ -13,7 +12,6 @@
020_mmx_pic_code.diff
020_disable_snow_mmx_in_pic.diff
020_fix_libswscale_pic_code
-040_early_altivec_detection.diff
040_only_use_maltivec_when_needed.diff
051_mjpeg_gray_support.diff
053_rm_demux_crash.diff
Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=924&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Wed Dec 5 16:34:18 2007
@@ -143,7 +143,7 @@
dh_compress
dh_fixperms
for d in $(LIBS); do \
- dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.cvs20070307)" ; \
+ dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.cvs20071025)" ; \
done
dh_installdeb
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
More information about the pkg-multimedia-commits
mailing list