[Restricted-changes] r175 - in dists/trunk: . lame/debian mjpegtools mjpegtools/debian mjpegtools/debian/bug mjpegtools/debian/lintian mjpegtools/debian/patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Tue Mar 11 10:21:55 UTC 2008
Author: fabian-guest
Date: 2008-03-11 10:21:54 +0000 (Tue, 11 Mar 2008)
New Revision: 175
Added:
dists/trunk/mjpegtools/
dists/trunk/mjpegtools/debian/
dists/trunk/mjpegtools/debian/bug/
dists/trunk/mjpegtools/debian/bug/libmjpegtools-1.9-0
dists/trunk/mjpegtools/debian/bug/libmjpegtools-dev
dists/trunk/mjpegtools/debian/bug/mjpegtools
dists/trunk/mjpegtools/debian/bug/mjpegtools-dbg
dists/trunk/mjpegtools/debian/bug/mjpegtools-gtk
dists/trunk/mjpegtools/debian/changelog
dists/trunk/mjpegtools/debian/compat
dists/trunk/mjpegtools/debian/control
dists/trunk/mjpegtools/debian/copyright
dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.install
dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.shlibs
dists/trunk/mjpegtools/debian/libmjpegtools-dev.install
dists/trunk/mjpegtools/debian/lintian/
dists/trunk/mjpegtools/debian/lintian/libmjpegtools-1.9-0
dists/trunk/mjpegtools/debian/lintian/libmjpegtools-dev
dists/trunk/mjpegtools/debian/lintian/mjpegtools
dists/trunk/mjpegtools/debian/lintian/mjpegtools-dbg
dists/trunk/mjpegtools/debian/lintian/mjpegtools-gtk
dists/trunk/mjpegtools/debian/mjpegtools-gtk.install
dists/trunk/mjpegtools/debian/mjpegtools.install
dists/trunk/mjpegtools/debian/patches/
dists/trunk/mjpegtools/debian/patches/01_debian-directory.patch
dists/trunk/mjpegtools/debian/patches/02_as-needed.patch
dists/trunk/mjpegtools/debian/patches/03_no-opt.patch
dists/trunk/mjpegtools/debian/patches/04_manpage-syntax.patch
dists/trunk/mjpegtools/debian/patches/05_shell-script-syntax.patch
dists/trunk/mjpegtools/debian/rules
dists/trunk/mjpegtools/debian/watch
Modified:
dists/trunk/lame/debian/rules
Log:
Check-In Mjpegtools 1.9.0~rc3
Fix binary-install target for lame-utils
Modified: dists/trunk/lame/debian/rules
===================================================================
--- dists/trunk/lame/debian/rules 2008-02-27 12:24:38 UTC (rev 174)
+++ dists/trunk/lame/debian/rules 2008-03-11 10:21:54 UTC (rev 175)
@@ -21,7 +21,7 @@
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-install/lame-utils::
+binary-install/lame-utils::
mkdir -p debian/lame-utils/usr/share/lame
cp -r misc debian/lame-utils/usr/share/lame
rm -rf debian/lame-utils/usr/share/lame/misc/.deps
Added: dists/trunk/mjpegtools/debian/bug/libmjpegtools-1.9-0
===================================================================
--- dists/trunk/mjpegtools/debian/bug/libmjpegtools-1.9-0 (rev 0)
+++ dists/trunk/mjpegtools/debian/bug/libmjpegtools-1.9-0 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Added: dists/trunk/mjpegtools/debian/bug/libmjpegtools-dev
===================================================================
--- dists/trunk/mjpegtools/debian/bug/libmjpegtools-dev (rev 0)
+++ dists/trunk/mjpegtools/debian/bug/libmjpegtools-dev 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Added: dists/trunk/mjpegtools/debian/bug/mjpegtools
===================================================================
--- dists/trunk/mjpegtools/debian/bug/mjpegtools (rev 0)
+++ dists/trunk/mjpegtools/debian/bug/mjpegtools 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Added: dists/trunk/mjpegtools/debian/bug/mjpegtools-dbg
===================================================================
--- dists/trunk/mjpegtools/debian/bug/mjpegtools-dbg (rev 0)
+++ dists/trunk/mjpegtools/debian/bug/mjpegtools-dbg 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Added: dists/trunk/mjpegtools/debian/bug/mjpegtools-gtk
===================================================================
--- dists/trunk/mjpegtools/debian/bug/mjpegtools-gtk (rev 0)
+++ dists/trunk/mjpegtools/debian/bug/mjpegtools-gtk 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Added: dists/trunk/mjpegtools/debian/changelog
===================================================================
--- dists/trunk/mjpegtools/debian/changelog (rev 0)
+++ dists/trunk/mjpegtools/debian/changelog 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,5 @@
+mjpegtools (1.9.0~rc3+debian-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Sat, 1 Mar 2008 00:00:00 +0100
Added: dists/trunk/mjpegtools/debian/compat
===================================================================
--- dists/trunk/mjpegtools/debian/compat (rev 0)
+++ dists/trunk/mjpegtools/debian/compat 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+5
Added: dists/trunk/mjpegtools/debian/control
===================================================================
--- dists/trunk/mjpegtools/debian/control (rev 0)
+++ dists/trunk/mjpegtools/debian/control 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,86 @@
+Source: mjpegtools
+Section: restricted/graphics
+Priority: optional
+Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>,
+ Daniel Baumann <daniel at debian.org>
+Origin: debian-unofficial.org
+Bugs: mailto:restricted-devel at lists.alioth.debian.org
+Build-Depends: autotools-dev,
+ cdbs (>= 0.4.41),
+ debhelper (>= 5),
+ libdv4-dev,
+ libjpeg62-dev,
+ libgtk2.0-dev,
+ libpng12-dev,
+ libquicktime-dev (>= 2:1.0.0+debian),
+ libsdl1.2-dev,
+ pkg-config
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/mjpegtools/
+Vcs-Browser: http://svn.debian.org/wsvn/restricted/dists/trunk/mjpegtools/
+Homepage: http://mjpeg.sourceforge.net/
+
+Package: mjpegtools
+Section: restricted/graphics
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: mjpegtools-gtk
+Description: MJPEG capture/editing/replay and MPEG encoding toolset
+ 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.
+
+Package: mjpegtools-dbg
+Section: restricted/devel
+Priority: extra
+Architecture: any
+Depends: mjpegtools (= ${binary:Version}),
+ mjpegtools-gtk (= ${binary:Version}),
+ libmjpegtools-1.9-0 (= ${binary:Version}),
+ libmjpegtools-dev (= ${binary:Version}),
+ ${misc:Depends}
+Description: MJPEG capture/editing/replay and MPEG encoding toolset (debug)
+ 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 contains the debug symbols.
+
+Package: mjpegtools-gtk
+Section: restricted/graphics
+Architecture: any
+Depends: mjpegtools (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: MJPEG capture/editing/replay and MPEG encoding toolset (GTK+ frontend)
+ 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 contains the GTK+ frontend.
+
+Package: libmjpegtools-1.9-0
+Section: restricted/libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: MJPEG capture/editing/replay and MPEG encoding toolset (libraries)
+ 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 contains the shared libraries.
+
+Package: libmjpegtools-dev
+Section: restricted/libdevel
+Architecture: any
+Depends: libmjpegtools-1.9-0 (= ${binary:Version}),
+ ${misc:Depends}
+Description: MJPEG capture/editing/replay and MPEG encoding toolset (development)
+ 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 contains the development files.
Added: dists/trunk/mjpegtools/debian/copyright
===================================================================
--- dists/trunk/mjpegtools/debian/copyright (rev 0)
+++ dists/trunk/mjpegtools/debian/copyright 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,46 @@
+This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
+Sat, 1 Mar 2008 00:00:00 +0100.
+
+It was downloaded from <http://mjpeg.sourceforge.net/>.
+
+Upstream Authors:
+
+ Rainer Johanni <Rainer at Johanni.de>
+ Gernot Ziegler <gz at lysator.liu.se>
+ Andrew Stevens <andrew.stevens at nexgo.de>
+ Bernhard Praschinger <shadowlord at utanet.at>
+ Ronald Bultje <rbultje at ronald.bitfreak.net>
+ Xavier Biquard <biquard at free.fr>
+ Matthew Marjanovic <maddog at mir.com>
+ pHilipp Zabel <pzabel at gmx.de>
+ Kawamata/Hitoshi <hitoshi.kawamata at nifty.ne.jp>
+ Stefan Fendt <stefan at lionfish.ping.de>
+ Scott Moser <smoser at brickies.net>
+ Shawn Sulma <lavtools at athos.cx>
+ Mike Bernson <mike at mlb.org>
+ James Klicman <james at klicman.org>
+ and others
+
+License:
+
+ Copyright © 2000-2008 mjpegtools authors
+
+ 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.
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is © 2008, Fabian Greffrath <fabian at debian-unofficial.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.install
===================================================================
--- dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.install (rev 0)
+++ dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.install 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+/usr/lib/*.so.*
Added: dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.shlibs
===================================================================
--- dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.shlibs (rev 0)
+++ dists/trunk/mjpegtools/debian/libmjpegtools-1.9-0.shlibs 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,7 @@
+liblavfile-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+liblavjpeg-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+liblavplay-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+liblavrec-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+libmjpegutils-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+libmpeg2encpp-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
+libmplex2-1.9 0 libmjpegtools-1.9-0 (>= 1.9.0~rc3)
Added: dists/trunk/mjpegtools/debian/libmjpegtools-dev.install
===================================================================
--- dists/trunk/mjpegtools/debian/libmjpegtools-dev.install (rev 0)
+++ dists/trunk/mjpegtools/debian/libmjpegtools-dev.install 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,5 @@
+/usr/include/*
+/usr/lib/*.a
+/usr/lib/*.so
+/usr/lib/*.la
+/usr/lib/pkgconfig/*
Added: dists/trunk/mjpegtools/debian/lintian/libmjpegtools-1.9-0
===================================================================
--- dists/trunk/mjpegtools/debian/lintian/libmjpegtools-1.9-0 (rev 0)
+++ dists/trunk/mjpegtools/debian/lintian/libmjpegtools-1.9-0 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+libmjpegtools-1.9-0: unknown-section restricted/libs
Added: dists/trunk/mjpegtools/debian/lintian/libmjpegtools-dev
===================================================================
--- dists/trunk/mjpegtools/debian/lintian/libmjpegtools-dev (rev 0)
+++ dists/trunk/mjpegtools/debian/lintian/libmjpegtools-dev 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+libmjpegtools-dev: unknown-section restricted/libdevel
Added: dists/trunk/mjpegtools/debian/lintian/mjpegtools
===================================================================
--- dists/trunk/mjpegtools/debian/lintian/mjpegtools (rev 0)
+++ dists/trunk/mjpegtools/debian/lintian/mjpegtools 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+mjpegtools: unknown-section restricted/graphics
Added: dists/trunk/mjpegtools/debian/lintian/mjpegtools-dbg
===================================================================
--- dists/trunk/mjpegtools/debian/lintian/mjpegtools-dbg (rev 0)
+++ dists/trunk/mjpegtools/debian/lintian/mjpegtools-dbg 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+mjpegtools-dbg: unknown-section restricted/devel
Added: dists/trunk/mjpegtools/debian/lintian/mjpegtools-gtk
===================================================================
--- dists/trunk/mjpegtools/debian/lintian/mjpegtools-gtk (rev 0)
+++ dists/trunk/mjpegtools/debian/lintian/mjpegtools-gtk 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+mjpegtools-gtk: unknown-section restricted/graphics
Added: dists/trunk/mjpegtools/debian/mjpegtools-gtk.install
===================================================================
--- dists/trunk/mjpegtools/debian/mjpegtools-gtk.install (rev 0)
+++ dists/trunk/mjpegtools/debian/mjpegtools-gtk.install 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1 @@
+/usr/bin/glav
Added: dists/trunk/mjpegtools/debian/mjpegtools.install
===================================================================
--- dists/trunk/mjpegtools/debian/mjpegtools.install (rev 0)
+++ dists/trunk/mjpegtools/debian/mjpegtools.install 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,2 @@
+/usr/bin/*
+/usr/share/*
Added: dists/trunk/mjpegtools/debian/patches/01_debian-directory.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/01_debian-directory.patch (rev 0)
+++ dists/trunk/mjpegtools/debian/patches/01_debian-directory.patch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,56 @@
+diff -Nur mjpegtools-1.9.0rc3/configure mjpegtools-1.9.0rc3.new/configure
+--- mjpegtools-1.9.0rc3/configure
++++ mjpegtools-1.9.0rc3.new/configure
+@@ -27022,7 +27022,7 @@
+ ;;
+ esac
+
+- ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
++ ac_config_files="$ac_config_files Makefile docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -27679,8 +27679,6 @@
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+- "debian/control" ) CONFIG_FILES="$CONFIG_FILES debian/control" ;;
+ "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+ "lavtools/Makefile" ) CONFIG_FILES="$CONFIG_FILES lavtools/Makefile" ;;
+ "yuvcorrect/Makefile" ) CONFIG_FILES="$CONFIG_FILES yuvcorrect/Makefile" ;;
+diff -Nur mjpegtools-1.9.0rc3/Makefile.am mjpegtools-1.9.0rc3.new/Makefile.am
+--- mjpegtools-1.9.0rc3/Makefile.am
++++ mjpegtools-1.9.0rc3.new/Makefile.am
+@@ -23,8 +23,7 @@
+ yuvdeinterlace \
+ y4mdenoise \
+ y4munsharp \
+- y4mutils \
+- debian
++ y4mutils
+
+ #
+ # Add any non autoconf'd files here, extra readmes and other misc
+diff -Nur mjpegtools-1.9.0rc3/Makefile.in mjpegtools-1.9.0rc3.new/Makefile.in
+--- mjpegtools-1.9.0rc3/Makefile.in
++++ mjpegtools-1.9.0rc3.new/Makefile.in
+@@ -270,8 +270,7 @@
+ yuvdeinterlace \
+ y4mdenoise \
+ y4munsharp \
+- y4mutils \
+- debian
++ y4mutils
+
+
+ #
+@@ -546,7 +545,7 @@
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/debian
++ $(mkdir_p) $(distdir)/.
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
Added: dists/trunk/mjpegtools/debian/patches/02_as-needed.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/02_as-needed.patch (rev 0)
+++ dists/trunk/mjpegtools/debian/patches/02_as-needed.patch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,124 @@
+diff -Nur mjpegtools-1.9.0rc3/lavtools/Makefile.am mjpegtools-1.9.0rc3.new/lavtools/Makefile.am
+--- mjpegtools-1.9.0rc3/lavtools/Makefile.am
++++ mjpegtools-1.9.0rc3.new/lavtools/Makefile.am
+@@ -40,25 +40,24 @@
+
+ liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
+ liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
+-liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
+- $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
+-liblavfile_la_LIBADD = $(LIBMJPEGUTILS)
++liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+
+ liblavjpeg_la_SOURCES = jpegutils.c
+ liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
+-liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
+-liblavjpeg_la_LIBADD = $(LIBMJPEGUTILS)
++liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavjpeg_la_LIBADD = $(JPEG_LIBS) $(LIBMJPEGUTILS)
+
+ liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
+ liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
+ liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+-liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la
++liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la $(LIBMJPEGUTILS)
+ liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+
+ liblavplay_la_SOURCES = liblavplay.c audiolib.c
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+-liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la
++liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+ if HAVE_V4L
+ liblavplay_la_LIBADD += ${X_LIBS} -lX11
+ endif
+diff -Nur mjpegtools-1.9.0rc3/lavtools/Makefile.in mjpegtools-1.9.0rc3.new/lavtools/Makefile.in
+--- mjpegtools-1.9.0rc3/lavtools/Makefile.in
++++ mjpegtools-1.9.0rc3.new/lavtools/Makefile.in
+@@ -433,24 +433,22 @@
+
+ liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
+ liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
+-liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
+- $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
+-
+-liblavfile_la_LIBADD = $(LIBMJPEGUTILS)
++liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+ liblavjpeg_la_SOURCES = jpegutils.c
+ liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
+-liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
+-liblavjpeg_la_LIBADD = $(LIBMJPEGUTILS)
++liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavjpeg_la_LIBADD = $(JPEG_LIBS) $(LIBMJPEGUTILS)
+ liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
+ liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
+ liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+-liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la
++liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la $(LIBMJPEGUTILS)
+ liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+ liblavplay_la_SOURCES = liblavplay.c audiolib.c
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+ liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la \
+- $(am__append_4)
++ $(am__append_4) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+ liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+ noinst_HEADERS = \
+ colorspace.h \
+diff -Nur mjpegtools-1.9.0rc3/ltmain.sh mjpegtools-1.9.0rc3.new/ltmain.sh
+--- mjpegtools-1.9.0rc3/ltmain.sh
++++ mjpegtools-1.9.0rc3.new/ltmain.sh
+@@ -1670,6 +1670,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2006,6 +2011,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+diff -Nur mjpegtools-1.9.0rc3/mpeg2enc/Makefile.am mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.am
+--- mjpegtools-1.9.0rc3/mpeg2enc/Makefile.am
++++ mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.am
+@@ -78,7 +78,7 @@
+
+ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
+
+-libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
++libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) -lpthread
+
+ mpeg2enc_DEPENDENCIES = \
+ $(LIBMJPEGUTILS) \
+diff -Nur mjpegtools-1.9.0rc3/mpeg2enc/Makefile.in mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.in
+--- mjpegtools-1.9.0rc3/mpeg2enc/Makefile.in
++++ mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.in
+@@ -347,7 +347,7 @@
+ -release $(LT_RELEASE) ${EXTRA_LDFLAGS}
+
+ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
+-libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
++libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) -lpthread
+ mpeg2enc_DEPENDENCIES = \
+ $(LIBMJPEGUTILS) \
+ libmpeg2encpp.la
Added: dists/trunk/mjpegtools/debian/patches/03_no-opt.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/03_no-opt.patch (rev 0)
+++ dists/trunk/mjpegtools/debian/patches/03_no-opt.patch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,11 @@
+diff -Nur mjpegtools-1.9.0rc3/configure mjpegtools-1.9.0rc3.new/configure
+--- mjpegtools-1.9.0rc3/configure
++++ mjpegtools-1.9.0rc3.new/configure
+@@ -26877,6 +26877,7 @@
+ ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
+ fi
+ fi
++ ARCHFLAGS=""
+ echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5
+ echo "${ECHO_T}$ARCHFLAGS" >&6
+ fi
Added: dists/trunk/mjpegtools/debian/patches/04_manpage-syntax.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/04_manpage-syntax.patch (rev 0)
+++ dists/trunk/mjpegtools/debian/patches/04_manpage-syntax.patch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,176 @@
+diff -Nur mjpegtools-1.9.0rc3/docs/lavplay.1 mjpegtools-1.9.0rc3.new/docs/lavplay.1
+--- mjpegtools-1.9.0rc3/docs/lavplay.1
++++ mjpegtools-1.9.0rc3.new/docs/lavplay.1
+@@ -26,7 +26,7 @@
+ .TP 8
+ .BR \-p/\-\-playback " [" S | C | H ]
+ The playback mode to be used. 'S' means software\-playback using SDL.
+-'H' means hardware\-playback on the monitor (on\-screen). 'C' means
++ 'H' means hardware\-playback on the monitor (on\-screen). 'C' means
+ hardware\-playback to the video-out of the zoran video-capture device.
+ Obviously, 'C' and 'H' only work on computers with zoran video\-capture
+ devices.
+diff -Nur mjpegtools-1.9.0rc3/docs/mjpeg-howto.info mjpegtools-1.9.0rc3.new/docs/mjpeg-howto.info
+--- mjpegtools-1.9.0rc3/docs/mjpeg-howto.info
++++ mjpegtools-1.9.0rc3.new/docs/mjpeg-howto.info
+@@ -1,3 +1,4 @@
++INFO-DIR-SECTION Video
+ START-INFO-DIR-ENTRY
+ * mjpegtools: (mjpeg-howto). command line tools for MPEG audio and video.
+ END-INFO-DIR-ENTRY
+diff -Nur mjpegtools-1.9.0rc3/docs/mjpegtools.1 mjpegtools-1.9.0rc3.new/docs/mjpegtools.1
+--- mjpegtools-1.9.0rc3/docs/mjpegtools.1
++++ mjpegtools-1.9.0rc3.new/docs/mjpegtools.1
+@@ -1,8 +1,8 @@
+-.\"
+-.TH "MJPEG tools" "MJPEG Linux Square" "MJPEG tools manual"
++.TH "MJPEG tools" "1" "MJPEG Linux Square" "MJPEG tools manual"
+ .LP
+
+-MJPEG HOWTO - An introduction to the MJPEG-toolsPraschinger Bernhardv1.50MJPEG capture/editting/replay and MPEG encoding toolset description
++.SH "NAME"
++mjpegtools \- An introduction to the MJPEG-tools
+ .PP
+ Introduction
+
+@@ -94,7 +94,6 @@
+ .PP
+ One last thing about the data you get before we start:
+ .PP
+-.DS
+ .sp
+ .ft RR
+ .nf
+@@ -108,7 +107,6 @@
+ PAL FULL size : (720 * 576 * 25 * 80) / (200 * 1024) = 4050 kB/sec
+ NTSC HALF size: (352 * 240 * 30 * 80) / (200 * 1024) = 990 kB/sec
+ NTSC FULL size: (720 * 480 * 30 * 80) / (200 * 1024) = 4050 kB/sec
+-.DE
+ .fi
+ .ec
+ .ft P
+@@ -447,7 +445,6 @@
+ .nr el +1
+ .nr t\n(ll 1
+ .nr e\n(el 0 1
+-.af e\n(el \*(f\n(el
+ .if \n(ll>1 .RS
+ .nr bi 1
+ .PP
+@@ -489,7 +486,6 @@
+ .nr el +1
+ .nr t\n(ll 1
+ .nr e\n(el 0 1
+-.af e\n(el \*(f\n(el
+ .if \n(ll>1 .RS
+ .nr bi 1
+ .PP
+@@ -535,7 +531,6 @@
+ .nr el +1
+ .nr t\n(ll 1
+ .nr e\n(el 0 1
+-.af e\n(el \*(f\n(el
+ .if \n(ll>1 .RS
+ .nr bi 1
+ .PP
+@@ -565,7 +560,6 @@
+ have, you need to extract some frames from the recorded stream and take a
+ look at them:\fP
+ .PP
+-.DS
+ .sp
+ .ft RR
+ .nf
+@@ -574,7 +568,6 @@
+ > rm pnm/image?.pnm
+ > cd pnm
+ > xv
+-.DE
+ .fi
+ .ec
+ .ft P
+@@ -1078,7 +1071,6 @@
+ The resulting video can be written as a LAV Edit List, a plain text file
+ containing the following lines:
+ .PP
+-.DS
+ .sp
+ .ft RR
+ .nf
+@@ -1091,7 +1083,6 @@
+ 0 0 224
+ 1 0 24
+ 2 25 999
+-.DE
+ .fi
+ .ec
+ .ft P
+@@ -1623,7 +1614,6 @@
+ maximal bitrate is not set too low:
+ .PP
+
+-.DS
+ .sp
+ .ft RR
+ .nf
+@@ -1632,7 +1622,6 @@
+ q >= 10 average quality
+ q >= 11 not that good
+ q >= 13 here even still sequences might look blocky
+-.DE
+ .fi
+ .ec
+ .ft P
+@@ -1843,12 +1832,10 @@
+ .PP
+ The approximate frame length formula for MPEG-1 layer-II is:
+ .PP
+-.DS
+ .sp
+ .ft RR
+ .nf
+ (frame length in bytes) = 144 * (byte rate) / (sample rate)
+-.DE
+ .fi
+ .ec
+ .ft P
+@@ -2736,14 +2723,12 @@
+ .PP
+ You should get something like this:
+ .PP
+-.DS
+ .sp
+ .ft RR
+ .nf
+ Found stream id 0xE0 = Video Stream 0
+ Found stream id 0xC0 = MPEG Audio Stream 0
+ Found stream id 0xBE = Padding Stream
+-.DE
+ .fi
+ .ec
+ .ft P
+diff -Nur mjpegtools-1.9.0rc3/docs/mpeg2enc.1 mjpegtools-1.9.0rc3.new/docs/mpeg2enc.1
+--- mjpegtools-1.9.0rc3/docs/mpeg2enc.1
++++ mjpegtools-1.9.0rc3.new/docs/mpeg2enc.1
+@@ -222,7 +222,8 @@
+ Set verbosity level to num. 0 = warnings and errors only, 1 =
+ information as well, 2=really verbose.
+ .PP
+-.BR -K|--custom-quant-matrices \fBkvcd\fP | \fBtmpgenc\fP | \fBdefault\fP | \fBhi-res\fP | \fBfile=\fPinputfile | \fBhelp\fP
++.BR -K|--custom-quant-matrices \fBkvcd\fP | \fBtmpgenc\fP |
++ \fBdefault\fP | \fBhi-res\fP | \fBfile=\fPinputfile | \fBhelp\fP
+ .PP
+ Specify which quantisation matrices to use instead of the defaults
+ (which can be specified by using "-K default"). Using "-K hi-res" is
+diff -Nur mjpegtools-1.9.0rc3/docs/mplex.1 mjpegtools-1.9.0rc3.new/docs/mplex.1
+--- mjpegtools-1.9.0rc3/docs/mplex.1
++++ mjpegtools-1.9.0rc3.new/docs/mplex.1
+@@ -129,7 +129,7 @@
+ .br
+ [,
+ .I samples_per_sec:channels:bits_per_sample
+-...]
++ ...]
+ .br
+ A comma-seperated list of paramter sets for the lpcm audio streams
+ (given in the order the lpcm streams appear on the command line).
Added: dists/trunk/mjpegtools/debian/patches/05_shell-script-syntax.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/05_shell-script-syntax.patch (rev 0)
+++ dists/trunk/mjpegtools/debian/patches/05_shell-script-syntax.patch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,12 @@
+diff -Nur mjpegtools-1.9.0rc3/scripts/lavtc.sh mjpegtools-1.9.0rc3.new/scripts/lavtc.sh
+--- mjpegtools-1.9.0rc3/scripts/lavtc.sh
++++ mjpegtools-1.9.0rc3.new/scripts/lavtc.sh
+@@ -791,7 +791,7 @@
+ break;
+ fi
+ done
+-if [[ -n ${needToCleanupFifo ]]; then
++if [[ -n ${needToCleanupFifo} ]]; then
+ cleanupFifo ;
+ fi
+ log_debug "chmod -x ${output}"
Added: dists/trunk/mjpegtools/debian/rules
===================================================================
--- dists/trunk/mjpegtools/debian/rules (rev 0)
+++ dists/trunk/mjpegtools/debian/rules 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+binary-predeb/mjpegtools:: binary-predeb/libmjpegtools-1.9-0
+binary-predeb/mjpegtools-gtk:: binary-predeb/libmjpegtools-1.9-0
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-simd-accel
+
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+binary-install/mjpegtools::
+ rm -f debian/mjpegtools/usr/bin/glav
+
+common-install-impl::
+ # Installing bug control
+ for BUG in debian/bug/*; do \
+ install -D -m 0644 $$BUG debian/`basename $$BUG`/usr/share/bug/`basename $$BUG`/control || exit 1; \
+ done
+
+ # Installing lintian overrides
+ for LINTIAN in debian/lintian/*; do \
+ install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
+ done
Property changes on: dists/trunk/mjpegtools/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: dists/trunk/mjpegtools/debian/watch
===================================================================
--- dists/trunk/mjpegtools/debian/watch (rev 0)
+++ dists/trunk/mjpegtools/debian/watch 2008-03-11 10:21:54 UTC (rev 175)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/mjpeg/mjpegtools-(.*)\.tar\.gz
More information about the Restricted-changes
mailing list