From 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sun, 9 May 2004 03:00:50 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 linux.local:/home/kergoth/code/packages

2004/05/08 23:00:41-04:00 local!kergoth
Upgrade the alsa packages to 1.0.4.

2004/05/08 22:17:13-04:00 local!kergoth
Fix compile error with adns, resulting from a function definition not matching the declaration.

2004/05/08 18:00:51-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages

2004/05/08 13:59:20-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages

2004/05/08 13:59:15-04:00 local!kergoth
Fixing up the libtool-native/libtool-cross mess.

2004/05/08 13:59:04-04:00 local!kergoth
Bugfix in ncurses usage of oe_libinstall.

2004/05/07 21:46:16-04:00 local!kergoth
Merge

2004/05/07 21:45:26-04:00 local!kergoth
Adapt some .oe's to use oe_libinstall.

BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ
---
 libsdl/libsdl-image_1.2.3.oe | 4 ++--
 libsdl/libsdl-mixer_1.2.5.oe | 4 ++--
 libsdl/libsdl-net_1.2.5.oe   | 4 ++--
 libsdl/libsdl-qpe_1.2.7.oe   | 4 ++--
 libsdl/libsdl-ttf_2.0.3.oe   | 4 ++--
 libsdl/libsdl-x11_1.2.7.oe   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libsdl')

diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
index 97a5b3dfdc..9c54849fe7 100644
--- a/libsdl/libsdl-image_1.2.3.oe
+++ b/libsdl/libsdl-image_1.2.3.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
 inherit autotools libtool
 
 do_stage() {
-	oe_soinstall .libs/libSDL_image-1.2.so.0.1.2 ${STAGING_LIBDIR}
-	ln -sf libSDL_image-1.2.so.0.1.2 ${STAGING_LIBDIR}/libSDL_image.so
+	oe_libinstall -so libSDL_image-1.2 ${STAGING_LIBDIR}
+	ln -sf libSDL_image-1.2.so ${STAGING_LIBDIR}/libSDL_image.so
 	install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
 }
 
diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
index 4fcacf867b..2f51ae240e 100644
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ b/libsdl/libsdl-mixer_1.2.5.oe
@@ -14,8 +14,8 @@ EXTRA_OECONF = "--disable-music-mp3"
 # to deal with optional dependencies
 
 do_stage() {
-	oe_soinstall .libs/libSDL_mixer-1.2.so.0.2.3 ${STAGING_LIBDIR}
-	ln -sf libSDL_mixer-1.2.so.0.2.3 ${STAGING_LIBDIR}/libSDL_mixer.so
+	oe_libinstall -so libSDL_mixer-1.2 ${STAGING_LIBDIR}
+	ln -sf libSDL_mixer-1.2.so ${STAGING_LIBDIR}/libSDL_mixer.so
 	install -m 0644 SDL_mixer.h ${STAGING_INCDIR}/SDL/SDL_mixer.h
 }
 
diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index 6353e408ca..975f8c190f 100644
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_net-${PV}"
 inherit autotools libtool
 
 do_stage() {
-	oe_soinstall .libs/libSDL_net-1.2.so.0.0.5 ${STAGING_LIBDIR}
-	ln -sf libSDL_net-1.2.so.0.0.5 ${STAGING_LIBDIR}/libSDL_net.so
+	oe_libinstall -so libSDL_net-1.2 ${STAGING_LIBDIR}
+	ln -sf libSDL_net-1.2.so ${STAGING_LIBDIR}/libSDL_net.so
 	install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
 }
 
diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe
index f7356852aa..90fc61b56b 100644
--- a/libsdl/libsdl-qpe_1.2.7.oe
+++ b/libsdl/libsdl-qpe_1.2.7.oe
@@ -22,8 +22,8 @@ EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers
                 --disable-video-picogui --enable-video-qtopia --enable-dlopen"
 
 do_stage() {
-	oe_soinstall src/.libs/libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}
-	ln -sf libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}/libSDL.so
+	oe_libinstall -so libSDL-1.2 ${STAGING_LIBDIR}
+	ln -sf libSDL-1.2.so ${STAGING_LIBDIR}/libSDL.so
 	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a
 
 	install -d ${STAGING_INCDIR}/SDL
diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
index b9319a9e8e..b02210f843 100644
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ b/libsdl/libsdl-ttf_2.0.3.oe
@@ -11,8 +11,8 @@ S = "${WORKDIR}/SDL_ttf-${PV}"
 inherit autotools libtool
 
 do_stage() {
-	oe_soinstall .libs/libSDL_ttf-2.0.so.0.0.3 ${STAGING_LIBDIR}
-	ln -sf libSDL_ttf-2.0.so.0.0.3 ${STAGING_LIBDIR}/libSDL_ttf.so
+	oe_libinstall -so libSDL_ttf-2.0 ${STAGING_LIBDIR}
+	ln -sf libSDL_ttf-2.0.so ${STAGING_LIBDIR}/libSDL_ttf.so
 	install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h
 }
 
diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe
index 2f06ea1d79..f078112280 100644
--- a/libsdl/libsdl-x11_1.2.7.oe
+++ b/libsdl/libsdl-x11_1.2.7.oe
@@ -21,8 +21,8 @@ EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
 
 do_stage() {
-	oe_soinstall src/.libs/libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}
-	ln -sf libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}/libSDL.so
+	oe_libinstall -so libSDL-1.2 ${STAGING_LIBDIR}
+	ln -sf libSDL-1.2.so ${STAGING_LIBDIR}/libSDL.so
 	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a
 
 	install -d ${STAGING_INCDIR}/SDL
-- 
cgit v1.2.3