--- mjpegtools-1.9.0.orig/debian/control +++ mjpegtools-1.9.0/debian/control @@ -0,0 +1,104 @@ +Source: mjpegtools +Section: graphics +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christian Marillat +Homepage: http://mjpeg.sourceforge.net/ +Bugs: mailto:marillat@debian.org +Standards-Version: 3.8.2 +Build-Depends: debhelper (>> 7), libpopt-dev, nasm (>= 0.98.34) [i386], + libdv-dev, libsdl-dev, libgtk2.0-dev, libjpeg62-dev, quilt, ccache, + libquicktime-dev (>= 2:0.9.8), libfreetype6-dev, libpng-dev, + libxrender-dev | xlibs-static-dev (<< 6.8.1-1), + libxt-dev | xlibs-static-dev (<< 6.8.1-1) + +Package: libmjpegtools-1.9 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Replaces: libmjpegtools0 (>> 1:1.9.0~rc3), libmjpegtools0 (<< 1:1.9.0~rc4-0.1) +Description: MJPEG video capture/editting/playback MPEG encoding + The mjpeg programs are a set of tools that can do recording of videos and + playback, simple cut-and-paste editing and the MPEG compression of audio + and video under Linux. This package combines them with important supporting + libraries required for their use. + . + The "lavrec" utility supplied supports capture from Zoran based MJPEG + capture/playback cards like the Buz (Iomega), DC10 (MIRO, Pinnacle) and the + LML33 (Linux Media Labs). Compatible MJPEG avi files can also be created + using any frame-grabbing card supported by the xawtv tool. + . + Videos recorded in this can be filtered, editted, and converted to MPEG + streams. The MPEG encoder is optimised for high quality results at medium + to high bit-rates (1Mbps upwards) and supports MMX/SSE/3D-Now and SMP. A + Duron 700 can deliver around 15-20 352x288 frames per second. + . + A key design objective of the tools is interoperability with other video + tools: currently xawtv, bcast2000, nuppelvideo and vcdimager are known to + interoperate. The MJPEG utilities can read AVI, Quicktime, and movtar + streams. The MPEG encoder can produce streams suitable for buring to + VCD/SVCD using vcdimager or similar tools. The software playback of MPEG + streams works with almost every player and every OS. SSE/MMX and 3D-Now! + are supported permitting a 700Mhz CPU to deliver arond 15-20 VCD + frames/second. + +Package: libmjpegtools-dev +Architecture: any +Section: libdevel +Replaces: mjpegtools (<= 1:1.6.0-0.2) +Depends: libmjpegtools-1.9 (= ${binary:Version}), libquicktime-dev, pkg-config +Description: MJPEG video capture/editting/playback MPEG encoding + The mjpeg programs are a set of tools that can do recording of videos and + playback, simple cut-and-paste editing and the MPEG compression of audio + and video under Linux. This package combines them with important supporting + libraries required for their use. + . + The "lavrec" utility supplied supports capture from Zoran based MJPEG + capture/playback cards like the Buz (Iomega), DC10 (MIRO, Pinnacle) and the + LML33 (Linux Media Labs). Compatible MJPEG avi files can also be created + using any frame-grabbing card supported by the xawtv tool. + . + Videos recorded in this can be filtered, editted, and converted to MPEG + streams. The MPEG encoder is optimised for high quality results at medium + to high bit-rates (1Mbps upwards) and supports MMX/SSE/3D-Now and SMP. A + Duron 700 can deliver around 15-20 352x288 frames per second. + . + A key design objective of the tools is interoperability with other video + tools: currently xawtv, bcast2000, nuppelvideo and vcdimager are known to + interoperate. The MJPEG utilities can read AVI, Quicktime, and movtar + streams. The MPEG encoder can produce streams suitable for buring to + VCD/SVCD using vcdimager or similar tools. The software playback of MPEG + streams works with almost every player and every OS. SSE/MMX and 3D-Now! + are supported permitting a 700Mhz CPU to deliver arond 15-20 VCD + frames/second. + +Package: mjpegtools +Architecture: any +Section: graphics +Depends: ${shlibs:Depends}, bc +Conflicts: dvb-mpegtools +Suggests: sox, twolame, mpeg2dec, a52dec +Description: MJPEG video capture/editting/playback MPEG encoding + The mjpeg programs are a set of tools that can do recording of videos and + playback, simple cut-and-paste editing and the MPEG compression of audio + and video under Linux. This package combines them with important supporting + libraries required for their use. + . + The "lavrec" utility supplied supports capture from Zoran based MJPEG + capture/playback cards like the Buz (Iomega), DC10 (MIRO, Pinnacle) and the + LML33 (Linux Media Labs). Compatible MJPEG avi files can also be created + using any frame-grabbing card supported by the xawtv tool. + . + Videos recorded in this can be filtered, editted, and converted to MPEG + streams. The MPEG encoder is optimised for high quality results at medium + to high bit-rates (1Mbps upwards) and supports MMX/SSE/3D-Now and SMP. A + Duron 700 can deliver around 15-20 352x288 frames per second. + . + A key design objective of the tools is interoperability with other video + tools: currently xawtv, bcast2000, nuppelvideo and vcdimager are known to + interoperate. The MJPEG utilities can read AVI, Quicktime, and movtar + streams. The MPEG encoder can produce streams suitable for buring to + VCD/SVCD using vcdimager or similar tools. The software playback of MPEG + streams works with almost every player and every OS. SSE/MMX and 3D-Now! + are supported permitting a 700Mhz CPU to deliver arond 15-20 VCD + frames/second. --- mjpegtools-1.9.0.orig/debian/rules +++ mjpegtools-1.9.0/debian/rules @@ -0,0 +1,102 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +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) + +CC:=ccache $(CC) +CXX:=ccache $(CXX) + +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else + CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +ifeq "$(DEBIAN_ARCH)" "powerpc" + EXTRA_OPTIONS=--disable-simd-accel +endif + +CFLAGS= + +configure: configure-stamp +ifeq "$(DEBIAN_ARCH)" "i386" +configure-stamp: debian/stamp-patched +endif +configure-stamp: + dh_testdir + + ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info CC="$(CC)" CXX="$(CXX)" $(EXTRA_OPTIONS) \ + CFLAGS="$(CFLAGS)" + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) -j $(NCPUS) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr + + dh_install --fail-missing + +# cp mpeg2enc/mpeg2syntaxcodes.h debian/libmjpegtools-dev/usr/include/mjpegtools/mpeg2enc + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -A AUTHORS + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -V + 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 --- mjpegtools-1.9.0.orig/debian/mjpegtools.postinst +++ mjpegtools-1.9.0/debian/mjpegtools.postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + install-info --quiet --section "Miscellaneous" "Miscellaneous" \ + --menuentry="How to use the mjpeg tools" \ + --description="mjpeg tools documentation" /usr/share/info/mjpeg-howto.info +fi + +#DEBHELPER# --- mjpegtools-1.9.0.orig/debian/mjpegtools.manpages +++ mjpegtools-1.9.0/debian/mjpegtools.manpages @@ -0,0 +1 @@ +docs/*.[1-9] --- mjpegtools-1.9.0.orig/debian/libmjpegtools-dev.install +++ mjpegtools-1.9.0/debian/libmjpegtools-dev.install @@ -0,0 +1,4 @@ +usr/include +usr/lib/*.{a,la,so} +usr/lib/pkgconfig +mpeg2enc/mpeg2syntaxcodes.h usr/include/mjpegtools/mpeg2enc --- mjpegtools-1.9.0.orig/debian/mjpegtools.install +++ mjpegtools-1.9.0/debian/mjpegtools.install @@ -0,0 +1,3 @@ +usr/bin +usr/share/man +usr/share/info --- mjpegtools-1.9.0.orig/debian/changelog +++ mjpegtools-1.9.0/debian/changelog @@ -0,0 +1,370 @@ +mjpegtools (1:1.9.0-0.5ubuntu1) karmic; urgency=low + + * merge from debian-multimedia, remaining changes: + * debian/patches/02_fix_arch_specifics.patch + - patch configure and configure.ac to never use arch specific + optimizations, fixes SIGILL on non-pentium4 archs. + (LP: #351017) + + -- Andreas Moog Sat, 18 Jul 2009 14:39:52 +0200 + +mjpegtools (1:1.9.0-0.5) unstable; urgency=low + + * New patch to fix a memory leak in png2yuv. + + -- Christian Marillat Sun, 28 Jun 2009 08:37:31 +0200 + +mjpegtools (1:1.9.0-0.4) unstable; urgency=low + + * Unset CFLAGS (fix mipsel build). + * Replace toolame by twolame. Only mpegtranscode and lav2mpeg use toolame. + + -- Christian Marillat Sat, 06 Jun 2009 10:06:20 +0200 + +mjpegtools (1:1.9.0-0.3) unstable; urgency=low + + * Build powerpc packages without altivec support. + + -- Christian Marillat Mon, 02 Mar 2009 16:18:05 +0100 + +mjpegtools (1:1.9.0-0.2) unstable; urgency=low + + * New patch 01_cpu-detection to compile with -march and -mtune set to i486. + + -- Christian Marillat Thu, 05 Feb 2009 08:49:24 +0100 + +mjpegtools (1:1.9.0-0.1) unstable; urgency=low + + * Upload in unstable. + + -- Christian Marillat Mon, 02 Feb 2009 18:10:27 +0100 + +mjpegtools (1:1.9.0-0.0) experimental; urgency=low + + * New upstream release. + * Rename library in libmjpegtools-1.9 and add Replaces/Conflicts for the + experimental package. + + -- Christian Marillat Tue, 06 Jan 2009 17:05:56 +0100 + +mjpegtools (1:1.9.0~rc4-0.1) experimental; urgency=low + + * Removed extra CFLAGS for amd64. + * Don't build with LDFLAGS=-Wl,--as-needed + + -- Christian Marillat Tue, 09 Dec 2008 15:43:10 +0100 + +mjpegtools (1:1.9.0~rc4-0.0) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 09 Dec 2008 09:14:43 +0100 + +mjpegtools (1:1.9.0~rc3-0.2) experimental; urgency=low + + * The -dev package need to depends on pkg-config. + + -- Christian Marillat Thu, 31 Jan 2008 15:52:30 +0100 + +mjpegtools (1:1.9.0~rc3-0.1) experimental; urgency=low + + * Add missing mpeg2syntaxcodes.h include file. + * Update Standards-Version to 3.7.3 (no changes). + * Use dh_install instead of dh_movefiles + * Use ccache. + + -- Christian Marillat Mon, 28 Jan 2008 10:57:27 +0100 + +mjpegtools (1:1.9.0~rc3-0.0) experimental; urgency=low + + * New upstream release. + * Upload in experimental. + + -- Christian Marillat Sat, 15 Dec 2007 09:59:37 +0100 + +mjpegtools (1:1.8.0-0.4) unstable; urgency=low + + * New patch from cvs to fix gcc 4 build. + + -- Christian Marillat Sun, 15 Oct 2006 08:42:40 +0200 + +mjpegtools (1:1.8.0-0.3) unstable; urgency=low + + * Rebuild against the latest libdirectfb-0.9-25 package. + + -- Christian Marillat Wed, 2 Aug 2006 14:04:42 +0200 + +mjpegtools (1:1.8.0-0.2) unstable; urgency=low + + * rebuild for amd64. + + -- Christian Marillat Sat, 13 May 2006 13:45:08 +0200 + +mjpegtools (1:1.8.0-0.1) unstable; urgency=low + + * Replace libgtk1.2-dev build-dependency by libgtk2.0-dev to build the + glav binary. Thanks to Carsten B. Jensen + + -- Christian Marillat Wed, 4 Jan 2006 19:46:01 +0100 + +mjpegtools (1:1.8.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 20 Sep 2005 10:18:44 +0200 + +mjpegtools (1:1.6.3+rc3-0.0) unstable; urgency=low + + * New upstream pre release. + * Remove all patches, ppc included. + + -- Christian Marillat Tue, 6 Sep 2005 18:37:21 +0200 + +mjpegtools (1:1.6.3+rc2-0.0) unstable; urgency=low + + * New upstream release. + * Move to dpatch. + + -- Christian Marillat Mon, 15 Aug 2005 10:13:36 +0200 + +mjpegtools (1:1.6.2-0.9) unstable; urgency=low + + * Add libpng-dev in Build-Depends to buid the png2yuv binary. + + -- Christian Marillat Thu, 3 Mar 2005 23:11:41 +0100 + +mjpegtools (1:1.6.2-0.8) unstable; urgency=low + + * Rebuild for testing. + * debian/control Add libxt-dev | xlibs-dev in Build-Depends + + -- Christian Marillat Wed, 12 Jan 2005 16:19:20 +0100 + +mjpegtools (1:1.6.2-0.7) unstable; urgency=low + + * Only add -fPIC and -DPIC for amd64 + + -- Christian Marillat Fri, 31 Dec 2004 12:01:06 +0100 + +mjpegtools (1:1.6.2-0.6) unstable; urgency=low + + * Fix libraries linkage (Thanks to Laurent Bonnaud) + * Build with -fPIC and -DPIC + + -- Christian Marillat Wed, 29 Dec 2004 20:26:41 +0100 + +mjpegtools (1:1.6.2-0.5) unstable; urgency=low + + * Applied patches from Tuomas Jormola. Thanks to him. + o Build amd64 with -fPIC + o Added two patches to build with gcc 3.4 + + -- Christian Marillat Wed, 11 Aug 2004 13:59:49 +0200 + +mjpegtools (1:1.6.2-0.4) unstable; urgency=low + + * Removed alvitec patch. + + -- Christian Marillat Mon, 28 Jun 2004 20:39:58 +0200 + +mjpegtools (1:1.6.2-0.3) unstable; urgency=low + + * Reverted change done in 1:1.6.1.90-0.2 (build the package without + --disable-cmov-extension) really a bad idea. + + -- Christian Marillat Thu, 29 Apr 2004 10:35:08 +0200 + +mjpegtools (1:1.6.2-0.2) unstable; urgency=low + + * Build against libdv4-dev for unstable. + + -- Christian Marillat Fri, 23 Apr 2004 21:05:40 +0200 + +mjpegtools (1:1.6.2-0.1) unstable; urgency=low + + * Remove libavifile-0.7-dev in Builde-Depends + * Change again nasm build-depency to 0.98.34 + + -- Christian Marillat Sat, 3 Apr 2004 17:34:39 +0200 + +mjpegtools (1:1.6.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 12 Feb 2004 10:34:37 +0100 + +mjpegtools (1:1.6.1.93-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 22 Jan 2004 00:29:53 +0100 + +mjpegtools (1:1.6.1.92-0.1) unstable; urgency=low + + * Update the shlibs file to make mjpegtools depends on the latest + libmjpegtools0 package. + + -- Christian Marillat Mon, 8 Dec 2003 13:54:48 +0100 + +mjpegtools (1:1.6.1.92-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 28 Nov 2003 19:02:25 +0100 + +mjpegtools (1:1.6.1.90-0.2) unstable; urgency=low + + * Build with -fPIC and -DPIC + * debian/rules build without --disable-cmov-extension, now this package + can't be used on a K6 or Pentium CPU. Idea from Nicolas B + * Apply patch from Marc Leeman to fix an infinite loop in jpeg2yuv + * Aplly patches from Guido Guenther to fix compilation on powerpc-linux + * disble -g for powerpc by default since it crashes the compiler on altivec code + * build-depend on libavifile on i386 only + + -- Christian Marillat Thu, 30 Oct 2003 11:24:51 +0100 + +mjpegtools (1:1.6.1.90-0.1) unstable; urgency=low + + * Register info documentation + * debian/control Add libavifile0.7-dev in Build-Depends + + -- Christian Marillat Tue, 26 Aug 2003 10:37:49 +0200 + +mjpegtools (1:1.6.1.90-0.0) unstable; urgency=low + + * New upstream release. + * Removed the following patches : + o 02_assert + o 03_Makefile.in + o 04_libavifile.h + * Rewrote the following patches : + o 06_link + o 07_configure + + -- Christian Marillat Sun, 24 Aug 2003 10:24:44 +0200 + +mjpegtools (1:1.6.1-0.7) unstable; urgency=low + + * debian/control remove the second libsdl1.2-dev Build-dependency and add + a versioned nasm build-dependency (Thanks to Nicolas B). But who is + Nicolas B ? + + -- Christian Marillat Tue, 19 Aug 2003 19:33:36 +0200 + +mjpegtools (1:1.6.1-0.6) unstable; urgency=low + + * Build for i386 + + -- Christian Marillat Fri, 8 Aug 2003 16:02:17 +0200 + +mjpegtools (1:1.6.1-0.5) unstable; urgency=low + + * From Nicolas B. mjpegtools need to depends on bc + * From Tuomas Jormola (thanks): + o Add missing assert.h include needed by gcc 3.3 + o Fix to build against latest libavifile. + o Fix to build against gcc 3.3 + * Pointed out by Stefan Frank, apply patch from Bob McElrath to fix lavrec + bug with some audio card. + * debian/control Add libsdl1.2-dev + * Fix libraries linkage + + -- Christian Marillat Sat, 26 Jul 2003 23:22:52 +0200 + +mjpegtools (1:1.6.1-0.4) unstable; urgency=low + + * Add libquicktime-dev dependecy for the -dev package + + -- Christian Marillat Sun, 27 Apr 2003 20:38:41 +0200 + +mjpegtools (1:1.6.1-0.3) unstable; urgency=low + + * Build against libquicktime-dev + + -- Christian Marillat Wed, 23 Apr 2003 21:02:18 +0200 + +mjpegtools (1:1.6.1-0.2) unstable; urgency=low + + * Rebuild against the latest libavifile. + + -- Christian Marillat Mon, 3 Mar 2003 15:17:44 +0100 + +mjpegtools (1:1.6.1-0.1) unstable; urgency=low + + * Compiled against gcc 3.2 for unstable + + -- Christian Marillat Wed, 5 Feb 2003 16:02:20 +0100 + +mjpegtools (1:1.6.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 28 Jan 2003 17:35:36 +0100 + +mjpegtools (1:1.6.0-0.4) unstable; urgency=low + + * debian/control Added sox, toolame, mpeg2dec and a52dec in suggests for + the mjpegtools package. + * debian/control nasm should only depends for i386 arch + * Standards-Version: is now 3.5.8 + * Replace extract_ac3 and ac3dec by extract_ac52 and ac52dec in + mpegtranscode + + -- Christian Marillat Thu, 12 Dec 2002 14:39:09 +0100 + +mjpegtools (1:1.6.0-0.3) unstable; urgency=low + + * Move mjpegtools.pc in the -dev package + * Build with MMX/3DNow!/SSE extension. I hope this will break nothing. + + -- Christian Marillat Sun, 3 Nov 2002 18:42:42 +0100 + +mjpegtools (1:1.6.0-0.2) unstable; urgency=low + + * Rebuild against libpng3 + + -- Christian Marillat Fri, 16 Aug 2002 17:10:24 +0200 + +mjpegtools (1:1.6.0-0.1) unstable; urgency=low + + * Enable quicktime support. + + -- Christian Marillat Sun, 19 May 2002 18:05:10 +0200 + +mjpegtools (1:1.6.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 15 May 2002 23:19:06 +0200 + +mjpegtools (1.6.0-rc2-0.0) unstable; urgency=low + + * New upstream release. + * Build against the latest libavifile-0.7 + + -- Christian Marillat Sun, 5 May 2002 14:29:17 +0200 + +mjpegtools (1.6.0-beta2-1) unstable; urgency=low + + * New upstream beta. + + -- Christian Marillat Sat, 16 Feb 2002 13:19:44 +0100 + +mjpegtools (1.6.0-beta1-3) unstable; urgency=low + + * debian/control Add Conflicts: dvb-mpegtools + + -- Christian Marillat Sun, 10 Feb 2002 10:47:39 +0100 + +mjpegtools (1.6.0-beta1-2) unstable; urgency=low + + * Move mjpegtools-config in the -dev package. + + -- Christian Marillat Sun, 27 Jan 2002 04:28:34 +0100 + +mjpegtools (1.6.0-beta1-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Fri, 25 Jan 2002 15:09:47 +0100 --- mjpegtools-1.9.0.orig/debian/libmjpegtools-1.9.install +++ mjpegtools-1.9.0/debian/libmjpegtools-1.9.install @@ -0,0 +1 @@ +usr/lib/*.so.0* --- mjpegtools-1.9.0.orig/debian/compat +++ mjpegtools-1.9.0/debian/compat @@ -0,0 +1 @@ +7 --- mjpegtools-1.9.0.orig/debian/watch +++ mjpegtools-1.9.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/mjpeg/mjpegtools-(.*).tar.gz --- mjpegtools-1.9.0.orig/debian/mjpegtools.prerm +++ mjpegtools-1.9.0/debian/mjpegtools.prerm @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +install-info --quiet --remove /usr/share/info/mjpeg-howto.info + +#DEBHELPER# --- mjpegtools-1.9.0.orig/debian/copyright +++ mjpegtools-1.9.0/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Christian Marillat on +Fri, 25 Jan 2002 15:09:47 +0100. + +It was downloaded from http://mjpeg.sourceforge.net/ + +Upstream Authors: See AUTHORS file + +Copyright © 2001-2008 + + 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-2; if + not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. --- mjpegtools-1.9.0.orig/debian/patches/series +++ mjpegtools-1.9.0/debian/patches/series @@ -0,0 +1,4 @@ +01_cpu-detection.diff +02_toolame.diff +03_memory_leak.diff +04_fix_arch_specifics.diff --- mjpegtools-1.9.0.orig/debian/patches/04_fix_arch_specifics.diff +++ mjpegtools-1.9.0/debian/patches/04_fix_arch_specifics.diff @@ -0,0 +1,32 @@ +Index: mjpegtools-1.9.0/configure +=================================================================== +--- mjpegtools-1.9.0.orig/configure 2009-04-25 03:27:11.000000000 +0200 ++++ mjpegtools-1.9.0/configure 2009-04-25 03:27:40.000000000 +0200 +@@ -25998,9 +25998,9 @@ + echo $ECHO_N "checking sub-architecture settings... $ECHO_C" >&6; } + chmod +x $srcdir/cpuinfo.sh + if test x$have_x86cpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh x86` ++ ARCHFLAGS=`` + elif test x$have_ppccpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh ppc` ++ ARCHFLAGS=`` + fi + fi + { echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5 +Index: mjpegtools-1.9.0/configure.ac +=================================================================== +--- mjpegtools-1.9.0.orig/configure.ac 2009-04-25 03:27:15.000000000 +0200 ++++ mjpegtools-1.9.0/configure.ac 2009-04-25 03:27:29.000000000 +0200 +@@ -441,9 +441,9 @@ + AC_MSG_CHECKING(sub-architecture settings) + chmod +x $srcdir/cpuinfo.sh + if test x$have_x86cpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh x86` ++ ARCHFLAGS=`` + elif test x$have_ppccpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh ppc` ++ ARCHFLAGS=`` + fi + fi + AC_MSG_RESULT($ARCHFLAGS) --- mjpegtools-1.9.0.orig/debian/patches/03_memory_leak.diff +++ mjpegtools-1.9.0/debian/patches/03_memory_leak.diff @@ -0,0 +1,13 @@ +Index: mjpegtools-1.9.0/lavtools/png2yuv.c +=================================================================== +--- mjpegtools-1.9.0.orig/lavtools/png2yuv.c 2009-06-28 08:35:39.000000000 +0200 ++++ mjpegtools-1.9.0/lavtools/png2yuv.c 2009-06-28 08:37:26.000000000 +0200 +@@ -408,7 +408,7 @@ + } + + fclose(pngfile); +- ++ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return 1; + } + --- mjpegtools-1.9.0.orig/debian/patches/01_cpu-detection.diff +++ mjpegtools-1.9.0/debian/patches/01_cpu-detection.diff @@ -0,0 +1,25 @@ +Index: mjpegtools-1.9.0/cpuinfo.sh +=================================================================== +--- mjpegtools-1.9.0.orig/cpuinfo.sh 2009-02-05 08:47:37.000000000 +0100 ++++ mjpegtools-1.9.0/cpuinfo.sh 2009-02-05 08:48:11.000000000 +0100 +@@ -166,15 +166,15 @@ + ;; + 6) iproc=686 + if test "$pmodel" -ge 15; then +- proc=nocona ++ proc=i486 + elif test "$pmodel" -ge 13; then +- proc=pentium-m ++ proc=i486 + elif test "$pmodel" -ge 7; then +- proc=pentium3 ++ proc=i486 + elif test "$pmodel" -ge 3; then +- proc=pentium2 ++ proc=i486 + else +- proc=i686 ++ proc=i486 + fi + ;; + 15) proc=pentium4 --- mjpegtools-1.9.0.orig/debian/patches/02_toolame.diff +++ mjpegtools-1.9.0/debian/patches/02_toolame.diff @@ -0,0 +1,53 @@ +Index: mjpegtools-1.9.0/scripts/lav2mpeg +=================================================================== +--- mjpegtools-1.9.0.orig/scripts/lav2mpeg 2009-06-06 09:59:09.000000000 +0200 ++++ mjpegtools-1.9.0/scripts/lav2mpeg 2009-06-06 10:00:24.000000000 +0200 +@@ -16,7 +16,7 @@ + YUVSCALER=${YUVSCALER:-"yuvscaler"} + MPEG2ENC=${MPEG2ENC:-"mpeg2enc"} + LAV2WAV=${LAV2WAV:-"lav2wav"} +-AUDIOENC=${AUDIOENC:-"mp2enc"} # can be "toolame" or "mp2enc" ++AUDIOENC=${AUDIOENC:-"mp2enc"} # can be "twolame" or "mp2enc" + MPLEX=${MPLEX:-"mplex"} + YUVDENOISE=${YUVDENOISE:-"yuvdenoise"} + LAVINFO=${LAVINFO:-"lavinfo"} +@@ -382,7 +382,7 @@ + if [ $AUDIOENC = "mp2enc" ]; then + audioenc_flags="$mono_flag -r 44100 ${audioenc_flags} -o $audio" + else +- # assume toolame ++ # assume twolame + audioenc_flags="$mono_flag -s 44.1 /dev/stdin ${audioenc_flags} $audio" + fi + mplex_flags=" -o $outfile $mplex_flags $audio $video" +@@ -491,7 +491,7 @@ + yuvscale_str="" + fi + +-#final flags -- bitrate flag is -b for both mp2enc and toolame ++#final flags -- bitrate flag is -b for both mp2enc and twolame + audioenc_flags="-b $aencbpr $audioenc_flags" + + +Index: mjpegtools-1.9.0/scripts/mpegtranscode +=================================================================== +--- mjpegtools-1.9.0.orig/scripts/mpegtranscode 2009-06-06 10:00:47.000000000 +0200 ++++ mjpegtools-1.9.0/scripts/mpegtranscode 2009-06-06 10:01:29.000000000 +0200 +@@ -14,7 +14,7 @@ + exit 0 + } + +-# Use this commented-out version if you haven't got sox and toolame ++# Use this commented-out version if you haven't got sox and twolame + #MP2ENC="nice -n 29 wav2mp2 -v -o" + MPEG2ENC=mpeg2enc + MPLEX=mplex +@@ -79,7 +79,7 @@ + + cat $* | extract_a52 - -s | a52dec -m wav | \ + sox -t wav /dev/stdin -t wav -r 44100 /dev/stdout | \ +- toolame -p 2 -b 224 /dev/stdin $outfile.mp2 ++ twolame -p 2 -b 224 /dev/stdin $outfile.mp2 + + # Eventually mux-ing goes here! +