Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
Date: Sun, 21 Feb 2016 11:12:08
Message-Id: 1456023972.ebaaaf60aac4c9545ded42534b1355b93ea43552.monsieurp@gentoo
1 commit: ebaaaf60aac4c9545ded42534b1355b93ea43552
2 Author: RobinDX <robin9800xt <AT> gmail <DOT> com>
3 AuthorDate: Sun Feb 21 03:04:26 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 21 03:06:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebaaaf60
7
8 games-emulation/ppsspp: remove old
9
10 .../ppsspp/files/ppsspp-ffmpeg-x86.patch | 11 --
11 .../ppsspp/files/ppsspp-ffmpeg-x86_64.patch | 11 --
12 games-emulation/ppsspp/files/ppsspp-qt.patch | 11 --
13 games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild | 132 ---------------------
14 games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild | 132 ---------------------
15 5 files changed, 297 deletions(-)
16
17 diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
18 deleted file mode 100644
19 index c9e755d..0000000
20 --- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
21 +++ /dev/null
22 @@ -1,11 +0,0 @@
23 ---- ffmpeg/linux_x86.sh.orig 2016-01-04 21:44:11.540084990 +0800
24 -+++ ffmpeg/linux_x86.sh 2016-01-04 21:44:56.560085770 +0800
25 -@@ -72,7 +72,7 @@
26 - ./configure \
27 - --prefix=./linux/${ARCH} \
28 - ${GENERAL} \
29 -- --extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
30 -+ --extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
31 - --enable-zlib \
32 - --disable-yasm \
33 - --disable-everything \
34
35 diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
36 deleted file mode 100644
37 index 45bd877..0000000
38 --- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
39 +++ /dev/null
40 @@ -1,11 +0,0 @@
41 ---- ffmpeg/linux_x86-64.sh.orig 2016-01-04 21:42:14.220082959 +0800
42 -+++ ffmpeg/linux_x86-64.sh 2016-01-04 21:42:31.940083265 +0800
43 -@@ -71,7 +71,7 @@
44 - ./configure \
45 - --prefix=./linux/${ARCH} \
46 - ${GENERAL} \
47 -- --extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
48 -+ --extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
49 - --enable-zlib \
50 - --enable-pic \
51 - --disable-yasm \
52
53 diff --git a/games-emulation/ppsspp/files/ppsspp-qt.patch b/games-emulation/ppsspp/files/ppsspp-qt.patch
54 deleted file mode 100644
55 index e372f15..0000000
56 --- a/games-emulation/ppsspp/files/ppsspp-qt.patch
57 +++ /dev/null
58 @@ -1,11 +0,0 @@
59 ---- Qt/Settings.pri.orig 2016-01-04 21:37:36.600078151 +0800
60 -+++ Qt/Settings.pri 2016-01-04 21:37:57.430078511 +0800
61 -@@ -64,7 +64,7 @@
62 - else: QMAKE_CXXFLAGS += -std=c++11
63 - QMAKE_CFLAGS_RELEASE ~= s/-O.*/
64 - QMAKE_CXXFLAGS_RELEASE ~= s/-O.*/
65 -- QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math
66 -+ QMAKE_ALLFLAGS_RELEASE += -O2 -ffast-math
67 - }
68 -
69 - contains(QT_CONFIG, opengles.) {
70
71 diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
72 deleted file mode 100644
73 index 4d8db28..0000000
74 --- a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
75 +++ /dev/null
76 @@ -1,132 +0,0 @@
77 -# Copyright 1999-2016 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -# $Id$
80 -
81 -EAPI=5
82 -
83 -inherit eutils cmake-utils qt4-r2 git-r3
84 -
85 -DESCRIPTION="A PSP emulator written in C++."
86 -HOMEPAGE="http://www.ppsspp.org/"
87 -EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
88 -EGIT_COMMIT="v${PV}"
89 -
90 -LICENSE="GPL-2"
91 -SLOT="0"
92 -KEYWORDS="~amd64 ~x86"
93 -IUSE="qt4 qt5 +sdl"
94 -REQUIRED_USE="
95 - ?? ( qt4 qt5 sdl )
96 -"
97 -
98 -RDEPEND=""
99 -
100 -DEPEND="
101 - sys-libs/zlib
102 - sdl? (
103 - dev-util/cmake
104 - media-libs/libsdl
105 - media-libs/libsdl2
106 - )
107 - qt4? (
108 - dev-qt/qtsvg:4
109 - dev-qt/qtgui:4
110 - dev-qt/qtcore:4
111 - dev-qt/qtopengl:4
112 - dev-qt/qtmultimedia:4
113 - dev-qt/qt-mobility[multimedia]
114 - )
115 - qt5? (
116 - dev-qt/qtsvg:5
117 - dev-qt/qtgui:5
118 - dev-qt/qtcore:5
119 - dev-qt/qtopengl:5
120 - dev-qt/qtmultimedia:5
121 - dev-qt/qtwidgets:5
122 - dev-qt/qt-mobility[multimedia]
123 - )
124 -"
125 -
126 -src_unpack() {
127 - git-r3_fetch
128 - git-r3_checkout
129 - if use qt4 ; then
130 - cd "${WORKDIR}"/"${P}"/Qt || die
131 - qt4-r2_src_unpack
132 - elif use qt5 ; then
133 - cd "${WORKDIR}"/"${P}"/Qt || die
134 - qt4-r2_src_unpack
135 - fi
136 -}
137 -
138 -src_prepare() {
139 - # Bug 574000
140 - sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
141 -
142 - epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
143 - epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
144 - epatch "$FILESDIR"/ppsspp-qt.patch
145 -
146 - if use qt4 ; then
147 - cd "${WORKDIR}"/"${P}"/Qt || die
148 - qt4-r2_src_prepare
149 - elif use qt5 ; then
150 - cd "${WORKDIR}"/"${P}"/Qt || die
151 - qt4-r2_src_prepare
152 - else
153 - cmake-utils_src_prepare
154 - fi
155 -}
156 -
157 -src_configure() {
158 - if use qt4 ; then
159 - cd "${WORKDIR}"/"${P}"/Qt || die
160 - qt4-r2_src_configure
161 - eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
162 - elif use qt5 ; then
163 - cd "${WORKDIR}"/"${P}"/Qt || die
164 - qt4-r2_src_configure
165 - eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
166 - else
167 - cmake-utils_src_configure
168 - fi
169 -}
170 -
171 -src_compile() {
172 - if use qt4 ; then
173 - cd "${WORKDIR}"/"${P}"/Qt || die
174 - qt4-r2_src_compile
175 - elif use qt5 ; then
176 - cd "${WORKDIR}"/"${P}"/Qt || die
177 - qt4-r2_src_compile
178 - else
179 - cmake-utils_src_compile
180 - fi
181 -}
182 -
183 -src_install() {
184 - if use qt4 ; then
185 - exeinto /usr/games/bin
186 - newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
187 - elif use qt5 ; then
188 - exeinto /usr/games/bin
189 - newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
190 - else
191 - exeinto /usr/games
192 - dobin "${FILESDIR}"/ppsspp
193 - exeinto /usr/share/games/"${PN}"
194 - doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
195 - insinto /usr/share/games/"${PN}"
196 - doins -r "${WORKDIR}"/"${P}"_build/assets
197 - doins -r "${WORKDIR}"/"${P}"/lang
198 - fi
199 - insinto /usr/share/icons/
200 - newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
201 - domenu "${FILESDIR}"/ppsspp.desktop
202 -}
203 -
204 -pkg_postinst() {
205 - elog "Remember, in order to play games, you have to "
206 - elog "be in the 'games' group. "
207 - elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
208 -}
209
210 diff --git a/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
211 deleted file mode 100644
212 index 4d8db28..0000000
213 --- a/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
214 +++ /dev/null
215 @@ -1,132 +0,0 @@
216 -# Copyright 1999-2016 Gentoo Foundation
217 -# Distributed under the terms of the GNU General Public License v2
218 -# $Id$
219 -
220 -EAPI=5
221 -
222 -inherit eutils cmake-utils qt4-r2 git-r3
223 -
224 -DESCRIPTION="A PSP emulator written in C++."
225 -HOMEPAGE="http://www.ppsspp.org/"
226 -EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
227 -EGIT_COMMIT="v${PV}"
228 -
229 -LICENSE="GPL-2"
230 -SLOT="0"
231 -KEYWORDS="~amd64 ~x86"
232 -IUSE="qt4 qt5 +sdl"
233 -REQUIRED_USE="
234 - ?? ( qt4 qt5 sdl )
235 -"
236 -
237 -RDEPEND=""
238 -
239 -DEPEND="
240 - sys-libs/zlib
241 - sdl? (
242 - dev-util/cmake
243 - media-libs/libsdl
244 - media-libs/libsdl2
245 - )
246 - qt4? (
247 - dev-qt/qtsvg:4
248 - dev-qt/qtgui:4
249 - dev-qt/qtcore:4
250 - dev-qt/qtopengl:4
251 - dev-qt/qtmultimedia:4
252 - dev-qt/qt-mobility[multimedia]
253 - )
254 - qt5? (
255 - dev-qt/qtsvg:5
256 - dev-qt/qtgui:5
257 - dev-qt/qtcore:5
258 - dev-qt/qtopengl:5
259 - dev-qt/qtmultimedia:5
260 - dev-qt/qtwidgets:5
261 - dev-qt/qt-mobility[multimedia]
262 - )
263 -"
264 -
265 -src_unpack() {
266 - git-r3_fetch
267 - git-r3_checkout
268 - if use qt4 ; then
269 - cd "${WORKDIR}"/"${P}"/Qt || die
270 - qt4-r2_src_unpack
271 - elif use qt5 ; then
272 - cd "${WORKDIR}"/"${P}"/Qt || die
273 - qt4-r2_src_unpack
274 - fi
275 -}
276 -
277 -src_prepare() {
278 - # Bug 574000
279 - sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
280 -
281 - epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
282 - epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
283 - epatch "$FILESDIR"/ppsspp-qt.patch
284 -
285 - if use qt4 ; then
286 - cd "${WORKDIR}"/"${P}"/Qt || die
287 - qt4-r2_src_prepare
288 - elif use qt5 ; then
289 - cd "${WORKDIR}"/"${P}"/Qt || die
290 - qt4-r2_src_prepare
291 - else
292 - cmake-utils_src_prepare
293 - fi
294 -}
295 -
296 -src_configure() {
297 - if use qt4 ; then
298 - cd "${WORKDIR}"/"${P}"/Qt || die
299 - qt4-r2_src_configure
300 - eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
301 - elif use qt5 ; then
302 - cd "${WORKDIR}"/"${P}"/Qt || die
303 - qt4-r2_src_configure
304 - eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
305 - else
306 - cmake-utils_src_configure
307 - fi
308 -}
309 -
310 -src_compile() {
311 - if use qt4 ; then
312 - cd "${WORKDIR}"/"${P}"/Qt || die
313 - qt4-r2_src_compile
314 - elif use qt5 ; then
315 - cd "${WORKDIR}"/"${P}"/Qt || die
316 - qt4-r2_src_compile
317 - else
318 - cmake-utils_src_compile
319 - fi
320 -}
321 -
322 -src_install() {
323 - if use qt4 ; then
324 - exeinto /usr/games/bin
325 - newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
326 - elif use qt5 ; then
327 - exeinto /usr/games/bin
328 - newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
329 - else
330 - exeinto /usr/games
331 - dobin "${FILESDIR}"/ppsspp
332 - exeinto /usr/share/games/"${PN}"
333 - doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
334 - insinto /usr/share/games/"${PN}"
335 - doins -r "${WORKDIR}"/"${P}"_build/assets
336 - doins -r "${WORKDIR}"/"${P}"/lang
337 - fi
338 - insinto /usr/share/icons/
339 - newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
340 - domenu "${FILESDIR}"/ppsspp.desktop
341 -}
342 -
343 -pkg_postinst() {
344 - elog "Remember, in order to play games, you have to "
345 - elog "be in the 'games' group. "
346 - elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
347 -}