logo

blog

My website can't be that messy, right? git clone https://hacktivis.me/git/blog.git

0001-autotools-Lazily-change-libGL-to-libOpenGL.patch (16480B)

    

  1. From 6eac68a48b8aacbc2025397df0d9f40ac8ff79a4 Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Tue, 9 Mar 2021 06:37:22 +0100
  4. Subject: [PATCH] autotools: Lazily change libGL to libOpenGL
  6. Correct way would be to check for libGL first and then try libOpenGL.
  7. ---
  8.  configure                     | 98 +++++++++++++++++------------------
  9.  configure.ac                  | 10 ++--
  10.  dlls/winewayland.drv/opengl.c |  4 +-
  11.  dlls/winex11.drv/opengl.c     |  6 +--
  12.  include/config.h.in           |  6 +--
  13.  5 files changed, 62 insertions(+), 62 deletions(-)
  15. diff --git a/configure b/configure
  16. index 8648f515f7d..b4fd183e728 100755
  17. --- a/configure
  18. +++ b/configure
  19. @@ -7000,7 +7000,7 @@ else
  20.      We can't simply define LARGE_OFF_T to be 9223372036854775807,
  21.      since some C++ compilers masquerading as C compilers
  22.      incorrectly reject 9223372036854775807.  */
  23. -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  24. +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  25.    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  26.  		       && LARGE_OFF_T % 2147483647 == 1)
  27.  		      ? 1 : -1];
  28. @@ -7046,7 +7046,7 @@ else
  29.      We can't simply define LARGE_OFF_T to be 9223372036854775807,
  30.      since some C++ compilers masquerading as C compilers
  31.      incorrectly reject 9223372036854775807.  */
  32. -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  33. +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  34.    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  35.  		       && LARGE_OFF_T % 2147483647 == 1)
  36.  		      ? 1 : -1];
  37. @@ -7070,7 +7070,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  38.      We can't simply define LARGE_OFF_T to be 9223372036854775807,
  39.      since some C++ compilers masquerading as C compilers
  40.      incorrectly reject 9223372036854775807.  */
  41. -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  42. +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  43.    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  44.  		       && LARGE_OFF_T % 2147483647 == 1)
  45.  		      ? 1 : -1];
  46. @@ -7115,7 +7115,7 @@ else
  47.      We can't simply define LARGE_OFF_T to be 9223372036854775807,
  48.      since some C++ compilers masquerading as C compilers
  49.      incorrectly reject 9223372036854775807.  */
  50. -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  51. +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  52.    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  53.  		       && LARGE_OFF_T % 2147483647 == 1)
  54.  		      ? 1 : -1];
  55. @@ -7139,7 +7139,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  56.      We can't simply define LARGE_OFF_T to be 9223372036854775807,
  57.      since some C++ compilers masquerading as C compilers
  58.      incorrectly reject 9223372036854775807.  */
  59. -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  60. +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  61.    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  62.  		       && LARGE_OFF_T % 2147483647 == 1)
  63.  		      ? 1 : -1];
  64. @@ -12549,13 +12549,13 @@ fi
  65.          opengl_msg=""
  66.      if test "x$with_opengl" != "xno"
  67.      then
  68. -	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5
  69. -$as_echo_n "checking for -lGL... " >&6; }
  70. -if ${ac_cv_lib_soname_GL+:} false; then :
  71. +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOpenGL" >&5
  72. +$as_echo_n "checking for -lOpenGL... " >&6; }
  73. +if ${ac_cv_lib_soname_OpenGL+:} false; then :
  74.    $as_echo_n "(cached) " >&6
  75.  else
  76.    ac_check_soname_save_LIBS=$LIBS
  77. -LIBS="-lGL $X_LIBS -lm $X_EXTRA_LIBS $LIBS"
  78. +LIBS="-lOpenGL $X_LIBS -lm $X_EXTRA_LIBS $LIBS"
  79.    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  80.  /* end confdefs.h.  */
  81.  
  82. @@ -12576,30 +12576,30 @@ return glXCreateContext ();
  83.  _ACEOF
  84.  if ac_fn_c_try_link "$LINENO"; then :
  85.    case "$LIBEXT" in
  86. -    dll) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest.exe | grep "GL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  87. -    dylib) ac_cv_lib_soname_GL=`$OTOOL -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  88. -    *) ac_cv_lib_soname_GL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  89. -       if ${ac_cv_lib_soname_GL:+false} :; then :
  90. -  ac_cv_lib_soname_GL=`$LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  91. +    dll) ac_cv_lib_soname_OpenGL=`$ac_cv_path_LDD conftest.exe | grep "OpenGL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  92. +    dylib) ac_cv_lib_soname_OpenGL=`$OTOOL -L conftest$ac_exeext | grep "libOpenGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libOpenGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  93. +    *) ac_cv_lib_soname_OpenGL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libOpenGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libOpenGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  94. +       if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  95. +  ac_cv_lib_soname_OpenGL=`$LDD conftest$ac_exeext | grep "libOpenGL\\.$LIBEXT" | sed -e "s/^.*\(libOpenGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  96.  fi ;;
  97.    esac
  98.  else
  99. -  ac_cv_lib_soname_GL=
  100. +  ac_cv_lib_soname_OpenGL=
  101.  fi
  102.  rm -f core conftest.err conftest.$ac_objext \
  103.      conftest$ac_exeext conftest.$ac_ext
  104.    LIBS=$ac_check_soname_save_LIBS
  105.  fi
  106. -if ${ac_cv_lib_soname_GL:+false} :; then :
  107. +if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  108.    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  109.  $as_echo "not found" >&6; }
  110. -       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5
  111. -$as_echo_n "checking for -lGL... " >&6; }
  112. -if ${ac_cv_lib_soname_GL+:} false; then :
  113. +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOpenGL" >&5
  114. +$as_echo_n "checking for -lOpenGL... " >&6; }
  115. +if ${ac_cv_lib_soname_OpenGL+:} false; then :
  116.    $as_echo_n "(cached) " >&6
  117.  else
  118.    ac_check_soname_save_LIBS=$LIBS
  119. -LIBS="-lGL $X_LIBS -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS"
  120. +LIBS="-lOpenGL $X_LIBS -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS"
  121.    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  122.  /* end confdefs.h.  */
  123.  
  124. @@ -12620,21 +12620,21 @@ return glXCreateContext ();
  125.  _ACEOF
  126.  if ac_fn_c_try_link "$LINENO"; then :
  127.    case "$LIBEXT" in
  128. -    dll) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest.exe | grep "GL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  129. -    dylib) ac_cv_lib_soname_GL=`$OTOOL -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  130. -    *) ac_cv_lib_soname_GL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  131. -       if ${ac_cv_lib_soname_GL:+false} :; then :
  132. -  ac_cv_lib_soname_GL=`$LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  133. +    dll) ac_cv_lib_soname_OpenGL=`$ac_cv_path_LDD conftest.exe | grep "OpenGL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  134. +    dylib) ac_cv_lib_soname_OpenGL=`$OTOOL -L conftest$ac_exeext | grep "libOpenGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libOpenGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  135. +    *) ac_cv_lib_soname_OpenGL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libOpenGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libOpenGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  136. +       if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  137. +  ac_cv_lib_soname_OpenGL=`$LDD conftest$ac_exeext | grep "libOpenGL\\.$LIBEXT" | sed -e "s/^.*\(libOpenGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  138.  fi ;;
  139.    esac
  140.  else
  141. -  ac_cv_lib_soname_GL=
  142. +  ac_cv_lib_soname_OpenGL=
  143.  fi
  144.  rm -f core conftest.err conftest.$ac_objext \
  145.      conftest$ac_exeext conftest.$ac_ext
  146.    LIBS=$ac_check_soname_save_LIBS
  147.  fi
  148. -if ${ac_cv_lib_soname_GL:+false} :; then :
  149. +if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  150.    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  151.  $as_echo "not found" >&6; }
  152.         if test -f /usr/X11R6/lib/libGL.a
  153. @@ -12645,24 +12645,24 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
  154.                                  opengl_msg="No OpenGL library found on this system."
  155.                              fi
  156.  else
  157. -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5
  158. -$as_echo "$ac_cv_lib_soname_GL" >&6; }
  159. +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_OpenGL" >&5
  160. +$as_echo "$ac_cv_lib_soname_OpenGL" >&6; }
  161.  
  162.  cat >>confdefs.h <<_ACEOF
  163. -#define SONAME_LIBGL "$ac_cv_lib_soname_GL"
  164. +#define SONAME_LIBOPENGL "$ac_cv_lib_soname_OpenGL"
  165.  _ACEOF
  166.  
  167. -       OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
  168. +       OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lOpenGL"
  169.  fi
  170.  else
  171. -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5
  172. -$as_echo "$ac_cv_lib_soname_GL" >&6; }
  173. +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_OpenGL" >&5
  174. +$as_echo "$ac_cv_lib_soname_OpenGL" >&6; }
  175.  
  176.  cat >>confdefs.h <<_ACEOF
  177. -#define SONAME_LIBGL "$ac_cv_lib_soname_GL"
  178. +#define SONAME_LIBOPENGL "$ac_cv_lib_soname_OpenGL"
  179.  _ACEOF
  180.  
  181. -       OPENGL_LIBS="-lGL"
  182. +       OPENGL_LIBS="-lOpenGL"
  183.  fi
  184.          if test "x$with_osmesa" != "xno"
  185.          then
  186. @@ -12871,13 +12871,13 @@ _ACEOF
  187.  
  188.  
  189.  fi
  190. -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5
  191. -$as_echo_n "checking for -lGL... " >&6; }
  192. -if ${ac_cv_lib_soname_GL+:} false; then :
  193. +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOpenGL" >&5
  194. +$as_echo_n "checking for -lOpenGL... " >&6; }
  195. +if ${ac_cv_lib_soname_OpenGL+:} false; then :
  196.    $as_echo_n "(cached) " >&6
  197.  else
  198.    ac_check_soname_save_LIBS=$LIBS
  199. -LIBS="-lGL  $LIBS"
  200. +LIBS="-lOpenGL  $LIBS"
  201.    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  202.  /* end confdefs.h.  */
  203.  
  204. @@ -12898,30 +12898,30 @@ return glFlush ();
  205.  _ACEOF
  206.  if ac_fn_c_try_link "$LINENO"; then :
  207.    case "$LIBEXT" in
  208. -    dll) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest.exe | grep "GL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  209. -    dylib) ac_cv_lib_soname_GL=`$OTOOL -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  210. -    *) ac_cv_lib_soname_GL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  211. -       if ${ac_cv_lib_soname_GL:+false} :; then :
  212. -  ac_cv_lib_soname_GL=`$LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  213. +    dll) ac_cv_lib_soname_OpenGL=`$ac_cv_path_LDD conftest.exe | grep "OpenGL" | sed -e "s/dll.*/dll/"';2,$d'` ;;
  214. +    dylib) ac_cv_lib_soname_OpenGL=`$OTOOL -L conftest$ac_exeext | grep "libOpenGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libOpenGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
  215. +    *) ac_cv_lib_soname_OpenGL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libOpenGL\\.$LIBEXT" | sed -e "s/^.*\\[\\(libOpenGL\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
  216. +       if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  217. +  ac_cv_lib_soname_OpenGL=`$LDD conftest$ac_exeext | grep "libOpenGL\\.$LIBEXT" | sed -e "s/^.*\(libOpenGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
  218.  fi ;;
  219.    esac
  220.  else
  221. -  ac_cv_lib_soname_GL=
  222. +  ac_cv_lib_soname_OpenGL=
  223.  fi
  224.  rm -f core conftest.err conftest.$ac_objext \
  225.      conftest$ac_exeext conftest.$ac_ext
  226.    LIBS=$ac_check_soname_save_LIBS
  227.  fi
  228. -if ${ac_cv_lib_soname_GL:+false} :; then :
  229. +if ${ac_cv_lib_soname_OpenGL:+false} :; then :
  230.    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  231.  $as_echo "not found" >&6; }
  232.  
  233.  else
  234. -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5
  235. -$as_echo "$ac_cv_lib_soname_GL" >&6; }
  236. +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_OpenGL" >&5
  237. +$as_echo "$ac_cv_lib_soname_OpenGL" >&6; }
  238.  
  239.  cat >>confdefs.h <<_ACEOF
  240. -#define SONAME_LIBGL "$ac_cv_lib_soname_GL"
  241. +#define SONAME_LIBOPENGL "$ac_cv_lib_soname_OpenGL"
  242.  _ACEOF
  243.  
  244.  
  245. diff --git a/configure.ac b/configure.ac
  246. index 29d48b6062e..5590dd6846f 100644
  247. --- a/configure.ac
  248. +++ b/configure.ac
  249. @@ -1275,10 +1275,10 @@ then
  250.      opengl_msg=""
  251.      if test "x$with_opengl" != "xno"
  252.      then
  253. -	WINE_CHECK_SONAME(GL,glXCreateContext,
  254. -		     [OPENGL_LIBS="-lGL"],
  255. -                     [WINE_CHECK_SONAME(GL,glXCreateContext,
  256. -			    [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"],
  257. +	WINE_CHECK_SONAME(OpenGL,glXCreateContext,
  258. +		     [OPENGL_LIBS="-lOpenGL"],
  259. +                     [WINE_CHECK_SONAME(OpenGL,glXCreateContext,
  260. +			    [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lOpenGL"],
  261.  			    [if test -f /usr/X11R6/lib/libGL.a
  262.                              then
  263.  	                        opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
  264. @@ -1323,7 +1323,7 @@ then
  265.      WINE_PACKAGE_FLAGS(WAYLAND_CLIENT,[wayland-client])
  266.      WINE_PACKAGE_FLAGS(WAYLAND_EGL,[wayland-egl])
  267.      WINE_CHECK_SONAME(EGL,eglGetProcAddress)
  268. -    WINE_CHECK_SONAME(GL,glFlush)
  269. +    WINE_CHECK_SONAME(OpenGL,glFlush)
  270.      WINE_CHECK_SONAME(GLESv2,glFlush)
  271.  fi
  272.  WINE_NOTICE_WITH(wayland, [test -z "$WAYLAND_CLIENT_LIBS"],
  273. diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c
  274. index 0504a4ad96b..22f114edcf7 100644
  275. --- a/dlls/winewayland.drv/opengl.c
  276. +++ b/dlls/winewayland.drv/opengl.c
  277. @@ -1106,9 +1106,9 @@ static BOOL egl_init(void)
  278.          ERR("failed to load %s: %s\n", SONAME_LIBEGL, dlerror());
  279.          return FALSE;
  280.      }
  281. -    if (!(opengl_handle = dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL)))
  282. +    if (!(opengl_handle = dlopen(SONAME_LIBOPENGL, RTLD_NOW|RTLD_GLOBAL)))
  283.      {
  284. -        WARN("failed to load %s: %s, trying GLESv2\n", SONAME_LIBGL, dlerror());
  285. +        WARN("failed to load %s: %s, trying GLESv2\n", SONAME_LIBOPENGL, dlerror());
  286.          if (!(opengl_handle = dlopen(SONAME_LIBGLESV2, RTLD_NOW|RTLD_GLOBAL)))
  287.          {
  288.              ERR("failed to load %s: %s\n", SONAME_LIBGLESV2, dlerror());
  289. diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
  290. index c44c587bf14..4f4f60438e6 100644
  291. --- a/dlls/winex11.drv/opengl.c
  292. +++ b/dlls/winex11.drv/opengl.c
  293. @@ -43,7 +43,7 @@
  294.  #include "wine/heap.h"
  295.  #include "wine/debug.h"
  296.  
  297. -#ifdef SONAME_LIBGL
  298. +#ifdef SONAME_LIBOPENGL
  299.  
  300.  WINE_DEFAULT_DEBUG_CHANNEL(wgl);
  301.  WINE_DECLARE_DEBUG_CHANNEL(winediag);
  302. @@ -550,7 +550,7 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context )
  303.  
  304.      /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient
  305.         and include all dependencies */
  306. -    opengl_handle = dlopen( SONAME_LIBGL, RTLD_NOW | RTLD_GLOBAL );
  307. +    opengl_handle = dlopen( SONAME_LIBOPENGL, RTLD_NOW | RTLD_GLOBAL );
  308.      if (opengl_handle == NULL)
  309.      {
  310.          ERR( "Failed to load libGL: %s\n", dlerror() );
  311. @@ -3420,4 +3420,4 @@ void destroy_gl_drawable( HWND hwnd )
  312.  {
  313.  }
  314.  
  315. -#endif /* defined(SONAME_LIBGL) */
  316. +#endif /* defined(SONAME_LIBOPENGL) */
  317. diff --git a/include/config.h.in b/include/config.h.in
  318. index 8b2441a548b..5f45fd42cb9 100644
  319. --- a/include/config.h.in
  320. +++ b/include/config.h.in
  321. @@ -1247,9 +1247,6 @@
  322.  /* Define to the soname of the libfreetype library. */
  323.  #undef SONAME_LIBFREETYPE
  324.  
  325. -/* Define to the soname of the libGL library. */
  326. -#undef SONAME_LIBGL
  327. -
  328.  /* Define to the soname of the libGLESv2 library. */
  329.  #undef SONAME_LIBGLESV2
  330.  
  331. @@ -1286,6 +1283,9 @@
  332.  /* Define to the soname of the libopenal library. */
  333.  #undef SONAME_LIBOPENAL
  334.  
  335. +/* Define to the soname of the libOpenGL library. */
  336. +#undef SONAME_LIBOPENGL
  337. +
  338.  /* Define to the soname of the libOSMesa library. */
  339.  #undef SONAME_LIBOSMESA
  340.  
  341. -- 
  342. 2.26.2