pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/53449: [maintainer-update] emulators/vice to 3.2
>Number: 53449
>Category: pkg
>Synopsis: Updates emulators/vice to 3.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Jul 14 14:25:00 +0000 2018
>Originator: Rhialto
>Release: NetBSD 7.0.1
>Organization:
>Environment:
System: NetBSD murthe.falu.nl 7.0.1 NetBSD 7.0.1 (MURTHE7.0.1) #0: Tue Jun 7 23:03:24 CEST 2016 rhialto%murthe.falu.nl@localhost:/usr/src/sys/arch/amd64/compile/MURTHE7.0.1 amd64
Architecture: x86_64
Machine: amd64
>Description:
Updates emulators/vice to 3.2.
I renamed the "gtk3" option to "gtk3wip", and removed it from
PKG_SUGGESTED_OPTIONS because the gtk3 gui is a Work In
Progress. See configure --help:
--enable-native-gtk3ui enables WIP native GTK3 UI support
--enable-debug-gtk3ui enables debugging for the WIP GTK3 port
and the NEWS file:
* Changes in VICE 3.2
======================
** General
----------
- New (experimental) GTK3 native port, this and the SDL(2) port will replace
all other ports (which will get removed) in VICE 3.3 and onward.
Apart from that the NEWS file is too detailed with its changes to copy here.
>How-To-Repeat:
Notice that vic needs to be updated.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/Makefile,v
retrieving revision 1.130
diff -u -r1.130 Makefile
--- Makefile 16 Apr 2018 14:34:27 -0000 1.130
+++ Makefile 14 Jul 2018 14:15:36 -0000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.130 2018/04/16 14:34:27 wiz Exp $
-DISTNAME= vice-3.1
-PKGREVISION= 4
+DISTNAME= vice-3.2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
MASTER_SITES+= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@@ -20,7 +19,7 @@
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake msgfmt pkg-config perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-ethernet
CONFIGURE_ARGS+= --enable-fullscreen
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/PLIST,v
retrieving revision 1.25
diff -u -r1.25 PLIST
--- PLIST 16 Aug 2017 17:54:09 -0000 1.25
+++ PLIST 14 Jul 2018 14:15:36 -0000
@@ -54,19 +54,17 @@
share/doc/vice/NLS-Howto.txt
share/doc/vice/OFL.txt
share/doc/vice/OpenVMS-Howto.txt
-share/doc/vice/OpenWatcom-Howto.txt
share/doc/vice/Readme-Amiga.txt
share/doc/vice/Readme-BeOS.txt
share/doc/vice/Readme-DOS.txt
share/doc/vice/Readme-GTK3.txt
share/doc/vice/Readme-MacOSX.txt
-share/doc/vice/Readme-OS2.txt
share/doc/vice/Readme-SDL.txt
share/doc/vice/Readme-SDL2.txt
share/doc/vice/Readme-Unix.txt
share/doc/vice/SDL-Howto.txt
+share/doc/vice/SDL-support.txt
share/doc/vice/Win32-Cygwin-Howto.txt
-share/doc/vice/Win32-MSVC-Howto.txt
share/doc/vice/Win32-Mingw32-Howto.txt
share/doc/vice/WinNT-Unicode.txt
share/doc/vice/amigaos.html
@@ -74,6 +72,7 @@
share/doc/vice/beos.html
share/doc/vice/coding-guidelines.txt
share/doc/vice/darwin.html
+share/doc/vice/ffmpeg-support.txt
share/doc/vice/hardware-sids.txt
share/doc/vice/iec-bus.txt
share/doc/vice/index.html
@@ -87,6 +86,7 @@
share/doc/vice/sitemap.xml
share/doc/vice/solaris.html
share/doc/vice/sortix.html
+share/doc/vice/unix.html
share/doc/vice/vice-logo.svg
share/doc/vice/vice.chm
share/doc/vice/vice.css
@@ -120,18 +120,18 @@
share/doc/vice/vice_9.html
share/doc/vice/vice_toc.html
share/doc/vice/windows.html
-${PLIST.x11}share/locale/da/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/de/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/es/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/fr/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/hu/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/it/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/ko/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/nl/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/pl/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/ru/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/sv/LC_MESSAGES/vice.mo
-${PLIST.x11}share/locale/tr/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/da/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/de/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/es/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/fr/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/hu/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/it/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/ko/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/nl/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/pl/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/ru/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/sv/LC_MESSAGES/vice.mo
+${PLIST.mo}share/locale/tr/LC_MESSAGES/vice.mo
share/vice/C128/basic64
share/vice/C128/basichi
share/vice/C128/basiclo
@@ -165,7 +165,10 @@
share/vice/C128/pepto-palold.vpl
share/vice/C128/ptoing.vpl
share/vice/C128/rgb.vpl
+${PLIST.sdl}share/vice/C128/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/C128/sdl_pos.vkm
+${PLIST.x11}share/vice/C128/gtk3_pos.vkm
+${PLIST.x11}share/vice/C128/gtk3_sym.vkm
share/vice/C128/vdc_comp.vpl
share/vice/C128/vdc_deft.vpl
share/vice/C128/vice.vpl
@@ -195,16 +198,29 @@
share/vice/C64/pepto-palold.vpl
share/vice/C64/ptoing.vpl
share/vice/C64/rgb.vpl
+${PLIST.sdl}share/vice/C64/sdl_hotkeys.vkm
+${PLIST.sdl}share/vice/C64/sdl_hotkeys_vsid.vkm
+${PLIST.sdl}share/vice/C64/sdl_joymap_ps3.vjm
${PLIST.sdl}share/vice/C64/sdl_keyrah.vkm
+${PLIST.sdl}share/vice/C64/sdl_keyrah_combian.vkm
${PLIST.sdl}share/vice/C64/sdl_keyrah_de.vkm
+${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie.vkm
+${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie_de.vkm
${PLIST.sdl}share/vice/C64/sdl_pos.vkm
${PLIST.sdl}share/vice/C64/sdl_pos_da.vkm
${PLIST.sdl}share/vice/C64/sdl_pos_de.vkm
${PLIST.sdl}share/vice/C64/sdl_pos_fi.vkm
${PLIST.sdl}share/vice/C64/sdl_pos_no.vkm
${PLIST.sdl}share/vice/C64/sdl_sym.vkm
+${PLIST.sdl}share/vice/C64/sdl_sym_de.vkm
share/vice/C64/sxkernal
share/vice/C64/vice.vpl
+${PLIST.x11}share/vice/C64/gtk3_keyrah.vkm
+${PLIST.x11}share/vice/C64/gtk3_keyrah_de.vkm
+${PLIST.x11}share/vice/C64/gtk3_pos.vkm
+${PLIST.x11}share/vice/C64/gtk3_pos_de.vkm
+${PLIST.x11}share/vice/C64/gtk3_sym.vkm
+${PLIST.x11}share/vice/C64/gtk3_sym_de.vkm
${PLIST.x11}share/vice/C64/x11_keyrah.vkm
${PLIST.x11}share/vice/C64/x11_keyrah_de.vkm
${PLIST.x11}share/vice/C64/x11_pos.vkm
@@ -217,15 +233,26 @@
share/vice/C64DTV/default.vrs
share/vice/C64DTV/dtvrom.bin
share/vice/C64DTV/kernal
+${PLIST.sdl}share/vice/C64DTV/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_combian.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_de.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie_de.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_pos.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_pos_da.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_pos_de.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_pos_fi.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_pos_no.vkm
${PLIST.sdl}share/vice/C64DTV/sdl_sym.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_de.vkm
share/vice/C64DTV/spiff.vpl
+${PLIST.x11}share/vice/C64DTV/gtk3_keyrah.vkm
+${PLIST.x11}share/vice/C64DTV/gtk3_keyrah_de.vkm
+${PLIST.x11}share/vice/C64DTV/gtk3_pos.vkm
+${PLIST.x11}share/vice/C64DTV/gtk3_pos_de.vkm
+${PLIST.x11}share/vice/C64DTV/gtk3_sym.vkm
+${PLIST.x11}share/vice/C64DTV/gtk3_sym_de.vkm
${PLIST.x11}share/vice/C64DTV/x11_keyrah.vkm
${PLIST.x11}share/vice/C64DTV/x11_keyrah_de.vkm
${PLIST.x11}share/vice/C64DTV/x11_pos.vkm
@@ -262,9 +289,12 @@
share/vice/CBM-II/rom256h.vrs
share/vice/CBM-II/rom256l.vrs
share/vice/CBM-II/rom500.vrs
+${PLIST.sdl}share/vice/CBM-II/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/CBM-II/sdl_sym.vkm
share/vice/CBM-II/vice.vpl
share/vice/CBM-II/white.vpl
+${PLIST.x11}share/vice/CBM-II/gtk3_sym.vkm
+${PLIST.x11}share/vice/CBM-II/gtk3_sym_de.vkm
${PLIST.x11}share/vice/CBM-II/x11_sym.vkm
${PLIST.x11}share/vice/CBM-II/x11_sym_de.vkm
share/vice/DRIVES/d1541II
@@ -309,6 +339,7 @@
share/vice/PET/romsuperpet.vrs
${PLIST.sdl}share/vice/PET/sdl_buuk_sym.vkm
${PLIST.sdl}share/vice/PET/sdl_grus_sym.vkm
+${PLIST.sdl}share/vice/PET/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/PET/sdl_sym.vkm
share/vice/PET/waterloo-a000.901898-01.bin
share/vice/PET/waterloo-b000.901898-02.bin
@@ -317,6 +348,19 @@
share/vice/PET/waterloo-e000.901897-01.bin
share/vice/PET/waterloo-f000.901898-05.bin
share/vice/PET/white.vpl
+${PLIST.x11}share/vice/PET/gtk3_bude_pos.vkm
+${PLIST.x11}share/vice/PET/gtk3_bude_pos_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_bude_sym.vkm
+${PLIST.x11}share/vice/PET/gtk3_bude_sym_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_buuk_pos.vkm
+${PLIST.x11}share/vice/PET/gtk3_buuk_pos_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_buuk_sym.vkm
+${PLIST.x11}share/vice/PET/gtk3_buuk_sym_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_grus_pos.vkm
+${PLIST.x11}share/vice/PET/gtk3_grus_pos_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_grus_sym.vkm
+${PLIST.x11}share/vice/PET/gtk3_grus_sym_de.vkm
+${PLIST.x11}share/vice/PET/gtk3_sym.vkm
${PLIST.x11}share/vice/PET/x11_bude_pos.vkm
${PLIST.x11}share/vice/PET/x11_bude_pos_de.vkm
${PLIST.x11}share/vice/PET/x11_bude_sym.vkm
@@ -340,7 +384,11 @@
share/vice/PLUS4/kernal.005
share/vice/PLUS4/kernal.232
share/vice/PLUS4/kernal.364
+${PLIST.sdl}share/vice/PLUS4/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/PLUS4/sdl_pos.vkm
+${PLIST.x11}share/vice/PLUS4/gtk3_pos.vkm
+${PLIST.x11}share/vice/PLUS4/gtk3_sym.vkm
+${PLIST.x11}share/vice/PLUS4/gtk3_sym_de.vkm
${PLIST.x11}share/vice/PLUS4/x11_pos.vkm
${PLIST.x11}share/vice/PLUS4/x11_sym.vkm
${PLIST.x11}share/vice/PLUS4/x11_sym_de.vkm
@@ -373,15 +421,24 @@
share/vice/SCPU64/rgb.vpl
share/vice/SCPU64/scpu64
share/vice/SCPU64/scpu64mem.sym
+${PLIST.sdl}share/vice/SCPU64/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_keyrah.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_combian.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_de.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie_de.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_pos.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_pos_da.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_pos_de.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_pos_fi.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_pos_no.vkm
${PLIST.sdl}share/vice/SCPU64/sdl_sym.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_de.vkm
share/vice/SCPU64/vice.vpl
+${PLIST.x11}share/vice/SCPU64/gtk3_pos.vkm
+${PLIST.x11}share/vice/SCPU64/gtk3_pos_de.vkm
+${PLIST.x11}share/vice/SCPU64/gtk3_sym.vkm
+${PLIST.x11}share/vice/SCPU64/gtk3_sym_de.vkm
${PLIST.x11}share/vice/SCPU64/x11_pos.vkm
${PLIST.x11}share/vice/SCPU64/x11_pos_de.vkm
${PLIST.x11}share/vice/SCPU64/x11_sym.vkm
@@ -393,9 +450,12 @@
share/vice/VIC20/kernal
share/vice/VIC20/mike-ntsc.vpl
share/vice/VIC20/mike-pal.vpl
+${PLIST.sdl}share/vice/VIC20/sdl_hotkeys.vkm
${PLIST.sdl}share/vice/VIC20/sdl_pos.vkm
${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm
share/vice/VIC20/vice.vpl
+${PLIST.x11}share/vice/VIC20/gtk3_pos.vkm
+${PLIST.x11}share/vice/VIC20/gtk3_sym.vkm
${PLIST.x11}share/vice/VIC20/x11_pos.vkm
${PLIST.x11}share/vice/VIC20/x11_sym.vkm
share/vice/fonts/CBM.ttf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- distinfo 16 Aug 2017 17:54:09 -0000 1.44
+++ distinfo 14 Jul 2018 14:15:36 -0000
@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.44 2017/08/16 17:54:09 adam Exp $
-SHA1 (vice-3.1.tar.gz) = ac9daeac550f26b6c66776448c0d34a00c913696
-RMD160 (vice-3.1.tar.gz) = 63ef44947f409702abe189d562d93e840eafc30f
-SHA512 (vice-3.1.tar.gz) = bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
-Size (vice-3.1.tar.gz) = 30714226 bytes
+SHA1 (vice-3.2.tar.gz) = ab240eed57d4af1e215e4c9c23c437f45cedf6bf
+RMD160 (vice-3.2.tar.gz) = 4e3fb04607dda7188d49fb5f68c3766925212cc2
+SHA512 (vice-3.2.tar.gz) = d05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616
+Size (vice-3.2.tar.gz) = 30279589 bytes
SHA1 (patch-configure) = f810d83265f5b8e7162c7ff6dbbca7d84e163de0
SHA1 (patch-data_fonts_Makefile.in) = 614a433448ec422108e5125c71d2e83fa3ecc21c
SHA1 (patch-po_Makefile.in.in) = 6e028dde8a74f6c5d511057a19580285e3d506c7
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/options.mk,v
retrieving revision 1.8
diff -u -r1.8 options.mk
--- options.mk 16 Aug 2017 17:54:09 -0000 1.8
+++ options.mk 14 Jul 2018 14:15:36 -0000
@@ -3,12 +3,12 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.vice
PKG_SUPPORTED_OPTIONS= ffmpeg vte
PKG_OPTIONS_REQUIRED_GROUPS= gui
-PKG_OPTIONS_GROUP.gui= gtk2 gtk3 sdl xaw
-PKG_SUGGESTED_OPTIONS= gtk3
+PKG_OPTIONS_GROUP.gui= gtk2 gtk3wip sdl xaw
+PKG_SUGGESTED_OPTIONS= gtk2
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= pcf sdl x11
+PLIST_VARS+= mo pcf sdl x11
# Cocoa user interface works only in application bundle.
#.if !empty(PKG_OPTIONS:Mcocoa)
@@ -22,13 +22,14 @@
.if !empty(PKG_OPTIONS:Mgtk2)
CONFIGURE_ARGS+= --enable-gnomeui
+PLIST.mo= yes
PLIST.pcf= yes
PLIST.x11= yes
. include "../../x11/gtk2/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+= --enable-gnomeui3
+.if !empty(PKG_OPTIONS:Mgtk3wip)
+CONFIGURE_ARGS+= --enable-native-gtk3ui
PLIST.pcf= yes
PLIST.x11= yes
. include "../../x11/gtk3/buildlink3.mk"
@@ -36,7 +37,6 @@
.if !empty(PKG_OPTIONS:Msdl)
CONFIGURE_ARGS+= --enable-sdlui2
-PLIST.pcf= yes
PLIST.sdl= yes
. include "../../devel/SDL2/buildlink3.mk"
.endif
@@ -50,10 +50,15 @@
.endif
.if !empty(PKG_OPTIONS:Mvte)
-. include "../../x11/vte/buildlink3.mk"
+. if !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk3wip)
+. include "../../x11/vte/buildlink3.mk"
+. else
+# vte only makes sense with gtk*
+. endif
.endif
.if !empty(PKG_OPTIONS:Mxaw)
+PLIST.mo= yes
PLIST.pcf= yes
PLIST.x11= yes
. include "../../x11/libXt/buildlink3.mk"
-Olaf.
--
___ Olaf 'Rhialto' Seibert -- Wayland: Those who don't understand X
\X/ rhialto/at/falu.nl -- are condemned to reinvent it. Poorly.
Home |
Main Index |
Thread Index |
Old Index