[SCM] mjpegtools/master: Refresh the patchset.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Oct 7 16:18:35 UTC 2013 

The following commit has been merged in the master branch:
commit 6c7ff5ddfd985cfef6906805e7f45e7f8e86ee71
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 7 17:18:13 2013 +0100

    Refresh the patchset.

diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index 9fb9985..e8bf9ae 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -6,9 +6,9 @@ Description: Do not auto-regenerate stuff in the debian/ directory.
 
 --- mjpegtools.orig/Makefile.am
 +++ mjpegtools/Makefile.am
-@@ -23,8 +23,7 @@ SUBDIRS = \
- 	yuvdeinterlace \
+@@ -24,8 +24,7 @@ SUBDIRS = \
  	y4mdenoise \
+ 	y4mscaler \
  	y4munsharp \
 -        y4mutils \
 -	debian
@@ -18,7 +18,7 @@ Description: Do not auto-regenerate stuff in the debian/ directory.
  # Add any non autoconf'd files here, extra readmes and other misc 
 --- mjpegtools.orig/configure.ac
 +++ mjpegtools/configure.ac
-@@ -570,8 +570,6 @@ dnl Output a Makefile or two and the lib
+@@ -578,8 +578,6 @@ dnl Output a Makefile or two and the lib
  dnl **********************************************************************
  AC_CONFIG_FILES([
       Makefile
diff --git a/debian/patches/03_disable_optimization.patch b/debian/patches/03_disable_optimization.patch
index 868ee55..fb53f05 100644
--- a/debian/patches/03_disable_optimization.patch
+++ b/debian/patches/03_disable_optimization.patch
@@ -5,7 +5,7 @@ Description: Disable optimization by default.
 
 --- mjpegtools.orig/configure.ac
 +++ mjpegtools/configure.ac
-@@ -471,6 +471,7 @@ if test x$have_x86cpu = xtrue -o x$have_
+@@ -479,6 +479,7 @@ if test x$have_x86cpu = xtrue -o x$have_
         ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
      fi
    fi
diff --git a/debian/patches/04_manpage-syntax.patch b/debian/patches/04_manpage-syntax.patch
index 165781d..b01306a 100644
--- a/debian/patches/04_manpage-syntax.patch
+++ b/debian/patches/04_manpage-syntax.patch
@@ -19,13 +19,13 @@ Description: Manpages improvements and fixes.
 +.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
+-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
  
-@@ -94,7 +94,6 @@ And this driver only works with the 2.4.
+@@ -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
@@ -33,7 +33,7 @@ Description: Manpages improvements and fixes.
  .sp 
  .ft RR
  .nf
-@@ -108,7 +107,6 @@ PAL HALF Size : (352 * 288 * 25 * 80) /
+@@ -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
@@ -41,7 +41,7 @@ Description: Manpages improvements and fixes.
  .fi 
  .ec
  .ft P
-@@ -447,7 +445,6 @@ There are three bad things that can happ
+@@ -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
@@ -49,7 +49,7 @@ Description: Manpages improvements and fixes.
  .if \n(ll>1 .RS
  .nr bi 1
  .PP
-@@ -489,7 +486,6 @@ How can I recognize if I have one of the
+@@ -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
@@ -57,7 +57,7 @@ Description: Manpages improvements and fixes.
  .if \n(ll>1 .RS
  .nr bi 1
  .PP
-@@ -535,7 +531,6 @@ How can you fix it?
+@@ -536,7 +532,6 @@ How can you fix it?
  .nr el +1
  .nr t\n(ll 1
  .nr e\n(el 0 1
@@ -81,15 +81,15 @@ Description: Manpages improvements and fixes.
  .fi 
  .ec
  .ft P
-@@ -1078,7 +1071,6 @@ Now we have the whole command for creati
- The resulting video can be written as a LAV Edit List, a plain text file
+@@ -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
-@@ -1091,7 +1083,6 @@ epilogue.mov
+@@ -1080,7 +1072,6 @@ epilogue.mov
  0 0 224
  1 0 24
  2 25 999
@@ -97,7 +97,7 @@ Description: Manpages improvements and fixes.
  .fi 
  .ec
  .ft P
-@@ -1623,7 +1614,6 @@ For SVCD/DVD you can expect a result lik
+@@ -1630,7 +1621,6 @@ For SVCD/DVD you can expect a result lik
  maximal bitrate is not set too low:
  .PP
  
@@ -105,7 +105,7 @@ Description: Manpages improvements and fixes.
  .sp 
  .ft RR
  .nf
-@@ -1632,7 +1622,6 @@ maximal bitrate is not set too low:
+@@ -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
@@ -113,7 +113,7 @@ Description: Manpages improvements and fixes.
  .fi 
  .ec
  .ft P
-@@ -1843,12 +1832,10 @@ Audio frame
+@@ -1847,12 +1836,10 @@ Audio frame
  .PP
  The approximate frame length formula for MPEG-1 layer-II is:
  .PP
@@ -126,7 +126,7 @@ Description: Manpages improvements and fixes.
  .fi 
  .ec
  .ft P
-@@ -2736,14 +2723,12 @@ First run:
+@@ -2730,14 +2717,12 @@ First run:
  .PP
  You should get something like this:
  .PP
diff --git a/debian/patches/13_fix_lav2yuv_linking.diff b/debian/patches/13_fix_lav2yuv_linking.diff
index 504bd97..d9bfd88 100644
--- a/debian/patches/13_fix_lav2yuv_linking.diff
+++ b/debian/patches/13_fix_lav2yuv_linking.diff
@@ -1,9 +1,13 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
---- a/lavtools/Makefile.am
-+++ b/lavtools/Makefile.am
-@@ -150,7 +150,7 @@ testrec_LDADD = @PTHREAD_LIBS@ $(LIBMJPE
+---
+ 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) \
diff --git a/debian/patches/14_fix_mplex_linking.diff b/debian/patches/14_fix_mplex_linking.diff
index ae0fd8a..7af6103 100644
--- a/debian/patches/14_fix_mplex_linking.diff
+++ b/debian/patches/14_fix_mplex_linking.diff
@@ -1,9 +1,13 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
---- a/mplex/Makefile.am
-+++ b/mplex/Makefile.am
-@@ -84,5 +84,6 @@ mplex_SOURCES = main.cpp
+---
+ 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
  
diff --git a/debian/patches/15_fix_qttoy4m_linking.diff b/debian/patches/15_fix_qttoy4m_linking.diff
index 1d37c12..8714d28 100644
--- a/debian/patches/15_fix_qttoy4m_linking.diff
+++ b/debian/patches/15_fix_qttoy4m_linking.diff
@@ -1,8 +1,12 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
---- a/y4mutils/Makefile.am
-+++ b/y4mutils/Makefile.am
+---
+ 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
diff --git a/debian/patches/16_fix_ftbfs_format_security.patch b/debian/patches/16_fix_ftbfs_format_security.patch
index d044c77..e416089 100644
--- a/debian/patches/16_fix_ftbfs_format_security.patch
+++ b/debian/patches/16_fix_ftbfs_format_security.patch
@@ -1,8 +1,17 @@
 From: Reinhard Tartler
 Subject: Avoid format security warning and build breakage
 
---- a/lavtools/lav_io.c
-+++ b/lavtools/lav_io.c
+---
+ 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
@@ -12,8 +21,8 @@ Subject: Avoid format security warning and build breakage
  	    free(lav_fd);
  	    internal_error = ERROR_FORMAT; /* Format not recognized */
  	    return 0;
---- a/lavtools/lavtrans.c
-+++ b/lavtools/lavtrans.c
+--- mjpegtools.orig/lavtools/lavtrans.c
++++ mjpegtools/lavtools/lavtrans.c
 @@ -275,7 +275,7 @@ int main(int argc, char ** argv)
     if (process_image_frame != -1)
     {
@@ -32,8 +41,8 @@ Subject: Avoid format security warning and build breakage
              imgfd = fopen(imgfname,"wb");
              if (imgfd==0) system_error("opening image file","fopen");
              res = fwrite(vbuff,nv,1,imgfd);
---- a/lavtools/jpeg2yuv.c
-+++ b/lavtools/jpeg2yuv.c
+--- mjpegtools.orig/lavtools/jpeg2yuv.c
++++ mjpegtools/lavtools/jpeg2yuv.c
 @@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
             
             if (firstjpeg) {
@@ -43,19 +52,19 @@ Subject: Avoid format security warning and build breakage
                 firstjpeg = NULL;
             }
             else {
---- a/mplex/main.cpp
-+++ b/mplex/main.cpp
-@@ -615,7 +615,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
+--- mjpegtools.orig/mplex/main.cpp
++++ mjpegtools/mplex/main.cpp
+@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
+                 if( flag_table[flag].longname != 0 )
                      message += sep;
              }
-             while( flag_table[flag].longname != 0 );
 -            mjpeg_error( message.c_str() );
 +            mjpeg_error( "%s", message.c_str() );
              return false;
          }
  
---- a/yuvfilters/yuvkineco.c
-+++ b/yuvfilters/yuvkineco.c
+--- mjpegtools.orig/yuvfilters/yuvkineco.c
++++ mjpegtools/yuvfilters/yuvkineco.c
 @@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
      } else {
  #ifdef MJPEGTOOLS
@@ -65,8 +74,8 @@ Subject: Avoid format security warning and build breakage
  #else
        fputs(buf, stderr);
  #endif
---- a/yuvfilters/main.c
-+++ b/yuvfilters/main.c
+--- mjpegtools.orig/yuvfilters/main.c
++++ mjpegtools/yuvfilters/main.c
 @@ -53,7 +53,7 @@ usage(char **argv)
    char buf[1024];
  

-- 
mjpegtools packaging

More information about the pkg-multimedia-commits mailing list