Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 video/transcode/HISTORY      |    4 ++++
 video/vlc/DEPENDS            |    5 +++++
 video/vlc/HISTORY            |    5 +++++
 video/vlc/PRE_BUILD          |    6 ++++++
 video/vlc/configure-qt.patch |   27 +++++++++++++++++++++++++++
 5 files changed, 47 insertions(+)

New commits:
commit d5f843bb751c5ca781a888cb65a8f6471fd997da
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    vlc: fix build to look for qt tools in PATH

commit 8c24ff60f830b36d85e8ad294eb347560594d526
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    transcode: fix build by removing leftover SCRIBBLED from previous commit 
here

diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index f46c0df..aeefd35 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,6 @@
+2015-04-30 Thomas Orgis <sobukus AT sourcemage.org>
+       * SCRIBBLED: removed, fixing build again
+
 2014-01-15 Robin Cook <rcook AT wyrms.net>
        * PRE_BUILD: added to apply patches from gentoo
 
@@ -6,6 +9,7 @@
 
 2012-07-21 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: hotfix to make it build (disabling xvid)
+
 2012-03-21 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.1.7, SOURCE_URL[0] updated
 
diff --git a/video/transcode/SCRIBBLED b/video/transcode/SCRIBBLED
deleted file mode 100644
index e69de29..0000000
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index ee34b65..5f5fde1 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -6,6 +6,11 @@ optional_depends  "QT"                            \
                   "--disable-qt --disable-skins2" \
                   "for Qt interface"              &&
 
+# Need to fixup configure.
+if is_depends_enabled $SPELL qt4 || is_depends_enabled_spell qtbase; then
+  depends autoconf
+fi &&
+
 optional_depends  "ncurses"               \
                   "--enable-ncurses"      \
                   "--disable-ncurses"     \
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 02a2666..b3fdcf7 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,8 @@
+2015-04-30 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: fix build error if QT is enabled, finding the _correct_ 
moc
+       * configure-qt.patch: added
+       * DEPENDS: needs autoconf, then
+
 2015-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD: fix build error if qt4 is enabled, moc was not found
 
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..fafb544 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,6 +1,12 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
+if is_depends_enabled $SPELL qt4 || is_depends_enabled $SPELL qtbase; then
+  message "${MESSAGE_COLOR}Patching configure for QT paths.$DEFAULT_COLOR" &&
+  patch -p0 < "$SCRIPT_DIRECTORY/configure-qt.patch" &&
+  autoreconf
+fi &&
+
 MOZ_MAKEFILE="projects/mozilla/Makefile.in"  &&
 if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
   sedit  's:$(libdir)/mozilla:$(libdir)/firefox:'  $MOZ_MAKEFILE
diff --git a/video/vlc/configure-qt.patch b/video/vlc/configure-qt.patch
new file mode 100644
index 0000000..7e0b57e
--- /dev/null
+++ b/video/vlc/configure-qt.patch
@@ -0,0 +1,27 @@
+--- configure.ac.orig  2015-04-30 10:06:41.747760390 +0200
++++ configure.ac       2015-04-30 10:08:57.777059790 +0200
+@@ -3718,9 +3718,9 @@
+       ])
+       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
+       QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
+-      AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" 
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+-      AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" 
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+-      AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" 
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
++      AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [])
++      AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, [])
++      AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, [])
+     ], [
+       PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
+         AS_IF([test -n "${enable_qt}"],[
+@@ -3731,9 +3731,9 @@
+         enable_qt="no"
+       ])
+       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
+-      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" 
"${CONTRIB_DIR}/bin"])
++      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [])
+       AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
+-      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" 
"${CONTRIB_DIR}/bin"])
++      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [])
+     ])
+ ])
+ AS_IF([test "${enable_qt}" != "no"], [