Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

vlc-git: update to latest and fix winstore supp

Browse Source
This commit is contained in:
Martell Malone
2015-05-18 18:46:05 +01:00
parent 9b3ef707e1
commit bdfb147feb
4 changed files with 109 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mingw-w64-vlc-git/0012-Only-build-correct-modules-for-WINSTORE.patch
View File

@@ -1,6 +1,6 @@
From e6e3e8aa15791a7f4fb3f200dadf95b704bb6f56 Mon Sep 17 00:00:00 2001
From 79025b6c3eb3c75426fb5fa2519061c89f37abca Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Thu, 5 Mar 2015 01:43:37 +0000
Date: Mon, 18 May 2015 17:31:15 +0100
Subject: [PATCH] Only build correct modules for WINSTORE
---
@@ -9,10 +9,10 @@ They should be buildable but are not
Must find out why :)
diff --git a/Makefile.am b/Makefile.am
index b66c21b..25dfb30 100644
index 3c7831a..3448956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -981,6 +981,7 @@ dist_noinst_SCRIPTS += test/run_vlc.sh
@@ -982,6 +982,7 @@ dist_noinst_SCRIPTS += test/run_vlc.sh
# Installing plugins cache
###############################################################################
install-exec-hook:
@@ -20,7 +20,7 @@ index b66c21b..25dfb30 100644
if test "$(build)" = "$(host)"; then \
PATH="$(DESTDIR)$(bindir):$$PATH" \
LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
@@ -989,7 +990,7 @@ install-exec-hook:
@@ -990,7 +991,7 @@ install-exec-hook:
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
@@ -30,10 +30,10 @@ index b66c21b..25dfb30 100644
rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 3bc9146..724c296 100644
index 5ded5f5..5290525 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -255,8 +255,10 @@ if HAVE_DARWIN
@@ -267,8 +267,10 @@ if HAVE_DARWIN
libcdda_plugin_la_LIBADD += -liconv
libcdda_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
endif
@@ -44,7 +44,7 @@ index 3bc9146..724c296 100644
libvcd_plugin_la_SOURCES = access/vcd/vcd.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
libvcd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
@@ -264,8 +266,10 @@ if HAVE_DARWIN
@@ -276,8 +278,10 @@ if HAVE_DARWIN
libvcd_plugin_la_LIBADD = -liconv
libvcd_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
endif
@@ -55,7 +55,7 @@ index 3bc9146..724c296 100644
libvcdx_plugin_la_SOURCES = \
access/vcdx/access.h access/vcdx/access.c \
@@ -410,8 +414,10 @@ if HAVE_WIN32
@@ -422,8 +426,10 @@ if HAVE_WIN32
libsmb_plugin_la_LIBADD += -lmpr
endif
libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
@@ -168,11 +168,11 @@ index 589e5fe..a0441b2 100644
libauhal_plugin_la_SOURCES = audio_output/auhal.c \
audio_output/TPCircularBuffer.h audio_output/TPCircularBuffer.c
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 9c31230..1f8c7e4 100644
index f173c0e..a29fab6 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -345,8 +345,10 @@ libdxva2_plugin_la_SOURCES = \
codec/avcodec/dxva2.c
@@ -348,8 +348,10 @@ libdxva2_plugin_la_SOURCES = \
codec/avcodec/dxva2.c packetizer/h264_nal.c packetizer/h264_nal.h
libdxva2_plugin_la_LIBADD = -lole32 -lshlwapi -luuid
if HAVE_AVCODEC_DXVA2
+if !HAVE_WINSTORE
@@ -182,8 +182,8 @@ index 9c31230..1f8c7e4 100644
libvda_plugin_la_SOURCES = \
video_chroma/copy.c video_chroma/copy.h \
@@ -477,8 +479,10 @@ codec_LTLIBRARIES += $(LTLIBtwolame)
libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c codec/h264_nal.c codec/h264_nal.h
@@ -481,8 +483,10 @@ codec_LTLIBRARIES += $(LTLIBtwolame)
libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c packetizer/h264_nal.c packetizer/h264_nal.h
libcrystalhd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
+if !HAVE_WINSTORE
@@ -193,7 +193,7 @@ index 9c31230..1f8c7e4 100644
libqsv_plugin_la_SOURCES = codec/qsv.c
libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
@@ -494,21 +498,27 @@ libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c
@@ -498,21 +502,27 @@ libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c
libqsv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libdmo_plugin_la_LIBADD = $(LIBM)
if HAVE_WIN32
@@ -203,7 +203,7 @@ index 9c31230..1f8c7e4 100644
endif
+endif
libmft_plugin_la_SOURCES = codec/mft.c codec/h264_nal.c codec/h264_nal.h
libmft_plugin_la_SOURCES = codec/mft.c packetizer/h264_nal.c packetizer/h264_nal.h
if HAVE_WIN32
+if !HAVE_WINSTORE
libmft_plugin_la_LIBADD = -lole32 -luuid -lmfuuid -lmfplat
@@ -222,10 +222,10 @@ index 9c31230..1f8c7e4 100644
libgstdecode_plugin_la_SOURCES = codec/gstdecode.c
libgstdecode_plugin_la_CFLAGS = $(AM_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_APP_CFLAGS)
diff --git a/modules/control/Makefile.am b/modules/control/Makefile.am
index 70a8486..b732876 100644
index 06f258c..8f56eae 100644
--- a/modules/control/Makefile.am
+++ b/modules/control/Makefile.am
@@ -1,20 +1,27 @@
@@ -1,20 +1,28 @@
controldir = $(pluginsdir)/control
+control_LTLIBRARIES =
@@ -245,9 +245,9 @@ index 70a8486..b732876 100644
+control_LTLIBRARIES += libnetsync_plugin.la
+endif
+
liboldrc_plugin_la_SOURCES = control/rc.c control/intromsg.h
liboldrc_plugin_la_SOURCES = control/oldrc.c control/intromsg.h
liboldrc_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
-
-control_LTLIBRARIES = \
- libdummy_plugin.la \
- libgestures_plugin.la \
@@ -260,7 +260,7 @@ index 70a8486..b732876 100644
liblirc_plugin_la_SOURCES = control/lirc.c
liblirc_plugin_la_LIBADD = -llirc_client
@@ -64,8 +71,8 @@ libntservice_plugin_la_SOURCES = control/ntservice.c
@@ -64,8 +72,8 @@ libntservice_plugin_la_SOURCES = control/ntservice.c
libwin_hotkeys_plugin_la_SOURCES = control/globalhotkeys/win32.c
libwin_msg_plugin_la_SOURCES = control/win_msg.c
if HAVE_WIN32
@@ -271,7 +271,7 @@ index 70a8486..b732876 100644
endif
endif
diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am
index b526338..15cf2c1 100644
index 11fca94..42096ce 100644
--- a/modules/services_discovery/Makefile.am
+++ b/modules/services_discovery/Makefile.am
@@ -11,7 +11,9 @@ sd_LTLIBRARIES += libpodcast_plugin.la
@@ -362,5 +362,5 @@ index f0e023c..f6f952b 100644
if HAVE_XCB_RANDR
libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
--
2.3.1
2.4.1

127
mingw-w64-vlc-git/0014-dx11-vout-add-WINSTORE-support.patch
View File

@@ -1,18 +1,17 @@
From 0d41b3966dc4e0b41e5da7a618896b087ab19bfe Mon Sep 17 00:00:00 2001
From 035969096dfd54dcdddd454ce4a1932211f7d5f6 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Tue, 10 Mar 2015 19:34:09 +0000
Date: Mon, 18 May 2015 16:47:52 +0100
Subject: [PATCH] dx11 vout: add WINSTORE support
diff --git a/include/vlc_windows_interfaces.h b/include/vlc_windows_interfaces.h
index e4c41f2..85ac475 100644
index e4c41f2..bee2795 100644
--- a/include/vlc_windows_interfaces.h
+++ b/include/vlc_windows_interfaces.h
@@ -38,13 +38,13 @@
@@ -39,12 +39,13 @@
/* rpcndr.h defines small not only for idl */
#undef small
-
+#if !VLC_WINSTORE_APP
/* mingw.org fails to define this */
#ifndef __ITaskbarList3_INTERFACE_DEFINED__
@@ -24,21 +23,19 @@ index e4c41f2..85ac475 100644
typedef enum TBPFLAG
{
@@ -204,10 +204,10 @@ struct ITaskbarList3Vtbl
@@ -205,8 +206,10 @@ struct ITaskbarList3Vtbl
long ( WINAPI *ThumbBarUpdateButtons )(ITaskbarList3 *This, HWND hwnd,
UINT cButtons, LPTHUMBBUTTON pButton);
-
+#if !VLC_WINSTORE_APP
long ( WINAPI *ThumbBarSetImageList )(ITaskbarList3 *This, HWND hwnd,
HIMAGELIST himl);
-
+#endif
long ( WINAPI *SetOverlayIcon )(ITaskbarList3 *This, HWND hwnd,
HICON hIcon, LPCWSTR pszDescription);
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 943ad6a..1505a9f 100644
index 943ad6a..e59d93c 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -186,13 +186,13 @@ EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
@@ -60,10 +57,10 @@ index 943ad6a..1505a9f 100644
else
libdirect3d11_plugin_la_LIBADD = -ld3dcompiler -lole32 -luuid
diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index 8de44fd..a028515 100644
index 987f260..5a1733a 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -42,26 +42,30 @@
@@ -42,26 +42,31 @@
#include <vlc_windows_interfaces.h>
@@ -98,10 +95,11 @@ index 8de44fd..a028515 100644
SetRectEmpty(&sys->rect_parent);
- sys->is_first_display = true;
- sys->is_on_top = false;
+
var_Create(vd, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
@@ -70,7 +74,7 @@ int CommonInit(vout_display_t *vd)
@@ -70,7 +75,7 @@ int CommonInit(vout_display_t *vd)
sys->event = EventThreadCreate(vd);
if (!sys->event)
return VLC_EGENERIC;
@@ -110,7 +108,7 @@ index 8de44fd..a028515 100644
event_cfg_t cfg;
memset(&cfg, 0, sizeof(cfg));
#ifdef MODULE_NAME_IS_direct3d9
@@ -83,7 +87,7 @@ int CommonInit(vout_display_t *vd)
@@ -83,7 +88,7 @@ int CommonInit(vout_display_t *vd)
cfg.y = var_InheritInteger(vd, "video-y");
cfg.width = vd->cfg->display.width;
cfg.height = vd->cfg->display.height;
@@ -119,7 +117,7 @@ index 8de44fd..a028515 100644
event_hwnd_t hwnd;
if (EventThreadStart(sys->event, &hwnd, &cfg))
return VLC_EGENERIC;
@@ -100,7 +104,7 @@ int CommonInit(vout_display_t *vd)
@@ -100,7 +105,7 @@ int CommonInit(vout_display_t *vd)
}
DisableScreensaver (vd);
@@ -128,7 +126,7 @@ index 8de44fd..a028515 100644
return VLC_SUCCESS;
}
@@ -108,14 +112,14 @@ int CommonInit(vout_display_t *vd)
@@ -108,7 +113,7 @@ int CommonInit(vout_display_t *vd)
void CommonClean(vout_display_t *vd)
{
vout_display_sys_t *sys = vd->sys;
@@ -137,15 +135,15 @@ index 8de44fd..a028515 100644
if (sys->event) {
CommonChangeThumbnailClip(vd, false);
EventThreadStop(sys->event);
EventThreadDestroy(sys->event);
@@ -116,6 +121,7 @@ void CommonClean(vout_display_t *vd)
}
-
RestoreScreensaver(vd);
+#endif
}
/* */
@@ -133,7 +137,7 @@ void CommonManage(vout_display_t *vd)
@@ -133,7 +139,7 @@ void CommonManage(vout_display_t *vd)
* messages. But since window can stay blocked into this function for a
* long time (for example when you move your window on the screen), I
* decided to isolate PeekMessage in another thread. */
@@ -154,11 +152,7 @@ index 8de44fd..a028515 100644
/* If we do not control our window, we check for geometry changes
* ourselves because the parent might not send us its events. */
if (sys->hparent) {
@@ -166,10 +170,10 @@ void CommonManage(vout_display_t *vd)
UpdateRects(vd, NULL, NULL, true);
}
}
-
@@ -170,6 +176,7 @@ void CommonManage(vout_display_t *vd)
/* HasMoved means here resize or move */
if (EventThreadGetAndResetHasMoved(sys->event))
UpdateRects(vd, NULL, NULL, false);
@@ -166,7 +160,7 @@ index 8de44fd..a028515 100644
}
/**
@@ -179,7 +183,7 @@ void CommonManage(vout_display_t *vd)
@@ -179,7 +186,7 @@ void CommonManage(vout_display_t *vd)
void CommonDisplay(vout_display_t *vd)
{
vout_display_sys_t *sys = vd->sys;
@@ -175,7 +169,7 @@ index 8de44fd..a028515 100644
if (!sys->is_first_display)
return;
@@ -194,6 +198,7 @@ void CommonDisplay(vout_display_t *vd)
@@ -194,6 +201,7 @@ void CommonDisplay(vout_display_t *vd)
SWP_NOSIZE|
SWP_NOZORDER);
sys->is_first_display = false;
@@ -183,7 +177,7 @@ index 8de44fd..a028515 100644
}
/**
@@ -272,6 +277,7 @@ void AlignRect(RECT *r, int align_boundary, int align_size)
@@ -272,6 +280,7 @@ void AlignRect(RECT *r, int align_boundary, int align_size)
r->right = ((r->right - r->left + align_size/2) & ~align_size) + r->left;
}
@@ -191,14 +185,14 @@ index 8de44fd..a028515 100644
/* */
static void CommonChangeThumbnailClip(vout_display_t *vd, bool show)
{
@@ -709,3 +715,5 @@ static void RestoreScreensaver(vout_display_t *vd)
@@ -710,3 +719,5 @@ static void RestoreScreensaver(vout_display_t *vd)
sys->i_spi_screensaveactive, NULL, 0);
}
}
+
+#endif
diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c
index ba129f6..b4071a0 100644
index 8ed4598..41a68bb 100644
--- a/modules/video_output/msw/direct3d11.c
+++ b/modules/video_output/msw/direct3d11.c
@@ -42,7 +42,7 @@
@@ -206,23 +200,11 @@ index ba129f6..b4071a0 100644
# define D3DCompile(args...) sys->OurD3DCompile(args)
#else
-# define IDXGISwapChain_Present(args...) IDXGISwapChain_Present1(args)
+//# define IDXGISwapChain_Present(a,b,c) IDXGISwapChain_Present1(a,b,c)
+//# define IDXGISwapChain_Present(args...) IDXGISwapChain_Present1(args)
# define IDXGIFactory_CreateSwapChain(a,b,c,d) IDXGIFactory2_CreateSwapChainForComposition(a,b,c,NULL,d)
# define DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC1
#endif
@@ -104,9 +104,9 @@ static void Direct3D11DestroyResources(vout_display_t *);
static int Direct3D11MapTexture(picture_t *);
-/* All the #if 0 contain an alternative method to setup dx11
+/* All the #ifdef METHOD_2 contain an alternative method to setup dx11
They both need to be benchmarked to see which performs better */
-#if 0
+#ifdef METHOD_2
/* I have no idea why MS decided dxgi headers do not define this
As they do have prototypes for d3d11 functions */
typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
@@ -219,7 +219,9 @@ static int Open(vlc_object_t *object)
@@ -431,7 +431,9 @@ static int Open(vlc_object_t *object)
vd->pool = CommonPool;
vd->prepare = Prepare;
vd->display = Display;
@@ -232,58 +214,21 @@ index ba129f6..b4071a0 100644
vd->manage = CommonManage;
msg_Dbg(vd, "Direct3D11 Open Succeeded");
@@ -304,7 +306,7 @@ static int Direct3D11Create(vout_display_t *vd)
return VLC_EGENERIC;
@@ -764,17 +766,17 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
sys->d3dPxShader = globPixelShaderDefault;
break;
}
-# if 0
+# ifdef METHOD_2
HINSTANCE hdxgi_dll = LoadLibrary(TEXT("DXGI.DLL"));
if (!hdxgi_dll) {
msg_Warn(vd, "cannot load dxgi.dll, aborting");
@@ -347,7 +349,7 @@ static int Direct3D11Create(vout_display_t *vd)
return VLC_EGENERIC;
}
-# if 0
+# ifdef METHOD_2
sys->hdxgi_dll = hdxgi_dll;
@@ -403,7 +405,7 @@ static void Direct3D11Destroy(vout_display_t *vd)
vout_display_sys_t *sys = vd->sys;
-# if 0
+# ifdef METHOD_2
if (sys->hdxgi_dll)
FreeLibrary(sys->hdxgi_dll);
# endif
@@ -477,7 +479,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
scd.OutputWindow = sys->hvideownd;
# endif
-# if 0
+# ifdef METHOD_2
/* TODO : list adapters for the user to choose from */
hr = IDXGIFactory_EnumAdapters(sys->dxgifactory, 0, &sys->dxgiadapter);
@@ -584,18 +586,19 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
# endif
# endif
-#endif
- UpdateRects(vd, NULL, NULL, true);
+ UpdateRects(vd, NULL, NULL, true);
-
+#if !VLC_WINSTORE_APP
UpdateRects(vd, NULL, NULL, true);
-
+#endif
if (Direct3D11CreateResources(vd, fmt)) {
msg_Err(vd, "Failed to allocate resources");
Direct3D11DestroyResources(vd);
return VLC_EGENERIC;
}
-
+#if !VLC_WINSTORE_APP
EventThreadUpdateTitle(sys->event, VOUT_TITLE " (Direct3D11 output)");
-
@@ -292,5 +237,5 @@ index ba129f6..b4071a0 100644
return VLC_SUCCESS;
}
--
2.3.1
2.4.1

