guichan: make libguichan-sdl actually link against sdl-image

diff --git a/packages/guichan/files/.mtn2git_empty b/packages/guichan/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/guichan/files/link-against-sdlimage.patch b/packages/guichan/files/link-against-sdlimage.patch
new file mode 100644 (file)
index 0000000..e2e3ddb
--- /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 28c5c8e..83a9eca 100644 (file)
--- 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