[19427] trunk/dports/graphics/libguichan

[source_changes at macosforge.org]

Revision: 19427
Author:   markd at macports.org
Date:     2006-09-06 21:25:59 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
Ticket 9691.  Patches to fix support for OpenGL and SDL_image.

Modified Paths:
--------------
    trunk/dports/graphics/libguichan/Portfile

Added Paths:
-----------
    trunk/dports/graphics/libguichan/files/patch-listmodel.hpp
    trunk/dports/graphics/libguichan/files/patch-openglgraphics.cpp
    trunk/dports/graphics/libguichan/files/patch-openglimageloader.cpp
    trunk/dports/graphics/libguichan/files/patch-sdlmakefile

Modified: trunk/dports/graphics/libguichan/Portfile
===================================================================
--- trunk/dports/graphics/libguichan/Portfile	2006-09-07 04:04:28 UTC (rev 19426)
+++ trunk/dports/graphics/libguichan/Portfile	2006-09-07 04:25:59 UTC (rev 19427)
@@ -4,8 +4,8 @@
 
 name			libguichan
 version			0.4.0
-revision		2
-categories		graphics
+revision		3
+categories		graphics devel
 platforms		darwin
 maintainers		josh_root at users.sourceforge.net
 description		portable C++ GUI library designed for games using SDL
@@ -16,16 +16,21 @@
 master_sites	sourceforge:guichan
 distname		guichan-${version}
 extract.suffix	-src.tar.gz
-checksums		md5 f68b6c603c4fb3d70a8737f916214a35
-patchfiles		patch-configure
+checksums		md5 f68b6c603c4fb3d70a8737f916214a35 \
+			sha1 9c505b1c903426c9993cff9f122bcfc948e4f1b0
 
+patchfiles		patch-configure \
+			patch-listmodel.hpp \
+			patch-openglgraphics.cpp \
+			patch-openglimageloader.cpp \
+			patch-sdlmakefile
+
 depends_lib		port:libsdl port:libsdl_image
 
-configure.args	--enable-sdl --enable-sdl-image
+configure.args	--enable-sdl --enable-sdl-image --enable-force-opengl
 configure.env	CFLAGS=-I${prefix}/include CXXFLAGS=-I${prefix}/include \
 				CPPFLAGS=-I${prefix}/include LDFLAGS=-L${prefix}/lib
 
 platform darwin 8 {
 	configure.env-append CC=/usr/bin/gcc-4.0 CXX=/usr/bin/g++-4.0 CPP=/usr/bin/cpp-4.0
 }
-

Added: trunk/dports/graphics/libguichan/files/patch-listmodel.hpp
===================================================================
--- trunk/dports/graphics/libguichan/files/patch-listmodel.hpp	                        (rev 0)
+++ trunk/dports/graphics/libguichan/files/patch-listmodel.hpp	2006-09-07 04:25:59 UTC (rev 19427)
@@ -0,0 +1,11 @@
+--- include/guichan/listmodel.hpp	2005-05-17 22:23:06.000000000 +0300
++++ include/guichan/listmodel.hpp	2006-06-30 10:56:11.000000000 +0300
+@@ -85,6 +85,8 @@
+          * @return an element as a string.
+          */
+         virtual std::string getElementAt(int i) = 0;
++
++	virtual ~ListModel() {};
+     };
+ }
+ 

Added: trunk/dports/graphics/libguichan/files/patch-openglgraphics.cpp
===================================================================
--- trunk/dports/graphics/libguichan/files/patch-openglgraphics.cpp	                        (rev 0)
+++ trunk/dports/graphics/libguichan/files/patch-openglgraphics.cpp	2006-09-07 04:25:59 UTC (rev 19427)
@@ -0,0 +1,11 @@
+--- src/opengl/openglgraphics.cpp       2006-06-30 14:42:58.000000000 +0300
++++ src/opengl/openglgraphics.cpp       2006-06-30 11:15:35.000000000 +0300
+@@ -64,6 +64,8 @@
+ #ifdef __amigaos4__
+ #include <mgl/gl.h>
+ #define glVertex3i glVertex3f
++#elif (defined __APPLE__ && defined __MACH__)
++#include <OpenGL/gl.h>
+ #else
+ #include <GL/gl.h>
+ #endif

Added: trunk/dports/graphics/libguichan/files/patch-openglimageloader.cpp
===================================================================
--- trunk/dports/graphics/libguichan/files/patch-openglimageloader.cpp	                        (rev 0)
+++ trunk/dports/graphics/libguichan/files/patch-openglimageloader.cpp	2006-09-07 04:25:59 UTC (rev 19427)
@@ -0,0 +1,11 @@
+--- src/opengl/openglimageloader.cpp	2006-06-30 14:46:14.000000000 +0300
++++ src/opengl/openglimageloader.cpp	2006-06-30 11:18:58.000000000 +0300
+@@ -63,6 +63,8 @@
+ 
+ #ifdef __amigaos4__
+ #include <mgl/gl.h>
++#elif (defined __APPLE__ && defined __MACH__)
++#include <OpenGL/gl.h>
+ #else
+ #include <GL/gl.h>
+ #endif

Added: trunk/dports/graphics/libguichan/files/patch-sdlmakefile
===================================================================
--- trunk/dports/graphics/libguichan/files/patch-sdlmakefile	                        (rev 0)
+++ trunk/dports/graphics/libguichan/files/patch-sdlmakefile	2006-09-07 04:25:59 UTC (rev 19427)
@@ -0,0 +1,11 @@
+--- src/sdl/Makefile.in	2005-05-17 22:23:17.000000000 +0300
++++ src/sdl/Makefile.in	2006-06-30 15:44:18.000000000 +0300
+@@ -266,7 +266,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libguichan_sdl.la: $(libguichan_sdl_la_OBJECTS) $(libguichan_sdl_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libguichan_sdl_la_LDFLAGS) $(libguichan_sdl_la_OBJECTS) $(libguichan_sdl_la_LIBADD) $(LIBS)
++	$(CXXLINK) -rpath $(libdir) $(libguichan_sdl_la_LDFLAGS) $(libguichan_sdl_la_OBJECTS) $(libguichan_sdl_la_LIBADD) $(LIBS) -lsdl_image
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20060906/ab1783bf/attachment.html