[oe-commits] org.oe.dev libsdl-x11: fix cdrom support and enable it

[koen commit]

libsdl-x11: fix cdrom support and enable it

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1431c1bf4b1086ea070e4a8d9ab7c1e3a49fb68b
ViewMTN: http://monotone.openembedded.org/revision/info/1431c1bf4b1086ea070e4a8d9ab7c1e3a49fb68b
Files:
1
packages/libsdl/files/sdl-cdfix.patch
packages/libsdl/libsdl-x11_1.2.11.bb
Diffs:

#
# mt diff -r63a05cb18b45ab802d55b58fd4b32d38a5f0f57d -r1431c1bf4b1086ea070e4a8d9ab7c1e3a49fb68b
#
#
#
# add_file "packages/libsdl/files/sdl-cdfix.patch"
#  content [75123157b05aeaa592bafde811545595d9398c23]
# 
# patch "packages/libsdl/libsdl-x11_1.2.11.bb"
#  from [138f8ba119aedf522c67ae727bbde1e8cf23cbf3]
#    to [22b2b21fa489b2c8f56b5956e0a7e33eef629415]
#
============================================================
--- packages/libsdl/files/sdl-cdfix.patch	75123157b05aeaa592bafde811545595d9398c23
+++ packages/libsdl/files/sdl-cdfix.patch	75123157b05aeaa592bafde811545595d9398c23
@@ -0,0 +1,11 @@
+--- /tmp/SDL_syscdrom.c	2008-08-11 21:56:58.000000000 +0200
++++ SDL-1.2.11/src/cdrom/linux/SDL_syscdrom.c	2008-08-11 21:57:07.813198000 +0200
+@@ -51,6 +51,8 @@
+ #ifdef __SVR4
+ #include <sys/cdio.h>
+ #endif
++#include <linux/cdrom.h>
++
+ 
+ /* Define this to use the alternative getmntent() code */
+ #ifndef __SVR4
============================================================
--- packages/libsdl/libsdl-x11_1.2.11.bb	138f8ba119aedf522c67ae727bbde1e8cf23cbf3
+++ packages/libsdl/libsdl-x11_1.2.11.bb	22b2b21fa489b2c8f56b5956e0a7e33eef629415
@@ -3,15 +3,16 @@ DEFAULT_PREFERENCE = "-1" 
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://acinclude.m4 \
            file://configure_tweak.patch;patch=1 \
            file://pagesize.patch;patch=1 \
-           file://kernel-asm-page.patch;patch=1 "
+           file://kernel-asm-page.patch;patch=1 \
+	   file://sdl-cdfix.patch;patch=1 "
 
-EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-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 \