widelands: update to 1.0.
This commit is contained in:
parent
6b7f190e03
commit
470925d461
|
@ -2,62 +2,66 @@ Index: CMakeLists.txt
|
|||
===================================================================
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
|
||||
@@ -209,6 +209,8 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
||||
endif ()
|
||||
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
|
||||
option(OPTION_ASAN "Build with AddressSanitizer" ON)
|
||||
+elseif(CMAKE_BUILD_TYPE STREQUAL "None")
|
||||
+ message(STATUS "Not setting any default flags.")
|
||||
else()
|
||||
- message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||
+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
|
||||
message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||
endif()
|
||||
|
||||
wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
|
||||
@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
|
||||
@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
|
||||
install (
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
|
||||
DESTINATION ${WL_INSTALL_BASEDIR}
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT CoreVersionFile
|
||||
)
|
||||
|
||||
@@ -378,7 +378,6 @@ install(
|
||||
@@ -440,7 +442,7 @@ install(
|
||||
data/txts
|
||||
data/world
|
||||
DESTINATION ${WL_INSTALL_DATADIR}
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT CoreDataFiles
|
||||
)
|
||||
|
||||
@@ -386,7 +385,6 @@ install(
|
||||
@@ -448,7 +450,7 @@ install(
|
||||
DIRECTORY
|
||||
data/maps
|
||||
DESTINATION ${WL_INSTALL_DATADIR}
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT MapFiles
|
||||
)
|
||||
|
||||
@@ -395,7 +393,6 @@ install(
|
||||
@@ -457,7 +459,7 @@ install(
|
||||
data/music
|
||||
data/sound
|
||||
DESTINATION ${WL_INSTALL_DATADIR}
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT MusicFiles
|
||||
)
|
||||
|
||||
@@ -405,7 +402,7 @@ install(
|
||||
@@ -467,7 +469,7 @@ install(
|
||||
CREDITS
|
||||
ChangeLog
|
||||
DESTINATION ${WL_INSTALL_BASEDIR}
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT CoreLicenseFiles
|
||||
)
|
||||
|
||||
@@ -424,7 +421,6 @@ install(
|
||||
@@ -486,7 +488,7 @@ install(
|
||||
DIRECTORY
|
||||
${CMAKE_CURRENT_BINARY_DIR}/locale/
|
||||
DESTINATION ${WL_INSTALL_DATADIR}/locale
|
||||
- CONFIGURATIONS Debug;Release
|
||||
+ CONFIGURATIONS Debug;Release;None
|
||||
COMPONENT CoreLanguageFiles
|
||||
)
|
||||
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
upstream: no
|
||||
reason: Our SDL2-devel package has a for cross broken sdl2-config.cmake,
|
||||
this patches switched back to a find module cmake script
|
||||
|
||||
---
|
||||
--- a/CMakeLists.txt 2020-07-19 19:54:00.744509368 +0200
|
||||
+++ b/CMakeLists.txt 2020-07-19 19:54:00.744509368 +0200
|
||||
@@ -110,7 +110,7 @@
|
||||
find_package(PNG REQUIRED)
|
||||
|
||||
find_package(Threads REQUIRED)
|
||||
-find_package(SDL2 CONFIG)
|
||||
+find_package(SDL2 REQUIRED MODULE)
|
||||
if(SDL2_FOUND)
|
||||
message(STATUS "Found SDL2 configuration file")
|
||||
if(TARGET SDL2::SDL2)
|
|
@ -1,21 +1,23 @@
|
|||
# Template file for 'widelands'
|
||||
pkgname=widelands
|
||||
version=21
|
||||
revision=5
|
||||
wrksrc="${pkgname}-build${version}"
|
||||
# Widelands 1.0 release supercedes beta builds
|
||||
reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
|
||||
19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
|
||||
version=1.0
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
|
||||
-DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_DATADIR=/usr/share/widelands"
|
||||
hostmakedepends="python3 pkg-config gettext"
|
||||
makedepends="boost-devel icu-devel minizip-devel gettext-devel
|
||||
glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
|
||||
glu-devel glew-devel libcurl-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
|
||||
SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
|
||||
short_desc="Real-time strategy game"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
maintainer="travankor <travankor@tuta.io>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://www.widelands.org/"
|
||||
distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
|
||||
checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
|
||||
homepage="https://www.widelands.org/"
|
||||
distfiles="https://github.com/widelands/widelands/archive/v${version}.tar.gz"
|
||||
checksum=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
|
||||
replaces="widelands-data>=0"
|
||||
|
||||
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
|
||||
|
|
Loading…
Reference in New Issue