Rebuilt for mingw32-nettle-3.3
[git/cygwin-packages/mingw64-i686-gstreamer1.0-plugins-bad-free.git] / 1.6.1-mingw32-decklink.patch
CommitLineData
acb43578
YS
1--- origsrc/gst-plugins-bad-1.6.1/configure.ac 2015-10-30 07:11:05.000000000 -0500
2+++ src/gst-plugins-bad-1.6.1/configure.ac 2015-11-24 10:24:23.460394600 -0600
3@@ -1910,6 +1910,12 @@ AG_GST_CHECK_FEATURE(DECKLINK, [decklink
4 ])
5 fi
6 ;;
7+ *-*mingw*)
8+ HAVE_DECKLINK=yes
9+ DECKLINK_CXXFLAGS=
10+ DECKLINK_LIBS="-lole32"
11+ HAVE_DECKLINK_WIN=yes
12+ ;;
13 *)
14 HAVE_DECKLINK=no
15 ;;
16@@ -1919,6 +1925,7 @@ AG_GST_CHECK_FEATURE(DECKLINK, [decklink
17 AC_SUBST(DECKLINK_LIBS)
18 ])
19 AM_CONDITIONAL(DECKLINK_OSX, test "x$HAVE_DECKLINK_OSX" = xyes)
20+AM_CONDITIONAL(DECKLINK_WIN, test "x$HAVE_DECKLINK_WIN" = xyes)
21
22 dnl **** DirectFB ****
23 translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTFB, true)
24--- origsrc/gst-plugins-bad-1.6.1/sys/decklink/Makefile.am 2015-10-22 03:04:08.000000000 -0500
25+++ src/gst-plugins-bad-1.6.1/sys/decklink/Makefile.am 2015-11-24 00:52:15.990238900 -0600
26@@ -34,9 +34,16 @@ if DECKLINK_OSX
27 libgstdecklink_la_SOURCES += \
28 osx/DeckLinkAPIDispatch.cpp
29 else
30+if DECKLINK_WIN
31+libgstdecklink_la_CPPFLAGS += \
32+ -DCOBJMACROS=1
33+libgstdecklink_la_SOURCES += \
34+ win/DeckLinkAPIDispatch.cpp
35+else
36 libgstdecklink_la_SOURCES += \
37 linux/DeckLinkAPIDispatch.cpp
38 endif
39+endif
40
41 noinst_HEADERS = \
42 gstdecklink.h \
43--- origsrc/gst-plugins-bad-1.6.1/sys/decklink/gstdecklink.cpp 2015-10-22 03:04:08.000000000 -0500
44+++ src/gst-plugins-bad-1.6.1/sys/decklink/gstdecklink.cpp 2015-11-24 00:58:48.362123000 -0600
45@@ -533,7 +533,7 @@ public:
46 }
47 };
48
49-#ifdef _MSC_VER
50+#ifdef G_OS_WIN32
51 /* FIXME: We currently never deinit this */
52
53 static GMutex com_init_lock;
54@@ -596,7 +596,7 @@ init_devices (gpointer data)
55 HRESULT ret;
56 int i;
57
58-#ifdef _MSC_VER
59+#ifdef G_OS_WIN32
60 // Start COM thread for Windows
61
62 g_mutex_lock (&com_init_lock);
63--- origsrc/gst-plugins-bad-1.6.1/sys/decklink/win/DeckLinkAPI.h 2015-10-22 03:04:08.000000000 -0500
64+++ src/gst-plugins-bad-1.6.1/sys/decklink/win/DeckLinkAPI.h 2015-11-24 00:57:02.328738100 -0600
65@@ -13301,6 +13301,10 @@ EXTERN_C const IID IID_IDeckLinkInput_v7
66 \r
67 /* Additional Prototypes for ALL interfaces */\r
68 \r
69+extern "C" {\r
70+ IDeckLinkIterator* CreateDeckLinkIteratorInstance (void);\r
71+}\r
72+\r
73 /* end of Additional Prototypes */\r
74 \r
75 #ifdef __cplusplus\r
This page took 0.026219 seconds and 5 git commands to generate.