r62 - in unstable/ffmpeg/debian: . patches
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:19:35 CET 2007
Author: sho
Date: 2006-06-25 19:24:09 +0000 (Sun, 25 Jun 2006)
New Revision: 62
Modified:
unstable/ffmpeg/debian/changelog
unstable/ffmpeg/debian/control
unstable/ffmpeg/debian/patches/005_altivec_flags.diff
unstable/ffmpeg/debian/patches/005_m68k_workaround.diff
unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff
unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
unstable/ffmpeg/debian/patches/series
unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060625-1) UNRELEASED; urgency=low
* New SVN snapshot.
* debian/control:
+ Set policy to 3.7.2.
* debian/rules:
+ Minor cleanup.
Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/changelog 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,3 +1,13 @@
+ffmpeg (0.cvs20060625-1) UNRELEASED; urgency=low
+
+ * New SVN snapshot.
+ * debian/control:
+ + Set policy to 3.7.2.
+ * debian/rules:
+ + Minor cleanup.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 25 Jun 2006 20:20:38 +0200
+
ffmpeg (0.cvs20060329-4) unstable; urgency=low
* debian/control:
Modified: unstable/ffmpeg/debian/control
===================================================================
--- unstable/ffmpeg/debian/control 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/control 2006-06-25 19:24:09 UTC (rev 62)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: ffmpeg
Section: graphics
Modified: unstable/ffmpeg/debian/patches/005_altivec_flags.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_altivec_flags.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/005_altivec_flags.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060329/configure
+Index: ffmpeg-0.cvs20060625/configure
===================================================================
---- ffmpeg-0.cvs20060329.orig/configure 2006-03-29 21:10:33.000000000 +0200
-+++ ffmpeg-0.cvs20060329/configure 2006-03-29 21:10:36.000000000 +0200
-@@ -846,7 +846,8 @@
+--- ffmpeg-0.cvs20060625.orig/configure 2006-06-25 20:22:21.000000000 +0200
++++ ffmpeg-0.cvs20060625/configure 2006-06-25 20:22:26.000000000 +0200
+@@ -1041,7 +1041,8 @@
if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
CFLAGS="$CFLAGS -faltivec"
else
Modified: unstable/ffmpeg/debian/patches/005_m68k_workaround.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_m68k_workaround.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/005_m68k_workaround.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060329/configure
+Index: ffmpeg-0.cvs20060625/configure
===================================================================
---- ffmpeg-0.cvs20060329.orig/configure 2006-03-29 21:10:23.000000000 +0200
-+++ ffmpeg-0.cvs20060329/configure 2006-03-29 21:10:33.000000000 +0200
-@@ -1296,6 +1296,8 @@
+--- ffmpeg-0.cvs20060625.orig/configure 2006-06-25 19:57:15.000000000 +0200
++++ ffmpeg-0.cvs20060625/configure 2006-06-25 20:22:21.000000000 +0200
+@@ -1391,6 +1391,8 @@
if test -n "`$cc -v 2>&1 | grep xlc`"; then
CFLAGS="$CFLAGS -O5"
LDFLAGS="$LDFLAGS -O5"
Modified: unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060329/configure
+Index: ffmpeg-0.cvs20060625/configure
===================================================================
---- ffmpeg-0.cvs20060329.orig/configure 2006-03-29 21:10:36.000000000 +0200
-+++ ffmpeg-0.cvs20060329/configure 2006-03-29 21:10:39.000000000 +0200
-@@ -1548,6 +1548,9 @@
+--- ffmpeg-0.cvs20060625.orig/configure 2006-06-25 20:22:26.000000000 +0200
++++ ffmpeg-0.cvs20060625/configure 2006-06-25 20:22:29.000000000 +0200
+@@ -1641,6 +1641,9 @@
echo "#undef HAVE_ALTIVEC_H" >> $TMPH
fi
fi
Modified: unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,7 +1,7 @@
-Index: ffmpeg-0.cvs20060329/ffmpeg-config.in
+Index: ffmpeg-0.cvs20060625/ffmpeg-config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060329/ffmpeg-config.in 2006-03-29 21:10:41.000000000 +0200
++++ ffmpeg-0.cvs20060625/ffmpeg-config.in 2006-06-25 20:22:31.000000000 +0200
@@ -0,0 +1,92 @@
+#!/bin/sh
+
@@ -95,10 +95,10 @@
+if test "$echo_version" = "yes"; then
+ echo $version
+fi
-Index: ffmpeg-0.cvs20060329/ffmpeg-config.1
+Index: ffmpeg-0.cvs20060625/ffmpeg-config.1
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060329/ffmpeg-config.1 2006-03-29 21:10:41.000000000 +0200
++++ ffmpeg-0.cvs20060625/ffmpeg-config.1 2006-06-25 20:22:31.000000000 +0200
@@ -0,0 +1,52 @@
+.TH ffmpeg-config 1 "2004-07-16" "ffmpeg"
+.SH NAME
Modified: unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,26 +1,26 @@
-Index: ffmpeg-0.cvs20060329/configure
+Index: ffmpeg-0.cvs20060625/configure
===================================================================
---- ffmpeg-0.cvs20060329.orig/configure 2006-03-29 21:10:39.000000000 +0200
-+++ ffmpeg-0.cvs20060329/configure 2006-03-29 21:10:44.000000000 +0200
-@@ -1593,10 +1593,10 @@
+--- ffmpeg-0.cvs20060625.orig/configure 2006-06-25 20:22:29.000000000 +0200
++++ ffmpeg-0.cvs20060625/configure 2006-06-25 20:23:15.000000000 +0200
+@@ -1685,10 +1685,10 @@
echo "#define HAVE_VHOOK 1" >> $TMPH
fi
--pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
+-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
-lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
-lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
-lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
-+pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/^[^0-9\.]*//'`
++pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/^[^0-9\.]*//'`
+lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/^[^0-9\.]*//'`
+lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/^[^0-9\.]*//'`
+lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/^[^0-9\.]*//'`
-Index: ffmpeg-0.cvs20060329/libavutil/avutil.h
+Index: ffmpeg-0.cvs20060625/libavutil/avutil.h
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavutil/avutil.h 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavutil/avutil.h 2006-03-29 21:10:44.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libavutil/avutil.h 2006-06-11 14:17:32.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavutil/avutil.h 2006-06-25 20:22:40.000000000 +0200
@@ -15,7 +15,7 @@
#define AV_TOSTRING(s) #s
@@ -30,36 +30,23 @@
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-Index: ffmpeg-0.cvs20060329/libavcodec/avcodec.h
+Index: ffmpeg-0.cvs20060625/libavcodec/avcodec.h
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/avcodec.h 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/avcodec.h 2006-03-29 21:10:44.000000000 +0200
-@@ -22,7 +22,7 @@
+--- ffmpeg-0.cvs20060625.orig/libavcodec/avcodec.h 2006-06-25 19:57:13.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/avcodec.h 2006-06-25 20:23:37.000000000 +0200
+@@ -18,7 +18,7 @@
#define AV_TOSTRING(s) #s
- #define LIBAVCODEC_VERSION_INT ((51<<16)+(8<<8)+0)
--#define LIBAVCODEC_VERSION 51.8.0
-+#define LIBAVCODEC_VERSION 0d.51.8.0
+ #define LIBAVCODEC_VERSION_INT ((51<<16)+(9<<8)+0)
+-#define LIBAVCODEC_VERSION 51.9.0
++#define LIBAVCODEC_VERSION 0d.51.9.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h
+Index: ffmpeg-0.cvs20060625/libavformat/avformat.h
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/libpostproc/postprocess.h 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h 2006-03-29 21:10:44.000000000 +0200
-@@ -30,7 +30,7 @@
- #endif
-
- #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
--#define LIBPOSTPROC_VERSION 51.1.0
-+#define LIBPOSTPROC_VERSION 0d.51.1.0
- #define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
-
- #define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
-Index: ffmpeg-0.cvs20060329/libavformat/avformat.h
-===================================================================
---- ffmpeg-0.cvs20060329.orig/libavformat/avformat.h 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavformat/avformat.h 2006-03-29 21:10:44.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libavformat/avformat.h 2006-06-25 19:57:15.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavformat/avformat.h 2006-06-25 20:22:40.000000000 +0200
@@ -6,7 +6,7 @@
#endif
@@ -69,11 +56,11 @@
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20060329/common.mak
+Index: ffmpeg-0.cvs20060625/common.mak
===================================================================
---- ffmpeg-0.cvs20060329.orig/common.mak 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/common.mak 2006-03-29 21:10:44.000000000 +0200
-@@ -79,7 +79,7 @@
+--- ffmpeg-0.cvs20060625.orig/common.mak 2006-06-11 14:17:42.000000000 +0200
++++ ffmpeg-0.cvs20060625/common.mak 2006-06-25 20:22:40.000000000 +0200
+@@ -83,7 +83,7 @@
$(libdir)/$(SLIBNAME_WITH_VERSION)
ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME_WITH_MAJOR)
@@ -82,3 +69,16 @@
$(libdir)/$(SLIBNAME)
endif
+Index: ffmpeg-0.cvs20060625/libpostproc/postprocess.h
+===================================================================
+--- ffmpeg-0.cvs20060625.orig/libpostproc/postprocess.h 2006-06-25 20:23:55.000000000 +0200
++++ ffmpeg-0.cvs20060625/libpostproc/postprocess.h 2006-06-25 20:24:16.000000000 +0200
+@@ -30,7 +30,7 @@
+ #endif
+
+ #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
+-#define LIBPOSTPROC_VERSION 51.1.0
++#define LIBPOSTPROC_VERSION 0d.51.1.0
+ #define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
+
+ #define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
Modified: unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/i386/dsputil_mmx.c 2006-03-29 21:32:19.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c 2006-03-29 21:32:26.000000000 +0200
-@@ -2972,7 +2972,7 @@
+--- ffmpeg-0.cvs20060625.orig/libavcodec/i386/dsputil_mmx.c 2006-06-25 20:24:21.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c 2006-06-25 20:25:04.000000000 +0200
+@@ -3092,7 +3092,7 @@
c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
}
@@ -11,10 +11,10 @@
if(mm_flags & MM_SSE2){
c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
-Index: ffmpeg-0.cvs20060329/libavcodec/i386/snowdsp_mmx.c
+Index: ffmpeg-0.cvs20060625/libavcodec/i386/snowdsp_mmx.c
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/i386/snowdsp_mmx.c 2006-03-27 14:51:18.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/i386/snowdsp_mmx.c 2006-03-29 21:34:16.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libavcodec/i386/snowdsp_mmx.c 2006-06-11 14:17:33.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/i386/snowdsp_mmx.c 2006-06-25 20:25:04.000000000 +0200
@@ -21,6 +21,7 @@
#include "../snow.h"
#include "mmx.h"
Modified: unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060329/libavcodec/Makefile
+Index: ffmpeg-0.cvs20060625/libavcodec/Makefile
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/Makefile 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/Makefile 2006-03-29 21:10:47.000000000 +0200
-@@ -339,6 +339,8 @@
+--- ffmpeg-0.cvs20060625.orig/libavcodec/Makefile 2006-06-25 19:57:13.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/Makefile 2006-06-25 20:24:21.000000000 +0200
+@@ -347,6 +347,8 @@
i386/idct_mmx.o i386/motion_est_mmx.o \
i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o
@@ -11,10 +11,10 @@
ifeq ($(CONFIG_GPL),yes)
OBJS += i386/idct_mmx_xvid.o
endif
-Index: ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/i386/dsputil_mmx.c 2006-03-29 21:10:12.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c 2006-03-29 21:10:47.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libavcodec/i386/dsputil_mmx.c 2006-06-11 14:17:33.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c 2006-06-25 20:24:21.000000000 +0200
@@ -25,6 +25,8 @@
#include "../mpegvideo.h"
#include "mmx.h"
Modified: unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,7 +1,7 @@
-Index: ffmpeg-0.cvs20060329/libavcodec/i386/mpegvideo_mmx_template.c
+Index: ffmpeg-0.cvs20060625/libavcodec/i386/mpegvideo_mmx_template.c
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/i386/mpegvideo_mmx_template.c 2006-03-29 21:10:11.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/i386/mpegvideo_mmx_template.c 2006-03-29 21:10:49.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libavcodec/i386/mpegvideo_mmx_template.c 2006-06-11 14:17:33.000000000 +0200
++++ ffmpeg-0.cvs20060625/libavcodec/i386/mpegvideo_mmx_template.c 2006-06-25 20:24:47.000000000 +0200
@@ -107,7 +107,12 @@
SPREADW(%%mm3)
"pxor %%mm7, %%mm7 \n\t" // 0
@@ -61,10 +61,10 @@
"r" (inv_zigzag_direct16+64), "r" (temp_block+64)
);
// note the asm is split cuz gcc doesnt like that many operands ...
-Index: ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess_template.c
+Index: ffmpeg-0.cvs20060625/libpostproc/postprocess_template.c
===================================================================
---- ffmpeg-0.cvs20060329.orig/libavcodec/libpostproc/postprocess_template.c 2006-03-29 21:10:11.000000000 +0200
-+++ ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess_template.c 2006-03-29 21:10:49.000000000 +0200
+--- ffmpeg-0.cvs20060625.orig/libpostproc/postprocess_template.c 2006-06-11 14:17:36.000000000 +0200
++++ ffmpeg-0.cvs20060625/libpostproc/postprocess_template.c 2006-06-25 20:24:47.000000000 +0200
@@ -33,9 +33,11 @@
# define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
#else
Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/patches/series 2006-06-25 19:24:09 UTC (rev 62)
@@ -1,8 +1,8 @@
-005_m68k_workaround.diff -p1
-005_altivec_flags.diff -p1
-005_runtime_cpudetect.diff -p1
-010_ffmpeg-config.diff -p1
-010_shared_library_versioning.diff -p1
-020_mmx_intrinsics.diff -p1
-020_mmx_pic_code.diff -p1
-020_disable_snow_mmx_in_pic.diff -p1
+005_m68k_workaround.diff
+005_altivec_flags.diff
+005_runtime_cpudetect.diff
+010_ffmpeg-config.diff
+010_shared_library_versioning.diff
+020_mmx_intrinsics.diff
+020_mmx_pic_code.diff
+020_disable_snow_mmx_in_pic.diff
Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules 2006-06-16 21:25:23 UTC (rev 61)
+++ unstable/ffmpeg/debian/rules 2006-06-25 19:24:09 UTC (rev 62)
@@ -4,13 +4,6 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-#ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-# confflags += --build $(DEB_HOST_GNU_TYPE)
-#else
-# confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-#endif
-
confflags += --enable-gpl --enable-pp --enable-pthreads
confflags += --enable-vorbis --enable-libogg --enable-theora --enable-a52 --enable-dts --enable-dc1394 --enable-libgsm
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -42,68 +35,68 @@
build-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
+
# Build ffmpeg and static libraries
./configure $(confflags) --prefix=/usr
cd doc && $(MAKE)
$(MAKE)
-
+
# Backup static libraries
mv libavutil/libavutil.a libavutil/libavutil.a.bak
- mv libavcodec/libpostproc/libpostproc.a libavcodec/libpostproc/libpostproc.a.bak
+ mv libpostproc/libpostproc.a libpostproc/libpostproc.a.bak
mv libavcodec/libavcodec.a libavcodec/libavcodec.a.bak
mv libavformat/libavformat.a libavformat/libavformat.a.bak
-
+
# Build shared libraries
./configure $(confflags) --enable-shared --prefix=/usr
-
+
sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
-
+
cd libavutil && \
$(MAKE) clean && \
rm -f Makefile.pic && \
sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
rm -f Makefile.pic
-
+
cd libavcodec && \
$(MAKE) clean && \
rm -f Makefile.pic && \
sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
rm -f Makefile.pic
-
- cd libavcodec/libpostproc && \
+
+ cd libpostproc && \
$(MAKE) clean && \
rm -f Makefile.pic && \
sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
rm -f Makefile.pic
-
+
cd libavformat && \
$(MAKE) clean && \
rm -f Makefile.pic && \
sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
rm -f Makefile.pic
-
+
rm -f config.mak.pic
-
+
# Restore static libraries
mv libavutil/libavutil.a.bak libavutil/libavutil.a
- mv libavcodec/libpostproc/libpostproc.a.bak libavcodec/libpostproc/libpostproc.a
+ mv libpostproc/libpostproc.a.bak libpostproc/libpostproc.a
mv libavcodec/libavcodec.a.bak libavcodec/libavcodec.a
mv libavformat/libavformat.a.bak libavformat/libavformat.a
-
+
# Fix timestamps
- touch libavutil/libavutil.a libavcodec/libpostproc/libpostproc.a
+ touch libavutil/libavutil.a libpostproc/libpostproc.a
touch libavcodec/libavcodec.a libavformat/libavformat.a
touch ffmpeg ffmpeg_g ffplay ffplay_g
-
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-cd tests && $(MAKE)
endif
-
+
touch build-stamp
clean:
@@ -115,9 +108,9 @@
-$(MAKE) distclean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f libavutil/Makefile.pic libavformat/Makefile.pic config.log
- rm -f libavcodec/libpostproc/Makefile.pic libavformat/Makefile.pic
+ rm -f libpostproc/Makefile.pic libavformat/Makefile.pic
rm -f libavutil/libavutil.a.bak
- rm -f libavcodec/libpostproc/libpostproc.a.bak
+ rm -f libpostproc/libpostproc.a.bak
rm -f libavcodec/libavcodec.a.bak
rm -f libavformat/libavformat.a.bak
rm -f libavcodec-uninstalled.pc libavcodec.pc
@@ -131,22 +124,22 @@
dh_testroot
dh_clean -k
dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg usr/lib usr/bin usr/share/man/man1 usr/include/postproc
-
+
$(MAKE) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
cp libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
- cp libavcodec/libpostproc/libpostproc.a debian/tmp/usr/lib
- cp libavcodec/libpostproc/postprocess.h debian/tmp/usr/include/postproc
+ cp libpostproc/libpostproc.a debian/tmp/usr/lib
+ cp libpostproc/postprocess.h debian/tmp/usr/include/postproc
cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/
-
- dh_install -ptmp libavutil/libavutil.so* libavcodec/libavcodec.so* libavcodec/libpostproc/libpostproc.so* libavformat/libavformat.so* /usr/lib
-
+
+ dh_install -ptmp libavutil/libavutil.so* libavcodec/libavcodec.so* libpostproc/libpostproc.so* libavformat/libavformat.so* /usr/lib
+
cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
cp doc/ffserver.conf debian/tmp/etc/
-
+
sed s/@VERSION@/`dpkg-parsechangelog | sed -ne 's/^Version: //p'`/ ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
chmod 644 debian/tmp/usr/bin/ffmpeg-config
cp ffmpeg-config.1 debian/tmp/usr/share/man/man1/ffmpeg-config.1
-
+
dh_install --fail-missing --sourcedir=debian/tmp
# Build architecture-independent files here.
@@ -155,23 +148,16 @@
# Build architecture-dependent files here.
binary-arch: build install
-# dh_testversion
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs doc/ffmpeg_powerpc_performance_evaluation_howto.txt doc/optimization.txt
dh_installdocs -A CREDITS doc/TODO debian/patents.txt debian/README.Debian
dh_installexamples -pffmpeg doc/ffserver.conf
dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
dh_installcron
-# dh_installmanpages
dh_installinfo
dh_installmime
-# dh_undocumented
dh_installchangelogs Changelog
dh_link
dh_strip
@@ -179,7 +165,6 @@
dh_fixperms
dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
More information about the Pkg-multimedia-commits
mailing list