Tue Mar 16 23:51:49 2021 UTC ()
emulators/cannonball: Updates to 0.31

Changes since 0.3.2019102:

Maintenance Release

This release focuses on upgrading the libraries and compilation tools CannonBall
uses, as I hadn't maintained the codebase in a number of years. Most of these
changes will be invisible to most users. Right now, I'm trying to get the house
in order as opposed to add lots of wild new features! :)

  * [audio] Audio updates at the correct rate and resolves the longstanding
    issue with music and sound being very slightly 'off'
  * [roms] ROMs are now read by CRC 32 value. Filenames no longer matter - so
    long as they are present they can be renamed to anything.
  * [roms] Fixed expected Z80 rom file length
  * [controls] Start Button behaviour less 'sticky' and buggy
  * [controls] Analog axis for accelerate and brake can now be configured via
    the in-built menu system
  * [menu] Reduced delay when scrolling through menu with analog controls
  * [config] ROMs and save data can be relocated to separate locations
  * [bug fix] Time Trial mode no longer crashes if used as the first mode played
  * [timing] Code tries to use V-Sync for timing OR internal timing, as opposed
    to both at once
  * [source] SDL 2 used by default. SDL 1 removed from codebase. This appears to
    have fixed compatibility bugs for some people
  * [source] Added compatibility for upcoming SmartyPi hardware (Pi 4 based) to
    run on original arcade hardware
  * [source] A general clean-up in many areas


(fox)
diff -r1.7 -r1.8 pkgsrc/emulators/cannonball/Makefile
diff -r1.2 -r1.3 pkgsrc/emulators/cannonball/distinfo
diff -r0 -r1.1 pkgsrc/emulators/cannonball/patches/patch-cmake_linux.cmake
cvs diff -r1.7 -r1.8 pkgsrc/emulators/cannonball/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/cannonball/Makefile 2021/01/01 08:24:42 1.7
+++ pkgsrc/emulators/cannonball/Makefile 2021/03/16 23:51:48 1.8
@@ -1,36 +1,32 @@ @@ -1,36 +1,32 @@
1# $NetBSD: Makefile,v 1.7 2021/01/01 08:24:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2021/03/16 23:51:48 fox Exp $
2 2
3DISTNAME= cannonball-0.3.20191023 3DISTNAME= cannonball-0.31
4PKGREVISION= 5 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_GITHUB:=djyt/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=djyt/}
7GITHUB_TAG= b6aa525ddd552f96b43b3b3a6f69326a277206bd 6GITHUB_TAG= v0.31
8EXTRACT_USING= bsdtar 7EXTRACT_USING= bsdtar
9 8
10MAINTAINER= fox@NetBSD.org 9MAINTAINER= fox@NetBSD.org
11HOMEPAGE= https://github.com/djyt/cannonball/wiki 10HOMEPAGE= https://github.com/djyt/cannonball/wiki
12COMMENT= Enhanced OutRun Engine 11COMMENT= Enhanced OutRun Engine
13LICENSE= mame-license 12LICENSE= mame-license
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17USE_CMAKE= yes 16USE_CMAKE= yes
18CONFIGURE_DIRS= build 17CONFIGURE_DIRS= build
19CMAKE_ARG_PATH= ${WRKSRC}/cmake 18CMAKE_ARG_PATH= ${WRKSRC}/cmake
20CMAKE_ARGS.Linux+= -DTARGET=debian 19CMAKE_ARGS+= -DTARGET=linux.cmake
21CMAKE_ARGS.NetBSD+= -G "Unix Makefiles" 
22CMAKE_ARGS.NetBSD+= -DTARGET=bsd 
23CMAKE_ARGS.NetBSD+= -DBSD_PREFIX_PATH:STRING=${PREFIX} 
24 20
25TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils 21TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
26 22
27ICON_SIZES= 16 23ICON_SIZES= 16
28 24
29INSTALLATION_DIRS+= bin libexec share/applications \ 25INSTALLATION_DIRS+= bin libexec share/applications \
30 share/cannonball share/cannonball/res \ 26 share/cannonball share/cannonball/res \
31 share/cannonball/conf ${PKGMANDIR}/man6 27 share/cannonball/conf ${PKGMANDIR}/man6
32.for s in ${ICON_SIZES} 28.for s in ${ICON_SIZES}
33INSTALLATION_DIRS+= share/icons/hicolor/${s}x${s}/apps 29INSTALLATION_DIRS+= share/icons/hicolor/${s}x${s}/apps
34.endfor 30.endfor
35 31
36pre-configure: 32pre-configure:
@@ -58,15 +54,19 @@ do-install: @@ -58,15 +54,19 @@ do-install:
58 ${DESTDIR}${PREFIX}/bin/cannonball 54 ${DESTDIR}${PREFIX}/bin/cannonball
59 ${INSTALL_PROGRAM} ${WRKSRC}/build/cannonball \ 55 ${INSTALL_PROGRAM} ${WRKSRC}/build/cannonball \
60 ${DESTDIR}${PREFIX}/libexec 56 ${DESTDIR}${PREFIX}/libexec
61 ${INSTALL_MAN} ${WRKSRC}/docs/cannonball.6 \ 57 ${INSTALL_MAN} ${WRKSRC}/docs/cannonball.6 \
62 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6 58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
63.for s in ${ICON_SIZES} 59.for s in ${ICON_SIZES}
64 ${INSTALL_DATA} ${WRKSRC}/${s}.png \ 60 ${INSTALL_DATA} ${WRKSRC}/${s}.png \
65 ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/cannonball.png 61 ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/cannonball.png
66.endfor 62.endfor
67 63
68.include "../../devel/boost-headers/buildlink3.mk" 64.include "../../devel/boost-headers/buildlink3.mk"
69.include "../../devel/boost-libs/buildlink3.mk" 65.include "../../devel/boost-libs/buildlink3.mk"
70.include "../../devel/SDL2/buildlink3.mk" 66.include "../../devel/SDL2/buildlink3.mk"
 67.if ${OPSYS} != "Darwin"
 68. include "../../graphics/glu/buildlink3.mk"
 69. include "../../graphics/MesaLib/buildlink3.mk"
 70.endif
71.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 71.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/emulators/cannonball/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/cannonball/distinfo 2019/10/24 00:32:36 1.2
+++ pkgsrc/emulators/cannonball/distinfo 2021/03/16 23:51:48 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2019/10/24 00:32:36 fox Exp $ 1$NetBSD: distinfo,v 1.3 2021/03/16 23:51:48 fox Exp $
2 2
3SHA1 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 3f75608aa20cae57ac0d3c2c1682d27ef1ed000b 3SHA1 (cannonball-0.31.tar.gz) = c39016a6b42a105316724cee0f4921db0c6ef30a
4RMD160 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 9baba3b856e4de47a0639f0619f704e71bd60020 4RMD160 (cannonball-0.31.tar.gz) = 7e81ea018b549735fe4d932589caf3a91f8f0cd0
5SHA512 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 6b0226e9f9f2c60b7f202b7ff282181d4da4717acc162393a475b6c4e58da6198be41f789a7797e0ca9fac8b8d29b6b4f480ee75868b600b93ed55cea398a797 5SHA512 (cannonball-0.31.tar.gz) = 213729c735442f8c9abf4f7d689851904496fc5ace6b0be35d1348ee124e6f7060ce78b281c07feebb1ca66089a74aced7ff6d0ea7eba64681daa38f36de03ef
6Size (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 278482 bytes 6Size (cannonball-0.31.tar.gz) = 269125 bytes
 7SHA1 (patch-cmake_linux.cmake) = 8b58551207d283b7c78e8a71bca864d9e8751f40
File Added: pkgsrc/emulators/cannonball/patches/Attic/patch-cmake_linux.cmake
$NetBSD: patch-cmake_linux.cmake,v 1.1 2021/03/16 23:51:49 fox Exp $

Adds support for building in Linux / BSD.

Will be removed once upstream makes a release with
https://github.com/djyt/cannonball/commit/a9c71cbf229b9f808ae172a09d12a773fc869209

--- cmake/linux.cmake.orig	2021-03-16 09:31:59.333255192 +0000
+++ cmake/linux.cmake
@@ -0,0 +1,11 @@
+# -----------------------------------------------------------------------------
+# CannonBall Linux Setup
+# -----------------------------------------------------------------------------
+
+# Use OpenGL for rendering.
+find_package(OpenGL REQUIRED)
+
+# Platform Specific Libraries
+set(platform_link_libs
+    ${OPENGL_LIBRARIES}
+)
\ No newline at end of file