diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 5116109eec34..b2be2eca0ecc 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,107 +1,107 @@ # Created by: dchapes@ddm.on.ca PORTNAME= vice PORTVERSION= 3.6.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF/vice-emu/releases MAINTAINER= dinoex@FreeBSD.org COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II LICENSE= GPLv2 ROM LICENSE_COMB= multi LICENSE_NAME_ROM= Commodore ROMs LICENSE_TEXT_ROM= ROMs are copyrighted by Commodore Business Machines LICENSE_PERMS_ROM= auto-accept BUILD_DEPENDS= xa65:devel/xa65 \ xdg-open:devel/xdg-utils LIB_DEPENDS= libpng.so:graphics/png \ libgif.so:graphics/giflib \ libportaudio.so:audio/portaudio \ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libavcodec.so:multimedia/ffmpeg \ libFLAC.so:audio/flac \ libpci.so:devel/libpci \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpcre2-8.so:devel/pcre2 \ libgnutls.so:security/gnutls \ libharfbuzz.so:print/harfbuzz USES= compiler:c++11-lang pkgconfig makeinfo localbase:ldflags \ gmake iconv:wchar_t jpeg readline gettext xorg USE_XORG= xpm ice sm xext xv xt x11 xmu xxf86vm USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes HAS_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share CFLAGS+= -fcommon CONFIGURE_ARGS+= --enable-ipv6 \ --enable-external-ffmpeg \ --enable-x64 \ --disable-realdevice \ --disable-pdf-docs \ --infodir="${PREFIX}/${INFO_PATH}" \ --localedir="${LOCALBASE}/share/locale" \ --disable-dependency-tracking \ DOS2UNIX=true OPTIONS_DEFINE= SDLSOUND ALSA PULSEAUDIO DOCS OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= GTK3UI SDLUI2 OPTIONS_DEFAULT?= GTK3UI SDLSOUND ALSA NO_OPTIONS_SORT=yes OPTIONS_SUB= yes GTK3UI_DESC= use GTK3 user interface SDLUI2_DESC= use SDL2 user interface SDLSOUND_DESC= build with SDL2 sound system support GTK3UI_USES= desktop-file-utils GTK3UI_CONFIGURE_ENABLE= native-gtk3ui desktop-files GTK3UI_BUILD_DEPENDS= bash:shells/bash SDLUI2_USES= sdl SDLUI2_USE= SDL=sdl2 SDL=image2 SDLUI2_CONFIGURE_ENABLE= sdlui2 SDLSOUND_USES= sdl SDLSOUND_USE= SDL=sdl2 SDLSOUND_CONFIGURE_ON= --with-sdlsound ALSA_CONFIGURE_OFF= --without-alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_CONFIGURE_OFF= --without-pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio .include .if !defined(BUILDING_INDEX) __pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/ / /}' | ${AWK} \ '{ if (NF % 2 != 0) { print "broken"; exit; } \ for (i=1; i<=NF; i++) { \ if ( i % 2 == 0) { print " " $$i " ;"; } \ else { printf "${LN} -s " $$i " "; } \ } }' .endif .if ${PORT_OPTIONS:MGTK3UI} USES+= gnome gl USE_GNOME+= gtk30 vte3 cairo gdkpixbuf2 pango USE_GL+= glu gl glew .endif .if ${PORT_OPTIONS:MDOCS} INFO+= vice .endif pre-configure: .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in .endif # workaround for xdg-desktop-menu pre-install-GTK3UI-on: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/desktop-directories .include diff --git a/emulators/vice/files/patch-src_iodrv_io-unix-access.c b/emulators/vice/files/patch-src_iodrv_io-unix-access.c index 0a22a8184705..9adc61903536 100644 --- a/emulators/vice/files/patch-src_iodrv_io-unix-access.c +++ b/emulators/vice/files/patch-src_iodrv_io-unix-access.c @@ -1,14 +1,18 @@ ---- src/iodrv/io-unix-access.c.orig 2019-03-21 09:04:15 UTC +--- src/iodrv/io-unix-access.c.orig 2022-01-24 00:13:24 UTC +++ src/iodrv/io-unix-access.c -@@ -26,6 +26,11 @@ +@@ -26,6 +26,15 @@ #include "vice.h" -+#if defined(__FreeBSD__) && defined(__ppc__) ++#if defined(__FreeBSD__) +#include ++#if defined(__ppc__) +#include ++#else ++#include ++#endif +#endif + #ifdef UNIX_COMPILE #include