[SM-Commit] PERFORCE change 77745 by Eric Sandall for review

Perforce Review Daemon p4review at smee.org
Thu Apr 13 12:55:01 EDT 2006


Change 77745 by eric_sandall at sandalle-moby on 2006/04/13 17:54:23

	   * CONFIGURE: Changed WINE_OPENGL from config_query to config_query_option
	   * DEPENDS: Depends on fontforge to build fonts
	   * BUILD: Pass WINE_OPENGL to OPTS

Affected files ...

... //sgl/grimoires/test/x11-libs/wine/BUILD#5 integrate
... //sgl/grimoires/test/x11-libs/wine/CONFIGURE#2 integrate
... //sgl/grimoires/test/x11-libs/wine/DEPENDS#4 integrate
... //sgl/grimoires/test/x11-libs/wine/HISTORY#27 integrate

Differences ...

==== //sgl/grimoires/test/x11-libs/wine/BUILD#5 (xtext) ====

@@ -1,6 +1,10 @@
 # fix wine build problem
 LDFLAGS=${LDFLAGS//-z combreloc/}               &&
-OPTS="--disable-debug --disable-trace ${OPTS}"  &&
+OPTS="$WINE_OPENGL     \
+      --disable-debug  \
+      --disable-trace  \
+      $OPTS"           &&
+
 # touch non-existant file
 touch programs/winetest/tests.rc                &&
 default_build                                   &&

==== //sgl/grimoires/test/x11-libs/wine/CONFIGURE#2 (xtext) ====

@@ -1,1 +1,2 @@
-config_query  WINE_OPENGL  "Enable OpenGL support?"  y
+config_query_option  WINE_OPENGL  "Enable OpenGL support?"  y  \
+                     '--with-opengl'  '--without-opengl'

==== //sgl/grimoires/test/x11-libs/wine/DEPENDS#4 (xtext) ====

@@ -1,5 +1,6 @@
-depends  flex   &&
-depends  bison  &&
+depends  bison      &&
+depends  flex       &&
+depends  fontforge  &&
 
 if  [  "$WINE_CVS"  ==  "y"  ];  then
   depends  CVS

==== //sgl/grimoires/test/x11-libs/wine/HISTORY#27 (text) ====

@@ -1,3 +1,8 @@
+2006-04-09 Eric Sandall <eric at sandall.us>
+	* CONFIGURE: Changed WINE_OPENGL from config_query to config_query_option
+	* DEPENDS: Depends on fontforge to build fonts
+	* BUILD: Pass WINE_OPENGL to OPTS
+
 2006-03-31 Eric Sandall <eric at sandall.us>
 	* DETAILS: Updated to 0.9.11
 



More information about the SM-Commit mailing list