* [gentoo-commits] proj/gamerlay:master commit in: games-emulation/pcsx2/
@ 2011-10-30 12:48 Marcel Unbehaun
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2011-10-30 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 09d09118fa8cfe1637542aa6af1ee02397107825
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sun Oct 30 13:48:30 2011 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sun Oct 30 13:48:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=09d09118
[games-emulation/pcsx2] changed inherit wxwidgets
---
games-emulation/pcsx2/pcsx2-0.9.8.ebuild | 5 -----
games-emulation/pcsx2/pcsx2-9999.ebuild | 7 +------
2 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild b/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
index 36dab1d..73b3bbd 100644
--- a/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
+++ b/games-emulation/pcsx2/pcsx2-0.9.8.ebuild
@@ -7,11 +7,6 @@ EAPI=3
WX_GTK_VER="2.8"
MY_PV=${P}-r4600-sources
-# no need for amd64 as we will use precompiled wxGTK.
-#if use x86; then
-# inherit wxwidgets
-#fi
-
inherit games cmake-utils wxwidgets
DESCRIPTION="A PlayStation 2 emulator"
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c0bc446..6237e3e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -6,12 +6,7 @@ EAPI=3
WX_GTK_VER="2.8"
-# no need for amd64 as we will use precompiled wxGTK.
-if use x86; then
- inherit wxwidgets
-fi
-
-inherit games cmake-utils subversion
+inherit games cmake-utils subversion wxwidgets
DESCRIPTION="A PlayStation 2 emulator"
HOMEPAGE="http://www.pcsx2.net"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-emulation/pcsx2/
@ 2013-10-23 15:46 Marcel Unbehaun
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2013-10-23 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 5eb9ec3c1329b72da4490c2d5dfc82100dba6e79
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Wed Oct 23 15:46:45 2013 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-23 15:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-23 15:46 [gentoo-commits] proj/gamerlay:master commit in: games-emulation/pcsx2/ Marcel Unbehaun
-- strict thread matches above, loose matches on Subject: below --
2011-10-30 12:48 Marcel Unbehaun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox