From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 45E861384B4 for ; Sat, 12 Dec 2015 21:13:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E58CF21C016; Sat, 12 Dec 2015 21:12:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66E7A21C016 for ; Sat, 12 Dec 2015 21:12:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE7EB3408C5 for ; Sat, 12 Dec 2015 21:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 965F8AF9 for ; Sat, 12 Dec 2015 21:12:53 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1449954737.362e44de9e120889948e31e2cc1fdbed728ec29f.twitch153@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-9999.ebuild games-emulation/dolphin/metadata.xml X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 362e44de9e120889948e31e2cc1fdbed728ec29f X-VCS-Branch: master Date: Sat, 12 Dec 2015 21:12:53 +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: 211f25c9-093b-4deb-8785-71869fd4f350 X-Archives-Hash: 93f99064f7332775938ba72bf39f4bdc commit: 362e44de9e120889948e31e2cc1fdbed728ec29f Author: Devan Franchini gentoo org> AuthorDate: Sat Dec 12 21:09:46 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Sat Dec 12 21:12:17 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362e44de games-emulation/dolphin: Adds updates to 9999 ebuild, bug #561914 Removes a lot of outdated dependencies and adds a few newer ones. Also adds various new USE flags. Package-Manager: portage-2.2.24 games-emulation/dolphin/dolphin-9999.ebuild | 71 +++++++++++++++++++++++------ games-emulation/dolphin/metadata.xml | 4 ++ 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index bd8bcdf..5b8f798 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -14,7 +14,7 @@ then inherit git-r3 KEYWORDS="" else - SRC_URI="https://${PN}-emu.googlecode.com/files/${P}-src.zip" + SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" fi @@ -23,35 +23,61 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio pulseaudio" +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" RDEPEND=">=media-libs/glew-1.10 >=media-libs/libsfml-2.1 - >=net-libs/miniupnpc-1.8 + >net-libs/enet-1.3.7 + >=net-libs/mbedtls-2.1.1 + sys-libs/glibc sys-libs/readline:= + sys-libs/zlib x11-libs/libXext + x11-libs/libXi x11-libs/libXrandr - media-libs/libsdl2[haptic,joystick] - net-libs/polarssl[havege] + virtual/libusb:1 + virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) - ffmpeg? ( virtual/ffmpeg - !!>=media-video/libav-10 ) - lzo? ( dev-libs/lzo ) - openal? ( media-libs/openal ) - opengl? ( virtual/opengl ) + egl? ( media-libs/mesa[egl] ) + evdev? ( + dev-libs/libevdev + virtual/udev + ) + ffmpeg? ( + virtual/ffmpeg + !!>=media-video/libav-10 + ) + llvm? ( sys-devel/llvm ) + openal? ( + media-libs/openal + media-libs/libsoundtouch + ) portaudio? ( media-libs/portaudio ) + profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + sdl? ( media-libs/libsdl2[haptic,joystick] ) + upnp? ( >=net-libs/miniupnpc-1.7 ) + wxwidgets? ( + dev-libs/glib:2 + x11-libs/gtk+:2 + x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] + ) " DEPEND="${RDEPEND} + >=dev-util/cmake-2.8.8 + >=sys-devel/gcc-4.9.0 app-arch/zip media-gfx/nvidia-cg-toolkit media-libs/freetype - media-libs/libsoundtouch - >net-libs/enet-1.3.7 - >=sys-devel/gcc-4.9.0 - x11-libs/wxGTK:${WX_GTK_VER} + sys-devel/gettext + virtual/pkgconfig " pkg_pretend() { @@ -80,6 +106,9 @@ 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 @@ -111,6 +140,10 @@ src_prepare() { src_configure() { + if use wxwidgets; then + need-wxwidgets unicode + fi + local mycmakeargs=( "-DDOLPHIN_WC_REVISION=${PV}" "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" @@ -119,8 +152,16 @@ src_configure() { "-Dplugindir=$(games_get_libdir)/${PN}" "-DUSE_SHARED_ENET=ON" $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS ) + $( cmake-utils_use log FASTLOG ) + $( cmake-utils_use profile OPROFILING ) + $( cmake-utils_use_disable wxwidgets WX ) + $( cmake-utils_use_enable evdev EVDEV ) $( cmake-utils_use_enable lto LTO ) - $( cmake-utils_use openmp OPENMP ) + $( cmake-utils_use_enable pch PCH ) + $( cmake-utils_use_enable qt5 QT ) + $( cmake-utils_use_enable sdl SDL ) + $( cmake-utils_use_use egl EGL ) + $( cmake-utils_use_use upnp UPNP ) ) cmake-utils_src_configure diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index 17c3f1f..2e94d66 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -2,6 +2,10 @@ + Enable EGL support + Enable evdev input support + Enable the LLVM-based disassembler for debugger mode + Increase logging output Add support for link-time optimizations.