vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now
PATCH v2 1/1 vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now
* re-adds dropped depends as they are available now
* removes ENTERPRISE_DISTRO as sugested by Martin Jansa
* and adds libxpm as dependency as current vlc's config depends on it.
* bumps PR
--- meta-oe/recipes-multimedia/vlc/vlc.inc | 3 +-- meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/vlc/vlc.inc +1 -2
@@ -4,8 +4,7 @@ LICENSE = "GPLv2" SECTION = "multimedia" DEPENDS = "libfribidi libtool 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)}" + libmad libid3tag liba52 mpeg2dec libxpm" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb +2 -0
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13" require vlc.inc +PR = "r1" + # work around build failure EXTRA_OECONF += " --enable-libxml2=no"
Signature · 1 line
1.7.5.4
My bad, I did not get the point from Martin Jansa. I will send a new patch
2011/12/20 Sylvain 'GarthPS' Paré <[email protected]>
Quoted 48 lines
* re-adds dropped depends as they are available now
* removesENTERPRISE_DISTROas sugested by Martin Jansa
* and adds libxpm as dependency as current vlc's config depends on it.
* bumps PRSigned-off-by Sylvain 'GarthPS' Paré <[email protected]>--- meta-oe/recipes-multimedia/vlc/vlc.inc | 3 +-- meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)meta-oe/recipes-multimedia/vlc/vlc.inc +0
-2@@ -4,8 +4,7 @@ LICENSE = "GPLv2" SECTION = "multimedia" DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ -" -# ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmadlibid3tag liba52 mpeg2dec', d)}"
+ libmad libid3tag liba52 mpeg2dec libxpm"
SRC_URI= "
http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"(quoted diff) +0
-0vlc_1.1.11.bb
index fb69e05..9f53159 100644meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb +0
-0@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
require vlc.inc
meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb +2
-1+PR = "r1" + # work around build failure EXTRA_OECONF += " --enable-libxml2=no" --1.7.5.4