public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/, games-strategy/widelands/files/
Date: Thu, 12 Mar 2020 17:31:07 +0000 (UTC)	[thread overview]
Message-ID: <1584034252.be975d4634d9e9dbbc257d4b632d5d2c67d37112.polynomial-c@gentoo> (raw)

commit:     be975d4634d9e9dbbc257d4b632d5d2c67d37112
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 17:30:52 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 17:30:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be975d46

games-strategy/widelands: Fixed build with media-libs/libglvnd

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../widelands/files/widelands-0.20-glvnd.patch     | 25 ++++++++++++++++++++++
 ...elands-0.20.ebuild => widelands-0.20-r1.ebuild} |  1 +
 2 files changed, 26 insertions(+)

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 00000000000..94d1aa3850c
--- /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 <somal@arcor.de>
+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.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
similarity index 97%
rename from games-strategy/widelands/widelands-0.20.ebuild
rename to games-strategy/widelands/widelands-0.20-r1.ebuild
index e714c6e11a9..335598744fe 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${FILESDIR}/${PN}-0.20-glvnd.patch"
 )
 
 src_prepare() {


             reply	other threads:[~2020-03-12 17:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 17:31 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-06-14 22:13 [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/, games-strategy/widelands/files/ David Seifert
2021-08-17 13:26 Ionen Wolkens
2023-01-27  5:26 Sam James
2024-04-27 12:11 Ionen Wolkens
2025-05-01 10:58 Ionen Wolkens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1584034252.be975d4634d9e9dbbc257d4b632d5d2c67d37112.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox