From subversion at mplayerhq.hu  Tue Mar  3 12:15:22 2020
From: subversion at mplayerhq.hu (ib)
Date: Tue,  3 Mar 2020 12:15:22 +0200 (EET)
Subject: [MPlayer-cvslog] r38182 - trunk/libvo/gl_common.h
Message-ID: <20200303101522.EFE9A68B51A@ffbox0-bg.mplayerhq.hu>

Author: ib
Date: Tue Mar  3 12:15:22 2020
New Revision: 38182

Log:
Fix compilation of non-X11 OpenGL video output driver.

Patch by Stephen Sheldon, sfsheldo gmail com.

Modified:
   trunk/libvo/gl_common.h

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	Fri Feb 21 09:54:35 2020	(r38181)
+++ trunk/libvo/gl_common.h	Tue Mar  3 12:15:22 2020	(r38182)
@@ -316,6 +316,8 @@ extern void (GLAPIENTRY *mpglTexImage3D)
 extern void* (GLAPIENTRY *mpglAllocateMemoryMESA)(void *, int, size_t, float, float, float);
 extern void (GLAPIENTRY *mpglFreeMemoryMESA)(void *, int, void *);
 
+#ifdef CONFIG_GL_X11
 extern XVisualInfo *gui_vinfo;
+#endif
 
 #endif /* MPLAYER_GL_COMMON_H */

From subversion at mplayerhq.hu  Tue Mar  3 12:47:08 2020
From: subversion at mplayerhq.hu (ib)
Date: Tue,  3 Mar 2020 12:47:08 +0200 (EET)
Subject: [MPlayer-cvslog] r38183 - trunk/gui/win32/gui.c
Message-ID: <20200303104708.25C5668B5B6@ffbox0-bg.mplayerhq.hu>

Author: ib
Date: Tue Mar  3 12:47:07 2020
New Revision: 38183

Log:
Fix compilation of the Win32 GUI Wine build.

Add missing definition of gui_vinfo.

Modified:
   trunk/gui/win32/gui.c

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	Tue Mar  3 12:15:22 2020	(r38182)
+++ trunk/gui/win32/gui.c	Tue Mar  3 12:47:07 2020	(r38183)
@@ -63,6 +63,13 @@
 /* Globals / Externs */
 float video_aspect;
 
+#ifdef __WINE__
+#ifdef CONFIG_GL_X11
+#include <X11/Xutil.h>
+XVisualInfo *gui_vinfo;
+#endif
+#endif
+
 DWORD oldtime;
 NOTIFYICONDATA nid;
 int console_state = FALSE;

From subversion at mplayerhq.hu  Tue Mar  3 19:33:32 2020
From: subversion at mplayerhq.hu (ib)
Date: Tue,  3 Mar 2020 19:33:32 +0200 (EET)
Subject: [MPlayer-cvslog] r38184 - trunk/configure
Message-ID: <20200303173332.55FA868B59B@ffbox0-bg.mplayerhq.hu>

Author: ib
Date: Tue Mar  3 19:33:32 2020
New Revision: 38184

Log:
Fix linking error of the non-GUI Wine build.

There is an undefined reference to 'ExtractIconA'.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Mar  3 12:47:07 2020	(r38183)
+++ trunk/configure	Tue Mar  3 19:33:32 2020	(r38184)
@@ -1872,6 +1872,7 @@ fi
 
 if wine ; then
   extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags"
+  libs_mplayer="$libs_mplayer -lshell32"
 fi
 
 if darwin && test "$cc_vendor" != "clang" ; then