--- a/components/desktop/desktop-cache/Makefile	Thu Sep 22 16:57:34 2016 -0700
+++ b/components/desktop/desktop-cache/Makefile	Sat Sep 17 14:27:58 2016 -0700
@@ -46,4 +46,5 @@
 validate-smf:	$(BUILD_DIR)/.validated-smf-manifests-$(MACH)
 build:		$(BUILD_DIR)/.validated-smf-manifests-$(MACH)
 
+REQUIRED_PACKAGES += service/opengl/ogl-select
 REQUIRED_PACKAGES += system/core-os

--- a/components/desktop/desktop-cache/files/input-method-cache.xml	Thu Sep 22 16:57:34 2016 -0700
+++ b/components/desktop/desktop-cache/files/input-method-cache.xml	Sat Sep 17 14:27:58 2016 -0700
@@ -52,6 +52,17 @@
 		<service_fmri value='svc:/system/filesystem/minimal' />
 	</dependency>
 
+	<!-- gtk is linked to cairo which is linked to libGL, so we need
+	     libGL to be resolvable so we don't get file-not-found errors
+	     trying to load libraries in gtk-query-immodules -->
+	<dependency
+		name='ogl-select'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/application/opengl/ogl-select' />
+	</dependency>
+
 	<dependent
                 name='input_method_cache-assembly-complete'
                 grouping='optional_all'

--- a/components/gnome/gtk3/Makefile	Thu Sep 22 16:57:34 2016 -0700
+++ b/components/gnome/gtk3/Makefile	Sat Sep 17 14:27:58 2016 -0700
@@ -117,6 +117,7 @@
 REQUIRED_PACKAGES += print/cups
 REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += service/opengl/ogl-select
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/fontconfig
 REQUIRED_PACKAGES += system/library/freetype-2

--- a/components/gnome/gtk3/files/gtk3-input-method-cache.xml	Thu Sep 22 16:57:34 2016 -0700
+++ b/components/gnome/gtk3/files/gtk3-input-method-cache.xml	Sat Sep 17 14:27:58 2016 -0700
@@ -48,6 +48,17 @@
 		<service_fmri value='svc:/system/filesystem/minimal' />
 	</dependency>
 
+	<!-- gtk is linked to cairo which is linked to libGL, so we need
+	     libGL to be resolvable so we don't get file-not-found errors
+	     trying to load libraries in gtk-query-immodules -->
+	<dependency
+		name='ogl-select'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/application/opengl/ogl-select' />
+	</dependency>
+
 	<dependent
 		name='gtk3-input-method-cache_assembly-complete'
 		grouping='optional_all'