Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-rpg/arx-libertatis/files/, games-rpg/arx-libertatis/
Date: Tue, 16 Aug 2022 02:23:24
Message-Id: 1660615512.9cacfd47ccdf300fdd81d5e936997fa3a1577715.winterheart@gentoo
1 commit: 9cacfd47ccdf300fdd81d5e936997fa3a1577715
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 16 02:04:22 2022 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Tue Aug 16 02:05:12 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=9cacfd47
7
8 games-rpg/arx-libertatis: add 1.2.1, drop 1.1.2_p2-r1
9
10 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
11
12 ....2_p2-r1.ebuild => arx-libertatis-1.2.1.ebuild} | 18 ++++--------
13 .../files/arx-libertatis-1.1.2-cmake-3.5.patch | 34 ----------------------
14 games-rpg/arx-libertatis/metadata.xml | 1 -
15 3 files changed, 5 insertions(+), 48 deletions(-)
16
17 diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2_p2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.2.1.ebuild
18 similarity index 80%
19 rename from games-rpg/arx-libertatis/arx-libertatis-1.1.2_p2-r1.ebuild
20 rename to games-rpg/arx-libertatis/arx-libertatis-1.2.1.ebuild
21 index d828706..52ee815 100644
22 --- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2_p2-r1.ebuild
23 +++ b/games-rpg/arx-libertatis/arx-libertatis-1.2.1.ebuild
24 @@ -6,20 +6,20 @@ EAPI=7
25 CMAKE_WARN_UNUSED_CLI=yes
26 inherit cmake
27
28 -MY_PV=${PV/_p/-r}
29 -
30 DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
31 HOMEPAGE="https://arx-libertatis.org/"
32 -SRC_URI="https://github.com/arx/ArxLibertatis/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
33 +SRC_URI="https://github.com/arx/ArxLibertatis/releases/download/${PV}/${P}.tar.xz"
34
35 LICENSE="GPL-3"
36 SLOT="0"
37 KEYWORDS="~amd64 ~x86"
38 -IUSE="+c++11 crash-reporter debug static tools +unity-build"
39 +IUSE="crash-reporter debug static tools +unity-build"
40
41 COMMON_DEPEND="
42 media-libs/freetype
43 - media-libs/libsdl[X,video,opengl]
44 + media-libs/glm
45 + media-libs/libepoxy
46 + media-libs/libsdl2[X,video,opengl]
47 media-libs/openal
48 sys-libs/zlib:=
49 virtual/opengl
50 @@ -39,14 +39,8 @@ BDEPEND="virtual/pkgconfig"
51
52 DOCS=( README.md AUTHORS CHANGELOG )
53
54 -PATCHES=( "${FILESDIR}/${PN}-1.1.2-cmake-3.5.patch" )
55 -
56 -S="${WORKDIR}/ArxLibertatis-${MY_PV}"
57 -
58 src_configure() {
59 - # editor does not build
60 local mycmakeargs=(
61 - -DBUILD_EDITOR=OFF
62 -DBUILD_TOOLS=$(usex tools)
63 -DDEBUG=$(usex debug)
64 -DICONDIR=/usr/share/icons/hicolor/128x128/apps
65 @@ -54,11 +48,9 @@ src_configure() {
66 -DSET_OPTIMIZATION_FLAGS=OFF
67 -DSTRICT_USE=ON
68 -DUNITY_BUILD=$(usex unity-build)
69 - -DUSE_CXX11=$(usex c++11)
70 -DUSE_NATIVE_FS=ON
71 -DUSE_OPENAL=ON
72 -DUSE_OPENGL=ON
73 - -DUSE_SDL=ON
74 -DBUILD_CRASHREPORTER=$(usex crash-reporter)
75 $(usex crash-reporter "-DUSE_QT5=ON" "")
76 -DUSE_STATIC_LIBS=$(usex static)
77
78 diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
79 deleted file mode 100644
80 index d085afa..0000000
81 --- a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
82 +++ /dev/null
83 @@ -1,34 +0,0 @@
84 -From c4262bc600dc01d3ddbacc7811132b29ea46ad3b Mon Sep 17 00:00:00 2001
85 -From: Daniel Scharrer <daniel@×××××××××.org>
86 -Date: Thu, 24 Mar 2016 22:47:44 +0100
87 -Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
88 -
89 -This makes the build system more robust against stray variables
90 -coming from included CMake scripts provided by the system.
91 -
92 -Fixes build with CMake 3.5.
93 -
94 -This has been fixed in master with commit 60e43c.
95 ----
96 - CMakeLists.txt | 5 +++++
97 - 1 file changed, 5 insertions(+)
98 -
99 -diff --git a/CMakeLists.txt b/CMakeLists.txt
100 -index 93f1ee3..8347544 100755
101 ---- a/CMakeLists.txt
102 -+++ b/CMakeLists.txt
103 -@@ -13,6 +13,11 @@ else()
104 - cmake_minimum_required(VERSION 2.8)
105 - endif()
106 -
107 -+if(POLICY CMP0054)
108 -+ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
109 -+ cmake_policy(SET CMP0054 NEW)
110 -+endif()
111 -+
112 -
113 - # Define configuration options
114 -
115 ---
116 -2.7.4
117 -
118
119 diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
120 index 8a7355e..3d1bf51 100644
121 --- a/games-rpg/arx-libertatis/metadata.xml
122 +++ b/games-rpg/arx-libertatis/metadata.xml
123 @@ -50,6 +50,5 @@
124 <doc lang="en">http://wiki.arx-libertatis.org/</doc>
125 <remote-id type="github">arx/ArxLibertatis</remote-id>
126 <remote-id type="sourceforge">arx</remote-id>
127 - <remote-id type="freecode">arx-libertatis</remote-id>
128 </upstream>
129 </pkgmetadata>