summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia
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 /meta-multimedia/recipes-multimedia
parent6898dae64e79fa81c3b032cb314e3c2d6f2c6e0d (diff)
downloadmeta-openembedded-94a46455c2d28b8a952f61ba7931cca9097747a3.tar.gz
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>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
-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 000000000..3dadb237e
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
@@ -0,0 +1,17 @@
1* modules/gui/qt4/Modules.am not B!=S friendly
2* Simple solution to missing directories in ${B}
3
4Upstream status: Pending
5
6Index: vlc-2.1.4/modules/gui/qt4/Modules.am
7===================================================================
8--- vlc-2.1.4.orig/modules/gui/qt4/Modules.am
9+++ vlc-2.1.4/modules/gui/qt4/Modules.am
10@@ -261,6 +261,7 @@ else
11 if HAVE_WIN32
12 $(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
13 else
14+ [ -d $(dir $@) ] || mkdir -p $(dir $@)
15 $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
16 endif
17 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 98d18552c..f9be48dba 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"
6SRC_URI += "file://0001-enable-subdir-objects.patch \ 6SRC_URI += "file://0001-enable-subdir-objects.patch \
7 file://0002-glibc-does-not-provide-strlcpy.patch \ 7 file://0002-glibc-does-not-provide-strlcpy.patch \
8 file://0003-use-am-path-libgcrypt.patch \ 8 file://0003-use-am-path-libgcrypt.patch \
9 file://0004-modules-gui-qt4-out-of-tree-build.patch \
9" 10"
10 11
11SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222" 12SRC_URI[md5sum] = "7ed67d22f7425011078772bfc62ac222"