mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 23:28:08 -07:00
games-arcade/cdogs-sdl: drop 0.10.1
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST cdogs-sdl-0.10.1.tar.gz 25035447 BLAKE2B 7f1ab1c210daaa44080cfca335cbcf0cd3ae069ef0638bd34c437e7b08833dfecfdf010ccdf9d5a4d3ede66cb75fd6258d3e8b7d907425fc0b73a792568ed205 SHA512 97bc23848536e98207afeaf74c172fe138dd0425dde6bb888b5c64f244b3c6ecea16245630628ab7aa4277da16c25c623574e8d123993bc9e840a3c26c1edce7
|
||||
DIST cdogs-sdl-1.1.1.tar.gz 35073687 BLAKE2B e4bcdbcafd281cfe127fc8b90bda479055042bf541ea7be7eaf2d0959e6d596565c8fca16bc703ca8263281d18372d89fa8ffa787592f3c01c0b048504df10fa SHA512 2d1357ba4a9892a7309d60b98aacf242b6d2b76f07f9f0a13fe0d97713b97507d1f163dfc63c1ac73c06b52590cda93bc212731bf201d5221ade8fa8b2e64598
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake xdg
|
||||
|
||||
DESCRIPTION="Classic overhead run-and-gun game"
|
||||
HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
|
||||
SRC_URI="https://github.com/cxong/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DEPEND="
|
||||
dev-python/protobuf-python
|
||||
media-libs/libsdl2[haptic,opengl]
|
||||
media-libs/sdl2-image[png]
|
||||
media-libs/sdl2-mixer[vorbis,wav]
|
||||
net-libs/enet:1.3="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-Add-BUILD_EDITOR-option.patch"
|
||||
"${FILESDIR}/${P}-Remove-Winline-and-Werror-definitions.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
rm -f doc/{COPYING.,LICENSE.,license.,README_DATA.md}* || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCDOGS_DATA_DIR="${EPREFIX}/usr/share/${PN}/"
|
||||
-DCDOGS_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/"
|
||||
-DBUILD_EDITOR=OFF
|
||||
-DUSE_SHARED_ENET=ON
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
From f8adfb66ea686366edddc89e92c9a5537b8dfbef Mon Sep 17 00:00:00 2001
|
||||
From: William Breathitt Gray <vilhelm.gray@gmail.com>
|
||||
Date: Wed, 9 Dec 2020 07:45:54 -0500
|
||||
Subject: [PATCH] Add BUILD_EDITOR option to control cdogs-sdl-editor build
|
||||
|
||||
---
|
||||
CMakeLists.txt | 10 +++++++---
|
||||
src/CMakeLists.txt | 6 +++---
|
||||
2 files changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 169a17ca..510e4802 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,12 +29,14 @@ SET(WEBSITE "http://cxong.github.io/cdogs-sdl/")
|
||||
option(DEBUG "Enable debug build" OFF)
|
||||
option(DEBUG_PROFILE "Enable debug profile build" OFF)
|
||||
option(USE_SHARED_ENET "Use system installed copy of enet" OFF)
|
||||
+option(BUILD_EDITOR "Build cdogs-sdl-editor" ON)
|
||||
|
||||
# check for crosscompiling (defined when using a toolchain file)
|
||||
if(CMAKE_CROSSCOMPILING)
|
||||
# check for gcw0
|
||||
if(CMAKE_C_COMPILER MATCHES ".*gcw0-linux.*")
|
||||
set(GCW0 1)
|
||||
+ set(BUILD_EDITOR OFF)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -65,7 +67,9 @@ find_package(Nanopb REQUIRED)
|
||||
find_package(SDL2 REQUIRED)
|
||||
find_package(SDL2_image REQUIRED)
|
||||
find_package(SDL2_mixer REQUIRED)
|
||||
-find_package(OpenGL REQUIRED)
|
||||
+if(BUILD_EDITOR)
|
||||
+ find_package(OpenGL REQUIRED)
|
||||
+endif()
|
||||
find_package(CCache)
|
||||
link_directories(${SDL2_LIBRARY_DIRS} ${SDL2_IMAGE_LIBRARY_DIRS} ${SDL2_MIXER_LIBRARY_DIRS})
|
||||
|
||||
@@ -165,7 +169,7 @@ set_target_properties(cdogs-sdl PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
)
|
||||
-if(NOT "${GCW0}")
|
||||
+if(BUILD_EDITOR)
|
||||
set_target_properties(cdogs-sdl-editor PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
@@ -200,7 +204,7 @@ install(
|
||||
PROGRAMS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl${EXE_EXTENSION}
|
||||
DESTINATION ${CDOGS_BIN_DIR})
|
||||
-if(NOT "${GCW0}")
|
||||
+if(BUILD_EDITOR)
|
||||
install(
|
||||
PROGRAMS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl-editor${EXE_EXTENSION}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 8fb82667..564cbf3f 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -4,12 +4,12 @@ include_directories(
|
||||
${SDL2_INCLUDE_DIRS}
|
||||
${SDL2_IMAGE_INCLUDE_DIRS}
|
||||
${SDL2_MIXER_INCLUDE_DIRS})
|
||||
-if(NOT "${GCW0}")
|
||||
+if(BUILD_EDITOR)
|
||||
include_directories(${OPENGL_INCLUDE_DIRS})
|
||||
endif()
|
||||
|
||||
add_subdirectory(cdogs)
|
||||
-if(NOT "${GCW0}")
|
||||
+if(BUILD_EDITOR)
|
||||
add_subdirectory(cdogsed)
|
||||
endif()
|
||||
add_subdirectory(json)
|
||||
@@ -82,7 +82,7 @@ if(GCW0)
|
||||
)
|
||||
endif()
|
||||
|
||||
-if(NOT "${GCW0}")
|
||||
+if(BUILD_EDITOR)
|
||||
add_executable(cdogs-sdl-editor cdogsed/cdogsed.c ${CDOGS_SDL_EXTRA})
|
||||
if(APPLE)
|
||||
set_target_properties(cdogs-sdl-editor PROPERTIES
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 2b55a76518e0492d7003af9af798bd9769f0b586 Mon Sep 17 00:00:00 2001
|
||||
From: William Breathitt Gray <vilhelm.gray@gmail.com>
|
||||
Date: Thu, 10 Dec 2020 07:07:33 -0500
|
||||
Subject: [PATCH] Remove -Winline and -Werror definitions
|
||||
|
||||
---
|
||||
CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 510e4802..ed2872b5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -123,7 +123,6 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
if(NOT BEOS AND NOT HAIKU)
|
||||
- add_definitions(-Winline -Werror)
|
||||
set(EXTRA_LIBRARIES "m")
|
||||
endif()
|
||||
endif()
|
||||
--
|
||||
2.29.2
|
||||
|
||||
Reference in New Issue
Block a user