pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

supertuxkart: Use external Angelscript on purpose



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Wed Jan 18 22:14:48 2023 -0800
Changeset:	2d0b5b98c3af4e7614783dd412bb3f6269b274ab

Modified Files:
	supertuxkart/Makefile
	supertuxkart/PLIST
	supertuxkart/distinfo
Added Files:
	supertuxkart/patches/patch-CMakeLists.txt

Log Message:
supertuxkart: Use external Angelscript on purpose

This avoids SuperTuxKart from installing its own copy
of Angelscript (!)

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

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

diffstat:
 supertuxkart/Makefile                     |  2 ++
 supertuxkart/PLIST                        |  6 ------
 supertuxkart/distinfo                     |  1 +
 supertuxkart/patches/patch-CMakeLists.txt | 28 ++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 6 deletions(-)

diffs:
diff --git a/supertuxkart/Makefile b/supertuxkart/Makefile
index 6f9c17876f..34d85cca82 100644
--- a/supertuxkart/Makefile
+++ b/supertuxkart/Makefile
@@ -20,6 +20,7 @@ USE_TOOLS+=	cmake pkg-config
 CMAKE_ARGS+=	-DUSE_WIIUSE=OFF
 CMAKE_ARGS+=	-DBUILD_RECORDER=OFF
 CMAKE_ARGS+=	-DUSE_SYSTEM_SQUISH=OFF
+CMAKE_ARGS+=	-DUSE_SYSTEM_ANGELSCRIPT=ON
 
 # Needs linux joystick support.
 CMAKE_ARGS+=	-DENABLE_WAYLAND_DEVICE=OFF
@@ -40,6 +41,7 @@ GCC_REQD+=	4.8
 .include "../../lang/python/tool.mk"
 .include "../../net/enet/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../wip/angelscript/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/atomic64.mk"
diff --git a/supertuxkart/PLIST b/supertuxkart/PLIST
index dc5d384178..e1932f9983 100644
--- a/supertuxkart/PLIST
+++ b/supertuxkart/PLIST
@@ -1,11 +1,5 @@
 @comment $NetBSD$
 bin/supertuxkart
-include/angelscript.h
-lib/cmake/Angelscript/AngelscriptConfig.cmake
-lib/cmake/Angelscript/AngelscriptConfigVersion.cmake
-lib/cmake/Angelscript/AngelscriptTargets-stkrelease.cmake
-lib/cmake/Angelscript/AngelscriptTargets.cmake
-lib/libangelscript.a
 share/applications/supertuxkart.desktop
 share/icons/hicolor/1024x1024/apps/supertuxkart.png
 share/icons/hicolor/128x128/apps/supertuxkart.png
diff --git a/supertuxkart/distinfo b/supertuxkart/distinfo
index b6367060d4..2d0ba89899 100644
--- a/supertuxkart/distinfo
+++ b/supertuxkart/distinfo
@@ -3,4 +3,5 @@ $NetBSD$
 BLAKE2s (SuperTuxKart-1.4-src.tar.xz) = 860086124a9b4bcbabae25f6fac2b5fd4c98d87c532b376dc89686e49ec8b10c
 SHA512 (SuperTuxKart-1.4-src.tar.xz) = e88f3fb5ccdb38d0ef75e92d73b43c5cc7a1f6c76ac9502033df099a00d6dc3e86b2c5442b806237d2420c44ada7dd23a2c90ecf94785a44d2348c933770a5ab
 Size (SuperTuxKart-1.4-src.tar.xz) = 650010456 bytes
+SHA1 (patch-CMakeLists.txt) = 4b490d4c7bb03bd16079a17e478c6441f77b8827
 SHA1 (patch-src_io_rich_presence.cpp) = 05f8748977fc578e87d6b0a8e35d134c83ea4bc5
diff --git a/supertuxkart/patches/patch-CMakeLists.txt b/supertuxkart/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..6e6d35e5fd
--- /dev/null
+++ b/supertuxkart/patches/patch-CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Use CONFIG method of finding external Angelscript library.
+
+--- CMakeLists.txt.orig	2023-01-18 20:50:11.059525955 -0800
++++ CMakeLists.txt	2023-01-18 21:19:31.093020651 -0800
+@@ -402,19 +402,13 @@
+ 
+ # Build the angelscript library if not in system
+ if(USE_SYSTEM_ANGELSCRIPT)
+-    find_package(Angelscript)
+-    if(ANGELSCRIPT_FOUND)
++    find_package(Angelscript CONFIG REQUIRED)
+         include_directories(${Angelscript_INCLUDE_DIRS})
+-    else()
+-        message(FATAL_ERROR "Angelscript not found. "
+-            "Either install angelscript or use built-in version using "
+-            "-DUSE_SYSTEM_ANGELSCRIPT=0")
+-    endif()
+ else()
+     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
+     include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+-    set(Angelscript_LIBRARIES angelscript)
+ endif()
++set(Angelscript_LIBRARIES angelscript)
+ 
+ if(NOT SERVER_ONLY)
+     # OpenAL


Home | Main Index | Thread Index | Old Index