diff options
author | Tim Orling <TicoTimo@gmail.com> | 2015-08-02 17:39:07 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 11:52:29 +0200 |
commit | 9fee5145d7bf011df948fb82aca14b488c7c38c2 (patch) | |
tree | cf5aa4617008eaf52542dda0810566ae24dfb786 /meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch | |
parent | 2262233da0fe1deae6d35988ab405bc0aedcad5b (diff) | |
download | meta-openembedded-contrib-9fee5145d7bf011df948fb82aca14b488c7c38c2.tar.gz |
vlc: update to 2.2.1
* add several pkg configs and libsamplerate0 dependency to vlc.inc
* update patches 0003 and 0004
* add patch to use tremor's libvorbisidec rather than libvorbisdec
* add patch to fix luaL_checkint and luaL_optint (deprecated in lua 5.3)
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch')
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch | 24 |
1 files changed, 13 insertions, 11 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 index 3dadb237e4..53df1c6ebf 100644 --- 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 @@ -1,17 +1,19 @@ -* modules/gui/qt4/Modules.am not B!=S friendly +* modules/gui/qt4/Makefile.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 +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +Index: vlc-2.2.1/modules/gui/qt4/Makefile.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 +--- vlc-2.2.1.orig/modules/gui/qt4/Makefile.am ++++ vlc-2.2.1/modules/gui/qt4/Makefile.am +@@ -127,6 +127,7 @@ moc_verbose_0 = @echo " MOC " $@; + moc_verbose__0 = $(moc_verbose_0) + + .hpp.moc.cpp: + [ -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 + $(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $< + + # These MOC files depend on the configure settings: |