Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Marcel Unbehaun <frostworks@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-emulation/ps2emu-spu2-x/, games-emulation/ps2emu-zerospu/
Date: Sun, 30 Oct 2011 12:40:02
Message-Id: 196415525069e15258f288cf14766b53e7ddd148.frostwork@gentoo
1 commit: 196415525069e15258f288cf14766b53e7ddd148
2 Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
3 AuthorDate: Sun Oct 30 13:39:41 2011 +0000
4 Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
5 CommitDate: Sun Oct 30 13:39:41 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=19641552
7
8 [games-emulation/ps2emu-zerospu+spu2-x] added soundtouch useflag to allow choosing system/internal soundtouch
9
10 ---
11 .../ps2emu-spu2-x/ps2emu-spu2-x-1.4.ebuild | 10 +++++++---
12 .../ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild | 10 +++++++---
13 .../ps2emu-zerospu/ps2emu-zerospu-0.4.6.ebuild | 8 +++++---
14 .../ps2emu-zerospu/ps2emu-zerospu-9999.ebuild | 8 +++++---
15 4 files changed, 24 insertions(+), 12 deletions(-)
16
17 diff --git a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-1.4.ebuild b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-1.4.ebuild
18 index 922d051..1fdfd89 100644
19 --- a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-1.4.ebuild
20 +++ b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-1.4.ebuild
21 @@ -16,7 +16,7 @@ SRC_URI="http://forums.pcsx2.net/attachment.php?aid=28280 -> pcsx2-0.9.8.7z"
22 LICENSE="GPL-3"
23 SLOT="0"
24 KEYWORDS="~x86"
25 -IUSE="debug"
26 +IUSE="debug soundtouch"
27 if use amd64; then
28 ABI="x86"
29 fi
30 @@ -52,11 +52,15 @@ DEPEND="dev-cpp/sparsehash
31 app-emulation/emul-linux-x86-sdl
32 app-emulation/emul-linux-x86-soundlibs
33 app-emulation/emul-linux-x86-wxGTK
34 - )"
35 + )
36 + soundtouch? ( media-libs/libsoundtouch )
37 + "
38 RDEPEND="${DEPEND}"
39
40 src_prepare() {
41 + if use soundtouch; then
42 sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
43 + fi
44 sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
45 sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
46 sed -i -e "s:add_subdirectory(tools)::g" -i CMakeLists.txt
47 @@ -95,7 +99,7 @@ src_configure() {
48 -DPLUGIN_DIR=$(games_get_libdir)/pcsx2
49 -DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2
50 -DCMAKE_INSTALL_PREFIX=/usr
51 - -DFORCE_INTERNAL_SOUNDTOUCH=FALSE
52 + $(cmake-utils_use !soundtouch FORCE_INTERNAL_SOUNDTOUCH)
53 ${wxgtk_config}
54 ${cg_config}
55 "
56
57 diff --git a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
58 index 16ec3ac..f8c120b 100644
59 --- a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
60 +++ b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
61 @@ -21,7 +21,7 @@ ESVN_PROJECT="pcsx2"
62 LICENSE="GPL-3"
63 SLOT="0"
64 KEYWORDS=""
65 -IUSE="debug"
66 +IUSE="debug soundtouch"
67 if use amd64; then
68 ABI="x86"
69 fi
70 @@ -57,11 +57,15 @@ DEPEND="dev-cpp/sparsehash
71 app-emulation/emul-linux-x86-sdl
72 app-emulation/emul-linux-x86-soundlibs
73 app-emulation/emul-linux-x86-wxGTK
74 - )"
75 + )
76 + soundtouch? ( media-libs/libsoundtouch )
77 + "
78 RDEPEND="${DEPEND}"
79
80 src_prepare() {
81 + if use soundtouch; then
82 sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
83 + fi
84 sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
85 sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
86 sed -i -e "s:add_subdirectory(tools)::g" -i CMakeLists.txt
87 @@ -99,7 +103,7 @@ src_configure() {
88 -DPLUGIN_DIR=$(games_get_libdir)/pcsx2
89 -DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2
90 -DCMAKE_INSTALL_PREFIX=/usr
91 - -DFORCE_INTERNAL_SOUNDTOUCH=FALSE
92 + $(cmake-utils_use !soundtouch FORCE_INTERNAL_SOUNDTOUCH)
93 ${wxgtk_config}
94 ${cg_config}
95 "
96
97 diff --git a/games-emulation/ps2emu-zerospu/ps2emu-zerospu-0.4.6.ebuild b/games-emulation/ps2emu-zerospu/ps2emu-zerospu-0.4.6.ebuild
98 index 0486128..bb7b97f 100644
99 --- a/games-emulation/ps2emu-zerospu/ps2emu-zerospu-0.4.6.ebuild
100 +++ b/games-emulation/ps2emu-zerospu/ps2emu-zerospu-0.4.6.ebuild
101 @@ -16,7 +16,7 @@ SRC_URI="http://forums.pcsx2.net/attachment.php?aid=28280 -> pcsx2-0.9.8.7z"
102 LICENSE="GPL-3"
103 SLOT="0"
104 KEYWORDS="~x86"
105 -IUSE="debug"
106 +IUSE="debug soundtouch"
107 if use amd64; then
108 ABI="x86"
109 fi
110 @@ -26,7 +26,7 @@ else
111 CMAKE_BUILD_TYPE="Release"
112 fi
113
114 -DEPEND="
115 +DEPEND="soundtouch? ( media-libs/libsoundtouch )
116 x86? (
117 media-libs/alsa-lib
118 media-libs/portaudio
119 @@ -36,7 +36,9 @@ DEPEND="
120 RDEPEND="${DEPEND}"
121
122 src_prepare() {
123 + if use soundtouch; then
124 sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
125 + fi
126 sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
127 sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
128 sed -i -e "s:add_subdirectory(tools)::g" -i CMakeLists.txt
129 @@ -68,7 +70,7 @@ src_configure() {
130 -DPLUGIN_DIR=$(games_get_libdir)/pcsx2
131 -DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2
132 -DCMAKE_INSTALL_PREFIX=/usr
133 - -DFORCE_INTERNAL_SOUNDTOUCH=FALSE
134 + $(cmake-utils_use !soundtouch FORCE_INTERNAL_SOUNDTOUCH)
135 "
136 cmake-utils_src_configure
137 }
138
139 diff --git a/games-emulation/ps2emu-zerospu/ps2emu-zerospu-9999.ebuild b/games-emulation/ps2emu-zerospu/ps2emu-zerospu-9999.ebuild
140 index aca7024..f3b0851 100644
141 --- a/games-emulation/ps2emu-zerospu/ps2emu-zerospu-9999.ebuild
142 +++ b/games-emulation/ps2emu-zerospu/ps2emu-zerospu-9999.ebuild
143 @@ -16,7 +16,7 @@ ESVN_PROJECT="pcsx2"
144 LICENSE="GPL-3"
145 SLOT="0"
146 KEYWORDS=""
147 -IUSE="debug"
148 +IUSE="debug soundtouch"
149 if use amd64; then
150 ABI="x86"
151 fi
152 @@ -26,7 +26,7 @@ else
153 CMAKE_BUILD_TYPE="Release"
154 fi
155
156 -DEPEND="
157 +DEPEND="soundtouch? ( media-libs/libsoundtouch )
158 x86? (
159 media-libs/alsa-lib
160 media-libs/portaudio
161 @@ -36,7 +36,9 @@ DEPEND="
162 RDEPEND="${DEPEND}"
163
164 src_prepare() {
165 + if use soundtouch; then
166 sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
167 + fi
168 sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
169 sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
170 sed -i -e "s:add_subdirectory(tools)::g" -i CMakeLists.txt
171 @@ -66,7 +68,7 @@ src_configure() {
172 -DPLUGIN_DIR=$(games_get_libdir)/pcsx2
173 -DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2
174 -DCMAKE_INSTALL_PREFIX=/usr
175 - -DFORCE_INTERNAL_SOUNDTOUCH=FALSE
176 + $(cmake-utils_use !soundtouch FORCE_INTERNAL_SOUNDTOUCH)
177 "
178 cmake-utils_src_configure
179 }
Report Message
Find on MARC Find on Google Groups