* [gentoo-commits] repo/gentoo:master commit in: games-rpg/arx-libertatis/files/, games-rpg/arx-libertatis/
@ 2015-08-14 23:10 Julian Ospald
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald @ 2015-08-14 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 3b1297edb955a74d447610b8082ed273096e1a60
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 22:39:23 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 22:39:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1297ed
games-rpg/arx-libertatis: rm old
games-rpg/arx-libertatis/Manifest | 2 -
.../arx-libertatis/arx-libertatis-1.0.3.ebuild | 91 --------------------
.../arx-libertatis/arx-libertatis-1.1.1.ebuild | 98 ----------------------
.../files/arx-libertatis-1.0.3-cmake2.8.patch | 36 --------
.../files/arx-libertatis-1.0.3-gentoo.patch | 74 ----------------
5 files changed, 301 deletions(-)
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index 0e606a1..6109d34 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -1,3 +1 @@
-DIST arx-libertatis-1.0.3.tar.xz 912288 SHA256 5719e1602051f6a6dc13ac0366ff03804f914ffbd855e7e06fdeb0d065fb6d32 SHA512 e1e8d581b6a7928911abad124a6f9670c28f2a56bc7f7f3bae965f717977a0e9a3953514a663c3f7eb4a802cca8e5607feec829a3b7ffeccc83a835fd77a74b6 WHIRLPOOL 321ec489a474b9a63a762756d929371bd8c05ea5d2fa7994c597a86dc20009f385c5f8d23c1da5f978e9f358949a96bf23bf218245633fd5f4393294fbecee75
-DIST arx-libertatis-1.1.1.tar.xz 970544 SHA256 d405047a78c520015f724b0b907ede55aadc787b5da91cf9967c08e70414d6c4 SHA512 9d6f2cdf029e0bfe19a6794ddbfe57f1cb88c4085d55f8b43cad740ef219d37dba3d47bd4a6bfd0cf0d5a58eabcb3304038430fe743e87d585e6d9620b1ce42c WHIRLPOOL 728f42a4a503dbe16e19cdc19551d224fd0a23aabeb56554947baa5fd40653d9779854a30cceff9094cf59d90d77c136bb15e4bb3d236da21897889168a3735a
DIST arx-libertatis-1.1.2.tar.xz 970608 SHA256 82adb440a9c86673e74b84abd480cae968e1296d625b6d40c69ca35b35ed4e42 SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8 WHIRLPOOL 8408189dd184ce692962fb157e89048e96f9a29f47cd16163f0194e5ccb5c8a3c8bbac33fabd253d11eb07fd74b5598ccf98a94383c656c0686aff5485f4bb0e
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
deleted file mode 100644
index 2107716..0000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug unity-build crash-reporter tools"
-
-COMMON_DEPEND=">=dev-libs/boost-1.39
- media-libs/devil[jpeg]
- media-libs/freetype
- media-libs/glew
- media-libs/libsdl[opengl]
- media-libs/openal
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- crash-reporter? (
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- )"
-RDEPEND="${COMMON_DEPEND}
- crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-{gentoo,cmake2.8}.patch
-}
-
-src_configure() {
- use debug && CMAKE_BUILD_TYPE=Debug
-
- # editor does not build
- local mycmakeargs=(
- $(cmake-utils_use unity-build UNITY_BUILD)
- $(cmake-utils_use_build tools TOOLS)
- $(cmake-utils_use_build crash-reporter CRASHREPORTER)
- -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
- -DGAMESBINDIR="${GAMES_BINDIR}"
- -DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
- -DICONDIR=/usr/share/icons/hicolor/128x128/apps
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- dogamesbin "${FILESDIR}"/arx-data-copy
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " games-rpg/arx-fatalis-data (from CD or GOG)"
- elog " games-rpg/arx-fatalis-demo (free demo)"
- elog
- elog "This package only installs the game binary."
- elog "You need the demo or full game data. Also see:"
- elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
- elog
- elog "If you have already installed the game or use the STEAM version,"
- elog "run \"${GAMES_BINDIR}/arx-data-copy /path/to/installed-arx /usr/local/share/games/arx\"."
-
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.1.ebuild
deleted file mode 100644
index d238e63..0000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
- media-libs/freetype
- media-libs/libsdl[X,video,opengl]
- media-libs/openal
- sys-libs/zlib
- virtual/opengl
- crash-reporter? (
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- )
- !static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
- crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- virtual/pkgconfig
- static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-src_configure() {
- # editor does not build
- local mycmakeargs=(
- $(cmake-utils_use_build crash-reporter CRASHREPORTER)
- -DBUILD_EDITOR=OFF
- $(cmake-utils_use_build tools TOOLS)
- -DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
- -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
- $(cmake-utils_use debug DEBUG)
- -DGAMESBINDIR="${GAMES_BINDIR}"
- -DICONDIR=/usr/share/icons/hicolor/128x128/apps
- -DINSTALL_SCRIPTS=ON
- -DSET_OPTIMIZATION_FLAGS=OFF
- -DSTRICT_USE=ON
- $(cmake-utils_use unity-build UNITY_BUILD)
- $(cmake-utils_use_use c++0x CXX11)
- -DUSE_NATIVE_FS=ON
- -DUSE_OPENAL=ON
- -DUSE_OPENGL=ON
- -DUSE_SDL=ON
- $(usex crash-reporter "-DUSE_QT5=OFF" "")
- $(cmake-utils_use_use static STATIC_LIBS)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " games-rpg/arx-fatalis-data (from CD or GOG)"
- elog " games-rpg/arx-fatalis-demo (free demo)"
- elog
- elog "This package only installs the game binary."
- elog "You need the demo or full game data. Also see:"
- elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
- elog
- elog "If you have already installed the game or use the STEAM version,"
- elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch
deleted file mode 100644
index b44dce2..0000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1cd224fe2933edf33fa1fe7003fc6580e38217fa Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Sat, 3 Nov 2012 04:43:42 +0100
-Subject: [PATCH] Fix build with CMake 2.8.10
-
-Previously we checked for SDL by using
- find_package(SDL 1.2 EXACT)
-
-This worked with earlier CMake versions as the find script for SDL
-didn't provide any version, so CMake just ignored the '1.2 EXACT' part.
-
-In CMake 2.8.10, FindSDL.cmake reports the SDL version number as
-major.minor.patch, which is never exactly equal to 1.2.
-
-This commit relaxes the check by removing the 'EXACT' requirement.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14ec2fe..5690176 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ if(USE_SDL)
- # due to the need to have NSApplication correctly setup by SDLmain.
- set(SDL_BUILDING_LIBRARY 1)
- endif()
-- find_package(SDL 1.2 EXACT)
-+ find_package(SDL 1.2)
- endif()
-
- if(MSVC)
---
-1.7.10
-
-
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-gentoo.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-gentoo.patch
deleted file mode 100644
index c1da7f7..0000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-gentoo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Jun 27 22:04:32 UTC 2012
-Subject: build system
-
-respect flags
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -365,21 +365,6 @@
-
- endif()
-
-- # Warning level
-- add_cxxflag("-Wall")
-- add_cxxflag("-Wextra")
-- add_cxxflag("-Wformat=2")
-- add_cxxflag("-Wundef")
-- add_cxxflag("-Wpointer-arith")
-- add_cxxflag("-Wcast-qual")
-- add_cxxflag("-Woverloaded-virtual")
-- add_cxxflag("-Wlogical-op")
--
-- add_cxxflag("-Wliteral-conversion")
-- add_cxxflag("-Wshift-overflow")
-- add_cxxflag("-Woverflow")
-- add_cxxflag("-Wbool-conversions")
--
- # TODO enable:
- # add_cxxflag("-Wconversion") # very noisy
- # add_cxxflag("-Wsign-conversion") # very noisy
-@@ -391,27 +376,12 @@
- endif()
-
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
--
-- #Debug
- add_definitions(-D_DEBUG)
--
-- check_compiler_flag(RESULT "-g3")
-- if(NOT RESULT STREQUAL "")
-- string(REGEX REPLACE "-g(|[0-9]|gdb)" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${RESULT}")
-- endif()
--
-- check_compiler_flag(RESULT "-O0")
-- string(REGEX REPLACE "-O[0-9]" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${RESULT}")
--
- elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
--
- if((NOT CMAKE_CXX_FLAGS MATCHES "-g(|[0-9]|gdb)")
- AND (NOT CMAKE_CXX_FLAGS_RELEASE MATCHES "-g(|[0-9]|gdb)"))
- add_cxxflag("-g2")
- endif()
--
- endif()
-
- if(DEBUG_EXTRA)
-@@ -419,15 +389,7 @@
- add_cxxflag("-fbounds-checking")
- add_cxxflag("-fcatch-undefined-behavior")
- add_cxxflag("-Wstrict-aliasing=1")
-- else()
-- # -Wuninitialized causes too many false positives
-- add_cxxflag("-Wno-uninitialized")
-- # (clang only) Conflicts with using const variables for configuration.
-- add_cxxflag("-Wno-constant-logical-operand")
- endif()
--
-- # Because we are lazy
-- add_ldflag("-Wl,--as-needed")
-
- # Xcode does not support -isystem yet
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-rpg/arx-libertatis/files/, games-rpg/arx-libertatis/
@ 2016-03-25 13:19 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-03-25 13:19 UTC (permalink / raw
To: gentoo-commits
commit: c7714fc8e0edbe83fb8bf307c1ef137a11dc75fa
Author: Daniel Scharrer <daniel <AT> constexpr <DOT> org>
AuthorDate: Thu Mar 24 22:05:41 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 13:19:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7714fc8
games-rpg/arx-libertatis: fix build with cmake 3.5
.../arx-libertatis/arx-libertatis-1.1.2.ebuild | 6 +++-
.../files/arx-libertatis-1.1.2-cmake-3.5.patch | 34 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
index d238e63..578e102 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,6 +36,10 @@ DEPEND="${COMMON_DEPEND}
DOCS=( README.md AUTHORS CHANGELOG )
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake-3.5.patch
+)
+
src_configure() {
# editor does not build
local mycmakeargs=(
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
new file mode 100644
index 0000000..d085afa
--- /dev/null
+++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
@@ -0,0 +1,34 @@
+From c4262bc600dc01d3ddbacc7811132b29ea46ad3b Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Thu, 24 Mar 2016 22:47:44 +0100
+Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
+
+This makes the build system more robust against stray variables
+coming from included CMake scripts provided by the system.
+
+Fixes build with CMake 3.5.
+
+This has been fixed in master with commit 60e43c.
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93f1ee3..8347544 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,11 @@ else()
+ cmake_minimum_required(VERSION 2.8)
+ endif()
+
++if(POLICY CMP0054)
++ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
++ cmake_policy(SET CMP0054 NEW)
++endif()
++
+
+ # Define configuration options
+
+--
+2.7.4
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-25 13:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 23:10 [gentoo-commits] repo/gentoo:master commit in: games-rpg/arx-libertatis/files/, games-rpg/arx-libertatis/ Julian Ospald
-- strict thread matches above, loose matches on Subject: below --
2016-03-25 13:19 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox