r71 - tarballs unstable/ffmpeg/debian unstable/ffmpeg/debian/patches
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:19:40 CET 2007
Author: sho
Date: 2006-08-23 12:09:20 +0000 (Wed, 23 Aug 2006)
New Revision: 71
Added:
tarballs/ffmpeg_0.cvs20060823.orig.tar.gz
Modified:
unstable/ffmpeg/debian/changelog
unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060823-1) unstable; urgency=low
* New SVN snapshot (Closes: #368904).
* debian/control:
+ Set policy to 3.7.2.
+ Do not build 1394 support on GNU/kFreeBSD or Hurd. Patch courtesy of
Petr Salinger (Closes: #372290).
* debian/rules:
+ Minor cleanup.
+ Removed --enable-theora, upstream dropped that option.
* debian/patches/020_mmx_intrinsics.diff:
+ Disabled intrinsics workaround because it is no longer necessary and it
causes trouble with some codecs such as H264 (Closes: #373765).
Added: tarballs/ffmpeg_0.cvs20060823.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/ffmpeg_0.cvs20060823.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog 2006-08-17 06:06:25 UTC (rev 70)
+++ unstable/ffmpeg/debian/changelog 2006-08-23 12:09:20 UTC (rev 71)
@@ -1,4 +1,4 @@
-ffmpeg (0.cvs20060724-1) UNRELEASED; urgency=low
+ffmpeg (0.cvs20060823-1) unstable; urgency=low
* New SVN snapshot (Closes: #368904).
* debian/control:
@@ -13,7 +13,7 @@
+ Disabled intrinsics workaround because it is no longer necessary and it
causes trouble with some codecs such as H264 (Closes: #373765).
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 24 Jul 2006 17:15:56 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 23 Aug 2006 12:09:58 +0200
ffmpeg (0.cvs20060329-4) unstable; urgency=low
Modified: unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff 2006-08-17 06:06:25 UTC (rev 70)
+++ unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff 2006-08-23 12:09:20 UTC (rev 71)
@@ -1,26 +1,28 @@
-Index: ffmpeg-0.cvs20060724/configure
+Index: ffmpeg-0.cvs20060817/configure
===================================================================
---- ffmpeg-0.cvs20060724.orig/configure 2006-07-24 17:20:09.000000000 +0200
-+++ ffmpeg-0.cvs20060724/configure 2006-07-24 17:20:19.000000000 +0200
-@@ -1741,10 +1741,10 @@
+--- ffmpeg-0.cvs20060817.orig/configure 2006-08-17 12:45:30.000000000 +0200
++++ ffmpeg-0.cvs20060817/configure 2006-08-17 12:49:18.000000000 +0200
+@@ -1744,11 +1744,11 @@
echo "#define HAVE_VHOOK 1" >> $TMPH
fi
+-sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.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/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\.]*//'`
++sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.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.cvs20060724/libavutil/avutil.h
+Index: ffmpeg-0.cvs20060817/libavutil/avutil.h
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavutil/avutil.h 2006-07-24 17:11:16.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavutil/avutil.h 2006-07-24 17:20:19.000000000 +0200
+--- ffmpeg-0.cvs20060817.orig/libavutil/avutil.h 2006-07-24 17:11:16.000000000 +0200
++++ ffmpeg-0.cvs20060817/libavutil/avutil.h 2006-08-17 12:47:42.000000000 +0200
@@ -15,7 +15,7 @@
#define AV_TOSTRING(s) #s
@@ -30,23 +32,23 @@
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-Index: ffmpeg-0.cvs20060724/libavcodec/avcodec.h
+Index: ffmpeg-0.cvs20060817/libavcodec/avcodec.h
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/avcodec.h 2006-07-24 17:11:20.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/avcodec.h 2006-07-24 17:20:51.000000000 +0200
+--- ffmpeg-0.cvs20060817.orig/libavcodec/avcodec.h 2006-08-17 12:39:27.000000000 +0200
++++ ffmpeg-0.cvs20060817/libavcodec/avcodec.h 2006-08-17 12:49:57.000000000 +0200
@@ -18,7 +18,7 @@
#define AV_TOSTRING(s) #s
- #define LIBAVCODEC_VERSION_INT ((51<<16)+(10<<8)+0)
--#define LIBAVCODEC_VERSION 51.10.0
-+#define LIBAVCODEC_VERSION 0d.51.10.0
+ #define LIBAVCODEC_VERSION_INT ((51<<16)+(11<<8)+0)
+-#define LIBAVCODEC_VERSION 51.11.0
++#define LIBAVCODEC_VERSION 0d.51.11.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: ffmpeg-0.cvs20060724/libavformat/avformat.h
+Index: ffmpeg-0.cvs20060817/libavformat/avformat.h
===================================================================
---- ffmpeg-0.cvs20060724.orig/libavformat/avformat.h 2006-07-24 17:11:24.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavformat/avformat.h 2006-07-24 17:21:07.000000000 +0200
+--- ffmpeg-0.cvs20060817.orig/libavformat/avformat.h 2006-08-17 12:39:28.000000000 +0200
++++ ffmpeg-0.cvs20060817/libavformat/avformat.h 2006-08-17 12:47:42.000000000 +0200
@@ -6,7 +6,7 @@
#endif
@@ -56,23 +58,23 @@
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20060724/common.mak
+Index: ffmpeg-0.cvs20060817/common.mak
===================================================================
---- ffmpeg-0.cvs20060724.orig/common.mak 2006-07-24 17:11:24.000000000 +0200
-+++ ffmpeg-0.cvs20060724/common.mak 2006-07-24 17:21:35.000000000 +0200
-@@ -68,7 +68,7 @@
- $(shlibdir)/$(SLIBNAME_WITH_VERSION)
- ln -sf $(SLIBNAME_WITH_VERSION) \
- $(shlibdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-+ ln -sf $(SLIBNAME_WITH_MAJOR) \
- $(shlibdir)/$(SLIBNAME)
- endif
+--- ffmpeg-0.cvs20060817.orig/common.mak 2006-08-17 12:39:28.000000000 +0200
++++ ffmpeg-0.cvs20060817/common.mak 2006-08-17 12:50:26.000000000 +0200
+@@ -64,7 +64,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)
-Index: ffmpeg-0.cvs20060724/libpostproc/postprocess.h
+ install-lib-static: $(LIB)
+ install -d "$(libdir)"
+Index: ffmpeg-0.cvs20060817/libpostproc/postprocess.h
===================================================================
---- ffmpeg-0.cvs20060724.orig/libpostproc/postprocess.h 2006-06-11 14:17:36.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libpostproc/postprocess.h 2006-07-24 17:20:19.000000000 +0200
+--- ffmpeg-0.cvs20060817.orig/libpostproc/postprocess.h 2006-06-11 14:17:36.000000000 +0200
++++ ffmpeg-0.cvs20060817/libpostproc/postprocess.h 2006-08-17 12:47:42.000000000 +0200
@@ -30,7 +30,7 @@
#endif
Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules 2006-08-17 06:06:25 UTC (rev 70)
+++ unstable/ffmpeg/debian/rules 2006-08-23 12:09:20 UTC (rev 71)
@@ -134,6 +134,7 @@
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
+ rm -f debian/tmp/usr/include/ffmpeg/swscale.h # unused yet
cp libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
cp libpostproc/libpostproc.a debian/tmp/usr/lib
cp libpostproc/postprocess.h debian/tmp/usr/include/postproc
@@ -171,6 +172,9 @@
dh_strip
dh_compress
dh_fixperms
+ dh_makeshlibs -p libavcodec0d -V 'libavcodec0d (>= 0.cvs20060823)'
+ dh_makeshlibs -p libavformat0d -V 'libavformat0d (>= 0.cvs20060823)'
+ dh_makeshlibs -p libpostproc0d -V 'libpostproc0d (>= 0.cvs20060823)'
dh_makeshlibs
dh_installdeb
dh_shlibdeps
More information about the Pkg-multimedia-commits
mailing list