From 76de7b7fd59422898dd599f7dba5817e9023732a Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 7 Feb 2016 10:50:18 +0000 Subject: games-emulation/ppsspp: Remove bogus patch. Fix install directory (typo). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also taken into consideration in this commit is the sed command pruning all -O2 flags in favour of -O3, courtesy of Michał Ziąbkowski . Gentoo-Bug: 574000 Package-Manager: portage-2.2.26 Signed-off-by: Patrice Clement --- games-emulation/ppsspp/files/ppsspp-cmake.patch | 32 ------ games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild | 129 ----------------------- games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild | 132 ++++++++++++++++++++++++ games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild | 129 ----------------------- games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild | 132 ++++++++++++++++++++++++ games-emulation/ppsspp/ppsspp-9999.ebuild | 7 +- 6 files changed, 269 insertions(+), 292 deletions(-) delete mode 100644 games-emulation/ppsspp/files/ppsspp-cmake.patch delete mode 100644 games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild create mode 100644 games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild delete mode 100644 games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild create mode 100644 games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild (limited to 'games-emulation/ppsspp') diff --git a/games-emulation/ppsspp/files/ppsspp-cmake.patch b/games-emulation/ppsspp/files/ppsspp-cmake.patch deleted file mode 100644 index 4a0a036b1d40..000000000000 --- a/games-emulation/ppsspp/files/ppsspp-cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- CMakeLists.txt.orig 2016-01-04 20:44:44.010023206 +0800 -+++ CMakeLists.txt 2016-01-04 20:45:34.910024088 +0800 -@@ -219,11 +219,11 @@ - if(NOT MSVC) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG") - set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG") - set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG") - - # Disable some warnings -@@ -634,12 +634,12 @@ - if (NOT MSVC) - # These can be fast even for debug. - if(NOT SNAPPY_FOUND) -- set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3") -+ set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O2") - endif() -- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3") -- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3") -+ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2") -+ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2") - if(NOT ZLIB_FOUND) -- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3") -+ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2") - endif() - endif() diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild deleted file mode 100644 index 19baa10186d2..000000000000 --- a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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/${PN}.git" -EGIT_COMMIT="v${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qt4 qt5 +sdl" -REQUIRED_USE=" - ?? ( qt4 qt5 sdl ) -" - -RDEPEND="" - -DEPEND=" - sys-libs/zlib - 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-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtmultimedia: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 -} - -src_prepare() { - epatch "$FILESDIR"/ppsspp-cmake.patch - epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch - epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch - epatch "$FILESDIR"/ppsspp-qt.patch - 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 -} - -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 -} - -src_install() { - if use qt4 ; then - into /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 - 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 games', then have re-login. " -} diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild new file mode 100644 index 000000000000..4d8db28fecf2 --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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/${PN}.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="qt4 qt5 +sdl" +REQUIRED_USE=" + ?? ( qt4 qt5 sdl ) +" + +RDEPEND="" + +DEPEND=" + sys-libs/zlib + 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-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtmultimedia: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 +} + +src_prepare() { + # Bug 574000 + sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die + + epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch + epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch + epatch "$FILESDIR"/ppsspp-qt.patch + + 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 +} + +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 +} + +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 + 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 games', then have re-login. " +} diff --git a/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild deleted file mode 100644 index 19baa10186d2..000000000000 --- a/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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/${PN}.git" -EGIT_COMMIT="v${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qt4 qt5 +sdl" -REQUIRED_USE=" - ?? ( qt4 qt5 sdl ) -" - -RDEPEND="" - -DEPEND=" - sys-libs/zlib - 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-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtmultimedia: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 -} - -src_prepare() { - epatch "$FILESDIR"/ppsspp-cmake.patch - epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch - epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch - epatch "$FILESDIR"/ppsspp-qt.patch - 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 -} - -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 -} - -src_install() { - if use qt4 ; then - into /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 - 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 games', then have re-login. " -} diff --git a/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild new file mode 100644 index 000000000000..3e3854ffbe89 --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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/${PN}.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="qt4 qt5 +sdl" +REQUIRED_USE=" + ?? ( qt4 qt5 sdl ) +" + +RDEPEND="" + +DEPEND=" + sys-libs/zlib + 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-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtmultimedia: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 +} + +src_prepare() { + # Bug 574000 + sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die + + epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch + epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch + epatch "$FILESDIR"/ppsspp-qt.patch + + 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 +} + +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 +} + +src_install() { + if use qt4 ; then + into /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 + 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 games', then have re-login. " +} diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild index 86798edd4ef5..a3d3bccdde5d 100644 --- a/games-emulation/ppsspp/ppsspp-9999.ebuild +++ b/games-emulation/ppsspp/ppsspp-9999.ebuild @@ -59,10 +59,13 @@ src_unpack() { } src_prepare() { - epatch "$FILESDIR"/ppsspp-cmake.patch + # Bug 574000 + sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die + epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch epatch "$FILESDIR"/ppsspp-qt.patch + if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_prepare @@ -102,7 +105,7 @@ src_compile() { src_install() { if use qt4 ; then - into /usr/games/bin + exeinto /usr/games/bin newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp elif use qt5 ; then exeinto /usr/games/bin -- cgit v1.2.3-65-gdbad