freeglut: fix broken wayland build

The most recent commit, 8472c96 ("freeglut: add missing dependencies")
broke when this was built for wayland, in two ways:

1. It dropped the xkbcommon dep, which is required on Wayland as well
2. It started passing x11_dep to the XParseGeometry-detection, but
   x11_dep isn't set in that code-path.

The former was fixed simply by adding it back. The latter was fixed by
dropping the x11_dep in the Windows code-path, and rather passing all of
freeglut_deps to the detection logic.

releases.json

@@ -890,6 +890,7 @@
       "glut"
     ],
     "versions": [
+      "3.4.0-3",
       "3.4.0-2",
       "3.4.0-1"
     ]

subprojects/packagefiles/freeglut/meson.build

@@ -107,7 +107,6 @@ if host_system == 'windows'
 
   freeglut_deps += cc.find_library('winmm')
   freeglut_deps += cc.find_library('gdi32')
-  x11_dep = dependency('', required: false)
 
 else # not windows
 
@@ -143,6 +142,7 @@ else # not windows
     add_project_arguments('-DFREEGLUT_WAYLAND', language: 'c')
     freeglut_deps += dependency('wayland-client, wayland-cursor')
     freeglut_deps += dependency('wayland-egl, egl')
+    freeglut_deps += dependency('xkbcommon')
 
   else
     freeglut_sources += files(
@@ -209,7 +209,7 @@ if cc.has_function('gettimeofday')
   add_project_arguments('-DHAVE_GETTIMEOFDAY', language: 'c')
 endif
 
-if cc.has_function('XParseGeometry', dependencies: x11_dep,
+if cc.has_function('XParseGeometry', dependencies: freeglut_deps,
                    prefix: '#include <X11/Xlib.h>')
   add_project_arguments('-DHAVE_XPARSEGEOMETRY', language: 'c')
 else