* [gentoo-commits] repo/gentoo:master commit in: app-emulation/punes/, app-emulation/punes/files/
@ 2018-08-21 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 11bf57252b7949aa5b363677c87cbde9da466728
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Aug 21 20:20:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 21:23:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bf5725
app-emulation/punes: Fix compilation with Qt 5.11
Thanks-to: Fabio Cavallo <fhorse <AT> libero.it>
Closes: https://bugs.gentoo.org/661524
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9656
.../punes/files/punes-0.102-qt-5.11-fix.patch | 21 +++++++++++++++++++++
app-emulation/punes/punes-0.102.ebuild | 2 ++
2 files changed, 23 insertions(+)
diff --git a/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch b/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch
new file mode 100644
index 00000000000..1ac5ccafab0
--- /dev/null
+++ b/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch
@@ -0,0 +1,21 @@
+From 46620c32ff37a7968c977e4b3cde8d601807702c Mon Sep 17 00:00:00 2001
+From: fhorse <punes.development@gmail.com>
+Date: Sun, 15 Jul 2018 13:30:15 +0200
+Subject: [PATCH] Corretto errore di compilazione con le Qt5.
+
+---
+ src/gui/dlgCheats.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/dlgCheats.cpp b/src/gui/dlgCheats.cpp
+index 9ff904d2..b7c6c52a 100644
+--- a/src/gui/dlgCheats.cpp
++++ b/src/gui/dlgCheats.cpp
+@@ -25,6 +25,7 @@
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QCheckBox>
+ #include <QtWidgets/QFileDialog>
++#include <QtWidgets/QButtonGroup>
+ #endif
+ #include "dlgCheats.moc"
+ #include "mainWindow.hpp"
diff --git a/app-emulation/punes/punes-0.102.ebuild b/app-emulation/punes/punes-0.102.ebuild
index cb13a854923..92b1d19b10d 100644
--- a/app-emulation/punes/punes-0.102.ebuild
+++ b/app-emulation/punes/punes-0.102.ebuild
@@ -28,6 +28,8 @@ DEPEND="
S="${WORKDIR}/puNES-${PV}"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11-fix.patch" )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/punes/, app-emulation/punes/files/
@ 2019-03-11 10:13 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2019-03-11 10:13 UTC (permalink / raw
To: gentoo-commits
commit: f61ca6de9088588c4014381ac50b93f4fd5862b3
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Mar 3 15:23:26 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 10:13:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61ca6de
app-emulation/punes: remove old.
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
app-emulation/punes/Manifest | 1 -
.../punes/files/punes-0.102-qt-5.11-fix.patch | 21 ---------
app-emulation/punes/punes-0.102.ebuild | 55 ----------------------
3 files changed, 77 deletions(-)
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 146ce82d356..8dc1779acd5 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,2 +1 @@
-DIST punes-0.102.tar.gz 4670534 BLAKE2B 04576110e4fcd9aeaa3dfb6812ab7a21305200c82651be00defcb59b91374b155b279818f2e09d217841aa8567c41e06067252538fb68b7b907d5ab29b02c678 SHA512 dff95b25f64ed03060b6dd187d7a283acfddb6bea4168df5be4d309bd6aabdcaa5d0ea0312d0824205bf134cd0ddabf014e82a81c8a901a59258475ec24bd394
DIST punes-0.103.tar.gz 5366838 BLAKE2B cb4a9a1336293891e06d573f68c52962e79220e7024fad716a957f5423a72703a34efc3fb6129dbe9ffde2c96fe7abd2a1ad4a622aaca89e90f6a2d5af8c1a53 SHA512 db0fbc075b9fd46be8013b17c03fd7abd12b209ce166557c83283c917e53224712ba5838cd8b9e7fad3d21271f29e475460996dd9800b9f759602e289bad4205
diff --git a/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch b/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch
deleted file mode 100644
index 1ac5ccafab0..00000000000
--- a/app-emulation/punes/files/punes-0.102-qt-5.11-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 46620c32ff37a7968c977e4b3cde8d601807702c Mon Sep 17 00:00:00 2001
-From: fhorse <punes.development@gmail.com>
-Date: Sun, 15 Jul 2018 13:30:15 +0200
-Subject: [PATCH] Corretto errore di compilazione con le Qt5.
-
----
- src/gui/dlgCheats.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/dlgCheats.cpp b/src/gui/dlgCheats.cpp
-index 9ff904d2..b7c6c52a 100644
---- a/src/gui/dlgCheats.cpp
-+++ b/src/gui/dlgCheats.cpp
-@@ -25,6 +25,7 @@
- #include <QtWidgets/QMessageBox>
- #include <QtWidgets/QCheckBox>
- #include <QtWidgets/QFileDialog>
-+#include <QtWidgets/QButtonGroup>
- #endif
- #include "dlgCheats.moc"
- #include "mainWindow.hpp"
diff --git a/app-emulation/punes/punes-0.102.ebuild b/app-emulation/punes/punes-0.102.ebuild
deleted file mode 100644
index 92b1d19b10d..00000000000
--- a/app-emulation/punes/punes-0.102.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- cg? ( media-gfx/nvidia-cg-toolkit )
- media-libs/alsa-lib
- media-libs/libsdl[opengl]
- virtual/opengl"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/puNES-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11-fix.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 \
- --enable-qt5 \
- $(use_with cg opengl-nvidia-cg)
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/punes/, app-emulation/punes/files/
@ 2021-02-02 13:08 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-02-02 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 49379b99eb646946f88437cdb56f30644e164516
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Jan 21 09:40:29 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 12:29:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49379b99
app-emulation/punes: update to 0.107
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/punes/Manifest | 1 +
.../punes/files/punes-0.107_ffmpeg-configure.patch | 27 +++++++++
app-emulation/punes/punes-0.107.ebuild | 64 ++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 44c8a05db29..a7985c2b638 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1 +1,2 @@
DIST punes-0.106.tar.gz 5595484 BLAKE2B aa3bb5c869e679b19829a3d1de970517d6d626e0ed2404a9ed09d16af8fabb1ee3258ec8fbb4027fb6b70b5449b2bb7ac6880f43c3ba846687c65d8a0eeaf3f2 SHA512 f35c5cee05464cb11f130938cf7aa519d4dea35dbf52ce3606c3c6bb2596bc59b75e11816a5b44c7b1c9d402a299b4db49727087b4c93c3cb2ba473adfdd4fa2
+DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
diff --git a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch
new file mode 100644
index 00000000000..fd70e0d49ef
--- /dev/null
+++ b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch
@@ -0,0 +1,27 @@
+From 241b71fdacad10ad1e790e5a4e380ea1ffbe8a93 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+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/punes-0.107.ebuild b/app-emulation/punes/punes-0.107.ebuild
new file mode 100644
index 00000000000..db719a74f5f
--- /dev/null
+++ b/app-emulation/punes/punes-0.107.ebuild
@@ -0,0 +1,64 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-02 13:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-02 13:08 [gentoo-commits] repo/gentoo:master commit in: app-emulation/punes/, app-emulation/punes/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-03-11 10:13 Patrice Clement
2018-08-21 21:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox