diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
| commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
| tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /recipes/libsdl | |
| parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
| parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
| download | openembedded-testing.tar.gz | |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'recipes/libsdl')
| -rw-r--r-- | recipes/libsdl/libsdl-mixer_1.2.11.bb | 4 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl-x11_1.2.14.bb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb index 1d5b1f9d08..8c032ceb03 100644 --- a/recipes/libsdl/libsdl-mixer_1.2.11.bb +++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "virtual/libsdl flac libmikmod libvorbis libmad" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ file://fix-flac-madness.diff" @@ -20,7 +20,7 @@ inherit autotools # Add support for runtime linking with libmad so we can use that for fixed point MP3 decoding. # Add support for runtime linking with libtremor so we can use that for fixed point OGG Vorbis decoding. -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor --enable-music-mp3-mad-gpl" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor --enable-music-mp3-mad-gpl LIBS=-L${STAGING_LIBDIR}" do_compile() { # Override SDL_LIBS to include a linker rpath so the linker diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb index 4c84d99bef..37799c32fc 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL" DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib" PROVIDES = "virtual/libsdl" -PR = "r5" +PR = "r6" SRC_URI = " \ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ @@ -30,7 +30,7 @@ EXTRA_OECONF = " \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ --enable-video-opengl --enable-input-events --enable-pthreads \ --disable-video-picogui --disable-video-qtopia --enable-dlopen \ - --enable-input-tslib --disable-video-ps3 \ + --enable-input-tslib --disable-video-ps3 --disable-rpath \ " do_configure() { |