r930 - /experimental/ffmpeg/debian/patches/
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Dec 9 19:56:00 UTC 2007
Author: siretart
Date: Sun Dec 9 19:56:00 2007
New Revision: 930
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=930
Log:
refreshed all patches, no changes
Modified:
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/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_mmx_optims.diff
experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
experimental/ffmpeg/debian/patches/300_c++_compliant_headers.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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/005_m68k_workaround.diff (original)
+++ experimental/ffmpeg/debian/patches/005_m68k_workaround.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:53:01.000000000 +0100
++++ trunk/configure 2007-12-09 20:54:22.000000000 +0100
+@@ -1708,6 +1708,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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff (original)
+++ experimental/ffmpeg/debian/patches/005_runtime_cpudetect.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:54:22.000000000 +0100
++++ trunk/configure 2007-12-09 20:54:37.000000000 +0100
+@@ -1877,6 +1877,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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/006_mips_pthreads.diff (original)
+++ experimental/ffmpeg/debian/patches/006_mips_pthreads.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:54:37.000000000 +0100
++++ trunk/configure 2007-12-09 20:54:40.000000000 +0100
+@@ -1524,6 +1524,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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/010_proper_rpath.diff (original)
+++ experimental/ffmpeg/debian/patches/010_proper_rpath.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:54:40.000000000 +0100
++++ trunk/configure 2007-12-09 20:54:46.000000000 +0100
+@@ -889,7 +889,7 @@
# build settings
SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)'
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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/011_link_plugins.diff (original)
+++ experimental/ffmpeg/debian/patches/011_link_plugins.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/Makefile
===================================================================
---- 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 @@
+--- trunk.orig/Makefile 2007-12-09 20:53:01.000000000 +0100
++++ trunk/Makefile 2007-12-09 20:54:54.000000000 +0100
+@@ -48,11 +48,16 @@
HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff (original)
+++ experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:54:52.000000000 +0100
++++ trunk/configure 2007-12-09 20:54:58.000000000 +0100
+@@ -2049,11 +2049,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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/015_build_imgresample.diff (original)
+++ experimental/ffmpeg/debian/patches/015_build_imgresample.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/libavcodec/Makefile
===================================================================
---- 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 @@
+--- trunk.orig/libavcodec/Makefile 2007-12-09 20:53:01.000000000 +0100
++++ trunk/libavcodec/Makefile 2007-12-09 20:55:02.000000000 +0100
+@@ -338,9 +338,7 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -14,8 +14,8 @@
ifeq ($(HAVE_MMX),yes)
Index: trunk/libavcodec/imgconvert.c
===================================================================
---- 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
+--- trunk.orig/libavcodec/imgconvert.c 2007-12-09 20:53:01.000000000 +0100
++++ trunk/libavcodec/imgconvert.c 2007-12-09 20:55:02.000000000 +0100
@@ -2324,7 +2324,7 @@
}
#endif
@@ -27,9 +27,9 @@
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 @@
+--- trunk.orig/Makefile 2007-12-09 20:54:54.000000000 +0100
++++ trunk/Makefile 2007-12-09 20:55:02.000000000 +0100
+@@ -289,15 +289,6 @@
seektest: tests/seek_test$(EXESUF)
$(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
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=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/020_mmx_optims.diff (original)
+++ experimental/ffmpeg/debian/patches/020_mmx_optims.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/libavcodec/Makefile
===================================================================
---- 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 @@
+--- trunk.orig/libavcodec/Makefile 2007-12-09 20:55:02.000000000 +0100
++++ trunk/libavcodec/Makefile 2007-12-09 20:55:05.000000000 +0100
+@@ -353,6 +353,7 @@
i386/fft_3dn.o \
i386/fft_3dn2.o \
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=930&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 Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
Index: trunk/configure
===================================================================
---- 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 @@
+--- trunk.orig/configure 2007-12-09 20:54:58.000000000 +0100
++++ trunk/configure 2007-12-09 20:55:11.000000000 +0100
+@@ -1470,6 +1470,7 @@
}
EOF
fi
@@ -10,7 +10,7 @@
enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"'
-@@ -1858,6 +1859,7 @@
+@@ -1857,6 +1858,7 @@
echo "STRIP=echo ignoring strip" >> config.mak
echo "OPTFLAGS=$CFLAGS" >> config.mak
@@ -20,9 +20,9 @@
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
Index: trunk/libavcodec/Makefile
===================================================================
---- 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 @@
+--- trunk.orig/libavcodec/Makefile 2007-12-09 20:55:05.000000000 +0100
++++ trunk/libavcodec/Makefile 2007-12-09 20:55:11.000000000 +0100
+@@ -338,7 +338,8 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -35,7 +35,7 @@
Index: trunk/libavcodec/imgresample_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/libavcodec/imgresample_altivec.c 2007-10-27 16:54:20.000000000 -0400
++++ trunk/libavcodec/imgresample_altivec.c 2007-12-09 20:55:11.000000000 +0100
@@ -0,0 +1,164 @@
+/*
+ * High quality image resampling with polyphase filters
@@ -203,8 +203,8 @@
+
Index: trunk/libpostproc/Makefile
===================================================================
---- trunk.orig/libpostproc/Makefile 2007-10-25 08:59:04.000000000 -0400
-+++ trunk/libpostproc/Makefile 2007-10-27 16:54:20.000000000 -0400
+--- trunk.orig/libpostproc/Makefile 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libpostproc/Makefile 2007-12-09 20:55:11.000000000 +0100
@@ -10,8 +10,10 @@
LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR)
@@ -229,8 +229,8 @@
-rmdir "$(prefix)/include/postproc"
Index: trunk/libpostproc/postprocess.c
===================================================================
---- 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
+--- trunk.orig/libpostproc/postprocess.c 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libpostproc/postprocess.c 2007-12-09 20:55:11.000000000 +0100
@@ -90,10 +90,6 @@
#include "postprocess.h"
#include "postprocess_internal.h"
@@ -257,7 +257,7 @@
Index: trunk/libpostproc/postprocess_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/libpostproc/postprocess_altivec.c 2007-10-27 16:54:20.000000000 -0400
++++ trunk/libpostproc/postprocess_altivec.c 2007-12-09 20:55:11.000000000 +0100
@@ -0,0 +1,614 @@
+/*
+ Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -875,8 +875,8 @@
+
Index: trunk/libpostproc/postprocess_template.c
===================================================================
---- 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
+--- trunk.orig/libpostproc/postprocess_template.c 2007-12-09 20:55:08.000000000 +0100
++++ trunk/libpostproc/postprocess_template.c 2007-12-09 20:55:11.000000000 +0100
@@ -3182,7 +3182,10 @@
}
#endif //HAVE_MMX
@@ -903,8 +903,8 @@
DECLARE_ALIGNED(8, PPContext, c)= *c2; //copy to stack for faster access
Index: trunk/libswscale/swscale.c
===================================================================
---- 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
+--- trunk.orig/libswscale/swscale.c 2007-12-09 20:55:10.000000000 +0100
++++ trunk/libswscale/swscale.c 2007-12-09 20:55:11.000000000 +0100
@@ -918,7 +918,10 @@
#undef RENAME
#define HAVE_ALTIVEC
@@ -940,7 +940,7 @@
Index: trunk/libswscale/swscale_altivec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/libswscale/swscale_altivec.c 2007-10-27 16:54:20.000000000 -0400
++++ trunk/libswscale/swscale_altivec.c 2007-12-09 20:55:11.000000000 +0100
@@ -0,0 +1,729 @@
+/*
+ * Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>
@@ -1673,8 +1673,8 @@
+
Index: trunk/libswscale/swscale_altivec_template.c
===================================================================
---- 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
+--- trunk.orig/libswscale/swscale_altivec_template.c 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libswscale/swscale_altivec_template.c 2007-12-09 20:55:11.000000000 +0100
@@ -381,13 +381,13 @@
}
@@ -1696,11 +1696,11 @@
uint8_t *vsrc = src[2];
Index: trunk/libswscale/swscale_internal.h
===================================================================
---- 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
+--- trunk.orig/libswscale/swscale_internal.h 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libswscale/swscale_internal.h 2007-12-09 20:55:11.000000000 +0100
@@ -21,9 +21,11 @@
- #ifndef FFMPEG_SWSCALE_INTERNAL_H
- #define FFMPEG_SWSCALE_INTERNAL_H
+ #ifndef SWSCALE_INTERNAL_H
+ #define SWSCALE_INTERNAL_H
+#ifdef ABI_ALTIVEC
#ifdef HAVE_ALTIVEC_H
@@ -1749,8 +1749,8 @@
uint32_t oc __attribute__((aligned(4)));
Index: trunk/libswscale/Makefile
===================================================================
---- trunk.orig/libswscale/Makefile 2007-10-25 08:59:06.000000000 -0400
-+++ trunk/libswscale/Makefile 2007-10-27 16:59:03.000000000 -0400
+--- trunk.orig/libswscale/Makefile 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libswscale/Makefile 2007-12-09 20:55:11.000000000 +0100
@@ -10,7 +10,9 @@
OBJS = rgb2rgb.o swscale.o
@@ -1764,8 +1764,8 @@
yuv2rgb_bfin.o \
Index: trunk/libswscale/swscale_template.c
===================================================================
---- 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
+--- trunk.orig/libswscale/swscale_template.c 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libswscale/swscale_template.c 2007-12-09 20:55:11.000000000 +0100
@@ -2918,13 +2918,16 @@
xpos+=xInc;
}
Modified: experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff?rev=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff (original)
+++ experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060823/libavcodec/h264.c
+Index: trunk/libavcodec/h264.c
===================================================================
---- ffmpeg-0.cvs20060823.orig/libavcodec/h264.c 2007-03-26 14:33:03.000000000 +0200
-+++ ffmpeg-0.cvs20060823/libavcodec/h264.c 2007-03-26 14:33:12.000000000 +0200
-@@ -2890,8 +2890,8 @@
+--- trunk.orig/libavcodec/h264.c 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libavcodec/h264.c 2007-12-09 20:55:19.000000000 +0100
+@@ -1713,8 +1713,8 @@
if( full_mx < 0-extra_width
|| full_my < 0-extra_height
Modified: experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/300_c%2B%2B_compliant_headers.diff?rev=930&op=diff
==============================================================================
--- experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff (original)
+++ experimental/ffmpeg/debian/patches/300_c++_compliant_headers.diff Sun Dec 9 19:56:00 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+Index: trunk/libavcodec/avcodec.h
===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h 2007-03-29 22:22:06.000000000 +0200
-+++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h 2007-03-29 22:23:03.000000000 +0200
-@@ -34,6 +34,14 @@
+--- trunk.orig/libavcodec/avcodec.h 2007-12-09 20:53:00.000000000 +0100
++++ trunk/libavcodec/avcodec.h 2007-12-09 20:55:22.000000000 +0100
+@@ -30,6 +30,14 @@
#include "avutil.h"
#include <sys/types.h> /* size_t */
More information about the pkg-multimedia-commits
mailing list