From 6f8315d8f65066fda4ca9498f5d7beec46729d11 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 23 Jan 2002 23:27:10 +0000
Subject: Change/fix opengl checks, add a glut fallback (GLU).

CVS patchset: 1445
CVS date: 2002/01/23 23:27:10
---
 src/video_out/Makefile.am        |  2 +-
 src/video_out/video_out_opengl.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index b8ae2c2f3..7b45d752c 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -49,7 +49,7 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	alphablend.c video_out_opengl.c
-xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(X_LIBS)
+xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS)
 xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 74bc39775..8a2993de9 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_opengl.c,v 1.3 2002/01/23 15:05:46 richwareham Exp $
+ * $Id: video_out_opengl.c,v 1.4 2002/01/23 23:27:10 f1rmb Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -71,7 +71,13 @@
 
 #include <GL/gl.h>
 #include <GL/glx.h>
+#ifdef HAVE_GLUT
 #include <GL/glut.h>
+#else
+#ifdef HAVE_GLU
+#include <GL/glu.h>
+#endif
+#endif
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -664,6 +670,7 @@ static void opengl_render_image (opengl_driver_t *this, opengl_frame_t *frame,
 		    (GLfloat)(this->window_width)/
 		    (GLfloat)(this->window_height),
 		    1.0f, 1000.0f);
+
     glMatrixMode (GL_MODELVIEW);
     glLoadIdentity ();	
 	
@@ -937,7 +944,7 @@ static int opengl_gui_data_exchange (vo_driver_t *this_gen,
 
   switch (data_type) {
   case GUI_SELECT_VISUAL:
-/*fprintf (stderr, "*** gui_select_visual ***\n"); */
+fprintf (stderr, "*** gui_select_visual ***\n");
     XLockDisplay (this->display);
     this->vinfo = glXChooseVisual (this->display, this->screen, glxAttrib);
     XUnlockDisplay (this->display);
-- 
cgit v1.2.3