Thu Apr 23 17:45:26 2020 UTC ()
vice: Switch to ffmpeg4


(nia)
diff -r1.147 -r1.148 pkgsrc/emulators/vice/Makefile
diff -r1.12 -r1.13 pkgsrc/emulators/vice/options.mk
cvs diff -r1.147 -r1.148 pkgsrc/emulators/vice/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/vice/Makefile 2020/03/26 12:26:02 1.147
+++ pkgsrc/emulators/vice/Makefile 2020/04/23 17:45:26 1.148
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.147 2020/03/26 12:26:02 nia Exp $ 1# $NetBSD: Makefile,v 1.148 2020/04/23 17:45:26 nia Exp $
2 2
3DISTNAME= vice-3.4 3DISTNAME= vice-3.4
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vice-emu/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
7 7
8MAINTAINER= rhialto@NetBSD.org 8MAINTAINER= rhialto@NetBSD.org
9HOMEPAGE= http://vice-emu.sourceforge.net/ 9HOMEPAGE= http://vice-emu.sourceforge.net/
10COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16 10COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13RESTRICTED= ROM image copyright is questionable. 13RESTRICTED= ROM image copyright is questionable.
14NO_BIN_ON_CDROM= ${RESTRICTED} 14NO_BIN_ON_CDROM= ${RESTRICTED}
15NO_SRC_ON_CDROM= ${RESTRICTED} 15NO_SRC_ON_CDROM= ${RESTRICTED}
16NO_BIN_ON_FTP= ${RESTRICTED} 16NO_BIN_ON_FTP= ${RESTRICTED}
17NO_SRC_ON_FTP= ${RESTRICTED} 17NO_SRC_ON_FTP= ${RESTRICTED}
@@ -32,25 +32,24 @@ REQD_DIRS+= ${PREFIX}/share/vice @@ -32,25 +32,24 @@ REQD_DIRS+= ${PREFIX}/share/vice
32 32
33BUILD_DEPENDS+= xa65-[0-9]*:../../devel/xa65 33BUILD_DEPENDS+= xa65-[0-9]*:../../devel/xa65
34 34
35SUBST_CLASSES+= prefix 35SUBST_CLASSES+= prefix
36SUBST_STAGE.prefix= post-configure 36SUBST_STAGE.prefix= post-configure
37SUBST_FILES.prefix= man/vice.1 37SUBST_FILES.prefix= man/vice.1
38SUBST_FILES.prefix+= doc/html/index.html 38SUBST_FILES.prefix+= doc/html/index.html
39SUBST_FILES.prefix+= doc/html/darwin.html 39SUBST_FILES.prefix+= doc/html/darwin.html
40SUBST_FILES.prefix+= doc/vice.info-1 40SUBST_FILES.prefix+= doc/vice.info-1
41SUBST_FILES.prefix+= doc/vice.txt 41SUBST_FILES.prefix+= doc/vice.txt
42SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|g' 42SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|g'
43 43
44.include "options.mk" 44.include "options.mk"
45 
46.include "../../audio/flac/buildlink3.mk" 45.include "../../audio/flac/buildlink3.mk"
47.include "../../audio/lame/buildlink3.mk" 46.include "../../audio/lame/buildlink3.mk"
48.include "../../audio/libvorbis/buildlink3.mk" 47.include "../../audio/libvorbis/buildlink3.mk"
49.include "../../audio/mpg123/buildlink3.mk" 48.include "../../audio/mpg123/buildlink3.mk"
50.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
51.include "../../graphics/giflib/buildlink3.mk" 50.include "../../graphics/giflib/buildlink3.mk"
52.include "../../graphics/png/buildlink3.mk" 51.include "../../graphics/png/buildlink3.mk"
53.include "../../net/libpcap/buildlink3.mk" 52.include "../../net/libpcap/buildlink3.mk"
54.include "../../mk/jpeg.buildlink3.mk" 53.include "../../mk/jpeg.buildlink3.mk"
55.include "../../mk/readline.buildlink3.mk" 54.include "../../mk/readline.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/emulators/vice/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/vice/options.mk 2020/01/01 16:30:37 1.12
+++ pkgsrc/emulators/vice/options.mk 2020/04/23 17:45:26 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.12 2020/01/01 16:30:37 rhialto Exp $ 1# $NetBSD: options.mk,v 1.13 2020/04/23 17:45:26 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.vice 3PKG_OPTIONS_VAR= PKG_OPTIONS.vice
4PKG_SUPPORTED_OPTIONS= ffmpeg vice-x64 vice-cpuhistory 4PKG_SUPPORTED_OPTIONS= ffmpeg vice-x64 vice-cpuhistory
5PKG_OPTIONS_REQUIRED_GROUPS= gui 5PKG_OPTIONS_REQUIRED_GROUPS= gui
6PKG_OPTIONS_GROUP.gui= gtk3 sdl sdl2 6PKG_OPTIONS_GROUP.gui= gtk3 sdl sdl2
7PKG_SUGGESTED_OPTIONS= gtk3 ffmpeg 7PKG_SUGGESTED_OPTIONS= gtk3 ffmpeg
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11PLIST_VARS+= gtk sdl x64 11PLIST_VARS+= gtk sdl x64
12 12
13.if !empty(PKG_OPTIONS:Mgtk3) 13.if !empty(PKG_OPTIONS:Mgtk3)
14CONFIGURE_ARGS+= --enable-native-gtk3ui 14CONFIGURE_ARGS+= --enable-native-gtk3ui
@@ -25,25 +25,25 @@ PLIST.sdl= yes @@ -25,25 +25,25 @@ PLIST.sdl= yes
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Msdl2) 27.if !empty(PKG_OPTIONS:Msdl2)
28CONFIGURE_ARGS+= --enable-sdlui2 28CONFIGURE_ARGS+= --enable-sdlui2
29PLIST.sdl= yes 29PLIST.sdl= yes
30. include "../../devel/SDL2/buildlink3.mk" 30. include "../../devel/SDL2/buildlink3.mk"
31.endif 31.endif
32 32
33# If desired, ffmpeg and lame can be build-time-only dependencies, 33# If desired, ffmpeg and lame can be build-time-only dependencies,
34# since they are loaded dynamically only. 34# since they are loaded dynamically only.
35.if !empty(PKG_OPTIONS:Mffmpeg) 35.if !empty(PKG_OPTIONS:Mffmpeg)
36#BUILDLINK_DEPMETHOD.ffmpeg?= build 36#BUILDLINK_DEPMETHOD.ffmpeg?= build
37CONFIGURE_ARGS+= --enable-external-ffmpeg 37CONFIGURE_ARGS+= --enable-external-ffmpeg
38. include "../../multimedia/ffmpeg3/buildlink3.mk" 38. include "../../multimedia/ffmpeg4/buildlink3.mk"
39.endif 39.endif
40 40
41# Building x64 is deprecated, in favour of x64sc (but that is slower). 41# Building x64 is deprecated, in favour of x64sc (but that is slower).
42.if !empty(PKG_OPTIONS:Mvice-x64) 42.if !empty(PKG_OPTIONS:Mvice-x64)
43CONFIGURE_ARGS+= --enable-x64 43CONFIGURE_ARGS+= --enable-x64
44PLIST.x64= yes 44PLIST.x64= yes
45.endif 45.endif
46 46
47.if !empty(PKG_OPTIONS:Mvice-cpuhistory) 47.if !empty(PKG_OPTIONS:Mvice-cpuhistory)
48CONFIGURE_ARGS+= --enable-cpuhistory 48CONFIGURE_ARGS+= --enable-cpuhistory
49.endif 49.endif