r779 - in /siretart/ffmpeg/debian: README.source changelog control patches/010_shared_library_versioning.diff rules

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon May 28 20:33:58 UTC 2007 

Author: siretart
Date: Mon May 28 20:33:58 2007
New Revision: 779

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=779
Log:
update to svn.20070330
document how to have encoders removed


Modified:
    siretart/ffmpeg/debian/README.source
    siretart/ffmpeg/debian/changelog
    siretart/ffmpeg/debian/control
    siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
    siretart/ffmpeg/debian/rules

Modified: siretart/ffmpeg/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/README.source?rev=779&op=diff
==============================================================================
--- siretart/ffmpeg/debian/README.source (original)
+++ siretart/ffmpeg/debian/README.source Mon May 28 20:33:58 2007
@@ -1,6 +1,8 @@
 # This is how we create an ffmpeg orig tarball:
+# (NB: you need the package unifdef installed)
 DATE=${1:-$(date +%Y%m%d)}
 TREE="ffmpeg-0.svn$DATE"
 rm -Rf "$TREE"
 svn export svn://svn.mplayerhq.hu/ffmpeg/trunk "$TREE"
+grep -r CONFIG_ENCODERS "$TREE"/libavcodec/* -l | while read i; do unifdef -UCONFIG_ENCODERS <$i >$i.new; mv $i.new $i; done
 tar cvzf ffmpeg_0.svn"$DATE".orig.tar.gz "$TREE"

Modified: siretart/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/changelog?rev=779&op=diff
==============================================================================
--- siretart/ffmpeg/debian/changelog (original)
+++ siretart/ffmpeg/debian/changelog Mon May 28 20:33:58 2007
@@ -1,3 +1,11 @@
+ffmpeg (0.svn20070307-5) unstable; urgency=low
+
+  * disable encoders. Document how to get a tarball without encoders in 
+    debian/README.source
+  * remove dependency on x264 as removed from debian for now
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 27 May 2007 18:49:56 +0200
+
 ffmpeg (0.cvs20070307-4) experimental; urgency=low
 
   * added myself to uploaders

Modified: siretart/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/control?rev=779&op=diff
==============================================================================
--- siretart/ffmpeg/debian/control (original)
+++ siretart/ffmpeg/debian/control Mon May 28 20:33:58 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Loic Minier <lool at dooz.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, libx264-dev
+Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/ffmpeg
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/

Modified: siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff?rev=779&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff (original)
+++ siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff Mon May 28 20:33:58 2007
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: ffmpeg.unstable/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 @@
+--- ffmpeg.unstable.orig/configure	2007-05-28 22:16:52.000000000 +0200
++++ ffmpeg.unstable/configure	2007-05-28 22:16:56.000000000 +0200
+@@ -1965,11 +1965,11 @@
    echo "BUILD_DOC=yes" >> config.mak
  fi
  
@@ -19,7 +19,7 @@
  
  
  
-@@ -2057,9 +2057,9 @@
+@@ -2098,9 +2098,9 @@
  pkgconfig_generate(){
  name=$1
  comment=$2
@@ -31,7 +31,7 @@
  include=$6
  cat <<EOF >$name.pc
  prefix=$PREFIX
-@@ -2081,9 +2081,9 @@
+@@ -2122,9 +2122,9 @@
  name=$1
  shortname=${name#lib}
  comment=$2
@@ -43,49 +43,49 @@
  cat <<EOF >$name-uninstalled.pc
  prefix=
  exec_prefix=
-Index: ffmpeg-0.cvs20070307/libavutil/avutil.h
+Index: ffmpeg.unstable/libavutil/avutil.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
+--- ffmpeg.unstable.orig/libavutil/avutil.h	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/libavutil/avutil.h	2007-05-28 22:18:14.000000000 +0200
 @@ -35,7 +35,7 @@
  #define AV_TOSTRING(s) #s
  
- #define LIBAVUTIL_VERSION_INT   ((49<<16)+(3<<8)+0)
--#define LIBAVUTIL_VERSION       49.3.0
-+#define LIBAVUTIL_VERSION       1d.49.3.0
+ #define LIBAVUTIL_VERSION_INT   ((49<<16)+(4<<8)+0)
+-#define LIBAVUTIL_VERSION       49.4.0
++#define LIBAVUTIL_VERSION       1d.49.4.0
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+Index: ffmpeg.unstable/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
+--- ffmpeg.unstable.orig/libavcodec/avcodec.h	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/libavcodec/avcodec.h	2007-05-28 22:18:49.000000000 +0200
 @@ -38,7 +38,7 @@
  #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_VERSION_INT  ((51<<16)+(40<<8)+2)
+-#define LIBAVCODEC_VERSION      51.40.2
++#define LIBAVCODEC_VERSION      1d.51.40.2
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: ffmpeg-0.cvs20070307/libavformat/avformat.h
+Index: ffmpeg.unstable/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
+--- ffmpeg.unstable.orig/libavformat/avformat.h	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/libavformat/avformat.h	2007-05-28 22:18:46.000000000 +0200
 @@ -26,7 +26,7 @@
  #endif
  
- #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)+(11<<8)+0)
+-#define LIBAVFORMAT_VERSION     51.11.0
++#define LIBAVFORMAT_VERSION     1d.51.11.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20070307/common.mak
+Index: ffmpeg.unstable/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
+--- ffmpeg.unstable.orig/common.mak	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/common.mak	2007-05-28 22:16:56.000000000 +0200
 @@ -68,7 +68,7 @@
  	cd "$(shlibdir)" && \
  		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -95,10 +95,10 @@
  	$(SLIB_INSTALL_EXTRA_CMD)
  
  install-lib-static: $(LIB)
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.h
+Index: ffmpeg.unstable/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
+--- ffmpeg.unstable.orig/libpostproc/postprocess.h	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/libpostproc/postprocess.h	2007-05-28 22:16:56.000000000 +0200
 @@ -32,7 +32,7 @@
  #endif
  
@@ -108,10 +108,10 @@
  #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
  
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
-Index: ffmpeg-0.cvs20070307/libswscale/swscale.h
+Index: ffmpeg.unstable/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
+--- ffmpeg.unstable.orig/libswscale/swscale.h	2007-05-27 19:40:43.000000000 +0200
++++ ffmpeg.unstable/libswscale/swscale.h	2007-05-28 22:16:56.000000000 +0200
 @@ -37,7 +37,7 @@
  #define AV_TOSTRING(s) #s
  

Modified: siretart/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/rules?rev=779&op=diff
==============================================================================
--- siretart/ffmpeg/debian/rules (original)
+++ siretart/ffmpeg/debian/rules Mon May 28 20:33:58 2007
@@ -5,8 +5,8 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 LIBS = libavutil libavcodec libpostproc libavformat libswscale
-confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads
-confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-liba52 --enable-libdts --enable-libgsm --enable-x264
+confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads --disable-encoders
+confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-liba52 --enable-libdts --enable-libgsm
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 
@@ -51,12 +51,14 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	
 	# Build and backup static libraries
+	$(DEB_EXTRA_CONFIG_FLAGS) \
 	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
 	$(MAKE) -C doc
 	$(MAKE)
 	for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
 	
 	# Build ffmpeg and shared libraries
+	$(DEB_EXTRA_CONFIG_FLAGS) \
 	./configure $(confflags) --enable-shared --prefix=/usr
 	sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
 	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic

More information about the pkg-multimedia-commits mailing list