r1070 - in /experimental/ffmpeg/debian: changelog control rules
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Tue Mar 4 15:42:19 UTC 2008
Author: fabian-guest
Date: Tue Mar 4 15:42:19 2008
New Revision: 1070
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1070
Log:
* debian/control:
+ Wrapped Uploaders, Build-Depends and Depends,
Conflicts and Replaces fields.
+ Added libfaad-dev to Build-Depends.
+ Added Homepage field.
+ Added ${misc:Depends} to all Depends.
* debian/rules:
+ Enabled faad support via libfaad
(Closes: #400094, #418230, #447089, #448068, #449387).
+ Added libmp3lame-dev to weak-build-deps in DEB_BUILD_OPTIONS=risky.
+ Added support for amrnb, amrwb and x264 (Closes: #432170) in
DEB_BUILD_OPTIONS=risky.
Modified:
experimental/ffmpeg/debian/changelog
experimental/ffmpeg/debian/control
experimental/ffmpeg/debian/rules
Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=1070&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Tue Mar 4 15:42:19 2008
@@ -1,3 +1,20 @@
+ffmpeg-free (0.cvs20071007-4) experimental; urgency=low
+
+ * debian/control:
+ + Wrapped Uploaders, Build-Depends and Depends,
+ Conflicts and Replaces fields.
+ + Added libfaad-dev to Build-Depends.
+ + Added Homepage field.
+ + Added ${misc:Depends} to all Depends.
+ * debian/rules:
+ + Enabled faad support via libfaad
+ (Closes: #400094, #418230, #447089, #448068, #449387).
+ + Added libmp3lame-dev to weak-build-deps in DEB_BUILD_OPTIONS=risky.
+ + Added support for amrnb, amrwb and x264 (Closes: #432170) in
+ DEB_BUILD_OPTIONS=risky.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 03 Mar 2008 10:28:05 +0100
+
ffmpeg-free (0.cvs20071007-3) experimental; urgency=low
* disable armv6 code generation. Thanks to Joey Hess for the patch
Modified: experimental/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/control?rev=1070&op=diff
==============================================================================
--- experimental/ffmpeg/debian/control (original)
+++ experimental/ffmpeg/debian/control Tue Mar 4 15:42:19 2008
@@ -2,21 +2,34 @@
Section: libs
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, zlib1g-dev,
- libsdl1.2-dev, libfreetype6-dev, libimlib2-dev,
- 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, texi2html
+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),
+ liba52-dev,
+ libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libfaad-dev,
+ libfreetype6-dev,
+ libgsm1-dev,
+ libimlib2-dev,
+ libogg-dev,
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsdl1.2-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
+ libvorbis-dev,
+ quilt,
+ texi2html,
+ zlib1g-dev
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/ffmpeg/debian/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/
+Homepage: http://ffmpeg.mplayerhq.hu/
Package: ffmpeg
Section: graphics
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: multimedia player, server and encoder
This package contains the ffplay multimedia player, the ffserver streaming
server and the ffmpeg audio and video encoder. They support most existing
@@ -26,7 +39,8 @@
Package: libavutil1d
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: ffmpeg utility library
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
@@ -37,7 +51,8 @@
Package: libavcodec1d
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: ffmpeg codec library
This is the codec library from the ffmpeg project. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@ -48,7 +63,8 @@
Package: libpostproc1d
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: ffmpeg video postprocessing library
This is the video postprocessing library from the ffmpeg project.
.
@@ -58,7 +74,8 @@
Package: libavformat1d
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: ffmpeg file format library
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -69,7 +86,8 @@
Package: libswscale1d
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: ffmpeg video scaling library
This is the video scaling library from the ffmpeg project.
.
@@ -79,9 +97,13 @@
Package: libavutil-dev
Section: libdevel
Architecture: any
-Depends: libavutil1d (= ${binary:Version}), ${shlibs:Depends}
-Conflicts: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
-Replaces: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
+Depends: libavutil1d (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavformat-dev (<< 0.cvs20060329-4),
+ libavcodec-dev (<< 0.cvs20070307-1)
+Replaces: libavformat-dev (<< 0.cvs20060329-4),
+ libavcodec-dev (<< 0.cvs20070307-1)
Description: development files for libavutil
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
@@ -92,7 +114,17 @@
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libavcodec1d (= ${binary:Version}), libavutil-dev (= ${binary:Version}), libvorbis-dev, libogg-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Depends: libavcodec1d (= ${binary:Version}),
+ libavutil-dev (= ${binary:Version}),
+ liba52-dev,
+ libgsm1-dev,
+ libogg-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
+ libvorbis-dev,
+ zlib1g-dev,
+ ${lib1394-dev},
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4)
Replaces: libavformat-dev (<< 0.cvs20060329-4)
Description: development files for libavcodec
@@ -105,7 +137,10 @@
Package: libpostproc-dev
Section: libdevel
Architecture: any
-Depends: libpostproc1d (= ${binary:Version}), libavcodec-dev (= ${binary:Version}), ${shlibs:Depends}
+Depends: libpostproc1d (= ${binary:Version}),
+ libavcodec-dev (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -115,7 +150,10 @@
Package: libavformat-dev
Section: libdevel
Architecture: any
-Depends: libavformat1d (= ${binary:Version}), libavcodec-dev (= ${binary:Version}), ${shlibs:Depends}
+Depends: libavformat1d (= ${binary:Version}),
+ libavcodec-dev (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: libavcodec-dev (<< 0.cvs20060306-1)
Replaces: libavcodec-dev (<< 0.cvs20060306-1)
Description: development files for libavformat
@@ -128,7 +166,10 @@
Package: libswscale-dev
Section: libdevel
Architecture: any
-Depends: libswscale1d (= ${binary:Version}), libavutil-dev (= ${binary:Version}), ${shlibs:Depends}
+Depends: libswscale1d (= ${binary:Version}),
+ libavutil-dev (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1070&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Tue Mar 4 15:42:19 2008
@@ -8,6 +8,7 @@
confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads
confflags += --enable-libvorbis --enable-libtheora --enable-libogg
confflags += --enable-liba52 --enable-libgsm
+confflags += --enable-libfaad
confflags += --disable-armv6 --disable-armv5te
DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
@@ -36,14 +37,18 @@
endif
ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-weak-build-deps += liblame-dev
+weak-build-deps += libamrnb-dev
+confflags += --enable-libamr-nb
+weak-build-deps += libamrwb-dev
+confflags += --enable-libamr-wb
+weak-build-deps += libmp3lame-dev | liblame-dev
confflags += --enable-libmp3lame
-weak-build-deps += libfaad2-dev
-confflags += --enable-libfaadbin --enable-libfaad
weak-build-deps += libfaac-dev
confflags += --enable-libfaac
weak-build-deps += libxvidcore-dev
confflags += --enable-xvid
+weak-build-deps += libx264-dev
+confflags += --enable-x264
$(warning Make sure these packages are installed: $(weak-build-deps))
endif
More information about the pkg-multimedia-commits
mailing list