diff options
| author |   Rene Wagner <rw@handhelds.org> | 2005-10-04 12:56:33 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-04 12:56:33 +0000 |
| commit | 3596fdaee31ae85ce26a2afecdb4a0372c6d6944 (patch) | |
| tree | 6b694c406b2800115f9bd661aceffa2905fcde1f | |
| parent | a6c3ff38d6ebd6058db7b4964efe9758931200fb (diff) | |
| download | openembedded-3596fdaee31ae85ce26a2afecdb4a0372c6d6944.tar.gz | |
libsdl-(qpe|x11): fix packaging and inherit binconfig. fixes Bug #115
| -rw-r--r-- | packages/libsdl/libsdl-qpe_1.2.7.bb | 14 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-x11_1.2.7.bb | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb index fc109fe0e5..54dc975fb5 100644 --- a/packages/libsdl/libsdl-qpe_1.2.7.bb +++ b/packages/libsdl/libsdl-qpe_1.2.7.bb @@ -5,7 +5,9 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "virtual/libqpe libopie2" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r5" + +# NOTE: make sure to keep PR in sync with libsdl-x11 +PR = "r6" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey.patch;patch=1 \ @@ -17,7 +19,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://SDL-Akita.patch;patch=1" S = "${WORKDIR}/SDL-${PV}" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \ @@ -28,6 +30,9 @@ EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers --disable-video-opengl --enable-input-events --enable-pthreads \ --disable-video-picogui --enable-video-qtopia --enable-dlopen" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*config" + do_stage() { oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so @@ -39,9 +44,4 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done - - cat sdl-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \ - | sed -e "s,libdirs ,mickey_is_cool ," \ - | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/sdl-config - chmod a+rx ${STAGING_BINDIR}/sdl-config } diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb index b93dde6f2e..80c547b520 100644 --- a/packages/libsdl/libsdl-x11_1.2.7.bb +++ b/packages/libsdl/libsdl-x11_1.2.7.bb @@ -1,4 +1,3 @@ -PR = "r3" DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" @@ -7,12 +6,15 @@ DEPENDS = "x11 xext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" +# NOTE: make sure to keep PR in sync with libsdl-qpe +PR = "r6" + SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/SDL-${PV}" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \ @@ -23,6 +25,9 @@ EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --disable-video-opengl --enable-input-events --enable-pthreads \ --disable-video-picogui --disable-video-qtopia --enable-dlopen" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*config" + do_configure_prepend() { rm -f ${S}/acinclude.m4 cp ${WORKDIR}/acinclude.m4 ${S}/ @@ -47,9 +52,4 @@ do_stage() { do install -m 0644 $f ${STAGING_INCDIR}/SDL/ done - - cat sdl-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \ - | sed -e "s,libdirs ,mickey_is_cool ," \ - | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/sdl-config - chmod a+rx ${STAGING_BINDIR}/sdl-config } |