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 EF43E138334 for ; Sat, 28 Jul 2018 17:25:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA3B5E077D; Sat, 28 Jul 2018 17:25:41 +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 89D2DE077D for ; Sat, 28 Jul 2018 17:25: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 8B164335CA7 for ; Sat, 28 Jul 2018 17:25:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64879357 for ; Sat, 28 Jul 2018 17:25:37 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1532798728.97a3987ca11005a9a5291d5f92f84edd4dfc88f1.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0.ebuild games-emulation/dolphin/dolphin-9999.ebuild games-emulation/dolphin/metadata.xml X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 97a3987ca11005a9a5291d5f92f84edd4dfc88f1 X-VCS-Branch: master Date: Sat, 28 Jul 2018 17:25:37 +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-Archives-Salt: 9c75d0dd-79f7-4f1a-8597-a4719baa6adc X-Archives-Hash: 17752cc61390acdab922857d00da684d commit: 97a3987ca11005a9a5291d5f92f84edd4dfc88f1 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 28 17:25:14 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 28 17:25:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a3987c games-emulation/dolphin: unconditionally disable llvm, bug #594940 llvm is used only for debug disassembly and is not detected by cmake scripts for various reasons. Let's sort llvm detection upstream first and restore downstream later. Reported-by: Michał Górny Closes: https://bugs.gentoo.org/594940 Package-Manager: Portage-2.3.43, Repoman-2.3.10 games-emulation/dolphin/dolphin-5.0.ebuild | 12 +++++++----- games-emulation/dolphin/dolphin-9999.ebuild | 7 ++----- games-emulation/dolphin/metadata.xml | 1 - 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 908b571cf42..491d92991be 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -17,7 +17,9 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" + +RESTRICT=test RDEPEND=" >=media-libs/libsfml-2.1 @@ -44,7 +46,6 @@ RDEPEND=" libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) - llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch @@ -89,9 +90,10 @@ src_prepare() { if use !bluetooth; then sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die fi - if use !llvm; then - sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die - fi + + # Unconditionally disable LLVM disassembler. + sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die + if use !openal; then sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die fi diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index de76dd90ee6..b8b2dd91a85 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav llvm log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp" +IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp" RDEPEND=" >=media-libs/libsfml-2.1 @@ -52,7 +52,6 @@ RDEPEND=" libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) - llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch @@ -89,9 +88,6 @@ src_prepare() { if use !bluetooth; then sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die fi - if use !llvm; then - sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die - fi if use !openal; then sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die fi @@ -152,6 +148,7 @@ src_configure() { -DOPROFILING=$(usex profile) -DENABLE_EVDEV=$(usex evdev) + -DENABLE_LLVM=OFF -DENABLE_LTO=$(usex lto) -DENABLE_QT=$(usex qt5) -DENABLE_SDL=$(usex sdl) diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index 5a7e53ca6e4..34a2a16ae8e 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -8,7 +8,6 @@ Enables Discord Rich Presence, show the current game on Discord Enable EGL support Enable evdev input support - Enable the LLVM-based disassembler for debugger mode Increase logging output Add support for link-time optimizations.