diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 4b0c72697a..3b2b400943 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -38,7 +38,7 @@ PKG_AUTORECONF="no"
PKG_DEPENDS="$PKG_DEPENDS dbus"
# needed for hosttools (Texturepacker)
- PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET lzo:host SDL-host SDL_image-host"
+ PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET lzo:host SDL:host SDL_image-host"
# some python stuff needed for various addons
PKG_DEPENDS="$PKG_DEPENDS Imaging"
diff --git a/packages/multimedia/SDL-host/build b/packages/multimedia/SDL-host/build
deleted file mode 100755
index bea798fd51..0000000000
--- a/packages/multimedia/SDL-host/build
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack SDL
-
-SDL_DIR=`ls -d $BUILD/SDL-[0-9]*`
-
-setup_toolchain host
-
-cd $SDL_DIR
-
-mkdir -p .build-host && cd .build-host
-../configure --host=$HOST_NAME \
- --build=$HOST_NAME \
- --prefix=$ROOT/$TOOLCHAIN \
- --sysconfdir=$ROOT/$TOOLCHAIN/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --enable-rpath \
- --enable-libc \
- --disable-audio \
- --disable-events \
- --disable-joystick \
- --disable-cdrom \
- --enable-threads \
- --enable-timers \
- --enable-file \
- --enable-loadso \
- --enable-cpuinfo \
- --enable-assembly \
- --disable-oss \
- --disable-alsa \
- --disable-alsatest \
- --disable-alsa-shared \
- --disable-esd \
- --disable-esdtest \
- --disable-esd-shared \
- --disable-pulseaudio \
- --disable-pulseaudio-shared \
- --disable-arts \
- --disable-arts-shared \
- --disable-nas \
- --disable-diskaudio \
- --disable-dummyaudio \
- --disable-mintaudio \
- --enable-nasm \
- --disable-altivec \
- --disable-ipod \
- --disable-video \
- --disable-x11-shared \
- --disable-video-x11-dgamouse \
- --disable-video-x11-xinerama \
- --disable-video-x11-xme \
- --disable-video-x11-xrandr \
- --disable-video-x11 \
- --disable-video-x11-vm \
- --disable-video-x11-xv \
- --without-x \
- --disable-video-opengl \
- --disable-video-nanox \
- --disable-nanox-debug \
- --disable-nanox-share-memory \
- --disable-nanox-direct-fb \
- --disable-dga \
- --disable-video-dga \
- --disable-video-photon \
- --disable-video-carbon \
- --disable-video-cocoa \
- --disable-video-fbcon \
- --disable-video-directfb \
- --disable-video-ps2gs \
- --disable-video-ggi \
- --disable-video-svga \
- --disable-video-vgl \
- --disable-video-wscons \
- --disable-video-aalib \
- --disable-video-qtopia \
- --disable-video-picogui \
- --disable-video-dummy \
- --disable-osmesa-shared \
- --disable-input-events \
- --disable-input-tslib \
- --disable-pth \
- --enable-pthreads \
- --enable-pthread-sem \
- --disable-stdio-redirect \
- --disable-directx \
- --enable-sdl-dlopen \
- --disable-atari-ldg \
- --disable-clock_gettime \
-
-make
-make install
diff --git a/packages/multimedia/SDL-host/meta b/packages/multimedia/SDL-host/meta
deleted file mode 100644
index b19964fa13..0000000000
--- a/packages/multimedia/SDL-host/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-PKG_NAME="SDL"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.libsdl.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain yasm:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
-PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of 'Civilization: Call To Power.' Simple DirectMedia Layer supports Linux, Win32, BeOS, MacOS, Solaris, IRIX, and FreeBSD."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
-
diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build
deleted file mode 100755
index e4694e42d4..0000000000
--- a/packages/multimedia/SDL/build
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-if [ "$DISPLAYSERVER" = "xorg-server" ]; then
- SDL_X11="--enable-video --enable-x11-shared --disable-video-x11-dgamouse"
- SDL_X11="$SDL_X11 --disable-video-x11-xinerama --disable-video-x11-xme"
- SDL_X11="$SDL_X11 --enable-video-x11-xrandr --enable-video-x11"
- SDL_X11="$SDL_X11 --disable-video-x11-vm --disable-video-x11-xv --with-x"
-else
- SDL_X11="--disable-video --disable-x11-shared --disable-video-x11-dgamouse"
- SDL_X11="$SDL_X11 --disable-video-x11-xinerama --disable-video-x11-xme"
- SDL_X11="$SDL_X11 --disable-video-x11-xrandr --disable-video-x11"
- SDL_X11="$SDL_X11 --disable-video-x11-vm --disable-video-x11-xv --without-x"
-fi
-
-if [ "$OPENGL" = "Mesa" ]; then
- SDL_OPENGL="--enable-video-opengl"
-else
- SDL_OPENGL="--disable-video-opengl"
-fi
-
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
- SDL_PULSEAUDIO="--enable-pulseaudio --enable-pulseaudio-shared"
-else
- SDL_PULSEAUDIO="--disable-pulseaudio --disable-pulseaudio-shared"
-fi
-
-cd $PKG_BUILD
-
-rm -f acinclude/alsa.m4
-# Skip autoheader because there is a problem with AC_DEFINE's in the configure.in of SDL 1.2.14.
-# Added include directory 'acinclude' because SDL 1.2.14 has no Makefile.am in which to specify it.
- AUTOHEADER="true" autoreconf --verbose --install --force -I $SYSROOT_PREFIX/usr/share/aclocal -I acinclude
-
-mkdir -p .build-target && cd .build-target
-../configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --disable-rpath \
- --enable-libc \
- --enable-audio \
- --enable-events \
- --enable-joystick \
- --enable-cdrom \
- --enable-threads \
- --enable-timers \
- --enable-file \
- --enable-loadso \
- --enable-cpuinfo \
- --enable-assembly \
- --disable-oss \
- --enable-alsa \
- --disable-alsatest \
- --enable-alsa-shared \
- --with-alsa-prefix=$SYSROOT_PREFIX/usr/lib \
- --with-alsa-inc-prefix=$SYSROOT_PREFIX/usr/include \
- --disable-esd \
- --disable-esdtest \
- --disable-esd-shared \
- $SDL_PULSEAUDIO \
- --disable-arts \
- --disable-arts-shared \
- --disable-nas \
- --disable-diskaudio \
- --disable-dummyaudio \
- --disable-mintaudio \
- --enable-nasm \
- --disable-altivec \
- --disable-ipod \
- $SDL_X11 \
- $SDL_OPENGL \
- --disable-video-nanox \
- --disable-nanox-debug \
- --disable-nanox-share-memory \
- --disable-nanox-direct-fb \
- --disable-dga \
- --disable-video-dga \
- --disable-video-photon \
- --disable-video-carbon \
- --disable-video-cocoa \
- --disable-video-fbcon \
- --disable-video-directfb \
- --disable-video-ps2gs \
- --disable-video-ggi \
- --disable-video-svga \
- --disable-video-vgl \
- --disable-video-wscons \
- --disable-video-aalib \
- --disable-video-qtopia \
- --disable-video-picogui \
- --disable-video-dummy \
- --disable-osmesa-shared \
- --enable-input-events \
- --disable-input-tslib \
- --disable-pth \
- --enable-pthreads \
- --enable-pthread-sem \
- --disable-stdio-redirect \
- --disable-directx \
- --enable-sdl-dlopen \
- --disable-atari-ldg \
- --disable-clock_gettime \
-
-make
-
-$MAKEINSTALL
-
-mkdir -p $ROOT/$TOOLCHAIN/bin
- cp $SYSROOT_PREFIX/usr/bin/sdl-config $ROOT/$TOOLCHAIN/bin
- $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/sdl-config
-
diff --git a/packages/multimedia/SDL/install b/packages/multimedia/SDL/install
deleted file mode 100755
index 5cb5d5d006..0000000000
--- a/packages/multimedia/SDL/install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/.build-target/build/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta
deleted file mode 100644
index e1cd9d78f0..0000000000
--- a/packages/multimedia/SDL/meta
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-PKG_NAME="SDL"
-PKG_VERSION="1.2.15"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.libsdl.org/"
-PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="alsa-lib"
-PKG_BUILD_DEPENDS="toolchain yasm:host alsa-lib"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
-PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of 'Civilization: Call To Power.' Simple DirectMedia Layer supports Linux, Win32, BeOS, MacOS, Solaris, IRIX, and FreeBSD."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
-
-if [ "$DISPLAYSERVER" = "xorg-server" ]; then
- PKG_DEPENDS="$PKG_DEPENDS libX11 libXrandr"
- PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXrandr"
-fi
-
-if [ "$OPENGL" = "Mesa" ]; then
- PKG_DEPENDS="$PKG_DEPENDS Mesa glu"
- PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu"
-fi
-
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
- PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
- PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
-fi
diff --git a/packages/multimedia/SDL/package.mk b/packages/multimedia/SDL/package.mk
new file mode 100644
index 0000000000..55c279e685
--- /dev/null
+++ b/packages/multimedia/SDL/package.mk
@@ -0,0 +1,228 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="SDL"
+PKG_VERSION="1.2.15"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.libsdl.org/"
+PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_DEPENDS_TARGET="alsa-lib"
+PKG_BUILD_DEPENDS_HOST="toolchain yasm:host"
+PKG_BUILD_DEPENDS_TARGET="toolchain yasm:host alsa-lib"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
+PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of 'Civilization: Call To Power.' Simple DirectMedia Layer supports Linux, Win32, BeOS, MacOS, Solaris, IRIX, and FreeBSD."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--enable-rpath \
+ --enable-libc \
+ --disable-audio \
+ --disable-events \
+ --disable-joystick \
+ --disable-cdrom \
+ --enable-threads \
+ --enable-timers \
+ --enable-file \
+ --enable-loadso \
+ --enable-cpuinfo \
+ --enable-assembly \
+ --disable-oss \
+ --disable-alsa \
+ --disable-alsatest \
+ --disable-alsa-shared \
+ --disable-esd \
+ --disable-esdtest \
+ --disable-esd-shared \
+ --disable-pulseaudio \
+ --disable-pulseaudio-shared \
+ --disable-arts \
+ --disable-arts-shared \
+ --disable-nas \
+ --disable-diskaudio \
+ --disable-dummyaudio \
+ --disable-mintaudio \
+ --enable-nasm \
+ --disable-altivec \
+ --disable-ipod \
+ --disable-video \
+ --disable-x11-shared \
+ --disable-video-x11-dgamouse \
+ --disable-video-x11-xinerama \
+ --disable-video-x11-xme \
+ --disable-video-x11-xrandr \
+ --disable-video-x11 \
+ --disable-video-x11-vm \
+ --disable-video-x11-xv \
+ --without-x \
+ --disable-video-opengl \
+ --disable-video-nanox \
+ --disable-nanox-debug \
+ --disable-nanox-share-memory \
+ --disable-nanox-direct-fb \
+ --disable-dga \
+ --disable-video-dga \
+ --disable-video-photon \
+ --disable-video-carbon \
+ --disable-video-cocoa \
+ --disable-video-fbcon \
+ --disable-video-directfb \
+ --disable-video-ps2gs \
+ --disable-video-ggi \
+ --disable-video-svga \
+ --disable-video-vgl \
+ --disable-video-wscons \
+ --disable-video-aalib \
+ --disable-video-qtopia \
+ --disable-video-picogui \
+ --disable-video-dummy \
+ --disable-osmesa-shared \
+ --disable-input-events \
+ --disable-input-tslib \
+ --disable-pth \
+ --enable-pthreads \
+ --enable-pthread-sem \
+ --disable-stdio-redirect \
+ --disable-directx \
+ --enable-sdl-dlopen \
+ --disable-atari-ldg \
+ --disable-clock_gettime"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
+ --enable-libc \
+ --enable-audio \
+ --enable-events \
+ --enable-joystick \
+ --enable-cdrom \
+ --enable-threads \
+ --enable-timers \
+ --enable-file \
+ --enable-loadso \
+ --enable-cpuinfo \
+ --enable-assembly \
+ --disable-oss \
+ --enable-alsa \
+ --disable-alsatest \
+ --enable-alsa-shared \
+ --with-alsa-prefix=$SYSROOT_PREFIX/usr/lib \
+ --with-alsa-inc-prefix=$SYSROOT_PREFIX/usr/include \
+ --disable-esd \
+ --disable-esdtest \
+ --disable-esd-shared \
+ --disable-arts \
+ --disable-arts-shared \
+ --disable-nas \
+ --disable-diskaudio \
+ --disable-dummyaudio \
+ --disable-mintaudio \
+ --enable-nasm \
+ --disable-altivec \
+ --disable-ipod \
+ --disable-video-nanox \
+ --disable-nanox-debug \
+ --disable-nanox-share-memory \
+ --disable-nanox-direct-fb \
+ --disable-dga \
+ --disable-video-dga \
+ --disable-video-photon \
+ --disable-video-carbon \
+ --disable-video-cocoa \
+ --disable-video-fbcon \
+ --disable-video-directfb \
+ --disable-video-ps2gs \
+ --disable-video-ggi \
+ --disable-video-svga \
+ --disable-video-vgl \
+ --disable-video-wscons \
+ --disable-video-aalib \
+ --disable-video-qtopia \
+ --disable-video-picogui \
+ --disable-video-dummy \
+ --disable-osmesa-shared \
+ --enable-input-events \
+ --disable-input-tslib \
+ --disable-pth \
+ --enable-pthreads \
+ --enable-pthread-sem \
+ --disable-stdio-redirect \
+ --disable-directx \
+ --enable-sdl-dlopen \
+ --disable-atari-ldg \
+ --disable-clock_gettime"
+
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+ PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr"
+ PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libX11 libXrandr"
+
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video --enable-x11-shared --disable-video-x11-dgamouse"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinerama --disable-video-x11-xme"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video-x11-xrandr --enable-video-x11"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --disable-video-x11-xv --with-x"
+else
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video --disable-x11-shared --disable-video-x11-dgamouse"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinerama --disable-video-x11-xme"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xrandr --disable-video-x11"
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --disable-video-x11-xv --without-x"
+fi
+
+if [ "$OPENGL" = "Mesa" ]; then
+ PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
+ PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET Mesa glu"
+
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video-opengl"
+else
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-opengl"
+fi
+
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+ PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
+ PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
+
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio --enable-pulseaudio-shared"
+else
+ PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio --disable-pulseaudio-shared"
+fi
+
+pre_configure_host() {
+ ( cd $ROOT/$PKG_BUILD
+ rm -f acinclude/alsa.m4
+
+ # Skip autoheader because there is a problem with AC_DEFINE's in the configure.in in SDL 1.2.14.
+ # Added include directory 'acinclude' because SDL 1.2.14 has no Makefile.am in which to specify it.
+ AUTOHEADER=true autoreconf --verbose --install --force -I $SYSROOT_PREFIX/usr/share/aclocal -I acinclude
+ )
+}
+
+pre_configure_target() {
+ # todo: hack
+ pre_configure_host
+}
+
+post_makeinstall_target() {
+ mkdir -p $ROOT/$TOOLCHAIN/bin
+ cp $SYSROOT_PREFIX/usr/bin/sdl-config $ROOT/$TOOLCHAIN/bin
+ sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
+ -i $ROOT/$TOOLCHAIN/bin/sdl-config
+
+ rm -rf $INSTALL/usr/bin
+}
diff --git a/packages/multimedia/SDL_image-host/meta b/packages/multimedia/SDL_image-host/meta
index c46404a368..a6f22271d3 100644
--- a/packages/multimedia/SDL_image-host/meta
+++ b/packages/multimedia/SDL_image-host/meta
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://www.libsdl.org/"
PKG_URL=""
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain SDL-host libpng:host libjpeg-turbo:host"
+PKG_BUILD_DEPENDS="toolchain SDL:host libpng:host libjpeg-turbo:host"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libsdl_image: A cross-platform Graphic API"