UPDATE: QEMU 4.0.0

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: QEMU 4.0.0

Brad Smith-14
Here is an update to QEMU 4.0.0.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.183
diff -u -p -u -p -r1.183 Makefile
--- Makefile 19 Dec 2018 17:57:06 -0000 1.183
+++ Makefile 25 Apr 2019 12:34:27 -0000
@@ -1,12 +1,10 @@
 # $OpenBSD: Makefile,v 1.183 2018/12/19 17:57:06 sthen Exp $
 
-USE_WXNEEDED= Yes
-
 ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc sparc64
 
 COMMENT= multi system emulator
 
-DISTNAME= qemu-3.1.0
+DISTNAME= qemu-4.0.0
 CATEGORIES= emulators
 MASTER_SITES= https://download.qemu.org/
 EXTRACT_SUFX= .tar.xz
@@ -19,11 +17,11 @@ MAINTAINER= Brad Smith <[hidden email]
 PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB= SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl \
- 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 \
- curses nettle nfs pango-1.0 pangocairo-1.0 pcre2-8 \
- pixman-1 png ssh2 usb-1.0 util vte-2.91 xkbcommon xml2 z \
- ${COMPILER_LIBCXX}
+ curses epoxy fdt>=4.1 gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 \
+ glib-2.0 gnutls gobject-2.0 gthread-2.0 gtk-3 iconv intl \
+ iscsi jpeg lzo2 m nettle nfs pango-1.0 pangocairo-1.0 \
+ pcre2-8 pixman-1 png16 ssh2 usb-1.0 util vte-2.91 xkbcommon \
+ xml2 z ${COMPILER_LIBCXX}
 
 # Using TLS emulation layer
 COMPILER = base-clang ports-gcc
@@ -35,8 +33,9 @@ BUILD_DEPENDS= devel/gettext-tools \
  textproc/texi2html
 LIB_DEPENDS= archivers/bzip2 \
  archivers/lzo2 \
+ converters/libiconv \
  devel/capstone/main \
- devel/dtc \
+ devel/dtc>=1.5.0p0 \
  devel/gettext \
  devel/glib2 \
  devel/libiscsi \
@@ -59,7 +58,8 @@ MODPY_RUNDEP= No
 MAKE_ENV= V=1
 FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu
 
-EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
+# fix build with ancient ncurses
+EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -D_XOPEN_SOURCE_EXTENDED
 EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
 
 # until the system headers are fixed properly.
@@ -80,7 +80,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
  --disable-bsd-user \
  --enable-capstone=system \
  --enable-curses \
+ --disable-auth-pam \
  --disable-gcrypt \
+ --disable-sdl-image \
  --disable-smartcard \
  --disable-snappy \
  --disable-spice \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 distinfo
--- distinfo 19 Dec 2018 17:57:06 -0000 1.57
+++ distinfo 25 Apr 2019 12:34:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-3.1.0.tar.xz) = agUI3weaCjPCSHypNqVsEhIvEFuKlqRDdHBL72xpq/w=
-SIZE (qemu-3.1.0.tar.xz) = 36070104
+SHA256 (qemu-4.0.0.tar.xz) = E6k9/nW4ZzQyb41bR1/eguxpLVtaM4tCYq7raw+k5Gk=
+SIZE (qemu-4.0.0.tar.xz) = 55628624
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.59
diff -u -p -u -p -r1.59 patch-configure
--- patches/patch-configure 19 Dec 2018 17:57:06 -0000 1.59
+++ patches/patch-configure 26 Mar 2019 20:34:47 -0000
@@ -1,19 +1,9 @@
 $OpenBSD: patch-configure,v 1.59 2018/12/19 17:57:06 sthen Exp $
 
-Fix curses test to work on OpenBSD
-
 Index: configure
 --- configure.orig
 +++ configure
-@@ -3370,6 +3370,7 @@ if test "$curses" != "no" ; then
-   fi
-   curses_found=no
-   cat > $TMPC << EOF
-+#define _XOPEN_SOURCE_EXTENDED
- #include <locale.h>
- #include <curses.h>
- #include <wchar.h>
-@@ -5631,10 +5632,6 @@ write_c_skeleton
+@@ -5937,10 +5937,6 @@ write_c_skeleton
  if test "$gcov" = "yes" ; then
    CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 PLIST
