Package: drip Version: 0.8.3.2+0.9.0-rc3-7 Severity: normal Tags: patch Hi,
Attached is the diff for my drip 0.8.3.2+0.9.0-rc3-7.1 NMU prepared by Sebastian Droege during his NM application. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u drip-0.8.3.2+0.9.0-rc3/debian/control
drip-0.8.3.2+0.9.0-rc3/debian/control
--- drip-0.8.3.2+0.9.0-rc3/debian/control
+++ drip-0.8.3.2+0.9.0-rc3/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: extra
Maintainer: Alastair McKinstry <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 4.1.0), libgnome-dev, libgdk-pixbuf-dev,
libgtkxmhtml-dev, libzvt-dev, nasm, automake1.7, libdvdread3-dev (>= 0.9.3),
libmpeg2-4-dev (>= 0.3.1), liba52-0.7.4-dev, libavifile-0.7-dev (>= 0.7.22),
libtool, libsdl1.2-dev, libxml2-dev, gcc (>= 3:3.2), libxrender-dev,
libfontconfig1-dev, chrpath, libmad0-dev, libxft-dev, libxinerama-dev,
libxxf86vm-dev, libxxf86dga-dev, libmagick9-dev | libmagick-dev,
libmagick++9-dev | libmagick++-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), libgnome-dev, libgdk-pixbuf-dev,
libgtkxmhtml-dev, libzvt-dev, nasm, automake1.7, libdvdread-dev (>= 0.9.3),
libmpeg2-4-dev (>= 0.3.1), liba52-0.7.4-dev, libavifile-0.7-dev (>= 0.7.22),
libtool, libsdl1.2-dev, libxml2-dev, gcc (>= 3:3.2), libxrender-dev,
libfontconfig1-dev, chrpath, libmad0-dev, libxv-dev, libxft-dev,
libxinerama-dev, libxxf86vm-dev, libxxf86dga-dev, libmagick9-dev |
libmagick-dev, libmagick++9-dev | libmagick++-dev
Build-Conflicts: libdvdcss-dev
Standards-Version: 3.6.2
diff -u drip-0.8.3.2+0.9.0-rc3/debian/changelog
drip-0.8.3.2+0.9.0-rc3/debian/changelog
--- drip-0.8.3.2+0.9.0-rc3/debian/changelog
+++ drip-0.8.3.2+0.9.0-rc3/debian/changelog
@@ -1,3 +1,26 @@
+drip (0.8.3.2+0.9.0-rc3-7.1) unstable; urgency=low
+
+ * Non-Maintainer upload
+ * Build-Depend on libxv-dev (Closes: #359650)
+ * Build-Depend on libdvdread-dev instead of libdvdread3-dev which no longer
+ exists (Closes: #366562)
+ * debian/patches/dvdread_include_fixes.diff:
+ - include stdint.h before any dvdread headers. Also #define
+ __STDC_LIMIT_MACROS and #define __STDC_CONSTANT_MACROS to fix FTBFS.
+ (Closes: #373090)
+ * debian/patches/glib2_nolink.diff,
+ debian/libaviplay.la:
+ - Don't link drip with glib2 as this causes segfaults.
+ drip is linked to glib-2.0 because it's linked to a static library
+ which need aviplay, Libtool knows that aviplay need glib-2.0 hence
+ the unwanted linking. So we use this fake libaviplay.la which just
+ remove any glib-2.0 reference from the dependancy list. There will
+ be no linking problems since drip is dynamically linked to aviplay.
+ Also regenerate libtool and ltmain.sh for this.
+ Thanks to Yann Rouillard for providing the patch. (Closes: #304109)
+
+ -- Sebastian Dr??ge <[EMAIL PROTECTED]> Mon, 12 Jun 2006 15:55:55 +0200
+
drip (0.8.3.2+0.9.0-rc3-7) unstable; urgency=low
* Depend on libmagic9-dev, etc. for imagemagick transition. Closes: #332449.
diff -u drip-0.8.3.2+0.9.0-rc3/debian/rules drip-0.8.3.2+0.9.0-rc3/debian/rules
--- drip-0.8.3.2+0.9.0-rc3/debian/rules
+++ drip-0.8.3.2+0.9.0-rc3/debian/rules
@@ -5,6 +5,10 @@
DEB_AUTO_UPDATE_AUTOCONF := 2.50
+# libtool,ltmain.sh are outdated in original tar
+# so we must update them
+DEB_AUTO_UPDATE_LIBTOOL := pre
+
binary/drip:: install/drip
# libao shared objects are in the libao0 separate package
rm -f $(CURDIR)/debian/drip/usr/lib/libao.*
only in patch2:
unchanged:
--- drip-0.8.3.2+0.9.0-rc3.orig/debian/patches/dvdread_include_fixes.diff
+++ drip-0.8.3.2+0.9.0-rc3/debian/patches/dvdread_include_fixes.diff
@@ -0,0 +1,291 @@
+diff -Naur drip-0.9.0rc3-old/encoder/autoclipper.cpp
drip-0.9.0rc3/encoder/autoclipper.cpp
+--- drip-0.9.0rc3-old/encoder/autoclipper.cpp 2003-11-25 00:01:26.000000000
+0100
++++ drip-0.9.0rc3/encoder/autoclipper.cpp 2006-06-12 19:14:21.128305944
+0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include "demuxer.hh"
+ #include "autoclipper.hh"
+ #include "encoder.hh"
+diff -Naur drip-0.9.0rc3-old/encoder/conversion.cpp
drip-0.9.0rc3/encoder/conversion.cpp
+--- drip-0.9.0rc3-old/encoder/conversion.cpp 2003-03-24 14:11:39.000000000
+0100
++++ drip-0.9.0rc3/encoder/conversion.cpp 2006-06-12 19:08:42.446793360
+0200
+@@ -26,6 +26,8 @@
+
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+
+ #include "../config.h"
+ #include "../src/drip.h"
+diff -Naur drip-0.9.0rc3-old/encoder/demuxer.cpp
drip-0.9.0rc3/encoder/demuxer.cpp
+--- drip-0.9.0rc3-old/encoder/demuxer.cpp 2003-12-03 09:00:15.000000000
+0100
++++ drip-0.9.0rc3/encoder/demuxer.cpp 2006-06-12 19:08:53.783069984 +0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ /* Mpeg decoding */
+ #include "demuxer.hh"
+ #include "encoder.hh"
+diff -Naur drip-0.9.0rc3-old/encoder/encoder.cpp
drip-0.9.0rc3/encoder/encoder.cpp
+--- drip-0.9.0rc3-old/encoder/encoder.cpp 2003-12-01 00:04:42.000000000
+0100
++++ drip-0.9.0rc3/encoder/encoder.cpp 2006-06-12 19:09:10.878471088 +0200
+@@ -29,6 +29,8 @@
+ // added DX50 and XVID and corrected DIVX attributes - Michael Deindl, May
2002
+ // changed matching from fourCC to "privname" - Michael Deindl, May
2002
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+
+ /* system */
+ #include <sys/time.h>
+diff -Naur drip-0.9.0rc3-old/encoder/fast_memcpy.cpp
drip-0.9.0rc3/encoder/fast_memcpy.cpp
+--- drip-0.9.0rc3-old/encoder/fast_memcpy.cpp 2003-02-14 14:29:47.000000000
+0100
++++ drip-0.9.0rc3/encoder/fast_memcpy.cpp 2006-06-12 19:12:22.081403824
+0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include "../src/drip.h"
+ #include <string.h>
+ #include <stdio.h>
+diff -Naur drip-0.9.0rc3-old/encoder/main.hh drip-0.9.0rc3/encoder/main.hh
+--- drip-0.9.0rc3-old/encoder/main.hh 2003-02-22 11:15:21.000000000 +0100
++++ drip-0.9.0rc3/encoder/main.hh 2006-06-12 19:05:04.665901088 +0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include <videoencoder.h>
+ #include <avifile.h>
+ #include <aviplay.h>
+diff -Naur drip-0.9.0rc3-old/encoder/plugin-loader.cpp
drip-0.9.0rc3/encoder/plugin-loader.cpp
+--- drip-0.9.0rc3-old/encoder/plugin-loader.cpp 2003-04-26
15:52:23.000000000 +0200
++++ drip-0.9.0rc3/encoder/plugin-loader.cpp 2006-06-12 19:09:21.221898648
+0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include "../src/drip.h"
+ #include "plugin-loader.hh"
+ #include <unistd.h>
+diff -Naur drip-0.9.0rc3-old/encoder/plugin-loader.hh
drip-0.9.0rc3/encoder/plugin-loader.hh
+--- drip-0.9.0rc3-old/encoder/plugin-loader.hh 2003-02-14 14:29:47.000000000
+0100
++++ drip-0.9.0rc3/encoder/plugin-loader.hh 2006-06-12 19:09:28.035862768
+0200
+@@ -17,6 +17,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include "../src/drip.h"
+ #include <gmodule.h>
+
+diff -Naur drip-0.9.0rc3-old/encoder/swscale.cpp
drip-0.9.0rc3/encoder/swscale.cpp
+--- drip-0.9.0rc3-old/encoder/swscale.cpp 2003-02-14 14:29:47.000000000
+0100
++++ drip-0.9.0rc3/encoder/swscale.cpp 2006-06-12 19:09:37.962353712 +0200
+@@ -23,6 +23,9 @@
+ // current version mostly by Michael Niedermayer ([EMAIL PROTECTED])
+ // the parts written by michael are under GNU GPL
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
++
+ #include <inttypes.h>
+ #include <string.h>
+ #include <math.h>
+diff -Naur drip-0.9.0rc3-old/plug-ins/bwfilter.cpp
drip-0.9.0rc3/plug-ins/bwfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/bwfilter.cpp 2003-02-14 14:30:02.000000000
+0100
++++ drip-0.9.0rc3/plug-ins/bwfilter.cpp 2006-06-12 19:25:09.201783800
+0200
+@@ -26,7 +26,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/cleanfilter.cpp
drip-0.9.0rc3/plug-ins/cleanfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/cleanfilter.cpp 2003-02-14 14:30:02.000000000
+0100
++++ drip-0.9.0rc3/plug-ins/cleanfilter.cpp 2006-06-12 19:25:24.765417768
+0200
+@@ -54,6 +54,8 @@
+ found at http://home.earthlink.net/~casaburi/download/
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/colourfilter.cpp
drip-0.9.0rc3/plug-ins/colourfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/colourfilter.cpp 2003-02-14
14:30:03.000000000 +0100
++++ drip-0.9.0rc3/plug-ins/colourfilter.cpp 2006-06-12 19:25:52.413214664
+0200
+@@ -26,7 +26,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/crystalityfilter.cpp
drip-0.9.0rc3/plug-ins/crystalityfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/crystalityfilter.cpp 2003-02-14
14:30:03.000000000 +0100
++++ drip-0.9.0rc3/plug-ins/crystalityfilter.cpp 2006-06-12
19:26:03.509527768 +0200
+@@ -28,6 +28,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/filter.hh
drip-0.9.0rc3/plug-ins/filter.hh
+--- drip-0.9.0rc3-old/plug-ins/filter.hh 2002-03-11 12:58:52.000000000
+0100
++++ drip-0.9.0rc3/plug-ins/filter.hh 2006-06-12 19:26:11.361334112 +0200
+@@ -1,2 +1,4 @@
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../src/drip.h"
+
+diff -Naur drip-0.9.0rc3-old/plug-ins/logofilter.cpp
drip-0.9.0rc3/plug-ins/logofilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/logofilter.cpp 2003-04-26 16:43:06.000000000
+0200
++++ drip-0.9.0rc3/plug-ins/logofilter.cpp 2006-06-12 19:26:34.736780504
+0200
+@@ -31,7 +31,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/magickfilter.cpp
drip-0.9.0rc3/plug-ins/magickfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/magickfilter.cpp 2003-04-26
15:52:40.000000000 +0200
++++ drip-0.9.0rc3/plug-ins/magickfilter.cpp 2006-06-12 19:26:48.281721360
+0200
+@@ -25,7 +25,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/noisefilter.cpp
drip-0.9.0rc3/plug-ins/noisefilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/noisefilter.cpp 2003-02-14 14:30:06.000000000
+0100
++++ drip-0.9.0rc3/plug-ins/noisefilter.cpp 2006-06-12 19:26:55.595609480
+0200
+@@ -25,7 +25,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/testfilter.cpp
drip-0.9.0rc3/plug-ins/testfilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/testfilter.cpp 2003-02-14 14:30:06.000000000
+0100
++++ drip-0.9.0rc3/plug-ins/testfilter.cpp 2006-06-12 19:27:05.060170648
+0200
+@@ -46,7 +46,8 @@
+ //
+ //
----------------------------------------------------------------------------------
+
+-
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/plug-ins/volumefilter.cpp
drip-0.9.0rc3/plug-ins/volumefilter.cpp
+--- drip-0.9.0rc3-old/plug-ins/volumefilter.cpp 2003-02-14
14:30:09.000000000 +0100
++++ drip-0.9.0rc3/plug-ins/volumefilter.cpp 2006-06-12 19:27:17.576267912
+0200
+@@ -17,6 +17,8 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ #include "../config.h"
+ #include "../src/drip.h"
+ #include "../encoder/plugin-loader.hh"
+diff -Naur drip-0.9.0rc3-old/src/callbacks.c drip-0.9.0rc3/src/callbacks.c
+--- drip-0.9.0rc3-old/src/callbacks.c 2003-11-25 00:01:35.000000000 +0100
++++ drip-0.9.0rc3/src/callbacks.c 2006-06-12 19:17:00.829027744 +0200
+@@ -17,6 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include <stdint.h>
+ #include "../config.h"
+ #include <gnome.h>
+ #include "callbacks.h"
+diff -Naur drip-0.9.0rc3-old/src/drip.h drip-0.9.0rc3/src/drip.h
+--- drip-0.9.0rc3-old/src/drip.h 2003-04-26 15:52:41.000000000 +0200
++++ drip-0.9.0rc3/src/drip.h 2006-06-12 19:04:09.651264584 +0200
+@@ -22,14 +22,15 @@
+ #include <gtk/gtk.h>
+ #include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
++/* Other */
++#include <stdlib.h>
++#include <stdint.h>
+ /* libdvdread includes */
+ #include <dvdread/dvd_reader.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/nav_read.h>
+ #include <dvdread/nav_print.h>
+-/* Other */
+-#include <stdlib.h>
+
+ //#include <dmalloc.h>
+
+diff -Naur drip-0.9.0rc3-old/src/interface.c drip-0.9.0rc3/src/interface.c
+--- drip-0.9.0rc3-old/src/interface.c 2003-12-14 10:49:16.000000000 +0100
++++ drip-0.9.0rc3/src/interface.c 2006-06-12 19:16:50.372617360 +0200
+@@ -17,6 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include <stdint.h>
+ #include "../config.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -Naur drip-0.9.0rc3-old/src/process.c drip-0.9.0rc3/src/process.c
+--- drip-0.9.0rc3-old/src/process.c 2003-12-06 15:39:10.000000000 +0100
++++ drip-0.9.0rc3/src/process.c 2006-06-12 19:18:35.847582728 +0200
+@@ -17,6 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include <stdint.h>
+ #include "../config.h"
+ #include <gnome.h>
+ #include "process.h"
only in patch2:
unchanged:
--- drip-0.8.3.2+0.9.0-rc3.orig/debian/patches/glib2_nolink.diff
+++ drip-0.8.3.2+0.9.0-rc3/debian/patches/glib2_nolink.diff
@@ -0,0 +1,12 @@
+--- drip-0.9.0rc3/encoder/Makefile.am.orig 2006-01-29 15:26:41.000000000
+0100
++++ drip-0.9.0rc3/encoder/Makefile.am 2006-01-29 15:27:46.000000000 +0100
+@@ -1,5 +1,9 @@
+ SHELL=/bin/sh
+
++# Dirty hack to have our fake libaviplay.la used
++# so we can remove glib-2.0 reference
++AM_LDFLAGS = -L../../../debian
++
+ DEBUG_C = $(COMPILE_DEBUG)
+ DEBUG_L = -DNONE
+ OPTIM_C = $(COMPILE_OPTIM)
only in patch2:
unchanged:
--- drip-0.8.3.2+0.9.0-rc3.orig/debian/libaviplay.la
+++ drip-0.8.3.2+0.9.0-rc3/debian/libaviplay.la
@@ -0,0 +1,24 @@
+# libaviplay.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 Debian 1.5.22-2 (1.1220.2.365
2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+
+# This is a dirty hack to avoid having drip linked with glib-2.0 since it's
already linked
+# to glib-1.2.
+# drip is linked to glib-2.0 because it's linked to a static library which
need aviplay,
+# Libtool knows that aviplay need glib-2.0 hence the unwanted linking.
+# So we use this fake libaviplay.la which just remove any glib-2.0 reference
from the
+# dependancy list.
+# There will be no linking problem since drip is dynamically linked to aviplay.
+
+if [ -f /usr/lib/libaviplay.la ]; then
+ . /usr/lib/libaviplay.la
+fi
+
+# We remove any reference to glib-2.0 libraries
+for _LIB in libgmodule-2.0 libgthread-2.0 libglib-2.0; do
+ dependency_libs=" `echo $dependency_libs | sed -e "s/[^
]*\/*${_LIB}\.la//"`"
+done
signature.asc
Description: Digital signature
