cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update freeserf to its latest code--this fixes some game-breaking bugs.

Browse Source 
This is also likely to be close to the 0.3.0 release of freeserf.
This commit is contained in:
bcallah 2018-12-25 15:18:20 +00:00
parent 36f87642ae
commit f9bc984c02
4 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
games/freeserf/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.10 2018/11/11 16:24:38 bcallah Exp $
# $OpenBSD: Makefile,v 1.11 2018/12/25 15:18:20 bcallah Exp $
COMMENT = Settlers 1 (Serf City) clone
DISTNAME = freeserf-0.1.1.20181102
DISTNAME = freeserf-0.1.1.20181223
CATEGORIES = games x11
# Switch to GH_TAGNAME or a real tarball once 0.2 is released.
# Switch to GH_TAGNAME or a real tarball once 0.3 is released.
GH_ACCOUNT = freeserf
GH_PROJECT = freeserf
GH_COMMIT = 1158e1a7a9b232ccdcb0136e36fd0983b5777054
GH_COMMIT = 4d9545242ca6ce8d41e372e80a4305541a5e8cbf
HOMEPAGE = http://jonls.dk/freeserf/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>

4
games/freeserf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freeserf-0.1.1.20181102-1158e1a7.tar.gz) = v7S20/F6QIOGrT0hiM/6b55LORs9mbt2dCzJJOdTOHw=
SIZE (freeserf-0.1.1.20181102-1158e1a7.tar.gz) = 860245
SHA256 (freeserf-0.1.1.20181223-4d954524.tar.gz) = E5nU7YnmPUGO4Yc34Ov/np6RDWaZOtnLzNQFFQ3mxCg=
SIZE (freeserf-0.1.1.20181223-4d954524.tar.gz) = 860503

42
games/freeserf/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2018/11/11 16:24:38 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.6 2018/12/25 15:18:20 bcallah Exp $
Don't do this git stuff.
Don't do the cpplint stuff. Elimintates python as a dependency.
@ -6,42 +6,18 @@ Don't do the cpplint stuff. Elimintates python as a dependency.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -10,34 +10,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -10,9 +10,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(Git)
-if(GIT_FOUND)
- execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags --dirty
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- OUTPUT_VARIABLE FREESERF_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(FIND ${FREESERF_VERSION} "." VERSION_FULL)
- if(VERSION_FULL STREQUAL "-1")
- string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" PROJECT_VERSION_MAJOR "${PROJECT_VERSION}")
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" PROJECT_VERSION_MINOR "${PROJECT_VERSION}")
- execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short=7 HEAD
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- OUTPUT_VARIABLE PROJECT_VERSION_PATCH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(FREESERF_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- set(PROJECT_VERSION "${FREESERF_VERSION}")
- else()
- string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" PROJECT_VERSION_MAJOR "${FREESERF_VERSION}")
- string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" PROJECT_VERSION_MINOR "${FREESERF_VERSION}")
- string(REGEX REPLACE "^v[0-9]+\\.[0-9]+.*-g([0-9a-f]+).*" "\\1" PROJECT_VERSION_PATCH "${FREESERF_VERSION}")
- set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- endif()
-else()
set(FREESERF_VERSION "${PROJECT_VERSION}")
string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" PROJECT_VERSION_MAJOR "${PROJECT_VERSION}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" PROJECT_VERSION_MINOR "${PROJECT_VERSION}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PROJECT_VERSION_PATCH "${PROJECT_VERSION}")
-endif()
-include(GitTools)
-git_make_version(FREESERF_VERSION ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_VERSION})
-message(STATUS "FREESERF_VERSION = ${FREESERF_VERSION}")
+message(STATUS "FREESERF_VERSION = ${PROJECT_VERSION}")
message(STATUS "FREESERF_VERSION = ${FREESERF_VERSION}")
message(STATUS "PROJECT_VERSION = ${PROJECT_VERSION}")
@@ -58,9 +34,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
@@ -28,9 +26,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version
@ONLY)
add_definitions(-DPACKAGE_BUGREPORT="https://github.com/freeserf/freeserf/issues")

6
games/freeserf/patches/patch-src_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.4 2018/11/11 16:24:38 bcallah Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.5 2018/12/25 15:18:20 bcallah Exp $
Install to the correct location.
Don't do the cpplint stuff.
@ -48,14 +48,14 @@ Index: src/CMakeLists.txt
if(SDL2_FOUND)
@@ -206,7 +201,7 @@ endif()
if(XMP_FOUND)
target_link_libraries(FreeSerf ${XMP_LIBRARY})
target_link_libraries(FreeSerf optimized ${XMP_LIBRARY} debug ${XMP_LIBRARY_DEBUG})
endif()
-install(TARGETS FreeSerf DESTINATION ".")
+install(TARGETS FreeSerf DESTINATION "bin")
if(WIN32)
if(DEFINED _VCPKG_INSTALLED_DIR)
@@ -267,5 +262,4 @@ set(PROFILER_HEADERS profiler.h
@@ -274,5 +269,4 @@ set(PROFILER_HEADERS profiler.h
command_line.h)
add_executable(profiler ${PROFILER_SOURCES} ${PROFILER_HEADERS})