rpms/Glide3-libGL/FC-4 Mesa-6.2.1-config.patch,1.1,1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sat Feb 18 12:04:21 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646

Modified Files:
	Mesa-6.2.1-config.patch 
Log Message:
Add -L/usr/X11R6/lib for non modular X

Mesa-6.2.1-config.patch:

Index: Mesa-6.2.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/FC-4/Mesa-6.2.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mesa-6.2.1-config.patch	16 Jan 2006 21:22:30 -0000	1.1
+++ Mesa-6.2.1-config.patch	18 Feb 2006 12:04:21 -0000	1.2
@@ -17,12 +17,10 @@
  
  # Library/program dependencies
 -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
--GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
--GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3 -lm -lpthread
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
-+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
-+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
 +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
 --- Mesa-6.2.1/configs/default.config	2006-01-15 09:32:20.000000000 +0100
 +++ Mesa-6.2.1/configs/default	2006-01-15 09:32:53.000000000 +0100
@@ -52,10 +50,8 @@
  
  # Library/program dependencies
 -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
--GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
--GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3 -lm -lpthread
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
-+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
-+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
 +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm




More information about the fedora-extras-commits mailing list