debian/0000755000000000000000000000000012241664721007173 5ustar debian/mjpegtools.install0000644000000000000000000000127212241664455012754 0ustar usr/bin/jpeg2yuv usr/bin/lav2mpeg usr/bin/lav2wav usr/bin/lav2yuv usr/bin/lavaddwav usr/bin/lavinfo usr/bin/lavpipe usr/bin/lavplay usr/bin/lavtrans usr/bin/mp2enc usr/bin/mpeg2enc usr/bin/mpegtranscode usr/bin/mplex usr/bin/pgmtoy4m usr/bin/png2yuv usr/bin/pnmtoy4m usr/bin/ppmtoy4m usr/bin/y4mcolorbars usr/bin/y4mdenoise usr/bin/y4mscaler usr/bin/y4mshift usr/bin/y4mtopnm usr/bin/y4mtoppm usr/bin/y4munsharp usr/bin/yuv2lav usr/bin/yuv4mpeg usr/bin/yuvcorrect usr/bin/yuvcorrect_tune usr/bin/yuvdeinterlace usr/bin/yuvdenoise usr/bin/yuvfps usr/bin/yuvinactive usr/bin/yuvkineco usr/bin/yuvmedianfilter usr/bin/yuvplay usr/bin/yuvycsnoise usr/share/* usr/bin/lav2avi.sh usr/lib/mjpegtools/bin/ debian/changelog0000644000000000000000000001205612241664534011053 0ustar mjpegtools (1:2.1.0+debian-2.1) unstable; urgency=low * Non-maintainer upload. * Add Breaks+Replaces against the improperly transitioned library packages from 1:2.1.0+debian-1. (Closes: #727097, #727635) * Ship lav2avi.sh. (Closes: #709256) -- Andreas Beckmann Sat, 16 Nov 2013 13:47:23 +0100 mjpegtools (1:2.1.0+debian-2) unstable; urgency=low * Team upload. * Handle SONAME bump properly. (Closes: #725879) -- Alessio Treglia Wed, 09 Oct 2013 17:38:07 +0100 mjpegtools (1:2.1.0+debian-1) unstable; urgency=low * Team upload. * New upstream release: - Add new tool: y4mshift * Handle epoch properly when checking for new releases. * Drop debian/patches/11_fix_ftbfs_gcc4.7.patch patch, applied upstream. * Refresh the patchset. * Avoid unconditional usage of PATH_MAX and MAXPATHLEN. Thanks to Pino Toscano for the great work. (Closes: #724897) * Divert y4mshift. * Remove DM-Upload-Allowed: yes. * Bump Standards. -- Alessio Treglia Mon, 07 Oct 2013 17:54:12 +0100 mjpegtools (1:2.0.0+debian-2) unstable; urgency=low * Team upload. [ Fabian Greffrath ] * dh --with autoreconf and autotools_dev are mutually exclusive. * Fix patches to modify configure.ac instead of configure, we are running autoreconf. * Fix patches to not modify Makefile.in, we are running autoreconf. * Change shebang line in scripts/lav2mpeg to bash, it is full of bashisms (Closes: #690617), thanks Raphael Geissert. [ Alessio Treglia ] * Add epoch to allow Ubuntu auto-syncing this. * Add headers to patches. -- Alessio Treglia Thu, 01 Nov 2012 17:45:57 +0000 mjpegtools (2.0.0+debian-1) unstable; urgency=low [ Andres Mejia ] * New upload. (Closes: #515850) * Add myself as uploader. * Change to libjpeg-dev to migrate to libjpeg8. * Update Vcs-* entries to anonscm locations. * Don't install *.la files. Gets rid of lintian error. * Separate each shared library into it's own package. Removes lintian warnings and also removes the need to use shlibs file. * Add dependency for install-info to binary package, not source package. [ Reinhard Tartler ] * Imported Upstream version 2.0.0+debian, LP: #1033328 - remove patches that no longer apply with new upstream version * simplify packaging * rebuild autotool files at build-time * make the use of v4l optional * patch ltmain.sh via autoreconf * pick-up patches from Ubuntu to fix linking related FTBFS * fix typo in debian/changelog * bump debhelper compat level to 9 - install libraries from multi-arch'ed directories * debian/rules: make get-orig-source more robust * refresh quilt patches * rename package names of library packages * Avoid format security warning and build breakage -- Reinhard Tartler Sun, 02 Sep 2012 16:29:46 +0200 mjpegtools (2.0.0~rc1+debian-1) unstable; urgency=low [ Maia Kozheva ] * Initial import of release 2.0.0~rc1 into git, based on Fabian Greffrath's work. Did some cleanup in the original tarball. Closes: #515850 * Set up git infrastructure for 3.0 (quilt). * Update from debhelper 5 and cdbs to debhelper 7. * debian/control: - Change Maintainer to this team. - Update sections (restricted/graphics -> video). - Update bug mail. - Remove non-standard header (Origin). - Bump Standards-Version to 3.9.2. - Update Vcs- fields to the new git repository. - Add myself to uploaders. - Depend on install-info. - Enable DM uploads. * debian/rules: - Add a get-orig-source rule to repack the original tarball. * debian/patches: - Migrate to quilt. - Refresh patches 01-04, remove hunks merged upstream. - Remove 05_shell-script-syntax.patch, merged upstream. * Add 05_ignore_videodev.h_error.patch: - Do not fail ./configure on missing linux/videodev.h (V4L1 was removed). * Add 06_link_pthread.patch: - Link mpeg2enc with -lpthread (build fails otherwise). * Add 07_yuvdenoise_disable_sse2.patch: - Build yuvdenoise without SSE2 (build fails otherwise). * Add 09_script_path.patch: - Set PATH in scripts that depend on diverted scripts. * Add 10_usr_local.patch: - Fix scripts not to invoke binaries in /usr/local. * Rename package libmjpegtools-1.9-0 to libmjpegtools-1.10-0. * Update shlibs file for libmjpegtools-1.10-0. - liblavrec removed for now (depends on V4L1, doesn't build). * Remove debian/bug and debian/lintian handling, obsolete. * Install manpages. * Divert some undocumented binaries to /usr/lib/mjpegtools/bin. [ Alessio Treglia ] * Add autotools_dev to DH's sequence. [ Reinhard Tartler ] * Add copyright note about mssg software. * Add 08_use_bash.patch: - Use bash for scripts/lavtc.sh. * Enable parallel builds. -- Maia Kozheva Sun, 01 May 2011 17:27:45 +0700 mjpegtools (1.9.0~rc3+debian-1) unstable; urgency=low * Initial release. * Rebuilt upstream tarball without debian directory. -- Fabian Greffrath Sat, 1 Mar 2008 00:00:00 +0100 debian/control0000644000000000000000000001367112241663121010577 0ustar Source: mjpegtools Section: video Priority: optional Maintainer: Debian Multimedia Maintainers Uploaders: Fabian Greffrath , Reinhard Tartler , Maia Kozheva , Andres Mejia Build-Depends: debhelper (>= 9), dh-autoreconf, libdv4-dev, libgtk2.0-dev, libjpeg-dev, libpng12-dev, libquicktime-dev (>= 2:1.0.0+debian), libsdl1.2-dev, pkg-config Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mjpegtools.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mjpegtools.git Homepage: http://mjpeg.sourceforge.net/ Package: mjpegtools Architecture: any Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}, ${shlibs: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: debug Priority: extra Architecture: any Depends: liblavfile-2.1-0 (= ${binary:Version}), liblavjpeg-2.1-0 (= ${binary:Version}), liblavplay-2.1-0 (= ${binary:Version}), libmjpegtools-dev (= ${binary:Version}), libmjpegutils-2.1-0 (= ${binary:Version}), libmpeg2encpp-2.1-0 (= ${binary:Version}), libmplex2-2.1-0 (= ${binary:Version}), mjpegtools (= ${binary:Version}), mjpegtools-gtk (= ${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 Architecture: any Depends: mjpegtools (= ${binary:Version}), ${misc:Depends}, ${shlibs: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-dev Section: libdevel Architecture: any Depends: liblavfile-2.1-0 (= ${binary:Version}), liblavjpeg-2.1-0 (= ${binary:Version}), liblavplay-2.1-0 (= ${binary:Version}), libmjpegutils-2.1-0 (= ${binary:Version}), libmpeg2encpp-2.1-0 (= ${binary:Version}), libmplex2-2.1-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. Package: liblavfile-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: liblavfile-2.0-0 (>> 1:2.1.0) Replaces: liblavfile-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 lavfile library. Package: liblavjpeg-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: liblavjpeg-2.0-0 (>> 1:2.1.0) Replaces: liblavjpeg-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 lavjpeg library. Package: liblavplay-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: liblavplay-2.0-0 (>> 1:2.1.0) Replaces: liblavplay-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 lavplay library. Package: libmjpegutils-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libmjpegutils-2.0-0 (>> 1:2.1.0) Replaces: libmjpegutils-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 mjpegutils library. Package: libmpeg2encpp-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libmpeg2encpp-2.0-0 (>> 1:2.1.0) Replaces: libmpeg2encpp-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 mpeg2encpp library. Package: libmplex2-2.1-0 Section: libs Architecture: any Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libmplex2-2.0-0 (>> 1:2.1.0) Replaces: libmplex2-2.0-0 (>> 1:2.1.0) Description: MJPEG capture/editing/replay and MPEG encoding toolset (library) 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 mplex2 library. debian/libmplex2-2.1-0.install0000644000000000000000000000003312241661630013104 0ustar /usr/lib/*/libmplex2*.so.* debian/libmpeg2encpp-2.1-0.install0000644000000000000000000000003712241661630013741 0ustar /usr/lib/*/libmpeg2encpp*.so.* debian/libmjpegutils-2.1-0.install0000644000000000000000000000003712241661630014064 0ustar /usr/lib/*/libmjpegutils*.so.* debian/liblavplay-2.1-0.install0000644000000000000000000000003412241661630013346 0ustar /usr/lib/*/liblavplay*.so.* debian/liblavjpeg-2.1-0.install0000644000000000000000000000003412241661630013326 0ustar /usr/lib/*/liblavjpeg*.so.* debian/liblavfile-2.1-0.install0000644000000000000000000000003412241661630013320 0ustar /usr/lib/*/liblavfile*.so.* debian/rules0000755000000000000000000000303712241661630010252 0ustar #!/usr/bin/make -f %: dh $@ --parallel --with autoreconf override_dh_autoreconf: dh_autoreconf --as-needed override_dh_auto_configure: dpkg-source --before-build . dh_auto_configure -- --disable-simd-accel override_dh_install: dh_install --sourcedir=debian/tmp for file in `cat debian/divert-binaries` ; do \ [ ! -f debian/mjpegtools/usr/bin/$${file} ] || \ mv debian/mjpegtools/usr/bin/$${file} debian/mjpegtools/usr/lib/mjpegtools/bin/ ; \ done override_dh_strip: dh_strip --dbg-package=mjpegtools-dbg PACKAGE = mjpegtools EPOCH = $(shell dpkg-parsechangelog | grep "^Version:" | sed -r "s/Version: (.*):.*/\1/") VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | sed -r "s/Version: $(EPOCH):(.*)\+debian.*/\1/") TARBALL_VERSION = $(shell echo $(VERSION) | sed "s/~//") TARBALL_DIR = $(PACKAGE)-$(shell echo $(VERSION) | sed "s/~.*//") get-orig-source: # Perform cleanup and repack the tarball uscan --verbose --force-download --no-symlink cd debian && tar xvzf ../../$(PACKAGE)-$(TARBALL_VERSION).tar.gz cd debian/$(TARBALL_DIR) && find -name CVS | xargs rm -rf cd debian/$(TARBALL_DIR) && make distclean || true cd debian/$(TARBALL_DIR) && rm -rf autom4te.cache debian cd debian/$(TARBALL_DIR) && find -name "*.rej" | xargs rm -f cd debian/$(TARBALL_DIR) && find -name "*~" | xargs rm -f cd debian/$(TARBALL_DIR) && find -name ".#*" | xargs rm -f cd debian/$(TARBALL_DIR) && find -name .cvsignore | xargs rm -f cd debian && tar cvzf ../../$(PACKAGE)_$(VERSION)+debian.orig.tar.gz $(TARBALL_DIR) rm -rf debian/$(TARBALL_DIR) debian/divert-binaries0000644000000000000000000000033512241661630012202 0ustar anytovcd.sh lav2avi.sh lavtc.sh matteblend.flt multiblend.flt transist.flt mjpeg_simd_helper qttoy4m y4mblack y4mhist y4minterlace y4mivtc y4mshift y4mspatialfilter y4mstabilizer y4mtoqt y4mtoyuv y4mshift ypipe yuyvtoy4m debian/watch0000644000000000000000000000016312241661624010223 0ustar version=3 opts=uversionmangle=s/rc/~rc/,dversionmangle=s/\+debian// \ http://sf.net/mjpeg/mjpegtools-(.*)\.tar\.gz debian/source/0000755000000000000000000000000012241661624010472 5ustar debian/source/format0000644000000000000000000000001412241661624011700 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012241661630010616 5ustar debian/patches/series0000644000000000000000000000050412241661630012032 0ustar 01_debian-directory.patch 03_disable_optimization.patch 04_manpage-syntax.patch 06_link_pthread.patch 07_yuvdenoise_disable_sse2.patch 08_use_bash.patch 09_script_path.patch 10_usr_local.patch 13_fix_lav2yuv_linking.diff 14_fix_mplex_linking.diff 15_fix_qttoy4m_linking.diff 16_fix_ftbfs_format_security.patch 17_hurd.patch debian/patches/17_hurd.patch0000644000000000000000000000232112241661630013106 0ustar Description: Avoid unconditional usage of PATH_MAX and MAXPATHLEN. Author: Pino Toscano Forwarded: https://sourceforge.net/p/mjpeg/patches/53/ Bug: https://sourceforge.net/p/mjpeg/patches/53/ Bug-Debian: https://sourceforge.net/p/mjpeg/patches/53/ Acked-by: Alessio Treglia Last-Update: 2013-10-07 --- lavtools/editlist.c | 3 +++ lavtools/png2yuv.c | 4 ++++ mplex/main.cpp | 4 ++++ 3 files changed, 11 insertions(+) --- mjpegtools.orig/lavtools/editlist.c +++ mjpegtools/lavtools/editlist.c @@ -26,6 +26,9 @@ #include "editlist.h" #include +#ifndef PATH_MAX +# define PATH_MAX 4096 +#endif /* Since we use malloc often, here the error handling */ --- mjpegtools.orig/lavtools/png2yuv.c +++ mjpegtools/lavtools/png2yuv.c @@ -51,6 +51,10 @@ png2yuv #include "subsample.h" #include "colorspace.h" +#ifndef PATH_MAX +# define PATH_MAX 4096 +#endif + #define DEFAULT_CHROMA_MODE Y4M_CHROMA_420JPEG typedef struct _parameters --- mjpegtools.orig/mplex/main.cpp +++ mjpegtools/mplex/main.cpp @@ -73,6 +73,10 @@ lround(double x) }; #endif +#if !defined(MAXPATHLEN) +# define MAXPATHLEN 4096 +#endif + class FileOutputStream : public OutputStream debian/patches/16_fix_ftbfs_format_security.patch0000644000000000000000000000576512241661630017433 0ustar From: Reinhard Tartler Subject: Avoid format security warning and build breakage --- lavtools/jpeg2yuv.c | 2 +- lavtools/lav_io.c | 2 +- lavtools/lavtrans.c | 4 ++-- mplex/main.cpp | 2 +- yuvfilters/main.c | 4 ++-- yuvfilters/yuvkineco.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) --- mjpegtools.orig/lavtools/lav_io.c +++ mjpegtools/lavtools/lav_io.c @@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi strcat(errmsg, ", quicktime"); #endif strcat(errmsg, ").\n"); - fprintf(stderr, errmsg); + fprintf(stderr, "%s", errmsg); free(lav_fd); internal_error = ERROR_FORMAT; /* Format not recognized */ return 0; --- mjpegtools.orig/lavtools/lavtrans.c +++ mjpegtools/lavtools/lavtrans.c @@ -275,7 +275,7 @@ int main(int argc, char ** argv) if (process_image_frame != -1) { nv = el_get_video_frame(vbuff, process_image_frame, &el); - sprintf(imgfname,outfile); + sprintf(imgfname, "%s", outfile); imgfd = fopen(imgfname,"wb"); if (imgfd==0) system_error("opening image file","fopen"); res = fwrite(vbuff,nv,1,imgfd); @@ -307,7 +307,7 @@ int main(int argc, char ** argv) break; case 'i': - sprintf(imgfname,outfile,nframe); + sprintf(imgfname,"%s%d",outfile,nframe); imgfd = fopen(imgfname,"wb"); if (imgfd==0) system_error("opening image file","fopen"); res = fwrite(vbuff,nv,1,imgfd); --- mjpegtools.orig/lavtools/jpeg2yuv.c +++ mjpegtools/lavtools/jpeg2yuv.c @@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ if (firstjpeg) { p = firstjpeg; - sprintf(jpegname, firstjpeg); + sprintf(jpegname, "%s", firstjpeg); firstjpeg = NULL; } else { --- mjpegtools.orig/mplex/main.cpp +++ mjpegtools/mplex/main.cpp @@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun if( flag_table[flag].longname != 0 ) message += sep; } - mjpeg_error( message.c_str() ); + mjpeg_error( "%s", message.c_str() ); return false; } --- mjpegtools.orig/yuvfilters/yuvkineco.c +++ mjpegtools/yuvfilters/yuvkineco.c @@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha } else { #ifdef MJPEGTOOLS buf[n] = '\0'; - mjpeg_debug(buf); + mjpeg_debug("%s", buf); #else fputs(buf, stderr); #endif --- mjpegtools.orig/yuvfilters/main.c +++ mjpegtools/yuvfilters/main.c @@ -53,7 +53,7 @@ usage(char **argv) char buf[1024]; sprintf(buf, "Usage: %s %s", argv[0], (*MODULE.usage)()); - WERRORL(buf); + mjpeg_error("%s", buf); } int @@ -91,7 +91,7 @@ main(int argc, char **argv) if (ret == Y4M_ERR_EOF) ret = Y4M_OK; if (ret != Y4M_OK) - WERRORL(y4m_strerr(ret)); + mjpeg_error("%s", y4m_strerr(ret)); FINI: for (h = hreader; h; h = hreader) { debian/patches/15_fix_qttoy4m_linking.diff0000644000000000000000000000166612241661630015770 0ustar From: Daniel T Chen Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS. --- y4mutils/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- mjpegtools.orig/y4mutils/Makefile.am +++ mjpegtools/y4mutils/Makefile.am @@ -54,11 +54,13 @@ y4minterlace_LDADD = $(LIBMJPEGUTILS) if HAVE_LIBQUICKTIME y4mtoqt_SOURCES = y4mtoqt.c y4mtoqt_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS) -y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la +y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la \ + -lquicktime qttoy4m_SOURCES = qttoy4m.c qttoy4m_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS) -qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la +qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la \ + -lquicktime endif y4mtoyuv_SOURCES = y4mtoyuv.c debian/patches/14_fix_mplex_linking.diff0000644000000000000000000000077412241661630015472 0ustar From: Daniel T Chen Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS. --- mplex/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- mjpegtools.orig/mplex/Makefile.am +++ mjpegtools/mplex/Makefile.am @@ -74,5 +74,6 @@ mplex_SOURCES = main.cpp mplex_DEPENDENCIES = libmplex2.la -mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS) +mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS) \ + $(top_builddir)/utils/libmjpegutils.la debian/patches/13_fix_lav2yuv_linking.diff0000644000000000000000000000114012241661630015740 0ustar From: Daniel T Chen Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS. --- lavtools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- mjpegtools.orig/lavtools/Makefile.am +++ mjpegtools/lavtools/Makefile.am @@ -144,7 +144,7 @@ lavrec_LDADD = $(LIBMJPEGUTILS) \ lav2yuv_SOURCES = lav2yuv.c lav_common.c lav2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) lav2yuv_LDADD = $(LIBMJPEGUTILS) \ - liblavfile.la liblavjpeg.la + liblavfile.la liblavjpeg.la -ldv jpeg2yuv_SOURCES = jpeg2yuv.c jpeg2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS) debian/patches/04_manpage-syntax.patch0000644000000000000000000000605512241661630015104 0ustar Description: Manpages improvements and fixes. --- docs/mjpeg-howto.info | 1 + docs/mjpegtools.1 | 21 +++------------------ 2 files changed, 4 insertions(+), 18 deletions(-) --- mjpegtools.orig/docs/mjpeg-howto.info +++ mjpegtools/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 --- mjpegtools.orig/docs/mjpegtools.1 +++ mjpegtools/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 Bernhardv2.00MJPEG capture/editting/replay and MPEG encoding toolset description +.SH "NAME" +mjpegtools \- An introduction to the MJPEG-tools .PP Introduction @@ -97,7 +97,6 @@ And this driver only works with the 2.4. .PP One last thing about the data you get before we start: .PP -.DS .sp .ft RR .nf @@ -111,7 +110,6 @@ PAL HALF Size : (352 * 288 * 25 * 80) / 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 @@ -449,7 +447,6 @@ There are three bad things that can happ .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 @@ -491,7 +488,6 @@ How can I recognize if I have one of the .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 @@ -536,7 +532,6 @@ How can you fix it? .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 @@ flag (-z b\(brt)\fP that tells the decod 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 @@ look at them:\fP > rm pnm/image?.pnm > cd pnm > xv -.DE .fi .ec .ft P @@ -1067,7 +1060,6 @@ Now we have the whole command for creati 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 @@ -1080,7 +1072,6 @@ epilogue.mov 0 0 224 1 0 24 2 25 999 -.DE .fi .ec .ft P @@ -1630,7 +1621,6 @@ For SVCD/DVD you can expect a result lik maximal bitrate is not set too low: .PP -.DS .sp .ft RR .nf @@ -1639,7 +1629,6 @@ maximal bitrate is not set too low: q >= 10 average quality q >= 11 not that good q >= 13 here even still sequences might look blocky -.DE .fi .ec .ft P @@ -1847,12 +1836,10 @@ Audio frame .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 @@ -2730,14 +2717,12 @@ First run: .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 debian/patches/03_disable_optimization.patch0000644000000000000000000000052012241661630016347 0ustar Description: Disable optimization by default. --- configure.ac | 1 + 1 file changed, 1 insertion(+) --- mjpegtools.orig/configure.ac +++ mjpegtools/configure.ac @@ -479,6 +479,7 @@ if test x$have_x86cpu = xtrue -o x$have_ ARCHFLAGS=`$srcdir/cpuinfo.sh ppc` fi fi + ARCHFLAGS="" AC_MSG_RESULT($ARCHFLAGS) fi debian/patches/01_debian-directory.patch0000644000000000000000000000140112241661630015357 0ustar Description: Do not auto-regenerate stuff in the debian/ directory. --- Makefile.am | 3 +-- configure.ac | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) --- mjpegtools.orig/Makefile.am +++ mjpegtools/Makefile.am @@ -24,8 +24,7 @@ SUBDIRS = \ y4mdenoise \ y4mscaler \ y4munsharp \ - y4mutils \ - debian + y4mutils # # Add any non autoconf'd files here, extra readmes and other misc --- mjpegtools.orig/configure.ac +++ mjpegtools/configure.ac @@ -578,8 +578,6 @@ dnl Output a Makefile or two and the lib dnl ********************************************************************** AC_CONFIG_FILES([ Makefile - debian/Makefile - debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile debian/patches/10_usr_local.patch0000644000000000000000000000132212241661625014124 0ustar Description: transcode installs the binary in /usr/bin (as well as every Debian Policy-compliant package does). --- scripts/lavtc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- mjpegtools.orig/scripts/lavtc.sh +++ mjpegtools/scripts/lavtc.sh @@ -768,8 +768,8 @@ do # # this is the big call # - log_debug `for arg in /usr/local/bin/transcode ${passArgs} ${transcodeArgs} ${inputCodecArgs} ${outputCodecArgs} ; do echo -n "${arg} " ; done` " " - /usr/local/bin/transcode \ + log_debug `for arg in transcode ${passArgs} ${transcodeArgs} ${inputCodecArgs} ${outputCodecArgs} ; do echo -n "${arg} " ; done` " " + transcode \ ${passArgs} \ ${transcodeArgs} \ ${inputCodecArgs} \ debian/patches/09_script_path.patch0000644000000000000000000000055712241661625014502 0ustar Description: Add mjpegtools' private bin dir to PATH. --- scripts/anytovcd.sh | 2 ++ 1 file changed, 2 insertions(+) --- mjpegtools.orig/scripts/anytovcd.sh +++ mjpegtools/scripts/anytovcd.sh @@ -19,6 +19,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +PATH=/usr/lib/mjpegtools/bin:$PATH + AUD_TRACK="1" VOLUMES="1" PREFIX_OUT="out" debian/patches/08_use_bash.patch0000644000000000000000000000111312241661625013737 0ustar Modified scripts/lavtc.sh --- scripts/lav2mpeg | 2 +- scripts/lavtc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- mjpegtools.orig/scripts/lavtc.sh +++ mjpegtools/scripts/lavtc.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lav2tc.bash - use transcode to convert MJPEG avi files to another # video/audio format. --- mjpegtools.orig/scripts/lav2mpeg +++ mjpegtools/scripts/lav2mpeg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # A convenient front-end for the various mpeg encoding tools. # Allows "1 command" production of a video stream... debian/patches/07_yuvdenoise_disable_sse2.patch0000644000000000000000000000246112241661625016765 0ustar Description: Disable SSE in-line optimizations. --- yuvdenoise/main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) --- mjpegtools.orig/yuvdenoise/main.c +++ mjpegtools/yuvdenoise/main.c @@ -28,12 +28,6 @@ #include "cpu_accel.h" #include "motionsearch.h" -#if defined(__SSE3__) -# include -#elif defined(__SSE2__) -# include -#endif - int verbose = 1; int width = 0; int height = 0; @@ -447,7 +441,7 @@ for(i=0;i<(w*h);i++) *(frame+i)=(*(frame+i)*(255-level)+random[i&8191]*level)/255; } -#if defined(__SSE2__) +#if 0 static inline __m128i tf0(const __m128i mask, const __m128i l0, const __m128i vt, const __m128i vc, const __m128i vb) { __m128i k0, k1, k2, k3, d0; /* temp storage, pixel surroundings, 16-bit words */ @@ -806,7 +800,7 @@ void temporal_filter_planes_p (int idx, } } -#if defined(__SSE2__) +#if 0 /* 4 to 5 times faster */ void filter_plane_median_sse2(uint8_t *plane, int w, int h, int level) { int i; @@ -1328,7 +1322,7 @@ static void init_accel() { temporal_filter_planes = temporal_filter_planes_p; uint32_t tmp; -#if defined(__SSE2__) +#if 0 int d = 0; /* __asm__ volatile("cpuid" : "=d"(d) : "a"(1) : "ebx", "ecx"); */ __asm__ volatile("movl %%ebx, %1; cpuid; movl %1, %%ebx" : "=d"(d), "=&g"(tmp) : "a"(1) : "ecx"); debian/patches/06_link_pthread.patch0000644000000000000000000000075012241661625014616 0ustar Description: Add pthread to linker's libs list. --- mpeg2enc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- mjpegtools.orig/mpeg2enc/Makefile.am +++ mjpegtools/mpeg2enc/Makefile.am @@ -78,7 +78,7 @@ libmpeg2encpp_la_LDFLAGS = \ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS) -libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@ +libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@ -lpthread mpeg2enc_DEPENDENCIES = \ $(LIBMJPEGUTILS) \ debian/mjpegtools.manpages0000644000000000000000000000001512241661624013066 0ustar docs/*.[1-9] debian/mjpegtools.links0000644000000000000000000000006212241661624012415 0ustar usr/lib/mjpegtools/bin/lav2avi.sh usr/bin/lav2avi debian/mjpegtools-gtk.install0000644000000000000000000000001612241661624013525 0ustar /usr/bin/glav debian/libmjpegtools-dev.install0000644000000000000000000000010512241661624014204 0ustar /usr/include/* /usr/lib/*/*.a /usr/lib/*/*.so /usr/lib/*/pkgconfig/* debian/gbp.conf0000644000000000000000000000003612241661624010610 0ustar [DEFAULT] pristine-tar = True debian/copyright0000644000000000000000000000643412241661624011134 0ustar This package was debianized by Fabian Greffrath on Sat, 1 Mar 2008 00:00:00 +0100. It was downloaded from . Upstream Authors: Rainer Johanni Gernot Ziegler Andrew Stevens Bernhard Praschinger Ronald Bultje Xavier Biquard Matthew Marjanovic pHilipp Zabel Kawamata/Hitoshi Stefan Fendt Scott Moser Shawn Sulma Mike Bernson James Klicman 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 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Parts of the sources of this packages such as aenc/* and mpeg2enc/* have been derived from the MSSG (the Mpeg software simulation group). Per http://www.mpeg.org/MPEG/mpeg-pointers-and-resources/, all MSSG software is considered public domain. More information on that group can be found here: http://www.mpeg.org/MPEG/video/mssg-free-mpeg-software.html They have released their code under the following terms. * Disclaimer of Warranty * * These software programs are available to the user without any license fee or * royalty on an "as is" basis. The MPEG Software Simulation Group disclaims * any and all warranties, whether express, implied, or statuary, including any * implied warranties or merchantability or of fitness for a particular * purpose. In no event shall the copyright-holder be liable for any * incidental, punitive, or consequential damages of any kind whatsoever * arising from the use of these programs. * * This disclaimer of warranty extends to the user of these programs and user's * customers, employees, agents, transferees, successors, and assigns. * * The MPEG Software Simulation Group does not represent or warrant that the * programs furnished hereunder are free of infringement of any third-party * patents. * * Commercial implementations of MPEG-1 and MPEG-2 video, including shareware, * are subject to royalty fees to patent holders. Many of these patents are * general enough such that they are unavoidable regardless of implementation * design. debian/compat0000644000000000000000000000000212241661624010370 0ustar 9