diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-02 14:14:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-02 14:14:47 +0000 |
| commit | 5a0f4ca1fec6af093195d0b0d2dfffb463c815ea (patch) | |
| tree | c321adef102d72e0d66c5e2d4785928a45c08824 /packages/guichan | |
| parent | 7a5388e17be3a3d4b3789edf8ecbd4366740f8b7 (diff) | |
| parent | 76fd07d9e9def4526f1fd47517e9d8822e555177 (diff) | |
merge of '907b09122e18d1c5bf7d911edc9c19d8eff6cfe4'
and '9f9ee853372a36ca4890047d0472edcab6e5c2f3'
Diffstat (limited to 'packages/guichan')
| -rw-r--r-- | packages/guichan/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/guichan/files/link-against-sdlimage.patch | 22 | ||||
| -rw-r--r-- | packages/guichan/guichan_0.7.1.bb | 4 |
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 |