3 files changed, 8 insertions, 10 deletions
diff --git a/profiles/desktop-media b/profiles/desktop-media
index 2d3cdb6..f367f0c 100644
--- a/profiles/desktop-media
+++ b/profiles/desktop-media
@@ -1,7 +1,5 @@
 ## media
 # include PulseAudio with volume control and ESounD support (needed by Mplayer2)
-pulseaudio pavucontrol
-#FIXME: include mplayer2 with web plugin on hardware supporting OpenGL
-#mplayer2 gecko-mplayer
-#FIXME: include PulseAudio plugin for ESounD (needed by Mplayer2)
-#pulseaudio-esound-compat
+pulseaudio pavucontrol pulseaudio-esound-compat
+# include mplayer2, with desktop and web browser wrappers
+mplayer2 gecko-mediaplayer
diff --git a/profiles/desktop-office b/profiles/desktop-office
index 1e4e696..4dbdc15 100644
--- a/profiles/desktop-office
+++ b/profiles/desktop-office
@@ -6,7 +6,6 @@ libreoffice- libreoffice-base- libreoffice-report-builder-bin-
 # include LibreOffice Calc and Writer (excluding Java support or email composer)
 libreoffice-calc libreoffice-writer libreoffice-java-common- libreoffice-emailmerge-
 # include LibreOffice Impress
-#TODO: include OpenGL plugin libreoffice-ogltrans on hardware supporting OpenGL
-libreoffice-impress
+libreoffice-impress libreoffice-ogltrans
 # include Evince PDF reader (and exclude ePDFView)
 evince-gtk epdfview-
diff --git a/profiles/desktop-z b/profiles/desktop-z
index 3007295..c7a8b21 100644
--- a/profiles/desktop-z
+++ b/profiles/desktop-z
@@ -5,6 +5,7 @@ parcimonie haveged gnome-disk-utility
 cpufrequtils unattended-upgrades ntp
 # fix include recommendations of other packages (uuid, bash)
 uuid-runtime bash-completion
-# exclude OpenGL and packages depending on it
-#TODO: do this only as alternative to hardware-dependent _promoting_ OpenGL
-libgl1-mesa-dri- libgl1-mesa-glx- x11-utils- evolution-data-server- gvfs- gvfs-backends- libvisual-0.4-plugins- libwebkitgtk-1.0-0-
+# include OpenGL hardware rasterizers (excluding software rasterizer)
+libgl1-mesa-dri libgl1-mesa-swx11-
+#TODO: include these only when upgrading, and mark as auto-installed
+evolution-data-server gvfs libvisual-0.4-plugins libwebkitgtk-1.0-0