r24 - in unstable/vlc/debian: . patches

Sam Hocevar sho at alioth.debian.org
Wed Mar 14 14:19:07 CET 2007 

Author: sho
Date: 2006-04-24 15:55:23 +0000 (Mon, 24 Apr 2006)
New Revision: 24

Added:
   unstable/vlc/debian/patches/010_no-wx-updates.diff
   unstable/vlc/debian/patches/010_osdmenu-paths.diff
   unstable/vlc/debian/patches/020_xulrunner.diff
   unstable/vlc/debian/patches/series
Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
Log:
  * debian/patches/010_no-wx-updates.diff:
    + Created from old dpatch. Disables broken "check for updates" button.
  * debian/patches/010_osdmenu-paths.diff
    + Created from old dpatch. Fixes file paths for OSD plugin.
  * debian/patches/020_xulrunner.diff:
    + Build using XULrunner (Closes: #364381).


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/changelog	2006-04-24 15:55:23 UTC (rev 24)
@@ -9,7 +9,7 @@
     + Fixed the double pane in settings dialog issue (Closes: #343031).
     + Help flags now adapt to the locale and help formatting was fixed
       (Closes: #347278).
-    + HTTP streaming no longer fails (Closes: #352559).
+    + HTTP streaming no longer fails (Closes: #352599).
     + Memory leak fixed (Closes: #359655).
     + x264 build system supports ppc64 and mips64 (Closes: #361452, #358233).
 
@@ -22,7 +22,17 @@
       against them.
     + Build-depend on newer Matroska libraries to fix .mkv support
       (Closes: #348404).
+    + Build-depend on libxul-dev and xulrunner instead of mozilla-dev.
 
+  * debian/patches/010_no-wx-updates.diff:
+    + Created from old dpatch. Disables broken "check for updates" button.
+
+  * debian/patches/010_osdmenu-paths.diff
+    + Created from old dpatch. Fixes file paths for OSD plugin.
+
+  * debian/patches/020_xulrunner.diff:
+    + Build using XULrunner (Closes: #364381).
+
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Apr 2006 12:18:36 +0200
 
 vlc (0.8.4.debian-2) unstable; urgency=low

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/control	2006-04-24 15:55:23 UTC (rev 24)
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), mozilla-dev (>= 2:1.7.10-1), xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2004.11.11a-1), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060329-4), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2004.11.11a-1), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060329-4), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev
 Standards-Version: 3.6.2
 
 Package: vlc
@@ -131,12 +131,12 @@
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: mozilla-browser | mozilla-firefox
-Description: multimedia plugin for Mozilla based on VLC
+Description: multimedia plugin for web browsers based on VLC
  This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
- more formats to your Mozilla browser. The decoding process is done by VLC
- and the output window is embedded in a webpage or directly in the browser
- window. There is also support for fullscreen display and javascript control.
+ more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
+ decoding process is done by VLC and the output window is embedded in a
+ webpage or directly in the browser window. There is also support for
+ fullscreen display and javascript control.
  .
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia

Added: unstable/vlc/debian/patches/010_no-wx-updates.diff
===================================================================
--- unstable/vlc/debian/patches/010_no-wx-updates.diff	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/patches/010_no-wx-updates.diff	2006-04-24 15:55:23 UTC (rev 24)
@@ -0,0 +1,15 @@
+Index: vlc-0.8.5-test3.debian/modules/gui/wxwidgets/interface.cpp
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/modules/gui/wxwidgets/interface.cpp	2006-04-19 09:25:08.000000000 +0200
++++ vlc-0.8.5-test3.debian/modules/gui/wxwidgets/interface.cpp	2006-04-24 16:21:44.000000000 +0200
+@@ -603,8 +603,8 @@
+     /* Create the "Help" menu */
+     wxMenu *help_menu = new wxMenu;
+     help_menu->Append( About_Event, wxU(_("About...")) );
+-    help_menu->AppendSeparator();
+-    help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
++//    help_menu->AppendSeparator();
++//    help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
+ 
+     /* Append the freshly created menus to the menu bar... */
+     wxMenuBar *menubar = new wxMenuBar();

Added: unstable/vlc/debian/patches/010_osdmenu-paths.diff
===================================================================
--- unstable/vlc/debian/patches/010_osdmenu-paths.diff	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/patches/010_osdmenu-paths.diff	2006-04-24 15:55:23 UTC (rev 24)
@@ -0,0 +1,33 @@
+Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg	2006-04-19 09:25:02.000000000 +0200
++++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg	2006-04-24 16:21:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/default
++dir /usr/share/vlc/osdmenu/default
+ action	key-play-pause (0,0)
+ 	unselect unselected.png
+ 	select   selection/play_pause.png
+Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg	2006-04-19 09:25:02.000000000 +0200
++++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg	2006-04-24 16:21:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/dvd
++dir /usr/share/vlc/osdmenu/dvd
+ action	key-play (0,0)
+ 	unselect unselect/barroff.png
+ 	select   selection/play.png
+Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c	2006-04-19 09:25:11.000000000 +0200
++++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c	2006-04-24 16:21:46.000000000 +0200
+@@ -92,7 +92,7 @@
+ #if defined( WIN32 ) || defined( UNDER_CE )
+ #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
+ #else
+-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+ #endif
+ 
+ #define OSD_UPDATE_MIN     0

Added: unstable/vlc/debian/patches/020_xulrunner.diff
===================================================================
--- unstable/vlc/debian/patches/020_xulrunner.diff	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/patches/020_xulrunner.diff	2006-04-24 15:55:23 UTC (rev 24)
@@ -0,0 +1,96 @@
+Index: vlc-0.8.5-test3.debian/configure
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/configure	2006-04-19 16:33:35.000000000 +0200
++++ vlc-0.8.5-test3.debian/configure	2006-04-24 17:52:16.000000000 +0200
+@@ -61706,8 +61706,8 @@
+ then
+   if test "${with_mozilla_sdk_path}" = ""
+   then
+-    # Extract the first word of "mozilla-config", so it can be a program name with args.
+-set dummy mozilla-config; ac_word=$2
++    # Extract the first word of "xulrunner-config", so it can be a program name with args.
++set dummy xulrunner-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_MOZILLA_CONFIG+set}" = set; then
+@@ -61748,8 +61748,8 @@
+ 
+     if test "${MOZILLA_CONFIG}" = "no"
+     then
+-      { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, mozilla-config was not found." >&5
+-echo "$as_me: error: Please install the Mozilla development tools, mozilla-config was not found." >&2;}
++      { { echo "$as_me:$LINENO: error: Please install the Mozilla development tools, xulrunner-config was not found." >&5
++echo "$as_me: error: Please install the Mozilla development tools, xulrunner-config was not found." >&2;}
+    { (exit 1); exit 1; }; }
+     else
+       if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+@@ -61846,7 +61846,7 @@
+ 
+ 
+   for element in mozilla; do
+-    eval "LDFLAGS_${element}="'"'"`${MOZILLA_CONFIG} --libs plugin xpcom` "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"`${MOZILLA_CONFIG} --libs plugin` "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -62004,7 +62004,7 @@
+       MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
+       XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \
+       `${MOZILLA_CONFIG} --idlflags plugin xpcom java` "
+-      xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
++      xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner"
+     fi
+   else
+         if test "${SYS}" = "mingw32"
+@@ -62269,7 +62269,7 @@
+ 
+       MOZILLA_SDK_PATH="${real_mozilla_sdk}"
+       XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl"
+-      xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin"
++      xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/lib/xulrunner"
+ 
+       if test -n "${CYGPATH}"; then
+         real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"
+Index: vlc-0.8.5-test3.debian/configure.ac
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/configure.ac	2006-04-19 16:29:37.000000000 +0200
++++ vlc-0.8.5-test3.debian/configure.ac	2006-04-24 17:52:06.000000000 +0200
+@@ -5004,10 +5004,10 @@
+ then
+   if test "${with_mozilla_sdk_path}" = ""
+   then
+-    AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
++    AC_PATH_PROG(MOZILLA_CONFIG, xulrunner-config, no)
+     if test "${MOZILLA_CONFIG}" = "no"
+     then
+-      AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
++      AC_MSG_ERROR([Please install the Mozilla development tools, xulrunner-config was not found.])
+     else
+       if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+         LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+@@ -5024,14 +5024,14 @@
+       mozilla=:
+       dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
+       VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
+-      VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
++      VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
+       CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
+       AC_CHECK_HEADERS(mozilla-config.h)
+       CPPFLAGS="${CPPFLAGS_save}"
+       MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
+       XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \
+       `${MOZILLA_CONFIG} --idlflags plugin xpcom java` "
+-      xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
++      xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner"
+     fi
+   else
+     dnl special case for mingw32
+@@ -5061,7 +5061,7 @@
+   
+       MOZILLA_SDK_PATH="${real_mozilla_sdk}"
+       XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl"
+-      xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin"
++      xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/lib/xulrunner"
+   
+       if test -n "${CYGPATH}"; then
+         real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"

Added: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series	2006-04-24 13:56:44 UTC (rev 23)
+++ unstable/vlc/debian/patches/series	2006-04-24 15:55:23 UTC (rev 24)
@@ -0,0 +1,3 @@
+010_no-wx-updates.diff 
+010_osdmenu-paths.diff 
+020_xulrunner.diff

More information about the Pkg-multimedia-commits mailing list