r230 - in unstable/vlc/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-17 18:52:05 +0000 (Sat, 17 Mar 2007)
New Revision: 230

Added:
   unstable/vlc/debian/patches/106_xshm_check.diff
Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/patches/series
Log:
  * debian/patches/106_xshm_check.diff:
    + New patch. Don't crash if XShmAttach fails, instead fall back to
      normal X images (Closes: #404361).


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2007-03-17 13:49:57 UTC (rev 229)
+++ unstable/vlc/debian/changelog	2007-03-17 18:52:05 UTC (rev 230)
@@ -12,8 +12,12 @@
     + Distribute libvlc.a again.
     + Switch to AM_MAINTAINER_MODE instead of touching all files.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 16 Mar 2007 23:58:03 +0100
+  * debian/patches/106_xshm_check.diff:
+    + New patch. Don't crash if XShmAttach fails, instead fall back to
+      normal X images (Closes: #404361).
 
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 17 Mar 2007 19:46:52 +0100
+
 vlc (0.8.6.a.debian-4) unstable; urgency=low
 
   * *sigh*, libfaad-dev build-depend was in fact missing.

Added: unstable/vlc/debian/patches/106_xshm_check.diff
===================================================================
--- unstable/vlc/debian/patches/106_xshm_check.diff	2007-03-17 13:49:57 UTC (rev 229)
+++ unstable/vlc/debian/patches/106_xshm_check.diff	2007-03-17 18:52:05 UTC (rev 230)
@@ -0,0 +1,37 @@
+Index: vlc-0.8.6.a.debian/modules/video_output/x11/xcommon.c
+===================================================================
+--- vlc-0.8.6.a.debian.orig/modules/video_output/x11/xcommon.c	2007-03-17 07:09:50.000000000 -0500
++++ vlc-0.8.6.a.debian/modules/video_output/x11/xcommon.c	2007-03-17 07:44:22.000000000 -0500
+@@ -2323,20 +2323,21 @@
+  *****************************************************************************/
+ static int X11ErrorHandler( Display * display, XErrorEvent * event )
+ {
+-    /* Ingnore errors on XSetInputFocus()
+-     * (they happen when a window is not yet mapped) */
+-    if( event->request_code == X_SetInputFocus )
++    switch( event->request_code )
+     {
+-        fprintf(stderr, "XSetInputFocus failed\n");
++    case X_SetInputFocus:
++        /* Ingnore errors on XSetInputFocus()
++         * (they happen when a window is not yet mapped) */
+         return 0;
+-    }
+ 
+-    if( event->request_code == 150 /* MIT-SHM */ &&
+-        event->minor_code == X_ShmAttach )
+-    {
+-        fprintf(stderr, "XShmAttach failed\n");
+-        b_shm = VLC_FALSE;
+-        return 0;
++    case 150: /* MIT-SHM */
++    case 146: /* MIT-SHM too, what gives? */
++        if( event->minor_code == X_ShmAttach )
++        {
++            b_shm = VLC_FALSE;
++            return 0;
++        }
++        break;
+     }
+ 
+     XSetErrorHandler(NULL);

Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series	2007-03-17 13:49:57 UTC (rev 229)
+++ unstable/vlc/debian/patches/series	2007-03-17 18:52:05 UTC (rev 230)
@@ -6,4 +6,5 @@
 103_kfreebsd.diff
 104_notify.diff
 105_audio_format_crash.diff
+106_xshm_check.diff
 200_osdmenu_paths.diff