diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-09-07 10:44:36 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-07 10:44:36 +0200 |
| commit | 4f8e5549a9ea263f1c33fc0f05b5a216a1d36524 (patch) | |
| tree | 42be84c9ffc850c420b1acf486835400bb6b28b9 /meta-oe/recipes-multimedia/vlc | |
| parent | 757cfa948ffb5317634d4b03def4de5e651937bf (diff) | |
| download | meta-openembedded-4f8e5549a9ea263f1c33fc0f05b5a216a1d36524.tar.gz | |
vlc: remove hal dependency, fix PR
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-multimedia/vlc')
| -rw-r--r-- | meta-oe/recipes-multimedia/vlc/vlc.inc | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc index bb67097f6c..b277f547fa 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc.inc +++ b/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-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb index f28323c35a..84897b04db 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb +++ b/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" |