[SCM] mjpegtools/master: Add headers to patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Oct 30 17:09:37 UTC 2012 

The following commit has been merged in the master branch:
commit e8ba448c65b88c829e57b66d7f53db36f9c796f5
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 30 17:08:03 2012 +0000

    Add headers to patches.

diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index 68ca349..9fb9985 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -1,5 +1,11 @@
---- a/Makefile.am
-+++ b/Makefile.am
+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
 @@ -23,8 +23,7 @@ SUBDIRS = \
  	yuvdeinterlace \
  	y4mdenoise \
@@ -10,8 +16,8 @@
  
  #
  # Add any non autoconf'd files here, extra readmes and other misc 
---- a/configure.ac
-+++ b/configure.ac
+--- mjpegtools.orig/configure.ac
++++ mjpegtools/configure.ac
 @@ -570,8 +570,6 @@ dnl Output a Makefile or two and the lib
  dnl **********************************************************************
  AC_CONFIG_FILES([
diff --git a/debian/patches/03_disable_optimization.patch b/debian/patches/03_disable_optimization.patch
index 9e7178a..868ee55 100644
--- a/debian/patches/03_disable_optimization.patch
+++ b/debian/patches/03_disable_optimization.patch
@@ -1,5 +1,10 @@
---- a/configure.ac
-+++ b/configure.ac
+Description: Disable optimization by default.
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- mjpegtools.orig/configure.ac
++++ mjpegtools/configure.ac
 @@ -471,6 +471,7 @@ if test x$have_x86cpu = xtrue -o x$have_
         ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
      fi
diff --git a/debian/patches/04_manpage-syntax.patch b/debian/patches/04_manpage-syntax.patch
index e445aa7..165781d 100644
--- a/debian/patches/04_manpage-syntax.patch
+++ b/debian/patches/04_manpage-syntax.patch
@@ -1,12 +1,18 @@
---- a/docs/mjpeg-howto.info
-+++ b/docs/mjpeg-howto.info
+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
---- a/docs/mjpegtools.1
-+++ b/docs/mjpegtools.1
+--- mjpegtools.orig/docs/mjpegtools.1
++++ mjpegtools/docs/mjpegtools.1
 @@ -1,8 +1,8 @@
 -.\"
 -.TH "MJPEG tools" "MJPEG Linux Square" "MJPEG tools manual"
diff --git a/debian/patches/06_link_pthread.patch b/debian/patches/06_link_pthread.patch
index 0dd8994..f95a91e 100644
--- a/debian/patches/06_link_pthread.patch
+++ b/debian/patches/06_link_pthread.patch
@@ -1,5 +1,10 @@
---- a/mpeg2enc/Makefile.am
-+++ b/mpeg2enc/Makefile.am
+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)
diff --git a/debian/patches/07_yuvdenoise_disable_sse2.patch b/debian/patches/07_yuvdenoise_disable_sse2.patch
index f9c4912..be309b2 100644
--- a/debian/patches/07_yuvdenoise_disable_sse2.patch
+++ b/debian/patches/07_yuvdenoise_disable_sse2.patch
@@ -1,5 +1,10 @@
---- a/yuvdenoise/main.c
-+++ b/yuvdenoise/main.c
+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"
diff --git a/debian/patches/08_use_bash.patch b/debian/patches/08_use_bash.patch
index 7d2ce17..378ec82 100644
--- a/debian/patches/08_use_bash.patch
+++ b/debian/patches/08_use_bash.patch
@@ -1,15 +1,20 @@
 	Modified scripts/lavtc.sh
 
---- a/scripts/lavtc.sh
-+++ b/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.
---- a/scripts/lav2mpeg
-+++ b/scripts/lav2mpeg
+--- mjpegtools.orig/scripts/lav2mpeg
++++ mjpegtools/scripts/lav2mpeg
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
diff --git a/debian/patches/09_script_path.patch b/debian/patches/09_script_path.patch
index 41eb3d0..33cdba2 100644
--- a/debian/patches/09_script_path.patch
+++ b/debian/patches/09_script_path.patch
@@ -1,5 +1,10 @@
---- a/scripts/anytovcd.sh
-+++ b/scripts/anytovcd.sh
+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.
  #
diff --git a/debian/patches/10_usr_local.patch b/debian/patches/10_usr_local.patch
index aa6e23c..1951a98 100644
--- a/debian/patches/10_usr_local.patch
+++ b/debian/patches/10_usr_local.patch
@@ -1,5 +1,11 @@
---- a/scripts/lavtc.sh
-+++ b/scripts/lavtc.sh
+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

-- 
mjpegtools packaging

More information about the pkg-multimedia-commits mailing list