qemu · Apr 3, 2022
Showing with 939 additions and 8 deletions.

+55 −1 configure

+1 −1 dtc

+1 −1 meson

+11 −0 meson.build

+5 −2 qapi/ui.json

+1 −1 slirp

+855 −0 ui/arcan.c

+1 −1 ui/keycodemapdb

+9 −1 ui/meson.build
diff --git a/configure b/configure
@@ -384,6 +384,12 @@ cfi="false"
 
 # 4. Detection partly done in configure
 xen=${default_feature:+disabled}
+gettext="auto"
+fuse="auto"
+fuse_lseek="auto"
+multiprocess="no"
+malloc_trim="auto"
+arcan="auto"
 
 # parse CC options second
 for opt do
@@ -1194,6 +1200,10 @@ for opt do
   ;;
   --enable-jemalloc) meson_option_parse --enable-malloc=jemalloc jemalloc
   ;;
+  --disable-arcan) arcan="no"
+  ;;
+  --enable-arcan) arcan="yes"
+  ;;
   # everything else has the same name in configure and meson
   --enable-* | --disable-*) meson_option_parse "$opt" "$optarg"
   ;;
@@ -1470,6 +1480,11 @@ cat << EOF
   rng-none        dummy RNG, avoid using /dev/(u)random and getrandom()
   gio             libgio support
   slirp-smbd      use smbd (at path --smbd=*) in slirp networking
+  libdaxctl       libdaxctl support
+  fuse            FUSE block device export
+  fuse-lseek      SEEK_HOLE/SEEK_DATA support for FUSE exports
+  multiprocess    Multiprocess QEMU support
+  arcan           Arcan UI support
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -2602,7 +2617,40 @@ case "$fdt" in
 esac
 
 ##########################################
-# opengl probe (for sdl2, gtk)
+# arcan shmif probe
+
+if $pkg_config arcan-shmif --exists; then
+ if test "$opengl" = "no" ; then
+  arcanconfig="$pkg_config arcan-shmif"
+ else
+  arcanconfig="$pkg_config arcan-shmif-ext"
+ fi
+ arcan="yes"
+else
+ if test "$arcan" = "yes"; then
+  feature_not_found "arcan" "Install arcan-shmif-dev"
+ fi
+ arcan="no"
+fi
+
+if test "$arcan" != "no" ; then
+  arcan_cflags=`$arcanconfig --cflags 2> /dev/null`
+  if test "$static" = "yes" ; then
+    arcan_libs=`$arcanconfig --static-libs 2>/dev/null`
+  else
+    arcan_libs=`$arcanconfig --libs 2> /dev/null`
+  fi
+fi
+
+##########################################
+# opengl probe (for sdl2, gtk, milkymist-tmu2)
+
+gbm="no"
+if $pkg_config gbm; then
+    gbm_cflags="$($pkg_config --cflags gbm)"
+    gbm_libs="$($pkg_config --libs gbm)"
+    gbm="yes"
+fi
 
 if test "$opengl" != "no" ; then
   epoxy=no
@@ -3580,6 +3628,12 @@ if test "$opengl" = "yes" ; then
   echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
 fi
 
+if test "$arcan" = "yes" ; then
+    echo "CONFIG_ARCAN=y" >> $config_host_mak
+    echo "ARCAN_LIBS=$arcan_libs" >> $config_host_mak
+    echo "ARCAN_CFLAGS=$arcan_cflags" >> $config_host_mak
+fi
+
 if test "$avx2_opt" = "yes" ; then
   echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
 fi

diff --git a/dtc b/dtc
diff --git a/meson b/meson
diff --git a/meson.build b/meson.build
@@ -583,6 +583,16 @@ if not get_option('zstd').auto() or have_block
                     required: get_option('zstd'),
                     method: 'pkg-config', kwargs: static_kwargs)
 endif
+gbm = not_found
+if 'CONFIG_GBM' in config_host
+  gbm = declare_dependency(compile_args: config_host['GBM_CFLAGS'].split(),
+                           link_args: config_host['GBM_LIBS'].split())
+endif
+arcan = not_found
+if 'CONFIG_ARCAN' in config_host
+  arcan = declare_dependency(compile_args: config_host['ARCAN_CFLAGS'].split(),
+                           link_args: config_host['ARCAN_LIBS'].split())
+endif
 virgl = not_found
 if not get_option('virglrenderer').auto() or have_system
   virgl = dependency('virglrenderer',
@@ -3394,6 +3404,7 @@ if targetos == 'linux'
   summary_info += {'ALSA support':    alsa}
   summary_info += {'PulseAudio support': pulse}
 endif
+summary_info += {'Arcan support':     arcan.found()}
 summary_info += {'JACK support':      jack}
 summary_info += {'brlapi support':    brlapi}
 summary_info += {'vde support':       vde}

diff --git a/qapi/ui.json b/qapi/ui.json
@@ -1158,12 +1158,14 @@
 # Display (user interface) type.
 #
 # @default: The default user interface, selecting from the first available
-#           of gtk, sdl, cocoa, and vnc.
+#           of arcan, gtk, sdl, cocoa, and vnc.
 #
 # @none: No user interface or video output display. The guest will
 #        still see an emulated graphics card, but its output will not
 #        be displayed to the QEMU user.
 #
+# @arcan: The Arcan user interface.
+#
 # @gtk: The GTK user interface.
 #
 # @sdl: The SDL user interface.
@@ -1199,7 +1201,8 @@
               'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } },
     { 'name': 'curses', 'if': 'CONFIG_CURSES' },
     { 'name': 'cocoa', 'if': 'CONFIG_COCOA' },
-    { 'name': 'spice-app', 'if': 'CONFIG_SPICE'} ] }
+    { 'name': 'spice-app', 'if': 'CONFIG_SPICE'},
+    { 'name': 'arcan', 'if': 'CONFIG_ARCAN'}] }
 
 ##
 # @DisplayOptions:

diff --git a/slirp b/slirp