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 B8046138334 for ; Mon, 13 May 2019 22:06:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E6EFE0855; Mon, 13 May 2019 22:06:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 4E309E0855 for ; Mon, 13 May 2019 22:06:04 +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 D878E344247 for ; Mon, 13 May 2019 22:06:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71B072A5 for ; Mon, 13 May 2019 22:06:01 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1557785128.fa2997a88ebb4ae65f728f35a0fb1a847d552969.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch games-action/supertuxkart/supertuxkart-1.0.ebuild X-VCS-Directories: games-action/supertuxkart/ games-action/supertuxkart/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: fa2997a88ebb4ae65f728f35a0fb1a847d552969 X-VCS-Branch: master Date: Mon, 13 May 2019 22:06:01 +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: 47160e7c-b7bf-480b-b6bd-80ca511589fc X-Archives-Hash: 3b5626095826afe809e59e091d72a8e7 commit: fa2997a88ebb4ae65f728f35a0fb1a847d552969 Author: James Le Cuirot gentoo org> AuthorDate: Mon May 13 22:05:28 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon May 13 22:05:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2997a8 games-action/supertuxkart: Fix automagic dependency on libsquish Closes: https://bugs.gentoo.org/685808 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> .../files/supertuxkart-1.0-system-squish.patch | 43 ++++++++++++++++++++++ games-action/supertuxkart/supertuxkart-1.0.ebuild | 2 + 2 files changed, 45 insertions(+) diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch new file mode 100644 index 00000000000..8158c4bb9e5 --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch @@ -0,0 +1,43 @@ +From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Mon, 13 May 2019 22:51:21 +0100 +Subject: [PATCH] CMake: Add option to use system Squish library + +The system version was preferred before but it wasn't possible to +explicitly disable it, making its use automagic, which is bad for +packaging. + +Closes: https://github.com/supertuxkart/stk-code/pull/3916 +--- + CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a7f03264..40e7790fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON + "NOT SERVER_ONLY;NOT APPLE" OFF) + CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON + "NOT SERVER_ONLY" OFF) ++CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON ++ "NOT SERVER_ONLY" OFF) + CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON + "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF) + +@@ -247,8 +249,10 @@ if(NOT SERVER_ONLY) + endif() + + if(NOT SERVER_ONLY) +- find_library(SQUISH_LIBRARY NAMES squish libsquish) +- find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS) ++ if(USE_SYSTEM_SQUISH) ++ find_library(SQUISH_LIBRARY NAMES squish libsquish) ++ find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS) ++ endif() + if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR) + add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish") + include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish") +-- +2.20.1 + diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild b/games-action/supertuxkart/supertuxkart-1.0.ebuild index 0069c7d8553..96746c833f7 100644 --- a/games-action/supertuxkart/supertuxkart-1.0.ebuild +++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch "${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch "${FILESDIR}"/${PN}-1.0-fix-buildsystem.patch + "${FILESDIR}"/${PN}-1.0-system-squish.patch ) src_prepare() { @@ -66,6 +67,7 @@ src_configure() { -DUSE_SYSTEM_ANGELSCRIPT=ON -DUSE_SYSTEM_ENET=ON -DUSE_SYSTEM_GLEW=ON + -DUSE_SYSTEM_SQUISH=OFF -DUSE_SYSTEM_WIIUSE=OFF -DUSE_CRYPTO_OPENSSL=$(usex nettle no yes) -DENABLE_WAYLAND_DEVICE=OFF