--- avidemux-2.1.2.orig/addons/ffv1rec/Makefile +++ avidemux-2.1.2/addons/ffv1rec/Makefile @@ -7,7 +7,7 @@ -I../../ \ -I../../avidemux/ADM_library \ -COPTSRT= -O3 -Wall -DMMX -mcpu=pentium -funroll-loops -fexpensive-optimizations -finline-functions +COPTSRT= -O3 -Wall -funroll-loops -fexpensive-optimizations -finline-functions #COPTSRT= -O0 -g3 @@ -16,7 +16,7 @@ V4LDIR=/usr/src/linux/drivers/char/ -COPTS=-DMMX $(IFLAGS) $(COPTSRT) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +COPTS=$(IFLAGS) $(COPTSRT) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 all: ffv1rec --- avidemux-2.1.2.orig/debian/dirs +++ avidemux-2.1.2/debian/dirs @@ -0,0 +1,2 @@ +usr/share/applications +usr/share/pixmaps --- avidemux-2.1.2.orig/debian/menu +++ avidemux-2.1.2/debian/menu @@ -0,0 +1,2 @@ +?package(avidemux):needs="X11" section="Apps/Graphics" \ + title="avidemux" command="/usr/bin/avidemux" --- avidemux-2.1.2.orig/debian/control +++ avidemux-2.1.2/debian/control @@ -0,0 +1,18 @@ +Source: avidemux +Section: graphics +Priority: optional +Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Standards-Version: 3.6.2 +Build-Depends: debhelper (>> 4), libgtk2.0-dev, liblame-dev, libmad0-dev, liba52-0.7.4-dev, libvorbis-dev, libmjpegtools-dev, libxvidcore4-dev, libfreetype6-dev, libxml2-dev, libasound2-dev, libsdl-dev, libsmjs-dev, libfaac-dev (>= 1.24), libfaad2-dev, libxv-dev, libx264-dev + +Package: avidemux +Architecture: any +Depends: ${shlibs:Depends} +Recommends: mjpegtools, toolame, lame +Description: a small editing software for avi (especially DivX) + With avidemux you can open divx, process the audio track with the included + filters and save a part of the avi (i.e. split). + . + De-multiplex audio & video is also possible, the audio track can be coming + from the avi or an external Wav/MP3 file. --- avidemux-2.1.2.orig/debian/rules +++ avidemux-2.1.2/debian/rules @@ -0,0 +1,152 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +#export DH_VERBOSE=1 + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEBIAN_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + + ./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) --with-jsapi-include=/usr/include/smjs --with-newfaad + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) -j 2 +ifeq "$(DEBIAN_ARCH)" "i386" + $(MAKE) -j 2 -C addons/ffv1rec +endif + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + -$(MAKE) -C adm_lavcodec distclean +ifeq "$(DEBIAN_ARCH)" "i386" + $(MAKE) -C addons/ffv1rec clean +endif + + debian/rules unpatch + + find -name .deps | xargs rm -rf + + dh_clean adm_lavcodec/libpostproc/*.a adm_lavcodec/libpostproc/*.o + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/avidemux/usr + + # Install .desktop file + cp debian/avidemux.desktop debian/avidemux/usr/share/applications + cp avidemux_icon.png debian/avidemux/usr/share/pixmaps/avidemux.png + +ifeq "$(DEBIAN_ARCH)" "i386" + cp addons/ffv1rec/ffv1rec debian/avidemux/usr/bin +endif + mv debian/avidemux/usr/bin/avidemux2 debian/avidemux/usr/bin/avidemux + rm -rf debian/avidemux/usr/share/locale/klingon + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installchangelogs History + dh_desktop + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch + +DPATCH_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) +PATCHLIST_ALL = $(shell cat debian/patches/00list) +PATCHLIST_ARCH = $(shell cat debian/patches/00list.${DPATCH_ARCH} 2>/dev/null) +PATCHLIST ?= $(sort ${PATCHLIST_ALL} ${PATCHLIST_ARCH}) + +UNPATCHLIST = $(shell echo ${PATCHLIST} | tr ' ' '\n' | tac) + +patch: patch-stamp +patch-stamp: + test -d debian/patched || install -d debian/patched + @echo "Patches applied in the Debian version of ${PACKAGE}:" > $@T + @for patch in ${PATCHLIST}; do \ + patchdir=$${patch%/*}; \ + test "x$$patchdir" = "x$$patch" || \ + install -d debian/patched/$$patchdir; \ + stamp=debian/patched/$$patch.dpatch; \ + patch=debian/patches/$$patch.dpatch; \ + author=`sed -n "s,^#* *.*dpatch by *,,p" $$patch`; \ + test -x $$patch || chmod +x $$patch; \ + if test -f $$stamp; then \ + echo "$$patch already applied."; \ + echo -e "\n$$patch ($$author):" >> $@T; \ + sed -n 's/^#* *DP: */ /p' $$patch >> $@T; \ + else \ + echo -n "applying patch $$patch..."; \ + if $$patch -patch >$$stamp.new 2>&1; then \ + mv $$stamp.new $$stamp; \ + touch $$stamp; \ + echo -e "\n$$patch ($$author):" >> $@T; \ + sed -n 's/^#* *DP: */ /p' $$patch >> $@T; \ + echo " ok."; \ + else \ + echo " failed."; \ + exit 1; \ + fi; \ + fi; \ + done + mv -f $@T $@ + +unpatch: + @for patch in ${UNPATCHLIST}; do \ + stamp=debian/patched/$$patch.dpatch; \ + patch=debian/patches/$$patch.dpatch; \ + test -x $$patch || chmod +x $$patch; \ + if test -f $$stamp; then \ + echo -n "reverting patch $$patch..."; \ + if $$patch -unpatch 2>&1 >/dev/null; then \ + rm -f $$stamp; \ + echo " ok."; \ + else \ + echo " failed."; \ + exit 1; \ + fi; \ + fi; \ + done + rm -rf patch-stamp patch-stampT debian/patched --- avidemux-2.1.2.orig/debian/watch +++ avidemux-2.1.2/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://download.berlios.de/avidemux/avidemux-([\d.]*).tar.gz --- avidemux-2.1.2.orig/debian/changelog +++ avidemux-2.1.2/debian/changelog @@ -0,0 +1,427 @@ +avidemux (1:2.1.2-0.0ubuntu2) dapper; urgency=low + + * Add a desktop file (thanks Fabio Berta) + Closes Malone #39702 + + -- Gauvain Pocentek Tue, 2 May 2006 07:46:14 +0200 + +avidemux (1:2.1.2-0.0ubuntu1) dapper; urgency=low + + * New upstream release. + * Sync with Marillat. Ubuntu patches preserved. + * UVF Exception: Malone #39819 + * build and install addons/ffv1rec (on i386 only) + + -- Jamie Jones Mon, 17 Apr 2006 11:54:34 +1000 + +avidemux (1:2.1.1-0.0ubuntu1) dapper; urgency=low + + * Sync with Marillat + * UVF Exception: Malone #34448 + * Don't build MMX support as we support older CPUs too, only build the + ffv1rec addon on x86. Patch by Jamie Jones. + * Adjust Build-Depends: + + liba52-dev -> liba52-0.7.4-dev + + -- Sebastian Dröge Sun, 26 Mar 2006 16:33:17 +0200 + +avidemux (1:2.1.1-0.0) unstable; urgency=low + + * New upstream release. + * Add libsmjs-dev, libxv-dev and libx264-dev in Build-Depends. + * Add a watch file. + + -- Christian Marillat Tue, 7 Feb 2006 12:16:54 +0100 + +avidemux (1:2.0.42-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 22 Jul 2005 23:26:25 +0200 + +avidemux (1:2.0.40-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 25 May 2005 13:02:29 +0200 + +avidemux (1:2.0.38+rc3-0.1) unstable; urgency=low + + * Oooops, I've patched accidently ffv1rec, so now ffv1rec can be packaged. + + -- Christian Marillat Fri, 6 May 2005 14:16:18 +0200 + +avidemux (1:2.0.38+rc3-0.0) unstable; urgency=low + + * New upstream release. + * Removed 01_ffv1rec patch included by upstream. + * ffv1rec doesn't compile. + + -- Christian Marillat Fri, 6 May 2005 10:58:55 +0200 + +avidemux (1:2.0.38+rc2b-0.2) unstable; urgency=low + + * For now doesn't build ffv1rec for sparc. + + -- Christian Marillat Fri, 22 Apr 2005 13:52:25 +0200 + +avidemux (1:2.0.38+rc2b-0.1) unstable; urgency=low + + * Rebuild for testing. + + -- Christian Marillat Sun, 10 Apr 2005 19:39:54 +0200 + +avidemux (1:2.0.38+rc2b-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 1 Apr 2005 11:50:26 +0200 + +avidemux (1:2.0.38+rc1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Feb 2005 19:34:26 +0100 + +avidemux (1:2.0.36-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 24 Jan 2005 16:16:37 +0100 + +avidemux (1:2.0.34+test2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 18 Dec 2004 13:55:13 +0100 + +avidemux (1:2.0.34+test1-0.1) unstable; urgency=low + + * Need to build depends on a versioned libfaac-dev (>= 1.24-0.2). + + -- Christian Marillat Wed, 24 Nov 2004 17:31:48 +0100 + +avidemux (1:2.0.34+test1-0.0) unstable; urgency=low + + * New upstream release. + * Add nasm, libfaac-dev and libfaad2-dev in Build-depends + + -- Christian Marillat Sun, 14 Nov 2004 17:41:03 +0100 + +avidemux (1:2.0.30-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 17 Oct 2004 11:10:27 +0200 + +avidemux (1:2.0.28-0.2) unstable; urgency=low + + * Little hack to remove the automake/aclocal calls and remove automake1.8 + from Build-Depends. + + -- Christian Marillat Mon, 6 Sep 2004 15:05:39 +0200 + +avidemux (1:2.0.28-0.1) unstable; urgency=low + + * Really need to Build-depends on automake1.8 + + -- Christian Marillat Sun, 5 Sep 2004 11:12:43 +0200 + +avidemux (1:2.0.28-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 19 Aug 2004 14:46:55 +0200 + +avidemux (1:2.0.26-0.0) unstable; urgency=low + + * New upstream release. + * debian/control Add libsdl-dev in Build-Depends. + + -- Christian Marillat Fri, 23 Jul 2004 09:44:16 +0200 + +avidemux (1:2.0.24-0.2) unstable; urgency=low + + * Add a Build-dependency for automaken | automake1.8 + + -- Christian Marillat Mon, 28 Jun 2004 14:40:36 +0200 + +avidemux (1:2.0.24-0.1) unstable; urgency=low + + * Build against xvid 1.0.0 + + -- Christian Marillat Tue, 18 May 2004 15:03:11 +0200 + +avidemux (1:2.0.24-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 9 May 2004 15:21:01 +0200 + +avidemux (1:2.0.22-0.1) unstable; urgency=low + + * Fix to complie ffv1rec from the author. + + -- Christian Marillat Tue, 2 Mar 2004 10:36:15 +0100 + +avidemux (1:2.0.22-0.0) unstable; urgency=low + + * New upstream release. + * ffv1rec doesn't complie, not packaged. + + -- Christian Marillat Sat, 28 Feb 2004 09:52:26 +0100 + +avidemux (1:2.0.20-0.0) unstable; urgency=low + + * New upstream release. + * Add the ffv1rec binary in the package. + + -- Christian Marillat Sat, 20 Dec 2003 22:49:46 +0100 + +avidemux (1:2.0.18-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 1 Nov 2003 15:50:01 +0100 + +avidemux (1:2.0.16-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 1 Oct 2003 21:17:13 +0200 + +avidemux (1:2.0.12-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 8 Aug 2003 17:29:42 +0200 + +avidemux (1:2.0.10-0.0) unstable; urgency=low + + * New upstream release. + * 2.0.12-0.0 New upstream release. + + -- Christian Marillat Fri, 8 Aug 2003 17:21:32 +0200 + +avidemux (1:0.9-0.1) unstable; urgency=low + + * Rebuild for sarge (libvorbis) + + -- Christian Marillat Wed, 14 May 2003 02:21:23 +0200 + +avidemux (1:0.9-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 22 Apr 2003 10:23:07 +0200 + +avidemux (0.9rc3-0.1) unstable; urgency=low + + * Add mjpegtools in Recommends + + -- Christian Marillat Sun, 20 Apr 2003 17:47:05 +0200 + +avidemux (0.9rc3-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 23 Mar 2003 11:36:54 +0100 + +avidemux (0.9rc2-0.2) unstable; urgency=low + + * Add libxml2-dev in build-depends + + -- Christian Marillat Sun, 16 Mar 2003 15:43:34 +0100 + +avidemux (0.9rc2-0.1) unstable; urgency=low + + * Build against the latest libvorbis + + -- Christian Marillat Sun, 16 Mar 2003 09:01:52 +0100 + +avidemux (0.9rc2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 8 Mar 2003 23:00:37 +0100 + +avidemux (0.9rc1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 1 Mar 2003 14:02:54 +0100 + +avidemux (0.9pre32-0.1) unstable; urgency=low + + * Rebuild against the latest liba52 for woody. + + -- Christian Marillat Mon, 24 Feb 2003 17:43:30 +0100 + +avidemux (0.9pre32-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Mon, 10 Feb 2003 17:51:45 +0100 + +avidemux (0.9pre30-0.1) unstable; urgency=low + + * Rebuild against the latest libmjpegtools-dev + + -- Christian Marillat Wed, 5 Feb 2003 17:24:43 +0100 + +avidemux (0.9pre30-0.0) unstable; urgency=low + + * New upstream pre-release. + + -- Christian Marillat Sun, 19 Jan 2003 14:13:27 +0100 + +avidemux (0.9pre28-0.0) unstable; urgency=low + + * New upstream pre-release. + * Bump Standards-Version to 3.5.8 + * Remove freetype patche. + + -- Christian Marillat Sun, 12 Jan 2003 15:31:56 +0100 + +avidemux (0.9pre26-0.0) unstable; urgency=low + + * New upstream pre release. + * Add a libfreetype6-dev build-dependency + * Add upstream patche to build with libfreetype6 => 2.1.3 + + -- Christian Marillat Sun, 29 Dec 2002 15:54:21 +0100 + +avidemux (0.9pre24-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Mon, 9 Dec 2002 19:23:12 +0100 + +avidemux (0.9pre22-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Fri, 22 Nov 2002 01:48:49 +0100 + +avidemux (0.9pre20-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Fri, 8 Nov 2002 16:06:28 +0100 + +avidemux (0.9pre18-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 6 Oct 2002 20:31:26 +0200 + +avidemux (0.9pre17-0.1) unstable; urgency=low + + * Revert my previous change (doesn't use the DivX 5 codec), otherwise + avidemux doesn't work with Divx 3 files + + -- Christian Marillat Fri, 4 Oct 2002 19:06:21 +0200 + +avidemux (0.9pre17-0.0) unstable; urgency=low + + * New upstream pre release. + * Doesn't use the DivX 5 codec libavcodec is better and faster + + -- Christian Marillat Fri, 4 Oct 2002 06:41:53 +0200 + +avidemux (0.9pre16-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 29 Sep 2002 18:52:52 +0200 + +avidemux (0.9pre14-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sat, 14 Sep 2002 12:14:00 +0200 + +avidemux (0.9pre13-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Tue, 3 Sep 2002 01:00:37 +0200 + +avidemux (0.9pre12-0.1) unstable; urgency=low + + * Should build-depends on liba52-dev + + -- Christian Marillat Fri, 16 Aug 2002 19:19:54 +0200 + +avidemux (0.9pre12-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Wed, 14 Aug 2002 18:35:16 +0200 + +avidemux (0.9pre11-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Tue, 13 Aug 2002 11:24:08 +0200 + +avidemux (0.9pre10-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 28 Jul 2002 18:38:29 +0200 + +avidemux (0.9pre9-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Thu, 11 Jul 2002 10:23:24 +0200 + +avidemux (0.9pre8-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sat, 29 Jun 2002 12:05:29 +0200 + +avidemux (0.9pre7-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 23 Jun 2002 22:00:42 +0200 + +avidemux (0.9pre6-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 16 Jun 2002 16:16:50 +0200 + +avidemux (0.9pre5-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Wed, 5 Jun 2002 09:03:32 +0200 + +avidemux (0.9pre3-0.0) unstable; urgency=low + + * New upstream pre release. + + -- Christian Marillat Sun, 19 May 2002 09:41:15 +0200 + +avidemux (0.9pre2-0.0) unstable; urgency=low + + * News upstream prerelease. + + -- Christian Marillat Tue, 7 May 2002 11:12:52 +0200 + +avidemux (0.8-2) unstable; urgency=low + + * debian/control update Builds-depends field. + + -- Christian Marillat Sun, 7 Apr 2002 14:55:39 +0200 + +avidemux (0.8-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Mon, 1 Apr 2002 23:09:35 +0200 + --- avidemux-2.1.2.orig/debian/avidemux.desktop +++ avidemux-2.1.2/debian/avidemux.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Avidemux +GenericName=Video Editor +Comment=A Simple Visual Video Editor +Encoding=UTF-8 +TryExec=avidemux +Exec=avidemux +Icon=avidemux.png +Terminal=false +Type=Application +Categories=Application;AudioVideo; --- avidemux-2.1.2.orig/debian/compat +++ avidemux-2.1.2/debian/compat @@ -0,0 +1 @@ +4 --- avidemux-2.1.2.orig/debian/copyright +++ avidemux-2.1.2/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Christian Marillat on +Mon, 1 Apr 2002 23:09:35 +0200. + +It was downloaded from http://fixounet.free.fr/avidemux/ + +Upstream Author: mean + +Copyright: 2002 mean + + You should have received a copy of the GNU General Public License with the + Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if + not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301, USA. --- avidemux-2.1.2.orig/adm_lavcodec/config.cpu +++ avidemux-2.1.2/adm_lavcodec/config.cpu @@ -0,0 +1,31 @@ +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX_NASM=yes +TARGET_MMX=yes +TARGET_MMX=yes +TARGET_MMX=yes +TARGET_MMX=yes +TARGET_MMX=yes