--- pkg/PLIST 19 Dec 2018 17:57:06 -0000 1.41
+++ pkg/PLIST 23 Mar 2019 23:12:31 -0000
@@ -4,6 +4,7 @@
 @pkgpath emulators/kqemu
 @pkgpath emulators/qemu,kqemu
 @pkgpath emulators/qemu-old[,no_x11]
+@bin bin/elf2dmp
 @bin bin/qemu-edid
 @bin bin/qemu-ga
 @bin bin/qemu-img
@@ -49,8 +50,40 @@
 @man man/man7/qemu-qmp-ref.7
 @man man/man8/qemu-ga.8
 @man man/man8/qemu-nbd.8
+share/applications/qemu.desktop
 share/doc/pkg-readmes/${PKGSTEM}
 share/doc/qemu/
+share/doc/qemu/interop/
+share/doc/qemu/interop/.buildinfo
+share/doc/qemu/interop/_static/
+share/doc/qemu/interop/_static/ajax-loader.gif
+share/doc/qemu/interop/_static/alabaster.css
+share/doc/qemu/interop/_static/basic.css
+share/doc/qemu/interop/_static/comment-bright.png
+share/doc/qemu/interop/_static/comment-close.png
+share/doc/qemu/interop/_static/comment.png
+share/doc/qemu/interop/_static/custom.css
+share/doc/qemu/interop/_static/doctools.js
+share/doc/qemu/interop/_static/down-pressed.png
+share/doc/qemu/interop/_static/down.png
+share/doc/qemu/interop/_static/file.png
+share/doc/qemu/interop/_static/jquery.js
+share/doc/qemu/interop/_static/minus.png
+share/doc/qemu/interop/_static/plus.png
+share/doc/qemu/interop/_static/pygments.css
+share/doc/qemu/interop/_static/searchtools.js
+share/doc/qemu/interop/_static/underscore.js
+share/doc/qemu/interop/_static/up-pressed.png
+share/doc/qemu/interop/_static/up.png
+share/doc/qemu/interop/_static/websupport.js
+share/doc/qemu/interop/bitmaps.html
+share/doc/qemu/interop/genindex.html
+share/doc/qemu/interop/index.html
+share/doc/qemu/interop/live-block-operations.html
+share/doc/qemu/interop/objects.inv
+share/doc/qemu/interop/pr-helper.html
+share/doc/qemu/interop/search.html
+share/doc/qemu/interop/searchindex.js
 share/doc/qemu/qemu-doc.html
 share/doc/qemu/qemu-doc.txt
 share/doc/qemu/qemu-ga-ref.html
@@ -66,6 +99,16 @@ share/examples/qemu/qemu-ifup
 @mode 755
 @sample ${SYSCONFDIR}/qemu-ifup
 @mode
+share/icons/hicolor/128x128/apps/qemu.png
+share/icons/hicolor/16x16/apps/qemu.png
+share/icons/hicolor/24x24/apps/qemu.png
+share/icons/hicolor/256x256/apps/qemu.png
+share/icons/hicolor/32x32/apps/qemu.bmp
+share/icons/hicolor/32x32/apps/qemu.png
+share/icons/hicolor/48x48/apps/qemu.png
+share/icons/hicolor/512x512/apps/qemu.png
+share/icons/hicolor/64x64/apps/qemu.png
+share/icons/hicolor/scalable/apps/qemu.svg
 share/locale/bg/LC_MESSAGES/qemu.mo
 share/locale/de_DE/
 share/locale/de_DE/LC_MESSAGES/
@@ -96,7 +139,6 @@ share/qemu/hppa-firmware.img
 share/qemu/keymaps/
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo
-share/qemu/keymaps/common
 share/qemu/keymaps/cz
 share/qemu/keymaps/da
 share/qemu/keymaps/de
@@ -119,9 +161,7 @@ share/qemu/keymaps/ja
 share/qemu/keymaps/lt
 share/qemu/keymaps/lv
 share/qemu/keymaps/mk
-share/qemu/keymaps/modifiers
 share/qemu/keymaps/nl
-share/qemu/keymaps/nl-be
 share/qemu/keymaps/no
 share/qemu/keymaps/pl
 share/qemu/keymaps/pt
@@ -142,14 +182,13 @@ share/qemu/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
 share/qemu/ppc_rom.bin
+share/qemu/pvh.bin
 share/qemu/pxe-e1000.rom
 share/qemu/pxe-eepro100.rom
 share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 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