Update vice to 3.3.

Notable changes:

- Add devel/gettext to LIB_DEPENDS
- Remove --with-sdlsound configure option, it is not necessary anymore
  and now links against both SDL and SDL2 if kept enabled
This commit is contained in:
fcambus 2018-12-21 11:52:05 +00:00
parent b4880eb814
commit 303193d497
5 changed files with 27 additions and 48 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2018/11/14 20:48:21 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2018/12/21 11:52:05 fcambus Exp $
COMMENT = versatile Commodore emulator
DISTNAME = vice-3.2
REVISION = 2
DISTNAME = vice-3.3
CATEGORIES = emulators
@ -14,8 +13,8 @@ MAINTAINER = Frederic Cambus <fcambus@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC SDL2 c curses gif jpeg m ogg
WANTLIB += png readline vorbis vorbisenc vorbisfile z
WANTLIB += ${COMPILER_LIBCXX} FLAC SDL2 c gif iconv intl jpeg
WANTLIB += m ogg png readline vorbis vorbisenc vorbisfile z
COMPILER = base-clang ports-gcc base-gcc
@ -25,6 +24,7 @@ BUILD_DEPENDS = devel/xa
LIB_DEPENDS = audio/flac \
audio/libvorbis \
devel/gettext \
devel/sdl2 \
graphics/giflib \
graphics/jpeg \
@ -35,7 +35,6 @@ AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS += --without-oss \
--without-pulse \
--with-sdlsound \
--disable-hardsid \
--disable-lame \
--disable-portaudio \

View File

