emulators/qemu: Update version 2.5.1.1=>2.6.1

- Remove BSD_USER related codes
- Add NCURSES support [1]
- Fix STATIC_LINKS code to not build with X11 support

PR: 		211973 [1]
Submitted by:	ilavsky.martin@gmail.com [1]

1 files changed, 56 insertions, 31 deletions

diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure
index 1352414aed42..40a964f3df4e 100644
--- a/emulators/qemu/files/patch-configure
+++ b/emulators/qemu/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-03-30 17:53:28 UTC
+--- configure.orig	2016-04-14 20:19:53 UTC
 +++ configure
-@@ -276,7 +276,7 @@ DSOSUF=".so"
+@@ -245,7 +245,7 @@ DSOSUF=".so"
  LDFLAGS_SHARED="-shared"
  modules="no"
  prefix="/usr/local"
@@ -9,17 +9,27 @@
  datadir="\${prefix}/share"
  qemu_docdir="\${prefix}/share/doc/qemu"
  bindir="\${prefix}/bin"
-@@ -344,6 +344,9 @@ libssh2=""
+@@ -316,6 +316,10 @@ virglrenderer=""
+ tpm="yes"
+ libssh2=""
  vhdx=""
- numa=""
- tcmalloc="no"
++quorum="no"
 +pcap="no"
 +pcap_create="no"
 +bpf="no"
+ numa=""
+ tcmalloc="no"
  jemalloc="no"
- 
- # parse CC options first
-@@ -905,6 +908,10 @@ for opt do
+@@ -575,7 +579,7 @@ FreeBSD)
+   audio_drv_list="oss"
+   audio_possible_drivers="oss sdl pa"
+   # needed for kinfo_getvmmap(3) in libutil.h
+-  LIBS="-lutil $LIBS"
++  LIBS="-lprocstat -lkvm -lelf -lutil $LIBS"
+   netmap=""  # enable netmap autodetect
+   HOST_VARIANT_DIR="freebsd"
+ ;;
+@@ -878,6 +882,10 @@ for opt do
    ;;
    --enable-vnc-png) vnc_png="yes"
    ;;
@@ -30,7 +40,7 @@
    --disable-slirp) slirp="no"
    ;;
    --disable-uuid) uuid="no"
-@@ -2241,7 +2248,7 @@ if test "$gtk" != "no"; then
+@@ -2157,7 +2165,7 @@ if test "$gtk" != "no"; then
              gtk_cflags="$gtk_cflags $x11_cflags"
              gtk_libs="$gtk_libs $x11_libs"
          fi
@@ -39,11 +49,28 @@
          gtk="yes"
      elif test "$gtk" = "yes"; then
          feature_not_found "gtk" "Install gtk2 or gtk3 devel"
-@@ -2413,6 +2420,50 @@ then
+@@ -2384,6 +2392,14 @@ if ! check_include "ifaddrs.h" ; then
  fi
  
  ##########################################
++# getifaddrs (for tests/test-io-channel-socket )
++
++have_ifaddrs_h=yes
++if ! check_include "ifaddrs.h" ; then
++  have_ifaddrs_h=no
++fi
++
++##########################################
+ # VTE probe
+ 
+ if test "$vte" != "no"; then
+@@ -2526,6 +2542,50 @@ EOF
+   fi
+ fi
+ 
++##########################################
 +# pcap probe
++
 +if test "$pcap" = "yes" -a "$pcap" != "no"; then
 +  cat > $TMPC << EOF
 +#include <pcap.h>
@@ -57,7 +84,7 @@
 +  if compile_prog "" "$libpcap" ; then
 +    :
 +  else
-+   echo
++    echo
 +    echo "Error: Could not find pcap"
 +    echo "Make sure to have the pcap libs and headers installed."
 +    echo
@@ -85,37 +112,25 @@
 +  fi
 +  libs_softmmu="$libpcap $libs_softmmu"
 +fi # test "$pcap"
-+
-+##########################################
- # libtasn1 - only for the TLS creds/session test suite
  
- tasn1=yes
-@@ -2983,7 +3034,7 @@ for i in $glib_modules; do
-         glib_libs=`$pkg_config --libs $i`
-         CFLAGS="$glib_cflags $CFLAGS"
-         LIBS="$glib_libs $LIBS"
--        libs_qga="$glib_libs $libs_qga"
-+        libs_qga="$glib_libs -lintl $libs_qga"
-     else
-         error_exit "glib-$glib_req_ver $i is required to compile QEMU"
-     fi
-@@ -3864,14 +3915,7 @@ fi
+ ##########################################
+ # VNC SASL detection
+@@ -3857,14 +3917,7 @@ fi
  
  # Check if tools are available to build documentation.
  if test "$docs" != "no" ; then
 -  if has makeinfo && has pod2man; then
--    docs=yes
+     docs=yes
 -  else
 -    if test "$docs" = "yes" ; then
 -      feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
 -    fi
 -    docs=no
 -  fi
-+docs=yes
  fi
  
  # Search for bswap_32 function
-@@ -3999,6 +4043,17 @@ fi
+@@ -3992,6 +4045,17 @@ fi
  
  # check for libusb
  if test "$libusb" != "no" ; then
@@ -133,7 +148,7 @@
      if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
          libusb="yes"
          libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -4011,6 +4066,7 @@ if test "$libusb" != "no" ; then
+@@ -4004,6 +4068,7 @@ if test "$libusb" != "no" ; then
          fi
          libusb="no"
      fi
@@ -141,7 +156,7 @@
  fi
  
  # check for usbredirparser for usb network redirection support
-@@ -4773,6 +4829,7 @@ echo "Audio drivers     $audio_drv_list"
+@@ -4769,6 +4834,7 @@ echo "Audio drivers     $audio_drv_list"
  echo "Block whitelist (rw) $block_drv_rw_whitelist"
  echo "Block whitelist (ro) $block_drv_ro_whitelist"
  echo "VirtFS support    $virtfs"
@@ -149,7 +164,7 @@
  echo "VNC support       $vnc"
  if test "$vnc" = "yes" ; then
      echo "VNC SASL support  $vnc_sasl"
-@@ -4951,6 +5008,15 @@ fi
+@@ -4950,6 +5016,15 @@ fi
  if test "$profiler" = "yes" ; then
    echo "CONFIG_PROFILER=y" >> $config_host_mak
  fi
@@ -165,3 +180,13 @@
  if test "$slirp" = "yes" ; then
    echo "CONFIG_SLIRP=y" >> $config_host_mak
    echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
+@@ -5153,6 +5228,9 @@ fi
+ if test "$have_ifaddrs_h" = "yes" ; then
+     echo "HAVE_IFADDRS_H=y" >> $config_host_mak
+ fi
++if test "$have_ifaddrs_h" = "yes" ; then
++    echo "HAVE_IFADDRS_H=y" >> $config_host_mak
++fi
+ if test "$vte" = "yes" ; then
+   echo "CONFIG_VTE=y" >> $config_host_mak
+   echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak