From e250dc0acaab4ff169745ce92ace9b52dfc41608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 21 Dec 2016 00:19:18 +0100
Subject: [PATCH] vice: enhance and cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cleanup DEPENDS
* fix install location of c64 icon
* configure with --enable-fullscreen / --with-uithreads / --without-oss by default
* depend on gtkglext for x1 and opengl in DISTRO_FEATURES
* add PACKAGECONFIG for pulseaudio - disabled by default

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-emulators/vice/vice_2.4.33.bb | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/recipes-emulators/vice/vice_2.4.33.bb b/recipes-emulators/vice/vice_2.4.33.bb
index 9ec4244..604b329 100644
--- a/recipes-emulators/vice/vice_2.4.33.bb
+++ b/recipes-emulators/vice/vice_2.4.33.bb
@@ -22,13 +22,31 @@ SRC_URI[sha256sum] = "111bb26310bd660802767084f6840a75156158134689a23a3c8a0e0d81
 
 inherit autotools pkgconfig gtk-icon-cache
 
-DEPENDS = "gtk+ pulseaudio libav libsdl libpng jpeg giflib libxxf86vm portaudio-v19 mpg123 virtual/libgl vte9"
+DEPENDS = " \
+    gtk+ \
+    libav \
+    libsdl \
+    libpng \
+    jpeg \
+    giflib \
+    libxxf86vm \
+    portaudio-v19 \
+    mpg123 \
+    virtual/libgl \
+    vte9 \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "gtkglext", "", d)} \
+"
+
+PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio"
 
 EXTRA_OECONF = " \
     --disable-option-checking \
     --enable-external-ffmpeg \
     --enable-parsid \
+    --enable-fullscreen \
     --enable-gnomeui \
+    --with-uithreads \
+    --without-oss \
 "
 
 do_install_append() {
@@ -36,8 +54,8 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications
 
     for size in 16 32 48; do
-        install -d ${D}/${datadir}/icons/hicolor/${size}x${size}
-        install -m 0644 ${WORKDIR}/c64_${size}.png ${D}/${datadir}/icons/hicolor/${size}x${size}/
+        install -d ${D}/${datadir}/icons/hicolor/${size}x${size}/apps
+        install -m 0644 ${WORKDIR}/c64_${size}.png ${D}/${datadir}/icons/hicolor/${size}x${size}/apps/c64.png
     done
 }