From a8b6046e91995edf19d396ba4231ecaf02c0d77b Mon Sep 17 00:00:00 2001
From: martell <martellmalone@gmail.com>
Date: Mon, 17 Nov 2014 23:08:47 +0000
Subject: [PATCH] vlc-git: fixed for latest mingw-wruntime

---
 mingw-w64-vlc-git/0003-fix-prog-find-2.2.patch      | 10 +++++-----
 .../0004-skip-pthread-time-declares.patch           | 13 ++-----------
 mingw-w64-vlc-git/0006-fix-time-mingw-include.patch | 13 +++++++++++++
 mingw-w64-vlc-git/PKGBUILD                          |  9 ++++++---
 4 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 mingw-w64-vlc-git/0006-fix-time-mingw-include.patch

diff --git a/mingw-w64-vlc-git/0003-fix-prog-find-2.2.patch b/mingw-w64-vlc-git/0003-fix-prog-find-2.2.patch
index 4d1046b5ea..2182d0a967 100644
--- a/mingw-w64-vlc-git/0003-fix-prog-find-2.2.patch
+++ b/mingw-w64-vlc-git/0003-fix-prog-find-2.2.patch
@@ -7,9 +7,9 @@
 -      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_PROG(MOC, [moc-qt5 moc], moc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+      AC_PATH_PROG(RCC, [rcc-qt5 rcc], rcc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+      AC_PATH_PROG(UIC, [uic-qt5 uic], uic, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
++      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"])
      ], [
        PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
          AS_IF([test -n "${enable_qt}"],[
@@ -18,10 +18,10 @@
        ])
        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_PROG(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
++      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
        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_PROG(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
++      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
      ])
  ])
  AS_IF([test "${enable_qt}" != "no"], [
diff --git a/mingw-w64-vlc-git/0004-skip-pthread-time-declares.patch b/mingw-w64-vlc-git/0004-skip-pthread-time-declares.patch
index 278f35e0d5..4ea44a5180 100644
--- a/mingw-w64-vlc-git/0004-skip-pthread-time-declares.patch
+++ b/mingw-w64-vlc-git/0004-skip-pthread-time-declares.patch
@@ -1,19 +1,11 @@
 --- vlc/modules/gui/qt4/Makefile.am	2014-10-16 20:03:35.772278000 +0100
 +++ vlc/modules/gui/qt4/Makefile.am	2014-10-16 20:04:00.121609700 +0100
-@@ -13,14 +13,14 @@
- #   - Add it to DEPS_res
- 
- SUFFIXES += .ui .h .hpp .moc.cpp
--
-+QT_CFLAGS += -DNO_TIME_PLZ
- libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt4)
- libqt4_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt4)
- libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
+@@ -20,7 +20,7 @@ libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
  if HAVE_OS2
  else
  if HAVE_WIN32
 -libqt4_plugin_la_LIBADD += -lole32
-+libqt4_plugin_la_LIBADD += -lole32 -lcomctl32
++libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid
  else
  libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
  endif
@@ -32,7 +24,6 @@
   #else
    Q_IMPORT_PLUGIN(qjpeg)
    Q_IMPORT_PLUGIN(qtaccessiblewidgets)
-
 #@@ -13,7 +13,7 @@
 # #   - Add it to DEPS_res
 # 
diff --git a/mingw-w64-vlc-git/0006-fix-time-mingw-include.patch b/mingw-w64-vlc-git/0006-fix-time-mingw-include.patch
new file mode 100644
index 0000000000..0726af889e
--- /dev/null
+++ b/mingw-w64-vlc-git/0006-fix-time-mingw-include.patch
@@ -0,0 +1,13 @@
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index c3d5fac..390cbcd 100644
+--- a/include/vlc_fixups.h
++++ b/include/vlc_fixups.h
+@@ -26,7 +26,7 @@
+ #ifndef LIBVLC_FIXUPS_H
+ # define LIBVLC_FIXUPS_H 1
+ 
+-#if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R)
++#if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R) || defined (__MINGW32__)
+ # include <time.h> /* time_t */
+ #endif
+ 
diff --git a/mingw-w64-vlc-git/PKGBUILD b/mingw-w64-vlc-git/PKGBUILD
index 3ce2126630..61f89aea83 100644
--- a/mingw-w64-vlc-git/PKGBUILD
+++ b/mingw-w64-vlc-git/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=2.2
-pkgver=2.2.0.58010.e782ae3
+pkgver=2.2.0.58154.81457d2
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('any')
@@ -110,14 +110,16 @@ source=("${_realname}-${_ver_base}"::"git://git.videolan.org/${_realname}/${_rea
         0003-fix-prog-find-2.2.patch
         0004-skip-pthread-time-declares.patch
         0005-disablestatic.patch
+        0006-fix-time-mingw-include.patch
         0010-fix_REENTRANT-2.2.patch
         0011-prefer-static-libs.patch)
 md5sums=('SKIP'
          'a546326fd9beb9a04e066bad6c1945c9'
          'e1d4601bec65f1287f87a66b13f98226'
-         '0ea45934d7819fe63384dd8ef95c9de2'
-         'e17fb5732ceaa7897a5f5183764393ad'
+         '6f5658882060d0a33c8ba45186fcaf69'
+         '76ad5b8bf5850cc47e11580fd3bbc179'
          '1e544f65bd17b5af5b862098412f99f7'
+         '6e7eb88c80751432a9e1214ea567f8ba'
          'd858696f47e0688b4706d598fd7e42ed'
          'bc2038d61add89c423dc7145cdc6c843')
 
@@ -139,6 +141,7 @@ prepare() {
   patch -p1 -i  "${srcdir}/0003-fix-prog-find-2.2.patch"
   patch -p1 -i  "${srcdir}/0004-skip-pthread-time-declares.patch"
   patch -p1 -i  "${srcdir}/0005-disablestatic.patch"
+  patch -p1 -i  "${srcdir}/0006-fix-time-mingw-include.patch"
   patch -p1 -i  "${srcdir}/0010-fix_REENTRANT-2.2.patch"
   patch -Rp1 -i "${srcdir}/0011-prefer-static-libs.patch"