[SCM] mjpegtools/master: refresh quilt patches

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Sep 2 13:49:36 UTC 2012 

The following commit has been merged in the master branch:
commit f2d2f4625cd474aed41e3feccaa019cccbf8dd51
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 14:56:14 2012 +0200

    refresh quilt patches

diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index 6630097..b480d43 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -1,8 +1,6 @@
-Index: mjpegtools/Makefile.am
-===================================================================
---- mjpegtools.orig/Makefile.am	2011-05-01 00:52:34.341597541 +0700
-+++ mjpegtools/Makefile.am	2011-05-01 00:53:11.591597540 +0700
-@@ -23,8 +23,7 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,8 +23,7 @@ SUBDIRS = \
  	yuvdeinterlace \
  	y4mdenoise \
  	y4munsharp \
@@ -12,11 +10,9 @@ Index: mjpegtools/Makefile.am
  
  #
  # Add any non autoconf'd files here, extra readmes and other misc 
-Index: mjpegtools/Makefile.in
-===================================================================
---- mjpegtools.orig/Makefile.in	2011-05-01 00:52:34.311597541 +0700
-+++ mjpegtools/Makefile.in	2011-05-01 00:53:11.591597540 +0700
-@@ -308,8 +308,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -309,8 +309,7 @@ SUBDIRS = \
  	yuvdeinterlace \
  	y4mdenoise \
  	y4munsharp \
@@ -26,11 +22,9 @@ Index: mjpegtools/Makefile.in
  
  
  #
