From 62bf4ede03217aaaf651178b1f4d6d4adb8cbf55 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 24 Feb 2005 22:40:12 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/24 23:24:51+01:00 handhelds.org!zecke SDL Perl: Move the sdl-perl patch from Pigi to the right directory. Allow building of sdl-perl for all gui environments 2005/02/24 23:23:25+01:00 handhelds.org!zecke Frozen Bubble: -Apply Pigis patches to frozen-bubble to make it build BKrev: 421e57cc3v7zBoegz_7PMKmoHdRjyg --- packages/frozen-bubble/Makefile_top.patch | 0 packages/frozen-bubble/frozen-bubble_1.0.0.bb | 19 +++++++++++++++++++ packages/sdl-perl/sdl-perl_1.20.3.bb | 0 packages/sdlperl/sdl-perl_1.20.3.bb | 4 ++-- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 packages/frozen-bubble/Makefile_top.patch delete mode 100644 packages/sdl-perl/sdl-perl_1.20.3.bb diff --git a/packages/frozen-bubble/Makefile_top.patch b/packages/frozen-bubble/Makefile_top.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/frozen-bubble/frozen-bubble_1.0.0.bb b/packages/frozen-bubble/frozen-bubble_1.0.0.bb index e69de29bb2..f8ee64aca0 100644 --- a/packages/frozen-bubble/frozen-bubble_1.0.0.bb +++ b/packages/frozen-bubble/frozen-bubble_1.0.0.bb @@ -0,0 +1,19 @@ +LICENSE = GPL +SECTION = "opie/games" +DEPENDS = "libsdl-mixer libsdl-image sdl-perl" + +SRC_URI = "http://zarb.org/~gc/fb//frozen-bubble-${PV}.tar.bz2 \ + file://Makefile_top.patch;patch=1 \ + file://Makefile.patch;patch=1 \ + file://Makefile.PL.patch;patch=1" +# The Makefile needs to be patched to look in STAGING_LIBDIR/perl/... - It's looking in i686-linux/lib at the moment, regardless of arch +BROKEN = "1" + + +do_compile() { + oe_runmake OPTIMIZE="${CFLAGS}" PREFIX="${prefix}" +} + +do_install() { + oe_runmake PREFIX="${D}${prefix}" install +} diff --git a/packages/sdl-perl/sdl-perl_1.20.3.bb b/packages/sdl-perl/sdl-perl_1.20.3.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb index d85d11cc2d..d115f02ce3 100644 --- a/packages/sdlperl/sdl-perl_1.20.3.bb +++ b/packages/sdlperl/sdl-perl_1.20.3.bb @@ -4,9 +4,9 @@ SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0" S = "${WORKDIR}/SDL_perl-${PV}" LICENSE = "GPL" -DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg mesa" +DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg" -inherit cpan +inherit sdl do_stage () { install -d ${STAGING_LIBDIR}/perl5/vendor_perl -- cgit v1.2.3