aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-10 21:11:12 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-11 01:54:23 +0100
commitc3494762a34fce44d9b0103047d864ad58c36d30 (patch)
treebed3efa8d56924bfcdc84ef1e0868808c72c2274 /meta-oe/recipes-multimedia
parent609e4e98967955cff5004b4afc3eaa84b423394d (diff)
downloadmeta-openembedded-c3494762a34fce44d9b0103047d864ad58c36d30.tar.gz
vlc: disable kde-solid
* fixes: WARNING: QA Issue: vlc: Files/directories were installed but not shipped /usr/share/kde4 /usr/share/kde4/apps /usr/share/kde4/apps/solid /usr/share/kde4/apps/solid/actions /usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop /usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop /usr/share/kde4/apps/solid/actions/vlc-opencda.desktop Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/vlc/vlc.inc2
-rw-r--r--meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index 7353f908e6..1ccda70f88 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -62,6 +62,7 @@ EXTRA_OECONF = "\
--enable-dbus \
--disable-hal \
--without-contrib \
+ --without-kde-solid \
--disable-opengl --disable-glx \
--enable-realrtsp \
ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
@@ -82,4 +83,3 @@ do_configure() {
sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
}
-
diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
index 6ef0b6bbf7..7bb6b16fe1 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
require vlc.inc
-PR = "r2"
+PR = "r3"
# work around build failure
EXTRA_OECONF += " --enable-libxml2=no"