[patch] Patch to make Xinerama support optional with --disable-xinerama

mythtv-0.18-xinerama.patch (text/plain), 5.20 KB, created by Nathan Lutchansky on 2005-04-23 23:16:06 UTC

diff -ur configure configure
--- configure	2005-04-13 16:35:55.000000000 -0400
+++ configure	2005-04-23 20:23:11.000000000 -0400
@@ -45,6 +45,7 @@
 firewire_cable_box="yes"
 x11="yes"
 xrandr="yes"
+xinerama="yes"
 xv="yes"
 xvmc="no"
 xvmc_vld="no"
@@ -149,6 +150,7 @@
 echo "  --enable-dvb-eit         enable DVB EIT support (--enable-dvb is required)"
 echo "  --disable-x11            disable X11 support"
 echo "  --disable-xrandr         disable X11 resolution switching"
+echo "  --disable-xinerama       disable Xinerama support"
 echo "  --disable-xv             disable XVideo   (X11 video output accel.)"
 echo "  --enable-xvmc            enable XvMC      (Linux/BSD MPEG accel.)"
 echo "  --disable-xvmc-vld       disable XvMC-VLD (VIA Epia MPEG accel.)"
@@ -648,6 +650,10 @@
   ;;
   --disable-xrandr) xrandr="no"
   ;;
+  --enable-xinerama) xinerama="yes"
+  ;;
+  --disable-xinerama) xinerama="no"
+  ;;
   --enable-xv) xv="yes"
   ;;
   --disable-xv) xv="no"
@@ -1651,6 +1657,7 @@
 fi
 if test x"$x11" = x"no" ; then
     xrandr="no"
+    xinerama="no"
     xv="no"
     xvmc="no"
     xvmc_vld="no"
@@ -1663,6 +1670,13 @@
     fi
 fi
 
+if test x"$xinerama" = x"yes" ; then
+    xinerama="no"
+    if test -f /usr/X11R6/include/X11/extensions/Xinerama.h ; then
+        xinerama="yes"
+    fi
+fi
+
 if test x"$xv" = x"yes" ; then
     xv="no"
     if test x`ls /usr/X11R6/lib/libXv.* 2> /dev/null | head -n 1` != x"" ; then
@@ -1794,6 +1808,7 @@
 echo "# Video Output Support"
 echo "x11 support      $x11"
 echo "xrandr support   $xrandr"
+echo "xinerama support $xinerama"
 echo "xv support       $xv"
 echo "XvMC support     $xvmc"
 echo "XvMC VLD support $xvmc_vld"
@@ -2305,6 +2320,11 @@
   CONFIG_DEFINES="$CONFIG_DEFINES USING_XRANDR"
 fi
 
+if test x"$xinerama" = x"yes" ; then
+  CCONFIG="$CCONFIG using_xinerama"
+  CONFIG_DEFINES="$CONFIG_DEFINES USING_XINERAMA"
+fi
+
 if test x"$xvmc" = x"yes" ; then
   CCONFIG="$CCONFIG using_xvmc"
   CONFIG_DEFINES="$CONFIG_DEFINES USING_XVMC"
diff -ur libs/libmyth/util-x11.cpp libs/libmyth/util-x11.cpp
--- libs/libmyth/util-x11.cpp	2005-04-07 16:59:23.000000000 -0400
+++ libs/libmyth/util-x11.cpp	2005-04-23 20:27:55.000000000 -0400
@@ -9,7 +9,9 @@
 #define USING_XV
 #include "util-x11.h"
 extern "C" {
+#ifdef USING_XINERAMA
 #include <X11/extensions/Xinerama.h>
+#endif
 }
 typedef int (*XErrorCallbackType)(Display *, XErrorEvent *);
 typedef vector<XErrorEvent>       XErrorVectorType;
@@ -24,14 +26,14 @@
 {
     int nr_xinerama_screens = 0;
 
-#ifdef Q_WS_X11
+#ifdef USING_XINERAMA
     Display *d = XOpenDisplay(NULL);
     int event_base = 0, error_base = 0;
     if (XineramaQueryExtension(d, &event_base, &error_base) &&
         XineramaIsActive(d))
         XFree(XineramaQueryScreens(d, &nr_xinerama_screens));
     XCloseDisplay(d);
-#endif // Q_WS_X11
+#endif
 
     return nr_xinerama_screens;
 }
diff -ur libs/libmythtv/videoout_xv.cpp libs/libmythtv/videoout_xv.cpp
--- libs/libmythtv/videoout_xv.cpp	2005-04-10 01:10:51.000000000 -0400
+++ libs/libmythtv/videoout_xv.cpp	2005-04-23 20:25:45.000000000 -0400
@@ -39,7 +39,9 @@
 #include "yuv2rgb.h"
 
 extern "C" {
+#ifdef USING_XINERAMA
 #include <X11/extensions/Xinerama.h>
+#endif
 
     extern int      XShmQueryExtension(Display*);
     extern int      XShmGetEventBase(Display*);
@@ -309,9 +311,13 @@
             h_mm = DisplayHeightMM(data->XJ_disp, XJ_screen_num);
     }
 
+#ifdef USING_XINERAMA
     usingXinerama = 
         (XineramaQueryExtension(data->XJ_disp, &event_base, &error_base) &&
          XineramaIsActive(data->XJ_disp));
+#else
+    usingXinerama = 0;
+#endif
     if (w_mm == 0 || h_mm == 0 || usingXinerama)
     {
         w_mm = (int)(300 * XJ_aspect);
diff -ur libs/libmythtv/videoout_xvmc.cpp libs/libmythtv/videoout_xvmc.cpp
--- libs/libmythtv/videoout_xvmc.cpp	2005-04-10 12:47:43.000000000 -0400
+++ libs/libmythtv/videoout_xvmc.cpp	2005-04-23 20:26:20.000000000 -0400
@@ -65,7 +65,9 @@
  **********************************************************/
 
 extern "C" {
+#ifdef USING_XINERAMA
 #include <X11/extensions/Xinerama.h>
+#endif
 
     extern int      XShmQueryExtension(Display*);
     extern int      XShmGetEventBase(Display*);
@@ -321,9 +323,13 @@
             h_mm = DisplayHeightMM(data->XJ_disp, XJ_screen_num);
     }
 
+#ifdef USING_XINERAMA
     usingXinerama = 
         (XineramaQueryExtension(data->XJ_disp, &event_base, &error_base) &&
          XineramaIsActive(data->XJ_disp));
+#else
+    usingXinerama = 0;
+#endif
     if (w_mm == 0 || h_mm == 0 || usingXinerama)
     {
         w_mm = (int)(300 * XJ_aspect);
diff -ur libs/libmythui/util.cpp libs/libmythui/util.cpp
--- libs/libmythui/util.cpp	2004-08-24 01:03:50.000000000 -0400
+++ libs/libmythui/util.cpp	2005-04-23 20:24:30.000000000 -0400
@@ -11,7 +11,9 @@
 #if defined(Q_WS_X11)
 extern "C" {
 #include <X11/Xlib.h>
+#ifdef USING_XINERAMA
 #include <X11/extensions/Xinerama.h>
+#endif
 }
 #endif
 
@@ -547,6 +549,7 @@
 {
     int event_base, error_base;
 
+#ifdef USING_XINERAMA
     if (XineramaQueryExtension(dpy, &event_base, &error_base) &&
         XineramaIsActive(dpy)) 
     {
@@ -582,6 +585,7 @@
         XFree(xinerama_screens);
     } 
     else 
+#endif
     {
         *w = DisplayWidth(dpy, screen_num);
         *h = DisplayHeight(dpy, screen_num);