aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2014-07-19 21:07:39 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:01:59 +0200
commit94a46455c2d28b8a952f61ba7931cca9097747a3 (patch)
tree3ac9b8034423e20b4d89f9c62d1fadb66160574e
parent6898dae64e79fa81c3b032cb314e3c2d6f2c6e0d (diff)
downloadmeta-openembedded-contrib-94a46455c2d28b8a952f61ba7931cca9097747a3.tar.gz
meta-openembedded-contrib-94a46455c2d28b8a952f61ba7931cca9097747a3.tar.bz2
meta-openembedded-contrib-94a46455c2d28b8a952f61ba7931cca9097747a3.zip
vlc: modules/gui/qt4/Modules.am not B!=S friendly
Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch17
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb1
2 files changed, 18 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
new file mode 100644
index 0000000000..3dadb237e4
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
@@ -0,0 +1,17 @@
+* modules/gui/qt4/Modules.am not B!=S friendly
+* Simple solution to missing directories in ${B}
+
+Upstream status: Pending
+
+Index: vlc-2.1.4/modules/gui/qt4/Modules.am
+===================================================================
+--- vlc-2.1.4.orig/modules/gui/qt4/Modules.am
++++ vlc-2.1.4/modules/gui/qt4/Modules.am
+@@ -261,6 +261,7 @@ else
+ if HAVE_WIN32
+ $(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+ else
++ [ -d $(dir $@) ] || mkdir -p $(dir $@)
+ $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+ endif
+ endif
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
index 98d18552c9..f9be48dba8 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.4.bb
@@ -6,6 +6,7 @@ EXTRA_OECONF += " --enable-libxml2=no"
SRC_URI += "file://0001-enable-subdir-objects.patch \
file://0002-glibc-does-not-provide-strlcpy.patch \
file://0003-use-am-path-libgcrypt.patch \
+ file://0004-modules-gui-qt4-out-of-tree-build.patch \
"
SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"