Merge branch 'master' into xblc_gui

.github/workflows/build.yml

@@ -315,8 +315,7 @@ jobs:
         brew install \
           ccache \
           coreutils \
-          dylibbundler \
+          dylibbundler
-          ninja
         pip install pyyaml requests
     - name: Initialize compiler, library cache
       id: cache

configure

@@ -1191,17 +1191,6 @@ EOF
   fi
 fi
 
-##########################################
-# epoxy probe
-
-if $pkg_config --libs --silence-errors epoxy > /dev/null 2>&1 ; then
-    epoxy_libs=$($pkg_config --libs --silence-errors epoxy)
-    epoxy_cflags=$($pkg_config --cflags --silence-errors epoxy)
-else
-    error_exit "epoxy not present." \
-        "Please install the epoxy devel package."
-fi
-
 ##########################################
 # detect rust triple
 
@@ -1807,10 +1796,6 @@ if test "$default_targets" = "yes"; then
   echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
 fi
 
-# FIXME: Use meson
-echo "EPOXY_CFLAGS=$epoxy_cflags" >> $config_host_mak
-echo "EPOXY_LIBS=$epoxy_libs" >> $config_host_mak
-
 # tests/tcg configuration
 mkdir -p tests/tcg
 echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak

meson.build

@@ -1774,6 +1774,8 @@ if not get_option('coreaudio').auto() or (host_os == 'darwin' and have_system)
                          required: get_option('coreaudio'))
 endif
 
+epoxy = dependency('epoxy', required: true)
+
 opengl = not_found
 if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
   # FIXME: Use meson's 'gl' dep
@@ -1787,8 +1789,7 @@ if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
     error('Unknown GL platform')
   endif
 
-  opengl = declare_dependency(compile_args: config_host['EPOXY_CFLAGS'].split(),
+  opengl = declare_dependency(link_args: opengl_libs, dependencies: epoxy)
-                              link_args: config_host['EPOXY_LIBS'].split() + opengl_libs)
 endif
 
 gbm = not_found

scripts/download-macos-libs.py

@@ -149,7 +149,9 @@ class LibInstaller:
 						if pkg_name.startswith('openssl'): # FIXME
 							new_prefix = f'prefix={self._extract_path}/opt/local/libexec/openssl11\n'
 						lines[i] = new_prefix
-						break
+					elif l.strip().startswith('Requires.private:'):
+						if pkg_name.startswith('libepoxy'):
+							lines[i] = ''
 				with open(extracted_path, 'w') as f:
 					f.write(''.join(lines))