apply libsdl and initscript patches courtesy pb_

BKrev: 4083c07aeLK1lkzVEVs6g4X1nep2NA

4 files changed, 209 insertions, 6 deletions

diff --git a/initscripts/initscripts-1.0-r0/device_table.txt b/initscripts/initscripts-1.0-r0/device_table.txt
index e69de29bb2..b10c4fa472 100644
--- a/initscripts/initscripts-1.0-r0/device_table.txt
+++ b/initscripts/initscripts-1.0-r0/device_table.txt
@@ -0,0 +1,160 @@
+#/dev/		d	775	0	0	-	-	-	-	-
+#/dev/msys	d	775	0	0	-	-	-	-	-
+#/dev/pts	d	775	0	0	-	-	-	-	-
+#/var		d	775	0	0	-	-	-	-	-
+/boot/var/empty	d	755	0	3	-	-	-	-
+/dev/apm_bios	c	660	0	46	10	134	-	-	-
+/dev/audio	c	660	0	29	14	4	-	-	-
+/dev/audio1	c	660	0	29	14	20	-	-	-
+/dev/audio2	c	660	0	29	14	36	-	-	-
+/dev/audio3	c	660	0	29	14	52	-	-	-
+/dev/bty	c	644	0	0	60	0	0	1	5
+/dev/collie-fl	c	640	0	44	254	0	-	-	-
+/dev/console	c	662	0	5	5	1	-	-
+/dev/cusa0	c	640	0	0	205	5	-	-	-
+/dev/cusa1	c	640	0	0	205	6	-	-	-
+/dev/cusa2	c	640	0	0	205	7	-	-	-
+/dev/dsp	c	660	0	29	14	3	-	-	-
+/dev/dsp1	c	660	0	29	14	19	-	-	-
+/dev/dsp2	c	660	0	29	14	35	-	-	-
+/dev/dsp3	c	660	0	29	14	51	-	-	-
+/dev/fb		c	660	0	44	29	0	0	32	2
+/dev/fb0autodetect	c	660	0	44	29	1	-	-	-
+/dev/fb0current	c	660	0	44	29	0	-	-	-
+#/dev/fb1	c	660	0	44	29	32	-	-	-
+/dev/fb1autodetect	c	660	0	44	29	33	-	-	-
+/dev/fb1current	c	660	0	44	29	32	-	-	-
+/dev/full	c	666	0	7	-	-	-
+/dev/hda	b	660	0	6	3	0	-	-	-
+/dev/hda	b	660	0	6	3	1	1	1	20
+/dev/hdb	b	660	0	6	3	64	-	-	-
+/dev/hdb	b	660	0	6	3	65	1	1	20
+/dev/hdc	b	660	0	6	22	0	-	-	-
+/dev/hdc	b	660	0	6	22	1	1	1	20
+/dev/initctl	p	600	0	0	-	-	-	-
+/dev/inportbm	c	660	0	0	10	2	-	-	-
+/dev/ircomm0	c	640	0	0	161	0	-	-	-
+/dev/jbm	c	660	0	0	10	4	-	-	-
+/dev/kmem	c	640	0	15	1	2	-	-	-
+/dev/lirc	c	660	0	5	61	0	-	-	-
+/dev/logibm	c	660	0	0	10	0	-	-	-
+/dev/loop0	b	660	0	11	7	0	-	-	-
+/dev/loop1	b	660	0	11	7	1	-	-	-
+/dev/mem	c	640	0	15	1	1	-	-	-
+/dev/mixer	c	666	0	0	14	0	-	-	-
+/dev/mixer1	c	666	0	0	14	16	-	-	-
+/dev/mixer2	c	666	0	0	14	32	-	-	-
+/dev/mixer3	c	666	0	0	14	48	-	-	-
+/dev/mmcda	b	640	0	0	60	0	-	-	-
+/dev/mmcda1	b	640	0	0	60	1	-	-	-
+/dev/mmcda2	b	640	0	0	60	2	-	-	-
+/dev/msys/fla	b	660	0	11	100	0	-	-	-
+/dev/msys/fla1	b	660	0	11	100	1	-	-	-
+/dev/msys/fla2	b	660	0	11	100	2	-	-	-
+/dev/msys/fla3	b	660	0	11	100	3	-	-	-
+/dev/msys/fla4	b	660	0	11	100	4	-	-	-
+/dev/msys/flb	b	660	0	11	100	64	-	-	-
+/dev/msys/flb1	b	660	0	11	100	65	-	-	-
+/dev/msys/flb2	b	660	0	11	100	66	-	-	-
+/dev/msys/flb3	b	660	0	11	100	67	-	-	-
+/dev/msys/flb4	b	660	0	11	100	68	-	-	-
+/dev/mtd	c	660	0	6	90	0	0	2	8
+/dev/mtdblock	b	640	0	0	31	0	0	1	8
+/dev/nst0	c	664	0	11	9	128	-	-	-
+/dev/nst0a	c	664	0	11	9	224	-	-	-
+/dev/nst0l	c	664	0	11	9	160	-	-	-
+/dev/nst0m	c	664	0	11	9	192	-	-	-
+/dev/nst1	c	664	0	11	9	129	-	-	-
+/dev/nst1a	c	664	0	11	9	225	-	-	-
+/dev/nst1l	c	664	0	11	9	161	-	-	-
+/dev/nst1m	c	664	0	11	9	193	-	-	-
+/dev/null	c	666	0	0	1	3	-	-	-
+/dev/par0	c	660	0	7	6	0	-	-	-
+/dev/par1	c	660	0	7	6	1	-	-	-
+/dev/par2	c	660	0	7	6	2	-	-	-
+/dev/port	c	640	0	15	1	4	-	-	-
+/dev/ppp	c	640	0	0	108	0	-	-	-
+/dev/psaux	c	660	0	0	10	1	-	-	-
+/dev/ptmx	c	666	0	5	5	2	-	-	-
+/dev/ptya0	c	660	0	5	2	176	-	-	-
+/dev/ptya1	c	660	0	5	2	177	-	-	-
+/dev/ptya2	c	660	0	5	2	178	-	-	-
+/dev/ptya3	c	660	0	5	2	179	-	-	-
+/dev/ptya4	c	660	0	5	2	180	-	-	-
+/dev/ptya5	c	660	0	5	2	181	-	-	-
+/dev/ptya6	c	660	0	5	2	182	-	-	-
+/dev/ptya7	c	660	0	5	2	183	-	-	-
+/dev/ptya8	c	660	0	5	2	184	-	-	-
+/dev/ptya9	c	660	0	5	2	185	-	-	-
+/dev/ptyaa	c	660	0	5	2	186	-	-	-
+/dev/ptyab	c	660	0	5	2	187	-	-	-
+/dev/ptyac	c	660	0	5	2	188	-	-	-
+/dev/ptyad	c	660	0	5	2	189	-	-	-
+/dev/ptyae	c	660	0	5	2	190	-	-	-
+/dev/ptyaf	c	660	0	5	2	191	-	-	-
+/dev/ram	b	640	0	0	1	0	0	1	4
+/dev/random	c	440	0	0	1	8	-	-	-
+/dev/rmidi0	c	660	0	0	35	64	-	-	-
+/dev/rmidi1	c	660	0	0	35	65	-	-	-
+/dev/rmidi2	c	660	0	0	35	66	-	-	-
+/dev/rmidi3	c	660	0	0	35	67	-	-	-
+/dev/rtc	c	660	0	47	10	135	-	-	-
+/dev/scd0	b	660	0	6	11	0	-	-	-
+/dev/scd1	b	660	0	6	11	1	-	-	-
+/dev/sda	b	660	0	6	8	0	-	-	-
+/dev/sda1	b	660	0	6	8	1	-	-	-
+/dev/sda2	b	660	0	6	8	2	-	-	-
+/dev/sda3	b	660	0	6	8	3	-	-	-
+/dev/sda4	b	660	0	6	8	4	-	-	-
+/dev/sda5	b	660	0	6	8	5	-	-	-
+/dev/sda6	b	660	0	6	8	6	-	-	-
+/dev/sda7	b	660	0	6	8	7	-	-	-
+/dev/sda8	b	660	0	6	8	8	-	-	-
+/dev/sda9	b	660	0	6	8	9	-	-	-
+/dev/sdb	b	660	0	6	8	16	-	-	-
+/dev/sdb1	b	660	0	6	8	17	-	-	-
+/dev/sdb2	b	660	0	6	8	18	-	-	-
+/dev/sdb3	b	660	0	6	8	19	-	-	-
+/dev/sdb4	b	660	0	6	8	20	-	-	-
+/dev/sdb5	b	660	0	6	8	21	-	-	-
+/dev/sdb6	b	660	0	6	8	22	-	-	-
+/dev/sdb7	b	660	0	6	8	23	-	-	-
+/dev/sdb8	b	660	0	6	8	24	-	-	-
+/dev/sdb9	b	660	0	6	8	25	-	-	-
+/dev/sdc	b	660	0	6	8	32	-	-	-
+/dev/sdc1	b	660	0	6	8	33	-	-	-
+/dev/sdc2	b	660	0	6	8	34	-	-	-
+/dev/sdc3	b	660	0	6	8	35	-	-	-
+/dev/sdc4	b	660	0	6	8	36	-	-	-
+/dev/sdc5	b	660	0	6	8	37	-	-	-
+/dev/sdc6	b	660	0	6	8	38	-	-	-
+/dev/sdc7	b	660	0	6	8	39	-	-	-
+/dev/sdc8	b	660	0	6	8	40	-	-	-
+/dev/sdc9	b	660	0	6	8	41	-	-	-
+/dev/sd_slotstat	c	660	0	6	10	240	-	-	-
+/dev/sharp_audioctl	c	660	0	29	10	213	-	-	-
+/dev/sharp_buz	c	660	0	29	10	211	-	-	-
+/dev/sharp_kbdctl	c	660	0	45	10	214	-	-	-
+/dev/sharp_led	c	660	0	48	10	210	-	-	-
+/dev/sharp_ts	c	640	0	45	11	0	-	-	-
+/dev/smtpe0	c	640	0	0	35	128	-	-	-
+/dev/smtpe1	c	640	0	0	35	129	-	-	-
+/dev/smtpe2	c	640	0	0	35	130	-	-	-
+/dev/smtpe3	c	640	0	0	35	131	-	-	-
+/dev/sndstat	c	660	0	29	14	6	-	-	-
+/dev/st0	c	660	0	11	9	0	-	-	-
+/dev/st0a	c	660	0	11	9	96	-	-	-
+/dev/st0l	c	660	0	11	9	32	-	-	-
+/dev/st0m	c	660	0	11	9	64	-	-	-
+/dev/st1	c	660	0	11	9	1	-	-	-
+/dev/st1a	c	660	0	11	9	97	-	-	-
+/dev/st1l	c	660	0	11	9	33	-	-	-
+/dev/st1m	c	660	0	11	9	65	-	-	-
+/dev/tty	c	662	0	5	5	0	-	-	-
+/dev/tty	c	666	0	5	4	0	0	1	9
+/dev/ttyS	c	640	0	5	4	64	0	1	4
+/dev/ttySA	c	640	0	5	204	5	0	1	4
+/dev/ttyUSB	c	660	0	5	188	0	0	1	2
+/dev/urandom	c	440	0	0	1	9	-	-	-
+/dev/usbmouse	c	640	0	45	10	32	-	-	-
+/dev/zero	c	644	0	0	1	5	-	-
diff --git a/initscripts/initscripts-1.0-r0/devpts b/initscripts/initscripts-1.0-r0/devpts
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/initscripts/initscripts-1.0-r0/devpts
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 70fc3dbfd4..c472a9ce03 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "SysV init scripts"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 SRC_URI = "file://${FILESDIR}/halt \
 	   file://${FILESDIR}/ramdisk \
@@ -8,6 +9,7 @@ SRC_URI = "file://${FILESDIR}/halt \
 	   file://${FILESDIR}/packages_default \
 	   file://${FILESDIR}/h3600/devices \
 	   file://${FILESDIR}/devpts.sh \
