From b179b768b455143b32bd626d9ca89da255b9a177 Mon Sep 17 00:00:00 2001
From: Juergen Lock <nox@FreeBSD.org>
Date: Wed, 29 May 2013 18:01:53 +0000
Subject: - Update to 1.5.0, announce message is here:

	https://lists.gnu.org/archive/html/qemu-devel/2013-05/msg02557.html

  Full changelog:

	http://wiki.qemu.org/ChangeLog/1.5

  The new libusb host code needs recent 10-current; for older releases you
  can still try the net/usbredir support knob, see pkg-message for details.

- Update pkg-message a bit.

Thanx to:	emaste for some suggestions
---
 emulators/qemu-devel/files/patch-configure | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'emulators/qemu-devel/files/patch-configure')

diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index d425d4cfef84..61bffda02f4e 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -17,6 +17,15 @@
  "
  fi
  
+@@ -1756,7 +1756,7 @@ if test "$gtk" != "no"; then
+ 	gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null`
+ 	vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null`
+ 	vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null`
+-	libs_softmmu="$gtk_libs $vte_libs $libs_softmmu"
++	libs_softmmu="$gtk_libs -lintl $vte_libs $libs_softmmu"
+ 	gtk="yes"
+     else
+ 	if test "$gtk" = "yes" ; then
 @@ -2511,15 +2511,18 @@ if compile_prog "" "" ; then
  fi
  
@@ -44,3 +53,42 @@
  fi
  
  # Search for bswap_32 function
+@@ -3134,18 +3134,29 @@ fi
+ 
+ # check for libusb
+ if test "$libusb" != "no" ; then
+-    if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
+-        libusb="yes"
+-	usb="libusb"
+-        libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
+-        libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
+-        QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
++    cat > $TMPC << EOF
++#include <libusb.h>
++
++int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); }
++EOF
++    if compile_prog "-Werror" "-lusb" ; then
++        libusb_cflags=""
++        libusb_libs=-lusb
+         libs_softmmu="$libs_softmmu $libusb_libs"
+     else
+-        if test "$libusb" = "yes"; then
+-            feature_not_found "libusb"
++        if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
++            libusb="yes"
++            usb="libusb"
++            libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
++            libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
++            QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
++            libs_softmmu="$libs_softmmu $libusb_libs"
++        else
++            if test "$libusb" = "yes"; then
++                feature_not_found "libusb"
++            fi
++            libusb="no"
+         fi
+-        libusb="no"
+     fi
+ fi
+ 
-- 
cgit v1.2.3