[SCM] VLC media player packaging branch, sid, updated. debian/1.0.0.rc2-1-23-g61c84b5

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Thu Jul 9 13:13:48 UTC 2009 

The following commit has been merged in the sid branch:
commit 71d02b0452237444b6423e4b2e831081025222a9
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Jul 9 00:29:21 2009 +0200

    Refresh patches

diff --git a/debian/patches/052_as-needed.diff b/debian/patches/052_as-needed.diff
index 63de2ec..c76aef5 100644
--- a/debian/patches/052_as-needed.diff
+++ b/debian/patches/052_as-needed.diff
@@ -3,10 +3,10 @@ later libtool version
 
 Index: vlc-debian/autotools/ltmain.sh
 ===================================================================
---- 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
+--- vlc-debian.orig/autotools/ltmain.sh	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/autotools/ltmain.sh	2009-07-09 00:23:16.000000000 +0200
+@@ -1807,6 +1807,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
  
 +      -Wl,--as-needed)
@@ -15,9 +15,9 @@ Index: vlc-debian/autotools/ltmain.sh
 +	;;
 +      
        -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2150,6 +2155,15 @@
  	lib=
  	found=no
  	case $deplib in
diff --git a/debian/patches/101_certificates_paths.diff b/debian/patches/101_certificates_paths.diff
index 80e13f7..32c2322 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	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 @@
+--- vlc-debian.orig/modules/misc/gnutls.c	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/modules/misc/gnutls.c	2009-07-09 00:23:16.000000000 +0200
+@@ -698,6 +698,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 f7a3593..75effa9 100644
--- a/debian/patches/102_dejavu_font.diff
+++ b/debian/patches/102_dejavu_font.diff
@@ -2,8 +2,8 @@ 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	2009-05-12 13:55:44.000000000 +0200
-+++ vlc-debian/modules/misc/freetype.c	2009-05-12 14:36:22.000000000 +0200
+--- vlc-debian.orig/modules/misc/freetype.c	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/modules/misc/freetype.c	2009-07-09 00:23:16.000000000 +0200
 @@ -60,7 +60,7 @@
  #define DEFAULT_FONT "" /* Default font found at run-time */
  #define FC_DEFAULT_FONT "Arial"
diff --git a/debian/patches/104_notify.diff b/debian/patches/104_notify.diff
index 67049c3..11e40a5 100644
--- a/debian/patches/104_notify.diff
+++ b/debian/patches/104_notify.diff
@@ -4,8 +4,8 @@ so modify the code where needed.
 
 Index: vlc-debian/modules/misc/notify/notify.c
 ===================================================================
---- 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
+--- vlc-debian.orig/modules/misc/notify/notify.c	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/modules/misc/notify/notify.c	2009-07-09 00:23:16.000000000 +0200
 @@ -231,12 +231,7 @@
      else /* else we show state-of-the art logo */
      {
@@ -19,4 +19,4 @@ Index: vlc-debian/modules/misc/notify/notify.c
 +        pix = gdk_pixbuf_new_from_file( "/usr/share/pixmaps/vlc.png", &p_error );
      }
  
-     /* we need to replace '&' with '&amp;' because '&' is a keyword of
+     free( psz_arturl );
diff --git a/debian/patches/200_osdmenu_paths.diff b/debian/patches/200_osdmenu_paths.diff
index 343d2b7..fd13640 100644
--- a/debian/patches/200_osdmenu_paths.diff
+++ b/debian/patches/200_osdmenu_paths.diff
@@ -2,8 +2,8 @@ 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	2009-05-12 13:55:46.000000000 +0200
-+++ vlc-debian/share/osdmenu/default.cfg	2009-05-12 15:11:37.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/default.cfg	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/share/osdmenu/default.cfg	2009-07-09 00:23:16.000000000 +0200
 @@ -1,4 +1,4 @@
 -dir share/osdmenu/default
 +dir /usr/share/vlc/osdmenu/default
@@ -12,8 +12,8 @@ Index: vlc-debian/share/osdmenu/default.cfg
  	select   selection/play_pause.png
 Index: vlc-debian/modules/video_filter/osdmenu.c
 ===================================================================
---- 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
+--- vlc-debian.orig/modules/video_filter/osdmenu.c	2009-07-09 00:21:18.000000000 +0200
++++ vlc-debian/modules/video_filter/osdmenu.c	2009-07-09 00:23:16.000000000 +0200
 @@ -105,7 +105,7 @@
  #if defined( WIN32 ) || defined( UNDER_CE )
  #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
diff --git a/debian/patches/300_manpage_syntax.diff b/debian/patches/300_manpage_syntax.diff
index 6176207..36bf955 100644
--- a/debian/patches/300_manpage_syntax.diff
+++ b/debian/patches/300_manpage_syntax.diff
@@ -2,8 +2,8 @@ Add a note about the videolan-doc package (even if it's not really up-to-date)
 
 Index: vlc-debian/doc/vlc.1
 ===================================================================
---- vlc-debian.orig/doc/vlc.1	2008-01-20 00:13:51.000000000 +0000
-+++ vlc-debian/doc/vlc.1	2008-01-20 00:16:31.000000000 +0000
+--- vlc-debian.orig/doc/vlc.1	2009-07-09 00:20:12.000000000 +0200
++++ vlc-debian/doc/vlc.1	2009-07-09 00:23:16.000000000 +0200
 @@ -70,6 +70,11 @@
  (close VLC).
  
diff --git a/debian/patches/401_i420_mmx_pic.diff b/debian/patches/401_i420_mmx_pic.diff
index 9dc34e7..a5085bc 100644
--- a/debian/patches/401_i420_mmx_pic.diff
+++ b/debian/patches/401_i420_mmx_pic.diff
@@ -3,10 +3,10 @@ Patch from upstream trac ticket #1383. Thanks to Gentoo and Alexis Ballier
 
 
 
-Index: vlc/modules/video_chroma/i420_rgb_mmx.h
+Index: vlc-debian/modules/video_chroma/i420_rgb_mmx.h
 ===================================================================
---- vlc/modules/video_chroma/i420_rgb_mmx.h	(revision 23401)
-+++ vlc/modules/video_chroma/i420_rgb_mmx.h	(working copy)
+--- vlc-debian.orig/modules/video_chroma/i420_rgb_mmx.h	2009-07-09 00:20:12.000000000 +0200
++++ vlc-debian/modules/video_chroma/i420_rgb_mmx.h	2009-07-09 00:23:16.000000000 +0200
 @@ -34,18 +34,18 @@
  #define USED_U64(foo) \
      static const uint64_t foo __asm__ (#foo) __attribute__((unused))
@@ -15,15 +15,16 @@ Index: vlc/modules/video_chroma/i420_rgb_mmx.h
 -USED_U64(mmx_10w)     = 0x1010101010101010ULL;
 -USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL;
 -USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL;
-+USED_U64(mmx_80w)     = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
-+USED_U64(mmx_10w)     = 0x1010101010101010ULL; /* -- as %5 */
-+USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL; /* -- as %6 */
-+USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
- 
+-
 -USED_U64(mmx_U_green) = 0xf37df37df37df37dULL;
 -USED_U64(mmx_U_blue)  = 0x4093409340934093ULL;
 -USED_U64(mmx_V_red)   = 0x3312331233123312ULL;
 -USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL;
++USED_U64(mmx_80w)     = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
++USED_U64(mmx_10w)     = 0x1010101010101010ULL; /* -- as %5 */
++USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL; /* -- as %6 */
++USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
++
 +USED_U64(mmx_U_green) = 0xf37df37df37df37dULL; /* -- as %8 */
 +USED_U64(mmx_U_blue)  = 0x4093409340934093ULL; /* -- as %9 */
 +USED_U64(mmx_V_red)   = 0x3312331233123312ULL; /* -- as %10 */

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list