vlc: remove hal dependency, fix PR

(From meta-openembedded rev: 4f8e5549a9ea263f1c33fc0f05b5a216a1d36524)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc
index bb67097..b277f54 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPLv2"
 SECTION = "multimedia"
 
-DEPENDS = "libfribidi libtool hal gettext libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
+DEPENDS = "libfribidi libtool gettext libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
@@ -60,7 +60,7 @@ EXTRA_OECONF = "\
        --enable-live555 --enable-tremor \
        --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \
        --enable-dbus \
-       --enable-hal \  
+       --disable-hal \ 
        --without-contrib \
        --disable-opengl --disable-glx \
        --enable-realrtsp \

diff --git a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
index f28323c..84897b0 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
@@ -1,11 +1,9 @@
 # This recipe packages vlc as a library as well, so qt4 dependencies
-# can be avoided when ony the library is installed.
-# Would be cool if when newer vlc is added to OE and older ones are phased
-# out that could be made the default.
+# can be avoided when only the library is installed.
 
 require vlc.inc
 
-PR = "${INC_PR}.1"
+PR = "r1"
 
 SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
 SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"