diff --git a/debian/Makefile.am b/debian/Makefile.am index b311d265a7..d9b89f2837 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -31,4 +31,9 @@ EXTRA_DIST = \ vlc-plugin-svgalib.dirs \ wxvlc.dirs \ wxvlc.menu \ + patches/00list \ + patches/20_configure.dpatch \ + patches/20_faad2.dpatch \ + patches/20_ffmpeg.dpatch \ + patches/20_interfaces.dpatch \ $(NULL) diff --git a/debian/changelog b/debian/changelog index eef3640f52..5fb5eb95ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +vlc (0.7.2.final-7) unstable; urgency=low + + * debian/rules: + + Switch build system to dpatch. + + -- Sam Hocevar (Debian packages) Thu, 29 Jul 2004 17:03:51 +0200 + +vlc (0.7.2.final-6) unstable; urgency=low + + * configure.ac: don't use -maltivec -mabi=altivec, because we don't want + to trigger AltiVec optimisations in our generic code (Closes: #256578, + Closes: #260819). + + -- Sam Hocevar (Debian packages) Fri, 23 Jul 2004 17:21:21 +0200 + vlc (0.7.2.final-5) unstable; urgency=low * debian/control: diff --git a/debian/control b/debian/control index a3504e1025..01189775f7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vlc Section: graphics Priority: optional Maintainer: Sam Hocevar (Debian packages) -Build-Depends: debhelper (>= 4.0), gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libmodplug-dev, libxml2-dev, libid3tag0-dev, libtheora-dev +Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libmodplug-dev, libxml2-dev, libid3tag0-dev, libtheora-dev Build-Conflicts: libavcodec-dev Standards-Version: 3.6.1.1 @@ -220,7 +220,7 @@ Description: wxWindows frontend for VLC Package: vlc-alsa Section: oldlibs Architecture: any -Depends: vlc, vlc-plugin-alsa, ${misc:Depends} +Depends: vlc (= ${Source-Version}), vlc-plugin-alsa, ${misc:Depends} Description: ALSA audio output plugin for VLC (dummy legacy package) The vlc-alsa package has been renamed to vlc-plugin-alsa. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-alsa @@ -232,7 +232,7 @@ Description: ALSA audio output plugin for VLC (dummy legacy package) Package: vlc-esd Section: oldlibs Architecture: any -Depends: vlc, vlc-plugin-esd, ${misc:Depends} +Depends: vlc (= ${Source-Version}), vlc-plugin-esd, ${misc:Depends} Description: Esound audio output plugin for VLC (dummy legacy package) The vlc-esd package has been renamed to vlc-plugin-esd. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-esd @@ -244,7 +244,7 @@ Description: Esound audio output plugin for VLC (dummy legacy package) Package: vlc-ggi Section: oldlibs Architecture: any -Depends: vlc, vlc-plugin-ggi, ${misc:Depends} +Depends: vlc (= ${Source-Version}), vlc-plugin-ggi, ${misc:Depends} Description: GGI video output plugin for VLC (dummy legacy package) The vlc-ggi package has been renamed to vlc-plugin-ggi. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-ggi @@ -256,7 +256,7 @@ Description: GGI video output plugin for VLC (dummy legacy package) Package: vlc-glide Section: oldlibs Architecture: i386 -Depends: vlc, vlc-plugin-glide, ${misc:Depends} +Depends: vlc (= ${Source-Version}), vlc-plugin-glide, ${misc:Depends} Description: Glide video output plugin for VLC (dummy legacy package) The vlc-glide package has been renamed to vlc-plugin-glide. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-glide @@ -268,7 +268,7 @@ Description: Glide video output plugin for VLC (dummy legacy package) Package: vlc-gnome Section: oldlibs Architecture: any -Depends: vlc, gnome-vlc, ${misc:Depends} +Depends: vlc (= ${Source-Version}), gnome-vlc, ${misc:Depends} Description: GNOME frontend for VLC (dummy legacy package) The vlc-gnome package has been renamed to gnome-vlc. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-gnome @@ -280,7 +280,7 @@ Description: GNOME frontend for VLC (dummy legacy package) Package: vlc-gtk Section: oldlibs Architecture: any -Depends: vlc, gvlc, ${misc:Depends} +Depends: vlc (= ${Source-Version}), gvlc, ${misc:Depends} Description: GTK+ frontend for VLC (dummy legacy package) The vlc-gtk package has been renamed to gvlc. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-gtk to gvlc. @@ -291,7 +291,7 @@ Description: GTK+ frontend for VLC (dummy legacy package) Package: vlc-qt Section: oldlibs Architecture: any -Depends: vlc, qvlc, ${misc:Depends} +Depends: vlc (= ${Source-Version}), qvlc, ${misc:Depends} Description: Qt frontend for VLC (dummy legacy package) The vlc-qt package has been renamed to qvlc. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-qt to qvlc. @@ -302,7 +302,7 @@ Description: Qt frontend for VLC (dummy legacy package) Package: vlc-sdl Section: oldlibs Architecture: any -Depends: vlc, vlc-plugin-sdl, ${misc:Depends} +Depends: vlc (= ${Source-Version}), vlc-plugin-sdl, ${misc:Depends} Description: SDL video and audio output plugin for VLC (dummy legacy package) The vlc-sdl package has been renamed to vlc-plugin-sdl. This is a dummy package with the sole purpose of ensuring a smooth upgrade from vlc-sdl diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000000..ae7e9ef483 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,4 @@ +20_configure +20_faad2 +20_ffmpeg +20_interfaces diff --git a/debian/patches/20_configure.dpatch b/debian/patches/20_configure.dpatch new file mode 100755 index 0000000000..10ed50b317 --- /dev/null +++ b/debian/patches/20_configure.dpatch @@ -0,0 +1,142 @@ +#! /bin/sh -e +## 20_configure.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure vlc-0.7.2.final/configure +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure 2004-05-21 14:09:58.000000000 +0200 ++++ vlc-0.7.2.final/configure 2004-07-29 17:15:04.000000000 +0200 +@@ -17850,7 +17850,8 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_c_altivec="-maltivec -mabi=altivec" ++ ac_cv_c_altivec="" ++ ac_cv_c_altivec_abi="-maltivec -mabi=altivec" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -17919,12 +17920,9 @@ + #define CAN_COMPILE_C_ALTIVEC 1 + _ACEOF + +- +- for element in vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec; do +- eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} ${ac_cv_c_altivec}"'"' +- am_modules_with_cflags="${am_modules_with_cflags} ${element}" +- done +- ++ VLC_ADD_CFLAGS(vlc,${ac_cv_c_altivec}) ++ VLC_ADD_CFLAGS(idctaltivec motionaltivec memcpyaltivec deinterlace,${ac_cv_c_altivec}) ++ VLC_ADD_CFLAGS(i420_yuy2_altivec,${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}) + ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" + fi + +@@ -25153,13 +25151,13 @@ + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + +- echo "$as_me:$LINENO: checking for dts_free in -ldts" >&5 +-echo $ECHO_N "checking for dts_free in -ldts... $ECHO_C" >&6 +-if test "${ac_cv_lib_dts_dts_free+set}" = set; then ++ echo "$as_me:$LINENO: checking for dts_free in -ldts_pic" >&5 ++echo $ECHO_N "checking for dts_free in -ldts_pic... $ECHO_C" >&6 ++if test "${ac_cv_lib_dts_pic_dts_free+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldts $LIBS" ++LIBS="-ldts_pic $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25203,27 +25201,27 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_dts_dts_free=yes ++ ac_cv_lib_dts_pic_dts_free=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dts_dts_free=no ++ac_cv_lib_dts_pic_dts_free=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dts_dts_free" >&5 +-echo "${ECHO_T}$ac_cv_lib_dts_dts_free" >&6 +-if test $ac_cv_lib_dts_dts_free = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_dts_pic_dts_free" >&5 ++echo "${ECHO_T}$ac_cv_lib_dts_pic_dts_free" >&6 ++if test $ac_cv_lib_dts_pic_dts_free = yes; then + + + PLUGINS="${PLUGINS} dtstofloat32" + + + for element in dtstofloat32; do +- eval "LDFLAGS_${element}="'"'"-ldts "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-ldts_pic "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure.ac vlc-0.7.2.final/configure.ac +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure.ac 2004-05-21 13:54:55.000000000 +0200 ++++ vlc-0.7.2.final/configure.ac 2004-07-29 17:14:51.000000000 +0200 +@@ -1011,7 +1011,8 @@ + #include + #endif], + [vec_ld(0, (unsigned char *)0);], +- [ac_cv_c_altivec="-maltivec -mabi=altivec"], ++ [ac_cv_c_altivec="" ++ ac_cv_c_altivec_abi="-maltivec -mabi=altivec"], + [# Linux/PPC test (old GCC versions) + CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec" + AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H +@@ -1025,7 +1026,9 @@ + CFLAGS="${CFLAGS_save}"]) + if test "${ac_cv_c_altivec}" != "no"; then + AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) +- AX_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec],[${ac_cv_c_altivec}]) ++ VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}]) ++ VLC_ADD_CFLAGS([idctaltivec motionaltivec memcpyaltivec deinterlace],[${ac_cv_c_altivec}]) ++ VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}]) + ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" + fi + +@@ -2178,9 +2181,9 @@ + else + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" + AC_CHECK_HEADERS(dts.h, [ +- AC_CHECK_LIB(dts, dts_free, [ ++ AC_CHECK_LIB(dts_pic, dts_free, [ + AX_ADD_PLUGINS([dtstofloat32]) +- AX_ADD_LDFLAGS([dtstofloat32],[-ldts]) ++ AX_ADD_LDFLAGS([dtstofloat32],[-ldts_pic]) + ],[ + if test "${enable_dts}" = "yes"; then + AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html]) diff --git a/debian/patches/20_faad2.dpatch b/debian/patches/20_faad2.dpatch new file mode 100755 index 0000000000..21a9bd285b --- /dev/null +++ b/debian/patches/20_faad2.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh -e +## 20_faad2.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.am vlc-0.7.2.final/extras/faad2/Makefile.am +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.am 2004-02-06 17:04:39.000000000 +0100 ++++ vlc-0.7.2.final/extras/faad2/Makefile.am 2004-07-29 17:11:18.000000000 +0200 +@@ -3,6 +3,6 @@ + EXTRA_DIST = faad2.spec + + rpm: Makefile +- make dist +- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz +- rm $(PACKAGE)-$(VERSION).tar.gz ++ make dist ++ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz ++ rm $(PACKAGE)-$(VERSION).tar.gz +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.in vlc-0.7.2.final/extras/faad2/Makefile.in +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.in 2004-02-22 02:23:18.000000000 +0100 ++++ vlc-0.7.2.final/extras/faad2/Makefile.in 2004-07-29 17:11:18.000000000 +0200 +@@ -560,9 +560,9 @@ + + + rpm: Makefile +- make dist +- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz +- rm $(PACKAGE)-$(VERSION).tar.gz ++ make dist ++ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz ++ rm $(PACKAGE)-$(VERSION).tar.gz + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile 2004-07-29 17:11:18.000000000 +0200 +@@ -0,0 +1 @@ ++distclean: diff --git a/debian/patches/20_ffmpeg.dpatch b/debian/patches/20_ffmpeg.dpatch new file mode 100755 index 0000000000..d43ae47186 --- /dev/null +++ b/debian/patches/20_ffmpeg.dpatch @@ -0,0 +1,105 @@ +#! /bin/sh -e +## 20_ffmpeg.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/configure vlc-0.7.2.final/extras/ffmpeg/configure +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/configure 2004-05-20 12:35:16.000000000 +0200 ++++ vlc-0.7.2.final/extras/ffmpeg/configure 2004-07-29 17:11:45.000000000 +0200 +@@ -124,6 +124,12 @@ + sh4) + cpu="sh4" + ;; ++ parisc|parisc64) ++ cpu="parisc" ++ ;; ++ s390) ++ cpu="s390" ++ ;; + *) + cpu="unknown" + ;; +@@ -1051,6 +1057,12 @@ + elif test "$cpu" = "sh4" ; then + echo "TARGET_ARCH_SH4=yes" >> config.mak + echo "#define ARCH_SH4 1" >> $TMPH ++elif test "$cpu" = "parisc" ; then ++ echo "TARGET_ARCH_PARISC=yes" >> config.mak ++ echo "#define ARCH_PARISC 1" >> $TMPH ++elif test "$cpu" = "s390" ; then ++ echo "TARGET_ARCH_S390=yes" >> config.mak ++ echo "#define ARCH_S390 1" >> $TMPH + fi + echo "#define TUNECPU $TUNECPU" >> $TMPH + if test "$bigendian" = "yes" ; then +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile 2004-05-10 10:31:52.000000000 +0200 ++++ vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile 2004-07-29 17:11:45.000000000 +0200 +@@ -205,6 +205,11 @@ + libpostproc/libpostproc.a: + $(MAKE) -C libpostproc + ++ifeq ($(TARGET_ARCH_PARISC),yes) ++motion_est.o: motion_est.c ++ $(CC) $(CFLAGS) -O1 -c -o $@ $< ++endif ++ + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c 2004-05-20 12:35:25.000000000 +0200 ++++ vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c 2004-07-29 17:11:45.000000000 +0200 +@@ -970,17 +970,17 @@ + int best_vector_score= INT_MAX; + int best_vector_sum=-999, best_vector_mean=-999; + const int stage= count-1; +- const int8_t *vector; ++ const int8_t *vect; + + for(i=0; i<16; i++){ + int sum= codebook_sum[stage*16 + i]; + int sqr=0; + int diff, mean, score; + +- vector = codebook + stage*size*16 + i*size; ++ vect = codebook + stage*size*16 + i*size; + + for(j=0; j +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/kde/kde.cpp vlc-0.7.2.final/modules/gui/kde/kde.cpp +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/kde/kde.cpp 2004-03-05 20:24:00.000000000 +0100 ++++ vlc-0.7.2.final/modules/gui/kde/kde.cpp 2004-07-29 17:12:39.000000000 +0200 +@@ -53,7 +53,7 @@ + /* int i = getenv( "DISPLAY" ) == NULL ? 8 : 85; */ + set_description( _("KDE interface") ); + add_file( "kde-uirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL, VLC_TRUE ); +- set_capability( "interface", 0 ); /* 0 used to be i, disabled because kvlc not maintained */ ++ set_capability( "interface", 1 ); /* 0 used to be i, disabled because kvlc not maintained */ + set_program( "kvlc" ); + set_callbacks( open, close ); + vlc_module_end(); +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp 2004-05-21 13:24:58.000000000 +0200 ++++ vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp 2004-07-29 17:12:39.000000000 +0200 +@@ -258,7 +258,7 @@ + SKINS2_TRANSPARENCY_LONG, VLC_FALSE ); + #endif + set_description( _("Skinnable Interface") ); +- set_capability( "interface", 30 ); ++ set_capability( "interface", 200 ); + set_callbacks( Open, Close ); + set_program( "svlc" ); + vlc_module_end(); +diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/src/interface/interface.c vlc-0.7.2.final/src/interface/interface.c +--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/src/interface/interface.c 2004-05-17 00:42:55.000000000 +0200 ++++ vlc-0.7.2.final/src/interface/interface.c 2004-07-29 17:12:39.000000000 +0200 +@@ -242,9 +242,11 @@ + { + static char *ppsz_interfaces[] = + { ++/* + "skins", "Skins", + "skins2", "Skins 2", + "wxwindows", "wxWindows", ++*/ + NULL, NULL + }; + char **ppsz_parser; diff --git a/debian/rules b/debian/rules index f9648e6ba0..897e5416e8 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make # # Compilation options @@ -54,6 +55,7 @@ CONFIG_FLAGS += \ --enable-fribidi \ --enable-cdio \ --enable-mod \ + --enable-theora \ $(NULL) # These ones are currently shipped with VLC @@ -118,8 +120,8 @@ configure-stamp: touch configure-stamp -build: configure-stamp build-stamp -build-stamp: +build: build-stamp +build-stamp: patch configure-stamp dh_testdir # Build only VLC, with the non-PIC libs @@ -175,6 +177,7 @@ clean: rm -f config.log confdefs.h -$(MAKE) distclean + $(MAKE) -f debian/rules unpatch dh_clean