hedgewars: merge -data back
This commit is contained in:
parent
fb97ba28de
commit
44a95e2f96
|
@ -1 +0,0 @@
|
|||
hedgewars
|
|
@ -0,0 +1,30 @@
|
|||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda
|
||||
|
||||
|
||||
if(BUILD_ENGINE_C AND NOT NOVIDEOREC)
|
||||
- if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
|
||||
+ if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
|
||||
message("NOTE: Video recorder support disabled. It's incompatible with BUILD_ENGINE_C")
|
||||
set(BUILD_ENGINE_C ON CACHE STRING "Required for BUILD_ENGINE_JS" FORCE)
|
||||
else()
|
||||
@@ -93,7 +93,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR 1)
|
||||
set(CPACK_PACKAGE_VERSION_MINOR 0)
|
||||
set(CPACK_PACKAGE_VERSION_PATCH 0)
|
||||
set(HEDGEWARS_PROTO_VER 59)
|
||||
-if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
|
||||
+if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
|
||||
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
|
||||
else()
|
||||
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev")
|
||||
@@ -114,6 +114,7 @@ include(${CMAKE_MODULE_PATH}/platform.cm
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
if(NOT((CMAKE_BUILD_TYPE STREQUAL "Release") OR
|
||||
(CMAKE_BUILD_TYPE STREQUAL "Debug") OR
|
||||
+ (CMAKE_BUILD_TYPE STREQUAL "None") OR
|
||||
(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
|
||||
set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
|
||||
message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})")
|
|
@ -1,15 +1,16 @@
|
|||
# Template file for 'hedgewars'
|
||||
pkgname=hedgewars
|
||||
version=1.0.0
|
||||
revision=2
|
||||
revision=3
|
||||
wrksrc="${pkgname}-src-${version}"
|
||||
build_style=cmake
|
||||
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
|
||||
-DPHYSFS_SYSTEM=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DMINIMAL_FLAGS=1"
|
||||
hostmakedepends="lua51 pkg-config"
|
||||
-DPHYSFS_SYSTEM=1 -DMINIMAL_FLAGS=1"
|
||||
make_cmd=make
|
||||
hostmakedepends="lua51 pkg-config qt5-qmake qt5-host-tools"
|
||||
makedepends="ffmpeg-devel lua51-devel physfs-devel qt5-tools-devel SDL2_image-devel
|
||||
SDL2_mixer-devel SDL2_net-devel SDL2_ttf-devel"
|
||||
depends="hedgewars-data>=${version}_${revision} libfreeglut"
|
||||
depends="libfreeglut"
|
||||
short_desc="Funny turn-based artillery game, featuring fighting Hedgehogs!"
|
||||
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
|
||||
license="GPL-2.0-only"
|
||||
|
@ -18,10 +19,8 @@ distfiles="https://hedgewars.org/download/releases/hedgewars-src-${version}.tar.
|
|||
checksum=211634e61f2e4beecc3c98c6f749601fcd08321fda1ba969b3b3832a004f155b
|
||||
nopie_files="/usr/bin/hwengine"
|
||||
nocross="Needs investigation: fails to link hwengine"
|
||||
|
||||
if [ -n "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" qt5-devel"
|
||||
fi
|
||||
replaces="hedgewars-data>=0"
|
||||
export CMAKE_GENERATOR="Unix Makefiles"
|
||||
|
||||
case $XBPS_TARGET_MACHINE in
|
||||
x86_64*)
|
||||
|
@ -38,6 +37,7 @@ esac
|
|||
|
||||
if [ -n "$_use_c_engine" ]; then
|
||||
hostmakedepends+=" glew-devel libatomic-devel ghc clang"
|
||||
makedepends+=" glew-devel libatomic-devel"
|
||||
configure_args+=" -DBUILD_ENGINE_C=1"
|
||||
nopie_files+=" /usr/bin/hedgewars"
|
||||
fi
|
||||
|
@ -56,10 +56,3 @@ pre_configure() {
|
|||
post_install() {
|
||||
vinstall ${DESTDIR}/usr/share/hedgewars/Data/misc/hedgewars.desktop 644 usr/share/applications
|
||||
}
|
||||
|
||||
hedgewars-data_package() {
|
||||
short_desc+=" - data files"
|
||||
pkg_install() {
|
||||
vmove usr/share/hedgewars/Data
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue