From be975d4634d9e9dbbc257d4b632d5d2c67d37112 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 12 Mar 2020 18:30:52 +0100 Subject: games-strategy/widelands: Fixed build with media-libs/libglvnd Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Lars Wendler --- .../widelands/files/widelands-0.20-glvnd.patch | 25 +++++++ games-strategy/widelands/widelands-0.20-r1.ebuild | 77 ++++++++++++++++++++++ games-strategy/widelands/widelands-0.20.ebuild | 76 --------------------- 3 files changed, 102 insertions(+), 76 deletions(-) create mode 100644 games-strategy/widelands/files/widelands-0.20-glvnd.patch create mode 100644 games-strategy/widelands/widelands-0.20-r1.ebuild delete mode 100644 games-strategy/widelands/widelands-0.20.ebuild (limited to 'games-strategy') diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch new file mode 100644 index 000000000000..94d1aa3850c7 --- /dev/null +++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch @@ -0,0 +1,25 @@ +From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001 +From: franku +Date: Thu, 18 Jul 2019 19:30:34 +0200 +Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS... + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c5ca8a60b..bcff2db2ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,7 +181,7 @@ endif(OPTION_ASAN) + + # This is set to avoid linker errors when using GLVND-libs on Linux + if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") +- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") ++ link_libraries("GL") + add_compile_definitions(WL_USE_GLVND) + message(STATUS "Adding linker flags for GLVND.") + endif() +-- +2.25.1 + diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild new file mode 100644 index 000000000000..335598744fef --- /dev/null +++ b/games-strategy/widelands/widelands-0.20-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit desktop cmake python-any-r1 + +MY_PV="build$(ver_cut 2-)" +MY_P="${PN}-${MY_PV/_/-}" + +DESCRIPTION="A game similar to Settlers 2" +HOMEPAGE="http://www.widelands.org/" +SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/boost-1.48:= + dev-libs/icu:= + media-libs/glew:0= + media-libs/libglvnd + media-libs/libpng:0= + media-libs/libsdl2[video] + media-libs/sdl2-image[jpeg,png] + media-libs/sdl2-mixer[vorbis] + media-libs/sdl2-ttf + sys-libs/zlib:=[minizip]" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/lua:0 +" +BDEPEND=" + sys-devel/gettext +" + +CMAKE_BUILD_TYPE="Release" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch" + "${FILESDIR}/${PN}-0.20-glvnd.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die +} + +src_configure() { + local mycmakeargs=( + -DOPTION_BUILD_WEBSITE_TOOLS=OFF + + # Upstream's cmake files are totally fscked up... + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF} + # Game is NOT happy being moved from /usr/share/games + -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN} + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # move game binary to correct location + dodir /usr/bin + mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die + + newicon data/images/logos/wl-ico-128.png ${PN}.png + make_desktop_entry ${PN} ${PN^} +} diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild deleted file mode 100644 index e714c6e11a94..000000000000 --- a/games-strategy/widelands/widelands-0.20.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit desktop cmake python-any-r1 - -MY_PV="build$(ver_cut 2-)" -MY_P="${PN}-${MY_PV/_/-}" - -DESCRIPTION="A game similar to Settlers 2" -HOMEPAGE="http://www.widelands.org/" -SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/boost-1.48:= - dev-libs/icu:= - media-libs/glew:0= - media-libs/libglvnd - media-libs/libpng:0= - media-libs/libsdl2[video] - media-libs/sdl2-image[jpeg,png] - media-libs/sdl2-mixer[vorbis] - media-libs/sdl2-ttf - sys-libs/zlib:=[minizip]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/lua:0 -" -BDEPEND=" - sys-devel/gettext -" - -CMAKE_BUILD_TYPE="Release" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch" -) - -src_prepare() { - cmake_src_prepare - - sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die -} - -src_configure() { - local mycmakeargs=( - -DOPTION_BUILD_WEBSITE_TOOLS=OFF - - # Upstream's cmake files are totally fscked up... - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF} - # Game is NOT happy being moved from /usr/share/games - -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN} - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # move game binary to correct location - dodir /usr/bin - mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die - - newicon data/images/logos/wl-ico-128.png ${PN}.png - make_desktop_entry ${PN} ${PN^} -} -- cgit v1.2.3-18-g5258