summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/vlc
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/vlc
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/vlc')
-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 7353f908e..1ccda70f8 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -62,6 +62,7 @@ EXTRA_OECONF = "\
62 --enable-dbus \ 62 --enable-dbus \
63 --disable-hal \ 63 --disable-hal \
64 --without-contrib \ 64 --without-contrib \
65 --without-kde-solid \
65 --disable-opengl --disable-glx \ 66 --disable-opengl --disable-glx \
66 --enable-realrtsp \ 67 --enable-realrtsp \
67 ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ 68 ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
@@ -82,4 +83,3 @@ do_configure() {
82 sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config 83 sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
83 sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile 84 sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
84} 85}
85
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 6ef0b6bbf..7bb6b16fe 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"
5 5
6require vlc.inc 6require vlc.inc
7 7
8PR = "r2" 8PR = "r3"
9 9
10# work around build failure 10# work around build failure
11EXTRA_OECONF += " --enable-libxml2=no" 11EXTRA_OECONF += " --enable-libxml2=no"