diff options
author | adam <adam@pkgsrc.org> | 2017-02-27 05:19:29 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-02-27 05:19:29 +0000 |
commit | c90a8b32639c13acb7a91629fbfb25cbf0f199d4 (patch) | |
tree | d33261ebced0aec1a7c88570293b60f83a6c5623 /emulators/qemu | |
parent | effdc9aae5e266eaf5d658e7cfcfc4d77eaa2a99 (diff) | |
download | pkgsrc-c90a8b32639c13acb7a91629fbfb25cbf0f199d4.tar.gz |
Revision 2 changes:
* Fixed building with C++.
* Fixed building on Darwin (PR 51899).
* Added GTK3 as an option.
* Switched from SDL-1 to SDL-2.
* Depend and enable support for: lzo, jemalloc, snappy, png, curl, jpeg.
Diffstat (limited to 'emulators/qemu')
-rw-r--r-- | emulators/qemu/Makefile | 23 | ||||
-rw-r--r-- | emulators/qemu/PLIST | 9 | ||||
-rw-r--r-- | emulators/qemu/distinfo | 6 | ||||
-rw-r--r-- | emulators/qemu/options.mk | 25 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-configure | 20 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc | 16 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-disas_libvixl_vixl_utils.h | 19 |
7 files changed, 90 insertions, 28 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 91ee79bb9dd..c5f515b6d07 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.164 2017/02/20 04:03:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.165 2017/02/27 05:19:29 adam Exp $ DISTNAME= qemu-2.8.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://download.qemu-project.org/ EXTRACT_SUFX= .tar.bz2 @@ -16,8 +16,9 @@ NOT_FOR_PLATFORM+= NetBSD-1.[0-6]*-* # qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565. NOT_FOR_PLATFORM+= NetBSD-5*-* -USE_TOOLS+= bison gmake makeinfo perl:build pkg-config USE_CURSES= resize_term wide +USE_LANGUAGES+= c c++ +USE_TOOLS+= bison gmake makeinfo perl:build pkg-config FAKE_NCURSES= yes UNLIMIT_RESOURCES= datasize HAS_CONFIGURE= yes @@ -41,7 +42,7 @@ CONFIGURE_ARGS+= --python=${PYTHONBIN} CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --enable-curses -#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X +CONFIGURE_ARGS+= --enable-jemalloc CONFIGURE_ARGS+= --disable-opengl CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} @@ -84,10 +85,10 @@ PKG_SYSCONFSUBDIR= qemu REPLACE_PERL+= scripts/texi2pod.pl -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported yet as of 1.7.0 +PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported yet as of 2.8.0 -BUILDLINK_PASSTHRU_DIRS+= /usr/lib -BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib +BUILDLINK_PASSTHRU_DIRS+= /usr/lib +BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu @@ -123,7 +124,7 @@ PLIST.nbd= YES CONFIGURE_ARGS+= --disable-coroutine-pool .endif -PLIST_VARS+= ${UE_ARCHS} nbd ivshmem +PLIST_VARS+= ${UE_ARCHS} nbd .for _var_ in ${USER_EMUL} PLIST.${_var_}= YES .endfor @@ -136,11 +137,17 @@ post-install: .if empty(OPSYS:MDarwin) .include "../../mk/oss.buildlink3.mk" .endif +.include "../../archivers/lzo/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/jemalloc/buildlink3.mk" +.include "../../devel/snappy/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../security/libgcrypt/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST index 68128e32726..332989f6f1e 100644 --- a/emulators/qemu/PLIST +++ b/emulators/qemu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.48 2016/12/30 10:00:16 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.49 2017/02/27 05:19:29 adam Exp $ ${PLIST.ivshmem}bin/ivshmem-client ${PLIST.ivshmem}bin/ivshmem-server ${PLIST.alpha}bin/qemu-alpha @@ -62,6 +62,13 @@ man/man8/qemu-nbd.8 share/doc/qemu/Makefile.multinode-NetBSD share/doc/qemu/qemu-doc.html share/doc/qemu/qmp-commands.txt +${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo +${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo share/qemu/QEMU,cgthree.bin share/qemu/QEMU,tcx.bin share/qemu/acpi-dsdt.aml diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 0fc01fb4608..4acc0b7ecaf 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.120 2017/01/08 02:26:47 kamil Exp $ +$NetBSD: distinfo,v 1.121 2017/02/27 05:19:29 adam Exp $ SHA1 (qemu-2.8.0.tar.bz2) = a5602f2ddb51d61b4c0e618b779fdb0dbdc9cc1f RMD160 (qemu-2.8.0.tar.bz2) = da1e640443a15f36a242fe803c65a39f85b06fcc SHA512 (qemu-2.8.0.tar.bz2) = 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 Size (qemu-2.8.0.tar.bz2) = 28368517 bytes SHA1 (patch-Makefile.objs) = f40deeed5482a24369e898411bb611be418dc3ca -SHA1 (patch-configure) = 5c2911c1375a2f8916f84f68d4ba9a799b7624cb +SHA1 (patch-configure) = 302d0ed283947b943e7fbcdd1138ba5fad3d1683 SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7 +SHA1 (patch-disas_libvixl_vixl_a64_disasm-a64.cc) = 0660a0c2d37c332fcd1e00edb2dc3c52fe179cc9 +SHA1 (patch-disas_libvixl_vixl_utils.h) = 85285473b6021f9a0d190832d03c60c4d9df6bb7 SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41 SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk index a4403f017f5..57ab7fd5e75 100644 --- a/emulators/qemu/options.mk +++ b/emulators/qemu/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2015/12/21 12:10:22 ryoon Exp $ +# $NetBSD: options.mk,v 1.3 2017/02/27 05:19:29 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qemu -PKG_SUPPORTED_OPTIONS= sdl ivshmem +PKG_SUPPORTED_OPTIONS= gtk3 ivshmem sdl .include "../../mk/bsd.fast.prefs.mk" @@ -15,14 +15,23 @@ PKG_SUGGESTED_OPTIONS+= sdl .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Msdl) -CONFIGURE_ARGS+= --enable-sdl -.include "../../devel/SDL/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-sdl -.endif +PLIST_VARS+= gtk ivshmem .if !empty(PKG_OPTIONS:Mivshmem) PLIST.ivshmem= yes .endif +.if !empty(PKG_OPTIONS:Mgtk3) +PLIST.gtk= yes +CONFIGURE_ARGS+= --enable-gtk +.include "../../x11/gtk3/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-gtk +.endif + +.if !empty(PKG_OPTIONS:Msdl) +CONFIGURE_ARGS+= --enable-sdl +.include "../../devel/SDL2/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-sdl +.endif diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index 98de471f7a8..8e8bb2b195f 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,6 +1,7 @@ -$NetBSD: patch-configure,v 1.16 2017/01/08 02:26:47 kamil Exp $ +$NetBSD: patch-configure,v 1.17 2017/02/27 05:19:29 adam Exp $ Don't use gld on SunOS +Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least). add check for shm_open avoid bad substitution @@ -14,18 +15,19 @@ avoid bad substitution smbd="${SMBD-/usr/sfw/sbin/smbd}" needs_libsunmath="no" solarisrev=$(uname -r | cut -f2 -d.) -@@ -2928,8 +2927,8 @@ if test "$curses" != "no" ; then +@@ -2928,23 +2927,23 @@ if test "$curses" != "no" ; then curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):" curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses" else - curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" - curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" -+ curses_inc_list="$(@PREFIX@/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:" -+ curses_lib_list="$(@PREFIX@/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw" ++ curses_inc_list="$(/dist/pkg/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:" ++ curses_lib_list="$(/dist/pkg/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw" fi curses_found=no cat > $TMPC << EOF -@@ -2937,14 +2936,13 @@ if test "$curses" != "no" ; then + #include <locale.h> ++#define NCURSES_WIDECHAR 1 #include <curses.h> #include <wchar.h> int main(void) { @@ -41,7 +43,7 @@ avoid bad substitution } EOF IFS=: -@@ -3762,6 +3760,27 @@ if compile_prog "" "" ; then +@@ -3762,6 +3761,27 @@ if compile_prog "" "" ; then fallocate_zero_range=yes fi @@ -69,7 +71,7 @@ avoid bad substitution # check for posix_fallocate posix_fallocate=no cat > $TMPC << EOF -@@ -4041,8 +4060,13 @@ fi +@@ -4041,8 +4061,13 @@ fi cat > $TMPC <<EOF #include <signal.h> #include <time.h> @@ -83,7 +85,7 @@ avoid bad substitution return clock_gettime(CLOCK_REALTIME, NULL); } EOF -@@ -4797,7 +4821,9 @@ if test "$want_tools" = "yes" ; then +@@ -4797,7 +4822,9 @@ if test "$want_tools" = "yes" ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" @@ -94,7 +96,7 @@ avoid bad substitution fi fi if test "$softmmu" = yes ; then -@@ -5303,6 +5329,9 @@ fi +@@ -5303,6 +5330,9 @@ fi if test "$fallocate_zero_range" = "yes" ; then echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak fi diff --git a/emulators/qemu/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/emulators/qemu/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc new file mode 100644 index 00000000000..c606cc02df7 --- /dev/null +++ b/emulators/qemu/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-disas_libvixl_vixl_a64_disasm-a64.cc,v 1.1 2017/02/27 05:19:29 adam Exp $ + +Re-order includes, so __STDC_CONSTANT_MACROS gets defined before including stdint.h. + +--- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2017-02-26 09:56:59.312135262 +0000 ++++ disas/libvixl/vixl/a64/disasm-a64.cc +@@ -24,8 +24,8 @@ + // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-#include <cstdlib> + #include "vixl/a64/disasm-a64.h" ++#include <cstdlib> + + namespace vixl { + diff --git a/emulators/qemu/patches/patch-disas_libvixl_vixl_utils.h b/emulators/qemu/patches/patch-disas_libvixl_vixl_utils.h new file mode 100644 index 00000000000..409dc42eda6 --- /dev/null +++ b/emulators/qemu/patches/patch-disas_libvixl_vixl_utils.h @@ -0,0 +1,19 @@ +$NetBSD: patch-disas_libvixl_vixl_utils.h,v 1.1 2017/02/27 05:19:29 adam Exp $ + +Re-order includes, so __STDC_CONSTANT_MACROS gets defined before including stdint.h. + +--- disas/libvixl/vixl/utils.h.orig 2017-02-26 09:55:15.839475323 +0000 ++++ disas/libvixl/vixl/utils.h +@@ -27,10 +27,10 @@ + #ifndef VIXL_UTILS_H + #define VIXL_UTILS_H + +-#include <string.h> +-#include <cmath> + #include "vixl/globals.h" + #include "vixl/compiler-intrinsics.h" ++#include <string.h> ++#include <cmath> + + namespace vixl { + |