-Index: mjpegtools/configure.ac
-===================================================================
---- mjpegtools.orig/configure.ac	2011-05-01 00:52:34.361597541 +0700
-+++ mjpegtools/configure.ac	2011-05-01 00:53:11.591597540 +0700
-@@ -543,8 +543,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -570,8 +570,6 @@ dnl Output a Makefile or two and the lib
  dnl **********************************************************************
  AC_CONFIG_FILES([
       Makefile
@@ -39,11 +33,9 @@ Index: mjpegtools/configure.ac
       docs/Makefile
       lavtools/Makefile
       yuvcorrect/Makefile
-Index: mjpegtools/configure
-===================================================================
---- mjpegtools.orig/configure	2011-05-01 00:53:16.111597540 +0700
-+++ mjpegtools/configure	2011-05-01 00:53:27.941597539 +0700
-@@ -18654,7 +18654,7 @@
+--- a/configure
++++ b/configure
+@@ -18564,7 +18564,7 @@ $as_echo "#define NDEBUG 1" >>confdefs.h
  	;;
  esac
  
@@ -52,7 +44,7 @@ Index: mjpegtools/configure
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -19782,8 +19782,6 @@
+@@ -19715,8 +19715,6 @@ do
      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
diff --git a/debian/patches/03_disable_optimization.patch b/debian/patches/03_disable_optimization.patch
index 388772b..8548c19 100644
--- a/debian/patches/03_disable_optimization.patch
+++ b/debian/patches/03_disable_optimization.patch
@@ -1,8 +1,6 @@
-Index: mjpegtools/configure
-===================================================================
---- mjpegtools.orig/configure	2011-05-01 01:11:37.000000000 +0700
-+++ mjpegtools/configure	2011-05-01 01:12:59.761597483 +0700
-@@ -18523,6 +18523,7 @@
+--- a/configure
++++ b/configure
+@@ -18433,6 +18433,7 @@ $as_echo_n "checking sub-architecture se
         ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
      fi
    fi
diff --git a/debian/patches/04_manpage-syntax.patch b/debian/patches/04_manpage-syntax.patch
index fc99fc6..e445aa7 100644
--- a/debian/patches/04_manpage-syntax.patch
+++ b/debian/patches/04_manpage-syntax.patch
@@ -1,16 +1,12 @@
-Index: mjpegtools/docs/mjpeg-howto.info
-===================================================================
---- mjpegtools.orig/docs/mjpeg-howto.info	2011-04-30 23:56:13.000000000 +0700
-+++ mjpegtools/docs/mjpeg-howto.info	2011-05-01 01:14:32.701597480 +0700
+--- a/docs/mjpeg-howto.info
++++ b/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
-Index: mjpegtools/docs/mjpegtools.1
-===================================================================
---- mjpegtools.orig/docs/mjpegtools.1	2011-04-30 23:56:13.000000000 +0700
-+++ mjpegtools/docs/mjpegtools.1	2011-05-01 01:14:32.701597480 +0700
+--- a/docs/mjpegtools.1
++++ b/docs/mjpegtools.1
 @@ -1,8 +1,8 @@
 -.\"
 -.TH "MJPEG tools" "MJPEG Linux Square" "MJPEG tools manual"
@@ -23,7 +19,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .PP
  Introduction
  
-@@ -94,7 +94,6 @@
+@@ -94,7 +94,6 @@ And this driver only works with the 2.4.
  .PP
  One last thing about the data you get before we start:
  .PP
@@ -31,7 +27,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .sp 
  .ft RR
  .nf
-@@ -108,7 +107,6 @@
+@@ -108,7 +107,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
@@ -39,7 +35,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .fi 
  .ec
  .ft P
-@@ -447,7 +445,6 @@
+@@ -447,7 +445,6 @@ There are three bad things that can happ
  .nr el +1
  .nr t\n(ll 1
  .nr e\n(el 0 1
@@ -47,7 +43,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .if \n(ll>1 .RS
  .nr bi 1
  .PP
-@@ -489,7 +486,6 @@
+@@ -489,7 +486,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
@@ -55,7 +51,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .if \n(ll>1 .RS
  .nr bi 1
  .PP
-@@ -535,7 +531,6 @@
+@@ -535,7 +531,6 @@ How can you fix it?
  .nr el +1
  .nr t\n(ll 1
  .nr e\n(el 0 1
@@ -63,7 +59,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .if \n(ll>1 .RS
  .nr bi 1
  .PP
-@@ -565,7 +560,6 @@
+@@ -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
@@ -71,7 +67,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .sp 
  .ft RR
  .nf
-@@ -574,7 +568,6 @@
+@@ -574,7 +568,6 @@ look at them:\fP
  > rm pnm/image?.pnm 
  > cd pnm 
  > xv 
@@ -79,7 +75,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .fi 
  .ec
  .ft P
-@@ -1078,7 +1071,6 @@
+@@ -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
  containing the following lines:
  .PP
@@ -87,7 +83,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .sp 
  .ft RR
  .nf
-@@ -1091,7 +1083,6 @@
+@@ -1091,7 +1083,6 @@ epilogue.mov
  0 0 224
  1 0 24
  2 25 999
@@ -95,7 +91,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .fi 
  .ec
  .ft P
-@@ -1623,7 +1614,6 @@
+@@ -1623,7 +1614,6 @@ For SVCD/DVD you can expect a result lik
  maximal bitrate is not set too low:
  .PP
  
@@ -103,7 +99,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .sp 
  .ft RR
  .nf
-@@ -1632,7 +1622,6 @@
+@@ -1632,7 +1622,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
@@ -111,7 +107,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .fi 
  .ec
  .ft P
-@@ -1843,12 +1832,10 @@
+@@ -1843,12 +1832,10 @@ Audio frame
  .PP
  The approximate frame length formula for MPEG-1 layer-II is:
  .PP
@@ -124,7 +120,7 @@ Index: mjpegtools/docs/mjpegtools.1
  .fi 
  .ec
  .ft P
-@@ -2736,14 +2723,12 @@
+@@ -2736,14 +2723,12 @@ First run:
  .PP
  You should get something like this:
  .PP
diff --git a/debian/patches/06_link_pthread.patch b/debian/patches/06_link_pthread.patch
index c172aa2..20b3f06 100644
--- a/debian/patches/06_link_pthread.patch
+++ b/debian/patches/06_link_pthread.patch
@@ -1,8 +1,6 @@
-Index: mjpegtools/mpeg2enc/Makefile.am
-===================================================================
---- mjpegtools.orig/mpeg2enc/Makefile.am	2011-05-01 11:53:34.089150005 +0700
-+++ mjpegtools/mpeg2enc/Makefile.am	2011-05-01 11:54:20.000000000 +0700
-@@ -78,7 +78,7 @@
+--- a/mpeg2enc/Makefile.am
++++ b/mpeg2enc/Makefile.am
+@@ -78,7 +78,7 @@ libmpeg2encpp_la_LDFLAGS = \
  
  libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
  
@@ -11,11 +9,9 @@ Index: mjpegtools/mpeg2enc/Makefile.am
  
  mpeg2enc_DEPENDENCIES = \
  	$(LIBMJPEGUTILS) \
-Index: mjpegtools/mpeg2enc/Makefile.in
-===================================================================
---- mjpegtools.orig/mpeg2enc/Makefile.in	2011-05-01 11:53:34.069150005 +0700
-+++ mjpegtools/mpeg2enc/Makefile.in	2011-05-01 11:57:05.469149902 +0700
-@@ -358,7 +358,7 @@
+--- a/mpeg2enc/Makefile.in
++++ b/mpeg2enc/Makefile.in
+@@ -359,7 +359,7 @@ libmpeg2encpp_la_LDFLAGS = \
  	-release $(LT_RELEASE) ${EXTRA_LDFLAGS}
  
  libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
diff --git a/debian/patches/07_yuvdenoise_disable_sse2.patch b/debian/patches/07_yuvdenoise_disable_sse2.patch
index d130d36..f9c4912 100644
--- a/debian/patches/07_yuvdenoise_disable_sse2.patch
+++ b/debian/patches/07_yuvdenoise_disable_sse2.patch
@@ -1,7 +1,5 @@
-Index: mjpegtools/yuvdenoise/main.c
-===================================================================
---- mjpegtools.orig/yuvdenoise/main.c	2011-05-01 12:08:35.039149565 +0700
-+++ mjpegtools/yuvdenoise/main.c	2011-05-01 12:08:58.319149555 +0700
+--- a/yuvdenoise/main.c
++++ b/yuvdenoise/main.c
 @@ -28,12 +28,6 @@
  #include "cpu_accel.h"
  #include "motionsearch.h"
@@ -15,7 +13,7 @@ Index: mjpegtools/yuvdenoise/main.c
  int verbose = 1;
  int width = 0;
  int height = 0;
-@@ -447,7 +441,7 @@
+@@ -447,7 +441,7 @@ for(i=0;i<(w*h);i++)
  	*(frame+i)=(*(frame+i)*(255-level)+random[i&8191]*level)/255;
  }
  
@@ -24,7 +22,7 @@ Index: mjpegtools/yuvdenoise/main.c
  
  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 @@
+@@ -806,7 +800,7 @@ void temporal_filter_planes_p (int idx,
  	}
  }
  
@@ -33,7 +31,7 @@ Index: mjpegtools/yuvdenoise/main.c
  /* 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 @@
+@@ -1328,7 +1322,7 @@ static void init_accel() {
  	temporal_filter_planes = temporal_filter_planes_p;
  	uint32_t tmp;
  
diff --git a/debian/patches/08_use_bash.patch b/debian/patches/08_use_bash.patch
index 6e22991..d19d9bf 100644
--- a/debian/patches/08_use_bash.patch
+++ b/debian/patches/08_use_bash.patch
@@ -1,7 +1,5 @@
 	Modified scripts/lavtc.sh
 
-diff --git a/scripts/lavtc.sh b/scripts/lavtc.sh
-index a099ba8..53ac9ea 100755
 --- a/scripts/lavtc.sh
 +++ b/scripts/lavtc.sh
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/09_script_path.patch b/debian/patches/09_script_path.patch
index 13ca627..41eb3d0 100644
--- a/debian/patches/09_script_path.patch
+++ b/debian/patches/09_script_path.patch
@@ -1,7 +1,5 @@
-Index: mjpegtools/scripts/anytovcd.sh
-===================================================================
---- mjpegtools.orig/scripts/anytovcd.sh	2011-05-01 16:23:04.279142122 +0700
-+++ mjpegtools/scripts/anytovcd.sh	2011-05-01 16:23:32.229142109 +0700
+--- a/scripts/anytovcd.sh
++++ b/scripts/anytovcd.sh
 @@ -19,6 +19,8 @@
  #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
diff --git a/debian/patches/10_usr_local.patch b/debian/patches/10_usr_local.patch
index fa42177..aa6e23c 100644
--- a/debian/patches/10_usr_local.patch
+++ b/debian/patches/10_usr_local.patch
@@ -1,8 +1,6 @@
-Index: mjpegtools/scripts/lavtc.sh
-===================================================================
---- mjpegtools.orig/scripts/lavtc.sh	2011-05-01 16:26:23.249142025 +0700
-+++ mjpegtools/scripts/lavtc.sh	2011-05-01 16:27:00.089142007 +0700
-@@ -768,8 +768,8 @@
+--- a/scripts/lavtc.sh
++++ b/scripts/lavtc.sh
+@@ -768,8 +768,8 @@ do
  	#
  	# this is the big call
  	#
diff --git a/debian/patches/13_fix_lav2yuv_linking.diff b/debian/patches/13_fix_lav2yuv_linking.diff
index 2a0ae01..504bd97 100644
--- a/debian/patches/13_fix_lav2yuv_linking.diff
+++ b/debian/patches/13_fix_lav2yuv_linking.diff
@@ -1,11 +1,9 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
-Index: mjpegtools-1.9.0/lavtools/Makefile.am
-===================================================================
---- mjpegtools-1.9.0.orig/lavtools/Makefile.am	2011-08-29 09:56:16.000000000 -0400
-+++ mjpegtools-1.9.0/lavtools/Makefile.am	2011-08-29 09:57:37.000000000 -0400
-@@ -146,7 +146,7 @@
+--- a/lavtools/Makefile.am
++++ b/lavtools/Makefile.am
+@@ -150,7 +150,7 @@ testrec_LDADD = @PTHREAD_LIBS@ $(LIBMJPE
  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 5812fbd..ae0fd8a 100644
--- a/debian/patches/14_fix_mplex_linking.diff
+++ b/debian/patches/14_fix_mplex_linking.diff
@@ -1,11 +1,9 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
-Index: mjpegtools-1.9.0/mplex/Makefile.am
-===================================================================
---- mjpegtools-1.9.0.orig/mplex/Makefile.am	2011-08-29 10:08:49.000000000 -0400
-+++ mjpegtools-1.9.0/mplex/Makefile.am	2011-08-29 10:09:19.000000000 -0400
-@@ -83,5 +83,6 @@
+--- a/mplex/Makefile.am
++++ b/mplex/Makefile.am
+@@ -84,5 +84,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 f948421..1d37c12 100644
--- a/debian/patches/15_fix_qttoy4m_linking.diff
+++ b/debian/patches/15_fix_qttoy4m_linking.diff
@@ -1,11 +1,9 @@
 From: Daniel T Chen <crimsun at ubuntu.com>
 Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
 
-Index: mjpegtools-1.9.0/y4mutils/Makefile.am
-===================================================================
---- mjpegtools-1.9.0.orig/y4mutils/Makefile.am	2011-08-29 10:14:03.000000000 -0400
-+++ mjpegtools-1.9.0/y4mutils/Makefile.am	2011-08-29 10:17:15.000000000 -0400
-@@ -54,11 +54,13 @@
+--- a/y4mutils/Makefile.am
++++ b/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)

-- 
mjpegtools packaging

More information about the pkg-multimedia-commits mailing list