@ -1,2 +1,2 @@
SHA256 (vice-3.2.tar.gz) = KNmfXhEHIMl+8W2N1CGc+aZ2YdWIGYNdGTeBQ2l7pSM=
SIZE (vice-3.2.tar.gz) = 30279589
SHA256 (vice-3.3.tar.gz) = GlWzjMmIFlsHeAjAfFKnedGBJwsowUtcmr9OVpE3Qx0=
SIZE (vice-3.3.tar.gz) = 22742913

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.3 2018/08/10 20:55:26 fcambus Exp $
$OpenBSD: patch-configure_ac,v 1.4 2018/12/21 11:52:05 fcambus Exp $
Don't build a redundant copy of the documentation.
Don't run fc-cache on install.
@ -6,7 +6,7 @@ Don't run fc-cache on install.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -675,12 +675,7 @@ fi
@@ -1260,12 +1260,7 @@ fi
AC_CHECK_PROGS(MAKEINFO, makeinfo, no)
AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
@ -20,7 +20,7 @@ Index: configure.ac
AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
@@ -3252,12 +3247,7 @@ if test x"$enable_lame" != "xno" ; then
@@ -3012,12 +3007,7 @@ if test x"$enable_lame" != "xno" ; then
fi
fi
@ -33,4 +33,4 @@ Index: configure.ac
+AM_CONDITIONAL(HAVE_FC_CACHE, false)
if test x"$is_amigaos4" = "xyes"; then
if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
dnl for AmigaOS4 native resid needs to be configured without dependency tracking

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2018/08/10 20:55:26 fcambus Exp $
Don't build a redundant copy of vice.info, it breaks the build.
Index: doc/Makefile.in
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -1190,7 +1190,6 @@ $(builddir)/vice.inf: $(srcdir)/vice.texi
$(builddir)/vice.info: $(srcdir)/vice.texi
touch $(builddir)/vice.info
- $(MAKEINFO) -D$(PLATFORM_DOX_FLAGS) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi
.texi.pdf:

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2018/08/10 20:55:26 fcambus Exp $
@comment $OpenBSD: PLIST,v 1.6 2018/12/21 11:52:05 fcambus Exp $
@bin bin/c1541
@bin bin/cartconv
@bin bin/petcat
@ -27,7 +27,9 @@ lib/vice/C128/chargch
lib/vice/C128/chargde
lib/vice/C128/chargen
lib/vice/C128/chargfr
lib/vice/C128/chargno
lib/vice/C128/chargse
lib/vice/C128/cjam.vpl
lib/vice/C128/colodore.vpl
lib/vice/C128/community-colors.vpl
lib/vice/C128/deekay.vpl
@ -62,6 +64,7 @@ lib/vice/C64/c64mem.sym
lib/vice/C64/c64s.vpl
lib/vice/C64/ccs64.vpl
lib/vice/C64/chargen
lib/vice/C64/cjam.vpl
lib/vice/C64/colodore.vpl
lib/vice/C64/community-colors.vpl
lib/vice/C64/deekay.vpl
@ -95,6 +98,7 @@ lib/vice/C64/sdl_pos_fi.vkm
lib/vice/C64/sdl_pos_no.vkm
lib/vice/C64/sdl_sym.vkm
lib/vice/C64/sdl_sym_de.vkm
lib/vice/C64/sdl_sym_nl.vkm
lib/vice/C64/sxkernal
lib/vice/C64/vice.vpl
lib/vice/C64DTV/
@ -117,6 +121,7 @@ lib/vice/C64DTV/sdl_pos_fi.vkm
lib/vice/C64DTV/sdl_pos_no.vkm
lib/vice/C64DTV/sdl_sym.vkm
lib/vice/C64DTV/sdl_sym_de.vkm
lib/vice/C64DTV/sdl_sym_nl.vkm
lib/vice/C64DTV/spiff.vpl
lib/vice/CBM-II/
lib/vice/CBM-II/amber.vpl
@ -129,6 +134,7 @@ lib/vice/CBM-II/ccs64.vpl
lib/vice/CBM-II/chargen.500
lib/vice/CBM-II/chargen.600
lib/vice/CBM-II/chargen.700
lib/vice/CBM-II/cjam.vpl
lib/vice/CBM-II/colodore.vpl
lib/vice/CBM-II/community-colors.vpl
lib/vice/CBM-II/deekay.vpl
@ -234,6 +240,7 @@ lib/vice/SCPU64/c64hq.vpl
lib/vice/SCPU64/c64s.vpl
lib/vice/SCPU64/ccs64.vpl
lib/vice/SCPU64/chargen
lib/vice/SCPU64/cjam.vpl
lib/vice/SCPU64/colodore.vpl
lib/vice/SCPU64/community-colors.vpl
lib/vice/SCPU64/deekay.vpl
@ -263,6 +270,7 @@ lib/vice/SCPU64/sdl_pos_fi.vkm
lib/vice/SCPU64/sdl_pos_no.vkm
lib/vice/SCPU64/sdl_sym.vkm
lib/vice/SCPU64/sdl_sym_de.vkm
lib/vice/SCPU64/sdl_sym_nl.vkm
lib/vice/SCPU64/vice.vpl
lib/vice/VIC20/
lib/vice/VIC20/basic
@ -283,7 +291,8 @@ lib/vice/doc/CIPS2008.png
lib/vice/doc/COPYING
lib/vice/doc/Documentation-Howto.txt
lib/vice/doc/Doxygen-Howto.txt
lib/vice/doc/GTK3-Howto.txt
lib/vice/doc/FreeBSD-GTK3-Howto.txt
lib/vice/doc/GTK3-macOS.txt
lib/vice/doc/Lato-Bold.eot
lib/vice/doc/Lato-Bold.ttf
lib/vice/doc/Lato-Bold.woff
@ -300,31 +309,17 @@ lib/vice/doc/Lato-Regular.eot
lib/vice/doc/Lato-Regular.ttf
lib/vice/doc/Lato-Regular.woff
lib/vice/doc/Lato-Regular.woff2
lib/vice/doc/Linux-Mingw32-Howto.txt
lib/vice/doc/Linux-Native-Howto.txt
lib/vice/doc/MSDOS-Ethernet-Howto.txt
lib/vice/doc/MSDOS-Howto.txt
lib/vice/doc/MacOSX-Cocoa-Howto.txt
lib/vice/doc/MacOSX-Howto.txt
lib/vice/doc/MacOSX-ResourceTree.txt
lib/vice/doc/Minix-Howto.txt
lib/vice/doc/Linux-GTK3-Howto.txt
lib/vice/doc/NEWS
lib/vice/doc/NLS-Howto.txt
lib/vice/doc/NetBSD-howto.txt
lib/vice/doc/OFL.txt
lib/vice/doc/OpenVMS-Howto.txt
lib/vice/doc/Readme-Amiga.txt
lib/vice/doc/Readme-BeOS.txt
lib/vice/doc/Readme-DOS.txt
lib/vice/doc/Readme-GTK3.txt
lib/vice/doc/Readme-MacOSX.txt
lib/vice/doc/Readme-SDL.txt
lib/vice/doc/Readme-SDL2.txt
lib/vice/doc/Readme-Unix.txt
lib/vice/doc/Release-Howto.txt
lib/vice/doc/SDL-Howto.txt
lib/vice/doc/SDL-support.txt
lib/vice/doc/Win32-Cygwin-Howto.txt
lib/vice/doc/Win32-Mingw32-Howto.txt
lib/vice/doc/WinNT-Unicode.txt
lib/vice/doc/Windows-MinGW-GTK3-Howto.txt
lib/vice/doc/amigaos.html
lib/vice/doc/android.html
lib/vice/doc/beos.html
@ -337,7 +332,6 @@ lib/vice/doc/index.html
lib/vice/doc/macosx.html
lib/vice/doc/new.gif
lib/vice/doc/nsosrh.html
lib/vice/doc/ports-status.txt
lib/vice/doc/qnx.html
lib/vice/doc/robots.txt
lib/vice/doc/sco.html
@ -345,6 +339,7 @@ lib/vice/doc/sitemap.xml
lib/vice/doc/solaris.html
lib/vice/doc/sortix.html
lib/vice/doc/unix.html
lib/vice/doc/vice-logo-black.svg
lib/vice/doc/vice-logo.svg
lib/vice/doc/vice.chm
lib/vice/doc/vice.css