From 76de7b7fd59422898dd599f7dba5817e9023732a Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 7 Feb 2016 10:50:18 +0000 Subject: [PATCH] games-emulation/ppsspp: Remove bogus patch. Fix install directory (typo). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 --- .../ppsspp/files/ppsspp-cmake.patch | 32 ------------------- ...1.1.1-r1.ebuild => ppsspp-1.1.0-r2.ebuild} | 7 ++-- ...1.1.0-r1.ebuild => ppsspp-1.1.1-r2.ebuild} | 5 ++- games-emulation/ppsspp/ppsspp-9999.ebuild | 7 ++-- 4 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 games-emulation/ppsspp/files/ppsspp-cmake.patch rename games-emulation/ppsspp/{ppsspp-1.1.1-r1.ebuild => ppsspp-1.1.0-r2.ebuild} (96%) rename games-emulation/ppsspp/{ppsspp-1.1.0-r1.ebuild => ppsspp-1.1.1-r2.ebuild} (97%) 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.1-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild similarity index 96% rename from games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild rename to games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild index 19baa10186d2..4d8db28fecf2 100644 --- a/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild @@ -60,10 +60,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 @@ -103,7 +106,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 diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild similarity index 97% rename from games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild rename to games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild index 19baa10186d2..3e3854ffbe89 100644 --- a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild @@ -60,10 +60,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 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 -- 2.26.2