[SCM] VLC media player packaging branch, experimental, updated. debian/0.9.9a-1-36-g4dae45f

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Fri May 29 23:40:38 UTC 2009 

The following commit has been merged in the experimental branch:
commit 7e3f91381f06d1f98f447d4dd1787148350b9edf
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed May 13 12:05:51 2009 +0200

    Refresh patches

diff --git a/debian/patches/052_as-needed.diff b/debian/patches/052_as-needed.diff
index 729a40f..63de2ec 100644
--- a/debian/patches/052_as-needed.diff
+++ b/debian/patches/052_as-needed.diff
@@ -1,12 +1,12 @@
 Patch originally taken from the BTS #347650 and then adapted for 
 later libtool version
 
-Index: vlc-0.9.1/autotools/ltmain.sh
+Index: vlc-debian/autotools/ltmain.sh
 ===================================================================
---- vlc-0.9.1.orig/autotools/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
-+++ vlc-0.9.1/autotools/ltmain.sh	2008-09-04 00:46:24.000000000 +0200
-@@ -1807,6 +1807,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- vlc-debian.orig/autotools/ltmain.sh	2009-05-12 13:55:42.000000000 +0200
++++ vlc-debian/autotools/ltmain.sh	2009-05-12 14:36:22.000000000 +0200
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
  	;;
  
 +      -Wl,--as-needed)
@@ -15,9 +15,9 @@ Index: vlc-0.9.1/autotools/ltmain.sh
 +	;;
 +      
        -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2150,6 +2155,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
  	lib=
  	found=no
  	case $deplib in
diff --git a/debian/patches/101_certificates_paths.diff b/debian/patches/101_certificates_paths.diff
index 2f501c1..80e13f7 100644
--- a/debian/patches/101_certificates_paths.diff
+++ b/debian/patches/101_certificates_paths.diff
@@ -4,9 +4,9 @@ look for certificates
 
 Index: vlc-debian/modules/misc/gnutls.c
 ===================================================================
---- vlc-debian.orig/modules/misc/gnutls.c	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/modules/misc/gnutls.c	2008-06-01 11:38:57.000000000 +0200
-@@ -688,6 +688,10 @@
+--- vlc-debian.orig/modules/misc/gnutls.c	2009-05-12 13:55:44.000000000 +0200
++++ vlc-debian/modules/misc/gnutls.c	2009-05-12 14:36:22.000000000 +0200
+@@ -695,6 +695,10 @@
          sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
          gnutls_Addx509File (VLC_OBJECT (p_session),
                              p_sys->x509_cred, path, false);
diff --git a/debian/patches/102_dejavu_font.diff b/debian/patches/102_dejavu_font.diff
index d30d45f..f7a3593 100644
--- a/debian/patches/102_dejavu_font.diff
+++ b/debian/patches/102_dejavu_font.diff
@@ -2,9 +2,9 @@ Change the default font to one very likely to be present on a Debian box
 
 Index: vlc-debian/modules/misc/freetype.c
 ===================================================================
---- vlc-debian.orig/modules/misc/freetype.c	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/modules/misc/freetype.c	2008-06-01 11:38:57.000000000 +0200
-@@ -61,7 +61,7 @@
+--- vlc-debian.orig/modules/misc/freetype.c	2009-05-12 13:55:44.000000000 +0200
++++ vlc-debian/modules/misc/freetype.c	2009-05-12 14:36:22.000000000 +0200
+@@ -60,7 +60,7 @@
  #define DEFAULT_FONT "" /* Default font found at run-time */
  #define FC_DEFAULT_FONT "Arial"
  #else
diff --git a/debian/patches/104_notify.diff b/debian/patches/104_notify.diff
index e5c6ef8..67049c3 100644
--- a/debian/patches/104_notify.diff
+++ b/debian/patches/104_notify.diff
@@ -2,22 +2,21 @@ We don't install the icons where upstream expects them.
 so modify the code where needed.
 
 
-Index: vlc-0.9.1/modules/misc/notify/notify.c
+Index: vlc-debian/modules/misc/notify/notify.c
 ===================================================================
---- vlc-0.9.1.orig/modules/misc/notify/notify.c	2008-08-25 23:40:43.000000000 +0200
-+++ vlc-0.9.1/modules/misc/notify/notify.c	2008-09-04 00:46:24.000000000 +0200
-@@ -216,13 +216,7 @@
-         free( psz_arturl );
-     }
+--- vlc-debian.orig/modules/misc/notify/notify.c	2009-05-12 15:43:35.000000000 +0200
++++ vlc-debian/modules/misc/notify/notify.c	2009-05-12 15:50:17.000000000 +0200
+@@ -231,12 +231,7 @@
      else /* else we show state-of-the art logo */
--    {
--        const char *data_path = config_GetDataDir ();
--        char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
--
--        snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
--        pix = gdk_pixbuf_new_from_file( buf, &p_error );
--    }
+     {
+         GError *p_error = NULL;
+-        char *psz_pixbuf;
+-        if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", config_GetDataDir() ) >= 0 )
+-        {
+-            pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
+-            free( psz_pixbuf );
+-        }
 +        pix = gdk_pixbuf_new_from_file( "/usr/share/pixmaps/vlc.png", &p_error );
+     }
  
      /* we need to replace '&' with '&amp;' because '&' is a keyword of
-      * notification-daemon parser */
diff --git a/debian/patches/200_osdmenu_paths.diff b/debian/patches/200_osdmenu_paths.diff
index 4fcb6ee..343d2b7 100644
--- a/debian/patches/200_osdmenu_paths.diff
+++ b/debian/patches/200_osdmenu_paths.diff
@@ -2,28 +2,18 @@ Use the installed files for osdmenu rather than the ones in the current dir
 
 Index: vlc-debian/share/osdmenu/default.cfg
 ===================================================================
---- vlc-debian.orig/share/osdmenu/default.cfg	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/share/osdmenu/default.cfg	2008-06-01 11:38:57.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/default.cfg	2009-05-12 13:55:46.000000000 +0200
++++ vlc-debian/share/osdmenu/default.cfg	2009-05-12 15:11:37.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-debian/share/osdmenu/dvd.cfg
-===================================================================
---- vlc-debian.orig/share/osdmenu/dvd.cfg	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/share/osdmenu/dvd.cfg	2008-06-01 11:38:57.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-debian/modules/video_filter/osdmenu.c
 ===================================================================
---- vlc-debian.orig/modules/video_filter/osdmenu.c	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/modules/video_filter/osdmenu.c	2008-06-01 11:38:57.000000000 +0200
+--- vlc-debian.orig/modules/video_filter/osdmenu.c	2009-05-12 13:55:44.000000000 +0200
++++ vlc-debian/modules/video_filter/osdmenu.c	2009-05-12 15:11:37.000000000 +0200
 @@ -105,7 +105,7 @@
  #if defined( WIN32 ) || defined( UNDER_CE )
  #define OSD_DEFAULT_CFG "osdmenu/default.cfg"

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list