diff --git a/patches/winex11-Limited_Resolutions/0001-winex11-Display-a-helpful-warning-when-Dynamic-TwinV.patch b/patches/winex11-Limited_Resolutions/0001-winex11-Display-a-helpful-warning-when-Dynamic-TwinV.patch index 4d7bcacd..579f8def 100644 --- a/patches/winex11-Limited_Resolutions/0001-winex11-Display-a-helpful-warning-when-Dynamic-TwinV.patch +++ b/patches/winex11-Limited_Resolutions/0001-winex11-Display-a-helpful-warning-when-Dynamic-TwinV.patch @@ -1,15 +1,15 @@ -From 4fb6295c36aa1d6fea493bffde8a0390857be9fb Mon Sep 17 00:00:00 2001 +From c0cf16f0ef5dc84d17c62a6a6fdd60853d7b48e9 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Mon, 2 Mar 2015 23:18:10 -0700 Subject: winex11: Display a helpful warning when Dynamic TwinView is enabled. --- - configure.ac | 20 +++++++++++++++++++- + configure.ac | 22 +++++++++++++++++++++- dlls/winex11.drv/xrandr.c | 22 ++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletion(-) + 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f242181..b898597 100644 +index f242181..27e0fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,8 @@ AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput @@ -31,7 +31,7 @@ index f242181..b898597 100644 [#ifdef HAVE_X11_XLIB_H # include #endif -@@ -1225,6 +1228,21 @@ then +@@ -1225,6 +1228,23 @@ then #include #endif]) @@ -39,15 +39,17 @@ index f242181..b898597 100644 + if test "$ac_cv_header_NVCtrl_NVCtrlLib_h" = "yes" + then + AC_MSG_CHECKING([for -lXNVCtrl]) -+ ac_check_soname_save_LIBS=$LIBS ++ ac_save_LIBS="$LIBS" + LIBS="-lXNVCtrl $X_LIBS $X_EXTRA_LIBS $LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], [XNVCTRLIsNvScreen])], [AC_MSG_RESULT([-lXNVCtrl]) -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lXNVCtrl" -+ AC_DEFINE_UNQUOTED(HAVE_NVCTRL,1,[Define to 1 if libXNVCtrl is available]) -+ ac_cv_lib_XNVCtrl=1], [AC_MSG_RESULT([not found])]) -+ LIBS=$ac_check_soname_save_LIBS ++ AC_LINK_IFELSE([AC_LANG_CALL([], [XNVCTRLIsNvScreen])], ++ [AC_MSG_RESULT([yes]) ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lXNVCtrl" ++ AC_DEFINE_UNQUOTED(HAVE_NVCTRL,1,[Define to 1 if libXNVCtrl is available])], ++ [AC_MSG_RESULT([no]) ++ ac_cv_header_NVCtrl_NVCtrlLib_h=no]) ++ LIBS="$ac_save_LIBS" + fi -+ WINE_NOTICE_WITH(xnvctrl,[test "x$ac_cv_lib_XNVCtrl" = "x"], ++ WINE_NOTICE_WITH(xnvctrl,[test "x$ac_cv_header_NVCtrl_NVCtrlLib_h" != xyes], + [XNVCtrl ${notice_platform}development files not found, the NV-CONTROL extension won't be supported.]) + dnl *** End of X11/Xlib.h check @@ -101,5 +103,5 @@ index 58e66d6..e7fbf91 100644 for (i = 0; i < sizes_count; ++i) { -- -1.9.1 +2.3.0