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 C8F441382BD for ; Sat, 25 Jun 2016 02:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E0AF14002; Sat, 25 Jun 2016 02:32:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A24A214002 for ; Sat, 25 Jun 2016 02:32:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25212340BA2 for ; Sat, 25 Jun 2016 02:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78EF22411 for ; Sat, 25 Jun 2016 02:32:19 +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: <1466821756.7318d367fb3a59f0ba696921b3513fedf28b751f.twitch153@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/Manifest games-emulation/dolphin/dolphin-5.0.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 7318d367fb3a59f0ba696921b3513fedf28b751f X-VCS-Branch: master Date: Sat, 25 Jun 2016 02:32:19 +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: 3a54d9fa-d0df-4408-9fb4-5d739843e7d2 X-Archives-Hash: e35adf8d6c5a77386fce403e734ce6ba commit: 7318d367fb3a59f0ba696921b3513fedf28b751f Author: Devan Franchini gentoo org> AuthorDate: Sat Jun 25 02:20:01 2016 +0000 Commit: Devan Franchini gentoo org> CommitDate: Sat Jun 25 02:29:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7318d367 games-emulation/dolphin: Updates package version to reflect new release Package-Manager: portage-2.3.0 games-emulation/dolphin/Manifest | 2 +- games-emulation/dolphin/dolphin-5.0.ebuild | 106 ++++++++++++++++++++--------- 2 files changed, 74 insertions(+), 34 deletions(-) diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index 2cc1c50..1cc674f 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1 +1 @@ -DIST dolphin-5.0.zip 28317729 SHA256 2b1003360d52baf12a1bcd4d75f379749b0fd4001948ec1a24d0539c37aae055 SHA512 1b1c0dd6da4ba7e9ffe30499fae582b922c9bbd8b3d8159fbf9f4bfa1e744ef5b4c00a85d34f7cdd6e01efa32133f59b2a1f42cafc9d620f7fc7462c4ba73615 WHIRLPOOL 73cc25bafcb0d32592e8ad799b0a3d458cfa944ad15380a3b8f1cf27f3e024c314b08469a17f6d92edced95631bba38e39e1ccd625227c0520813abbd399e0f4 +DIST dolphin-5.0.zip 41802909 SHA256 f8c26bdea7a8329873bd2c485676ba5cbc1670faad3fef98f1d516254b4dd3a1 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a WHIRLPOOL 401d569e1b45a8873a2f7879a5d9c931228767be909c9ddde43d49394a79580c2ae0eccc29757f471565ad0554cd20e57c371393526d68b2c79f8570a2e2bd5c diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index d7266c1..88cd984 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -4,11 +4,13 @@ EAPI=5 +PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW" +PLOCALE_BACKUP="en" WX_GTK_VER="3.0" -inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games +inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}-rc.zip -> ${P}.zip" +SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" DESCRIPTION="Gamecube and Wii game emulator" @@ -16,35 +18,58 @@ 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" -S=${WORKDIR}/${P}-rc/ -RDEPEND=">=media-libs/glew-1.10 - >=media-libs/libsfml-2.1 - >=net-libs/miniupnpc-1.8 +RDEPEND=">=media-libs/libsfml-2.1 + >net-libs/enet-1.3.7 + >=net-libs/mbedtls-2.1.1 + dev-libs/lzo + media-libs/libpng:= + 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 ) + egl? ( media-libs/mesa[egl] ) + evdev? ( + dev-libs/libevdev + virtual/udev + ) ffmpeg? ( virtual/ffmpeg ) - lzo? ( dev-libs/lzo ) - openal? ( media-libs/openal ) - opengl? ( virtual/opengl ) + 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() { @@ -63,9 +88,6 @@ pkg_pretend() { src_prepare() { - epatch "${FILESDIR}"/"${P}"-dynamic-llvm-detect.patch - epatch "${FILESDIR}"/"${P}"-miniupnpc-abi-14.patch - # Remove automatic dependencies to prevent building without flags enabled. if use !alsa; then sed -i -e '/include(FindALSA/d' CMakeLists.txt || die @@ -76,6 +98,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 @@ -89,34 +114,50 @@ src_prepare() { # Remove ALL the bundled libraries, aside from: # - SOIL: The sources are not public. # - Bochs-disasm: Don't know what it is. - # - GL: A custom gl.h file is used. # - gtest: Their build set up solely relies on the build in gtest. # - xxhash: Not on the tree. mv Externals/SOIL . || die mv Externals/Bochs_disasm . || die - mv Externals/GL . || die mv Externals/gtest . || die mv Externals/xxhash . || die rm -r Externals/* || die "Failed to delete Externals dir." mv Bochs_disasm Externals || die mv SOIL Externals || die - mv GL Externals || die mv gtest Externals || die mv xxhash Externals || die + + remove_locale() { + # Ensure preservation of the backup locale when no valid LINGUA is set + if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then + return + else + rm "Languages/po/${1}.po" || die + fi + } + + l10n_find_plocales_changes "Languages/po/" "" '.po' + l10n_for_each_disabled_locale_do remove_locale } src_configure() { + if use wxwidgets; then + need-wxwidgets unicode + fi + local mycmakeargs=( - "-DDOLPHIN_WC_REVISION=${PV}" - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-Dprefix=${GAMES_PREFIX}" - "-Ddatadir=${GAMES_DATADIR}/${PN}" - "-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 QT2 ) + $( cmake-utils_use_enable sdl SDL ) + $( cmake-utils_use_use egl EGL ) + $( cmake-utils_use_use upnp UPNP ) ) cmake-utils_src_configure @@ -135,10 +176,9 @@ src_install() { dodoc -r docs/ActionReplay docs/DSP docs/WiiMote fi - doicon Installer/dolphin-emu.xpm - make_desktop_entry "dolphin-emu" "Dolphin Emulator" "dolphin-emu" "Game;Emulator;" - - prepgamesdirs + doicon -s 48 Data/dolphin-emu.png + doicon -s scalable Data/dolphin-emu.svg + doicon Data/dolphin-emu.svg } pkg_postinst() {