[oe-commits] Martin Jansa : Revert "libsdl-image, vlc, xbmc: Blacklist because of broken libsdl-image after libsdl2-config was removed "

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: e7b8a4b072767bb77263dfe4af1a78c9f9d86222
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=e7b8a4b072767bb77263dfe4af1a78c9f9d86222

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Jun 19 13:44:55 2014 +0200

Revert "libsdl-image, vlc, xbmc: Blacklist because of broken libsdl-image after libsdl2-config was removed"

This reverts commit 912d7e1df247b27d211edcf0b26ab8182a887b3f.

---

 meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb           | 2 --
 meta-multimedia/recipes-multimedia/vlc/vlc.inc                 | 2 --
 meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb | 2 --
 3 files changed, 6 deletions(-)

diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 00806d9..4b65152 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -3,8 +3,6 @@ SUMMARY = "XBMC Media Center"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
 
-PNBLACKLIST[xbmc] = "BROKEN: depends on broken libsdl-image"
-
 DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib libtinyxml libmad"
 #require recipes/egl/egl.inc
 
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index e773082..58f5648 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -5,8 +5,6 @@ SECTION = "multimedia"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-PNBLACKLIST[vlc] = "BROKEN: depends on broken libsdl-image"
-
 DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl \
    libsdl-image qt4-x11-free dbus dbus-glib libxml2 gnutls tremor \
    faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib libdvdcss \
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
index bfb704a..95dbff8 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -4,8 +4,6 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227"
 
-PNBLACKLIST[libsdl-image] = "BROKEN: needs to be updated to use libsdl pkg-config instead of libsdl2-config"
-
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \