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 4AC871381F3 for ; Wed, 23 Oct 2013 15:46:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B18FE0A5A; Wed, 23 Oct 2013 15:46:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F134EE0A5A for ; Wed, 23 Oct 2013 15:46:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFDE933F85F for ; Wed, 23 Oct 2013 15:46:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 97478E5308 for ; Wed, 23 Oct 2013 15:46:44 +0000 (UTC) From: "Marcel Unbehaun" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marcel Unbehaun" Message-ID: <1382543205.5eb9ec3c1329b72da4490c2d5dfc82100dba6e79.frostwork@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-emulation/pcsx2/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-emulation/pcsx2/pcsx2-0.9.8.ebuild games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: frostwork X-VCS-Committer-Name: Marcel Unbehaun X-VCS-Revision: 5eb9ec3c1329b72da4490c2d5dfc82100dba6e79 X-VCS-Branch: master Date: Wed, 23 Oct 2013 15:46:44 +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: 593c0982-359e-4322-8904-bbe831ede75d X-Archives-Hash: e2debf3c0ec0a57c927cf5ae68893eba commit: 5eb9ec3c1329b72da4490c2d5dfc82100dba6e79 Author: Marcel Unbehaun frostworx de> AuthorDate: Wed Oct 23 15:46:45 2013 +0000 Commit: Marcel Unbehaun gmx de> CommitDate: Wed Oct 23 15:46:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5eb9ec3c [games-emulation/pcsx2] updated pcsx2-9999.ebuild --- games-emulation/pcsx2/pcsx2-0.9.8.ebuild | 120 ------------------------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 121 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild b/games-emulation/pcsx2/pcsx2-0.9.8.ebuild deleted file mode 100644 index b656a15..0000000 --- a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -WX_GTK_VER="2.8" -MY_PV=${P}-r4600-sources - -inherit games cmake-utils wxwidgets - -DESCRIPTION="A PlayStation 2 emulator" -HOMEPAGE="http://www.pcsx2.net" -SRC_URI="http://forums.pcsx2.net/attachment.php?aid=28280 -> ${P}.7z" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~x86" -IUSE="debug" - -if use amd64; then - ABI="x86" -fi -if use debug; then - CMAKE_BUILD_TYPE="Debug" -else - CMAKE_BUILD_TYPE="Release" -fi - -DEPEND="dev-cpp/sparsehash - x86? ( - app-arch/bzip2 - sys-libs/zlib - media-libs/alsa-lib - media-libs/glew - media-libs/libsdl - media-libs/portaudio - media-gfx/nvidia-cg-toolkit - virtual/jpeg - virtual/opengl - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXext - x11-libs/wxGTK[X] - ) - amd64? ( media-gfx/nvidia-cg-toolkit[multilib] - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-gtklibs - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs - app-emulation/emul-linux-x86-wxGTK - )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_PV} - -src_prepare() { - sed -i -e "s:CDVDnull TRUE:CDVDnull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:CDVDiso TRUE:CDVDiso FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:CDVDlinuz TRUE:CDVDlinuz FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:dev9null TRUE:dev9null FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:FWnull TRUE:FWnull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:GSnull TRUE:GSnull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:GSdx TRUE:GSdx FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:zerogs TRUE:zerogs FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:zzogl TRUE:zzogl FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:PadNull TRUE:PadNull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:onepad TRUE:onepad FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:zeropad TRUE:zeropad FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:SPU2null TRUE:SPU2null FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:spu2-x TRUE:spu2-x FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:zerospu2 TRUE:zerospu2 FALSE:g" -i cmake/SelectPcsx2Plugins.cmake - sed -i -e "s:USBnull TRUE:USBnull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake -} - -src_configure() { - wxgtk_config="" - cg_config="" - if use amd64; then - # tell cmake to use 32 bit library - wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-32" - cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so - -DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so" - fi - - mycmakeargs=" - -DPACKAGE_MODE=1 - -DPLUGIN_DIR=$(games_get_libdir)/${PN} - -DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/${PN} - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_LIBRARY_PATH=$(games_get_libdir)/${PN} - ${wxgtk_config} - ${cg_config} - " - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install DESTDIR=${D} - - # move binary files to correct directory - mkdir -p ${D}/usr/games/bin - mv ${S}/bin/${PN} ${D}/usr/games/bin || die - - prepgamesdirs -} - -pkg_postinst() { - if use amd64; then - einfo "We currently use 64bit dev-cpp/sparsehash for compiling pcsx2" - einfo "since sparsehash installation contains only header files." - einfo "If you encounter any problems with that, try" - einfo "" - einfo " ABI=\"x86\" emerge sparsehash" - einfo "" - einfo "and remerge pcsx2 before reporting bugs." - fi -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 2af3a18..f2b8462 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -80,7 +80,7 @@ src_configure() { cg_config="" if use amd64; then # tell cmake to use 32 bit library - wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-32" + wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32" cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so -DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so" fi