* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/
@ 2016-11-11 17:17 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-11-11 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 0461a88faa4d542a801334304eca86a9b51b3d04
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 17:17:32 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 17:17:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0461a88f
games-emulation/snes9x: Bump to version 1.54.1
Package-Manager: portage-2.3.2
games-emulation/snes9x/Manifest | 1 +
.../snes9x/files/snes9x-1.54.1-build.patch | 55 ++++
.../snes9x/files/snes9x-1.54.1-system-zlib.patch | 307 +++++++++++++++++++++
games-emulation/snes9x/snes9x-1.54.1.ebuild | 124 +++++++++
4 files changed, 487 insertions(+)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 69194e2..8a7b5b8 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1 +1,2 @@
DIST snes9x-1.53-src.tar.bz2 1838746 SHA256 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3 SHA512 3ded506d1b3b6cff4e8e3de77ad557d97981eb97ea23ffc68ce5abbbd4677aca819776f1d11b9aa47f5b1a785b19455acf6ad4dbc536d3581d62c192ebdfbd8c WHIRLPOOL 482f0b2c476753b5ffb6ff30b1e5ccb9f50bd0dbe05c7147d5e1c073cd15ce7edd99dc4ea9c14bb50d0bd3cec7edda26e1c54b1b7e0c77b0eb26f9aa09e25f52
+DIST snes9x-1.54.1.tar.gz 2186737 SHA256 85862a22498bc418c37bd7c81a3089d9cc00af279b91e5f7fa8bea05e2e3027b SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed WHIRLPOOL 8ef309a14646c0250e81f6d2ede48da65144830247cb7cf17eccc6b94dffdd128f1b75d27258ae0d923b580c612984cef27c5237066c98a613b0a00faa3ad90b
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-build.patch b/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
new file mode 100644
index 00000000..945b5f1
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
@@ -0,0 +1,55 @@
+--- snes9x-1.54.1/gtk/configure.ac
++++ snes9x-1.54.1/gtk/configure.ac
+@@ -33,7 +33,7 @@
+
+ AM_GLIB_GNU_GETTEXT
+
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
++snes9xlocaledir='/usr/share/locale'
+ AC_SUBST(snes9xlocaledir)
+
+ AC_ARG_WITH(debug,
+--- snes9x-1.54.1/unix/configure.ac
++++ snes9x-1.54.1/unix/configure.ac
+@@ -56,20 +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)])],
+@@ -79,9 +65,6 @@
+ 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
+
+--- snes9x-1.54.1/unix/Makefile.in
++++ snes9x-1.54.1/unix/Makefile.in
+@@ -47,7 +47,7 @@
+ exit 1
+
+ snes9x: $(OBJECTS)
+- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
++ $(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
+
+ ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
+ $(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch b/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
new file mode 100644
index 00000000..e5d3c79
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
@@ -0,0 +1,307 @@
+From 22efabdfc5e3578276943a36ef351bf22a7bd061 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 11 Nov 2016 17:52:07 +0100
+Subject: [PATCH] Introduce --with-system-zip configure flag to use system zip
+ (minizip)
+
+if available.
+---
+ conffile.h | 6 +++++-
+ gtk/Makefile.am | 6 +++++-
+ gtk/configure.ac | 28 +++++++++++++++++++++++++++-
+ loadzip.cpp | 4 ++++
+ memmap.cpp | 6 +++++-
+ stream.cpp | 6 +++++-
+ stream.h | 7 +++++--
+ unix/Makefile.in | 9 +++++++--
+ unix/configure.ac | 47 +++++++++++++++++++++++++++++++++++++++--------
+ 9 files changed, 102 insertions(+), 17 deletions(-)
+
+diff --git a/conffile.h b/conffile.h
+index ed8a13b..366706f 100644
+--- a/conffile.h
++++ b/conffile.h
+@@ -197,7 +197,11 @@
+ #include <string>
+
+ #ifdef UNZIP_SUPPORT
+-#include "unzip/unzip.h"
++# ifdef SYSTEM_ZIP
++# include <minizip/unzip.h>
++# else
++# include "unzip/unzip.h"
++# endif
+ #endif
+ #include "snes9x.h"
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index fad1cf2..57f00fb 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -196,12 +196,16 @@ snes9x_gtk_SOURCES += \
+ ../server.cpp
+ endif
+
++
+ # Zip support is nonconfigurable.
+ snes9x_gtk_SOURCES += \
+- ../loadzip.cpp \
++ ../loadzip.cpp
++if ! SYSTEM_ZIP
++snes9x_gtk_SOURCES += \
+ ../unzip/unzip.c \
+ ../unzip/ioapi.c \
+ ../unzip/zip.c
++endif
+ UNZIPDEFINES=-DUNZIP_SUPPORT
+
+ if JMA
+diff --git a/gtk/configure.ac b/gtk/configure.ac
+index 4d21792..e64fac2 100644
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -138,6 +138,12 @@ AC_ARG_WITH(zlib,
+ [],
+ [with_zlib=yes])
+
++AC_ARG_WITH(system-zip,
++ [AS_HELP_STRING([--with(out)-system-zip],
++ [Use system zip])],
++ [],
++ [system_zip=check])
++
+ AC_ARG_WITH(screenshot,
+ [AS_HELP_STRING([--with(out)-screenshot],
+ [Screenshot support through libpng if available (default: with)])],
+@@ -313,6 +319,25 @@ if test yes = "$with_screenshot"; then
+ ])
+ fi
+
++SYSTEM_ZIP=0
++SYSTEM_ZIP_CFLAGS=""
++SYSTEM_ZIP_LIBS=""
++ZIP_CFLAGS="-I../unzip"
++if test no != "$with_system_zip" && test yes = "$with_zlib" ; then
++ PKG_CHECK_MODULES([SYSTEM_ZIP],[minizip],[
++ ZIP_CFLAGS=""
++ SYSTEM_ZIP=yes
++ CFLAGS="$CFLAGS $SYSTEM_ZIP_CFLAGS -DSYSTEM_ZIP"
++ LIBS="$LIBS $SYSTEM_ZIP_LIBS"
++ ],[
++ if test check = "$with_system_zip"; then
++ AC_MSG_WARN(Cannot find SYSTEM_ZIP)
++ else
++ AC_MSG_ERROR(--with-system-zip given but cannot find proper zip)
++ fi
++ ])
++fi
++
+ if test yes = "$with_hq2x" ; then
+ HQ2X=yes
+ CFLAGS="$CFLAGS -DUSE_HQ2X"
+@@ -440,7 +465,7 @@ if test $ac_cv_my_sar_int8 = yes && \
+ CFLAGS="$CFLAGS -DRIGHTSHIFT_IS_SAR"
+ fi
+
+-CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. -I../unzip"
++CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. $ZIP_CFLAGS"
+
+ CXXFLAGS="$CFLAGS"
+
+@@ -462,6 +487,7 @@ AM_CONDITIONAL(ALSA, [test yes = "$ALSA"])
+ AM_CONDITIONAL(PULSEAUDIO, [test yes = "$PULSEAUDIO"])
+ AM_CONDITIONAL(HQ2X, [test yes = "$HQ2X"])
+ AM_CONDITIONAL(XBRZ, [test yes = "$XBRZ"])
++AM_CONDITIONAL(SYSTEM_ZIP, [test yes = "$SYSTEM_ZIP"])
+
+ AC_SUBST(NASM)
+ AC_SUBST(NASM_FLAGS)
+diff --git a/loadzip.cpp b/loadzip.cpp
+index 024bc79..dab2504 100644
+--- a/loadzip.cpp
++++ b/loadzip.cpp
+@@ -192,7 +192,11 @@
+
+ #include <assert.h>
+ #include <ctype.h>
++#ifdef SYSTEM_ZIP
++#include <minizip/unzip.h>
++#else
+ #include "unzip/unzip.h"
++#endif
+ #include "snes9x.h"
+ #include "memmap.h"
+
+diff --git a/memmap.cpp b/memmap.cpp
+index 19df95c..98de319 100644
+--- a/memmap.cpp
++++ b/memmap.cpp
+@@ -193,7 +193,11 @@
+ #include <assert.h>
+
+ #ifdef UNZIP_SUPPORT
+-#include "unzip/unzip.h"
++# ifdef SYSTEM_ZIP
++# include <minizip/unzip.h>
++# else
++# include "unzip/unzip.h"
++# endif
+ #endif
+
+ #ifdef JMA_SUPPORT
+diff --git a/stream.cpp b/stream.cpp
+index 37051c3..bb64113 100644
+--- a/stream.cpp
++++ b/stream.cpp
+@@ -192,7 +192,11 @@
+
+ #include <string>
+ #ifdef UNZIP_SUPPORT
+-#include "unzip.h"
++# ifdef SYSTEM_ZIP
++# include <minizip/unzip.h>
++# else
++# include "unzip.h"
++# endif
+ #endif
+ #include "snes9x.h"
+ #include "stream.h"
+diff --git a/stream.h b/stream.h
+index b03dea9..ea22df0 100644
+--- a/stream.h
++++ b/stream.h
+@@ -229,8 +229,11 @@ class fStream : public Stream
+ };
+
+ #ifdef UNZIP_SUPPORT
+-
+-#include "unzip.h"
++# ifdef SYSTEM_ZIP
++# include <minizip/unzip.h>
++# else
++# include "unzip.h"
++# endif
+
+ #define unz_BUFFSIZ 1024
+
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index 5849568..aecad31 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -2,6 +2,7 @@
+ @S9XNETPLAY@
+ @S9XZIP@
+ @S9XJMA@
++@S9X_SYSTEM_ZIP@
+
+ # Fairly good and special-char-safe descriptor of the os being built on.
+ OS = `uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"`
+@@ -19,7 +20,11 @@ OBJECTS += ../netplay.o ../server.o
+ endif
+
+ ifdef S9XZIP
+-OBJECTS += ../loadzip.o ../unzip/ioapi.o ../unzip/unzip.o
++OBJECTS += ../loadzip.o
++ifndef SYSTEM_ZIP
++OBJECTS += ../unzip/ioapi.o ../unzip/unzip.o
++INCLUDES = -I../unzip/
++endif
+ endif
+
+ ifdef S9XJMA
+@@ -29,7 +34,7 @@ endif
+ CCC = @CXX@
+ CC = @CC@
+ GASM = @CXX@
+-INCLUDES = -I. -I.. -I../apu/ -I../apu/bapu -I../unzip/ -I../jma/ -I../filter/
++INCLUDES += -I. -I.. -I../apu/ -I../apu/bapu -I../jma/ -I../filter/
+
+ CCFLAGS = @S9XFLGS@ @S9XDEFS@ $(DEFS)
+ CFLAGS = $(CCFLAGS)
+diff --git a/unix/configure.ac b/unix/configure.ac
+index 3c851dc..dc0e7ba 100644
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -201,16 +201,43 @@ AC_ARG_ENABLE([zip],
+ [enable ZIP support through zlib (default: yes)])],
+ [], [enable_zip="yes"])
+
++S9X_SYSTEM_ZIP="#SYSTEM_ZIP=1"
++
++AC_ARG_WITH([system-zip],
++ [AS_HELP_STRING([--with-system-zip],
++ [Use system zip (default: check)])],
++ [], [with_system_zip="check"])
++
+ if test "x$enable_zip" = "xyes"; then
+- if test "x$snes9x_cv_zlib" = "xyes"; then
+- S9XZIP="S9XZIP=1"
+- S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
+- if test "x$enable_gzip" = "xno"; then
+- S9XLIBS="$S9XLIBS -lz"
+- fi
++ if test "x$with_system_zip" != "xno"; then
++ PKG_CHECK_MODULES(
++ SYSTEM_ZIP,
++ minizip,
++ S9XZIP="S9XZIP=1"
++ S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
++ S9X_SYSTEM_ZIP="SYSTEM_ZIP=1"
++ S9XLIBS="$S9XLIBS $SYSTEM_ZIP_LIBS"
++ if test "x$enable_gzip" = "xno"; then
++ S9XLIBS="$S9XLIBS -lz"
++ fi
++ S9XDEFS="$S9XDEFS -DSYSTEM_ZIP",
++ if test "x${with_system_zip}" != "xcheck"; then
++ AC_MSG_ERROR([--with-system-zlib requested but no proper zlib found.])
++ else
++ AC_MSG_WARN([zlib not found. Build without SYSTEM_ZIP support.])
++ fi
++ )
+ else
+- AC_MSG_WARN([zlib not found. Build without ZIP support.])
+- enable_zip="no"
++ if test "x$snes9x_cv_zlib" = "xyes"; then
++ S9XZIP="S9XZIP=1"
++ S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
++ if test "x$enable_gzip" = "xno"; then
++ S9XLIBS="$S9XLIBS -lz"
++ fi
++ else
++ AC_MSG_WARN([zlib not found. Build without ZIP support.])
++ enable_zip="no"
++ fi
+ fi
+ fi
+
+@@ -427,9 +454,11 @@ S9XLIBS="$LIBS $S9XLIBS"
+ S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/ */ /g'`"
+ S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/ */ /g'`"
+ S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/ */ /g'`"
++S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/ */ /g'`"
+ S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/^ *//'`"
+ S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/^ *//'`"
+ S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^ *//'`"
++S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/^ *//'`"
+
+ AC_SUBST(S9XFLGS)
+ AC_SUBST(S9XDEFS)
+@@ -439,6 +468,7 @@ AC_SUBST(S9XDEBUGGER)
+ AC_SUBST(S9XNETPLAY)
+ AC_SUBST(S9XZIP)
+ AC_SUBST(S9XJMA)
++AC_SUBST(S9X_SYSTEM_ZIP)
+
+ rm config.info 2>/dev/null
+
+@@ -459,6 +489,7 @@ netplay support...... $enable_netplay
+ gamepad support...... $enable_gamepad
+ GZIP support......... $enable_gzip
+ ZIP support.......... $enable_zip
++SYSTEM_ZIP........... $with_system_zip
+ JMA support.......... $enable_jma
+ debugger............. $enable_debugger
+
+--
+2.10.2
+
diff --git a/games-emulation/snes9x/snes9x-1.54.1.ebuild b/games-emulation/snes9x/snes9x-1.54.1.ebuild
new file mode 100644
index 00000000..c52bc33
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.54.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic multilib gnome2-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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr"
+RESTRICT="bindist"
+
+RDEPEND="
+ sys-libs/zlib[minizip]
+ x11-libs/libX11
+ x11-libs/libXext
+ png? ( >=media-libs/libpng-1.2.43:0 )
+ gtk? ( >=x11-libs/gtk+-2.10:2
+ x11-misc/xdg-utils
+ portaudio? ( >=media-libs/portaudio-19_pre )
+ joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
+ opengl? ( virtual/opengl )
+ xv? ( x11-libs/libXv )
+ xrandr? ( x11-libs/libXrandr )
+ alsa? ( media-libs/alsa-lib )
+ pulseaudio? ( media-sound/pulseaudio ) )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto
+ gtk? ( virtual/pkgconfig
+ xv? ( x11-proto/videoproto ) )
+ nls? ( dev-util/intltool )"
+
+S="${WORKDIR}/${P}/unix"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.54.1-build.patch
+ "${FILESDIR}"/${PN}-1.53-cross-compile.patch
+ "${FILESDIR}"/${PN}-1.54.1-system-zlib.patch
+)
+
+src_prepare() {
+ cd "${WORKDIR}"/${P} || die
+ rm -r unzip || die
+ default
+ cd unix
+ 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
+ econf \
+ --enable-gzip \
+ --enable-zip \
+ --with-system-zip \
+ $(use_enable joystick gamepad) \
+ $(use_enable debug debugger) \
+ $(use_enable netplay) \
+ $(use_enable png screenshot)
+
+ if use gtk; then
+ cd ../gtk || die
+ econf \
+ --datadir=/usr/share \
+ --with-zlib \
+ --with-system-zip \
+ $(use_enable nls) \
+ $(use_with opengl) \
+ $(use_with joystick) \
+ $(use_with xv) \
+ $(use_with xrandr) \
+ $(use_with netplay) \
+ $(use_with alsa) \
+ $(use_with oss) \
+ $(use_with pulseaudio) \
+ $(use_with portaudio) \
+ $(use_with png screenshot)
+ fi
+}
+
+src_compile() {
+ emake
+ if use gtk; then
+ emake -C ../gtk
+ fi
+}
+
+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() {
+ use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/
@ 2018-06-11 9:59 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-06-11 9:59 UTC (permalink / raw
To: gentoo-commits
commit: bd6b4e03bb4c8621ddc4a5330f64c0ed219829ae
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 09:14:52 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 09:59:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6b4e03
games-emulation/snes9x: Bump to version 1.56
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-emulation/snes9x/Manifest | 1 +
.../snes9x/files/snes9x-1.56-build-system.patch | 53 ++++++++
games-emulation/snes9x/snes9x-1.56.ebuild | 137 +++++++++++++++++++++
3 files changed, 191 insertions(+)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 6eda8d9906e..17a4640040d 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,2 +1,3 @@
DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
+DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
diff --git a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
new file mode 100644
index 00000000000..d2ee182cb7c
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
@@ -0,0 +1,53 @@
+--- snes9x-1.56/gtk/configure.ac
++++ snes9x-1.56/gtk/configure.ac
+@@ -33,8 +33,8 @@
+
+ AM_GLIB_GNU_GETTEXT
+
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+-snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
++snes9xlocaledir='$(localedir)'
++snes9xdatadir='$(datadir)/snes9x'
+
+ AC_SUBST(snes9xlocaledir)
+ AC_SUBST(snes9xdatadir)
+--- snes9x-1.56/unix/configure.ac
++++ snes9x-1.56/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.56.ebuild b/games-emulation/snes9x/snes9x-1.56.ebuild
new file mode 100644
index 00000000000..652a1c85921
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.56.ebuild
@@ -0,0 +1,137 @@
+# 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/, games-emulation/snes9x/files/
@ 2018-06-11 9:59 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-06-11 9:59 UTC (permalink / raw
To: gentoo-commits
commit: b6d3d2086a5b76724da73489e794a89743b5b65d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 09:21:09 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 09:59:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d3d208
games-emulation/snes9x: Removed old.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-emulation/snes9x/Manifest | 1 -
.../snes9x/files/snes9x-1.54.1-build.patch | 55 ----
.../snes9x/files/snes9x-1.54.1-system-zlib.patch | 307 ---------------------
games-emulation/snes9x/snes9x-1.54.1.ebuild | 121 --------
4 files changed, 484 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 17a4640040d..d4e447cdd89 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,3 +1,2 @@
-DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-build.patch b/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
deleted file mode 100644
index 945b5f1890b..00000000000
--- a/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- snes9x-1.54.1/gtk/configure.ac
-+++ snes9x-1.54.1/gtk/configure.ac
-@@ -33,7 +33,7 @@
-
- AM_GLIB_GNU_GETTEXT
-
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
-+snes9xlocaledir='/usr/share/locale'
- AC_SUBST(snes9xlocaledir)
-
- AC_ARG_WITH(debug,
---- snes9x-1.54.1/unix/configure.ac
-+++ snes9x-1.54.1/unix/configure.ac
-@@ -56,20 +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)])],
-@@ -79,9 +65,6 @@
- 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
-
---- snes9x-1.54.1/unix/Makefile.in
-+++ snes9x-1.54.1/unix/Makefile.in
-@@ -47,7 +47,7 @@
- exit 1
-
- snes9x: $(OBJECTS)
-- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
-+ $(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
-
- ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
- $(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch b/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
deleted file mode 100644
index 26025829442..00000000000
--- a/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From def3936a5353924fb7b9ffa30b8c1c96c9175ca7 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 11 Nov 2016 17:52:07 +0100
-Subject: [PATCH] Introduce --with-system-zip configure flag to use system zip
- (minizip)
-
-if available.
----
- conffile.h | 6 +++++-
- gtk/Makefile.am | 6 +++++-
- gtk/configure.ac | 28 +++++++++++++++++++++++++++-
- loadzip.cpp | 4 ++++
- memmap.cpp | 6 +++++-
- stream.cpp | 6 +++++-
- stream.h | 7 +++++--
- unix/Makefile.in | 9 +++++++--
- unix/configure.ac | 47 +++++++++++++++++++++++++++++++++++++++--------
- 9 files changed, 102 insertions(+), 17 deletions(-)
-
-diff --git a/conffile.h b/conffile.h
-index ed8a13b..366706f 100644
---- a/conffile.h
-+++ b/conffile.h
-@@ -197,7 +197,11 @@
- #include <string>
-
- #ifdef UNZIP_SUPPORT
--#include "unzip/unzip.h"
-+# ifdef SYSTEM_ZIP
-+# include <minizip/unzip.h>
-+# else
-+# include "unzip/unzip.h"
-+# endif
- #endif
- #include "snes9x.h"
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index fad1cf2..57f00fb 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -196,12 +196,16 @@ snes9x_gtk_SOURCES += \
- ../server.cpp
- endif
-
-+
- # Zip support is nonconfigurable.
- snes9x_gtk_SOURCES += \
-- ../loadzip.cpp \
-+ ../loadzip.cpp
-+if ! SYSTEM_ZIP
-+snes9x_gtk_SOURCES += \
- ../unzip/unzip.c \
- ../unzip/ioapi.c \
- ../unzip/zip.c
-+endif
- UNZIPDEFINES=-DUNZIP_SUPPORT
-
- if JMA
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 4d21792..e3bab4e 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -138,6 +138,12 @@ AC_ARG_WITH(zlib,
- [],
- [with_zlib=yes])
-
-+AC_ARG_WITH(system-zip,
-+ [AS_HELP_STRING([--with(out)-system-zip],
-+ [Use system zip])],
-+ [],
-+ [system_zip=check])
-+
- AC_ARG_WITH(screenshot,
- [AS_HELP_STRING([--with(out)-screenshot],
- [Screenshot support through libpng if available (default: with)])],
-@@ -313,6 +319,25 @@ if test yes = "$with_screenshot"; then
- ])
- fi
-
-+SYSTEM_ZIP=0
-+SYSTEM_ZIP_CFLAGS=""
-+SYSTEM_ZIP_LIBS=""
-+ZIP_CFLAGS="-I../unzip"
-+if test no != "$with_system_zip" && test yes = "$with_zlib" ; then
-+ PKG_CHECK_MODULES([SYSTEM_ZIP],[minizip],[
-+ ZIP_CFLAGS=""
-+ SYSTEM_ZIP=yes
-+ CFLAGS="$CFLAGS $SYSTEM_ZIP_CFLAGS -DSYSTEM_ZIP"
-+ LIBS="$LIBS $SYSTEM_ZIP_LIBS"
-+ ],[
-+ if test check = "$with_system_zip"; then
-+ AC_MSG_WARN(Cannot find SYSTEM_ZIP)
-+ else
-+ AC_MSG_ERROR(--with-system-zip given but cannot find proper zlib)
-+ fi
-+ ])
-+fi
-+
- if test yes = "$with_hq2x" ; then
- HQ2X=yes
- CFLAGS="$CFLAGS -DUSE_HQ2X"
-@@ -440,7 +465,7 @@ if test $ac_cv_my_sar_int8 = yes && \
- CFLAGS="$CFLAGS -DRIGHTSHIFT_IS_SAR"
- fi
-
--CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. -I../unzip"
-+CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. $ZIP_CFLAGS"
-
- CXXFLAGS="$CFLAGS"
-
-@@ -462,6 +487,7 @@ AM_CONDITIONAL(ALSA, [test yes = "$ALSA"])
- AM_CONDITIONAL(PULSEAUDIO, [test yes = "$PULSEAUDIO"])
- AM_CONDITIONAL(HQ2X, [test yes = "$HQ2X"])
- AM_CONDITIONAL(XBRZ, [test yes = "$XBRZ"])
-+AM_CONDITIONAL(SYSTEM_ZIP, [test yes = "$SYSTEM_ZIP"])
-
- AC_SUBST(NASM)
- AC_SUBST(NASM_FLAGS)
-diff --git a/loadzip.cpp b/loadzip.cpp
-index 024bc79..dab2504 100644
---- a/loadzip.cpp
-+++ b/loadzip.cpp
-@@ -192,7 +192,11 @@
-
- #include <assert.h>
- #include <ctype.h>
-+#ifdef SYSTEM_ZIP
-+#include <minizip/unzip.h>
-+#else
- #include "unzip/unzip.h"
-+#endif
- #include "snes9x.h"
- #include "memmap.h"
-
-diff --git a/memmap.cpp b/memmap.cpp
-index 19df95c..98de319 100644
---- a/memmap.cpp
-+++ b/memmap.cpp
-@@ -193,7 +193,11 @@
- #include <assert.h>
-
- #ifdef UNZIP_SUPPORT
--#include "unzip/unzip.h"
-+# ifdef SYSTEM_ZIP
-+# include <minizip/unzip.h>
-+# else
-+# include "unzip/unzip.h"
-+# endif
- #endif
-
- #ifdef JMA_SUPPORT
-diff --git a/stream.cpp b/stream.cpp
-index 37051c3..bb64113 100644
---- a/stream.cpp
-+++ b/stream.cpp
-@@ -192,7 +192,11 @@
-
- #include <string>
- #ifdef UNZIP_SUPPORT
--#include "unzip.h"
-+# ifdef SYSTEM_ZIP
-+# include <minizip/unzip.h>
-+# else
-+# include "unzip.h"
-+# endif
- #endif
- #include "snes9x.h"
- #include "stream.h"
-diff --git a/stream.h b/stream.h
-index b03dea9..ea22df0 100644
---- a/stream.h
-+++ b/stream.h
-@@ -229,8 +229,11 @@ class fStream : public Stream
- };
-
- #ifdef UNZIP_SUPPORT
--
--#include "unzip.h"
-+# ifdef SYSTEM_ZIP
-+# include <minizip/unzip.h>
-+# else
-+# include "unzip.h"
-+# endif
-
- #define unz_BUFFSIZ 1024
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index 5849568..aecad31 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -2,6 +2,7 @@
- @S9XNETPLAY@
- @S9XZIP@
- @S9XJMA@
-+@S9X_SYSTEM_ZIP@
-
- # Fairly good and special-char-safe descriptor of the os being built on.
- OS = `uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"`
-@@ -19,7 +20,11 @@ OBJECTS += ../netplay.o ../server.o
- endif
-
- ifdef S9XZIP
--OBJECTS += ../loadzip.o ../unzip/ioapi.o ../unzip/unzip.o
-+OBJECTS += ../loadzip.o
-+ifndef SYSTEM_ZIP
-+OBJECTS += ../unzip/ioapi.o ../unzip/unzip.o
-+INCLUDES = -I../unzip/
-+endif
- endif
-
- ifdef S9XJMA
-@@ -29,7 +34,7 @@ endif
- CCC = @CXX@
- CC = @CC@
- GASM = @CXX@
--INCLUDES = -I. -I.. -I../apu/ -I../apu/bapu -I../unzip/ -I../jma/ -I../filter/
-+INCLUDES += -I. -I.. -I../apu/ -I../apu/bapu -I../jma/ -I../filter/
-
- CCFLAGS = @S9XFLGS@ @S9XDEFS@ $(DEFS)
- CFLAGS = $(CCFLAGS)
-diff --git a/unix/configure.ac b/unix/configure.ac
-index 3c851dc..47f3780 100644
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -201,16 +201,43 @@ AC_ARG_ENABLE([zip],
- [enable ZIP support through zlib (default: yes)])],
- [], [enable_zip="yes"])
-
-+S9X_SYSTEM_ZIP="#SYSTEM_ZIP=1"
-+
-+AC_ARG_WITH([system-zip],
-+ [AS_HELP_STRING([--with-system-zip],
-+ [Use system zip (default: check)])],
-+ [], [with_system_zip="check"])
-+
- if test "x$enable_zip" = "xyes"; then
-- if test "x$snes9x_cv_zlib" = "xyes"; then
-- S9XZIP="S9XZIP=1"
-- S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
-- if test "x$enable_gzip" = "xno"; then
-- S9XLIBS="$S9XLIBS -lz"
-- fi
-+ if test "x$with_system_zip" != "xno"; then
-+ PKG_CHECK_MODULES(
-+ SYSTEM_ZIP,
-+ minizip,
-+ S9XZIP="S9XZIP=1"
-+ S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
-+ S9X_SYSTEM_ZIP="SYSTEM_ZIP=1"
-+ S9XLIBS="$S9XLIBS $SYSTEM_ZIP_LIBS"
-+ if test "x$enable_gzip" = "xno"; then
-+ S9XLIBS="$S9XLIBS -lz"
-+ fi
-+ S9XDEFS="$S9XDEFS -DSYSTEM_ZIP",
-+ if test "x${with_system_zip}" != "xcheck"; then
-+ AC_MSG_ERROR([--with-system-zip requested but no proper zlib found.])
-+ else
-+ AC_MSG_WARN([zlib not found. Build without SYSTEM_ZIP support.])
-+ fi
-+ )
- else
-- AC_MSG_WARN([zlib not found. Build without ZIP support.])
-- enable_zip="no"
-+ if test "x$snes9x_cv_zlib" = "xyes"; then
-+ S9XZIP="S9XZIP=1"
-+ S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
-+ if test "x$enable_gzip" = "xno"; then
-+ S9XLIBS="$S9XLIBS -lz"
-+ fi
-+ else
-+ AC_MSG_WARN([zlib not found. Build without ZIP support.])
-+ enable_zip="no"
-+ fi
- fi
- fi
-
-@@ -427,9 +454,11 @@ S9XLIBS="$LIBS $S9XLIBS"
- S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/ */ /g'`"
- S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/ */ /g'`"
- S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/ */ /g'`"
-+S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/ */ /g'`"
- S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/^ *//'`"
- S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/^ *//'`"
- S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^ *//'`"
-+S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/^ *//'`"
-
- AC_SUBST(S9XFLGS)
- AC_SUBST(S9XDEFS)
-@@ -439,6 +468,7 @@ AC_SUBST(S9XDEBUGGER)
- AC_SUBST(S9XNETPLAY)
- AC_SUBST(S9XZIP)
- AC_SUBST(S9XJMA)
-+AC_SUBST(S9X_SYSTEM_ZIP)
-
- rm config.info 2>/dev/null
-
-@@ -459,6 +489,7 @@ netplay support...... $enable_netplay
- gamepad support...... $enable_gamepad
- GZIP support......... $enable_gzip
- ZIP support.......... $enable_zip
-+SYSTEM_ZIP........... $with_system_zip
- JMA support.......... $enable_jma
- debugger............. $enable_debugger
-
---
-2.10.2
-
diff --git a/games-emulation/snes9x/snes9x-1.54.1.ebuild b/games-emulation/snes9x/snes9x-1.54.1.ebuild
deleted file mode 100644
index 972c9db684b..00000000000
--- a/games-emulation/snes9x/snes9x-1.54.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib gnome2-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 +xv +xrandr"
-RESTRICT="bindist"
-
-RDEPEND="
- sys-libs/zlib[minizip]
- x11-libs/libX11
- x11-libs/libXext
- png? ( >=media-libs/libpng-1.2.43:0 )
- gtk? ( >=x11-libs/gtk+-2.10:2
- x11-misc/xdg-utils
- portaudio? ( >=media-libs/portaudio-19_pre )
- joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
- opengl? ( virtual/opengl )
- xv? ( x11-libs/libXv )
- xrandr? ( x11-libs/libXrandr )
- alsa? ( media-libs/alsa-lib )
- pulseaudio? ( media-sound/pulseaudio ) )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.54.1-build.patch
- "${FILESDIR}"/${PN}-1.53-cross-compile.patch
- "${FILESDIR}"/${PN}-1.54.1-system-zlib.patch
-)
-
-src_prepare() {
- cd "${WORKDIR}"/${P} || die
- rm -r unzip || die
- default
- cd unix
- 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
- econf \
- --enable-gzip \
- --enable-zip \
- --with-system-zip \
- $(use_enable joystick gamepad) \
- $(use_enable debug debugger) \
- $(use_enable netplay) \
- $(use_enable png screenshot)
-
- if use gtk; then
- cd ../gtk || die
- econf \
- --datadir=/usr/share \
- --with-zlib \
- --with-system-zip \
- $(use_enable nls) \
- $(use_with opengl) \
- $(use_with joystick) \
- $(use_with xv) \
- $(use_with xrandr) \
- $(use_with netplay) \
- $(use_with alsa) \
- $(use_with oss) \
- $(use_with pulseaudio) \
- $(use_with portaudio) \
- $(use_with png screenshot)
- fi
-}
-
-src_compile() {
- emake
- if use gtk; then
- emake -C ../gtk
- fi
-}
-
-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() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/
@ 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: f07e30eddd4de57e5ba7d7b68ac6840039cfa166
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 11:06:52 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 11:25:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07e30ed
games-emulation/snes9x: Bump to version 1.58
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.58-build-system.patch | 53 ++++++++
games-emulation/snes9x/snes9x-1.58.ebuild | 137 +++++++++++++++++++++
3 files changed, 191 insertions(+)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 43a9331b3fb..25c7726bab9 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,2 +1,3 @@
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.58-build-system.patch b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch
new file mode 100644
index 00000000000..8a15e0aa4ee
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch
@@ -0,0 +1,53 @@
+--- snes9x-1.58/gtk/configure.ac
++++ snes9x-1.58/gtk/configure.ac
+@@ -33,8 +33,8 @@
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.2])
+
+-snes9xlocaledir='${prefix}/share/locale'
+-snes9xdatadir='${prefix}/share/snes9x'
++snes9xlocaledir='$(localedir)'
++snes9xdatadir='$(datadir)/snes9x'
+
+ AC_SUBST(snes9xlocaledir)
+ AC_SUBST(snes9xdatadir)
+--- snes9x-1.58/unix/configure.ac
++++ snes9x-1.58/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.58.ebuild b/games-emulation/snes9x/snes9x-1.58.ebuild
new file mode 100644
index 00000000000..911de9a90fb
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.58.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 multilib netplay nls 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}
+ 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.58-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-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
+ cd ../gtk || die
+ myeconfargs=(
+ --with-gtk3
+ --with-zlib
+ --with-system-zip
+ --without-gtk2
+ $(use_enable nls)
+ $(use_with opengl)
+ $(use_with xv)
+ $(use_with alsa)
+ $(use_with oss)
+ $(use_with pulseaudio)
+ $(use_with portaudio)
+ $(use_with png screenshot)
+ $(use_with wayland)
+ )
+ econf "${myeconfargs[@]}"
+ fi
+}
+
+src_compile() {
+ emake
+ use gtk && emake -C ../gtk
+}
+
+src_install() {
+ dobin ${PN}
+
+ dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
+ dodoc snes9x.conf.default
+
+ if use gtk; then
+ emake -C ../gtk DESTDIR="${D}" install
+ dodoc ../gtk/AUTHORS
+ 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/, games-emulation/snes9x/files/
@ 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: 1a8dedb49d3d7590098469a7655eada1c2230499
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 14:26:29 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 14:26:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8dedb4
games-emulation/snes9x: Removed old.
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.56-build-system.patch | 53 --------
games-emulation/snes9x/snes9x-1.57.ebuild | 139 ---------------------
3 files changed, 193 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index c4da18a9d02..a282f323f91 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,3 +1,2 @@
-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.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
deleted file mode 100644
index d2ee182cb7c..00000000000
--- a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- snes9x-1.56/gtk/configure.ac
-+++ snes9x-1.56/gtk/configure.ac
-@@ -33,8 +33,8 @@
-
- AM_GLIB_GNU_GETTEXT
-
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
--snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
-+snes9xlocaledir='$(localedir)'
-+snes9xdatadir='$(datadir)/snes9x'
-
- AC_SUBST(snes9xlocaledir)
- AC_SUBST(snes9xdatadir)
---- snes9x-1.56/unix/configure.ac
-+++ snes9x-1.56/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.57.ebuild b/games-emulation/snes9x/snes9x-1.57.ebuild
deleted file mode 100644
index 5792fa5ac7e..00000000000
--- a/games-emulation/snes9x/snes9x-1.57.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 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
- dev-libs/libxml2
- >=x11-libs/gtk+-3.22:3[wayland?]
- 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 )
- wayland? ( dev-libs/wayland )
- )
- 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)
- $(use_with wayland)
- )
- 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/, games-emulation/snes9x/files/
@ 2023-03-26 7:38 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2023-03-26 7:38 UTC (permalink / raw
To: gentoo-commits
commit: c625adb56c417c3109f959192ffa2e992ab32c88
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 05:04:13 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 07:38:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c625adb5
games-emulation/snes9x: add 1.62.1
This (unfortunately) migrates from meson to cmake, some
revamping been done to adapt.
May still be a few things to adjust, the cli build (autoconf) vs
gtk (cmake, with a new not entirely perfect CMakeLists.txt) and
then libretro too (Makefile-only) makes the ebuild and dependency
checks messy.
Most of this may need review next bump.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 4 +
.../snes9x/files/snes9x-1.62.1-flags.patch | 24 +++
.../snes9x/files/snes9x-1.62.1-gcc13.patch | 20 +++
.../files/snes9x-1.62.1-optional-wayland.patch | 16 ++
games-emulation/snes9x/snes9x-1.62.1.ebuild | 186 +++++++++++++++++++++
5 files changed, 250 insertions(+)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 85d1edc3c9f2..3964e7efd91e 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,3 +1,7 @@
+DIST glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz 3694607 BLAKE2B c6ba30fc561c6053c3f685f2b7529053f56e0869e4c05013a1c59f39b4c97847c3e50c30859dce6f0c17c9f9bf21b96ebc04b510bcdc33f4ced87d892a36f94c SHA512 49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62
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
+DIST snes9x-1.62.1.tar.gz 3418415 BLAKE2B fa9826f0514d48610086fb1209465bfddac64f88bc0498a97912247922e7fe8e068a92343da7e99307c7f93c48d7103a53f1badf260cef0b9416af7d1a608b8a SHA512 7c0af6df596d8899ee29abf1ac42295f82cff95ffac0db5bb6b4018b03abb3b0768749c1a5e90f44203a1947658023de0e4fcbff20aa863909b15d218e26afc5
+DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
+DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
diff --git a/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch b/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch
new file mode 100644
index 000000000000..7b3b4dad399b
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch
@@ -0,0 +1,24 @@
+Avoid forcing -O3 and let users set these as wanted.
+--- a/libretro/Makefile
++++ b/libretro/Makefile
+@@ -579,6 +579,6 @@
+ CXXFLAGS += -O2 -DNDEBUG
+ else
+- CFLAGS += -O3 -DNDEBUG
+- CXXFLAGS += -O3 -DNDEBUG
++ CFLAGS += -DNDEBUG
++ CXXFLAGS += -DNDEBUG
+ endif
+
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -65,9 +65,4 @@
+ 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
+
diff --git a/games-emulation/snes9x/files/snes9x-1.62.1-gcc13.patch b/games-emulation/snes9x/files/snes9x-1.62.1-gcc13.patch
new file mode 100644
index 000000000000..28945fd782fc
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.62.1-gcc13.patch
@@ -0,0 +1,20 @@
+Partly a backport from
+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c8
+--- a/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h
++++ b/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h
+@@ -2615,4 +2615,8 @@
+ #endif
+
++#if VMA_STATS_STRING_ENABLED
++ #include <cstdio> // For snprintf
++#endif
++
+ /*******************************************************************************
+ CONFIGURATION SECTION
+--- a/vulkan/slang_shader.hpp
++++ b/vulkan/slang_shader.hpp
+@@ -1,3 +1,4 @@
+ #pragma once
++#include <cstdint>
+ #include <string>
+ #include <vector>
diff --git a/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch b/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch
new file mode 100644
index 000000000000..396f76a9d641
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch
@@ -0,0 +1,16 @@
+USE_SLANG currently disregards whether USE_WAYLAND was used or not
+and leads to trying to use wayland headers that may be missing.
+--- a/gtk/CMakeLists.txt
++++ b/gtk/CMakeLists.txt
+@@ -99,8 +99,10 @@
+
+ list(APPEND DEFINES "VK_USE_PLATFORM_XLIB_KHR"
+- "VK_USE_PLATFORM_WAYLAND_KHR"
+ "VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1"
+ "VMA_DYNAMIC_VULKAN_FUNCTIONS=1"
+ "VMA_STATIC_VULKAN_FUNCTIONS=0")
++ if(USE_WAYLAND)
++ list(APPEND DEFINES "VK_USE_PLATFORM_WAYLAND_KHR")
++ endif()
+ list(APPEND INCLUDES ../external/vulkan-headers/include)
+ list(APPEND INCLUDES ../external/VulkanMemoryAllocator-Hpp/include)
diff --git a/games-emulation/snes9x/snes9x-1.62.1.ebuild b/games-emulation/snes9x/snes9x-1.62.1.ebuild
new file mode 100644
index 000000000000..27b761fd134b
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.62.1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg
+
+# TODO: try unbundling, albeit compatibility with (and between) these
+# tend to be volatile and it may not be the best idea "yet"
+HASH_GLSLANG=6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7
+HASH_SPIRV=4e2fdb25671c742a9fbe93a6034eb1542244c7e1
+HASH_VULKAN=a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2
+
+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? (
+ https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> glslang-${HASH_GLSLANG}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/${HASH_SPIRV}.tar.gz
+ -> spirv-cross-${HASH_SPIRV}.tar.gz
+ https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ -> vulkan-headers-${HASH_VULKAN}.tar.gz
+ )"
+
+LICENSE="
+ Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
+ gui? ( Apache-2.0 CC0-1.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="alsa debug gui libretro netplay oss portaudio pulseaudio wayland xinerama +xv"
+RESTRICT="bindist"
+
+RDEPEND="
+ media-libs/libpng:=
+ 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/libepoxy
+ media-libs/libsdl2[joystick]
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[wayland?]
+ x11-libs/libXrandr
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-libs/libpulse )
+ wayland? ( dev-libs/wayland )
+ )
+ libretro? ( !games-emulation/libretro-snes9x )
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="
+ virtual/pkgconfig
+ gui? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.62.1-flags.patch
+ "${FILESDIR}"/${PN}-1.62.1-gcc13.patch
+ "${FILESDIR}"/${PN}-1.62.1-optional-wayland.patch
+)
+
+pkg_setup() {
+ # used by bundled glslang
+ use gui && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if use gui; then
+ rmdir external/{glslang,SPIRV-Cross,vulkan-headers} || die
+ mv ../glslang-${HASH_GLSLANG} external/glslang || die
+ mv ../SPIRV-Cross-${HASH_SPIRV} external/SPIRV-Cross || die
+ mv ../Vulkan-Headers-${HASH_VULKAN} external/vulkan-headers || die
+ fi
+
+ if use gui; then
+ CMAKE_USE_DIR=${S}/gtk
+ cmake_src_prepare
+ else
+ default
+ fi
+
+ pushd unix >/dev/null || die
+ eautoreconf
+ popd >/dev/null || die
+
+ rm -r unzip || die
+}
+
+src_configure() {
+ tc-export CC CXX # for libretro
+
+ local econfargs=(
+ $(use_enable alsa sound-alsa)
+ $(use_enable debug debugger)
+ $(use_enable netplay)
+ $(use_enable xinerama)
+ $(use_enable xv xvideo)
+ --enable-gamepad
+ --enable-gzip
+ --enable-screenshot
+ --enable-zip
+ --disable-libyuv # unpackaged
+ --with-system-zip
+ )
+
+ pushd unix >/dev/null || die
+ econf "${econfargs[@]}"
+ popd >/dev/null || die
+
+ if use gui; then
+ # bundled SPIRV-Cross fails with -Werror=odr
+ filter-lto
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=no
+ -DDEBUGGER=$(usex debug)
+ -DUSE_ALSA=$(usex alsa)
+ -DUSE_OSS=$(usex oss)
+ -DUSE_PORTAUDIO=$(usex portaudio)
+ -DUSE_PULSEAUDIO=$(usex pulseaudio)
+ -DUSE_SYSTEMZIP=yes
+ -DUSE_WAYLAND=$(usex wayland)
+ -DUSE_XV=$(usex xv)
+
+ # this controls both vulkan output and shader support, could be
+ # behind USE=vulkan but it currently fails to build if disabled
+ # and adds no dependencies given they are bundled (for now)
+ -DUSE_SLANG=yes
+
+ # gets used for LOCALE/DATADIR too early (installs to /usr//locale)
+ -DCMAKE_INSTALL_DATAROOTDIR=share
+ )
+
+ cmake_src_configure
+ fi
+}
+
+src_compile() {
+ if use libretro; then
+ emake -C libretro LTO=
+ # rebuild objects given libretro uses different defines (bug #791475)
+ rm *.o || die
+ fi
+
+ emake -C unix
+
+ use gui && cmake_src_compile
+}
+
+src_test() {
+ # currently no tests, but don't run the cmake phase while unconfigured
+ use gui && cmake_src_test
+}
+
+src_install() {
+ if use libretro; then
+ exeinto /usr/$(get_libdir)/libretro
+ doexe libretro/snes9x_libretro.so
+ fi
+
+ dobin unix/snes9x
+
+ local DOCS=(
+ README.md
+ docs/{changes,control-inputs,controls,snapshots}.txt
+ unix/snes9x.conf.default
+ )
+ einstalldocs
+
+ if use gui; then
+ DOCS=( AUTHORS )
+ cmake_src_install
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/
@ 2023-07-14 21:32 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2023-07-14 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 4ef984d3161709689705389eaffb1e198cc516d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 21:01:51 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 21:19:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef984d3
games-emulation/snes9x: drop 1.61
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 3 -
.../snes9x/files/snes9x-1.53-cross-compile.patch | 38 -----
.../snes9x/files/snes9x-1.59-build-system.patch | 40 ------
.../snes9x/files/snes9x-1.61-libretro-flags.patch | 25 ----
games-emulation/snes9x/metadata.xml | 1 -
games-emulation/snes9x/snes9x-1.61.ebuild | 153 ---------------------
6 files changed, 260 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 87bd2f99144e..44814a48aea1 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,7 +1,4 @@
DIST glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz 3694607 BLAKE2B c6ba30fc561c6053c3f685f2b7529053f56e0869e4c05013a1c59f39b4c97847c3e50c30859dce6f0c17c9f9bf21b96ebc04b510bcdc33f4ced87d892a36f94c SHA512 49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62
-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
DIST snes9x-1.62.3.tar.gz 3423799 BLAKE2B 0eaea11d4f0fa03b01d7ae86a559ad76df31d6e5a485ee09f75ec81824296a2f3182da6180dd60eb4bb9722cd3d8ce6ac3e0c1ae7c7740f2828fde1231c19a2a SHA512 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
deleted file mode 100644
index 7a0fe8a8bde8..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
-
- AC_CONFIG_SRCDIR([unix.cpp])
-
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
-
- AC_PROG_CC
- AC_PROG_CXX
-@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
- return (argc);
- }
- ],
-- [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
-+ [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
- ])
-
- CXXFLAGS="[$]OLD_CXXFLAGS"
-@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
-
- AC_CACHE_VAL([snes9x_cv_linux_os],
- [
-- case "$target" in
-+ case "$host" in
- *-*-linux*)
- snes9x_cv_linux_os="yes"
- ;;
-@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
- return (i < 0 ? 0 : 1);
- }
- ],
-- [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
-+ [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
-
- CXXFLAGS="[$]OLD_CXXFLAGS"
-
diff --git a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
deleted file mode 100644
index 2d8f9f05e59f..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/files/snes9x-1.61-libretro-flags.patch b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
deleted file mode 100644
index 297c7d78257d..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 8f63c2fe45fa..32c1701b6637 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
- <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>
diff --git a/games-emulation/snes9x/snes9x-1.61.ebuild b/games-emulation/snes9x/snes9x-1.61.ebuild
deleted file mode 100644
index 7300fb65bb2a..000000000000
--- a/games-emulation/snes9x/snes9x-1.61.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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"
-REQUIRED_USE="glslang? ( gui opengl )"
-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
end of thread, other threads:[~2023-07-14 21:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-14 21:32 [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2023-03-26 7:38 Ionen Wolkens
2019-03-03 14:26 Lars Wendler
2018-12-23 11:25 Lars Wendler
2018-06-11 9:59 Lars Wendler
2018-06-11 9:59 Lars Wendler
2016-11-11 17:17 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox