Update to freeserf-0.1.1.20181102

This commit is contained in:
bcallah 2018-11-11 16:24:38 +00:00
parent 378fdacd35
commit 53d468fe84
4 changed files with 36 additions and 20 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2018/10/28 00:28:03 bcallah Exp $
# $OpenBSD: Makefile,v 1.10 2018/11/11 16:24:38 bcallah Exp $
COMMENT = Settlers 1 (Serf City) clone
DISTNAME = freeserf-0.1.1.20181027
DISTNAME = freeserf-0.1.1.20181102
CATEGORIES = games x11
# Switch to GH_TAGNAME or a real tarball once 0.2 is released.
GH_ACCOUNT = freeserf
GH_PROJECT = freeserf
GH_COMMIT = 9a7dfe38c58e5711f577429df638d87f3261d5f8
GH_COMMIT = 1158e1a7a9b232ccdcb0136e36fd0983b5777054
HOMEPAGE = http://jonls.dk/freeserf/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (freeserf-0.1.1.20181027-9a7dfe38.tar.gz) = cP1FTjSklBt+QNiTjrQyoS+n4X+DzhtC/TLe3WBg8+0=
SIZE (freeserf-0.1.1.20181027-9a7dfe38.tar.gz) = 859886
SHA256 (freeserf-0.1.1.20181102-1158e1a7.tar.gz) = v7S20/F6QIOGrT0hiM/6b55LORs9mbt2dCzJJOdTOHw=
SIZE (freeserf-0.1.1.20181102-1158e1a7.tar.gz) = 860245

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2018/10/28 00:28:03 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.5 2018/11/11 16:24:38 bcallah Exp $
Don't do this git stuff.
Don't do the cpplint stuff. Elimintates python as a dependency.
@ -6,7 +6,7 @@ Don't do the cpplint stuff. Elimintates python as a dependency.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -9,34 +9,10 @@ set(PROJECT_VERSION "0.2.0")
@@ -10,34 +10,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@ -41,7 +41,7 @@ Index: CMakeLists.txt
message(STATUS "FREESERF_VERSION = ${FREESERF_VERSION}")
message(STATUS "PROJECT_VERSION = ${PROJECT_VERSION}")
@@ -57,9 +33,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version
@@ -58,9 +34,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version
@ONLY)
add_definitions(-DPACKAGE_BUGREPORT="https://github.com/freeserf/freeserf/issues")

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2018/10/28 00:28:03 bcallah Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.4 2018/11/11 16:24:38 bcallah Exp $
Install to the correct location.
Don't do the cpplint stuff.
@ -6,31 +6,47 @@ Don't do the cpplint stuff.
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -36,7 +36,6 @@ set(TOOLS_HEADERS debug.h
@@ -42,7 +42,6 @@ set(TOOLS_HEADERS debug.h
buffer.h)
add_library(tools STATIC ${TOOLS_SOURCES} ${TOOLS_HEADERS})
-target_check_style(tools)
set(GAME_SOURCES building.cc
flag.cc
@@ -133,7 +132,6 @@ if(WIN32)
endif()
# Game library
@@ -76,7 +75,6 @@ set(GAME_HEADERS building.h
game-manager.h)
add_library(game STATIC ${GAME_SOURCES} ${GAME_HEADERS})
-target_check_style(game)
if(SDL2_FOUND)
include_directories(${INCLUDE_DIRECTORIES} ${SDL2_INCLUDE_DIR})
@@ -168,7 +166,6 @@ endif()
# Platform library
@@ -104,7 +102,6 @@ else()
endif()
add_library(platform STATIC ${PLATFORM_SOURCES} ${PLATFORM_HEADERS})
-target_check_style(platform)
# Data library
@@ -148,7 +145,6 @@ else()
endif()
add_library(data STATIC ${DATA_SOURCES} ${DATA_HEADERS})
-target_check_style(data)
# FreeSerf executable
@@ -188,7 +184,6 @@ set(OTHER_HEADERS pathfinder.h
set(FREESERF_SOURCES freeserf.cc ${OTHER_SOURCES})
set(FREESERF_HEADERS freeserf.h ${OTHER_HEADERS})
add_executable(FreeSerf MACOSX_BUNDLE WIN32 ${FREESERF_SOURCES} ${FREESERF_HEADERS})
-target_check_style(FreeSerf)
target_link_libraries(FreeSerf game tools)
target_link_libraries(FreeSerf game platform data tools)
if(SDL2_FOUND)
@@ -184,7 +181,7 @@ endif()
@@ -206,7 +201,7 @@ endif()
if(XMP_FOUND)
target_link_libraries(FreeSerf ${XMP_LIBRARY})
endif()
@ -39,7 +55,7 @@ Index: src/CMakeLists.txt
if(WIN32)
if(DEFINED _VCPKG_INSTALLED_DIR)
@@ -245,5 +242,4 @@ set(PROFILER_HEADERS profiler.h
@@ -267,5 +262,4 @@ set(PROFILER_HEADERS profiler.h
command_line.h)
add_executable(profiler ${PROFILER_SOURCES} ${PROFILER_HEADERS})