26
mingw-w64-vlc-git/0015-fixups-time.h-is-assumed-in-many-places.patch Normal file
View File

@@ -0,0 +1,26 @@
From 5d2e3cac97b6c119e6a55f5a6c715a7932556634 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Mon, 18 May 2015 17:26:53 +0100
Subject: [PATCH 1/2] fixups: time.h is assumed in many places
---
include/vlc_fixups.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index f844641..0c72af7 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -26,9 +26,7 @@
#ifndef LIBVLC_FIXUPS_H
# define LIBVLC_FIXUPS_H 1
-#if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R)
# include <time.h> /* time_t */
-#endif
#ifndef HAVE_LLDIV
typedef struct
--
2.4.1

45
mingw-w64-vlc-git/PKGBUILD
View File

@@ -2,15 +2,15 @@
# Contributor: Alexey Pavlov <alexpux@gmail.com>
# Contributor: Ray Donnelly <mingw.android@gmail.com>
#_variant=winrt
_variant=desktop
#_variant=winrt #desktop
_variant=winrt
_realname=vlc
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_ver_base=2.2
pkgver=3.0.0.60014.fd21eb0
pkgver=3.0.0.60785.d1bc937
pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('any')
@@ -49,7 +49,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-a52dec"
"${MINGW_PACKAGE_PREFIX}-libtheora"
"${MINGW_PACKAGE_PREFIX}-libvpx"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-lua"
"${MINGW_PACKAGE_PREFIX}-lua51"
"${MINGW_PACKAGE_PREFIX}-opencv"
"${MINGW_PACKAGE_PREFIX}-opus"
"${MINGW_PACKAGE_PREFIX}-portaudio"
@@ -76,6 +76,7 @@ makedepends=(
"autoconf"
"automake"
"libtool"
"make"
# 'libkate'
# 'live-media'
# 'libnotify'
@@ -111,27 +112,25 @@ makedepends=(
options=('strip' '!emptydirs')
source=(#"${_realname}-${_ver_base}"::"git://git.videolan.org/${_realname}/${_realname}-${_ver_base}.git"
"${_realname}"::"git://git.videolan.org/${_realname}.git"
0001-MinGW-w64-fix-redeclaration-of-MFAudioFormat_Dolby_A.patch
0002-MinGW-w64-lfind-s-_NumOfElements-is-an-unsigned-int.patch
0003-MinGW-w64-don-t-pass-static-to-pkg-config-if-SYS-min.patch
0005-Revert-Win32-prefer-the-static-libraries-when-creati.patch
0007-Use-libdir-for-plugins-on-msys2.patch
0008-Fix-localtime_r-and-gmtime_r-inline-issues.patch
0011-Add-include-on-WINSTORE-for-QueueTimer-functions.patch
0012-Only-build-correct-modules-for-WINSTORE.patch
0013-remove-AllocConsole-reference-for-WINSTORE.patch
0014-dx11-vout-add-WINSTORE-support.patch)
0014-dx11-vout-add-WINSTORE-support.patch
0015-fixups-time.h-is-assumed-in-many-places.patch)
md5sums=('SKIP'
'c2a4338d8c9396054c1ed45fae221470'
'13f5a8bf897b253e0d9626a5ae79bc8d'
'c53c41b440eb42e7a2cda9109a1651c4'
'8cd35991a69b14a1c3ab3b6faa9f15bc'
'b6a010849631177493135b3ad7c5f784'
'dc623f31cffed63092b192b24ab86f0d'
'3ab07dce68513b6d37321f36141a8340'
'c3d58a3f6ce7e82f68aa6c32453643bb'
'4c286b5d83b67e6c0ca15c16b9376fc4'
'0b3303af4b3d68cf5317f025975adb32'
'c9eb72a2a8126f2a5c643069eed757b7')
'7720533f97d4d8aeeecfd6b4f9b1f5b5'
'7935a0abb05472342473e9aafa3c426f')
pkgver() {
cd $_realname
@@ -146,21 +145,22 @@ pkgver() {
prepare() {
cd "${srcdir}"/${_realname}
git am "${srcdir}"/0001-MinGW-w64-fix-redeclaration-of-MFAudioFormat_Dolby_A.patch
git am "${srcdir}"/0002-MinGW-w64-lfind-s-_NumOfElements-is-an-unsigned-int.patch
git am "${srcdir}"/0003-MinGW-w64-don-t-pass-static-to-pkg-config-if-SYS-min.patch
git am "${srcdir}"/0015-fixups-time.h-is-assumed-in-many-places.patch
git am "${srcdir}"/0005-Revert-Win32-prefer-the-static-libraries-when-creati.patch
git am "${srcdir}"/0008-Fix-localtime_r-and-gmtime_r-inline-issues.patch
if [ "${_variant}" != "winrt" ]; then
git am "${srcdir}"/0007-Use-libdir-for-plugins-on-msys2.patch
fi
git am "${srcdir}"/0011-Add-include-on-WINSTORE-for-QueueTimer-functions.patch
git am "${srcdir}"/0012-Only-build-correct-modules-for-WINSTORE.patch
git am "${srcdir}"/0013-remove-AllocConsole-reference-for-WINSTORE.patch
git am "${srcdir}"/0012-Only-build-correct-modules-for-WINSTORE.patch
git am "${srcdir}"/0014-dx11-vout-add-WINSTORE-support.patch
./bootstrap
@@ -171,9 +171,6 @@ fi
build() {
cd "${srcdir}"/${_realname}
./bootstrap
mkdir -p ${srcdir}/build-${MINGW_CHOST}
cd ${srcdir}/build-${MINGW_CHOST}
@@ -241,8 +238,11 @@ if [ "${_variant}" = "winrt" ]; then
--disable-taglib \
--disable-ncurses \
--disable-dbus \
LUAC==${MINGW_PREFIX}/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
RCC==${MINGW_PREFIX}/bin/rcc
--disable-lua
# Having some issues with lua 5.2, disable for now
#LUAC==${MINGW_PREFIX}/bin/luac51 LUA_LIBS="`pkg-config --libs lua`" \
#RCC==${MINGW_PREFIX}/bin/rcc
#todo: look at direct for winRT
# --disable-dirac
@@ -264,8 +264,11 @@ else
--disable-sdl \
--disable-telx \
--enable-nls \
LUAC==${MINGW_PREFIX}/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
RCC==${MINGW_PREFIX}/bin/rcc
--disable-lua
# Having some issues with lua 5.2, disable for now
#LUAC==${MINGW_PREFIX}/bin/luac51 LUA_LIBS="`pkg-config --libs lua`" \
#RCC==${MINGW_PREFIX}/bin/rcc
fi