Patchwork [86/90] vlc: disable kde-solid

login
register
mail settings
Submitter Martin Jansa
Date Dec. 11, 2012, 12:59 a.m.
Message ID <c3494762a34fce44d9b0103047d864ad58c36d30.1355187290.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40715/
State Accepted
Commit c3494762a34fce44d9b0103047d864ad58c36d30
Headers show

Comments

Martin Jansa - Dec. 11, 2012, 12:59 a.m.
* 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>
---
 meta-oe/recipes-multimedia/vlc/vlc.inc       | 2 +-
 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index 7353f90..1ccda70 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 6ef0b6b..7bb6b16 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"