Update to returntotheroots-0.8.2.20180924. Features some CMake build
improvements, so a CMake patch goes away. Also includes some bug fixes and general game improvements. I added the usual "You must purchase this game to use the package" language to pkg/README to make sure it's clear that while the package we offer is open source, the game assets are not.
This commit is contained in:
bcallah
parent
001a01c514
commit
a3fdebb2cd
|
|
@ -1,11 +1,10 @@
|
|||
# $OpenBSD: Makefile,v 1.6 2018/09/04 12:46:13 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2018/09/24 21:43:10 bcallah Exp $
|
||||
|
||||
V = 0.8.2.20180702
|
||||
V = 0.8.2.20180924
|
||||
COMMENT = open source engine remake of The Settlers 2 (s25client)
|
||||
DISTNAME = s25client-${V}
|
||||
PKGNAME = returntotheroots-${V}
|
||||
CATEGORIES = games x11
|
||||
REVISION = 0
|
||||
|
||||
ONLY_FOR_ARCHS = i386 amd64
|
||||
|
||||
|
|
@ -41,16 +40,8 @@ LIB_DEPENDS = archivers/bzip2 \
|
|||
CONFIGURE_ARGS = -DRTTR_ENABLE_WERROR:Bool=OFF \
|
||||
-DRTTR_EXTRA_BINDIR="${LOCALBASE}/libexec/s25rttr"
|
||||
|
||||
post-extract:
|
||||
@cp ${WRKSRC}/cmake/freebsd.cmake ${WRKSRC}/cmake/openbsd.cmake
|
||||
|
||||
pre-configure:
|
||||
sed -i 's,$${LOCALBASE},${LOCALBASE},g' \
|
||||
${WRKSRC}/libutil/src/getExecutablePath.cpp
|
||||
|
||||
# Doesn't do this on its own... but needs it
|
||||
post-configure:
|
||||
@cp ${WRKSRC}/build_version_defines.h.cmake \
|
||||
${WRKBUILD}/build_version_defines.h
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (s25client-0.8.2.20180702.tar.gz) = jqMCS9WmQKuk8A9DXAe2luxiJD+Aoq79MRQMa/Tz+oY=
|
||||
SIZE (s25client-0.8.2.20180702.tar.gz) = 37558242
|
||||
SHA256 (s25client-0.8.2.20180924.tar.gz) = 2XRVDObtfzlXdSRVfLuXV+rF09ApPOtTLOfYGiz8+lY=
|
||||
SIZE (s25client-0.8.2.20180924.tar.gz) = 37545288
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/06/22 20:42:12 bcallah Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.4 2018/09/24 21:43:10 bcallah Exp $
|
||||
|
||||
Disable updater. Don't install a useless bash script.
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -415,7 +415,7 @@ endif()
|
||||
@@ -243,7 +243,7 @@ endif()
|
||||
|
||||
# Building the updater when using non-default paths (especially absolute paths)
|
||||
# is not recommended as it most likely won't work
|
||||
|
|
@ -14,7 +14,7 @@ Index: CMakeLists.txt
|
|||
foreach(curDirVar BINDIR DATADIR LIBDIR DOCDIR DRIVERDIR)
|
||||
if(IS_ABSOLUTE ${RTTR_${curDirVar}})
|
||||
set(RTTR_BUILD_UPDATER_DEF OFF)
|
||||
@@ -476,7 +476,7 @@ IF (WIN32)
|
||||
@@ -318,7 +318,7 @@ IF (WIN32)
|
||||
install(PROGRAMS "release/bin/rttr.bat" DESTINATION "${RTTR_BINDIR}")
|
||||
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CYGWIN)
|
||||
install(PROGRAMS "release/bin/rttr.sh" DESTINATION "${RTTR_BINDIR}")
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
$OpenBSD: patch-cmake_openbsd_cmake,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
|
||||
|
||||
Index: cmake/openbsd.cmake
|
||||
--- cmake/openbsd.cmake.orig
|
||||
+++ cmake/openbsd.cmake
|
||||
@@ -1,5 +1,5 @@
|
||||
# set compiler flags
|
||||
IF(RTTR_ENABLE_OPTIMIZATIONS)
|
||||
- FORCE_ADD_FLAGS(CMAKE_C_FLAGS -O2 -g -std=c11)
|
||||
- FORCE_ADD_FLAGS(CMAKE_CXX_FLAGS -O2 -g -std=c++11)
|
||||
+ FORCE_ADD_FLAGS(CMAKE_C_FLAGS -std=c11)
|
||||
+ FORCE_ADD_FLAGS(CMAKE_CXX_FLAGS -std=c++11)
|
||||
ENDIF(RTTR_ENABLE_OPTIMIZATIONS)
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
$OpenBSD: patch-src_s25client_CMakeLists_txt,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
|
||||
$OpenBSD: patch-src_s25client_CMakeLists_txt,v 1.2 2018/09/24 21:43:10 bcallah Exp $
|
||||
|
||||
Build halts and complains with empty s25client_RC
|
||||
|
||||
Index: src/s25client/CMakeLists.txt
|
||||
--- src/s25client/CMakeLists.txt.orig
|
||||
+++ src/s25client/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@ ELSE()
|
||||
@@ -14,7 +14,7 @@ ELSE()
|
||||
SET(s25client_RC "")
|
||||
ENDIF()
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ Index: src/s25client/CMakeLists.txt
|
|||
TARGET_LINK_LIBRARIES(s25client s25Main)
|
||||
|
||||
if(APPLE)
|
||||
@@ -29,6 +29,8 @@ elseif(WIN32)
|
||||
@@ -30,6 +30,8 @@ elseif(WIN32)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
TARGET_LINK_LIBRARIES(s25client pthread)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: patch-src_test_CMakeLists_txt,v 1.2 2018/01/09 03:47:55 bcallah Exp $
|
||||
$OpenBSD: patch-src_test_CMakeLists_txt,v 1.3 2018/09/24 21:43:10 bcallah Exp $
|
||||
|
||||
Let test link.
|
||||
|
||||
|
|
@ -11,5 +11,5 @@ Index: src/test/CMakeLists.txt
|
|||
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
|
||||
+ execinfo
|
||||
)
|
||||
|
||||
add_test(NAME MainTest COMMAND Test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
target_include_directories(Test PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include")
|
||||
add_test(NAME MainTest COMMAND Test WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: README,v 1.2 2018/09/04 12:46:13 espie Exp $
|
||||
$OpenBSD: README,v 1.3 2018/09/24 21:43:10 bcallah Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${PKGSTEM} on OpenBSD
|
||||
|
|
@ -20,3 +20,6 @@ $ doas cp -R app/* ${TRUEPREFIX}/share/s25rttr/S2
|
|||
|
||||
You can then delete everything extracted from the exe, such as the tmp
|
||||
directory.
|
||||
|
||||
While returntotheroots is open source, The Settlers 2: Gold Edition is
|
||||
not. You will need to purchase the game in order to use this package.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user