public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/
Date: Tue,  4 Apr 2017 21:14:06 +0000 (UTC)	[thread overview]
Message-ID: <1491340442.051286e08843fc07d1561486ad0fb2eabdf0472b.monsieurp@gentoo> (raw)

commit:     051286e08843fc07d1561486ad0fb2eabdf0472b
Author:     soredake <fdsfgs <AT> krutt <DOT> org>
AuthorDate: Tue Apr  4 13:11:03 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 21:14:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051286e0

games-emulation/ppsspp: update 9999 version.

Closes: https://github.com/gentoo/gentoo/pull/4342

 games-emulation/ppsspp/ppsspp-9999.ebuild | 138 +++++++++---------------------
 1 file changed, 42 insertions(+), 96 deletions(-)

diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
index 16ca5dd693f..ff8656b6a2d 100644
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@@ -1,127 +1,73 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils cmake-utils qt4-r2 git-r3
+inherit eutils cmake-utils git-r3
 
 DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="http://www.ppsspp.org/"
-EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
+HOMEPAGE="https://www.ppsspp.org/"
+EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="qt4 qt5 +sdl"
+IUSE="+qt5 sdl headless libav"
 REQUIRED_USE="
-	?? ( qt4 qt5 sdl )
+	!headless? ( || ( qt5 sdl ) )
+	?? ( qt5 sdl )
 "
+EGIT_SUBMODULES=( '*' '-ffmpeg' )
 
-RDEPEND=""
-
-DEPEND="
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
+	!libav? ( media-video/ffmpeg:= )
+	libav? ( media-video/libav:= )
 	sdl? (
-		dev-util/cmake
 		media-libs/libsdl
 		media-libs/libsdl2
 	)
-	qt4? (
-		dev-qt/qtsvg:4
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
-		dev-qt/qtopengl:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qt-mobility[multimedia]
-	)
 	qt5? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
+		dev-db/sqlite
+		dev-qt/assistant:5
 		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
 		dev-qt/qtmultimedia:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
 		dev-qt/qtwidgets:5
-		dev-qt/qt-mobility[multimedia]
-	)
-"
+	)"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	fi
-}
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-	sed -i -e "s#-O3#-O2#g;" "${S}"/Qt/Settings.pri || die
-	sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+	# https://github.com/hrydgard/ppsspp/blob/150619c5a341f372266bec86fd874ac5a1343a43/UI/NativeApp.cpp#L318
+	# patch ppsspp to use /usr/share instead of working dir to find the assets
+	sed -i 's|VFSRegister("", new AssetsAssetReader());|VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));|g' UI/NativeApp.cpp || die "Patching qt assets path failed"
 
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	else
-		cmake-utils_src_prepare
-	fi
+	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	else
-		cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	else
-		cmake-utils_src_compile
-	fi
+	local mycmakeargs=(
+		-DUSING_QT_UI=$(usex qt5)
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DHEADLESS=$(usex headless)
+		)
+	cmake-utils_src_configure
 }
 
 src_install() {
-	if use qt4 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	elif use qt5 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	else
-		exeinto /usr/games
-		dobin "${FILESDIR}"/ppsspp
-		exeinto /usr/share/games/"${PN}"
-		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
-		insinto /usr/share/games/"${PN}"
-		doins -r "${WORKDIR}"/"${P}"_build/assets
-		doins -r "${WORKDIR}"/"${P}"/lang
+	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+	if use qt5 || use sdl ; then
+		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+		local i
+		for i in 16 24 32 48 64 96 128 256 512 ; do
+			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
+		done
+		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
 	fi
-	insinto /usr/share/icons/
-	newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
-	domenu "${FILESDIR}"/ppsspp.desktop
-}
-
-pkg_postinst() {
-	elog "Remember, in order to play games, you have to "
-	elog "be in the 'games' group. "
-	elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
 }


             reply	other threads:[~2017-04-04 21:14 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-04 21:14 Patrice Clement [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-12 10:14 [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/ Ionen Wolkens
2025-03-07 19:34 Maciej Barć
2024-11-17 16:26 Maciej Barć
2024-11-14 23:40 Maciej Barć
2024-04-11  1:38 Maciej Barć
2024-03-15 23:53 Sam James
2024-03-04  1:03 Maciej Barć
2024-02-14 17:01 Maciej Barć
2024-02-12 17:07 Maciej Barć
2024-02-10 23:50 Maciej Barć
2024-02-10 23:50 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-22 14:09 Maciej Barć
2023-09-20 16:27 Maciej Barć
2023-09-13 18:31 Maciej Barć
2023-09-09 18:14 Maciej Barć
2023-06-24 22:44 Sam James
2023-06-23 21:24 Maciej Barć
2023-06-23 21:24 Maciej Barć
2023-06-07 16:11 Sam James
2023-05-22 17:15 Maciej Barć
2023-05-22 17:15 Maciej Barć
2023-05-22 17:15 Maciej Barć
2023-05-07 15:21 Maciej Barć
2023-05-05 12:03 Maciej Barć
2023-05-01 17:47 Maciej Barć
2023-04-04 19:32 Arthur Zamarin
2023-04-04 16:27 Maciej Barć
2023-03-07 15:45 Sam James
2023-03-04 21:15 Maciej Barć
2023-03-03 22:27 Maciej Barć
2023-01-03 20:30 Maciej Barć
2023-01-03 20:30 Maciej Barć
2023-01-02 12:26 Maciej Barć
2023-01-02 12:26 Maciej Barć
2023-01-01 12:30 Maciej Barć
2022-12-30 18:40 Maciej Barć
2022-12-30 18:40 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-15 15:26 Maciej Barć
2022-12-15 15:26 Maciej Barć
2022-09-12  1:50 Maciej Barć
2022-09-12  1:50 Maciej Barć
2022-08-31 15:09 Maciej Barć
2022-07-26 21:10 Maciej Barć
2022-03-01  1:34 Maciej Barć
2021-11-26  0:44 Maciej Barć
2021-11-25  2:03 Maciej Barć
2021-07-06 11:50 Ionen Wolkens
2021-07-05 17:59 Ionen Wolkens
2021-03-11 17:06 Sam James
2021-03-08 16:51 Joonas Niilola
2021-02-17 16:30 Joonas Niilola
2021-02-17 16:30 Joonas Niilola
2020-12-11  7:58 Joonas Niilola
2020-11-28  8:45 Joonas Niilola
2020-11-28  8:45 Joonas Niilola
2020-04-25 20:16 Mikle Kolyada
2018-08-15 10:37 Andreas Sturmlechner
2018-08-15 10:37 Andreas Sturmlechner
2018-08-15 10:37 Andreas Sturmlechner
2018-07-18 21:11 Jonas Stein
2018-04-18 22:26 Jonas Stein
2018-01-13 22:21 David Seifert
2017-12-14  8:47 Patrice Clement
2017-06-18  7:41 Michał Górny
2016-03-22  7:37 Patrice Clement
2016-02-21 11:12 Patrice Clement
2016-02-07 13:15 Patrice Clement
2016-02-02 22:27 Patrice Clement
2016-02-02 22:27 Patrice Clement
2016-01-31  0:15 Patrice Clement
2016-01-22 15:17 Michael Palimaka
2016-01-20  7:19 Ian Delaney
2016-01-19 20:27 Patrice Clement
2016-01-19 20:27 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491340442.051286e08843fc07d1561486ad0fb2eabdf0472b.monsieurp@gentoo \
    --to=monsieurp@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox