[gentoo-commits] dev/vincent:master commit in: games-emulation/pcsx2/

[Vicente Olivert Riera]

commit:     8b4a6e8c3bf46f508a5f97eb0c760e10e3f0590d
Author:     Vicente Olivert Riera <vincent <AT> gentoo <DOT> org>
AuthorDate: Fri May  2 21:00:38 2014 +0000
Commit:     Vicente Olivert Riera <vincent <AT> gentoo <DOT> org>
CommitDate: Fri May  2 21:00:38 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=commit;h=8b4a6e8c

Multiple changes

-Revert libsdl dependence
-Fix GSdx compilation failure

Signed-off-by: Vicente Olivert Riera <vincent <AT> gentoo.org>

---
 games-emulation/pcsx2/Manifest          | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index a33123c..bebb050 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,3 @@
-EBUILD pcsx2-9999.ebuild 2098 SHA256 
a88f8529532b7f1b111605fef390e836f1a7e5f9b76353140aa53004679ba276 SHA512 
4698a9a76059dedea9477f2af4043aae417febd39616917ac39bf6f3f1f15c410398dfa249aeb5b929e6e2a91a85d24aabff0e7707bb85b80a8185911f760546
 WHIRLPOOL 
18a0a4a7fcedd7d0c5b87165c5bddd794af11707f23f8e20dd140cabf489f802256f2cff98286aef40d4d6ddc3c71015271074a579e69524e6b42c4378f55d84
+EBUILD pcsx2-9999.ebuild 2192 SHA256 
6a1d1c7ab247cd5e055ff1659619fa726334de588bef680e751801d1fd0be197 SHA512 
c59df5bbd3086bf494a132ce07c17d417bcce67917178739dfe6a108dbc108b7c81cd74bff082fea5c3c6e523ec6954f47f5521fe49250e50b911781a3e39a9a
 WHIRLPOOL 
258f0db903e15a65083b1829ef944cde4b802b68bb1b55d10d24ad740aee1931a622302c793616a803151fe3fb2f6e4291b6324df3db60d452c123e29ddfd1c6
 MISC ChangeLog 1448 SHA256 
f5799473d43a98e59762e7c5136ed78898225db01e60d4c7ef0642f2eec2289c SHA512 
7d8fb4ef4afc8c961c3238d2734159826cb4f6792a69d2049b0d11d6628a2cadd0c5f7d17efeb0bccc6d08365a5dc9bf0fcc5f2e56ba0168745b15cbba7a1ffb
 WHIRLPOOL 
930278a972b515c5565a61f8951cd97838e88b98d2576020f0f359e9f2a4e0bc34264c789d1ab28bcc88d805deb9ad1ea45444a374f1c139160e8c43ea88d39e
 MISC metadata.xml 346 SHA256 
ec3a634eed6c4f90c68925dc7127c2e706fc9f02013321918e72c0368f488bb9 SHA512 
837626e9e6f66b309f65999684b459921c9e6294fbd47448046fcdec27d988a3bb941d2685d9fc0399bddc8ea78b6957aae56158941ed4425c507c3d22a20720
 WHIRLPOOL 
536fb2fca6cfe9d8a0e470f27d50efa043c4fa27586eff61d7fc3facf265623e4b03b8bde03ff1d04d302e292dfc77278deb6b418df7ee44dc37b3ef9bda8f39

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild 
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index eca7636..882cd67 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="-* ~x86 ~amd64"
 DEPEND="dev-cpp/sparsehash
        media-libs/alsa-lib
        media-libs/glew
-       media-libs/libsdl2
+       media-libs/libsdl
        media-libs/libsoundtouch
        media-libs/portaudio
        sys-libs/zlib
@@ -53,8 +53,10 @@ src_unpack() {
 }
 
 src_prepare() {
-       # Don't build GSdx plugin
-       #rm -Rf plugins/GSdx
+       # Append 32bit opengl include dir
+       if use amd64 ; then
+               sed '/include_directories/a /usr/lib32/opengl/xorg-x11/include' 
-i CMakeLists.txt
+       fi
        cmake-utils_src_prepare
 }