From 2db43213e5c343995f4b9fb977726fe42ebdac67 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Jan 2023 01:57:18 +0000 Subject: gentoo auto-resync : 27:01:2023 - 01:57:17 --- games-arcade/performous/Manifest | 11 +- .../files/performous-1.1-boost-1.70.patch | 52 ---------- .../files/performous-1.1-boost-1.73.patch | 11 -- .../performous/files/performous-1.1-gentoo.patch | 12 --- .../performous/files/performous-1.1-jpeg-9c.patch | 11 -- .../performous/files/performous-1.1-linguas.patch | 18 ---- .../files/performous-1.1-nomancompress.patch | 59 ----------- .../files/performous-1.1-pango-use-pkgconfig.patch | 113 --------------------- games-arcade/performous/metadata.xml | 1 - games-arcade/performous/performous-1.1-r3.ebuild | 110 -------------------- 10 files changed, 1 insertion(+), 397 deletions(-) delete mode 100644 games-arcade/performous/files/performous-1.1-boost-1.70.patch delete mode 100644 games-arcade/performous/files/performous-1.1-boost-1.73.patch delete mode 100644 games-arcade/performous/files/performous-1.1-gentoo.patch delete mode 100644 games-arcade/performous/files/performous-1.1-jpeg-9c.patch delete mode 100644 games-arcade/performous/files/performous-1.1-linguas.patch delete mode 100644 games-arcade/performous/files/performous-1.1-nomancompress.patch delete mode 100644 games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch delete mode 100644 games-arcade/performous/performous-1.1-r3.ebuild (limited to 'games-arcade/performous') diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest index d2613d06c078..3f137d00de80 100644 --- a/games-arcade/performous/Manifest +++ b/games-arcade/performous/Manifest @@ -1,18 +1,9 @@ -AUX performous-1.1-boost-1.70.patch 1693 BLAKE2B 80c9d9d0f90cd43730ddb1bed8594533a028e06d935e45203a8db1aa448f9af2d8c5a0aa96ca9d1d797aac1075e577ae7ee36dabf424757ca063b6c4c63478c4 SHA512 d6cddff13a981911cbb689f589351782d7bead2fe5d10a4e115302771b1bbc1b80bb678185ae104d6f90d89979bd70c876b7da99fc14010ca3bab3ccf0688515 -AUX performous-1.1-boost-1.73.patch 457 BLAKE2B f6a2848b3d878b77ff87dc536ce0c23db1a3f64df1702528f4ee8735c08473cccd6188d3bcb1da9141991c17a060be3280775f5a466bece487d6e8afc77d9f4a SHA512 d95b3d1f6a9252252feea255417e6fe5ff0ff0ed79fa9eaa906b6f5bff5fecc298090c6a67d2e71fde1fab5a7c67bc40393bfb5fac026cf1229d46e58995b2e4 -AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338 -AUX performous-1.1-jpeg-9c.patch 591 BLAKE2B 72aac804251366cbaa97c34cdcf9c87d55321059feba00fdc691f7134d9dd47ebf2396072329880bacd6d8e21c3697a2912e93469ba0c98049c0bab0c89622b7 SHA512 1952b59638ed5c0a20f1f4aa9abfd8fce98b7f39d597716c7901593c60fe7efa077ff93a0ad307febf1ac0b3aa88d74559899d511a137a62a77741fd421cfb61 -AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597 -AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9 -AUX performous-1.1-pango-use-pkgconfig.patch 3594 BLAKE2B 7944704c25c03ecc94c699dd37f202c5d015d80726fe8ac964bf35f7cee2d1c410d8ccbdcb83f3fba659ff4d742647d0c6cebafe466551d4fb00d5ed2a1455c7 SHA512 afe353247fbd8c58b7aa9b7a7bf24477c90470dd47db3c019421b91c1e3ba29c0620eb3bd4dc38206a6dd6067033109a42e1131eb50c7b55294e8ad4680b2771 AUX performous-1.2.0-ffmpeg5.patch 1000 BLAKE2B 50eefb89771457ef5e8ec67487d179c6114ddcfdf2d33dd60c6577ccefb832222539e7e8eb733285aed3ac9071025cd72aab885252d02e96a40fadde9f434d81 SHA512 044202b1ae8461da1bc999449890aa81ea5235b5c6aa89dd902b9d5a44fc822deb083903239dbf874fe83d7ff0f74dd8f8dca74051e2e041135de7a1ec5fe662 -DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1 DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56 DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b -EBUILD performous-1.1-r3.ebuild 2448 BLAKE2B 26e121e367340e5ab21705128a474a3e26eece244dbb2ca13a9ffbb43833418f5da00f1ede30bbfe658c7cbe76842668bc0dcdb6ebca0ea7bfe552cb423da372 SHA512 ad13a021eaba62d5f5e5425401d0548e7ea7490e75ef47ec06d2ab91fc781a0f0eeeb8c22b3b359dac9586c6f4926c0d690df424a6d11943df8060f2b365f852 EBUILD performous-1.2.0.ebuild 2542 BLAKE2B de6478d3a078906e258dfdc34bc6bf95da197f58b263f00e8d1db54817aefaff669bf8d1c65262098273d26a25a8bb04cc68ee6612c83e575c3413f80ffb2398 SHA512 00233aa5b60869dca91ff5c3b20ec96cefde47c165424c9023e39cd38fcb8626cef30579267191c91e70d4e00b5a1b7159ae19248196cb287b2537d211923480 -MISC metadata.xml 857 BLAKE2B e7316ca1dcec3ae5e0bcc55434ea9a004dbdda2c9595cfa0645bbd505824155ee2383d1d3d53d72eb0facc90573330cc27a381e65eed56557076db6b647cca32 SHA512 aa2e6a0da467eeb23563983e177427a19fed5da772d637ec6882201d3a848517a8453fefd8eddadaf205dabe1fb44284ab3c0d229fb14eb1ae678cbb23236ca1 +MISC metadata.xml 755 BLAKE2B a0d219e30adbcfa6a2a7a29cd7ffcb7eec20354398218d584f4c3a529c39cfcf33cf60811658c3ede6c4f4412b90bfe80257597d3f528df0fc52fdf5e4933d47 SHA512 c66e25e1fb7430c231e8d807a40e30fb917b425b1337c607a85aa859820267fceaaf6bbe5b93867dc8aaf8c05fe11049f0b9cfdf55452f7750693859f5d331df diff --git a/games-arcade/performous/files/performous-1.1-boost-1.70.patch b/games-arcade/performous/files/performous-1.1-boost-1.70.patch deleted file mode 100644 index d868e1279659..000000000000 --- a/games-arcade/performous/files/performous-1.1-boost-1.70.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://bugs.gentoo.org/671594 - ---- a/game/audio.cc -+++ b/game/audio.cc -@@ -77,7 +77,7 @@ - static ptime getTime() { return microsec_clock::universal_time(); } - // Conversion helpers - static double getSeconds(time_duration t) { return 1e-6 * t.total_microseconds(); } -- static time_duration getDuration(double seconds) { return microseconds(1e6 * seconds); } -+ static time_duration getDuration(double seconds) { return microseconds(static_cast(1e6 * seconds)); } - - mutable boost::mutex m_mutex; - ptime m_baseTime; ///< A reference time (corresponds to m_basePos) -@@ -149,7 +149,7 @@ - int64_t m_pos; ///< Current sample position - bool m_preview; - AudioClock m_clock; -- time_duration durationOf(int64_t samples) const { return microseconds(1e6 * samples / srate / 2.0); } -+ time_duration durationOf(int64_t samples) const { return microseconds(static_cast(1e6 * samples / srate / 2.0)); } - public: - bool suppressCenterChannel; - double fadeLevel; ---- a/game/backgrounds.hh -+++ b/game/backgrounds.hh -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - - /// songs class for songs screen ---- a/game/songs.hh -+++ b/game/songs.hh -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/game/svg.cc -+++ b/game/svg.cc -@@ -4,6 +4,7 @@ - #include "configuration.hh" - #include "../common/image.hh" - -+#include - #include - #include - diff --git a/games-arcade/performous/files/performous-1.1-boost-1.73.patch b/games-arcade/performous/files/performous-1.1-boost-1.73.patch deleted file mode 100644 index 3d7147a5170f..000000000000 --- a/games-arcade/performous/files/performous-1.1-boost-1.73.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/game/surface.cc 2021-01-18 14:22:05.876604740 +0300 -+++ b/game/surface.cc 2021-01-18 14:23:08.908716258 +0300 -@@ -135,7 +135,7 @@ - bitmap.resize(1, 1); - target->load(bitmap); - // Ask the loader to retrieve the image -- ldr->push(target, Job(name, boost::bind(&T::load, target, _1))); -+ ldr->push(target, Job(name, boost::bind(&T::load, target, boost::placeholders::_1))); - } - - Surface::Surface(fs::path const& filename) { loader(this, filename); } diff --git a/games-arcade/performous/files/performous-1.1-gentoo.patch b/games-arcade/performous/files/performous-1.1-gentoo.patch deleted file mode 100644 index a73663a88c41..000000000000 --- a/games-arcade/performous/files/performous-1.1-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt ---- performous-1.0.orig/game/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400 -@@ -141,7 +141,7 @@ - set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin subfolder. - set(SUBSYSTEM_WIN32 WIN32) - else() -- set(BIN_INSTALL bin) -+ set(BIN_INSTALL @GENTOO_BINDIR@) - endif() - - # Build main executable diff --git a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch deleted file mode 100644 index d878cec07f51..000000000000 --- a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/image.cc -+++ b/common/image.cc -@@ -180,7 +180,7 @@ - } - jpeg_create_decompress(&cinfo); - jpeg_mem_src(&cinfo, data.data(), data.size()); -- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); -+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); - jpeg_start_decompress(&cinfo); - bitmap.resize(cinfo.output_width, cinfo.output_height); - unsigned stride = (bitmap.width * 3 + 3) & ~3; // Number of bytes per row (word-aligned) diff --git a/games-arcade/performous/files/performous-1.1-linguas.patch b/games-arcade/performous/files/performous-1.1-linguas.patch deleted file mode 100644 index f8f1349ea3b9..000000000000 --- a/games-arcade/performous/files/performous-1.1-linguas.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt ---- performous-1.0.orig/lang/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500 -@@ -9,5 +9,13 @@ - file(MAKE_DIRECTORY "${mobuild}") - add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM) - add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make sure the mofiles are always built -- install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES") - endforeach(language) -+foreach(language $ENV{LINGUAS}) -+ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) -+ if (EXISTS ${pofile}) -+ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo) -+ install(FILES ${mofile} DESTINATION -+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo) -+ endif() -+endforeach(language) -+ diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch b/games-arcade/performous/files/performous-1.1-nomancompress.patch deleted file mode 100644 index fd21f9b70343..000000000000 --- a/games-arcade/performous/files/performous-1.1-nomancompress.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/docs/man/CMakeLists.txt 2018-10-14 19:57:14.924572577 +0200 -+++ b/docs/man/CMakeLists.txt 2018-10-14 20:11:13.250717230 +0200 -@@ -1,14 +1,12 @@ - find_program(HELP2MAN help2man DOC "Location of the help2man program") --find_program(GZIP gzip DOC "Location of the gzip program") - mark_as_advanced(HELP2MAN) --mark_as_advanced(GZIP) --if(HELP2MAN AND GZIP) -- set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz) -+if(HELP2MAN) -+ set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6) - set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m) - set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous) - add_custom_command( - OUTPUT ${MANFILE} -- COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE} -+ COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N > ${MANFILE} - MAIN_DEPENDENCY ${H2MFILE} - DEPENDS ${PERFORMOUS_EXEC} - COMMENT "Building Performous man page" -@@ -17,13 +15,13 @@ - add_custom_target(manpage ALL DEPENDS ${MANFILE}) - iF (APPLE) - install(FILES ${MANFILE} DESTINATION Resources/man/man6) -- else(APPLE) -+ else() - install(FILES ${MANFILE} DESTINATION share/man/man6) - endif() --else(HELP2MAN AND GZIP) -- message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated") --endif(HELP2MAN AND GZIP) --if(ENABLE_TOOLS AND GZIP) -+else() -+ message("WARNING: help2man is missing; performous man page will not be generated") -+endif() -+if(ENABLE_TOOLS) - set(TOOLS - "ss_pak_extract" "ss_extract" "ss_cover_conv" - "ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode" -@@ -31,15 +29,7 @@ - set(MAN_SECTION "1") - foreach(TOOL ${TOOLS}) - set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION}) -- set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz) -- add_custom_command( -- OUTPUT ${TOOL_MANFILE_GZ} -- COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ} -- MAIN_DEPENDENCY ${TOOL_MANFILE} -- COMMENT "Building ${TOOL} man page" -- VERBATIM -- ) -- add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE_GZ}) -- install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man${MAN_SECTION}) -- endforeach(TOOL) --endif(ENABLE_TOOLS AND GZIP) -+ add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE}) -+ install(FILES ${TOOL_MANFILE} DESTINATION share/man/man${MAN_SECTION}) -+ endforeach() -+endif() diff --git a/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch b/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch deleted file mode 100644 index 9019183206d6..000000000000 --- a/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch +++ /dev/null @@ -1,113 +0,0 @@ -From caea553262e1d40bf9caec84223b5d25989464c0 Mon Sep 17 00:00:00 2001 -From: Orivej Desh -Date: Wed, 25 Mar 2020 14:17:06 +0000 -Subject: [PATCH] Rely on pkg-config to find Pango - -Fixes build with pango that needs -I/usr/include/harfbuzz (as specified in its -pkg config). - -PkgConfig results can be overridded by setting e.g. Pango_PKGCONF_INCLUDEDIR, -Pango_PKGCONF_LDFLAGS (see FindPkgConfig documentation). - -IMPORTED_TARGET was added in CMake 3.6. - -Fixes #490 -Closes #493 ---- - CMakeLists.txt | 2 +- - cmake/Modules/FindPango.cmake | 25 ++--------------------- - cmake/Modules/FindPangoCairo.cmake | 32 ++++-------------------------- - 3 files changed, 7 insertions(+), 52 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6e72942d..ca7ae4e92 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.6) - project(Performous CXX C) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -diff --git a/cmake/Modules/FindPango.cmake b/cmake/Modules/FindPango.cmake -index bdddb9e03..42cb199cc 100644 ---- a/cmake/Modules/FindPango.cmake -+++ b/cmake/Modules/FindPango.cmake -@@ -2,31 +2,10 @@ - # Once done, this will define - # - # Pango_FOUND - system has Pango --# Pango_INCLUDE_DIRS - the Pango include directories - # Pango_LIBRARIES - link these to use Pango - - include(LibFindMacros) - --# Dependencies --libfind_package(Pango Freetype) --libfind_package(Pango Glib) --libfind_package(Pango GObject) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(Pango_PKGCONF pango) -- --# Include dir --find_path(Pango_INCLUDE_DIR -- NAMES pango/pango.h -- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 --) -- --# Finally the library itself --find_library(Pango_LIBRARY -- NAMES pango-1.0 -- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} --) -- -+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) -+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) - libfind_process(Pango) -- -diff --git a/cmake/Modules/FindPangoCairo.cmake b/cmake/Modules/FindPangoCairo.cmake -index a26f83bd0..1c1a9e843 100644 ---- a/cmake/Modules/FindPangoCairo.cmake -+++ b/cmake/Modules/FindPangoCairo.cmake -@@ -1,35 +1,11 @@ - # - Try to find PangoCairo - # Once done, this will define - # --# PangoCairo_FOUND - system has Pango --# PangoCairo_INCLUDE_DIRS - the Pango include directories --# PangoCairo_LIBRARIES - link these to use Pango -+# PangoCairo_FOUND - system has PangoCairo -+# PangoCairo_LIBRARIES - link these to use PangoCairo - - include(LibFindMacros) - --# Dependencies --libfind_package(PangoCairo Pango) --libfind_package(PangoCairo Cairo) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) -- --# Include dir --find_path(PangoCairo_INCLUDE_DIR -- NAMES pango/pangocairo.h -- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 --) -- --# Finally the library itself --find_library(PangoCairo_LIBRARY -- NAMES pangocairo-1.0 -- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} --) -- --# Set the include dir variables and the libraries and let libfind_process do the rest. --# NOTE: Singular variables for this library, plural for libraries this this lib depends on. --set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) --set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) -+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) -+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) - libfind_process(PangoCairo) -- diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml index 2696a7ec7172..b6be9a656e3d 100644 --- a/games-arcade/performous/metadata.xml +++ b/games-arcade/performous/metadata.xml @@ -11,7 +11,6 @@ Enable MIDI I/O support Install a few demo songs - Enable building of song extraction utilities for SingStar and Guitar Hero Enable Webcam support diff --git a/games-arcade/performous/performous-1.1-r3.ebuild b/games-arcade/performous/performous-1.1-r3.ebuild deleted file mode 100644 index 554820c1b01d..000000000000 --- a/games-arcade/performous/performous-1.1-r3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_REMOVE_MODULES_LIST=( FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ ) -inherit cmake desktop xdg-utils - -DESCRIPTION="SingStar GPL clone" -HOMEPAGE="https://performous.org/" - -SONGS_PN="ultrastar-songs" -SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz - songs? ( - mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip - mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip - mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip - mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip - ) -" - -LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="midi songs tools webcam" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/libxmlpp:2.6 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/libxml2:2 - gnome-base/librsvg:2 - media-gfx/imagemagick:0= - media-libs/libepoxy - media-libs/libpng:0= - media-libs/libsdl2[joystick,video] - media-libs/portaudio - sys-libs/zlib - media-video/ffmpeg - virtual/glu - virtual/jpeg:0 - virtual/libintl - virtual/opengl - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - midi? ( media-libs/portmidi ) - webcam? ( media-libs/opencv ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/help2man - sys-devel/gettext - songs? ( app-arch/unzip ) -" - -DOCS=( docs/{Authors,instruments}.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-linguas.patch - "${FILESDIR}"/${P}-nomancompress.patch - "${FILESDIR}"/${P}-jpeg-9c.patch - "${FILESDIR}"/${P}-boost-1.70.patch - "${FILESDIR}"/${P}-boost-1.73.patch - "${FILESDIR}"/${P}-pango-use-pkgconfig.patch -) - -src_prepare() { - cmake_src_prepare - - sed -i \ - -e "s:@GENTOO_BINDIR@:/usr/bin:" \ - -e '/ Z /s/ Z/ ZLIB/g' \ - -e 's/Z_FOUND/ZLIB_FOUND/g' \ - -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \ - -e 's/Jpeg/JPEG/' \ - -e 's/Png/PNG/' \ - {game,tools}/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_TOOLS=$(usex tools) - -DENABLE_WEBCAM=$(usex webcam) - -DENABLE_MIDI=$(usex midi) - -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DSHARE_INSTALL="/usr/share/${PN}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - if use songs ; then - insinto "/usr/share/${PN}" - doins -r "${WORKDIR}/songs" - fi - - newicon -s scalable data/themes/default/icon.svg ${PN}.svg -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3