[oe-commits] org.oe.dev guichan: make libguichan-sdl actually link against sdl-image

[pH5 commit]

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

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: cd21d75cfff033056e3acacea8568fdabac30742
ViewMTN: http://monotone.openembedded.org/revision/info/cd21d75cfff033056e3acacea8568fdabac30742
Files:
1
packages/guichan/files
packages/guichan/files/link-against-sdlimage.patch
packages/guichan/guichan_0.7.1.bb
Diffs:

#
# mt diff -r151b70ba70e6bb2082d6512e5e043573f6a5692b -rcd21d75cfff033056e3acacea8568fdabac30742
#
# 
# 
# add_dir "packages/guichan/files"
# 
# add_file "packages/guichan/files/link-against-sdlimage.patch"
#  content [c577427e3b3421650015f1795c8e31d2efa9aed9]
# 
# patch "packages/guichan/guichan_0.7.1.bb"
#  from [a047b1cf7b929e6bf217d56944caf0b97c746e00]
#    to [fdeb7cb56fe2d74b396e1e61384455f182d3b248]
# 
============================================================
--- packages/guichan/files/link-against-sdlimage.patch	c577427e3b3421650015f1795c8e31d2efa9aed9
+++ packages/guichan/files/link-against-sdlimage.patch	c577427e3b3421650015f1795c8e31d2efa9aed9
@@ -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@
============================================================
--- packages/guichan/guichan_0.7.1.bb	a047b1cf7b929e6bf217d56944caf0b97c746e00
+++ packages/guichan/guichan_0.7.1.bb	fdeb7cb56fe2d74b396e1e61384455f182d3b248
@@ -1,8 +1,10 @@ DEPENDS = "virtual/libsdl libsdl-image"
 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