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

3 files changed, 36 insertions, 13 deletions

diff --git a/emulators/cannonball/Makefile b/emulators/cannonball/Makefile
index f65483a9b5c..e61edcfe49c 100644
--- a/emulators/cannonball/Makefile
+++ b/emulators/cannonball/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2021/01/01 08:24:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2021/03/16 23:51:48 fox Exp $
 
-DISTNAME=	cannonball-0.3.20191023
-PKGREVISION=	5
+DISTNAME=	cannonball-0.31
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=djyt/}
-GITHUB_TAG=	b6aa525ddd552f96b43b3b3a6f69326a277206bd
+GITHUB_TAG=	v0.31
 EXTRACT_USING=	bsdtar
 
 MAINTAINER=	fox@NetBSD.org
@@ -17,10 +16,7 @@ USE_TOOLS+=		pkg-config
 USE_CMAKE=		yes
 CONFIGURE_DIRS=		build
 CMAKE_ARG_PATH=		${WRKSRC}/cmake
-CMAKE_ARGS.Linux+=	-DTARGET=debian
-CMAKE_ARGS.NetBSD+=	-G "Unix Makefiles"
-CMAKE_ARGS.NetBSD+=	-DTARGET=bsd
-CMAKE_ARGS.NetBSD+=	-DBSD_PREFIX_PATH:STRING=${PREFIX}
+CMAKE_ARGS+=		-DTARGET=linux.cmake
 
 TOOL_DEPENDS+=	icoutils-[0-9]*:../../graphics/icoutils
 
@@ -68,5 +64,9 @@ do-install:
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/glu/buildlink3.mk"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.endif
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/cannonball/distinfo b/emulators/cannonball/distinfo
index 1cfb41429c9..793b5885f67 100644
--- a/emulators/cannonball/distinfo
+++ b/emulators/cannonball/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/10/24 00:32:36 fox Exp $
+$NetBSD: distinfo,v 1.3 2021/03/16 23:51:48 fox Exp $
 
-SHA1 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 3f75608aa20cae57ac0d3c2c1682d27ef1ed000b
-RMD160 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 9baba3b856e4de47a0639f0619f704e71bd60020
-SHA512 (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 6b0226e9f9f2c60b7f202b7ff282181d4da4717acc162393a475b6c4e58da6198be41f789a7797e0ca9fac8b8d29b6b4f480ee75868b600b93ed55cea398a797
-Size (cannonball-0.3.20191023-b6aa525ddd552f96b43b3b3a6f69326a277206bd.tar.gz) = 278482 bytes
+SHA1 (cannonball-0.31.tar.gz) = c39016a6b42a105316724cee0f4921db0c6ef30a
+RMD160 (cannonball-0.31.tar.gz) = 7e81ea018b549735fe4d932589caf3a91f8f0cd0
+SHA512 (cannonball-0.31.tar.gz) = 213729c735442f8c9abf4f7d689851904496fc5ace6b0be35d1348ee124e6f7060ce78b281c07feebb1ca66089a74aced7ff6d0ea7eba64681daa38f36de03ef
+Size (cannonball-0.31.tar.gz) = 269125 bytes
+SHA1 (patch-cmake_linux.cmake) = 8b58551207d283b7c78e8a71bca864d9e8751f40
diff --git a/emulators/cannonball/patches/patch-cmake_linux.cmake b/emulators/cannonball/patches/patch-cmake_linux.cmake
new file mode 100644
index 00000000000..804d4416030
--- /dev/null
+++ b/emulators/cannonball/patches/patch-cmake_linux.cmake
@@ -0,0 +1,22 @@
+$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