summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-09-29 15:14:07 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-09-29 15:14:07 +0000
commitc8f855c12f5e6b787d131e0c04f4474094c522c3 (patch)
treec6d6df31861f3ff0007a679d922e9f9ae17809f9
parent4a1691f5c71abc3e025bc5e2600eca661335ad79 (diff)
guichan: make libguichan-sdl actually link against sdl-image
-rw-r--r--packages/guichan/files/.mtn2git_empty0
-rw-r--r--packages/guichan/files/link-against-sdlimage.patch22
-rw-r--r--packages/guichan/guichan_0.7.1.bb4
3 files changed, 25 insertions, 1 deletions
diff --git a/packages/guichan/files/.mtn2git_empty b/packages/guichan/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/guichan/files/.mtn2git_empty
diff --git a/packages/guichan/files/link-against-sdlimage.patch b/packages/guichan/files/link-against-sdlimage.patch
new file mode 100644
index 0000000000..e2e3ddb2e6
--- /dev/null
+++ b/packages/guichan/files/link-against-sdlimage.patch
@@ -0,0 +1,22 @@
+Index: guichan-0.6.1/configure.in
+===================================================================
+--- guichan-0.6.1.orig/configure.in 2007-09-28 18:35:17.000000000 +0200
++++ guichan-0.6.1/configure.in 2007-09-28 18:36:10.000000000 +0200
+@@ -116,6 +116,7 @@
+ SDLIMAGE="yes"
+ SDL_LIBS="$SDL_LIBS -lSDL_image"
+ CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
++ AC_SUBST([SDL_LIBS])
+ }
+
+ ForceSDLImage()
+Index: guichan-0.6.1/src/sdl/Makefile.am
+===================================================================
+--- guichan-0.6.1.orig/src/sdl/Makefile.am 2007-09-28 18:35:23.000000000 +0200
++++ guichan-0.6.1/src/sdl/Makefile.am 2007-09-28 18:35:51.000000000 +0200
+@@ -10,3 +10,5 @@
+ sdlimage.cpp \
+ sdlimageloader.cpp \
+ sdlinput.cpp
++
++libguichan_sdl_la_LDFLAGS = @SDL_LIBS@
diff --git a/packages/guichan/guichan_0.7.1.bb b/packages/guichan/guichan_0.7.1.bb
index 28c5c8e948..83a9eca2c5 100644
--- a/packages/guichan/guichan_0.7.1.bb
+++ b/packages/guichan/guichan_0.7.1.bb
@@ -1,8 +1,10 @@
DESCRIPTION = "A portable C++ GUI library designed for games using Allegro, HGE, OpenGL, OpenLayer and/or SDL."
HOMEPAGE = "http://guichan.sourceforge.net"
DEPENDS = "virtual/libsdl libsdl-image"
+PR = "r1"
-SRC_URI = "http://guichan.googlecode.com/files/guichan-0.7.1.tar.gz"
+SRC_URI = "http://guichan.googlecode.com/files/${PN}-${PV}.tar.gz \
+ file://link-against-sdlimage.patch;patch=1"
inherit autotools