commit: 4ba65c77c2b3dd7e4ca4554516ffe3f48bc78d83 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Tue Jan 10 12:28:20 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Jan 24 10:01:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba65c77
app-emulation/punes: drop 0.107, 0.109-r1 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29042 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-emulation/punes/Manifest | 3 - .../punes/files/punes-0.107_ffmpeg-configure.patch | 27 --------- .../punes/files/punes-0.109_ldflags.patch | 33 ----------- app-emulation/punes/punes-0.107.ebuild | 64 -------------------- app-emulation/punes/punes-0.109-r1.ebuild | 69 ---------------------- 5 files changed, 196 deletions(-) diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest index 2efb7fac9f3e..bd94310ac9e8 100644 --- a/app-emulation/punes/Manifest +++ b/app-emulation/punes/Manifest @@ -1,4 +1 @@ -DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd -DIST punes-0.109.tar.gz 48695769 BLAKE2B cc5a86b2f99dc3c97bc04386568fcb926d2a9c83f8c6dcaf28c022a136791ff481610ad578c996c643e0c0b107acb2be9a0fbfda0950435aad984f3506ec1983 SHA512 13cf3587c9936ff9f933d3394516d25fbd664fc2fd510af724c3bbbc6fefb12a019e8fe27cd52cd326ef8fba3721f4e1816ce5d3f3935f701081a142f04a3bc2 -DIST punes-0.109_musl.patch.xz 5520 BLAKE2B ea1c36d510303dd67b7e2005a3f099e328583c9762f74ccf9457a5f04268c44243b4fe18fc6498c176a999318f40c9a34ca2a3ed7de2d4dea953ab055901ad42 SHA512 507163d40849bbf782725f71409432a0cb4a79f5c3fccfaf78786322539a1bce0608b731a75c817b72f8a4e814d0cb21019cb23f621176042fb946754a4a9292 DIST punes-0.110.tar.gz 49500935 BLAKE2B c4704ad6edc828f6332798e44939dc82e86fb0fed1d7a71e3377c7bb384a7fc40d2b9303dff13b1e92cf4bb189a5c4816c5c6ec2f2db1ab1c5d58d459b6c1ed9 SHA512 e0f503ac8c0cd0257eebb1401a6cf5045d03e348a5f915574b47c15930c029c93e36f5776c1364b7c7b6a27faa48a36173c4fd0342f24e9a3241ebd5e0a9d137 diff --git a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch deleted file mode 100644 index fd70e0d49ef0..000000000000 --- a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 241b71fdacad10ad1e790e5a4e380ea1ffbe8a93 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" <[email protected]> -Date: Thu, 21 Jan 2021 12:32:31 +0300 -Subject: [PATCH] Fix ffmpeg configure switch option - -autoconf's --with-PACKAGE/--without-PACKAGE requires $withval, not -$enableval. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fd9e0365..f63d50ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,7 +38,7 @@ AC_ARG_WITH([ffmpeg], - AS_HELP_STRING([--with-ffmpeg], - [Build with support for FFmpeg [autodetect] @<:@default: yes@:>@] - ), -- [with_ffmpeg=$enableval], [with_ffmpeg=yes]) -+ [with_ffmpeg=$withval], [with_ffmpeg=yes]) - - AC_ARG_ENABLE([release], - AS_HELP_STRING([--disable-release], --- -2.26.2 - diff --git a/app-emulation/punes/files/punes-0.109_ldflags.patch b/app-emulation/punes/files/punes-0.109_ldflags.patch deleted file mode 100644 index ada9b28f137b..000000000000 --- a/app-emulation/punes/files/punes-0.109_ldflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/punesemu/puNES/commit/b79efed1b6e350076ea7a459dafd6c2f995bcb51 - -From b79efed1b6e350076ea7a459dafd6c2f995bcb51 Mon Sep 17 00:00:00 2001 -From: fhorse <[email protected]> -Date: Tue, 7 Jun 2022 09:16:59 +0200 -Subject: [PATCH] https://github.com/punesemu/puNES/issues/213 - -This commit allows compilation with Flatpak's build tools. ---- - src/extra/lib7zip-53abfeb/configure | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/extra/lib7zip-53abfeb/configure b/src/extra/lib7zip-53abfeb/configure -index ca28ab144..504c02f6e 100755 ---- a/src/extra/lib7zip-53abfeb/configure -+++ b/src/extra/lib7zip-53abfeb/configure -@@ -344,11 +344,11 @@ fi - - # Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we - # need to parse it here. --if [ "x${LDFLAGS}" != "x" ]; then -- for varname in EXE MODULE SHARED STATIC; do -- CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")" -- done --fi -+#if [ "x${LDFLAGS}" != "x" ]; then -+# for varname in EXE MODULE SHARED STATIC; do -+# CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")" -+# done -+#fi - - #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS} - #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS} diff --git a/app-emulation/punes/punes-0.107.ebuild b/app-emulation/punes/punes-0.107.ebuild deleted file mode 100644 index db719a74f5f9..000000000000 --- a/app-emulation/punes/punes-0.107.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg-utils - -DESCRIPTION="Nintendo Entertainment System (NES) emulator" -HOMEPAGE="https://github.com/punesemu/puNES"; -SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cg ffmpeg" - -RDEPEND=" - ffmpeg? ( media-video/ffmpeg:= ) - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - virtual/glu - virtual/opengl" -DEPEND="${RDEPEND}" -BDEPEND=" - cg? ( media-gfx/nvidia-cg-toolkit ) - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -S="${WORKDIR}/puNES-${PV}" - -PATCHES=( - "${FILESDIR}/${P}_ffmpeg-configure.patch" -) - -src_prepare() { - default - - sed -i "/update-desktop-database/d" misc/Makefile.am || die - eautoreconf - # FIXME why eautoreconf can't handle this? - cd "src/extra/lib7zip-1.6.5" || die - eautoreconf -} - -src_configure() { - econf \ - $(use_with cg opengl-nvidia-cg) \ - $(use_with ffmpeg) -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-emulation/punes/punes-0.109-r1.ebuild b/app-emulation/punes/punes-0.109-r1.ebuild deleted file mode 100644 index f4591cbe10f9..000000000000 --- a/app-emulation/punes/punes-0.109-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs xdg - -DESCRIPTION="Nintendo Entertainment System (NES) emulator" -HOMEPAGE="https://github.com/punesemu/puNES"; -SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}_musl.patch.xz"; -S="${WORKDIR}/puNES-${PV}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cg ffmpeg" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - media-libs/libglvnd[X] - virtual/glu - virtual/udev - x11-libs/libX11 - x11-libs/libXrandr - cg? ( media-gfx/nvidia-cg-toolkit ) - ffmpeg? ( media-video/ffmpeg:= )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - dev-qt/linguist-tools:5 - dev-util/cmake - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}_ldflags.patch - "${WORKDIR}"/${P}_musl.patch # 830471 -) - -src_prepare() { - default - - # empty CMAKE_ARGS to avoid double CHOST (bug #877089), and also unused - # options (QA notices), use sed to avoid rebases because of the directory - sed -e '/x${DEBUG_VERSION}/i\CMAKE_ARGS=' \ - -i src/extra/lib7zip-*/configure || die - tc-export CC CXX - - # src/extra/lib7zip is not autotools, but - # is contained within AC_CONFIG_SUBDIRS - AT_NO_RECURSIVE=1 eautoreconf - cd src/extra/xdelta-3.1.0 || die - eautoreconf -} - -src_configure() { - local econfargs=( - $(use_with cg opengl-nvidia-cg) - $(use_with ffmpeg) - ) - - econf "${econfargs[@]}" -}
