Attachment 199315 Details for Bug 233293 – upgrade vice to 3.2

[patch] upgrade vice to 3.2

vice-3.2.diff (text/plain), 14.14 KB, created by Felix Palmen on 2018-11-18 13:36:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2018-11-18 13:36:00 UTC

Size: 14.14 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index 8578e5d..02c2e82 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	vice
>-PORTVERSION=	3.1
>-PORTREVISION=	6
>+PORTVERSION=	3.2
> CATEGORIES=	emulators
>-MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
>-		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
>+MASTER_SITES=	SF/vice-emu/releases
> 
> MAINTAINER=	dinoex@FreeBSD.org
> COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
>@@ -15,7 +13,8 @@ LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
> 		mkfontdir:x11-fonts/mkfontdir \
>-		mkfontscale:x11-fonts/mkfontscale
>+		mkfontscale:x11-fonts/mkfontscale \
>+		xa65:devel/xa65
> LIB_DEPENDS=	libpng.so:graphics/png \
> 		libgif.so:graphics/giflib \
> 		libportaudio.so:audio/portaudio \
>@@ -35,7 +34,7 @@ RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
> USES=		compiler:c++11-lang pkgconfig makeinfo gmake iconv jpeg
> USE_XORG=	xpm ice sm xext xv xt x11 xmu xxf86vm
> USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
>-GNU_CONFIGURE=	yes
>+HAS_CONFIGURE=	yes
> MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -53,17 +52,15 @@ LMLINKS=	vice.1 x64.1 \
> 
> OPTIONS_DEFINE=	SDL ALSA PULSEAUDIO DOCS NLS
> OPTIONS_SINGLE=	GUI
>-OPTIONS_SINGLE_GUI=	GNOMEUI3 GNOMEUI2 XAW
>-OPTIONS_DEFAULT?=	GNOMEUI3 SDL ALSA
>+OPTIONS_SINGLE_GUI=	GNOMEUI2 XAW
>+OPTIONS_DEFAULT?=	GNOMEUI2 SDL
> NO_OPTIONS_SORT=yes
> OPTIONS_SUB=	yes
>-GNOMEUI3_DESC=	use gnome3 user interface
> GNOMEUI2_DESC=	use gnome2 user interface
> XAW_DESC=	use plain Xaw library
> SDL_DESC=	build with SDL2 sound system support
> 
> GNOMEUI2_CONFIGURE_ENABLE=	gnomeui
>-GNOMEUI3_CONFIGURE_ENABLE=	gnomeui3
> SDL_USE=		SDL=sdl2
> SDL_CONFIGURE_ON=	--with-sdlsound
> ALSA_CONFIGURE_OFF=	--without-alsa
>@@ -88,14 +85,6 @@ USE_GL+=	glu gl
> LIB_DEPENDS+=	libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
> .endif
> 
>-.if ${PORT_OPTIONS:MGNOMEUI3}
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext-runtime
>-.endif
>-USE_GNOME+=	gtk30 vte3 cairo gdkpixbuf2
>-USE_GL+=	glu gl
>-.endif
>-
> .if ${PORT_OPTIONS:MXAW}
> USE_XORG+=	xaw
> USES+=		readline
>diff --git a/distinfo b/distinfo
>index 218753d..8d1ff30 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491688299
>-SHA256 (vice-3.1.tar.gz) = d923635362a090010156eedf549e11603f7d9d9d2f2df005a4e36392de4f1529
>-SIZE (vice-3.1.tar.gz) = 30714226
>+TIMESTAMP = 1542453927
>+SHA256 (vice-3.2.tar.gz) = 28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523
>+SIZE (vice-3.2.tar.gz) = 30279589
>diff --git a/files/patch-configure b/files/patch-configure
>deleted file mode 100644
>index 10af1cf..0000000
>--- a/files/patch-configure
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- configure.orig	2016-12-15 03:47:11 UTC
>-+++ configure
>-@@ -15857,6 +15857,7 @@ if test "x$ac_cv_lib_SDL2_SDL_OpenAudio"
>-   SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o";
>-                                   use_sdl_prefix=no;
>-                                   use_sdl2_prefix=yes;
>-+                                  SOUND_LIBS="$SOUND_LIBS -lSDL2";
>-                                   USE_SDL_AUDIO_SUPPORT="yes";
>- 
>- $as_echo "#define USE_SDL2_PREFIX /**/" >>confdefs.h
>diff --git a/files/patch-doc_vice.texi b/files/patch-doc_vice.texi
>deleted file mode 100644
>index b744f79..0000000
>--- a/files/patch-doc_vice.texi
>+++ /dev/null
>@@ -1,48 +0,0 @@
>---- doc/vice.texi.orig	2016-12-15 21:30:13 UTC
>-+++ doc/vice.texi
>-@@ -1555,8 +1555,8 @@ System files can still be installed in a
>- specify a complete path instead of just a file name.  For example, if
>- you specify @file{./kernal} as the kernal image name, the kernal image
>- will be loaded from the current directory.  This can be done by using
>--command-line options or by modifying resource values (@pxref{Resource
>--files}).
>-+command-line options or by modifying
>-+resource values (@pxref{Resource files}).
>- 
>- @menu
>- * ROM files::                   Files containing dumps of the original ROMs.
>-@@ -11013,8 +11013,9 @@ character cell, the 8 colour bits are us
>- @subsection Changing screen colors
>- 
>- It is also possible to choose what color set is used for the emulation
>--window.  This is done by specifying a palette file name (@pxref{Palette
>--files}) in the @code{PaletteName} resource.  The menu provides the
>-+window.  This is done by specifying a palette file
>-+name (@pxref{Palette files}) in the @code{PaletteName}
>-+resource.  The menu provides the
>- following values:
>- 
>- @itemize @bullet
>-@@ -11442,8 +11443,9 @@ xcbm5x0: (510)
>- @subsection Changing screen colors
>- 
>- It is also possible to choose what color set is used for the emulation
>--window.  This is done by specifying a palette file name (@pxref{Palette
>--files}) in the @code{PaletteName} resource.  The menu provides the
>-+window.  This is done by specifying a palette file name
>-+(@pxref{Palette files}) in the @code{PaletteName}
>-+resource.  The menu provides the
>- following values:
>- 
>- @itemize @bullet
>-@@ -27895,8 +27897,8 @@ the VICE FAQ (it is available on the Int
>- VICE home page:
>- @uref{http://vice-emu.sourceforge.net});
>- @item
>--the @code{comp.emulators.cbm} and @code{comp.sys.cbm} FAQs (@pxref{FAQs
>--you should read}).
>-+the @code{comp.emulators.cbm} and @code{comp.sys.cbm}
>-+FAQs (@pxref{FAQs you should read}).
>- @end itemize
>- 
>- @item
>diff --git a/files/patch-man_vice.1 b/files/patch-man_vice.1
>deleted file mode 100644
>index e2669d9..0000000
>--- a/files/patch-man_vice.1
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- man/vice.1.orig	2016-12-09 03:46:53 UTC
>-+++ man/vice.1
>-@@ -55,7 +55,7 @@ a cartridge file (bin<--->crt) converter
>- .PP
>- The whole documentation for these programs is available in HTML
>- format; the main file should be installed on your system as
>--/usr/local/lib/vice/doc/vice_toc.html.
>-+%%PREFIX%%/share/doc/vice/vice_toc.html.
>- .P
>- For up to date news about VICE, have a look at the official home page
>- at
>diff --git a/files/patch-src_iodrv_io-unix-access.c b/files/patch-src_iodrv_io-unix-access.c
>deleted file mode 100644
>index 49bb774..0000000
>--- a/files/patch-src_iodrv_io-unix-access.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/iodrv/io-unix-access.c.orig	2016-11-17 19:06:26 UTC
>-+++ src/iodrv/io-unix-access.c
>-@@ -77,7 +77,7 @@
>- #include "log.h"
>- #include "types.h"
>- 
>--#if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))
>-+#if defined(__linux) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))
>- 
>- #define IO_PORT_ACCESS
>- 
>-@@ -162,7 +162,7 @@ static void device_io_outb(WORD addr, BY
>- }
>- #endif
>- 
>--#ifdef __FreeBSD__
>-+#if 0
>- static int device_io_open(void)
>- {
>-     io_fd = open("/dev/io", O_RDWR);
>diff --git a/pkg-plist b/pkg-plist
>index 4474983..14485dd 100644
>--- a/pkg-plist
>+++ b/pkg-plist
>@@ -12,19 +12,6 @@ bin/xpet
> bin/xplus4
> bin/xscpu64
> bin/xvic
>-%%PORTDOCS%%share/info/vice.txt
>-%%NLS%%share/locale/da/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/ko/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/vice.mo
> lib/vice/C128/basic64
> lib/vice/C128/basichi
> lib/vice/C128/basiclo
>@@ -42,6 +29,8 @@ lib/vice/C128/deekay.vpl
> lib/vice/C128/default.vrs
> lib/vice/C128/frodo.vpl
> lib/vice/C128/godot.vpl
>+lib/vice/C128/gtk3_pos.vkm
>+lib/vice/C128/gtk3_sym.vkm
> lib/vice/C128/kernal
> lib/vice/C128/kernal64
> lib/vice/C128/kernalch
>@@ -77,6 +66,12 @@ lib/vice/C64/edkernal
> lib/vice/C64/frodo.vpl
> lib/vice/C64/godot.vpl
> lib/vice/C64/gskernal
>+lib/vice/C64/gtk3_keyrah.vkm
>+lib/vice/C64/gtk3_keyrah_de.vkm
>+lib/vice/C64/gtk3_pos.vkm
>+lib/vice/C64/gtk3_pos_de.vkm
>+lib/vice/C64/gtk3_sym.vkm
>+lib/vice/C64/gtk3_sym_de.vkm
> lib/vice/C64/jpchrgen
> lib/vice/C64/jpkernal
> lib/vice/C64/kernal
>@@ -100,6 +95,12 @@ lib/vice/C64DTV/c64mem.sym
> lib/vice/C64DTV/chargen
> lib/vice/C64DTV/default.vrs
> lib/vice/C64DTV/dtvrom.bin
>+lib/vice/C64DTV/gtk3_keyrah.vkm
>+lib/vice/C64DTV/gtk3_keyrah_de.vkm
>+lib/vice/C64DTV/gtk3_pos.vkm
>+lib/vice/C64DTV/gtk3_pos_de.vkm
>+lib/vice/C64DTV/gtk3_sym.vkm
>+lib/vice/C64DTV/gtk3_sym_de.vkm
> lib/vice/C64DTV/kernal
> lib/vice/C64DTV/spiff.vpl
> lib/vice/C64DTV/x11_keyrah.vkm
>@@ -124,6 +125,8 @@ lib/vice/CBM-II/deekay.vpl
> lib/vice/CBM-II/frodo.vpl
> lib/vice/CBM-II/godot.vpl
> lib/vice/CBM-II/green.vpl
>+lib/vice/CBM-II/gtk3_sym.vkm
>+lib/vice/CBM-II/gtk3_sym_de.vkm
> lib/vice/CBM-II/kernal
> lib/vice/CBM-II/kernal.500
> lib/vice/CBM-II/pc64.vpl
>@@ -169,6 +172,19 @@ lib/vice/PET/edit4b40
> lib/vice/PET/edit4b80
> lib/vice/PET/edit4g40
> lib/vice/PET/green.vpl
>+lib/vice/PET/gtk3_bude_pos.vkm
>+lib/vice/PET/gtk3_bude_pos_de.vkm
>+lib/vice/PET/gtk3_bude_sym.vkm
>+lib/vice/PET/gtk3_bude_sym_de.vkm
>+lib/vice/PET/gtk3_buuk_pos.vkm
>+lib/vice/PET/gtk3_buuk_pos_de.vkm
>+lib/vice/PET/gtk3_buuk_sym.vkm
>+lib/vice/PET/gtk3_buuk_sym_de.vkm
>+lib/vice/PET/gtk3_grus_pos.vkm
>+lib/vice/PET/gtk3_grus_pos_de.vkm
>+lib/vice/PET/gtk3_grus_sym.vkm
>+lib/vice/PET/gtk3_grus_sym_de.vkm
>+lib/vice/PET/gtk3_sym.vkm
> lib/vice/PET/hre-9000.324992-02.bin
> lib/vice/PET/hre-a000.324993-02.bin
> lib/vice/PET/hre.vrs
>@@ -206,24 +222,27 @@ lib/vice/PLUS4/3plus1hi
> lib/vice/PLUS4/3plus1lo
> lib/vice/PLUS4/basic
> lib/vice/PLUS4/c2lo.364
>+lib/vice/PLUS4/colodore_ted.vpl
> lib/vice/PLUS4/default.vrs
>+lib/vice/PLUS4/gtk3_pos.vkm
>+lib/vice/PLUS4/gtk3_sym.vkm
>+lib/vice/PLUS4/gtk3_sym_de.vkm
> lib/vice/PLUS4/kernal
> lib/vice/PLUS4/kernal.005
> lib/vice/PLUS4/kernal.232
> lib/vice/PLUS4/kernal.364
>-lib/vice/PLUS4/colodore_ted.vpl
>-lib/vice/PLUS4/yape-ntsc.vpl
>-lib/vice/PLUS4/yape-pal.vpl
> lib/vice/PLUS4/x11_pos.vkm
> lib/vice/PLUS4/x11_sym.vkm
> lib/vice/PLUS4/x11_sym_de.vkm
>+lib/vice/PLUS4/yape-ntsc.vpl
>+lib/vice/PLUS4/yape-pal.vpl
> lib/vice/PRINTER/1520.vpl
> lib/vice/PRINTER/cbm1526
> lib/vice/PRINTER/mps801
> lib/vice/PRINTER/mps803
> lib/vice/PRINTER/mps803.vpl
>-lib/vice/PRINTER/nl10.vpl
> lib/vice/PRINTER/nl10-cbm
>+lib/vice/PRINTER/nl10.vpl
> lib/vice/SCPU64/c64hq.vpl
> lib/vice/SCPU64/c64s.vpl
> lib/vice/SCPU64/ccs64.vpl
>@@ -234,6 +253,10 @@ lib/vice/SCPU64/deekay.vpl
> lib/vice/SCPU64/default.vrs
> lib/vice/SCPU64/frodo.vpl
> lib/vice/SCPU64/godot.vpl
>+lib/vice/SCPU64/gtk3_pos.vkm
>+lib/vice/SCPU64/gtk3_pos_de.vkm
>+lib/vice/SCPU64/gtk3_sym.vkm
>+lib/vice/SCPU64/gtk3_sym_de.vkm
> lib/vice/SCPU64/jpchrgen
> lib/vice/SCPU64/pc64.vpl
> lib/vice/SCPU64/pepto-ntsc-sony.vpl
>@@ -253,6 +276,8 @@ lib/vice/VIC20/basic
> lib/vice/VIC20/chargen
> lib/vice/VIC20/colodore_vic.vpl
> lib/vice/VIC20/default.vrs
>+lib/vice/VIC20/gtk3_pos.vkm
>+lib/vice/VIC20/gtk3_sym.vkm
> lib/vice/VIC20/kernal
> lib/vice/VIC20/mike-ntsc.vpl
> lib/vice/VIC20/mike-pal.vpl
>@@ -260,19 +285,15 @@ lib/vice/VIC20/vice.vpl
> lib/vice/VIC20/x11_pos.vkm
> lib/vice/VIC20/x11_sym.vkm
> lib/vice/fonts/CBM.ttf
>-man/man1/c1541.1.gz
>-man/man1/cartconv.1.gz
>-man/man1/petcat.1.gz
>-man/man1/vice.1.gz
>+lib/vice/fonts/fonts.dir
>+lib/vice/fonts/vice-cbm.bdf
>+lib/vice/fonts/vice-cbm.pcf
> man/man1/x128.1.gz
> man/man1/x64.1.gz
> man/man1/xcbm2.1.gz
> man/man1/xpet.1.gz
> man/man1/xplus4.1.gz
> man/man1/xvic.1.gz
>-lib/vice/fonts/vice-cbm.bdf
>-lib/vice/fonts/fonts.dir
>-lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/Android-Howto.txt
> %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt
> %%PORTDOCS%%%%DOCSDIR%%/CIPS2008.png
>@@ -308,19 +329,17 @@ lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
> %%PORTDOCS%%%%DOCSDIR%%/OFL.txt
> %%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt
>-%%PORTDOCS%%%%DOCSDIR%%/OpenWatcom-Howto.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-GTK3.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt
>-%%PORTDOCS%%%%DOCSDIR%%/Readme-OS2.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL2.txt
> %%PORTDOCS%%%%DOCSDIR%%/Readme-Unix.txt
> %%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt
>+%%PORTDOCS%%%%DOCSDIR%%/SDL-support.txt
> %%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-Howto.txt
>-%%PORTDOCS%%%%DOCSDIR%%/Win32-MSVC-Howto.txt
> %%PORTDOCS%%%%DOCSDIR%%/Win32-Mingw32-Howto.txt
> %%PORTDOCS%%%%DOCSDIR%%/WinNT-Unicode.txt
> %%PORTDOCS%%%%DOCSDIR%%/amigaos.html
>@@ -328,6 +347,7 @@ lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/beos.html
> %%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.txt
> %%PORTDOCS%%%%DOCSDIR%%/darwin.html
>+%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-support.txt
> %%PORTDOCS%%%%DOCSDIR%%/hardware-sids.txt
> %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>@@ -341,6 +361,7 @@ lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/sitemap.xml
> %%PORTDOCS%%%%DOCSDIR%%/solaris.html
> %%PORTDOCS%%%%DOCSDIR%%/sortix.html
>+%%PORTDOCS%%%%DOCSDIR%%/unix.html
> %%PORTDOCS%%%%DOCSDIR%%/vice-logo.svg
> %%PORTDOCS%%%%DOCSDIR%%/vice.chm
> %%PORTDOCS%%%%DOCSDIR%%/vice.css
>@@ -361,10 +382,10 @@ lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/vice_17.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_18.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_19.html
>+%%PORTDOCS%%%%DOCSDIR%%/vice_2.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_20.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_21.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_22.html
>-%%PORTDOCS%%%%DOCSDIR%%/vice_2.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_3.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_4.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_5.html
>@@ -374,3 +395,23 @@ lib/vice/fonts/vice-cbm.pcf
> %%PORTDOCS%%%%DOCSDIR%%/vice_9.html
> %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
> %%PORTDOCS%%%%DOCSDIR%%/windows.html
>+%%PORTDOCS%%share/info/vice.info
>+%%PORTDOCS%%share/info/vice.pdf
>+%%PORTDOCS%%share/info/vice.txt
>+%%NLS%%share/locale/da/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/es/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/hu/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/ko/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/ru/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
>+%%NLS%%share/locale/tr/LC_MESSAGES/vice.mo
>+share/man/man1/c1541.1
>+share/man/man1/cartconv.1
>+share/man/man1/petcat.1
>+share/man/man1/vice.1
>+

Actions: View | Diff

Attachments on bug 233293: 199315