From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A18E138334 for ; Wed, 27 Mar 2019 19:54:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5372BE0918; Wed, 27 Mar 2019 19:54:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 168C3E0918 for ; Wed, 27 Mar 2019 19:54:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83DCE335D15 for ; Wed, 27 Mar 2019 19:54:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F164C520 for ; Wed, 27 Mar 2019 19:54:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1553716441.27083133bfb71b4fe269d35b4158e553859d81fe.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeglut/files/, media-libs/freeglut/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch media-libs/freeglut/freeglut-3.0.0.ebuild X-VCS-Directories: media-libs/freeglut/ media-libs/freeglut/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 27083133bfb71b4fe269d35b4158e553859d81fe X-VCS-Branch: master Date: Wed, 27 Mar 2019 19:54:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c4c0b84d-2a36-4963-921c-9c045d8cbdab X-Archives-Hash: 6f3c3b2e753de2b8d09344871f4fe3fb commit: 27083133bfb71b4fe269d35b4158e553859d81fe Author: Matt Turner gentoo org> AuthorDate: Wed Mar 27 19:36:24 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Mar 27 19:54:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27083133 media-libs/freeglut: Drop linking with unnecessary X11 libs Many thanks go to Christian ch-sc.de> for tracking down and fixing the bug! Closes: https://bugs.gentoo.org/557286 Closes: https://bugs.gentoo.org/647326 Closes: https://bugs.gentoo.org/658936 Signed-off-by: Matt Turner gentoo.org> .../freeglut-3.0.0-drop-unnecessary-x11-libs.patch | 30 ++++++++++++++++++++++ media-libs/freeglut/freeglut-3.0.0.ebuild | 4 +++ 2 files changed, 34 insertions(+) diff --git a/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch b/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch new file mode 100644 index 00000000000..761a6bfce7c --- /dev/null +++ b/media-libs/freeglut/files/freeglut-3.0.0-drop-unnecessary-x11-libs.patch @@ -0,0 +1,30 @@ +From bbdaa724ef363e34bd19fb2308739e59a9e8ddc8 Mon Sep 17 00:00:00 2001 +From: jtsiomb +Date: Tue, 26 Mar 2019 18:55:42 +0000 +Subject: [PATCH] Applied Christian's change to drop unnecessary dependency to + X11 libraries we don't actually use, by asking cmake to link with X11_X11_LIB + instead of the catch-all X11_LIBRARIES. + +git-svn-id: http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1845 7f0cb862-5218-0410-a997-914c9d46530a +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1c20e8..e324a02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -312,8 +312,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) + INCLUDE(CheckIncludeFiles) + IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + FIND_PACKAGE(X11 REQUIRED) +- INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) +- LIST(APPEND LIBS ${X11_LIBRARIES}) ++ INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) ++ LIST(APPEND LIBS ${X11_X11_LIB}) + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) + LIST(APPEND LIBS ${X11_Xrandr_LIB}) +-- +2.19.2 + diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild index 2a60b23ef11..95ec4c4bca8 100644 --- a/media-libs/freeglut/freeglut-3.0.0.ebuild +++ b/media-libs/freeglut/freeglut-3.0.0.ebuild @@ -29,6 +29,10 @@ DEPEND="${RDEPEND} HTML_DOCS=( doc/. ) +PATCHES=( + "${FILESDIR}"/${P}-drop-unnecessary-x11-libs.patch +) + src_configure() { local mycmakeargs=( "-DFREEGLUT_GLES=OFF"