cannonball: Now builds using SDL2 instead of SDL.

[Santhosh Raju <fox%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Tue Oct 22 04:52:52 2019 -0500
Changeset:	b21d70ff64ea189ee248d8eaff9cac3965bec789

Modified Files:
	cannonball/Makefile
	cannonball/distinfo
Added Files:
	cannonball/patches/patch-cmake_bsd.cmake

Log Message:
cannonball: Now builds using SDL2 instead of SDL.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b21d70ff64ea189ee248d8eaff9cac3965bec789

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cannonball/Makefile                      |  3 ++-
 cannonball/distinfo                      |  1 +
 cannonball/patches/patch-cmake_bsd.cmake | 35 ++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diffs:
diff --git a/cannonball/Makefile b/cannonball/Makefile
index 690f46471d..a541570366 100644
--- a/cannonball/Makefile
+++ b/cannonball/Makefile
@@ -20,6 +20,7 @@ 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.NetBSD+=	-DSDL2=1
 
 INSTALLATION_DIRS+=	bin libexec share/cannonball share/cannonball/res \
 			share/cannonball/conf ${PKGMANDIR}/man6
@@ -47,5 +48,5 @@ do-install:
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cannonball/distinfo b/cannonball/distinfo
index c99c483b0d..71e2753902 100644
--- a/cannonball/distinfo
+++ b/cannonball/distinfo
@@ -4,3 +4,4 @@ SHA1 (cannonball-0.3.20190924-a675d7076e3ca5f7f7777e327ed27b04aae43072.tar.gz) =
 RMD160 (cannonball-0.3.20190924-a675d7076e3ca5f7f7777e327ed27b04aae43072.tar.gz) = 33cd4d1140ab97422113ef47fd807732aeabb8df
 SHA512 (cannonball-0.3.20190924-a675d7076e3ca5f7f7777e327ed27b04aae43072.tar.gz) = ba5886140fbd5e479da64416a2b6205275d2c97dfda5ca01a270e5c4927abae5e471e6ab34721677d75471f0b85ae01840079be30658ef34685b46f463103786
 Size (cannonball-0.3.20190924-a675d7076e3ca5f7f7777e327ed27b04aae43072.tar.gz) = 278401 bytes
+SHA1 (patch-cmake_bsd.cmake) = 9f750bc8575076964dd43f2943146dc1176877ab
diff --git a/cannonball/patches/patch-cmake_bsd.cmake b/cannonball/patches/patch-cmake_bsd.cmake
new file mode 100644
index 0000000000..3a6642cd59
--- /dev/null
+++ b/cannonball/patches/patch-cmake_bsd.cmake
@@ -0,0 +1,35 @@
+$NetBSD$
+
+Support building with SDL2 instead of SDL.
+
+--- cmake/bsd.cmake.orig	2019-09-24 11:04:39.000000000 +0000
++++ cmake/bsd.cmake
+@@ -4,12 +4,12 @@ set(lib_base ${BSD_PREFIX_PATH}/include)
+ 
+ set(BOOST_INCLUDEDIR ${lib_base})
+ 
+-set(sdl_root ${lib_base}/SDL)
++set(sdl_root ${lib_base}/SDL2)
+ 
+ include_directories("${sdl_root}")
+ 
+ link_libraries(cannonball
+-    SDL
++    SDL2
+ )
+ 
+ # Linking
+@@ -17,7 +17,12 @@ link_directories(
+     "${BSD_PREFIX_PATH}/lib"
+ )
+ 
++add_definitions(-O3 -DSDL2)
++
+ # Location for Cannonball to create save files
+ # Used to auto-generate setup.hpp with various file paths
+ set(xml_directory ./)
+-set(sdl_flags "SDL_DOUBLEBUF | SDL_SWSURFACE")
++set(sdl_flags "SDL_WINDOW_RESIZABLE")
++
++# Set SDL2 instead of SDL1
++set(SDL2 1)