--- libav-0.6.2.orig/debian/libswscale0.install +++ libav-0.6.2/debian/libswscale0.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libswscale.so.* --- libav-0.6.2.orig/debian/libavutil50.lintian-overrides +++ libav-0.6.2/debian/libavutil50.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libavutil50: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/libavformat52.lintian-overrides +++ libav-0.6.2/debian/libavformat52.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libavformat52: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/libswscale0.lintian-overrides +++ libav-0.6.2/debian/libswscale0.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libswscale0: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/libav-doc.doc-base +++ libav-0.6.2/debian/libav-doc.doc-base @@ -0,0 +1,9 @@ +Document: ffmpeg-doc +Title: ffmpeg API Documentation +Author: FFmpeg Developers +Abstract: This is the main documentation for the ffmpeg API. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libav-doc/html/index.html +Files: /usr/share/doc/libav-doc/html/*.html --- libav-0.6.2.orig/debian/libavfilter-dev.install +++ libav-0.6.2/debian/libavfilter-dev.install @@ -0,0 +1,4 @@ +usr/include/libavfilter +usr/lib/libavfilter.a +usr/lib/{,*/,*/*/}libavfilter.so +usr/lib/pkgconfig/libavfilter.pc --- libav-0.6.2.orig/debian/copyright +++ libav-0.6.2/debian/copyright @@ -0,0 +1,96 @@ +SVN snapshots are downloaded with subversion from the ffmpeg SVN at: + + +Upstream Authors: Fabrice Bellard + Alex Beregszaszi + BERO + Mario Brito + Ronald Bultje + Tim Ferguson + Brian Foley + Arpad Gereoffy + Philip Gladstone + Vladimir Gneushev + Wolfgang Hesseler + Falk Hueffner + Zdenek Kabelac + Robin Kay + Todd Kirby + Nick Kurshev + Mike Melanson + Michael Niedermayer + François Revol + Roman Shaposhnik + Dieter Shirley + Juan J. Sierralta + Ewald Snel + Leon van Stuivenberg + Roberto Togni + Lionel Ulmer + +Copyright (c) 2000-2004 Fabrice Bellard et al. + +The following files are licensed under the GNU GPL, as clarified below: + + * ffmpeg.c + * libavcodec: + + dtsdec.c + + i386/idct_mmx.c + + liba52/*.[ch] + * libavformat: + + x11grab.c + + gxfenc.c + * libpostproc: + + postprocess_internal.h + + postprocess_altivec_template.c + + postprocess.h + + postprocess_template.c + + postprocess.c + + mangle.h + * libswscale: + + swscale.c + + swscale-example.c + + yuv2rgb_template.c + + swscale_altivec_template.c + + yuv2rgb_altivec.c + + swscale_template.c + + rgb2rgb_template.c + + rgb2rgb.c + + cs_test.c + + yuv2rgb_mlib.c + + yuv2rgb.c + + | This library is free software; you can redistribute it and/or + | modify it under the terms of the GNU General Public License as + | published by the Free Software Foundation; either version 2 of + | the License, or (at your option) any later version. + | + | This library is distributed in the hope that it will be useful, + | but WITHOUT ANY WARRANTY; without even the implied warranty of + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + | Lesser General Public License for more details. + | + | You should have received a copy of the GNU General Public License + | along with this program; if not, write to the Free Software + | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +The rest of the code is licensed under the GNU LGPL: + + | This library is free software; you can redistribute it and/or + | modify it under the terms of the GNU Lesser General Public License as + | published by the Free Software Foundation; either version 2.1 of + | the License, or (at your option) any later version. + | + | This library is distributed in the hope that it will be useful, + | but WITHOUT ANY WARRANTY; without even the implied warranty of + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + | Lesser General Public License for more details. + | + | You should have received a copy of the GNU General Public License + | along with this program; if not, write to the Free Software + | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL' and the text of the +GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'. + --- libav-0.6.2.orig/debian/libav-source.install +++ libav-0.6.2/debian/libav-source.install @@ -0,0 +1 @@ +usr/src/libav-source.tar.gz --- libav-0.6.2.orig/debian/libavcodec-dev.install +++ libav-0.6.2/debian/libavcodec-dev.install @@ -0,0 +1,4 @@ +usr/include/libavcodec +usr/lib/libavcodec.a +usr/lib/{,*/,*/*/}libavcodec.so +usr/lib/pkgconfig/libavcodec.pc --- libav-0.6.2.orig/debian/qt-faststart.1 +++ libav-0.6.2/debian/qt-faststart.1 @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH QT-FASTSTART 1 "May 10, 2009" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +qt-faststart \- utility for Quicktime files +.SH SYNOPSIS +.B qt-faststart +.br +.SH DESCRIPTION +\fBqt-faststart\fP is a utility that rearranges a Quicktime file such that the +moov atom is in front of the data, thus facilitating network streaming. +.SH OPTIONS +Options processed by the executable: +.TP +\fB\\fR +The source Quicktime file. +.TP +\fB\\fR +The destination Quicktime file. +.SH AUTHOR +This manual page was written by Andres Mejia +for the Debian GNU/Linux system, but may be used by others. --- libav-0.6.2.orig/debian/control +++ libav-0.6.2/debian/control @@ -0,0 +1,283 @@ +Source: libav +Section: libs +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian multimedia packages maintainers +Uploaders: Sam Hocevar (Debian packages) , + Loic Minier , + Reinhard Tartler , + Fabian Greffrath , + Andres Mejia , + Jonas Smedegaard +DM-Upload-Allowed: yes +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary +Homepage: http://ffmpeg.org/ +Build-Depends-Indep: doxygen +Build-Depends: debhelper (>= 7), + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libbz2-dev, + libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libfreetype6-dev, + libgsm1-dev, + libimlib2-dev, + libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libschroedinger-dev, + libsdl1.2-dev, + libspeex-dev, + libtheora-dev (>> 0.0.0.alpha4), + libva-dev [!hurd-i386], + libvdpau-dev, + libvorbis-dev, + libvpx-dev, + libx11-dev, + libxext-dev, + libxfixes-dev, + libxvmc-dev, + quilt, + texi2html, + yasm [i386 amd64], + zlib1g-dev + +Package: ffmpeg +Section: video +Architecture: any +Replaces: libavcodec52 (<< ${source:Version}), + libavcodec-extra-52 (<< 4:0.6~) +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: ffprobe +Description: Multimedia player, server, encoder and transcoder + This package contains the ffplay multimedia player, the ffserver streaming + server and the ffmpeg audio and video encoder. They support most existing + file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG, + DivX, MPEG4, AC3, DV...). + +Package: ffmpeg-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libav-dbg +Breaks: libav-dbg (<< ${binary:Version}) +Replaces: libav-dbg (<< ${binary:Version}) +Description: Debug symbols for Libav related packages + This package contains debug data of the Libav related shared libraries. + . + Most people will not need this package. Please install it to produce useful + stacktraces to help debugging the Libav libraries. + . + This package is only used for transitional purposes and can be safely + removed. + +Package: libav-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libavutil50 (= ${binary:Version}), + libavcodec52 (= ${binary:Version}), + libavdevice52 (= ${binary:Version}), + libpostproc51 (= ${binary:Version}), + libavformat52 (= ${binary:Version}), + libswscale0 (= ${binary:Version}), + ffmpeg (= ${binary:Version}), + ${misc:Depends} +Description: Debug symbols for Libav related packages + This package contains debug data of the Libav related shared libraries. + . + Most people will not need this package. Please install it to produce useful + stacktraces to help debugging the Libav library. + +Package: libav-source +Architecture: all +Section: devel +Description: Patched Libav sources + This package contains a tarball the source file that were used to produce + this package, containing all modifications that have been applied inline. + . + This package is used as build-dependency for 'libav-extra', which provides + the "extra" variants of libav. + +Package: ffmpeg-doc +Section: doc +Architecture: all +Depends: libav-doc +Description: Documentation of the Libav API (transitional package) + This package contains the html doxygen documentation of the Libav API. + . + Only application developers will find this package useful. + . + This package is only used for transitional purposes and can be safely + removed. + +Package: libav-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Breaks: ffmpeg-doc (<< ${binary:Version}) +Replaces: ffmpeg-doc (<< ${binary:Version}) +Description: Documentation of the Libav API + This package contains the html doxygen documentation of the Libav API. + . + Only application developers will find this package useful. + +Package: libavutil50 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Libav utility library + This is the common utility library from Libav. It contains shared code + used by all other ffmpeg libraries. + +Package: libavcodec52 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Breaks: libavcodec51 (<< 3:0.svn20090303-1) +Description: Libav codec library + This is the codec library from Libav (both encoding and decoding). + . + It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...). + +Package: libavdevice52 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Libav device handling library + This is the device handling library from Libav. + +Package: libavformat52 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~) +Description: Libav file format library + This is the library for handling file formats from Libav. + . + It supports most existing file formats (AVI, MPEG, OGG, Matroska, + ASF...). + +Package: libavfilter1 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Libav video filtering library + This is the video filtering library from Libav. + +Package: libpostproc51 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Libav video postprocessing library + This is the video postprocessing library from Libav. + +Package: libswscale0 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~) +Description: Libav video scaling library + This is the video software scaling library from Libav. + +Package: libavutil-dev +Section: libdevel +Architecture: any +Depends: libavutil50 (>= ${binary:Version}) | libavutil-extra-50 (>= ${source:Upstream-Version}), + libavutil50 (<= ${source:Upstream-Version}-99) | libavutil-extra-50 (<= ${source:Upstream-Version}-99), + ${misc:Depends} +Description: Development files for libavutil + This is the common utility library from Libav. + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libavutil. + +Package: libavcodec-dev +Section: libdevel +Architecture: any +Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-extra-52 (>= ${source:Upstream-Version}), + libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99), + libavutil-dev (= ${binary:Version}), + ${misc:Depends} +Suggests: libfaad-dev, + libgsm1-dev, + libogg-dev, + libschroedinger-dev, + libspeex-dev, + libtheora-dev (>> 0.0.0.alpha4), + libvorbis-dev, + libx11-dev, + libxext-dev, + zlib1g-dev, + ${lib1394-dev} +Description: Development files for libavcodec + This is the codec library from Libav. It supports most existing + encoding formats (MPEG, DivX, MPEG4, AC3, DV...). + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libavcodec. + +Package: libavdevice-dev +Section: libdevel +Architecture: any +Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-extra-52 (>= ${source:Upstream-Version}), + libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99), + libavformat-dev (= ${binary:Version}), + ${misc:Depends} +Description: Development files for libavdevice + This is the device handling library from Libav. + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libavdevice. + +Package: libavformat-dev +Section: libdevel +Architecture: any +Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}), + libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99), + libavcodec-dev (= ${binary:Version}), + ${misc:Depends} +Description: Development files for libavformat + This is the demuxer library from Libav. It supports most + existing file formats (AVI, MPEG, OGG, Matroska, ASF...). + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libavformat. + +Package: libavfilter-dev +Section: libdevel +Architecture: any +Depends: libavfilter1 (>= ${binary:Version}) | libavfilter-extra-1 (>= ${source:Upstream-Version}), + libavfilter1 (<= ${source:Upstream-Version}-99) | libavfilter-extra-1 (<= ${source:Upstream-Version}-99), + libavcodec-dev (= ${binary:Version}), + ${misc:Depends} +Description: Development files for libavfilter + This is the video filtering library from Libav. + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libavfilter. + +Package: libpostproc-dev +Section: libdevel +Architecture: any +Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}), + libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99), + libavutil-dev (= ${binary:Version}), + ${misc:Depends} +Description: Development files for libpostproc + This is the video postprocessing library from Libav. + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libpostproc. + +Package: libswscale-dev +Section: libdevel +Architecture: any +Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-0 (>= ${source:Upstream-Version}), + libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99), + libavutil-dev (= ${binary:Version}), + ${misc:Depends} +Description: Development files for libswscale + This is the video scaling library from Libav. + . + This package contains the header files and static libraries needed to + compile applications or shared objects that use libswscale. --- libav-0.6.2.orig/debian/libavdevice52.lintian-overrides +++ libav-0.6.2/debian/libavdevice52.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libavdevice52: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/rules +++ libav-0.6.2/debian/rules @@ -0,0 +1,156 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +EPOCH=4: +DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p') +UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//') +SHLIBS_VERSION := 4:0.6-1~ + +LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control) + +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +# on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS +ifeq ($(DEB_HOST_ARCH),i386) +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) +else ifeq ($(DEB_HOST_ARCH),amd64) +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) +endif +endif + +include debian/confflags + +$(info FLAVORS = $(FLAVORS)) +$(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS)) +$(info CFLAGS = $(CFLAGS)) +$(info LDFLAGS = $(LDFLAGS)) + +snapshot_version: + [ ! -r .svnrevision ] || \ + cp .svnrevision $@ + touch $@ + +configure-%: configure-stamp-% +configure-stamp-%: $(QUILT_STAMPFN) snapshot_version + dh_testdir + mkdir -p debian-$* + cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \ + $($*_build_confflags) $(extra_$*_build_confflags) + touch $@ + +build-%: build-stamp-% +build-stamp-%: configure-stamp-% + dh_testdir + $(MAKE) -C debian-$* $(NUMJOBS) V=1 + touch $@ + +debian-shared/tools/qt-faststart: build-stamp-shared + $(MAKE) -C debian-shared tools/qt-faststart V=1 + +build-doxy: build-doxy-stamp +build-doxy-stamp: $(QUILT_STAMPFN) + dh_testdir + doxygen + touch $@ + +build: build-stamp +build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart + touch $@ + +clean: clean-real unpatch +clean-real: + dh_testdir + dh_testroot + rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \ + $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp \ + build-doxy-stamp + rm -rf $(addprefix debian-, $(FLAVORS)) doxy + dh_clean + +get-orig-source: + dh_testdir + sh debian/get-orig-source.sh -d $(SVN_VERSION) + +# The trailing newline is important! +define install_flavor + $(MAKE) -C debian-$(1) install DESTDIR=$(CURDIR)/debian/tmp \ + mandir=$(CURDIR)/debian/tmp/usr/share/man + +endef + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs -ptmp usr/src + tar czvf debian/tmp/usr/src/libav-source.tar.gz . \ + --exclude 'debian*' --exclude .git --exclude .pc --exclude '*-stamp' \ + --transform 's,^./,libav/,' + dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc + dh_installdirs -ptmp usr/share/doc/libav-doc/html + $(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor))) + # don't fail on binary-indep only builds. + [ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc + install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/ + install -m 644 -D doc/ffserver.conf debian/tmp/etc/ + install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart + dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/ffmpeg \ + --fail-missing --sourcedir=debian/tmp + +formats.txt: install + env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \ + debian/tmp/usr/bin/ffmpeg -formats | tee $@ + +codecs.txt: install + env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \ + debian/tmp/usr/bin/ffmpeg -codecs | tee $@ + +binary-indep: build-doxy install + +binary-arch: build install codecs.txt formats.txt + dh_testdir + dh_testroot + dh_installman -pffmpeg debian/qt-faststart.1 + dh_installdocs $(extradoc) doc/optimization.txt + dh_installdocs -A MAINTAINERS CREDITS doc/TODO + dh_installdocs -A debian/README.Debian + dh_installdocs -p libavcodec52 codecs.txt + dh_installdocs -p libavformat52 formats.txt + dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh + dh_installexamples -plibavcodec-dev libavcodec/api-example.c + dh_installchangelogs Changelog + dh_lintian + dh_link + dh_compress + dh_fixperms + dh_strip --dbg-package=libav-dbg + +# strict internal dependencies + for pkg in $(LIB_PKGS); do \ + upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \ + dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \ + done + env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \ + dh_shlibdeps +# target dependencies for external packages + for pkg in $(LIB_PKGS); do \ + upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \ + dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \ + done + dh_installdeb + dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)" + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build $(addprefix build-, $(FLAVORS)) build-doxy \ + clean clean-real \ + configure $(addprefix configure-, $(FLAVORS)) \ + binary binary-indep binary-arch \ + install \ + get-orig-source --- libav-0.6.2.orig/debian/libswscale-dev.install +++ libav-0.6.2/debian/libswscale-dev.install @@ -0,0 +1,4 @@ +usr/include/libswscale +usr/lib/libswscale.a +usr/lib/{,*/,*/*/}libswscale.so +usr/lib/pkgconfig/libswscale.pc --- libav-0.6.2.orig/debian/libavutil-dev.install +++ libav-0.6.2/debian/libavutil-dev.install @@ -0,0 +1,4 @@ +usr/include/libavutil +usr/lib/libavutil.a +usr/lib/{,*/,*/*/}libavutil.so +usr/lib/pkgconfig/libavutil.pc --- libav-0.6.2.orig/debian/libpostproc-dev.install +++ libav-0.6.2/debian/libpostproc-dev.install @@ -0,0 +1,4 @@ +usr/include/libpostproc +usr/lib/libpostproc.a +usr/lib/{,*/,*/*/}libpostproc.so +usr/lib/pkgconfig/libpostproc.pc --- libav-0.6.2.orig/debian/confflags +++ libav-0.6.2/debian/confflags @@ -0,0 +1,240 @@ +# -*- mode: makefile -*- +# vim:syntax=make + +# build a static version on every architecture in the 'debian' ffmpeg package +FLAVORS := static + +# shared is generic, i.e. without arch specific opcodes +FLAVORS += shared + +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN") + +CROSS := +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + CROSS := $(DEB_HOST_GNU_TYPE)- +endif + +# this outputs 0 or 1 depending on whether a macro appears in the *default* cpp +# -dM -P output; this is used to test the toolchain *default* configuration +check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0) + +# this outputs 0 or 1 depending on whether a piece of assembly can be compiled +# with the *default* gcc flags; this is used to test the toolchain *default* +# configuration +check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CROSS)gcc -x c -c - -o /dev/null 2>/dev/null && echo 1 || echo 0) + +# the other flavors always build dynamic versions +# Also, disable architecture-specific optimizations for default shared build +ifeq ($(DEB_HOST_ARCH_CPU),arm) + # whether the toolchain *default* configuration includes vfp + vfp_asm := fadds s0, s0, s0 + has_vfp := $(call check_asm, $(vfp_asm)) + # whether the toolchain *default* configuration includes neon + neon_asm := vadd.i16 q0, q0, q0 + has_neon := $(call check_asm, $(neon_asm)) + # whether the toolchain *default* configuration enables ARMv7 + v7_asm := dmb + has_v7 := $(call check_asm, $(v7_asm)) + # whether the toolchain *default* configuration uses -mfloat-abi=soft + has_soft := $(call check_cpp,__SOFTFP__ 1) + + # only build a VFP flavour if the toolchain doesn't enable VFP by default + ifneq ($(has_vfp),1) + FLAVORS += vfp + endif + # only build a NEON flavour if the toolchain doesn't enable NEON by default + ifneq ($(has_neon),1) + FLAVORS += neon + endif + # calling-conventions for VFP and NEON flavours: if the toolchain uses + # -mfloat-abi=soft, we want to use softfp, otherwise we want to use the + # toolchain default (either softfp or hardfp) + ifeq ($(has_soft),1) + float_abi := -mfloat-abi=softfp + else + float_abi := + endif +else ifeq ($(DEB_HOST_ARCH),i386) + FLAVORS += cmov +else ifeq ($(DEB_HOST_ARCH),powerpc) + FLAVORS += altivec + nooptflags += --disable-altivec +else ifeq ($(DEB_HOST_ARCH),sparc) + FLAVORS += vis + nooptflags += --disable-vis +endif + +$(info Building FLAVORS=$(FLAVORS)) + +define cond_enable + $(shell test -r $(1) && echo --enable-$(2) ) +endef + +# variant that also require --enable-version3 +define cond_enable_v3 + $(shell test -r $(1) && echo --enable-$(2) --enable-version3 ) +endef + +# variant that also require --enable-nonfree +define cond_enable_nf + $(shell test -r $(1) && echo --enable-$(2) --enable-nonfree ) +endef + +# Configuration flags causing the libs to be GPL tainted +gpl_confflags += --enable-gpl +gpl_confflags += --enable-postproc +gpl_confflags += --enable-swscale +gpl_confflags += --enable-x11grab + +# there is no libfaad in ubuntu/main, on in ubuntu/multiverse +gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad) + +# Common configuration flags +confflags += --extra-version='$(DEB_VERSION)' +confflags += --prefix=/usr +confflags += --enable-avfilter +confflags += --enable-avfilter-lavf +confflags += --enable-vdpau +confflags += --enable-bzlib +confflags += --enable-libgsm +confflags += --enable-libschroedinger +confflags += --enable-libspeex +confflags += --enable-libtheora +confflags += --enable-libvorbis +confflags += --enable-pthreads +confflags += --enable-zlib +confflags += --enable-libvpx +confflags += --disable-stripping +confflags += --enable-runtime-cpudetect +ifeq ($(DEB_HOST_ARCH),armel) +# this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has +# plenty of incompatible assembly; not sure how to detect that properly +confflags += --extra-cflags="-marm -fPIC -DPIC" +endif + +ifeq ($(DEB_HOST_ARCH),powerpc) +confflags += --enable-pic +endif + +confflags += $(extra_common_confflags) + +# vaapi is not available on s390 and on the hurd +confflags += $(call cond_enable,/usr/include/va/va.h,vaapi) + +# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse +gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac) +gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad) +gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame) +gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp) +gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264) +gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid) + +confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg) + +# Opencore-amr requires GPL v3 +v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb) +v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb) + +# AAC is considered non-free upstream +confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac) + +# comment out following line for LGPL versions of the libraries +confflags += $(gpl_confflags) +confflags += $(v3_confflags) + +# Enable IEEE 1394 (FireWire) support on Linux only +ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE))) + confflags += --enable-libdc1394 + lib1394-dev += libraw1394-dev, libdc1394-22-dev +endif + +# Sanitize injected compiler in linker flags +CFLAGS := +LDFLAGS := + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +# Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC +# and with mmx code enabled. + confflags += --disable-optimizations + confflags += --disable-mmx +endif + +# Configuration flags for the static libraries +static_build_confflags += $(confflags) + +# Configuration flags for the non-optimized shared libraries +shared_build_confflags += $(confflags) +# amd64 has no problems with optimized shared libs. i386 and arm do. +ifneq ($(DEB_HOST_ARCH),amd64) +shared_build_confflags += $(nooptflags) +endif +shared_build_confflags += --enable-shared +shared_build_confflags += --disable-static + +## specific to arm architectures +# Configuration flags for the optimised shared libraries +vfp_build_confflags += $(confflags) +vfp_build_confflags += --shlibdir=/usr/lib/vfp +vfp_build_confflags += --enable-shared +vfp_build_confflags += --disable-static +vfp_build_confflags += --extra-cflags="-mfpu=vfp $(float_abi)" +vfp_build_confflags += --disable-ffmpeg +vfp_build_confflags += --disable-ffplay +# NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP +neon_build_confflags += $(confflags) +neon_build_confflags += --shlibdir=/usr/lib/neon/vfp +# the NEON pass now requires ubfx which was introduced in armv6t2; we need to +# enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a +# so pass armv7-a if it's not already enabled +ifneq ($(has_v7),1) +neon_build_confflags += --cpu='armv7-a' +endif +neon_build_confflags += --extra-cflags="-mfpu=neon $(float_abi) -fPIC -DPIC" +neon_build_confflags += --enable-shared +neon_build_confflags += --disable-static +neon_build_confflags += --disable-ffmpeg +neon_build_confflags += --disable-ffplay + +## i386 architecture specific +# Configuration flags for the optimized shared libraries +cmov_build_confflags += $(confflags) +cmov_build_confflags += $(nooptflags) +cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov +cmov_build_confflags += --cpu='i686' +cmov_build_confflags += --enable-shared +cmov_build_confflags += --disable-static +cmov_build_confflags += --disable-ffmpeg +cmov_build_confflags += --disable-ffplay + +## powerpc architecture specific +# Configuration flags for the optimized shared libraries +altivec_build_confflags += $(confflags) +altivec_build_confflags += --shlibdir=/usr/lib/altivec +altivec_build_confflags += --cpu='g4' +altivec_build_confflags += --enable-shared +altivec_build_confflags += --disable-static +altivec_build_confflags += --enable-altivec +altivec_build_confflags += --disable-ffmpeg +altivec_build_confflags += --disable-ffplay + +## sparc architecture specific +# Configuration flags for the optimized shared libraries +vis_build_confflags += $(confflags) +vis_build_confflags += --shlibdir=/usr/lib/v9 +vis_build_confflags += --cpu='sparc64' +vis_build_confflags += --enable-shared +vis_build_confflags += --disable-static +vis_build_confflags += --extra-cflags="-fPIC -DPIC" +vis_build_confflags += --disable-ffmpeg +vis_build_confflags += --disable-ffplay + +# Additional documentation for PowerPC +ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE))) + extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt +endif + --- libav-0.6.2.orig/debian/ffmpeg.docs +++ libav-0.6.2/debian/ffmpeg.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/ffmpeg/html --- libav-0.6.2.orig/debian/libavformat52.install +++ libav-0.6.2/debian/libavformat52.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libavformat.so.* --- libav-0.6.2.orig/debian/libavcodec52.install +++ libav-0.6.2/debian/libavcodec52.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libavcodec.so.* --- libav-0.6.2.orig/debian/watch +++ libav-0.6.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/.*-snapshot//i" \ +http://www.ffmpeg.org/releases/ffmpeg-(.*)\.tar\.gz --- libav-0.6.2.orig/debian/README.source +++ libav-0.6.2/debian/README.source @@ -0,0 +1,9 @@ +Usage of the quilt patch tracking system + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +For more information about quilt, see /usr/share/doc/quilt/README.source + + -- Reinhard Tartler , Sun, 1 Aug 2010 14:39:46 -0400 --- libav-0.6.2.orig/debian/libavfilter1.install +++ libav-0.6.2/debian/libavfilter1.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libavfilter.so.* --- libav-0.6.2.orig/debian/ffmpeg.install +++ libav-0.6.2/debian/ffmpeg.install @@ -0,0 +1,4 @@ +etc +usr/bin +usr/share/man +usr/share/ffmpeg/*.ffpreset --- libav-0.6.2.orig/debian/libavdevice52.install +++ libav-0.6.2/debian/libavdevice52.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libavdevice.so.* --- libav-0.6.2.orig/debian/libavdevice-dev.install +++ libav-0.6.2/debian/libavdevice-dev.install @@ -0,0 +1,4 @@ +usr/include/libavdevice +usr/lib/libavdevice.a +usr/lib/{,*/,*/*/}libavdevice.so +usr/lib/pkgconfig/libavdevice.pc --- libav-0.6.2.orig/debian/changelog +++ libav-0.6.2/debian/changelog @@ -0,0 +1,1935 @@ +libav (4:0.6.2-1ubuntu1.1) natty-security; urgency=low + + * SECURITY UPDATE: denial of service and possible code execution via + malformed OGG file + - debian/patches/CVE-2011-1196.patch: revalidate index when necessary + in libavformat/oggdec.c. + - CVE-2011-1196 + * SECURITY UPDATE: denial of service and possible code execution via + malformed AMV file + - debian/patches/CVE-2011-1931.patch: don't change flags in + libavcodec/sp5xdec.c. + - CVE-2011-1931 + * SECURITY UPDATE: arbitrary code execution via malformed CAVS file + - debian/patches/CVE-2011-3362.patch: validate values in + libavcodec/cavsdec.c. + - CVE-2011-3362 + + -- Marc Deslauriers Fri, 16 Sep 2011 09:06:48 -0400 + +libav (4:0.6.2-1ubuntu1) natty; urgency=low + + * Merge from debian. Remaining changes: + - don't build against libfaad, libdirac, librtmp and libopenjpeg + (all in universe) + - explicitly --enable-pic on powerpc, cf. LP #654666 + - different arm configure bits that should probably better be + merged into debian + + -- Reinhard Tartler Sun, 20 Mar 2011 12:09:31 +0100 + +libav (4:0.6.2-1) unstable; urgency=medium + + [ Reinhard Tartler ] + * Imported Upstream version 0.6.2 + - include security fixes (Closes: #611495) + * rename source package to libav + * Switch to libav packages + * copy in changelog entries from the 0.5 packaging branch (Closes: #616190) + * update version numbering + * make buildlogs verbose + * Introduce 'libav-source', which contains the patched sources of libav + * rename source package to libav + + [ Fabian Greffrath ] + * Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679) + + -- Reinhard Tartler Sat, 19 Mar 2011 08:13:46 +0100 + +ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low + + * Replace cp with tar to avoid an error of + "/bin/cp: Argument list too long" on the ARM platform + (running under a QEMU chroot environment) (LP: #734331) + - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86 + - Restore a "Doxygen" file that excidentaly got into the changeset of the bug + + -- Gal Shalif Mon, 14 Mar 2011 13:47:24 +0200 + +ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low + + * Merge from debian. Remaining changes: + - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe) + - explicitly --enable-pic on powerpc, cf. LP #654666 + - different arm configure bits that should probably better be merged into debian + + -- Reinhard Tartler Sun, 13 Feb 2011 20:04:06 +0100 + +ffmpeg (4:0.6.1-5) unstable; urgency=low + + * don't enable vaapi support on the hurd, Closes: #613034 + * minor updates to libswscale0's package description + * Force upgrade of mplayer pre-rc4 for upgrades of libswscale, + Closes: #612292 + + -- Reinhard Tartler Sun, 13 Feb 2011 09:25:42 +0100 + +ffmpeg (4:0.6.1-4) unstable; urgency=low + + * no change rebuild to fix broken last upload. + + -- Reinhard Tartler Sun, 06 Feb 2011 09:20:39 +0100 + +ffmpeg (4:0.6.1-3) unstable; urgency=low + + * add libxfixes-dev to build depends + * minor packaging cleanups + * revised package description + * detect libopenjpeg and dirac at build-time + * remove note about packages being "Debian-specific" + * simplify lintian-overrides + * Sanitize LDFLAGS variable; it seems that dpkg-buildflags injects + -Wl,-Bsymbolic-functions to LDFLAGS, which breaks the build on amd64 + + -- Reinhard Tartler Sun, 30 Jan 2011 09:22:11 +0100 + +ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low + + * Merge from debian. Remaining changes: + - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe) + + -- Reinhard Tartler Fri, 19 Nov 2010 12:05:43 +0100 + +ffmpeg (4:0.6.1-2) experimental; urgency=low + + [ Jonas Smedegaard ] + * Relax mplayer Breaks to permit backports and other early releases. + + [ Reinhard Tartler ] + * Bump Standards-Version, no changes needed. + + [ Matthias Klose ] + * Configure with --enable-pic on powerpc. LP: #654666. + + -- Reinhard Tartler Fri, 19 Nov 2010 10:50:51 +0100 + +ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low + + * Merge from debian. Remaining changes: + - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe) + - explicitly --enable-pic on powerpc, cf. LP: #654666 + * remove fix-CVE-2010-3429.patch, applied upstream + + -- Reinhard Tartler Sun, 14 Nov 2010 12:19:50 +0100 + +ffmpeg (4:0.6.1-1) experimental; urgency=low + + * Imported Upstream version 0.6.1 + * prepare new upload + * remove patches merged upstream + * add gitignore file + + -- Reinhard Tartler Mon, 01 Nov 2010 09:18:08 +0100 + +ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low + + * fix dependency on libswscale-extra-0, LP: #637895 + + -- Reinhard Tartler Tue, 05 Oct 2010 21:25:53 +0200 + +ffmpeg (4:0.6-2ubuntu5) maverick; urgency=low + + * Add flic video patch. Fixes CVE-2010-3429 + + -- Reinhard Tartler Tue, 05 Oct 2010 21:11:41 +0200 + +ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low + + * Configure with --enable-pic on powerpc. LP: #654666. + + -- Matthias Klose Mon, 04 Oct 2010 19:39:46 +0200 + +ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low + + * add libxfixes-dev to build-depends, LP: #631103 + + -- Dominic Evans Fri, 10 Sep 2010 14:21:23 +0100 + +ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low + + * weaken the dependencies for the -extra package + + -- Reinhard Tartler Sun, 11 Jul 2010 20:38:27 -0400 + +ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low + + * merge from debian/experimental. remaining changes: + - don't disable encoders + - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe) + + -- Reinhard Tartler Sun, 11 Jul 2010 11:00:54 -0400 + +ffmpeg (4:0.6-2) experimental; urgency=low + + [ Fabian Greffrath ] + * Enable RTMP[E] support via librtmp. + * Disable aac encoder, see README.Debian. + * Fix obsolete-relation-form for the internal dependencies. + * Merge debian/README.Source into debian/README.source and add section + headers. + * Remove obsoleted support for the non-free libamr-nb/wb. + + [ Reinhard Tartler ] + * enable runtime-cpudetect + * conditionally build against opencore-amr if installed in the build + environment + * update upstream url in debian/copyright + * fix usage documentation in debian/get-orig-source.sh + * update dep3 headers for debian/patches/900_doxyfile + * add proper replaces for moving presets back to ffmpeg + * make debian/patches gbp-pq friendly + * Add VP80 fourcc to libavformat/riff.c + * Backport-AAC-HE-v2 + * bump Standards-Version, no changes needed + + -- Reinhard Tartler Tue, 29 Jun 2010 09:07:56 +0200 + +ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low + + * merge from debian/experimental. remaining changes: + - don't disable encoders + - don't build against libfaad, libdirac and libopenjpeg (all in universe) + * new upstream release + - internal vorbis encoder is disabled. LP: #585330 + - includes native AMR-NB decoder, LP: #93849 + - api-example is fixed: LP: #557319 + + -- Reinhard Tartler Wed, 16 Jun 2010 12:53:24 +0200 + +ffmpeg (4:0.6-1) experimental; urgency=low + + * new upstream release + - adds VP8 support via libvpx, Closes: #582274 + * depend on libavfilter-extra-1 instead of -0, Closes: #583728 + * add conflicts to the ffprobe package, it has been merged upstream now + + -- Reinhard Tartler Wed, 16 Jun 2010 09:25:28 +0200 + +ffmpeg (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low + + * add proper replaces, fixes: LP: #587369 + * fix typo in dependency on libavfilter-extra-1. LP: #587431 + + -- Reinhard Tartler Thu, 03 Jun 2010 11:33:32 +0200 + +ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low + + * merge from debian/experimental. remaining changes: + - don't disable encoders + - don't build against libfaad, libdirac and libopenjpeg (all in universe) + + -- Reinhard Tartler Wed, 26 May 2010 00:01:17 +0200 + +ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low + + * update to new upstream. Closes: #569727 + - fixes various segfaults and other minor feature improvements + Closes: #374931, #522449, #501891, #559712, #420231, #369127, #538082, + #298095, #294422, #561553, #525385, #495274, #420230 + LP: #305286, #457106, #529200, #301723, #305315, #336479, #420230, + #412063, #428912, #432181, #440591, #453732, #453732, #453732, + #514259, #515243, #521472, #530186, #530186, #197842, #483317, + #483317, #539407, #280098, #331255, #566107, #569823, #570305, + #573190 + * Fixup lintian overrides for new upstream snapshot + * Bump Standards-Version to 3.8.4 + * Many upstream changes, see upstream Changelog for details + + -- Reinhard Tartler Sun, 24 Jan 2010 21:24:56 +0100 + +ffmpeg (4:0.5.2-6) unstable; urgency=high + + * Fix several security issues in flicvideo.c. + Fixes: CVE-2010-3429, Closes: #598590 + * Raising severity to high because of security issue. + + -- Reinhard Tartler Sun, 03 Oct 2010 16:59:39 +0200 + +ffmpeg (4:0.5.2-5) unstable; urgency=low + + [ Dominic Evans ] + * add libxfixes-dev to build-depends to unbreak x11grab input, + Closes: #596342, LP: #631103 + + [ Reinhard Tartler ] + * fix x11grab example in e.g. the manpage so that they actually work + + -- Reinhard Tartler Mon, 13 Sep 2010 15:29:49 +0200 + +ffmpeg (4:0.5.2-4) unstable; urgency=low + + [ Loïc Minier ] + * Fix typo: use -march=armv7-a instead of -marmv7-a + + -- Reinhard Tartler Tue, 31 Aug 2010 15:31:05 +0200 + +ffmpeg (4:0.5.2-3) unstable; urgency=low + + [ Reinhard Tartler ] + * Move breaks declaration from libavformat to libavcodec to help the + apt solver, Closes: #591881 + + [ Loïc Minier ] + debian/confflags: detect whether the toolchain supports ARMv7 ("dmb") + by default as the NEON pass needs at least ARMv6t2; if it's not enabled by + default, pass -marmv7-a in extra-cflags for the NEON pass since NEON + implies ARMv7; closes: #594417. + + -- Reinhard Tartler Fri, 27 Aug 2010 01:24:10 +0200 + +ffmpeg (4:0.5.2-2) unstable; urgency=low + + * Enable some encoders: + - h263, h263p, mpeg2video, mpeg4, msmpeg4v1, msmpeg4v2, msmpeg4v3 + Closes: #418231, #433287, #440216, #587898, #525349 + * Bump Standards Version, no changes needed + + -- Reinhard Tartler Thu, 05 Aug 2010 11:59:26 -0400 + +ffmpeg (4:0.5.2-1) unstable; urgency=low + + [ Andres Mejia ] + * Fix dependency problem for ffmpeg so it can use extra ffmpeg libs. + + [ Reinhard Tartler ] + * move presets back to 'ffmpeg' package. Closes: #581748 + + [ Fabian Greffrath ] + * Imported Upstream version 0.5.2 + * Remove ffmpeg-debian_hurd.patch, applied upstream. + * Remove fix-ftbfs-altivec.patch, applied upstream. + + -- Reinhard Tartler Tue, 25 May 2010 23:01:08 +0200 + +ffmpeg (4:0.5.1-3) unstable; urgency=low + + * fix ftbfs on powerpc + + -- Reinhard Tartler Fri, 12 Mar 2010 21:43:55 +0100 + +ffmpeg (4:0.5.1-2) unstable; urgency=low + + * reintroduce gnu/hurd patch + * Fix compilation on powerpc with --disable-altivec + + -- Reinhard Tartler Wed, 10 Mar 2010 21:19:40 +0100 + +ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low + + * merge from debian. remaining changes: + - don't disable encoders + - don't build against libfaad, libdirac and libopenjpeg (all in universe) + + -- Reinhard Tartler Thu, 04 Mar 2010 10:34:37 +0100 + +ffmpeg (4:0.5.1-1) unstable; urgency=low + + * new upstream release: + - clarifies documentation on metadata, Closes: #570050, LP: #501729 + - further security backports, Closes: #570713 + * adapt to new versioning scheme + * use '<<' instead of '<' relationship for internal shlib file + * merge changes from ubuntu packaging + * drop wmapro backport again as discussed with upstream. The unrelated + changes seem too risky for a stable release. + + -- Reinhard Tartler Wed, 03 Mar 2010 22:28:24 +0100 + +ffmpeg (4:0.5+svn20090706-6) unstable; urgency=low + + [ Fabian Greffrath ] + * debian/patches/901-fix-misc-typos.patch: New patch taken from + upstream GIT (slightly modified) to fix some spelling errors. + * Document our calling of debhelper programs in an odd order in + debian/rules. + + [ Reinhard Tartler ] + * document some unattributed patches + * enable cpu autodetection in libswscale, Closes: #567725, LP: #386397 + + [ Christopher Martin ] + * backport wmapro codec from ffmpeg trunk + + -- Reinhard Tartler Sun, 31 Jan 2010 16:53:47 +0100 + +ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low + + * tighten build dependency on new x264 package + * add x264 backport for ffmpeg 0.5 + * install presets in 'libavcodec package' instead of 'ffmpeg' binary, + see git history for rationale of this change + + -- Reinhard Tartler Wed, 17 Feb 2010 08:37:17 +0100 + +ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low + + * merge from debian, remaining changes: + - dont disable internal encoders + - disabled extra depedencies (come with ffmpeg-extra) + - libdirac + - libopenjpeg + + -- Reinhard Tartler Sat, 16 Jan 2010 10:12:15 +0100 + +ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium + + * Upload to unstable + * Urgency medium because of fixed RC bugs (security issues) + + -- Reinhard Tartler Fri, 22 Jan 2010 16:04:39 +0000 + +ffmpeg (4:0.5+svn20090706-4) experimental; urgency=low + + [ Loïc Minier ] + * Use default toolchain setup on ARM flavors for noopt and only add FPU + CFLAGS in the VFP and NEON flavors; this is ok since internally, cpu will + be set to "generic" but -march=generic or -mcpu=generic will NOT be added + to the build flags. + * Build all armel flavours with -marm since ffmpeg has a lot of hand crafted + assembly which doesn't build in the new lucid default mode (Thumb 2); + LP: #488267 + * Build all armel flavours with -fPIC -DPIC instead of just the neon flavour + as the new flags/toolchain require this in Ubuntu lucid. + * Build some assembly test code -- just like configure -- to decide whether + the *default* toolchain uses vfp or neon to decided whether to build the + vfp and neon flavors. + * Drop --disable/--enable opt flags such as --disable-neon or + --enable-armvfp on ARM since the upstream configure script will do the + right thing when the proper flags are set. + + -- Loïc Minier Wed, 13 Jan 2010 12:57:32 +0100 + +ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low + + [ Loïc Minier ] + * Disable more autodetecter ARM arch features + * Enable neon flavour + * Update NEON confflags to assume v7 and VFP + * Add backported NEON patches from ffmpeg trunk + * Pass proper --cpu and --extra-flags on armel + * Pass -fPIC -DPIC to neon pass + + [ Fabian Greffrath ] + * Initialize the FLAVORS variable to static instead of appending to + it. Also, we do not support the internalencoders variable anymore. + + [ Andres Mejia ] + * Remove unused patches from packaging. + * Update Vcs-* entries to new location. + * Bump Standards-Version to 3.8.3. + + [ Reinhard Tartler ] + * change shlibs file to make applications depend on the -extra- packages + * loosen dependencies further, so that the -dev packages remain + installable even if ffmpeg-extra is 'out-of-date' + * add patch for issue1245: Make arguments of av_set_pts_info() unsigned. + * Support constant-quant encoding for libtheora, LP: #356322 + * increase swscale compile time width (VOF/VOFW), LP: #443264 + * Backports of various security patches, Closes: #550442, including: + - backport fixes for vorbis_dec + - backport oggparsevorbis fix + - backport vp3 fixes + - backport ffv1 fix + - libavcodec/mpegaudiodec.c backports + - h264 security backports + - backported libavformat/mov.c security fixes + - backported libavformat/oggdec.c security fixes + - backport svn r18016 aka 'MOV-Support-stz2-Compact-Sample-Size-Box' + to fix FTBFS + * enable symbol versioning + * bump shlibs version + * add README.source describing how this source package manages patches + * make sure the ${misc:Depends} substvar is used for each binary package + + -- Reinhard Tartler Wed, 06 Jan 2010 16:27:40 +0100 + +ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low + + * export *all* symbols of libswscale, fixes FTBFS in mplayer + + -- Reinhard Tartler Sat, 02 Jan 2010 23:37:21 +0100 + +ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low + + * Imported Debian patch 0.5+svn20090706-2ubuntu4 + * revert gbp.conf to point to lucid branch + * enable symbol versioning + * bump shlibs version + + -- Reinhard Tartler Sat, 02 Jan 2010 15:03:09 +0100 + +ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low + + * add build dependency on 'yasm', since it is now moved to main. + + -- Reinhard Tartler Mon, 21 Dec 2009 23:57:34 +0100 + +ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low + + * security backports from ffmpeg trunk (Closes: #550442) + - libavcodec/mpegaudiodec + - libavcodec/vorbis_dec + - libavcodec/ffv1 + - libavcodec/vp3 + - libavcodec/h264 + - libavformat/mov + - libavformat/oggdec + - libavformat/oggparsevorbis + + -- Reinhard Tartler Thu, 05 Nov 2009 20:31:29 +0100 + +ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low + + [ Reinhard Tartler ] + * Make arguments of av_set_pts_info() unsigned. + * update debian/changelog + * use patch for issue1245 from git.ffmpeg.org + * Support constant-quant encoding for libtheora, LP: #356322 + * increase swscale compile time width (VOF/VOFW), LP: #443264 + + [ Loïc Minier ] + * Update config for karmic's armel toolchain. + * Enable neon flavour; LP: #383240. + * Update NEON confflags to assume v7 and VFP. + * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/. + * Pass proper --cpu and --extra-flags on armel. + * Pass -fPIC -DPIC to neon pass. + + -- Loïc Minier Tue, 13 Oct 2009 23:56:04 +0200 + +ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low + + * merge from debian. Remaining changes: + - disabled output decoders: faad, openjpeg, dirac (all not in main) + - build arm vfp variant + - don't build depend on yasm. + * fix dependencies on -extra packages: LP: #418705, #416348 + * no need to remove mpeg encoders in the ubuntu package, unless we hear + otherwise from some patent owner. This brings back the mpeg2video + encoder is available. cf. formats.txt.gz LP: #416585 + + -- Reinhard Tartler Wed, 26 Aug 2009 11:20:03 +0200 + +ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low + + [ Fabian Greffrath ] + * Enable support for libdirac, now that it has entered Debian. + + [ Andres Mejia ] + * Fix ordering of FLAVORS that are installed. (Closes: #543595) + + [ Reinhard Tartler ] + * prepare new upload + * simply debian/confflags by removing the case of renaming the source + package + + -- Reinhard Tartler Wed, 26 Aug 2009 09:12:49 +0200 + +ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low + + * update the dependencies of the -dev packages for the + unstripped -> extra renaming + + -- Reinhard Tartler Tue, 25 Aug 2009 16:37:23 +0200 + +ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low + + * really drop libopenjpeg from build depends. + + -- Reinhard Tartler Tue, 25 Aug 2009 08:17:17 +0200 + +ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low + + * merge from debian. Remaining changes: + - don't build-depend on libfaad-dev, disabling faad decoder. + - build arm vfp variant + - don't build libopenjpeg support (not in main) + * change shlibs file to make applications depend on the -extra- packages. + * don't build depend on yasm. + + -- Reinhard Tartler Sat, 15 Aug 2009 18:18:23 +0200 + +ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low + + * preparing new upstream version, 0.5 release branch, rev 19352 + - this version is capable of compiling swscale in LGPL mode + * rename source package back + - The replacement package with the 'missing bits' will be called + 'ffmpeg-extra' + - simplify README.upstream-upgrade + - rename the source package from 'ffmpeg-debian' -> 'ffmpeg' + * fix aac playback regression, thanks to Matthew Wakeling for reporting + (Closes: #540729) + * fix seeking in DIF (DV) movies + Thanks to Dan Dennedy for identifying the patch! (Closes: #540424) + * debian/rules: + - merge cond_enable_nf macro from master.extra branch + - don't disable ffserver in various optimized variants + - don't disable building of statically linked helper binaries + - simply by removing the case of renaming the source package + - change the shlibs file: s/-unstripped-/-extra-/ + + -- Reinhard Tartler Thu, 13 Aug 2009 12:48:27 +0200 + +ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low + + [ Fabian Greffrath ] + * Remove .install files for unstripped packages that we do not build + from this branch anyway. + * Remove debian/fixup-config.sh which was only a hack needed to repair + the crippled config.h + * Finally remove strip.sh. + + [ Andres Mejia ] + * Add vdpau support by including vdpau headers in deb packaging. + (Closes: #511544) + * Don't disable encoders if internalencoders is set in + DEB_BUILD_OPTIONS. + * Enable yasm for i386 and amd64. + + [ Reinhard Tartler ] + * clarifications suggested by upstream in README.Source + * refresh patches + + [ Fabian Greffrath ] + * Document the copyright notice and license for the VDPAU headers in + debian/copyright. + * Remove parallel make support from debian/confflags, it's overridden + in debian/rules anyway. + * Quote opts in debian/watch. + * Bump debhelper compat to 7. + * Clean up clean target in debian/rules in favour of debian/clean. + * Replace "dh_clean -k" by dh_prep. + + [ Reinhard Tartler ] + * remove duplicated libxvmc-dev build dependency + * sort build dependencies alphabetically + * remove section numbering from README.Debian + * add note about the lintian override + + -- Reinhard Tartler Thu, 13 Aug 2009 12:46:46 +0200 + +ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low + + * do not forcefully enable objenjpeg, it is not avaiable in this build + anyway + * don't build against faac in any case, it is deemed non-free + + -- Reinhard Tartler Sat, 25 Jul 2009 09:15:12 +0200 + +ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low + + * remove libopenjpeg-dev from build depends (fixes FTBFS) + * remove duplicate libxvmc-dev build-dependency + + -- Reinhard Tartler Fri, 24 Jul 2009 21:53:47 +0200 + +ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low + + * merge from debian. Remaining changes: + - don't build-depend on libfaad-dev, disabling faad decoder. + - build arm vfp variant + * update gbp.conf + * move gbp.conf to debian/ + + -- Reinhard Tartler Sat, 18 Jul 2009 10:55:24 +0200 + +ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low + + [ Andres Mejia ] + * Add myself to Uploaders list. + * Reorder when dh_strip is done so qt-faststart is also + stripped. + * Update to control files. + * Add new confflags for new build dependencies. + * Use .docs files to add ffmpeg and ffmpeg-doc documentation. + * Use .docs files for installing documentation. + * Add comment to 900_doxyfile patch. + * Add man page for qt-faststart. + * Bump version in changelog to prepare new release + * Fix FTBFS for ffmpeg source package with -dev packages (Closes: #527761) + * Use dh_lintian to install lintian overrides + * Update comment on fpic-* patches + * Build-Depend on debhelper (>= 6.0.7~) for dh_lintian. + * Add lintian overrides for remaining fpic lintian errors. + * Shorten comment on lintian-overrides. + * Allow passing in extra confflags, removes the need for fix-fpic + DEB_BUILD_OPTIONS. + * Fix FTBFS on kfreebsd. (Closes: #528591) + * Include patches to allow us to use opencore-amr libraries. + + [ Reinhard Tartler ] + * remove debian/control.* mechanism + * improve patch description for debian/patches/100_kfreebsd + + [ Andres Mejia ] + * Add lintian overrides for ffmpeg-debian source warnings. + * Only use .svnrevision if it's readable. + * Update source lintian-overrides for modifications to debian/rules. + * Add fix for FTBFS for GNU Hurd OS. Thanks Marc Dequènes. + (Closes: #530436) + + [ Felipe Sateler ] + * Don't add -unstripped to the unstripped variant version number + in debian/README.upstream-upgrade. + * In the same file, pass explicit version to git-import-orig + + [ Fabian Greffrath ] + * Cleaned up debian/watch file. + * Add notes why we no longer strip the orig.tar.gz. + + [ Andres Mejia ] + * Fix watch file to ignore daily snapshots. + * Make get-orig-source.sh executable. + + [ Reinhard Tartler ] + * add patch for qtrle encoding (Closes: #530016) + * Enable xvmc support by adding libxvmc-dev to build dependencies + * really add libopenjpeg-dev to build depends, actually enabling + the openjpeg decoder. + * reorganise README.Debian for the new plan [tm] + * no longer strip the source on upstream upgrades + * Imported Upstream version 0.5+svn20090609 + * adjust notes in README.upstream-upgrade for the now unstripped + debian source package + * remove hack to build with stripped sources + * bump standards version, no changes needed + + -- Reinhard Tartler Sun, 05 Jul 2009 22:52:43 +0200 + +ffmpeg-debian (4:0.5+svn20090420-2) unstable; urgency=low + + * debian/control: fix dependencies for libavutil-dev and libavfilter-dev + so that they can be used with the unstripped variants properly. + * debian/rules: set nooptflags only for relevant architectures. + * explicitly disable 'dangerous' encoders on the --configure line. + * fix SHLIBS_VERSION in debian/rules (Closes: #527350). + + -- Reinhard Tartler Mon, 04 May 2009 07:41:19 +0200 + +ffmpeg-debian (4:0.5+svn20090420-1) unstable; urgency=low + + [ Fabian Greffrath ] + * Merge the contents of patents.txt into README.Debian and change some + paragraphs to (hopefully) add some more clarity on the removed encoders + and the package naming scheme. Based on suggestions by Xavier Douville + , thank you very much for the review. (Closes: #519025) + * Reorder some confflags to account for GPL licensed libraries. + * Remove patents.txt + * Explicitely mention that no decoders are disabled in our packages. + + [ Loïc Minier ] + * Disable more autodetecter ARM arch features + * Add neon and vfp flavors to armel disabled for now + * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp" + + [ Reinhard Tartler ] + * New Upstream Version (svn revision 18630) + * bump epoch as 0.5 was released. Future version will use '+' to indicate + that the package is based on a release branch and '~' to indicate that + the package is based on the 'trunk' branch. + * update from the upstream release branch to generate a new upstream + tarball. + * add a git-buildpackage config file at debian/gbp.conf + * beautify identification string + * debian/rules: bump epoch to '4' + * update section names in control file + * update upstream svn server url + * fixup get-orig-source rules in debian/rules + * create right filenames for the orig.tar.gz files + * update README.upstream-upgrate for new versioning scheme + * remove debian/005_release_branch_changes.diff + * remove reference to 020_visibility_patch + * install the upstream license file and release notes + * allow -dev packages be installed with the unstripped variants + Closes: #526007, LP: #312898 + * be more careful with svn:externals in debian/get-orig-source.sh. + (Closes: #525348) + + -- Reinhard Tartler Sat, 02 May 2009 09:09:54 +0200 + +ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low + + * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp". + + -- Loic Minier Fri, 10 Apr 2009 21:34:29 +0200 + +ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low + + * Disable more autodetected ARM arch features. + * Add neon and vfp flavors to armel disabled for now. + * Enable vfp pass on armel; leave the neon disabled. + + -- Loïc Minier Fri, 10 Apr 2009 17:58:52 +0200 + +ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low + + * brown paperbag upload. Actually include the patch intended for the + last upload. + + -- Reinhard Tartler Sat, 21 Mar 2009 14:55:46 +0100 + +ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low + + * don't disable ffserver in specialised flavors. Fixes LP: #345370 + + -- Reinhard Tartler Sat, 21 Mar 2009 14:52:25 +0100 + +ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low + + * No-change rebuild to fix lpia shared library dependencies. + + -- Colin Watson Thu, 19 Mar 2009 17:26:36 +0000 + +ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low + + * FFE granted in LP: #340303. + + * merge from debian/unstable. + * remaining changes to debian: + - don't build-depend on libfaad-dev, disabling faad decoder. + + -- Reinhard Tartler Fri, 13 Mar 2009 08:54:33 +0100 + +ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low + + * New Upstream Version (svn revision 17737 libswscale revision 28799) + - Electronic Arts TQI decoder + - OpenJPEG based JPEG 2000 decoder + - NC (NC4600) camera file demuxer + - Gopher client support + - MXF D-10 muxer + - generic metadata API + * debian/get-orig-source.sh: Track the version 0.5 release branch. The + version number does not really reflect this, but this package is + actually very close to the 0.5 release branch. + * various cleanups to improve get-orig-source.sh + * Remove liba52 from the suggests field in debian/control.ffmpeg, as + ffmpeg does no longer use it since upload 0.svn20080206-10. + * Fix the Vcs-Git urls to the correct locations. + * The libavformat52 now links against libavcodec52, which breaks + applications that *ALSO* link against libavcodec51. Adding a + Breaks: libavcodec51 should prevent this and (hopefully) Closes: #516885. + * improve parallel builds on SMP/multicores by supporting the parallel + flag in DEB_BUILD_OPTIONS, and default to the number of available CPUs + on i386 and amd64. + * Drop unapplied patches from debian/patches. + * bump shlibs version. + + -- Reinhard Tartler Tue, 03 Mar 2009 21:01:25 +0100 + +ffmpeg-debian (3:0.svn20090204-3) unstable; urgency=low + + [ Fabian Greffrath ] + * remove libasound2-dev from build-depends on non-Linux archs + + [ Reinhard Tartler ] + * fix postinst generation by calling dh_installdeb after dh_makeshlibs + * upload to unstable + + -- Reinhard Tartler Sun, 22 Feb 2009 09:32:49 +0100 + +ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low + + * merge from debian. Remaining changes: + - don't build depend on libfaad-dev + + -- Reinhard Tartler Thu, 05 Feb 2009 21:22:01 +0100 + +ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low + + * add libxvmc-dev to build-depends in the 'ffmpeg' variant + * add libasound2-dev to build-depends. This means that ffplay is now able to + actually play using alsa directly instead only via libsdl + * add epochs for the "internal" shlibs dependencies + + -- Reinhard Tartler Thu, 05 Feb 2009 20:30:05 +0100 + +ffmpeg-debian (3:0.svn20090204-1) experimental; urgency=low + + [ Reinhard Tartler ] + * New Upstream Version (svn revision 16978 libswscale revision 28461) + + Upstream Changes: + - R3D REDCODE demuxer + - ALSA support for playback and record + + * strighten internal dependencies by using a shlibs.local file + Closes: #512844, #512466 + * New upstream version reintroduces a compatibility symbol ff_gcd + Closes: #512946 + * Bump shlibs because of changes of the Metadata API in libavformat. + Actually no other package should use them yet, but let's better play safe + here... + * no longer install dsputil.h. It exposes lots of function that are private + to ffmpeg and may change on any new upstream revision. Please get in touch + with the ffmpeg maintainers if you maintain packages that rely on that + ffmpeg internal headers like this. + * simplify debian/confflags by doing autodetection of headers: + - xvid.h + - lame/lame.h + - faac.h + - x264.h + - vdpau/vdpau.h + Also remove the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs + will be enabled as soon as the headers are installed on the filesystem, + so there is no need in enabling that separately. + * install ffpresets in /usr/share/ffmpeg/. Currently only presets for + x264 are avaiable, so a libx264 enabled libavcodec (like + libavcodec-unstripped-52) is needed to actually use them. + + [ Fabian Greffrath ] + * Enabled Speex decoding via libspeex. + * Use an alternative approach to achieve strict internal dependencies + by calling dh_makeshlibs twice in debian/rules instead of a + debian/shlibs.local file. + + -- Reinhard Tartler Sun, 01 Feb 2009 19:54:27 +0100 + +ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low + + * merge from debian. LP: #318501 + * new version fixes CVE-2008-3230, LP: #253767 + + -- Reinhard Tartler Tue, 20 Jan 2009 09:20:53 +0100 + +ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low + + * New Upstream Version (svn revision 16681 libswscale revision 28341) + * update Vcs-Git tags. Packaging has now moved to git + * updates to packaging that faciliate building the unstripped and ubuntu + variants of this package + * enable xvmc support + + Upstream Changes: + - SVQ3 watermark decoding support + - hybrid WavPack support + + -- Reinhard Tartler Tue, 20 Jan 2009 00:55:26 +0100 + +ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low + + * new upstream svn snapshot (svn revision 16508, libswscale revision 28286) + + Upstream Changes: + - RV30 and RV40 decoder + - QCELP / PureVoice decoder + + * removed patch 050_fix_pkgconfig_files.patch. Merged upstream + * disabled patch 020_visibility_patch. It needs to be adapted to the new + upstream changes. Hopefully it will get merged into ffmpeg properly. + * install formats.txt in the libavcodec52 package to document what + formats this version of ffmpeg has enabled. + + -- Reinhard Tartler Sun, 11 Jan 2009 20:55:48 +0100 + +ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low + + * merge from debian. + * keep myself in the maintainer field. If you are touching this or the + 'ffmpeg' package in multiverse, please get in touch with me. Both + source packages come from the same packaging branch. + * drop dependency on faad. + + -- Reinhard Tartler Sat, 15 Nov 2008 19:44:29 +0100 + +ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low + + * new upstream svn snapshot (svn revision 15824, libswscale revision 27910) + * bump standards version to version 3.8.0, no changes needed + * Adjust pkg-files to no longer put unnecessary dependencies in the generated + .pc files. Closes: #504220 + + -- Reinhard Tartler Mon, 10 Nov 2008 21:37:16 +0100 + +ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low + + * really disable faad support completely. + + -- Reinhard Tartler Mon, 10 Nov 2008 10:58:01 +0100 + +ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low + + * drop the patch to dlopen faad at runtime for now. it needs more + polishing, and we can have that functionality easier with the 'ffmpeg' + source package that will appear in multiverse. + + -- Reinhard Tartler Mon, 10 Nov 2008 10:31:47 +0100 + +ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low + + * merge from debian. + * keep myself in the maintainer field. If you are touching this or the + 'ffmpeg' package in multiverse, please get in touch with me. Both + source packages come from the same packaging branch. + * drop dependency on faad. + * import patches from old packaging to dlopen libfaad at runtime. + + -- Reinhard Tartler Mon, 10 Nov 2008 07:31:16 +0100 + +ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low + + * upstream svn snapshot (svn revision 15786, libswscale revision 27900). + * apply visibility patch from ffmpeg-devel mailing list. This reduces the + number of symbols that are exposed to other applications. Please file + bugs if applications fail to link against ffmpeg because of that. + * remove 001_fixup_version.diff patch and use upstream --extra-version + configure flag instead. + * now really remove 015_img_convert.patch from source package. + + -- Reinhard Tartler Sat, 08 Nov 2008 16:38:23 +0100 + +ffmpeg-debian (3:0.svn20080925-1) experimental; urgency=low + + [ Loic Minier ] + * Tweak sed versions regexps to deal with epochs and upstream revisions with + dashes and be generally stricter. + * Large cleanup to rules logic: drop some cruft, rewrite some small chunks + in a slightly more readable manner, whitespaces, .PHONY fixes, + internalencoders handling, shlibs logic... + * Rename SRC_VERSION to UPSTREAM_VERSION in rules. + * Use DEB_SOURCE from the Source: field of dpkg-parsechangelog's output + instead of hardcoding the name of the source. + + [ Reinhard Tartler ] + * new svn snapshot (svn revision 15404, libswscale revision 27636). + * SONAME change: libavcodec51 -> libavcodec52 + * drop old scaler (imgres/imgconvert). Upstream is about to remove it + completely. + - reporter claims that a newer snapshot fixes a crash in the dca decoder. + Thanks to "Alexander E. Patrakov" (Closes: #496612) + * reenable h261 encoder (Closes: #459073) + + [ Fabian Greffrath ] + * debian/{ffmpeg,lib*-dev}.install: + + Simplified, e.g. install the whole /usr/include/ sub-directory for each + particular library instead of single header files one by one. + * debian/control, debian/confflags: + + Enabled Dirac support via libschroedinger. (Closes: #499785) + * debian/changelog: + + Added an epoch needed for Ubuntu. + * debian/control: + + Removed Conflicts and Replaces against packages that either aren't even + in Debian 4.0 "Etch" anymore or that use the deprecated naming scheme + from . + + Since ffmpeg-config has been removed from our packages, all inter-package + Conflicts and Replaces may be removed, too. + + Removed Build-Conflicts against libdc1394-13-dev, because + libdc1394-22-dev already does this for us. + + Updated inter-package dependencies and demoted Depends on external + library packages to Suggests, since we shouldn't encourage package + maintainers to link statically against libav*. + * debian/confflags, debian/control, debian/rules, debian/libavfilter*: + + Built libavfilter and disabled vhook in turn (Closes: #499787). + + [ Loic Minier ] + * Remove debug echo which broke shlibs, sorry. + * Fix Vcs-* control fields; thanks Gerfried Fuchs. + * Mention upstream SVN in debian/copyright; thanks Gerfried Fuchs; + closes: #499914. + + -- Reinhard Tartler Sat, 06 Sep 2008 20:07:01 +0200 + +ffmpeg-debian (0.svn20080206-12) unstable; urgency=low + + * enable vhook in all flavors. (Closes: #490272, LP: #260296) + * make ffmpeg output a proper version number. (Closes: #496133, #483923) + + -- Reinhard Tartler Sat, 23 Aug 2008 10:49:10 +0200 + +ffmpeg-debian (0.svn20080206-11) unstable; urgency=low + + [ Reinhard Tartler ] + * new patch: patches/010_fix_ftbfs_hppa.diff: On hppa shared objects + do required object files to be build "-fPIC -DPIC". Patch taken + from upstream svn. + * bugfix: libraries linked with libX11 on GNU/kFreeBSD. Thanks to + Aurelien Jarno for the patch. (Closes: #487252) + + [ Fabian Greffrath ] + * debian/confflags, debian/control: + + Build-Depend on libdc1394-22-dev explicitely and add + Build-Conflicts on libdc1394-13-dev (Closes: #490319). + + -- Reinhard Tartler Wed, 16 Jul 2008 10:41:49 +0200 + +ffmpeg-debian (0.svn20080206-10) unstable; urgency=high + + * enable mmx and sse3 in builds. These CPU features are autodetected + at runtime on amd64 and i386 using the 'cpuid' instrcution. + (Closes: #489732) + * disable support for liba52-dev. ffmpeg has its own implementation. + * don't add -fPIC -DPIC forcefully to ./configure. upstream claim that + the configure script gets this right on all architectures itself. + * Add patch 020_bug489965_bufferoverflow_str_demuxer.diff. Fixes a + buffer overflow in the STR demuxer. Thanks to Moritz Muehlenhoff for + reporting the issue. (Closes: #489965) + * Raising severity to high because of security issue. + * rework the shlibs file. Make applications linking against libraries + produced by this source package generate an alternate dependency on + the 'unstripped' variants of this package. They actually do not exist + yet at this point, but this way reverse dependencies are enabled to + use them when they eventually appear. + + -- Reinhard Tartler Wed, 09 Jul 2008 14:04:06 +0200 + +ffmpeg-debian (0.svn20080206-9) unstable; urgency=low + + [ Reinhard Tartler ] + * cleanup 010_proper_rpath.diff: remove spurious linker search paths. + * debian/strip.sh: no need to remove the glue code for x264 and xvid. + However, since that code is not built in debian anyway, the orig.tar.gz + was not rebuilt with this change. + * provide mmx-enabled shared objects on amd64. AFAIK all amd64 machines + do support MMX. + * Provide optimized versions of the libraries along the unoptimized + ones. They are installed in machines and architecture specific + directories. Optimized for further target will be added per request, + please file bugs to request them. + * rename the source package (again), this time on upstream's request. + The former name was considered insulting by upstream, because it + somewhat indicated the original source was somehow 'non-free', which is + not the case. The new name now represents that we modified the package + so that it becomes acceptable for debian. + * Cleanups in debian/rules file. + * Add verbose explanations about the renaming in README.Debian. + + [ Fabian Greffrath ] + * debian/control: + + Added Conflicts and Replaces against obsolete library packages from + wearing the 'cvs' suffix in their names + (Closes: #484585, #484586, #484587, #484776, #484778). + + Added doxygen to Build-Depends. + + Introduced new package 'ffmpeg-doc' that contains html doxygen + documentation of the ffmpeg API (Closes: #438369). + + Changed Build-Depends from libdc1394-13-dev to libdc1394-22-dev, + which is supported upstream since r11501. + * debian/ffmpeg-doc.install: + + Added. + * debian/rules: + + Build and install html doxygen documentation. + + Avoid dependency of build-stamp rule on phony targets. + * debian/libavutil-dev.install, debian/rules, + debian/patches/010_ffmpeg-config.diff: + + Removed ffmpeg-config, use pkg-config instead (maintainers of affected + packages have been informed, see #487917 to #487922). + + [ Darren Salt ] + * Added patch 900_doxyfile: tell doxyfile to ignore debian* directories. + * debian/rules: + - Reworked building so that separate source & build directories are + used. This makes cleanup simpler and speeds up maintenance by avoiding + complete rebuilds when using "debuild binary". + - Removed some file installation 'cp' commands, made unnecessary due to + the build reworking. + - Unpatching is now done *after* cleaning. + + -- Reinhard Tartler Mon, 30 Jun 2008 15:27:50 +0200 + +ffmpeg-free (0.svn20080206-8) unstable; urgency=low + + [ Fabian Greffrath ] + + * debian/control: + + Added Conflicts and Replaces on libavutil-dev (<< 0.svn20080206-7) + to libavcodec-dev (Closes: #483548). + + [ Reinhard Tartler ] + + * remove patches from the debian package as disussed with upstream: + - 005_runtime_cpudetect.diff: it is supposed to fix runtime cpu detection + on i386. The code (and the define) has undergone large refactoring wrt. + the define RUNTIME_CPUDETECT. It is very likely to have undisired + side-effects with this version of ffmpeg. It therefore seem more safe + to me to actually remove this patch for now, and reinvestigate the + problems that occur, if they do. (Related to: #482717) + - 005_m68k_workaround.diff: works around bugs in gcc for m68k. + - 006_mips_pthreads.diff: was an workaround for (now fixed) #428741. + - 020_fix_sws_scale_crash: patch has been rejected upstream: + http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-May/047846.html + - 054_h264_mmx_chroma_mc_crash.diff. According to upstream, this has + been fixed in a different way and is not reproducible. Verified that + the file referenced in bug #404176 does not crash anymore even + without this patch. + * new patch: 015_reenable-img_convert.diff. Unlike previous version of this + patch, this uses a more lightweight approach. With building imgresample, a + few symbol clashes occur with libswscale. We therefore strip off symbols + that are already provided by libswscale. (Closes: #483960). + * remove 011_link_plugins.diff. It is completely unnecessary now. + * refactor quilt usage: use /usr/share/quilt/quilt.make. + * support building in paralell. make snippet taken from the qemu package. + * cleanups in debian/rules. + * Move ffmpeg-config back to libavutil. This way we can avoid a circular + dependency between libavutil-dev and libavcodec-dev. (Closes: #484132). + libavcodec uses libavutil internally, so this dependency cannot be avoided. + * disable altivec, at least for now. (Closes: #482717) + * always compile with --disable-strip. We strip the binaries afterwards using + dh_strip anyways. + * Remove depdency substitutions ${shlibs:Depends} and ${misc:Depends} from the + -dev packages. + + -- Reinhard Tartler Wed, 04 Jun 2008 00:04:08 +0200 + +ffmpeg-free (0.svn20080206-7) unstable; urgency=low + + * debian/control: + + Removed unnecessary Conflicts and Replaces from libswscale0 + (Closes: #481908), thanks Guillem Jover. + + Made libavutil-dev depend on libavcodec-dev. + * debian/libavcodec.install, debian/libavutil.install: + + Moved ffmpeg-config (script and manpage) from libavutil-dev to + libavcodec-dev (really Closes: #482213, #482214). + + -- Fabian Greffrath Tue, 28 May 2008 16:02:03 +0200 + +ffmpeg-free (0.svn20080206-6) unstable; urgency=low + + * Bug fix: "libavg: FTBFS: ld: cannot find -ldts", thanks to Lucas + Nussbaum (Closes: #482213, 482214). Fixed by removing -ldts from + ffmpeg-config. + + -- Reinhard Tartler Tue, 27 May 2008 12:45:10 +0200 + +ffmpeg-free (0.svn20080206-5) unstable; urgency=low + + [ Fabian Greffrath ] + * debian/control: + + Fixed dependency typo, libswscale0 conflicts with libswsacle1d but not + libswscale1d (Closes: #481908). + + [ Reinhard Tartler ] + * disable 015_build_imgresample.diff. Please port all applications + needing the symbols sws_{scale,getContext}, + sws_{getCachedContext,freeContext} to use libswscale instead. + * downgrade debhelper depencency to level 5. We don't use any of the + level 6 features, and level 5 faciliates backporting to earlier + releases massively. + * remove unapplied patches from source to reduce the size of the + .diff.gz. The old patches can be retrieved from branches in our svn. + + -- Reinhard Tartler Thu, 22 May 2008 09:26:06 +0200 + +ffmpeg-free (0.svn20080206-4) unstable; urgency=low + + * debian/rules: + + Moved confflags, that result in GPL versions of the libraries, into a + dedicated variable gpl_confflags. Add this to the common confflags. + + Moved --prefix=/usr to the common confflags. + + Added some comments and whitespace (nothing special). + + Renamed the "risky" keyword to "internalencoders". Set this in + DEB_BUILD_OPTIONS in order to create and build from an unstripped tarball + in the get-orig-source and build rules (Closes: #478010). + + Introduced the "externalcodecs" keyword. Set this in DEB_BUILD_OPTIONS to + enable support for additional codecs via external libraries. + + Commented out the amr?b codecs among the external codecs, because the + resulting packages will be unredistributable. + + -- Fabian Greffrath Tue, 29 Apr 2008 09:07:11 +0100 + +ffmpeg-free (0.svn20080206-3) experimental; urgency=low + + * install qt-faststart. Thanks Stefan Hermann for the patch from ubuntu. + (Closes: #470484) + * Reenable 020_fix_libswscale_pic_code, fixes FTBFS on amd64. + * Reenable altivec, fixes FTBFS on powerpc. + * Add some notes about the removed mpeg encoders (Closes: #440702) + + -- Reinhard Tartler Fri, 18 Apr 2008 23:02:24 +0200 + +ffmpeg-free (0.svn20080206-2) experimental; urgency=low + + [ Reinhard Tartler ] + * patches/020_fix_sws_scale_crash: if sws_scale is given an invalid context + (e.g. a null pointer), the function will crash because of a null pointer + dereference. Add a check for that here. + * add Conflicts/Replaces for libswscale1d. + * Due to the fact that we no longer build the shared version of ffmpeg with + mmx optimisations, the following patches have been dropped: + - 020_mmx_optims.diff + - 020_mmx_pic_code.diff + - 020_disable_snow_mmx_in_pic.diff + - 020_fix_libswscale_pic_code + + [ Fabian Greffrath ] + * debian/control: + + Added libx11-dev and libxext-dev to Build-Depends. + * debian/rules: + + Build with --enable-x11grab (Closes: #441983). + + Build ffmpeg and shared libraries with --extra-cflags="-fPIC -DPIC" + (feeling confident that this closes: #472613) and "drop the surgery + regarding Makefile.pic and config.mak.pic". + + In this context, cleaned up build rule: Run '$(MAKE)' and '$(MAKE) clean' + from the top source directory instead of diving into the library + directories; force move during backup and recovery of the static + libraries; let the build rule itself depend on config-extra-includes.h + (instead of build-stamp) to avoid being run again from the binary rule; + some more minor changes of cosmetic type. + + Renamed config-extra-includes rule to config-extra-includes.h to + reflect the file name of the created file (also changed to override it + instead of appending) and to avoid the rule to be run twice. + + Disabled all architecture-specific optimizations for the time being. + + -- Fabian Greffrath Fri, 1 Apr 2008 17:22:00 +0100 + +ffmpeg-free (0.svn20080206-1) experimental; urgency=low + + [ Reinhard Tartler ] + * new upstream release (Closes: #471136) + * refreshed patches + * libogg was dropped upstream + * no longer install integer.h, as it is not part of the public API (see + upstream r11642). + * no longer install rtp.h, as it is not part of the public API (see + upstream r11505). + * install crc.h and sha1.h to libavutil-dev, since it is part of the + public API now. + * introduce new package: libavdevice52 and libavdevice-dev. + * Implemented debian/get-orig-source.sh and adjusted the get-orig-source + target in debian/rules to use that. + * fix invocation of the testsuite. + * bump standards version to 3.7.3 (no changes needed). + * add script recordshow.sh (Closes: 461434). Thanks to + Daniel Dickinson + * Introdcue binary package ffmpeg-dbg, which contains debugging symbols + of the shared library packages. + + [ 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/compat: + + Bumped debhelper Build-Depends to (>= 6.0.0). + * 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: + + Reordered confflags to optionally build LGPL versions of the libraries. + + 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. + * debian/patches/011_link_plugins.diff: + + Updated to link all plugins against libavutil since they all use symbols + from this library. Resolves "symbols found in none of the libraries" + warnings from dpkg-shlibdeps. + + -- Reinhard Tartler Thu, 20 Mar 2008 17:57:21 +0100 + +ffmpeg-free (0.cvs20071007-4) experimental; urgency=low + + [ Fabian Greffrath ] + * 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. + + [ Reinhard Tartler ] + * added Fabian Greffrath to Uploaders + + -- Reinhard Tartler Thu, 20 Mar 2008 15:55:11 +0100 + +ffmpeg-free (0.cvs20071007-3) experimental; urgency=low + + * disable armv6 code generation. Thanks to Joey Hess for the patch + (Closes: #438923). + + -- Reinhard Tartler Sun, 13 Jan 2008 23:28:25 +0100 + +ffmpeg-free (0.cvs20071007-2) experimental; urgency=low + + * restore soname on libavutil. got dropped on previous upload. + * Bug fix: "needs libavutil-dev headers but doesn't depend on it", + thanks to rmh@aybabtu.com (Closes: #434494). This was actually already + fixed in a previous upload. + * build dependencies in debian/control are now multiline. + * Drop the XS- from the Vcs-Browser and Vcs-Svn field. + + -- Reinhard Tartler Sun, 16 Dec 2007 21:36:49 +0100 + +ffmpeg-free (0.cvs20071007-1) experimental; urgency=low + + * new upstream snapshot, using the same day as the mplayer release + * Refreshing patches: + -005_altivec_flags.diff: dropped, merged upstream + -005_m68k_workaround.diff: refreshed + -005_runtime_cpudetect.diff: refreshed + -006_mips_pthreads.diff: refreshed + -010_proper_rpath.diff: refreshed + -010_shared_library_versioning.diff: refreshed + -011_link_plugins.diff: refreshed (moved to top level makefile) + -015_build_imgresample.diff: refreshed + -020_disable_snow_mmx_in_pic.diff: refreshed + -020_fix_libswscale_pic_code.diff: refreshed + -020_mmx_optims.diff: refreshed + -020_mmx_pic_code.diff: refreshed + -040_early_altivec_detection.diff: disabled, doesn't apply anymore + -040_only_use_maltivec_when_needed.diff disabled, (causes ftbfs, needs revising) + -040_only_use_maltivec_when_needed.diff: refresh + -051_mjpeg_gray_support.diff, removed applied upstream + -053_rm_demux_crash.diff removed, applied upstream. + -060_fix_avi_skip.diff removed, does not apply anymore + * remove --enable-libdts. ffmpeg now has an internal dts decoder since + r9051 (2007-05-17). It seems that at least some packages link to libdts and + rely on the transitive dependency via ffmpeg. Please add explicit dependencies + on libdts instead! + * Don't ignore errors in upstream Makefile. Bug found via lintian. + + -- Reinhard Tartler Wed, 05 Dec 2007 17:33:34 +0100 + +ffmpeg-free (0.cvs20070307-7) UNRELEASED; urgency=low + + * debian/patches/051_mjpeg_gray_support.diff: + + Support grayscale MJPEG streams as sent by Axis cameras. + + -- Sam Hocevar (Debian packages) Tue, 31 Jul 2007 18:55:31 +0200 + +ffmpeg-free (0.cvs20070307-6) unstable; urgency=low + + * Rename the source package. We are (again) no longer shipping the + 'real' upstream source of ffmpeg. + * Add debian/strip.sh to strip ffmpeg upstream source disabling mpeg + based encoders as discussed with ftp-master at debconf7 + * update XS-Vcs tags in debian/control. + * make ffmpeg binNMU-able by using ${binary:Version} rather than + ${Source-Version} + + -- Reinhard Tartler Sat, 23 Jun 2007 15:11:21 +0100 + +ffmpeg (0.cvs20070307-5) unstable; urgency=low + + * upload to unstable + * remove x264 support, as it has been removed from unstable + + -- Reinhard Tartler Wed, 30 May 2007 15:19:20 +0200 + +ffmpeg (0.cvs20070307-4) experimental; urgency=low + + * added myself to uploaders + + * 020_fix_libswscale_pic_code: + + added, avoid some MMX code to avoid PIC code + + [ Sam Hocevar ] + + * fixed path in library installation. + + -- Reinhard Tartler Wed, 11 Apr 2007 23:17:47 +0200 + +ffmpeg (0.cvs20070307-3) experimental; urgency=low + + * debian/patches/015_build_imgresample.diff: + + Build imgresample functions even with swscaler activated, or legacy + applications will stop working. + + * debian/patches/053_rm_demux_crash.diff: + + New patch: fix a double free with corrupted rm files (Closes: #379922). + + * debian/patches/054_h264_mmx_chroma_mc_crash.diff: + + New patch: workaround for a buffer overflow in the MMX H264 chroma + motion compensation until upstream fixes it properly (Closes: #404176). + + * debian/patches/300_c++_compliant_headers.diff: + + Define INT64_C() when the system headers don't provide it, for instance + when building C++ code. + + * debian/control: + + Set pkg-multimedia-maintainers as main maintainer. + + Updated VCS fields. + * debian/rules: + + Huge cleanup. + + -- Sam Hocevar (Debian packages) Wed, 14 Mar 2007 19:40:42 +0100 + +ffmpeg (0.cvs20070307-2) experimental; urgency=low + + * debian/rules: + + Activate x264 support now that it is in unstable. + * debian/control: + + Build-depend on libx264-dev. + + -- Sam Hocevar (Debian packages) Mon, 12 Mar 2007 21:10:45 +0100 + +ffmpeg (0.cvs20070307-1) experimental; urgency=low + + [ Sam Hocevar ] + + * New upstream snapshot (Closes: #403330, #404788). + * This snapshot fixes numerous file parsing crashes (Closes: #404176, + Closes: #407003, #396282, #365006, #403398). + + * debian/patches/010_proper_rpath.diff: + + New patch. Link objects with the libraries that we generate, not the + ones installed on the system. + + * debian/patches/010_shared_library_versioning.diff: + + Strip unneeded prefix from .pc files (Closes: #404758). + + * debian/patches/011_link_plugins.diff: + + New patch. Link vhook plugins with the appropriate libraries. + + * debian/patches/013_strip_unneeded_linker_flags.diff: + + Remove unneeded -l flags from .pc files (Closes: #373986). + + * debian/patches/020_mmx_optims.diff: + * debian/patches/020_disable_snow_mmx_in_pic.diff: + + Sync patches. + + * debian/patches/020_really_use_liba52.diff: + * debian/patches/050_h264-misc-security-fixes.diff: + * debian/patches/051_asf-misc-security-fixes.diff: + + Drop patches, applied upstream or no longer relevant. + + * debian/patches/040_only_use_maltivec_when_needed.diff: + + Upgraded patch to cover libswscale. + + * debian/libavcodec-dev.install: + + Ship lzo.h and random.h. + + * debian/rules: + + Fix syntax for a few --enable flags. + + Only ship ffmpeg_powerpc_performance_evaluation_howto.txt.gz on + powerpc machines (Closes: #385079). + + Readded --enable-libtheora, it's here again. + + Activate --enable-swscaler (Closes: #399141, #398442). + + [ Reinhard Tartler ] + + * debian/rules: + + Ignore libswscale.pc and rgb2rgb.h. + + * debian/libavcodec-dev.install: + + Ship fifo.h and opt.h. + + * debian/patches/005_altivec_flags.diff: + * debian/patches/005_m68k_workaround.diff: + * debian/patches/005_runtime_cpudetect.diff: + * debian/patches/006_mips_pthreads.diff: + * debian/patches/020_really_use_liba52.diff: + + Sync patches. + + * debian/patches/007_disable_ffmpeg_option.diff: + * debian/patches/030_arm_cpu_detect.diff: + * debian/patches/030_arm_workaround.diff: + + Drop patches, applied upstream or no longer relevant. + + -- Sam Hocevar (Debian packages) Fri, 9 Mar 2007 15:13:16 +0100 + +ffmpeg (0.cvs20060823-7) unstable; urgency=high + + * debian/patches/040_only_use_maltivec_when_needed.diff: + + Fix a static function prototype that prevented programs using libpostproc + from working on PowerPC (Closes: #412214). + + * debian/control: + + Added Xs-Vcs-Browser and XS-Vcs-Svn fields. + + -- Sam Hocevar (Debian packages) Thu, 8 Mar 2007 17:51:37 +0100 + +ffmpeg (0.cvs20060823-6) unstable; urgency=high + + * Upload to unstable. + + -- Loic Minier Thu, 1 Feb 2007 21:36:47 +0100 + +ffmpeg (0.cvs20060823-5) testing-proposed-updates; urgency=high + + [ Loïc Minier ] + * Add myself to Uploaders. + * Exclude firewire libs from ffmpeg-config under kFreeBSD; based on a patch + by Petr Salinger; closes: #399701. + * Fix handling of debug in DEB_BUILD_OPTIONS; thanks Andreas Henriksson; + closes: #406474. + * SECURITY: New patch, 050_h264-misc-security-fixes, to properly check the + sps and pps ids before use and to check more bitstram values and fix + potential security holes; from upstream SVN r7585, r7586, and r7591. + * SECURITY: New patch, 051_asf-misc-security-fixes, to properly check + packet sizes, chunk sizes, and fragment positions; from upstream SVN r7640 + and r7650. + + [ Sam Hocevar ] + * debian/copyright: + + Fix typo and clarify licensing terms (Closes: #398235). + * debian/README.Debian: + + Removed mention of ffmpeg-config now that we ship .pc files. + * debian/patches/020_mmx_optims.diff: + + New patch, fix FTBFS with DEB_BUILD_OPTIONS=debug. + * debian/patches/040_early_altivec_detection.diff: + + New patch, detect AltiVec earlier on and only once so that we don't + risk using signal handlers in a multithreaded environment or when + the caller already installed a SIGILL handler. + * debian/patches/040_only_use_maltivec_when_needed.diff: + + New patch, only use -maltivec with files that use AltiVec intrinsics, + and make sure no codepath leads to these files on a non-AltiVec + machine (Closes: #405926). + * debian/patches/060_fix_avi_skip.diff: + + New patch, courtesy of Ben Hutchings: do not attempt to skip the ODML + if the current seek offset is already beyond it (Closes: #383734). + + -- Sam Hocevar (Debian packages) Mon, 29 Jan 2007 16:58:44 +0100 + +ffmpeg (0.cvs20060823-4) unstable; urgency=high + + * Maintainer upload. + * Acknowledging NMU (Closes: #386458). + + * High urgency because of FTBFS fix. + + * debian/patches/030_arm_workaround.diff: + + New patch courtesy of Aurélien Jarno: disable the broken ARM assembly + code in libavcodec/mpegaudiodec.c. + + * debian/patches/030_arm_cpu_detect.diff: + + New patch courtesy of Aurélien Jarno: correctly detect the newer ARM + CPUs. + + -- Sam Hocevar (Debian packages) Sun, 24 Sep 2006 23:38:29 +0200 + +ffmpeg (0.cvs20060823-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix variable substitution trick in debian/rules (Closes: #386458). + + -- Luk Claes Fri, 15 Sep 2006 21:29:07 +0200 + +ffmpeg (0.cvs20060823-3) unstable; urgency=low + + * debian/rules: + + Take local packages into account when computing shlibs dependencies, so + that ffplay/ffserver depend on the proper libraries (Closes: #386029). + + -- Sam Hocevar (Debian packages) Tue, 5 Sep 2006 17:44:00 +0200 + +ffmpeg (0.cvs20060823-2) unstable; urgency=low + + * debian/patches/020_really_use_liba52.diff: + + New patch: link with the shared liba52 instead of the built-in one. + + * debian/patches/006_mips_pthreads.diff: + + New patch: link libraries with -lpthreads on Linux MIPS because of a + known ld bug. + + * debian/patches/007_disable_ffmpeg_option.diff: + + New patch: add a --disable-ffmpeg option. + + -- Sam Hocevar (Debian packages) Wed, 30 Aug 2006 18:36:52 +0200 + +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). + + -- Sam Hocevar (Debian packages) Wed, 23 Aug 2006 12:09:58 +0200 + +ffmpeg (0.cvs20060329-4) unstable; urgency=low + + * debian/control: + + Make each -dev package depend on the corresponding shared library + package (Closes: #361348). + + Moved libavutil files from libavformat-dev to libavcodec-dev which is + the real common dependency (Closes: #361269). + + -- Sam Hocevar (Debian packages) Sun, 9 Apr 2006 15:23:37 +0200 + +ffmpeg (0.cvs20060329-3) unstable; urgency=low + + * debian/rules: that build system is hopeless. We now run configure and + make twice, backup static libraries inbetween, then update timestamps + to fool make. That should fix the FTBFS (Closes: #361215). + + -- Sam Hocevar (Debian packages) Fri, 7 Apr 2006 11:33:15 +0200 + +ffmpeg (0.cvs20060329-2) unstable; urgency=low + + * debian/rules: fixed Makefile.pic generation. + + -- Sam Hocevar (Debian packages) Thu, 6 Apr 2006 16:37:05 +0200 + +ffmpeg (0.cvs20060329-1) unstable; urgency=low + + * New CVS snapshot. + * Upstream fixed a double free in img.c (Closes: #351455). + * Upstream fixed the libvorbisenc dependency in libavcodec.pc + (Closes: #357352). + + * debian/rules: + + Activated threading support (Closes: #335677). + + Manually reinstall dsputil.h. + + * debian/README.Debian: + + Removed mention of --plugin-libs. + + Added a note about the unofficial packages (Closes: #306752). + + * 020_disable_snow_mmx_in_pic.diff: (new patch) disable MMX acceleration in + the Snow encoder in PIC mode. + + -- Sam Hocevar (Debian packages) Thu, 30 Mar 2006 10:41:17 +0200 + +ffmpeg (0.cvs20060306-3) unstable; urgency=low + + * Switched patch system to quilt. + * debian/control: + + Build-depend on quilt. + + * 005_altivec_flags.diff: (new patch from old diff.gz) proper gcc flags to + only generate AltiVec code when explicitely asked. + + * 005_m68k_workaround.diff: (new patch from old diff.gz) use -O2 instead of + -O3 on m68k. + + * 005_runtime_cpudetect.diff: (new patch from old diff.gz) fix runtime CPU + detection on m68k and x86. + + * 010_ffmpeg-config.diff: (new patch from old diff.gz) the ffmpeg-config + script and associated manpage (legacy). + + * 010_shared_library_versioning.diff: (new patch from old diff.gz) use a + Debian-specific scheme for shared library versioning to avoid spreading + libraries incompatible with every other version. + + * 020_mmx_intrinsics.diff: (new patch from old diff.gz) use MMX intrinsics + in dsputil_mmx.c because gcc is unable to compute some register constraints + in PIC mode. + + * 020_mmx_pic_code.diff: (new patch from old diff.gz) ported some MMX code + to be PIC. + + -- Sam Hocevar (Debian packages) Wed, 29 Mar 2006 18:53:35 +0200 + +ffmpeg (0.cvs20060306-2) unstable; urgency=low + + * ffmpeg-config.in: removed references to _pic libraries. + + -- Sam Hocevar (Debian packages) Fri, 17 Mar 2006 20:08:29 +0100 + +ffmpeg (0.cvs20060306-1) unstable; urgency=low + + * New CVS snapshot. + * Upstream now properly installs dsputil.h (Closes: #354391). + * debian/control: + + Distribute shared versions of the libraries with a Debian-specific + soname. + * debian/rules: + + Removed all custom PIC rules. + + Moved ffmpeg-config to libavformat-dev instead of libavcodec-dev so that + it is present by default (Closes: #350750). + + Include apiexample.c in libavcodec-dev (Closes: #350027). + + -- Sam Hocevar (Debian packages) Mon, 6 Mar 2006 11:05:26 +0100 + +ffmpeg (0.cvs20050918-6) unstable; urgency=low + + * Developer upload. + * Acknowledge NMU. Thanks to Samuel Mimram (Closes: #342207). + * configure: + + Set RUNTIME_CPUDETECT (except on m68k where it ICEs and on x86 where it + fails to build some asm constructs) (Closes: #337846). + * debian/rules: + + Make the build process aware of DEB_BUILD_OPTIONS, thanks to Timo + Lindfors (Closes: #338895). + + -- Sam Hocevar (Debian packages) Sat, 21 Jan 2006 16:51:26 +0100 + +ffmpeg (0.cvs20050918-5.1) unstable; urgency=low + + * NMU. + * Fix exploitable heap overflow in libavcodec's handling of images with + PIX_FMT_PAL8 pixel formats (CVE-2005-4048), closes: #342207. + + -- Samuel Mimram Sun, 15 Jan 2006 14:44:36 +0100 + +ffmpeg (0.cvs20050918-5) unstable; urgency=low + + * ffmpeg-config.1: fixed the examples and added a note that static libraries + should be put after the objects that refer to them (Closes: #339803). + + -- Sam Hocevar (Debian packages) Fri, 18 Nov 2005 23:58:16 +0100 + +ffmpeg (0.cvs20050918-4) unstable; urgency=low + + * configure: + + Tell the configure script about m68k, ia64 and others. + + -- Sam Hocevar (Debian packages) Thu, 22 Sep 2005 14:43:59 +0200 + +ffmpeg (0.cvs20050918-3) unstable; urgency=low + + * configure: + + Use -O2 instead of -O3 on m68k to avoid ICEs. + + -- Sam Hocevar (Debian packages) Tue, 20 Sep 2005 17:33:14 +0200 + +ffmpeg (0.cvs20050918-2) unstable; urgency=low + + * libavcodec/i386/dsputil_mmx.c: + + Reworked the MMX intrinsics. + * tests/libav.regression.ref: + + Minor cosmetic fix to use double-digit numbers in test sequences. + * debian/control: + + PowerPC no longer needs to use gcc-3.4, since 4.x is the default. + * libavcodec/Makefile: + + Removed special compilation case for HPPA now that we use 4.x. + + -- Sam Hocevar (Debian packages) Sun, 18 Sep 2005 17:43:48 +0200 + +ffmpeg (0.cvs20050918-1) unstable; urgency=low + + * New CVS snapshot. + * Upstream applied most Debian patches. + * configure: + + Do not use -mabi=altivec (-maltivec is enough for our AltiVec code) so + that our code still runs on a G3 computer (Closes: #319151). + * debian/rules: + + When not cross-compiling, run the regression tests (Closes: #292102). + * debian/changelog: + + Updated the FSF address. + * ffmpeg-config.in: + + Fixed avcodec linkage (Closes: #328505). + * libavcodec/i386/mpegvideo_mmx_template.c: + + Applied patch from Tobias Grimm to fix the PIC MMX code for MPEG + encoding (Closes: #318493). + * libavcodec/i386/dsputil_mmx.c: + + Applied patch from Joshua Kwan to fix the AMD64 build (Closes: #324026). + + Reworked that patch so that it still compiles on x86. + + -- Sam Hocevar (Debian packages) Fri, 16 Sep 2005 13:03:47 +0200 + +ffmpeg (0.cvs20050811-2) unstable; urgency=low + + * ffmpeg-config.in: added a missing -lgsm. + + -- Sam Hocevar (Debian packages) Mon, 22 Aug 2005 19:51:53 +0200 + +ffmpeg (0.cvs20050811-1) unstable; urgency=low + + * New CVS snapshot. + * Upstream fixed an integer overflow in the MPEG encoder (Closes: #320150). + * debian/rules: + + Activated libgsm support. + + Fixed theora support. + + Switched installation method to dh_install. + * Applied patch from Christian Aichinger and others to fix the clobbering + of the %ebx register during build (Closes: #319563). + + -- Sam Hocevar (Debian packages) Thu, 11 Aug 2005 14:22:03 +0200 + +ffmpeg (0.cvs20050626-2) unstable; urgency=low + + * ffmpeg-config.in: fixed the theora link that caused FTBFS. + + -- Sam Hocevar (Debian packages) Fri, 1 Jul 2005 17:20:59 +0200 + +ffmpeg (0.cvs20050626-1) unstable; urgency=low + + * New CVS snapshot. + * debian/control: + + Set policy to 3.6.2.1. + * debian/rules: + + Fixed Vorbis support (Closes: #306023). + + Patch by Jonas Smedegaard : conditionally enable these + unofficial libraries if DEB_BUILD_OPTIONS includes "risky": + o Mpeg2 layer 3 / MP3 (liblame-dev). + o FAAD (libfaad2-dev). + o FAAC (libfaac-dev). + o XviD (libxvidcore-dev). + + Activated theora support. + + Activated IEEE 1394 support (Closes: #296737). + + -- Sam Hocevar (Debian packages) Sun, 26 Jun 2005 15:46:54 +0200 + +ffmpeg (0.cvs20050313-2) unstable; urgency=low + + * libavcodec/libpostproc/postprocess_template.c + libavcodec/i386/mpegvideo_mmx_template.c: fixed my PIC MMX code (Closes: #299700). + * debian/rules: use gcc-3.4 on PowerPC (Closes: #300686). + + -- Sam Hocevar (Debian packages) Mon, 21 Mar 2005 23:38:46 +0100 + +ffmpeg (0.cvs20050313-1) unstable; urgency=low + + * New CVS snapshot. + * configure: fixed the builtin vector test (Closes: #293284), thanks + to Jacob L. Anawalt. + * libavcodec/libpostproc/postprocess_template.c + libavcodec/i386/mpegvideo_mmx_template.c: fixed MMX code so that it can + be compiled in PIC mode, and reactivated MMX (Closes: #290447, #290358). + + -- Sam Hocevar (Debian packages) Sat, 12 Mar 2005 18:34:29 +0100 + +ffmpeg (0.cvs20050121-1) unstable; urgency=low + + * New CVS snapshot. + * This snapshot fixes integer overflows that may lead to arbitrary code + execution (Closes: #291566). + + -- Sam Hocevar (Debian packages) Fri, 21 Jan 2005 17:41:47 +0100 + +ffmpeg (0.cvs20050108-1) unstable; urgency=low + + * Re-done tarball snapshot so that it does not contain binaries. + * ffmpeg-config.in: + + Added missing -lvorbisenc (Closes: #289030). + * debian/rules: + + Install missing headers that are not in the install rule: bwswap.h, + dsputil.h, os_support.h (Closes: #289033). + + -- Sam Hocevar (Debian packages) Sat, 8 Jan 2005 11:30:58 +0100 + +ffmpeg (0.cvs20050106-1) unstable; urgency=low + + * New upstream snapshot. + * The extern/static declaration conflict was fixed upstream (Closes: #288906). + + -- Sam Hocevar (Debian packages) Thu, 6 Jan 2005 15:44:49 +0100 + +ffmpeg (0.cvs20040716-2) unstable; urgency=low + + * debian/rules: + + Include missing rtp.h / rtsp.h in libavformat-dev. + * ffmpeg-config.in: + + Added -lz to the libavcodec linking flags. + + Added -ldts / -ldts_pic, -la52, -lvorbis to the libavcodec linking flags. + + -- Sam Hocevar (Debian packages) Tue, 17 Aug 2004 13:27:41 +0200 + +ffmpeg (0.cvs20040716-1) unstable; urgency=low + + * Initial release (Closes: #199266). + + -- Sam Hocevar (Debian packages) Fri, 16 Jul 2004 12:47:27 +0200 + --- libav-0.6.2.orig/debian/recordshow.sh +++ libav-0.6.2/debian/recordshow.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +# Copyright 2008, Daniel Dickinson +# +# This script script (which depends on xawtv for the v4lctl command to +# select channel) and crontab show how one can record tv shows using +# ffmpeg. + +STATION="$1" +TODAY=$(date +"%A %B %d %Y") +SHOWLENGTH="$2" +SHOWDIR="$3" +SHOWNAME="$4" + +function err_exit { + EXITCODE=$1 + shift + echo $* 1>&2 + exit $EXITCODE +} + +BADPARAM=FALSE + +if [ -z "STATION" ]; then + BADPARAM=TRUE +fi + +if [ -z "$SHOWDIR" ]; then + BADPARAM=TRUE +fi + +if [ -z "$SHOWLENGTH" ]; then + BADPARAM=TRUE +fi + +if [ "$BADPARAM" != "FALSE" ]; then + err_exit 2 "Usage: recordshow.sh station show-length show-dir [show-name]" +fi + +if [ -z "$SHOWNAME" ]; then + BASEFILENAME="$SHOWDIR/$TODAY" +else + BASEFILENAME="$SHOWDIR/$SHOWNAME-$TODAY" +fi + +SECONDS=$(echo $SHOWLENGTH | cut -f3 -d:) +MINUTES=$(echo $SHOWLENGTH | cut -f2 -d:) +HOURS=$(echo $SHOWLENGTH | cut -f1 -d:) + +TOTALSECONDS=0 + +TOTALSECONDS=$(expr $(expr $(expr $HOURS '*' 3600) + $(expr $MINUTES '*' 60)) + $SECONDS) + +/usr/bin/v4lctl setstation $1 >/dev/null || err_exit 1 "Unable to set station (channel) $STATION" +/usr/bin/v4lctl volume mute off >/dev/null || err_exit 4 "Unable to unmute audio" +/usr/bin/ffmpeg -y -tvstd ntsc -t "$TOTALSECONDS" -s 480x352 -re -deinterlace -f video4linux2 -i /dev/video0 -f audio_device -i /dev/dsp -ac 2 -s 768x576 -f mpegts -acodec mp2 -vcodec mpeg1video "$BASEFILENAME.mpegts" >/dev/null 2>&1 || err_exit 3 "Error recording show $BASEFILENAME to mpeg2 transport stream" +/usr/bin/v4lctl volume mute on >/dev/null || err_exit 5 "Unable to mute audio" + --- libav-0.6.2.orig/debian/libavfilter1.lintian-overrides +++ libav-0.6.2/debian/libavfilter1.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libavfilter1: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/libavutil50.install +++ libav-0.6.2/debian/libavutil50.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libavutil.so.* --- libav-0.6.2.orig/debian/libav-doc.docs +++ libav-0.6.2/debian/libav-doc.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/libav-doc/html --- libav-0.6.2.orig/debian/libpostproc51.lintian-overrides +++ libav-0.6.2/debian/libpostproc51.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libpostproc51: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/compat +++ libav-0.6.2/debian/compat @@ -0,0 +1 @@ +7 --- libav-0.6.2.orig/debian/get-orig-source.sh +++ libav-0.6.2/debian/get-orig-source.sh @@ -0,0 +1,91 @@ +#!/bin/sh +# +# Script to create a 'pristine' tarball for the debian ffmpeg source package +# Copyright (C) 2008, 2009, 2010 Reinhard Tartler +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -eu + +usage() { + cat >&2 <&2 +} + +error () { + echo "$1" >&2 + exit 1; +} + +set +e +PARAMS=`getopt hd: "$@"` +if test $? -ne 0; then usage; exit 1; fi; +set -e + +eval set -- "$PARAMS" + +DEBUG=false +SVNDATE= + +while test $# -gt 0 +do + case $1 in + -h) usage; exit 1 ;; + -d) SVNDATE=$2; shift ;; + --) shift ; break ;; + *) echo "Internal error!" ; exit 1 ;; + esac + shift +done + +# sanity checks now +dh_testdir + +if [ -z $SVNDATE ]; then + error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008" +fi + +TARBALL=../ffmpeg_0.6~svn${SVNDATE}.orig.tar.gz +PACKAGENAME=ffmpeg + +TMPDIR=`mktemp -d` +trap 'rm -rf ${TMPDIR}' EXIT + +baseurl="svn://svn.ffmpeg.org/ffmpeg/branches/0.6" + +echo "fetching source from ${baseurl}" + +svn export -r{${SVNDATE}} \ + --ignore-externals \ + ${baseurl} \ + ${TMPDIR}/${PACKAGENAME} + +svn info -r{${SVNDATE}} \ + ${baseurl} \ + | awk '/^Revision/ {print $2}' \ + > ${TMPDIR}/${PACKAGENAME}/.svnrevision + +tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME} + +echo "Created tarball for version ${SVNDATE} in ${TARBALL}" --- libav-0.6.2.orig/debian/libpostproc51.install +++ libav-0.6.2/debian/libpostproc51.install @@ -0,0 +1 @@ +usr/lib/{,*/,*/*/}libpostproc.so.* --- libav-0.6.2.orig/debian/gbp.conf +++ libav-0.6.2/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = ubuntu +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True --- libav-0.6.2.orig/debian/README.Debian +++ libav-0.6.2/debian/README.Debian @@ -0,0 +1,104 @@ +lintian override shlib-with-non-pic-codeshlib-with-non-pic-code +================================================================== + +The lintian overrides for the non-pic shared libs error messages is not +really a matter of silencing lintian. The general idea is that the +override would serve as an indication that we know about the error +message and we're avoiding any bug reports or complaints by others about +the errors. + +We are aware that this override is too strict. It should only cover the +i386 architecture, as we know that the upstream build system will +produce PIC libraries where necessary. Only architectures like i386 will +be built non-PIC, mainly for performance reasons. + + -- Reinhard Tartler , Sun, 1 Aug 2010 14:39:10 -0400 + +FFmpeg package names +==================== + +The ffmpeg packaging has seen many renames in the course of its history. +Looking for more stable names, the ffmpeg maintainers agreed on moving to +a naming scheme which would fit known use cases and avoid confusion. + +Some of the constraints and proposed solutions on the new names follow: + + 1. Distributions such as Debian and Ubuntu want to carry multiple version of + the package to fit component divisions and please users; e.g. an + Ubuntu/universe and an Ubuntu/multiverse version, or a Debian/main and a + Debian/non-free version. It is conceived that there are usually two + variants of the ffmpeg package in these distributions: a) the vanilla + version shipped in the most permissible component if possible and b) a + 'stripped' package suitable for the most constrained component. + + For details why such a stripping is necessary in the first place, please + look further below in this document ("Disabled MPEG encoders"). + + 2. Packages from distributions and third party repositories such as the popular + debian-multimedia.org shouldn't interfere but coexist nicely. If these + repositories want to provide an alternate version of the source package, + they could do so with their own source and binary package names. It is + hoped that providing the vanilla source in one of the source packages will + remove the need to fork ffmpeg in these third party repositories. + + 3. The libraries built by various source packages shall be ABI compatible as + to allow packages built against the most constrained component to run + against the more permissible components; for instance vlc if built against + ffmpeg in main shall be able to run against the ffmpeg libraries from + non-free. The plan here is to use shlibs tricks to allow to install one + lib or the other. The shlibs would look like: + lib-name-in-main-99 (>= 1.2.3) | lib-name-in-non-free-99 (>= 1.2.3) + This scheme can be extended for third party repositories if it still needs + to be. + +For consistency at this date, Debian is missing a ffmpeg-extra source +package and Ubuntu had two source packages in the same component for a +short time. The binary package names are not unified and shlibs do not +allow to install one or the other library. + +To avoid gratuitous package renames, the proposed changes against the above +packages are: + + * For Debian and Ubuntu the binary packages in the 'main' component will + keep their original names without any additional marker. + + * The extra (unstripped) replacement packages in the 'non-free' + (Debian) and 'multiverse' (ubuntu) component will be built from a + source package named 'ffmpeg-extra'. The resulting binary packages + carry an '-extra-' marker in the name right between the library name + and its SONAME. + + * Ubuntu will track the ffmpeg packages in Debian and tries to minimize the + diff for maintenance reason. + + * If you disagree with the naming, please speak up on + pkg-multimedia-maintainers@lists.alioth.debian.org + + -- Reinhard Tartler , Sun, 26 Jul 2009 10:38:10 +0200 + +License of the Debian ffmpeg packages +===================================== + +The license for the whole work is the GPL, not the LGPL, because GPL-only +parts of ffmpeg were activated -- namely libpostproc, libswscale, x11grab and +(optionally) libfaad2. If you need LGPL versions of the libraries, please +comment out the appropriate line in debian/confflags. + + +Differences with unofficial ffmpeg packages +=========================================== + + There are popular unofficial ffmpeg packages at the following URL: + + 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 +Debian-specific naming scheme for libraries, you should be able to +install at least the shared library packages together. + + Before submitting a bug report, please make sure it is related to the +Debian packages and not those unofficial packages. + + + -- Sam Hocevar Thu, 30 Mar 2006 10:23:16 +0200 --- libav-0.6.2.orig/debian/clean +++ libav-0.6.2/debian/clean @@ -0,0 +1,5 @@ +config-extra-includes.h +EXTRA +codecs.txt +formats.txt +snapshot_version --- libav-0.6.2.orig/debian/source.lintian-overrides +++ libav-0.6.2/debian/source.lintian-overrides @@ -0,0 +1,3 @@ +# The dependencies for packages within ffmpeg are different than the +# dependencies for packages that depend on the ffmpeg libraries. +ffmpeg source: debian-rules-calls-debhelper-in-odd-order --- libav-0.6.2.orig/debian/libavcodec52.lintian-overrides +++ libav-0.6.2/debian/libavcodec52.lintian-overrides @@ -0,0 +1,2 @@ +# Overriding these fpic lintian errors. Please see bug #528080. +libavcodec52: shlib-with-non-pic-code --- libav-0.6.2.orig/debian/libavformat-dev.install +++ libav-0.6.2/debian/libavformat-dev.install @@ -0,0 +1,4 @@ +usr/include/libavformat +usr/lib/libavformat.a +usr/lib/{,*/,*/*/}libavformat.so +usr/lib/pkgconfig/libavformat.pc --- libav-0.6.2.orig/debian/source/format +++ libav-0.6.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- libav-0.6.2.orig/debian/patches/0002-Tweak-doxygen-config.patch +++ libav-0.6.2/debian/patches/0002-Tweak-doxygen-config.patch @@ -0,0 +1,23 @@ +From: Reinhard Tartler +Date: Mon, 28 Jun 2010 22:43:55 +0200 +Subject: [PATCH] Tweak doxygen config + +exclude some directories we use for packaging from doxygen documentation +--- + Doxyfile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Doxyfile b/Doxyfile +index ee233b9..1251d34 100644 +--- a/Doxyfile ++++ b/Doxyfile +@@ -359,7 +359,7 @@ RECURSIVE = YES + # excluded from the INPUT source files. This way you can easily exclude a + # subdirectory from a directory tree whose root is specified with the INPUT tag. + +-EXCLUDE = ++EXCLUDE = debian debian-shared debian-static debian-cmov .pc .git + + # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories + # that are symbolic links (a Unix filesystem feature) are excluded from the input. +-- --- libav-0.6.2.orig/debian/patches/series +++ libav-0.6.2/debian/patches/series @@ -0,0 +1,4 @@ +0002-Tweak-doxygen-config.patch +CVE-2011-1196.patch +CVE-2011-1931.patch +CVE-2011-3362.patch --- libav-0.6.2.orig/debian/patches/CVE-2011-3362.patch +++ libav-0.6.2/debian/patches/CVE-2011-3362.patch @@ -0,0 +1,51 @@ +Description: fix arbitrary code execution via malformed CAVS file +Origin: upstream, http://git.libav.org/?p=libav.git;a=commitdiff;h=bd968d260aef322fb32e254a3de0d2036c57bd56 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641478 + +diff -Nur libav-0.6.2/libavcodec/cavsdec.c libav-0.6.2.new/libavcodec/cavsdec.c +--- libav-0.6.2/libavcodec/cavsdec.c 2011-03-18 13:34:49.000000000 -0400 ++++ libav-0.6.2.new/libavcodec/cavsdec.c 2011-09-16 09:16:57.906345874 -0400 +@@ -130,12 +130,14 @@ + r++; + mask = -(level_code & 1); + level = (level^mask) - mask; +- } else { ++ } else if (level_code >= 0) { + level = r->rltab[level_code][0]; + if(!level) //end of block signal + break; + run = r->rltab[level_code][1]; + r += r->rltab[level_code][2]; ++ } else { ++ break; + } + level_buf[i] = level; + run_buf[i] = run; +@@ -189,7 +191,8 @@ + + static int decode_mb_i(AVSContext *h, int cbp_code) { + GetBitContext *gb = &h->s.gb; +- int block, pred_mode_uv; ++ unsigned pred_mode_uv; ++ int block; + uint8_t top[18]; + uint8_t *left = NULL; + uint8_t *d; +@@ -445,6 +448,8 @@ + if((show_bits_long(gb,24+align) & 0xFFFFFF) == 0x000001) { + skip_bits_long(gb,24+align); + h->stc = get_bits(gb,8); ++ if (h->stc >= h->mb_height) ++ return 0; + decode_slice_header(h,gb); + return 1; + } +@@ -659,7 +664,7 @@ + buf_end = buf + buf_size; + for(;;) { + buf_ptr = ff_find_start_code(buf_ptr,buf_end, &stc); +- if(stc & 0xFFFFFE00) ++ if((stc & 0xFFFFFE00) || buf_ptr == buf_end) + return FFMAX(0, buf_ptr - buf - s->parse_context.last_index); + input_size = (buf_end - buf_ptr)*8; + switch(stc) { --- libav-0.6.2.orig/debian/patches/CVE-2011-1931.patch +++ libav-0.6.2/debian/patches/CVE-2011-1931.patch @@ -0,0 +1,23 @@ +Description: fix denial of service and possible code execution via malformed AMV file +Origin: upstream, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624339 + +diff -Nur libav-0.6.2/libavcodec/sp5xdec.c libav-0.6.2.new/libavcodec/sp5xdec.c +--- libav-0.6.2/libavcodec/sp5xdec.c 2011-03-18 13:34:49.000000000 -0400 ++++ libav-0.6.2.new/libavcodec/sp5xdec.c 2011-09-16 09:05:49.666341325 -0400 +@@ -90,7 +90,6 @@ + recoded[j++] = 0xFF; + recoded[j++] = 0xD9; + +- avctx->flags &= ~CODEC_FLAG_EMU_EDGE; + av_init_packet(&avpkt_recoded); + avpkt_recoded.data = recoded; + avpkt_recoded.size = j; +@@ -216,6 +215,6 @@ + NULL, + ff_mjpeg_decode_end, + sp5x_decode_frame, +- CODEC_CAP_DR1, ++ 0, + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), + }; --- libav-0.6.2.orig/debian/patches/CVE-2011-1196.patch +++ libav-0.6.2/debian/patches/CVE-2011-1196.patch @@ -0,0 +1,33 @@ +Description: fix denial of service and possible code execution via malformed OGG +Origin: upstream, http://git.libav.org/?p=libav.git;a=commit;h=4cc3467e7abfea7e8d03b6af511f7719038a5a98 +Bug: http://code.google.com/p/chromium/issues/detail?id=71788 + +diff -Nur libav-0.6.2/libavformat/oggdec.c libav-0.6.2.new/libavformat/oggdec.c +--- libav-0.6.2/libavformat/oggdec.c 2011-03-18 13:34:49.000000000 -0400 ++++ libav-0.6.2.new/libavformat/oggdec.c 2011-09-16 09:05:17.146341102 -0400 +@@ -582,15 +582,15 @@ + int64_t pos_limit) + { + struct ogg *ogg = s->priv_data; +- struct ogg_stream *os = ogg->streams + stream_index; + ByteIOContext *bc = s->pb; + int64_t pts = AV_NOPTS_VALUE; +- int i; ++ int i = -1; + url_fseek(bc, *pos_arg, SEEK_SET); + ogg_reset(ogg); + + while (url_ftell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) { + if (i == stream_index) { ++ struct ogg_stream *os = ogg->streams + stream_index; + pts = ogg_calc_pts(s, i, NULL); + if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY)) + pts = AV_NOPTS_VALUE; +@@ -615,6 +615,7 @@ + os->keyframe_seek = 1; + + ret = av_seek_frame_binary(s, stream_index, timestamp, flags); ++ os = ogg->streams + stream_index; + if (ret < 0) + os->keyframe_seek = 0; + return ret;