[118754] trunk/dports/emulators/qemu/Portfile

[raimue at macports.org]

Revision: 118754
          https://trac.macports.org/changeset/118754
Author:   raimue at macports.org
Date:     2014-04-10 09:35:01 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
emulators/qemu:
Split the cocoa and curses interfaces into separate conflicting variants,
closes #43302.
Additionally tested both SDL and GTK+ interfaces once again, but they are still
broken.

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2014-04-10 16:02:47 UTC (rev 118753)
+++ trunk/dports/emulators/qemu/Portfile	2014-04-10 16:35:01 UTC (rev 118754)
@@ -4,6 +4,7 @@
 
 name                    qemu
 version                 1.7.1
+revision                1
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -34,7 +35,6 @@
 
 depends_lib             port:curl \
                         path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                        port:ncurses \
                         port:zlib \
                         path:lib/pkgconfig/pixman-1.pc:libpixman
 
@@ -49,8 +49,10 @@
                         --python=${prefix}/bin/python2.7 \
 
 # Select features
-configure.args-append   --enable-cocoa \
-                        --enable-curses \
+configure.args-append   --disable-cocoa \
+                        --disable-curses \
+                        --disable-sdl \
+                        --disable-gtk \
                         --enable-curl \
                         --enable-uuid \
                         --enable-vhdx \
@@ -68,7 +70,6 @@
                         --disable-usb-redir \
                         --disable-seccomp \
                         --disable-glusterfs \
-                        --disable-gtk \
                         --disable-rdma \
                         --disable-libssh2 \
                         --disable-vnc
@@ -92,6 +93,39 @@
 }
 default_variants-append +target_i386 +target_x86_64
 
+if {![variant_isset curses]} {
+    default_variants-append +cocoa
+}
+
+variant cocoa description {Use the native Mac OS X graphical user interface} conflicts curses {
+    configure.args-replace  --disable-cocoa --enable-cocoa
+}
+
+variant curses description {Use the curses text-only user interface} conflicts cocoa {
+    configure.args-replace --disable-curses --enable-curses
+    depends_lib-append      port:ncurses
+}
+
+# XXX: Builds, but does not work as expected on runtime
+#variant gtk3 description {Build GTK+ GUI for GTK+ 3 (experimental)} conflicts cocoa {
+#    configure.args-replace --disable-gtk --enable-gtk
+#    configure.args-append --with-gtkabi=3.0
+#    depends_lib-append     port:gtk3 port:vte
+#}
+
+# XXX: Build broken due to missing port for vte 0.24 / pkg-config package vte
+#variant gtk2 description {Use the GTK+ 2 graphical user interface} conflicts cocoa curses gtk3 {
+#    configure.args-replace --disable-gtk --enable-gtk
+#    configure.args-append  --with-gtkabi=2.0
+#    depends_lib-append     port:gtk2 port:vte
+#}
+
+# XXX: Build broken due to missing X11 symbols
+#variant sdl description {Use the SDL graphical user interface} conflicts cocoa curses gtk2 gtk3 {
+#    configure.args-replace --disable-sdl --enable-sdl
+#    depends_lib-append      port:libsdl
+#}
+
 variant usb description {Support forwarding of USB devices to the guest} {
     configure.args-replace  --disable-libusb --enable-libusb
     depends_lib-append      path:lib/pkgconfig/libusb-1.0.pc:libusb
@@ -116,20 +150,6 @@
     depends_lib-append      port:libssh2
 }
 
-# XXX: GTK interface does not work on Mac OS X yet
-#variant gtk2 description {Build GTK+ GUI for GTK+ 2} {
-#    depends_lib-append     port:gtk2 port:vte
-#    configure.args-replace --disable-gtk --enable-gtk
-#    configure.args-append  --with-gtkabi=2.0
-#}
-#
-## Disabled for now, requires vte >= 0.30 / pkg-config package vte-2.90
-##variant gtk3 description {Build GTK+ GUI for GTK+ 3} {
-##    depends_lib-append     port:gtk3
-##    configure.args-replace --disable-gtk --enable-gtk
-##    configure.args-append --with-gtkabi=3.0
-##}
-
 # Default universal variant does not work
 universal_variant       no
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/aff161f4/attachment-0001.html>