summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/desktop/packages14
-rw-r--r--profiles/qemu/package.sync-conflict-20170516-120307.use5
2 files changed, 19 insertions, 0 deletions
diff --git a/profiles/desktop/packages b/profiles/desktop/packages
index 2bb4784..88bb60c 100644
--- a/profiles/desktop/packages
+++ b/profiles/desktop/packages
@@ -125,3 +125,17 @@ media-fonts/unifont
media-fonts/urw-fonts
media-fonts/wqy-microhei
media-fonts/wqy-zenhei
+
+# Media plugins
+media-plugins/gst-plugins-openh264
+media-plugins/gst-plugins-uvch264
+media-plugins/gst-plugins-x264
+media-plugins/gst-plugins-x265
+media-plugins/gst-plugins-libde265
+media-plugins/gst-plugins-vp8
+media-plugins/gst-plugins-vpx
+media-plugins/gst-plugins-hls
+media-plugins/gst-plugins-vorbis
+media-plugins/gst-plugins-flac
+media-plugins/gst-plugins-libav
+media-plugins/gst-plugins-pulse
diff --git a/profiles/qemu/package.sync-conflict-20170516-120307.use b/profiles/qemu/package.sync-conflict-20170516-120307.use
new file mode 100644
index 0000000..e6ccabe
--- /dev/null
+++ b/profiles/qemu/package.sync-conflict-20170516-120307.use
@@ -0,0 +1,5 @@
+app-emulation/qemu usb vhost-net virgl vte xattr fdt aio spice
+
+net-misc/spice-gtk gtk3 gstvideo lz4 mjpeg usbredir webdav
+app-emulation/spice lz4
+net-libs/phodav spice