* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2018-01-23 9:35 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2018-01-23 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 622178a43687a38321af43de225f6faa236e6445
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 09:35:31 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 09:35:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622178a4
games-emulation/snes9x: Fix broken build system
Closes: https://bugs.gentoo.org/645330
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../snes9x/files/snes9x-1.55-build-system.patch | 63 ++++++++++++++++++++++
games-emulation/snes9x/snes9x-1.55.ebuild | 5 +-
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
new file mode 100644
index 00000000000..30811ef421e
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
@@ -0,0 +1,63 @@
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -33,7 +33,7 @@
+
+ AM_GLIB_GNU_GETTEXT
+
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
++snes9xlocaledir='$(localedir)'
+ AC_SUBST(snes9xlocaledir)
+
+ AC_ARG_WITH(debug,
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -56,49 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+- [AS_HELP_STRING([--enable-debug],
+- [leave debug information in the final binary (default: no)])],
+- [], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+- AC_S9X_COMPILER_FLAG([-g], [g])
+- AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+- AC_S9X_COMPILER_FLAG([-O3], [o3], [
+- AC_S9X_COMPILER_FLAG([-O2], [o2], [
+- AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+- [AS_HELP_STRING([--enable-mtune],
+- [use the specified value for the -mtune/-mcpu flag (default: no)])],
+- [], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+- [
+- AC_MSG_WARN([-mtune failed, trying -mcpu...])
+- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+- ])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild
index cf70b572d8c..ba25e25b642 100644
--- a/games-emulation/snes9x/snes9x-1.55.ebuild
+++ b/games-emulation/snes9x/snes9x-1.55.ebuild
@@ -40,7 +40,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}/unix"
-PATCHES=( "${FILESDIR}"/${PN}-1.53-cross-compile.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.53-cross-compile.patch
+ "${FILESDIR}"/${PN}-1.55-build-system.patch
+)
src_prepare() {
cd "${WORKDIR}"/${P} || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2018-12-23 11:25 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-12-23 11:25 UTC (permalink / raw
To: gentoo-commits
commit: d62bbe838e6e499044cdd8aeeca85d36f6574846
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 11:07:36 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 11:25:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62bbe83
games-emulation/snes9x: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
games-emulation/snes9x/Manifest | 1 -
.../snes9x/files/snes9x-1.55-build-system.patch | 63 ----------
games-emulation/snes9x/snes9x-1.56.ebuild | 137 ---------------------
3 files changed, 201 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 25c7726bab9..0e2e1b50958 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,3 +1,2 @@
-DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
deleted file mode 100644
index 30811ef421e..00000000000
--- a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -33,7 +33,7 @@
-
- AM_GLIB_GNU_GETTEXT
-
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
-+snes9xlocaledir='$(localedir)'
- AC_SUBST(snes9xlocaledir)
-
- AC_ARG_WITH(debug,
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -56,49 +56,6 @@
- # *** Execution begins here ***
- # *****************************
-
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
-- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
-- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
-- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
-- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
-- [AS_HELP_STRING([--enable-debug],
-- [leave debug information in the final binary (default: no)])],
-- [], [enable_debug="no"])
--
--if test "x$enable_debug" = "xyes"; then
-- AC_S9X_COMPILER_FLAG([-g], [g])
-- AC_S9X_COMPILER_FLAG([-O0], [o0])
--else
-- AC_S9X_COMPILER_FLAG([-O3], [o3], [
-- AC_S9X_COMPILER_FLAG([-O2], [o2], [
-- AC_S9X_COMPILER_FLAG([-O1], [o1])])])
-- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
--fi
--
--AC_ARG_ENABLE([mtune],
-- [AS_HELP_STRING([--enable-mtune],
-- [use the specified value for the -mtune/-mcpu flag (default: no)])],
-- [], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
-- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
-- [
-- AC_MSG_WARN([-mtune failed, trying -mcpu...])
-- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
-- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
-- ])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
diff --git a/games-emulation/snes9x/snes9x-1.56.ebuild b/games-emulation/snes9x/snes9x-1.56.ebuild
deleted file mode 100644
index 652a1c85921..00000000000
--- a/games-emulation/snes9x/snes9x-1.56.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic gnome2-utils xdg-utils
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x"
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio xinerama +xv"
-RESTRICT="bindist"
-
-RDEPEND="
- sys-libs/zlib:=[minizip]
- x11-libs/libX11
- x11-libs/libXext
- png? ( media-libs/libpng:0= )
- gtk? (
- dev-libs/glib:2
- dev-libs/libxml2
- >=x11-libs/gtk+-3.0:3
- x11-libs/libXrandr
- x11-misc/xdg-utils
- alsa? ( media-libs/alsa-lib )
- joystick? ( media-libs/libsdl2[joystick] )
- opengl? (
- media-libs/libepoxy
- virtual/opengl
- )
- portaudio? ( >=media-libs/portaudio-19_pre )
- pulseaudio? ( media-sound/pulseaudio )
- xv? ( x11-libs/libXv )
- )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.53-cross-compile.patch
- "${FILESDIR}"/${PN}-1.56-build-system.patch
-)
-
-src_prepare() {
- cd "${WORKDIR}"/${P} || die
- rm -r unzip || die
- default
- cd unix || die
- eautoreconf
- if use gtk; then
- cd ../gtk || die
- eautoreconf
- fi
-}
-
-src_configure() {
- append-ldflags -Wl,-z,noexecstack
-
- # build breaks when zlib/zip support is disabled
- local myeconfargs=(
- --enable-gzip
- --enable-zip
- --with-system-zip
- $(use_enable joystick gamepad)
- $(use_enable debug debugger)
- $(use_enable netplay)
- $(use_enable png screenshot)
- $(use_enable xinerama)
- )
- econf "${myeconfargs[@]}"
-
- if use gtk; then
- cd ../gtk || die
- myeconfargs=(
- --with-gtk3
- --with-zlib
- --with-system-zip
- --without-gtk2
- $(use_enable nls)
- $(use_with opengl)
- $(use_with joystick)
- $(use_with xv)
- $(use_with netplay)
- $(use_with alsa)
- $(use_with oss)
- $(use_with pulseaudio)
- $(use_with portaudio)
- $(use_with png screenshot)
- )
- econf "${myeconfargs[@]}"
- fi
-}
-
-src_compile() {
- emake
- use gtk && emake -C ../gtk
-}
-
-src_install() {
- dobin ${PN}
-
- dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
-
- if use gtk; then
- emake -C ../gtk DESTDIR="${D}" install
- dodoc ../gtk/{AUTHORS,doc/README}
- fi
-
- docinto html
- dodoc {.,..}/docs/*.html
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use gtk ; then
- gnome2_icon_cache_update
- xdg_desktop_database_update
- fi
-}
-
-pkg_postrm() {
- if use gtk ; then
- gnome2_icon_cache_update
- xdg_desktop_database_update
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2019-01-04 17:40 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2019-01-04 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 92170680370d7c953241845837d0d6c7daa36e35
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 17:39:43 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 17:39:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92170680
games-emulation/snes9x: Fixed build with USE="-png".
Closes: https://bugs.gentoo.org/659900
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../snes9x-1.58-without-screenshot_build_fix.patch | 31 ++++++++++++++++++++++
games-emulation/snes9x/snes9x-1.58.ebuild | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
new file mode 100644
index 00000000000..7af1e9e2b90
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
@@ -0,0 +1,31 @@
+From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001
+From: Brandon Wright <bearoso@gmail.com>
+Date: Fri, 4 Jan 2019 10:52:11 -0600
+Subject: [PATCH] Fix PNG usage without preprocessor check.
+
+---
+ shaders/shader_helpers.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp
+index b84e6291..a589d39b 100644
+--- a/shaders/shader_helpers.cpp
++++ b/shaders/shader_helpers.cpp
+@@ -93,6 +93,7 @@ bool loadPngImage(const char* name,
+ bool& outHasAlpha,
+ GLubyte** outData)
+ {
++#ifdef HAVE_LIBPNG
+ png_structp png_ptr;
+ png_infop info_ptr;
+ unsigned int sig_read = 0;
+@@ -211,6 +212,9 @@ bool loadPngImage(const char* name,
+
+ /* That's it */
+ return true;
++#else
++ return false;
++#endif
+ }
+
+ bool loadTGA(const char* filename, STGA& tgaFile)
diff --git a/games-emulation/snes9x/snes9x-1.58.ebuild b/games-emulation/snes9x/snes9x-1.58.ebuild
index 911de9a90fb..9fd943cac80 100644
--- a/games-emulation/snes9x/snes9x-1.58.ebuild
+++ b/games-emulation/snes9x/snes9x-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P}/unix"
PATCHES=(
"${FILESDIR}"/${PN}-1.53-cross-compile.patch
"${FILESDIR}"/${PN}-1.58-build-system.patch
+ "${FILESDIR}"/${P}-without-screenshot_build_fix.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2019-03-03 14:26 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2019-03-03 14:26 UTC (permalink / raw
To: gentoo-commits
commit: ced341362df8b763f8330ed73b4f1561735dee51
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 14:24:09 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 14:26:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced34136
games-emulation/snes9x: Bump to version 1.59
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
games-emulation/snes9x/Manifest | 1 +
.../snes9x/files/snes9x-1.59-build-system.patch | 40 +++++++
games-emulation/snes9x/snes9x-1.59.ebuild | 128 +++++++++++++++++++++
3 files changed, 169 insertions(+)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 0e2e1b50958..c4da18a9d02 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,2 +1,3 @@
DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
+DIST snes9x-1.59.tar.gz 2819790 BLAKE2B 63328f034bbd8b9905346836e52344c86dccf04e57d8b1d280485d1ff24e3b1d452c2529526b477066d6ace8a0f2aba07e62d98e85bd0eae4d21f0c0186e0587 SHA512 e9bec3e9908705f3ff380c6e2131b8ff7c9a7fc5571a00f05c0f7810a2edd2fe36dd4def242bdb924e9f6d15a303794a626358cd49dedab9a2794e80a2cc920a
diff --git a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
new file mode 100644
index 00000000000..2d8f9f05e59
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
@@ -0,0 +1,40 @@
+--- snes9x-1.59/unix/configure.ac
++++ snes9x-1.59/unix/configure.ac
+@@ -56,37 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+- [AS_HELP_STRING([--enable-debug],
+- [leave debug information in the final binary (default: no)])],
+- [], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+- AC_S9X_COMPILER_FLAG([-g], [g])
+- AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+- AC_S9X_COMPILER_FLAG([-O3], [o3], [
+- AC_S9X_COMPILER_FLAG([-O2], [o2], [
+- AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+- [AS_HELP_STRING([--enable-mtune],
+- [use the specified value for the -mtune/-mcpu flag (default: no)])],
+- [], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+- [
+- AC_MSG_WARN([-mtune failed, trying -mcpu...])
+- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+- ])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
diff --git a/games-emulation/snes9x/snes9x-1.59.ebuild b/games-emulation/snes9x/snes9x-1.59.ebuild
new file mode 100644
index 00000000000..830686b140f
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.59.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic meson xdg
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="https://github.com/snes9xgit/snes9x"
+SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa debug gtk multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
+RESTRICT="bindist"
+
+RDEPEND="
+ sys-libs/zlib:=[minizip]
+ x11-libs/libX11
+ x11-libs/libXext
+ png? ( media-libs/libpng:0= )
+ gtk? (
+ dev-libs/glib:2
+ media-libs/libsdl2[joystick]
+ >=x11-libs/gtk+-3.22:3[wayland?]
+ x11-libs/libXrandr
+ x11-misc/xdg-utils
+ alsa? ( media-libs/alsa-lib )
+ opengl? (
+ media-libs/libepoxy
+ virtual/opengl
+ )
+ portaudio? ( >=media-libs/portaudio-19_pre )
+ pulseaudio? ( media-sound/pulseaudio )
+ xv? ( x11-libs/libXv )
+ wayland? ( dev-libs/wayland )
+ )
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/unix"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.53-cross-compile.patch
+ "${FILESDIR}"/${PN}-1.59-build-system.patch
+)
+
+src_prepare() {
+ cd "${WORKDIR}/${P}" || die
+ rm -r unzip || die
+ default
+ cd unix || die
+ eautoreconf
+ if use gtk ; then
+ export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
+ fi
+}
+
+src_configure() {
+ append-ldflags -Wl,-z,noexecstack
+
+ # build breaks when zlib/zip support is disabled
+ local myeconfargs=(
+ --enable-gamepad
+ --enable-gzip
+ --enable-zip
+ --with-system-zip
+ $(use_enable debug debugger)
+ $(use_enable netplay)
+ $(use_enable png screenshot)
+ $(use_enable xinerama)
+ )
+ econf "${myeconfargs[@]}"
+
+ if use gtk; then
+ local emesonargs=(
+ -Dalsa="$(usex alsa true false)"
+ -Ddebugger="$(usex debug true false)"
+ -Dgtk2=false
+ -Dgtk3=true
+ -Dopengl="$(usex opengl true false)"
+ -Doss="$(usex oss true false)"
+ -Dportaudio="$(usex portaudio true false)"
+ -Dpulseaudio="$(usex pulseaudio true false)"
+ -Dscreenshot="$(usex png true false)"
+ -Dsystem-zip=true
+ -Dxv="$(usex xv true false)"
+ -Dzlib=true
+ -Dwayland="$(usex wayland true false)"
+ )
+ meson_src_configure
+ fi
+}
+
+src_compile() {
+ emake
+ use gtk && meson_src_compile
+}
+
+src_install() {
+ dobin ${PN}
+
+ dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
+ dodoc snes9x.conf.default
+
+ if use gtk ; then
+ meson_src_install
+ dodoc ../gtk/AUTHORS
+ fi
+
+ docinto html
+ dodoc {.,..}/docs/*.html
+}
+
+pkg_preinst() {
+ use gtk && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ use gtk && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use gtk && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2021-05-21 22:06 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-05-21 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 7c5b7e17bd7487c699cefc72339a7061f737ae81
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 22:06:23 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 21 22:06:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b7e17
games-emulation/snes9x: Fix building against GCC 11
Closes: https://bugs.gentoo.org/789963
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../snes9x/files/snes9x-1.60-gcc11.patch | 31 ++++++++++++++++++++++
games-emulation/snes9x/snes9x-1.60.ebuild | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
new file mode 100644
index 00000000000..1b9a70b7f09
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
@@ -0,0 +1,31 @@
+--- a/conffile.cpp
++++ b/conffile.cpp
+@@ -452,7 +452,7 @@
+ }
+ }
+
+-bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
++bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const {
+ if(curConfigFile && a.section!=b.section){
+ const int sva = curConfigFile->GetSectionSize(a.section);
+ const int svb = curConfigFile->GetSectionSize(b.section);
+--- a/conffile.h
++++ b/conffile.h
+@@ -90,7 +90,7 @@
+ mutable bool used;
+
+ struct section_then_key_less {
+- bool operator()(const ConfigEntry &a, const ConfigEntry &b);
++ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
+ };
+
+ struct key_less {
+@@ -101,7 +101,7 @@
+ };
+
+ struct line_less {
+- bool operator()(const ConfigEntry &a, const ConfigEntry &b){
++ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const {
+ if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
+ if(b.line<0) return true;
+ if(a.line<0) return false;
diff --git a/games-emulation/snes9x/snes9x-1.60.ebuild b/games-emulation/snes9x/snes9x-1.60.ebuild
index 14b09f9d754..b44ac4ece5b 100644
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ b/games-emulation/snes9x/snes9x-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,6 +50,7 @@ S="${WORKDIR}/${P}/unix"
PATCHES=(
"${FILESDIR}"/${PN}-1.53-cross-compile.patch
"${FILESDIR}"/${PN}-1.59-build-system.patch
+ "${FILESDIR}"/${PN}-1.60-gcc11.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2022-03-05 7:00 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2022-03-05 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 068201997e59cd47afce4fda21b12cd0841532ed
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 06:30:23 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 06:57:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06820199
games-emulation/snes9x: add 1.61
Various changes, but for some notable ones:
- IUSE=gtk->gui, now uses gtkmm
- RESTRICT=test, has no tests but fails if -gui/-gtk (bug #737044)
- clean libretro objects to fix USE="netplay libretro" (bug #791475)
- respect flags for libretro, also don't use CXXFLAGS for CFLAGS
- install libretro core in libretro/ like libretro-snes9x
- tentatively remove noexecstack, not seeing QA notices
- remove html docs, they are not relevant for users
This bundles glslang/spriv-cross but upstream is concerned about API
and seems likely this will break if unbundled, leaving alone for now.
bug #766782 was caused by CFLAGS = $(CXXFLAGS) without := leading
to -fno-rtti being used for CC and seemingly being refusedby distcc.
1.61 corrected this.
Closes: https://bugs.gentoo.org/737044
Closes: https://bugs.gentoo.org/766782
Closes: https://bugs.gentoo.org/791475
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 3 +
.../snes9x/files/snes9x-1.61-libretro-flags.patch | 25 ++++
games-emulation/snes9x/metadata.xml | 3 +-
games-emulation/snes9x/snes9x-1.61.ebuild | 152 +++++++++++++++++++++
4 files changed, 182 insertions(+), 1 deletion(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index c477123ee770..67367eddc376 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1 +1,4 @@
DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
+DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45cfe039596a64bca3076ecb079f7c33aa14ac09a96e5a174ad51faf0c4d585d82aaadec3d8209cf8d3ca55d70e316b1642 SHA512 de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
+DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
+DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
diff --git a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
new file mode 100644
index 000000000000..297c7d78257d
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
@@ -0,0 +1,25 @@
+CXXFLAGS is used as a "common" flags variable and passed to CFLAGS,
+but want to use user's CFLAGS for CC rather than CXXFLAGS. Workaround
+with a temporary variable and also drop -O3/lto from defaults.
+--- a/libretro/Makefile
++++ b/libretro/Makefile
+@@ -4,3 +4,5 @@
+
+-LTO ?= -flto
++LTO :=
++ORIG_CXXFLAGS := $(CXXFLAGS)
++CXXFLAGS :=
+ SPACE :=
+@@ -580,4 +582,4 @@
+ else
+- CFLAGS += -O3 -DNDEBUG
+- CXXFLAGS += -O3 -DNDEBUG
++ CFLAGS += -DNDEBUG
++ CXXFLAGS += -DNDEBUG
+ endif
+@@ -612,3 +614,4 @@
+ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
+-CFLAGS := $(CXXFLAGS)
++CFLAGS := $(CXXFLAGS) $(CFLAGS)
++CXXFLAGS += $(ORIG_CXXFLAGS)
+ CFLAGS += -DHAVE_STDINT_H
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 2d24d25eb987..8f63c2fe45fa 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -6,8 +6,9 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
- <flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
+ <flag name="glslang">Build support for slang-type shaders</flag>
<flag name="libretro">Build libretro port</flag>
+ <flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
</use>
<upstream>
<remote-id type="google-code">snes9x-gtk</remote-id>
diff --git a/games-emulation/snes9x/snes9x-1.61.ebuild b/games-emulation/snes9x/snes9x-1.61.ebuild
new file mode 100644
index 000000000000..0442b30335df
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.61.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools meson toolchain-funcs xdg
+
+GLSLANG_COMMIT="bcf6a2430e99e8fc24f9f266e99316905e6d5134"
+SPIRV_COMMIT="1458bae62ec67ea7d12c5a13b740e23ed4bb226c"
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="https://github.com/snes9xgit/snes9x/"
+SRC_URI="
+ https://github.com/snes9xgit/snes9x/archive/${PV}.tar.gz -> ${P}.tar.gz
+ gui? ( glslang? (
+ https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${P}-glslang.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_COMMIT}.tar.gz -> ${P}-spirv.tar.gz
+ ) )"
+
+LICENSE="
+ Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
+ gui? ( glslang? ( Apache-2.0 BSD ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="alsa debug glslang gui libretro netplay opengl oss png portaudio pulseaudio wayland xinerama +xv"
+RESTRICT="bindist test" # has no tests but can lead to bug #737044
+
+RDEPEND="
+ sys-libs/zlib:=[minizip]
+ x11-libs/libX11
+ x11-libs/libXext
+ alsa? ( media-libs/alsa-lib )
+ gui? (
+ dev-cpp/cairomm:0
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:3.0[wayland?]
+ dev-libs/glib:2
+ dev-libs/libsigc++:2
+ media-libs/libsdl2[joystick]
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[wayland?]
+ x11-libs/libXrandr
+ x11-misc/xdg-utils
+ opengl? ( media-libs/libepoxy )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ wayland? ( dev-libs/wayland )
+ )
+ libretro? ( !games-emulation/libretro-snes9x )
+ png? ( media-libs/libpng:= )
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+ opengl? ( media-libs/libglvnd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.53-cross-compile.patch
+ "${FILESDIR}"/${PN}-1.59-build-system.patch
+ "${FILESDIR}"/${PN}-1.61-libretro-flags.patch
+)
+
+src_prepare() {
+ if use gui && use glslang; then
+ rmdir shaders/{glslang,SPIRV-Cross} || die
+ mv ../glslang-${GLSLANG_COMMIT} shaders/glslang || die
+ mv ../SPIRV-Cross-${SPIRV_COMMIT} shaders/SPIRV-Cross || die
+ fi
+
+ default
+
+ rm -r unzip || die
+
+ cd unix || die
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC CXX # for libretro
+
+ local econfargs=(
+ $(use_enable alsa sound-alsa)
+ $(use_enable debug debugger)
+ $(use_enable netplay)
+ $(use_enable png screenshot)
+ $(use_enable xinerama)
+ $(use_enable xv xvideo)
+ --enable-gamepad
+ --enable-gzip
+ --enable-zip
+ --with-system-zip
+ )
+
+ cd unix || die
+ econf "${econfargs[@]}"
+
+ if use gui; then
+ local emesonargs=(
+ $(meson_use alsa)
+ $(meson_use debug debugger)
+ $(meson_use glslang slang) # TODO?: unbundle
+ $(meson_use opengl)
+ $(meson_use oss)
+ $(meson_use png screenshot)
+ $(meson_use portaudio)
+ $(meson_use pulseaudio)
+ $(meson_use wayland)
+ $(meson_use xv)
+ -Dsystem-zip=true
+ -Dzlib=true
+ )
+
+ EMESON_SOURCE=${S}/gtk
+ meson_src_configure
+ fi
+}
+
+src_compile() {
+ if use libretro; then
+ emake -C libretro
+ # rebuild objects given libretro uses different defines (bug #791475)
+ rm *.o || die
+ fi
+
+ emake -C unix
+
+ use gui && meson_src_compile
+}
+
+src_install() {
+ if use libretro; then
+ exeinto /usr/$(get_libdir)/libretro
+ doexe libretro/snes9x_libretro.so
+ fi
+
+ dobin unix/${PN}
+
+ local DOCS=(
+ README.md
+ docs/{changes,control-inputs,controls,snapshots}.txt
+ unix/snes9x.conf.default
+ )
+ einstalldocs
+
+ if use gui; then
+ meson_src_install
+ dodoc gtk/AUTHORS
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/
@ 2022-03-14 11:43 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2022-03-14 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 8cbbf1e4a6225bc442f94b3183de9ffddf68d00e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 11:03:22 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 11:42:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbbf1e4
games-emulation/snes9x: drop 1.60
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 1 -
.../snes9x/files/snes9x-1.60-gcc11.patch | 47 -------
games-emulation/snes9x/snes9x-1.60.ebuild | 139 ---------------------
3 files changed, 187 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 67367eddc376..85d1edc3c9f2 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,4 +1,3 @@
-DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45cfe039596a64bca3076ecb079f7c33aa14ac09a96e5a174ad51faf0c4d585d82aaadec3d8209cf8d3ca55d70e316b1642 SHA512 de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
diff --git a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
deleted file mode 100644
index 453771f5139c..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7f6d9d6432d912cd90763c64f7c92270b3e6c182 Mon Sep 17 00:00:00 2001
-From: gocha <gochaism@gmail.com>
-Date: Sun, 19 Jan 2020 12:48:06 +0900
-Subject: [PATCH] win32: fix compilation error in vs2019
-
----
- conffile.cpp | 2 +-
- conffile.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/conffile.cpp b/conffile.cpp
-index 817afae7f..fa7de3fa2 100644
---- a/conffile.cpp
-+++ b/conffile.cpp
-@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
- }
- }
-
--bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
-+bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const{
- if(curConfigFile && a.section!=b.section){
- const int sva = curConfigFile->GetSectionSize(a.section);
- const int svb = curConfigFile->GetSectionSize(b.section);
-diff --git a/conffile.h b/conffile.h
-index ba69812df..d92128cba 100644
---- a/conffile.h
-+++ b/conffile.h
-@@ -90,7 +90,7 @@ class ConfigFile {
- mutable bool used;
-
- struct section_then_key_less {
-- bool operator()(const ConfigEntry &a, const ConfigEntry &b);
-+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
- };
-
- struct key_less {
-@@ -101,8 +101,8 @@ class ConfigFile {
- };
-
- struct line_less {
-- bool operator()(const ConfigEntry &a, const ConfigEntry &b){
-- if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
-+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
-+ if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
- if(b.line<0) return true;
- if(a.line<0) return false;
- return a.line<b.line;
diff --git a/games-emulation/snes9x/snes9x-1.60.ebuild b/games-emulation/snes9x/snes9x-1.60.ebuild
deleted file mode 100644
index b44ac4ece5bf..000000000000
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic meson xdg
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x"
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug gtk libretro multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
-RESTRICT="bindist"
-
-RDEPEND="
- gtk? (
- dev-libs/glib:2
- media-libs/libsdl2[joystick]
- >=x11-libs/gtk+-3.22:3[wayland?]
- x11-libs/libXrandr
- x11-misc/xdg-utils
- alsa? ( media-libs/alsa-lib )
- opengl? (
- media-libs/libepoxy
- virtual/opengl
- )
- portaudio? ( >=media-libs/portaudio-19_pre )
- pulseaudio? ( media-sound/pulseaudio )
- xv? ( x11-libs/libXv )
- wayland? ( dev-libs/wayland )
- )
- !gtk? ( x11-libs/libXv )
- libretro? ( !!games-emulation/libretro-snes9x )
- png? ( media-libs/libpng:0= )
- sys-libs/zlib:=[minizip]
- xinerama? ( x11-libs/libXinerama )
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.53-cross-compile.patch
- "${FILESDIR}"/${PN}-1.59-build-system.patch
- "${FILESDIR}"/${PN}-1.60-gcc11.patch
-)
-
-src_prepare() {
- cd "${WORKDIR}/${P}" || die
- rm -r unzip || die
- default
- cd unix || die
- eautoreconf
- if use gtk ; then
- export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
- fi
-}
-
-src_configure() {
- append-ldflags -Wl,-z,noexecstack
-
- # build breaks when zlib/zip support is disabled
- local myeconfargs=(
- --enable-gamepad
- --enable-gzip
- --enable-zip
- --with-system-zip
- $(use_enable debug debugger)
- $(use_enable netplay)
- $(use_enable png screenshot)
- $(use_enable xinerama)
- )
- econf "${myeconfargs[@]}"
-
- if use gtk; then
- local emesonargs=(
- -Dalsa="$(usex alsa true false)"
- -Ddebugger="$(usex debug true false)"
- -Dgtk2=false
- -Dgtk3=true
- -Dopengl="$(usex opengl true false)"
- -Doss="$(usex oss true false)"
- -Dportaudio="$(usex portaudio true false)"
- -Dpulseaudio="$(usex pulseaudio true false)"
- -Dscreenshot="$(usex png true false)"
- -Dsystem-zip=true
- -Dxv="$(usex xv true false)"
- -Dzlib=true
- -Dwayland="$(usex wayland true false)"
- )
- meson_src_configure
- fi
-}
-
-src_compile() {
- use libretro && emake -C ../libretro
- emake
- use gtk && meson_src_compile
-}
-
-src_install() {
- dobin ${PN}
-
- dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
- dodoc snes9x.conf.default
-
- if use libretro ; then
- cd "${WORKDIR}/${PF}/libretro/"
- dolib.so snes9x_libretro.so
- fi
-
- if use gtk ; then
- meson_src_install
- dodoc ../gtk/AUTHORS
- fi
-
- HTML_DOCS="${WORKDIR}/${PF}/docs/*.html"
- einstalldocs
-}
-
-pkg_preinst() {
- use gtk && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use gtk && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use gtk && xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-03-14 11:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-14 11:43 [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2022-03-05 7:00 Ionen Wolkens
2021-05-21 22:06 David Seifert
2019-03-03 14:26 Lars Wendler
2019-01-04 17:40 Lars Wendler
2018-12-23 11:25 Lars Wendler
2018-01-23 9:35 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox