Update openrct2 to 0.1.1

Changelog: https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.1.1
ok awolk@
This commit is contained in:
bcallah 2017-09-09 20:03:15 +00:00
parent 04436cced7
commit 0587608769
5 changed files with 14 additions and 37 deletions

View File

@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2017/08/15 01:07:45 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2017/09/09 20:03:15 bcallah Exp $
V = 0.1.0
V = 0.1.1
COMMENT = open source re-implementation of RollerCoaster Tycoon 2
DISTNAME = openrct2-${V}
CATEGORIES = games x11
REVISION = 1
SHARED_LIBS += openrct2 1.0 # 1.0
HOMEPAGE = https://openrct2.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -23,7 +20,7 @@ WANTLIB += ${COMPILER_LIBCXX}
MASTER_SITES = https://devio.us/~bcallah/source/
# Doesn't build with gcc-4.9.4
COMPILER = clang
COMPILER = base-clang ports-clang
MODULES = devel/cmake
@ -39,8 +36,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
# -DOPENRCT2_COMMIT_SHA1_SHORT is a lie but still useful.
CONFIGURE_ARGS = -DCMAKE_SHARED_LINKER_FLAGS="-L${X11BASE}/lib" \
-DDOWNLOAD_TITLE_SEQUENCES=OFF \
CONFIGURE_ARGS = -DDOWNLOAD_TITLE_SEQUENCES=OFF \
-DOPENRCT2_BRANCH=master \
-DOPENRCT2_COMMIT_SHA1_SHORT=`date +%Y%m%d`
@ -48,9 +44,7 @@ CONFIGURE_ARGS = -DCMAKE_SHARED_LINKER_FLAGS="-L${X11BASE}/lib" \
NO_TEST = Yes
pre-configure:
sed -i -e 's,$${LIBopenrct2_VERSION},${LIBopenrct2_VERSION},g' \
-e 's,-Werror,,g' \
${WRKSRC}/src/openrct2/CMakeLists.txt
sed -i 's,-Werror,,g' ${WRKSRC}/src/openrct2/CMakeLists.txt
sed -i 's,/usr/local,${TRUEPREFIX},g' \
${WRKSRC}/src/openrct2/platform/linux.c

View File

@ -1,2 +1,2 @@
SHA256 (openrct2-0.1.0.tar.gz) = xB8Tji7wD+j/o4CPKnjorggD5XWqQ1z9jX1wE2FmyGc=
SIZE (openrct2-0.1.0.tar.gz) = 8006116
SHA256 (openrct2-0.1.1.tar.gz) = G15uPhmW+rXQBZhKgZJYoeODLuLCvEZuyJR445aTR9k=
SIZE (openrct2-0.1.1.tar.gz) = 8033025

View File

@ -1,12 +1,11 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/06/28 16:43:46 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2017/09/09 20:03:15 bcallah Exp $
Don't gzip man page and put it in the right place.
Don't try to execute git.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -20,33 +20,9 @@ option(PORTABLE "Create a portable build (-rpath=$ORIG
@@ -23,33 +23,9 @@ option(PORTABLE "Create a portable build (-rpath=$ORIG
option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
# Define current git branch
@ -40,10 +39,3 @@ Index: CMakeLists.txt
# Tagged builds are not meant to display commit info
if (NOT OPENRCT2_COMMIT_SHA1_SHORT STREQUAL "HEAD")
@@ -154,5 +130,4 @@ install(FILES "resources/logo/icon_x128.png" DESTINATI
install(FILES "resources/logo/icon_x256.png" DESTINATION "share/icons/hicolor/256x256/apps" RENAME "openrct2.png")
install(FILES "resources/logo/icon_flag.svg" DESTINATION "share/icons/hicolor/scalable/apps" RENAME "openrct2.svg")
install(FILES "distribution/linux/openrct2.desktop" DESTINATION "share/applications")
-install(DIRECTORY "distribution/man/" DESTINATION "share/man/man6" FILES_MATCHING PATTERN "*.6")
-install(CODE "execute_process(COMMAND find \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man6 -type f -exec gzip -f \"{}\" \;)")
+install(DIRECTORY "distribution/man/" DESTINATION "man/man6" FILES_MATCHING PATTERN "*.6")

View File

@ -1,20 +1,11 @@
$OpenBSD: patch-src_openrct2_CMakeLists_txt,v 1.1.1.1 2017/06/28 16:43:46 bcallah Exp $
$OpenBSD: patch-src_openrct2_CMakeLists_txt,v 1.2 2017/09/09 20:03:15 bcallah Exp $
Version the SO.
Don't define DEBUG.
Index: src/openrct2/CMakeLists.txt
--- src/openrct2/CMakeLists.txt.orig
+++ src/openrct2/CMakeLists.txt
@@ -129,6 +129,7 @@ endif ()
set(PROJECT libopenrct2)
project(${PROJECT})
add_library(${PROJECT} SHARED ${OPENRCT2_CORE_SOURCES} ${OPENRCT2_CORE_MM_SOURCES} ${RCT2_SECTIONS})
+set_target_properties(${PROJECT} PROPERTIES SOVERSION ${LIBopenrct2_VERSION})
set_target_properties(${PROJECT} PROPERTIES PREFIX "")
set_target_properties(${PROJECT} PROPERTIES COMPILE_FLAGS "-Wundef")
@@ -189,7 +190,7 @@ endif ()
@@ -195,7 +195,7 @@ endif ()
if (APPLE OR STATIC OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
@ -23,7 +14,7 @@ Index: src/openrct2/CMakeLists.txt
endif()
# Includes
@@ -218,7 +219,7 @@ endif()
@@ -224,7 +224,7 @@ endif()
set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 03.")
set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-missing-braces ")
set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-comment -Wshadow -Wmissing-declarations -Wnonnull")

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/28 16:43:46 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.2 2017/09/09 20:03:15 bcallah Exp $
@bin bin/openrct2
@lib lib/libopenrct2.so.${LIBopenrct2_VERSION}
lib/libopenrct2.a
@man man/man6/openrct2.6
share/applications/openrct2.desktop
share/doc/openrct2/