+	   file://${FILESDIR}/devpts \
 	   file://${FILESDIR}/bootlogo-simpad.gz \
 	   file://${FILESDIR}/packages_ramses \
 	   file://${FILESDIR}/hostname.sh \
@@ -46,7 +48,8 @@ do_install () {
 		   ${D}/${sysconfdir}/rc3.d \
 		   ${D}/${sysconfdir}/rc4.d \
 		   ${D}/${sysconfdir}/rc5.d \
-		   ${D}/${sysconfdir}/rc6.d
+		   ${D}/${sysconfdir}/rc6.d \
+		   ${D}/${sysconfdir}/default
 	install -m 0755    ${FILESDIR}/bootmisc.sh	${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/checkroot.sh	${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/finish		${D}/etc/init.d
@@ -56,10 +59,12 @@ do_install () {
 	install -m 0755    ${FILESDIR}/mountnfs.sh	${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/reboot		${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/rmnologin	${D}/etc/init.d
-	install -m 0755    ${FILESDIR}/sendsigs	${D}/etc/init.d
+	install -m 0755    ${FILESDIR}/sendsigs		${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/single		${D}/etc/init.d
 	install -m 0755    ${FILESDIR}/umountnfs.sh	${D}/etc/init.d
-	install -m 0755    ${FILESDIR}/urandom		${D}/etc/init.d
+#	install -m 0755    ${FILESDIR}/urandom		${D}/etc/init.d
+	install -m 0755    ${FILESDIR}/devpts.sh	${D}/etc/init.d
+	install -m 0755    ${FILESDIR}/devpts		${D}/etc/default
 #
 # Install device dependent scripts
 #
@@ -80,7 +85,7 @@ do_install () {
 #	ln -sf		../init.d/umountfs	${D}/etc/rc6.d/S40umountfs
 	ln -sf		../init.d/reboot	${D}/etc/rc6.d/S90reboot
 	ln -sf		../init.d/sendsigs	${D}/etc/rc0.d/S20sendsigs
-	ln -sf		../init.d/urandom	${D}/etc/rc0.d/S30urandom
+#	ln -sf		../init.d/urandom	${D}/etc/rc0.d/S30urandom
 	ln -sf		../init.d/umountnfs.sh	${D}/etc/rc0.d/S31umountnfs.sh
 #	ln -sf		../init.d/umountfs	${D}/etc/rc0.d/S40umountfs
 	ln -sf		../init.d/halt		${D}/etc/rc0.d/S90halt
@@ -92,11 +97,11 @@ do_install () {
 	ln -sf		../init.d/hostname.sh	${D}/etc/rcS.d/S40hostname.sh
 	ln -sf		../init.d/mountnfs.sh	${D}/etc/rcS.d/S45mountnfs.sh
 	ln -sf		../init.d/bootmisc.sh	${D}/etc/rcS.d/S55bootmisc.sh
-	ln -sf		../init.d/urandom	${D}/etc/rcS.d/S55urandom
+#	ln -sf		../init.d/urandom	${D}/etc/rcS.d/S55urandom
 #	ln -sf		../init.d/packages	${D}/etc/rcS.d/S98packages
 	ln -sf		../init.d/finish	${D}/etc/rcS.d/S99finish
 	ln -sf		../init.d/devices	${D}/etc/rcS.d/S01devices
-#	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S31devpts.sh
+	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S31devpts.sh
 #	ln -sf		../init.d/ramdisk	${D}/etc/rcS.d/S30ramdisk
 
 	install -m 0755    ${FILESDIR}/device_table.txt		${D}/etc/device_table
diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe
index e69de29bb2..2f06ea1d79 100644
--- a/libsdl/libsdl-x11_1.2.7.oe
+++ b/libsdl/libsdl-x11_1.2.7.oe
@@ -0,0 +1,38 @@
+DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+DEPENDS = "virtual/libc x11 xext"
+PROVIDES = "virtual/libsdl"
+
+SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+	   file://${FILESDIR}/extra-keys.patch;patch=1"
+S = "${WORKDIR}/SDL-${PV}"
+
+inherit autotools libtool
+
+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_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
+	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a
+
+	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
+}