OpenGL does not depend on XRender anymore

5 files changed, 29 insertions, 28 deletions

diff --git a/config.c b/config.c
index 90a12684..e430f5aa 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.109 2012-01-19 08:18:26 phintuka Exp $
+ * $Id: config.c,v 1.110 2012-01-30 10:41:56 phintuka Exp $
  *
  */
 
@@ -795,12 +795,13 @@ bool config_t::ProcessArgs(int argc, char *argv[])
 #endif
               }
 #ifndef HAVE_XRENDER
-              LOGMSG("HUD OSD not supported\n");
+              else
+                LOGMSG("HUD OSD not supported\n");
 #endif
               break;
     case 'O': ProcessArg("OpenglAlways", "1");
 #ifndef HAVE_OPENGL
-              LOGMSG("OpenGL HUD OSD not supported\n");
+              LOGMSG("OpenGL not supported\n");
 #endif
               break;
     case 'w': //ProcessArg("Fullscreen", "0");
diff --git a/configure b/configure
index 50b81944..140e5e7d 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@
 # See the main source file 'xineliboutput.c' for copyright information and
 # how to reach the author.
 #
-# * $Id: configure,v 1.38 2011-06-11 08:38:43 phintuka Exp $
+# * $Id: configure,v 1.39 2012-01-30 10:41:56 phintuka Exp $
 #
 
 PKG_CONFIG="pkg-config"
@@ -334,8 +334,7 @@ check_deps(){
   disabled vdr     && disable libextractor libcap libbluray
   disabled dlfcn   && disable opengl
   disabled pthread && disable opengl
-  disabled xrender && disable opengl
-  disabled xshape  && disable opengl
+  disabled xrender && disable xshape xshm
 }
 
 check_deps
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index ed0665a0..875e51ed 100644
--- a/xine_frontend_main.c
+++ b/xine_frontend_main.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend_main.c,v 1.100 2012-01-27 11:28:13 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.101 2012-01-30 10:41:56 phintuka Exp $
  *
  */
 
@@ -109,25 +109,27 @@ static const char help_str[] =
     "                                 --aspect=auto:path_to_script\n"
 #ifndef IS_FBFE
     "   -f, --fullscreen              Fullscreen mode\n"
-# ifdef HAVE_XRENDER
-    "   -D, --hud[=flag[,flag]]       Head Up Display OSD mode using compositing\n"
+# if defined(HAVE_XRENDER) || defined(HAVE_OPENGL)
+    "   -D, --hud[=flag[,flag]]       Head Up Display OSD\n"
     "                                 Optional flags:\n"
-#  ifdef HAVE_XCOMPOSITE
+# endif
+# ifdef HAVE_XRENDER
+#   ifdef HAVE_XCOMPOSITE
     "                                 xrender Use XRender instead of compositing\n"
     "                                         (no compositing manager required)\n"
-#  endif
-#  ifdef HAVE_XSHAPE
+#   endif
+#   ifdef HAVE_XSHAPE
     "                                 xshape  Use XShape instead of compositing\n"
     "                                         (no compositing manager required)\n"
-#  endif
-#  ifdef HAVE_OPENGL
+#   endif
+# endif // HAVE_XRENDER
+# ifdef HAVE_OPENGL
     "                                 opengl  Use OpenGL instead of compositing\n"
     "                                         (no compositing manager required)\n"
-#  endif
-#  ifdef HAVE_OPENGL
+# endif
+# ifdef HAVE_OPENGL
     "   -O, --opengl                  Use OpenGL for video and Head Up Display OSD\n"
-#  endif
-# endif // HAVE_XRENDER
+# endif
     "   -w, --width=x                 Video window width\n"
     "   -h, --height=x                Video window height\n"
     "   -g, --geometry=WxH[+X+Y]      Set output window geometry (X style)\n"
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index 3b749ff6..3f5dc36e 100644
--- a/xine_sxfe_frontend.c
+++ b/xine_sxfe_frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_sxfe_frontend.c,v 1.193 2012-01-30 10:25:33 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.194 2012-01-30 10:41:56 phintuka Exp $
  *
  */
 
@@ -173,8 +173,6 @@ typedef struct sxfe_s {
   uint16_t      osd_height;
 #endif
 
-  /* HUD stuff */
-#ifdef HAVE_XRENDER
   /* OpenGL */
 #ifdef HAVE_OPENGL
   GLXDrawable     opengl_window;
@@ -198,6 +196,9 @@ typedef struct sxfe_s {
   uint8_t         opengl_osd_texture_img_updated : 1;
   uint8_t         opengl_deinit : 1;
 #endif /* HAVE_OPENGL */
+
+  /* HUD */
+#ifdef HAVE_XRENDER
   uint8_t         hud;
   XImage         *hud_img;
   Visual         *hud_vis;
diff --git a/xineliboutput.c b/xineliboutput.c
index a9a056e2..2b8ce4d6 100644
--- a/xineliboutput.c
+++ b/xineliboutput.c
@@ -21,7 +21,7 @@
  *
  * xineliboutput.c: VDR Plugin interface
  *
- * $Id: xineliboutput.c,v 1.46 2011-04-11 08:28:32 phintuka Exp $
+ * $Id: xineliboutput.c,v 1.47 2012-01-30 10:41:56 phintuka Exp $
  *
  */
 
@@ -124,18 +124,16 @@ const char cmdLineHelp[] =
 "                           (example: )\n" 
 #endif
 "  -f        --fullscreen   Fullscreen mode (X11)\n"
-#ifdef HAVE_XRENDER
+#if defined(HAVE_XRENDER) || defined(HAVE_OPENGL)
 "  -D        --hud[=flag[,flag]]\n"
 "                           Head Up Display OSD (X11)\n"
 "                           flags:\n"
-#  ifdef HAVE_XSHAPE
+#endif
+#if defined(HAVE_XRENDER) && defined(HAVE_XSHAPE)
 "                           xshape  Use XShape instead of compositing\n"
-#  endif
-#  ifdef HAVE_OPENGL
-"                           opengl  Use OpenGL instead of compositing\n"
-#  endif
 #endif
 #ifdef HAVE_OPENGL
+"                           opengl  Use OpenGL instead of compositing\n"
 "   -O       --opengl       Use OpenGL for video and Head Up Display OSD\n"
 #endif
 "  -w        --width=x      Window width\n"