Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

14 files changed, 0 insertions, 187 deletions

diff --git a/libsdl/libsdl-gfx_2.0.11.bb b/libsdl/libsdl-gfx_2.0.11.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-gfx_2.0.11.bb
diff --git a/libsdl/libsdl-gfx_2.0.11.oe b/libsdl/libsdl-gfx_2.0.11.oe
deleted file mode 100644
index 96cf7c502d..0000000000
--- a/libsdl/libsdl-gfx_2.0.11.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer graphic primitives library."
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "zlib libpng jpeg virtual/libsdl"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
-S = "${WORKDIR}/SDL_gfx-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-mmx"
-
-do_stage() {
-	oe_libinstall -so libSDL_gfx ${STAGING_LIBDIR}
-	install -m 0644 *.h ${STAGING_INCDIR}/SDL/
-}
-
diff --git a/libsdl/libsdl-image_1.2.3.bb b/libsdl/libsdl-image_1.2.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-image_1.2.3.bb
diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
deleted file mode 100644
index c8568473e4..0000000000
--- a/libsdl/libsdl-image_1.2.3.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer image library."
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "zlib libpng jpeg virtual/libsdl"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
-S = "${WORKDIR}/SDL_image-${PV}"
-
-inherit autotools
-
-do_stage() {
-	oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
-	ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
-	install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
-}
-
diff --git a/libsdl/libsdl-mixer_1.2.5.bb b/libsdl/libsdl-mixer_1.2.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-mixer_1.2.5.bb
diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
deleted file mode 100644
index 3203fd60a6..0000000000
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer mixer library."
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "virtual/libsdl"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
-S = "${WORKDIR}/SDL_mixer-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-music-mp3"
-# although we build smpeg... need to find out how
-# to deal with optional dependencies
-
-do_stage() {
-	oe_libinstall -so libSDL_mixer ${STAGING_LIBDIR}
-	ln -sf libSDL_mixer.so ${STAGING_LIBDIR}/libSDL_mixer-1.2.so
-	install -m 0644 SDL_mixer.h ${STAGING_INCDIR}/SDL/SDL_mixer.h
-}
-
diff --git a/libsdl/libsdl-net_1.2.5.bb b/libsdl/libsdl-net_1.2.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-net_1.2.5.bb
diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
deleted file mode 100644
index 1e5f9f81c2..0000000000
--- a/libsdl/libsdl-net_1.2.5.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer networking library."
-SECTION = "libs/network"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "virtual/libsdl"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz"
-S = "${WORKDIR}/SDL_net-${PV}"
-
-inherit autotools
-
-do_stage() {
-	oe_libinstall -so libSDL_net ${STAGING_LIBDIR}
-	ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so
-	install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
-}
-
diff --git a/libsdl/libsdl-qpe_1.2.7.bb b/libsdl/libsdl-qpe_1.2.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-qpe_1.2.7.bb
diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe
deleted file mode 100644
index 20061426f0..0000000000
--- a/libsdl/libsdl-qpe_1.2.7.oe
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "virtual/libqpe"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-PR = "r1"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey.patch;patch=1 \
-           file://pygame.patch;patch=1 \
-           file://gcc34.patch;patch=1 \
-           file://mouse.patch;patch=1 \
-	   file://kill-stdc++.patch;patch=1 "
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --enable-video-qtopia --enable-dlopen"
-
-do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	install -m 0655 src/main/libSDLmain.a src/main/.libs/
-	oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	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/libsdl/libsdl-ttf_2.0.3.bb b/libsdl/libsdl-ttf_2.0.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-ttf_2.0.3.bb
diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
deleted file mode 100644
index 6099021f88..0000000000
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer truetype font library."
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "virtual/libsdl freetype"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
-           file://new-freetype-includes.patch;patch=1"
-S = "${WORKDIR}/SDL_ttf-${PV}"
-
-inherit autotools
-
-do_stage() {
-	oe_libinstall -so libSDL_ttf ${STAGING_LIBDIR}
-	ln -sf libSDL_ttf.so ${STAGING_LIBDIR}/libSDL_ttf-2.0.so
-	install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h
-}
diff --git a/libsdl/libsdl-x11_1.2.7.bb b/libsdl/libsdl-x11_1.2.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-x11_1.2.7.bb
diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe
deleted file mode 100644
index 7fdee804fc..0000000000
--- a/libsdl/libsdl-x11_1.2.7.oe
+++ /dev/null
@@ -1,47 +0,0 @@
-PR = "r1"
-DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
-DEPENDS = "x11 xext"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-
-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
-
-EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-do_configure_prepend() {
-	rm -f ${S}/acinclude.m4
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	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
-}