cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to qemu-2.10.0.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2017-08-31 08:32:36 +00:00
parent f645678b5c
commit cad8dcbbdc
6 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emulators/qemu/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.167 2017/07/26 22:45:20 sthen Exp $
# $OpenBSD: Makefile,v 1.168 2017/08/31 08:32:36 ajacoutot Exp $
USE_WXNEEDED= Yes
@ -6,11 +6,10 @@ ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc sparc64
COMMENT= multi system emulator
DISTNAME= qemu-2.9.0
REVISION= 2
DISTNAME= qemu-2.10.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://www.qemu.org/
@ -19,15 +18,14 @@ MAINTAINER= Brad Smith <brad@comstyle.com>
# GPLv2, LGPLv2 and BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \
Xrandr Xrender atk-1.0 bz2 c cairo curl drm epoxy fdt \
fontconfig freetype gbm gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
glib-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0 intl \
iscsi jpeg lzo2 m ncursesw nettle nfs pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread pthread-stubs ssh2 \
usb-1.0 util vte z ${COMPILER_LIBCXX}
WANTLIB= SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject curl drm epoxy \
fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls \
gobject-2.0 gthread-2.0 gtk-3 intl iscsi jpeg lzo2 m \
ncursesw nettle nfs pango-1.0 pangocairo-1.0 pcre2-8 \
pixman-1 png pthread-stubs ssh2 usb-1.0 util vte-2.91 z \
${COMPILER_LIBCXX}
# Using gcc4 for the TLS emulation layer
# Using TLS emulation layer
COMPILER = gcc
MODULES= lang/python
@ -43,15 +41,15 @@ LIB_DEPENDS= archivers/bzip2 \
devel/libiscsi \
devel/libnfs \
devel/libusb1>=1.0.20 \
devel/sdl \
devel/vte \
devel/sdl2 \
devel/vte3 \
graphics/jpeg \
graphics/png \
net/curl \
security/gnutls \
security/libnettle \
security/libssh2 \
x11/gtk+2
x11/gtk+3
MODPY_RUNDEP= No

4
emulators/qemu/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qemu-2.9.0.tar.bz2) = AL+yF7G7A8emwyYbgZz8y/taWOPizv9UYyfScXc8bBQ=
SIZE (qemu-2.9.0.tar.bz2) = 28720490
SHA256 (qemu-2.10.0.tar.xz) = VdgayYekgh0nRDWcAm12ZFkxm6nAE3RlcDaQaNk/8zU=
SIZE (qemu-2.10.0.tar.xz) = 25040324

10
emulators/qemu/patches/patch-configure
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.53 2017/05/27 06:38:23 espie Exp $
$OpenBSD: patch-configure,v 1.54 2017/08/31 08:32:36 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -1593,7 +1593,7 @@ static __thread int tls_var;
@@ -1686,7 +1686,7 @@ static __thread int tls_var;
int main(void) { return tls_var; }
EOF
@ -12,7 +12,7 @@ Index: configure
error_exit "Your compiler does not support the __thread specifier for " \
"Thread-Local Storage (TLS). Please upgrade to a version that does."
fi
@@ -2985,6 +2985,7 @@ if test "$curses" != "no" ; then
@@ -3122,6 +3122,7 @@ if test "$curses" != "no" ; then
fi
curses_found=no
cat > $TMPC << EOF
@ -20,7 +20,7 @@ Index: configure
#include <locale.h>
#include <curses.h>
#include <wchar.h>
@@ -4787,10 +4788,6 @@ fi
@@ -5002,10 +5003,6 @@ fi
if test "$gcov" = "yes" ; then
CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
@ -31,7 +31,7 @@ Index: configure
fi
##########################################
@@ -4939,7 +4936,7 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a
@@ -5161,7 +5158,7 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a
# Different host OS linkers have different ideas about the name of the ELF
# emulation. Linux and OpenBSD use 'elf_i386'; FreeBSD uses the _fbsd
# variant; and Windows uses i386pe.

15
emulators/qemu/patches/patch-tcg_ppc_tcg-target_inc_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tcg_ppc_tcg-target_inc_c,v 1.4 2017/04/23 13:24:17 ajacoutot Exp $
--- tcg/ppc/tcg-target.inc.c.orig Tue Apr 11 14:00:36 2017
+++ tcg/ppc/tcg-target.inc.c Tue Apr 11 21:38:10 2017
@@ -2900,4 +2900,11 @@ static void __attribute__((constructor)) tcg_cache_ini
dcache_bsize = cacheline;
icache_bsize = cacheline;
}
+
+#elif defined(__OpenBSD__)
+static void __attribute__((constructor)) tcg_cache_init(void)
+{
+ dcache_bsize = 32;
+ icache_bsize = 32;
+}
#endif

20
emulators/qemu/patches/patch-util_cacheinfo_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-util_cacheinfo_c,v 1.1 2017/08/31 08:32:36 ajacoutot Exp $
Index: util/cacheinfo.c
--- util/cacheinfo.c.orig
+++ util/cacheinfo.c
@@ -89,6 +89,14 @@ static void sys_cache_info(int *isize, int *dsize)
}
}
+#elif defined (__OpenBSD__)
+
+static void sys_cache_info(int *isize, int *dsize)
+{
+ *isize = 32;
+ *dsize = 32;
+}
+
#else
/* POSIX */

6
emulators/qemu/pkg/PLIST
View File

@ -1,11 +1,9 @@
@comment $OpenBSD: PLIST,v 1.36 2017/04/23 13:24:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.37 2017/08/31 08:32:36 ajacoutot Exp $
@conflict kqemu-*
@conflict qemu-*
@pkgpath emulators/kqemu
@pkgpath emulators/qemu,kqemu
@pkgpath emulators/qemu-old[,no_x11]
@bin bin/ivshmem-client
@bin bin/ivshmem-server
@bin bin/qemu-ga
@bin bin/qemu-img
@bin bin/qemu-io
@ -145,7 +143,9 @@ share/qemu/pxe-rtl8139.rom
share/qemu/pxe-virtio.rom
share/qemu/qemu-icon.bmp
share/qemu/qemu_logo_no_text.svg
share/qemu/qemu_vga.ndrv
share/qemu/s390-ccw.img
share/qemu/s390-netboot.img
share/qemu/sgabios.bin
share/qemu/skiboot.lid
share/qemu/slof.bin