r1076 - /experimental/ffmpeg.20080206/debian/
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Tue Mar 18 15:22:43 UTC 2008
Author: fabian-guest
Date: Tue Mar 18 15:22:43 2008
New Revision: 1076
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1076
Log:
* debian/changelog:
+ Source is exported from SVN, not CVS. Reflect this in the versioning
scheme (Closes: #468319).
* debian/control:
+ Changed Build-Depends to liba52-0.7.4-dev | liba52-dev.
+ Improved descriptions and dependencies for libavdevice packages.
* debian/control, debian/*.install:
+ Adopted shared library package names to upstream SONAMEs.
* debian/README.Debian:
+ Updated, since AAC decoding (through FAAD) is now enabled.
+ Updated URL for unofficial ffmpeg packages.
* debian/rules:
+ Removed trailing whitespace.
+ Removed unused strip rule.
+ Added libxvidcore4-dev to weak-build-deps and fixed confflags
in DEB_BUILD_OPTIONS=risky accordingly.
+ Added a get-orig-source rule to reproduce the source tarball. Produce an
unstripped tarball if DEB_BUILD_OPTIONS=risky.
+ Do not run debian/fixup-config.sh if DEB_BUILD_OPTIONS=risky.
Added:
experimental/ffmpeg.20080206/debian/libavcodec51.install
- copied unchanged from r1075, experimental/ffmpeg.20080206/debian/libavcodec1d.install
experimental/ffmpeg.20080206/debian/libavdevice-dev.install
experimental/ffmpeg.20080206/debian/libavdevice52.install
experimental/ffmpeg.20080206/debian/libavformat52.install
- copied unchanged from r1075, experimental/ffmpeg.20080206/debian/libavformat1d.install
experimental/ffmpeg.20080206/debian/libavutil49.install
- copied unchanged from r1075, experimental/ffmpeg.20080206/debian/libavutil1d.install
experimental/ffmpeg.20080206/debian/libpostproc51.install
- copied unchanged from r1075, experimental/ffmpeg.20080206/debian/libpostproc1d.install
Removed:
experimental/ffmpeg.20080206/debian/libavcodec1d.install
experimental/ffmpeg.20080206/debian/libavformat1d.install
experimental/ffmpeg.20080206/debian/libavutil1d.install
experimental/ffmpeg.20080206/debian/libpostproc1d.install
Modified:
experimental/ffmpeg.20080206/debian/README.Debian
experimental/ffmpeg.20080206/debian/changelog
experimental/ffmpeg.20080206/debian/control
experimental/ffmpeg.20080206/debian/rules
Modified: experimental/ffmpeg.20080206/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/README.Debian?rev=1076&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/README.Debian (original)
+++ experimental/ffmpeg.20080206/debian/README.Debian Tue Mar 18 15:22:43 2008
@@ -13,11 +13,11 @@
source software cover the following codec technologies and file formats:
* MP3 encoding
- * AAC decoding and encoding
+ * AAC encoding
* the ASF file format
I did not activate MP3 encoding (through LAME) in libavcodec, nor AAC
-support (through FAAC/FAAD). However, since I have found no real enforcement
+encoding (through FAAC). However, since I have found no real enforcement
of the mysterious ASF file format patents, I did not deactivate ASF support in
libavformat. See more details in the patents.txt file.
@@ -27,7 +27,7 @@
There are popular unofficial ffmpeg packages at the following URL:
- ftp://ftp.nerim.net/debian-marillat/index.html
+ http://www.debian-multimedia.org/
I have nothing to do with these packages and it would be very tedious
for me to track their changes. Given that my official packages use a
Modified: experimental/ffmpeg.20080206/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/changelog?rev=1076&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/changelog (original)
+++ experimental/ffmpeg.20080206/debian/changelog Tue Mar 18 15:22:43 2008
@@ -1,5 +1,6 @@
-ffmpeg-free (0.cvs20080206-1) experimental; urgency=low
-
+ffmpeg-free (0.svn20080206-1) experimental; urgency=low
+
+ [ Reinhard Tartler ]
* new upstream release
* refreshed patches
* libogg was dropped upstream
@@ -11,7 +12,28 @@
public API now.
* introduce new package: libavdevice52 and libavdevice-dev.
- -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Mar 2008 22:45:56 +0100
+ [ Fabian Greffrath ]
+ * debian/changelog:
+ + Source is exported from SVN, not CVS. Reflect this in the versioning
+ scheme (Closes: #468319).
+ * debian/control:
+ + Changed Build-Depends to liba52-0.7.4-dev | liba52-dev.
+ + Improved descriptions and dependencies for libavdevice packages.
+ * debian/control, debian/*.install:
+ + Adopted shared library package names to upstream SONAMEs.
+ * debian/README.Debian:
+ + Updated, since AAC decoding (through FAAD) is now enabled.
+ + Updated URL for unofficial ffmpeg packages.
+ * debian/rules:
+ + Removed trailing whitespace.
+ + Removed unused strip rule.
+ + Added libxvidcore4-dev to weak-build-deps and fixed confflags
+ in DEB_BUILD_OPTIONS=risky accordingly.
+ + Added a get-orig-source rule to reproduce the source tarball. Produce an
+ unstripped tarball if DEB_BUILD_OPTIONS=risky.
+ + Do not run debian/fixup-config.sh if DEB_BUILD_OPTIONS=risky.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Tue, 18 Mar 2008 12:34:33 +0100
ffmpeg-free (0.cvs20071007-4) experimental; urgency=low
Modified: experimental/ffmpeg.20080206/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/control?rev=1076&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/control (original)
+++ experimental/ffmpeg.20080206/debian/control Tue Mar 18 15:22:43 2008
@@ -6,7 +6,7 @@
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>
Build-Depends: debhelper (>= 4.0),
- liba52-dev,
+ liba52-0.7.4-dev | liba52-dev,
libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfaad-dev | libfaad2-dev,
libfreetype6-dev,
@@ -35,7 +35,7 @@
file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
DivX, MPEG4, AC3, DV...).
-Package: libavutil1d
+Package: libavutil49
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -47,7 +47,7 @@
This package contains a Debian-specific version of the libswscale shared
object that should only be used by Debian packages.
-Package: libavcodec1d
+Package: libavcodec51
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -59,19 +59,18 @@
This package contains a Debian-specific version of the libavcodec shared
object that should only be used by Debian packages.
-Package: libavdevice1d
-Section: libs
-Architecture: any
-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...).
+Package: libavdevice52
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: ffmpeg device handling library
+ This is the device handling library from the ffmpeg project.
.
This package contains a Debian-specific version of the libavdevice shared
object that should only be used by Debian packages.
-Package: libpostproc1d
+Package: libpostproc51
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -82,7 +81,7 @@
This package contains a Debian-specific version of the libpostproc shared
object that should only be used by Debian packages.
-Package: libavformat1d
+Package: libavformat52
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -108,7 +107,7 @@
Package: libavutil-dev
Section: libdevel
Architecture: any
-Depends: libavutil1d (= ${binary:Version}),
+Depends: libavutil49 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4),
@@ -125,7 +124,7 @@
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libavcodec1d (= ${binary:Version}),
+Depends: libavcodec51 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
liba52-dev,
libgsm1-dev,
@@ -148,14 +147,14 @@
Package: libavdevice-dev
Section: libdevel
Architecture: any
-Depends: libavformat-dev (= ${binary:Version}),
+Depends: libavdevice52 (= ${binary:Version}),
+ libavformat-dev (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4)
Replaces: libavformat-dev (<< 0.cvs20060329-4)
-Description: development files for libavcodec
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+Description: development files for libavdevice
+ This is the device handling library from the ffmpeg project.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavdevice.
@@ -163,7 +162,7 @@
Package: libpostproc-dev
Section: libdevel
Architecture: any
-Depends: libpostproc1d (= ${binary:Version}),
+Depends: libpostproc51 (= ${binary:Version}),
libavcodec-dev (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
@@ -176,7 +175,7 @@
Package: libavformat-dev
Section: libdevel
Architecture: any
-Depends: libavformat1d (= ${binary:Version}),
+Depends: libavformat52 (= ${binary:Version}),
libavcodec-dev (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Added: experimental/ffmpeg.20080206/debian/libavdevice-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/libavdevice-dev.install?rev=1076&op=file
==============================================================================
--- experimental/ffmpeg.20080206/debian/libavdevice-dev.install (added)
+++ experimental/ffmpeg.20080206/debian/libavdevice-dev.install Tue Mar 18 15:22:43 2008
@@ -1,0 +1,4 @@
+usr/lib/pkgconfig/libavdevice.pc
+usr/include/ffmpeg/avdevice.h
+usr/lib/libavdevice.a
+usr/lib/libavdevice.so
Added: experimental/ffmpeg.20080206/debian/libavdevice52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/libavdevice52.install?rev=1076&op=file
==============================================================================
--- experimental/ffmpeg.20080206/debian/libavdevice52.install (added)
+++ experimental/ffmpeg.20080206/debian/libavdevice52.install Tue Mar 18 15:22:43 2008
@@ -1,0 +1,1 @@
+usr/lib/libavdevice.so.*
Modified: experimental/ffmpeg.20080206/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/rules?rev=1076&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/rules (original)
+++ experimental/ffmpeg.20080206/debian/rules Tue Mar 18 15:22:43 2008
@@ -12,6 +12,8 @@
confflags += --disable-armv6 --disable-armv5te
DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
+SRC_VERSION := $(shell echo $(DEB_VERSION) | sed -ne 's/\-.*$//p')
+SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -ne 's/^[0-9]\.[a-z]*//p')
ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
confflags += --enable-libdc1394
@@ -38,17 +40,17 @@
ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
weak-build-deps += libamrnb-dev
-confflags += --enable-libamr-nb
+confflags += --enable-nonfree --enable-libamr-nb
weak-build-deps += libamrwb-dev
-confflags += --enable-libamr-wb
+confflags += --enable-nonfree --enable-libamr-wb
weak-build-deps += libmp3lame-dev | liblame-dev
confflags += --enable-libmp3lame
weak-build-deps += libfaac-dev
confflags += --enable-libfaac
-weak-build-deps += libxvidcore-dev
-confflags += --enable-xvid
+weak-build-deps += libxvidcore-dev | libxvidcore4-dev
+confflags += --enable-libxvid
weak-build-deps += libx264-dev
-confflags += --enable-x264
+confflags += --enable-libx264
$(warning Make sure these packages are installed: $(weak-build-deps))
endif
@@ -56,16 +58,20 @@
build-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
+
# Build and backup static libraries
./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
+ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
sh debian/fixup-config.sh >> config.h
+endif
$(MAKE)
for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
-
+
# Build ffmpeg and shared libraries
./configure $(confflags) --enable-shared --prefix=/usr
+ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
sh debian/fixup-config.sh >> config.h
+endif
echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
for d in $(LIBS); do \
$(MAKE) -C $$d clean && \
@@ -75,18 +81,18 @@
rm -f $$d/Makefile.pic ; \
done
rm -f config.mak.pic
-
+
# Restore static libraries and fix timestamps
for d in $(LIBS); do \
mv $$d/$$d.a.bak $$d/$$d.a ; \
touch $$d/$$d.a ; \
done
touch ffmpeg ffmpeg_g ffplay ffplay_g
-
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-$(MAKE) -C tests
endif
-
+
touch build-stamp
clean:
@@ -102,16 +108,24 @@
rm -f config.log
dh_clean
-strip:
- # strip/clean the code from potentially dangerous patented code
- sh -x debian/strip.sh
+get-orig-source:
+ svn export -r{$(SVN_VERSION)} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-free-$(SRC_VERSION)
+ # libswscale is just an unversioned redirect, so we have to export it properly by hand
+ rm -rf ffmpeg-free-$(SRC_VERSION)/libswscale
+ svn export -r{$(SVN_VERSION)} svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg-free-$(SRC_VERSION)/libswscale
+ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+ # strip/clean the code from potentially dangerous patented code
+ cd ffmpeg-free-$(SRC_VERSION) && sh debian/strip.sh
+endif
+ tar czf ../tarballs/ffmpeg-free_$(SRC_VERSION).orig.tar.gz ffmpeg-free-$(SRC_VERSION)/
+ rm -rf ffmpeg-free-$(SRC_VERSION)/
install: build
dh_testdir
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 libpostproc/libpostproc.a debian/tmp/usr/lib
@@ -120,11 +134,11 @@
for d in $(LIBS); do cp $$d/$$d.so* debian/tmp/usr/lib; done
cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
cp doc/ffserver.conf debian/tmp/etc/
-
+
sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ 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.
@@ -149,10 +163,10 @@
dh_compress
dh_fixperms
for d in $(LIBS); do \
- dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.cvs20080206)" ; \
+ dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.svn20080206)" ; \
done
dh_installdeb
- dh_shlibdeps -L libavutil51 -L libavcodec51 -L libavdevice52 -L libpostproc51 -L libavformat51 -L libswscale1d -l debian/libavutil51/usr/lib:debian/libavcodec51/usr/lib:debian/libavdevice52/usr/lib:debian/libavformat51/usr/lib:debian/libpostproc51/usr/lib:debian/libswscale1d/usr/lib
+ dh_shlibdeps -L libavutil49 -L libavcodec51 -L libavdevice52 -L libpostproc51 -L libavformat52 -L libswscale1d -l debian/libavutil49/usr/lib:debian/libavcodec51/usr/lib:debian/libavdevice52/usr/lib:debian/libavformat52/usr/lib:debian/libpostproc51/usr/lib:debian/libswscale1d/usr/lib
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
dh_builddeb
More information about the pkg-multimedia-commits
mailing list