rpms/bolzplatz2006/F-11 bolzplatz2006-no-xrandr.patch, NONE, 1.1 bolzplatz2006-versioned-openal.patch, NONE, 1.1 bolzplatz2006-settings.sh, 1.2, 1.3 bolzplatz2006.sh, 1.2, 1.3 bolzplatz2006.spec, 1.5, 1.6

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/bolzplatz2006/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3446

Modified Files:
	bolzplatz2006-settings.sh bolzplatz2006.sh bolzplatz2006.spec 
Added Files:
	bolzplatz2006-no-xrandr.patch 
	bolzplatz2006-versioned-openal.patch 
Log Message:
* Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.0.3-10
- Fix building and running with latest vecmath1.2 package
  (hurray for coordination of changes)


bolzplatz2006-no-xrandr.patch:
 display.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE bolzplatz2006-no-xrandr.patch ---
diff -up bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/linux/display.c~ bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/linux/display.c
--- bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/linux/display.c~	2006-05-29 18:49:24.000000000 +0200
+++ bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/linux/display.c	2009-11-04 15:05:12.000000000 +0100
@@ -132,10 +132,15 @@ static bool isXF86VidModeSupported(JNIEn
 }
 	
 static extension getBestDisplayModeExtension(JNIEnv *env, Display *disp) {
+/* HDG disable use of xrandr, as it hangs on exit in XRRGetScreenInfo.
+   Note I don't think this is bolzplatz fault, but lets workaround it. */
+#if 0
 	if (isXrandrSupported(env, disp)) {
 		printfDebugJava(env, "Using Xrandr for display mode switching");
 		return XRANDR;
-	} else if (isXF86VidModeSupported(env, disp)) {
+	} else
+#endif
+	if (isXF86VidModeSupported(env, disp)) {
 		printfDebugJava(env, "Using XF86VidMode for display mode switching");
 		return XF86VIDMODE;
 	} else {

bolzplatz2006-versioned-openal.patch:
 extal.c |   22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE bolzplatz2006-versioned-openal.patch ---
diff -up bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/common/extal.c~ bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/common/extal.c
--- bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/common/extal.c~	2006-05-29 18:49:26.000000000 +0200
+++ bolzplatz2006-1.0.3/libsrc/lwjgl/src/native/common/extal.c	2009-11-04 16:02:55.000000000 +0100
@@ -117,12 +117,26 @@ static void tryLoadLibrary(JNIEnv *env, 
 		free(path_str);
 #endif
 #ifdef _X11
+		char *versioned_path_str;
 		char *path_str = GetStringNativeChars(env, path);
-		printfDebugJava(env, "Testing '%s'", path_str);
-		handleOAL = dlopen(path_str, RTLD_LAZY);
-		if (handleOAL != NULL) {
-			printfDebugJava(env, "Found OpenAL at '%s'", path_str);
+		
+		if (asprintf(&versioned_path_str, "%s.0", path_str) != -1) {
+			printfDebugJava(env, "Testing '%s'", versioned_path_str);
+			handleOAL = dlopen(versioned_path_str, RTLD_LAZY);
+			if (handleOAL != NULL) {
+				printfDebugJava(env, "Found OpenAL at '%s'", versioned_path_str);
+			}
+			free(versioned_path_str);
 		}
+
+		if (handleOAL == NULL) {
+			printfDebugJava(env, "Testing '%s'", path_str);
+			handleOAL = dlopen(path_str, RTLD_LAZY);
+			if (handleOAL != NULL) {
+				printfDebugJava(env, "Found OpenAL at '%s'", path_str);
+			}
+		}
+
 		free(path_str);
 #endif
 #ifdef _MACOSX


Index: bolzplatz2006-settings.sh
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/F-11/bolzplatz2006-settings.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bolzplatz2006-settings.sh	14 Mar 2008 15:53:04 -0000	1.2
+++ bolzplatz2006-settings.sh	4 Nov 2009 16:16:27 -0000	1.3
@@ -45,7 +45,7 @@ else
   set_options "-Djava.library.path="/usr/lib/bolzplatz2006:/usr/lib/sdljava""
 fi
 
-CLASSPATH=`build-classpath sdljava dom4j vecmath bolzplatz2006`
+CLASSPATH=`build-classpath sdljava dom4j vecmath1.2 bolzplatz2006`
 MAIN_CLASS="com.xenoage.bp2k6.tools.settings.SettingsTool"
 
 run $@ > bolzplatz2006-settings.log 2>&1


Index: bolzplatz2006.sh
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/F-11/bolzplatz2006.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bolzplatz2006.sh	14 Mar 2008 15:53:04 -0000	1.2
+++ bolzplatz2006.sh	4 Nov 2009 16:16:27 -0000	1.3
@@ -45,7 +45,7 @@ else
   set_options "-Djava.library.path="/usr/lib/bolzplatz2006:/usr/lib/sdljava""
 fi
 
-CLASSPATH=`build-classpath sdljava dom4j vecmath bolzplatz2006`
+CLASSPATH=`build-classpath sdljava dom4j vecmath1.2 bolzplatz2006`
 MAIN_CLASS="com.xenoage.bp2k6.Main"
 
 run $@ > bolzplatz2006.log 2>&1


Index: bolzplatz2006.spec
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/F-11/bolzplatz2006.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bolzplatz2006.spec	24 Feb 2009 05:26:58 -0000	1.5
+++ bolzplatz2006.spec	4 Nov 2009 16:16:27 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           bolzplatz2006
 Version:        1.0.3
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Slam Soccer 2006 is a funny football game in 3D-comic-style
 Summary(fr):    Coup de Foot 2006 est un jeu comique en 3D
 Summary(de):    Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
@@ -31,6 +31,8 @@ Patch3:         %{name}-irrlicht-png-64b
 Patch4:         %{name}-lwjgl-nofmod.patch
 Patch5:         %{name}-lwjgl-openal11.patch
 Patch6:         %{name}-lwjgl-Makefile.patch
+Patch7:         %{name}-no-xrandr.patch
+Patch8:         %{name}-versioned-openal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant-nodeps sdljava dom4j vecmath1.2 swig xml-commons-apis
 BuildRequires:  libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
@@ -40,6 +42,8 @@ BuildRequires:  libXt-devel libXrender-d
 BuildRequires:  java-1.6.0-openjdk-devel
 Requires:       sdljava dom4j vecmath1.2 java-1.6.0-openjdk jpackage-utils
 Requires:       hicolor-icon-theme autodownloader
+# These are dynamically opened by lwjgl:
+Requires:       openal libGL
 
 %description
 Slam Soccer 2006 is a funny football game in
@@ -119,6 +123,8 @@ popd
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 sed -i 's/\r//' license.txt
 # we use the system versions of these
 rm -r libsrc/irrlicht-0.14-patched/libpng libsrc/irrlicht-0.14-patched/zlib \
@@ -166,7 +172,7 @@ popd
 # build bolzplatz itself
 mkdir classes
 javac -d classes -encoding iso-8859-1 \
-  -cp `build-classpath dom4j sdljava vecmath`:./libsrc/jirr-dev/lib/irrlicht.jar:./libsrc/lwjgl/libs/lwjgl.jar \
+  -cp `build-classpath dom4j sdljava vecmath1.2`:./libsrc/jirr-dev/lib/irrlicht.jar:./libsrc/lwjgl/libs/lwjgl.jar \
   `find ./src -name '*.java'`
 jar cf %{name}.jar -C classes .
 
@@ -237,6 +243,19 @@ fi
 
 
 %changelog
+* Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.0.3-10
+- Fix building and running with latest vecmath1.2 package
+  (hurray for coordination of changes)
+
+* Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.0.3-9
+- Fix hang on exit (by using XF86Vidmode instead of Xrandr)
+- Do not crash when openal-devel is not installed
+  (dlopen versioned lib instead of .so devel symlink)
+- Require openal, as it is dlopened
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild