[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ian Delaney" <idella4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/
Date: Wed, 20 Jan 2016 07:19:59 +0000 (UTC)	[thread overview]
Message-ID: <1453265624.a4485befd670ac1d079816140690a1647bfdc549.idella4@gentoo> (raw)

commit:     a4485befd670ac1d079816140690a1647bfdc549
Author:     RobinDX <robin9800xt <AT> gmail <DOT> com>
AuthorDate: Wed Jan 20 04:53:15 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 04:53:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4485bef

games-emulation/ppsspp:add qt5 support

 games-emulation/ppsspp/metadata.xml        |  1 +
 games-emulation/ppsspp/ppsspp-1.1.0.ebuild | 30 +++++++++++++++++++++++++---
 games-emulation/ppsspp/ppsspp-1.1.1.ebuild | 32 ++++++++++++++++++++++++++----
 games-emulation/ppsspp/ppsspp-9999.ebuild  | 32 ++++++++++++++++++++++++++----
 4 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 51a6852..be7e8b7 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -8,6 +8,7 @@
 	</maintainer>
 	<use>
 		<flag name='qt4'>Adds support for the Qt GUI/Application Toolkit version 4.x</flag>
+		<flag name='qt5'>Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
 		<flag name='sdl'>Adds support for Simple Direct Layer (media library)</flag>
 	</use>
 	<upstream>

diff --git a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
index 6bc431f..38dc392 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
@@ -14,9 +14,9 @@ EGIT_COMMIT="v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 +sdl"
+IUSE="qt4 qt5 +sdl"
 REQUIRED_USE="
-	?? ( qt4 sdl )
+	?? ( qt4 qt5 sdl )
 "
 
 RDEPEND=""
@@ -36,6 +36,15 @@ DEPEND="
 		dev-qt/qtmultimedia:4
 		dev-qt/qt-mobility[multimedia]
 	)
+	qt5? (
+		dev-qt/qtsvg:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets
+		dev-qt/qt-mobility[multimedia]
+	)
 "
 
 src_unpack() {
@@ -44,8 +53,10 @@ src_unpack() {
 	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
-	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
 }
 
 src_prepare() {
@@ -56,6 +67,9 @@ src_prepare() {
 	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
@@ -66,6 +80,10 @@ src_configure() {
 		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
@@ -75,6 +93,9 @@ 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
@@ -84,6 +105,9 @@ 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

diff --git a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
index 6de52a1..38dc392 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
@@ -8,15 +8,15 @@ inherit eutils cmake-utils qt4-r2 git-r3
 
 DESCRIPTION="A PSP emulator written in C++."
 HOMEPAGE="http://www.ppsspp.org/"
-EGIT_REPO_URI="git://github.com/hrydgard/ppsspp.git"
+EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
 EGIT_COMMIT="v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 +sdl"
+IUSE="qt4 qt5 +sdl"
 REQUIRED_USE="
-	?? ( qt4 sdl )
+	?? ( qt4 qt5 sdl )
 "
 
 RDEPEND=""
@@ -36,6 +36,15 @@ DEPEND="
 		dev-qt/qtmultimedia:4
 		dev-qt/qt-mobility[multimedia]
 	)
+	qt5? (
+		dev-qt/qtsvg:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets
+		dev-qt/qt-mobility[multimedia]
+	)
 "
 
 src_unpack() {
@@ -44,8 +53,10 @@ src_unpack() {
 	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
-	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
 }
 
 src_prepare() {
@@ -56,6 +67,9 @@ src_prepare() {
 	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
@@ -66,6 +80,10 @@ src_configure() {
 		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
@@ -75,6 +93,9 @@ 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
@@ -84,6 +105,9 @@ 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

diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
index d9166bb..fdfb52b 100644
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@@ -8,14 +8,14 @@ inherit eutils cmake-utils qt4-r2 git-r3
 
 DESCRIPTION="A PSP emulator written in C++."
 HOMEPAGE="http://www.ppsspp.org/"
-EGIT_REPO_URI="git://github.com/hrydgard/ppsspp.git"
+EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt4 +sdl"
+IUSE="qt4 qt5 +sdl"
 REQUIRED_USE="
-	?? ( qt4 sdl )
+	?? ( qt4 qt5 sdl )
 "
 
 RDEPEND=""
@@ -35,6 +35,15 @@ DEPEND="
 		dev-qt/qtmultimedia:4
 		dev-qt/qt-mobility[multimedia]
 	)
+	qt5? (
+		dev-qt/qtsvg:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets
+		dev-qt/qt-mobility[multimedia]
+	)
 "
 
 src_unpack() {
@@ -43,8 +52,10 @@ src_unpack() {
 	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
-	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
 }
 
 src_prepare() {
@@ -55,6 +66,9 @@ src_prepare() {
 	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
@@ -65,6 +79,10 @@ src_configure() {
 		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
@@ -74,6 +92,9 @@ 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
@@ -83,6 +104,9 @@ 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

next             reply	other threads:[~2016-01-20  7:20 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-20  7:19 Ian Delaney [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
2017-04-04 21:14 Patrice Clement
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-19 20:27 Patrice Clement
2016-01-19 20:27 Patrice Clement

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:51a6852 dfblob:be7e8b7 dfblob:6bc431f dfblob:38dc392
dfblob:6de52a1 dfblob:38dc392 dfblob:d9166bb dfblob:fdfb52b )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/" )
	(help)

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=1453265624.a4485befd670ac1d079816140690a1647bfdc549.idella4@gentoo \
    --to=idella4@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