summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-04-04 14:48:54 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-04 15:19:44 +0200
commit9073c4a350957787107ad8565cc5361412ede6de (patch)
treeac5bfcdfdef0464c8f39718a34077ff17138b652 /games-emulation
parentgames-emulation/higan: Version bump to 116_pre20210404 (diff)
downloadgentoo-9073c4a350957787107ad8565cc5361412ede6de.tar.gz
gentoo-9073c4a350957787107ad8565cc5361412ede6de.tar.bz2
gentoo-9073c4a350957787107ad8565cc5361412ede6de.zip
games-emulation/higan: Drop 106_p1-r1
Closes: https://bugs.gentoo.org/661342 Closes: https://bugs.gentoo.org/739152 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/higan/Manifest1
-rw-r--r--games-emulation/higan/files/higan-106_p1-QA.patch117
-rw-r--r--games-emulation/higan/files/higan-106_p1-header-locations.patch24
-rw-r--r--games-emulation/higan/files/higan-106_p1-wrapper5
-rw-r--r--games-emulation/higan/higan-106_p1-r1.ebuild137
-rw-r--r--games-emulation/higan/metadata.xml1
6 files changed, 0 insertions, 285 deletions
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index f87f396c26e9..b6fe03d83b0d 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,2 +1 @@
-DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
DIST higan-116_pre20210404.tar.gz 9130899 BLAKE2B bb9830901d7014f9d442f3a3bd9bd82ad791d2ba62a3264cfc187e5d7498a5ec6eae1fff6509f5206d9a21294e2a3ef710fbed5fac3626ecc88c4156bd50f289 SHA512 8ee40d8b9867fe767d5321dc4df3e73039fa39b7ecad2eddb58c3114bcf42b1b2074396ae5c4783ca060057aeb4bca7110101cc44d9608fe7c4d5f561b3f40a5
diff --git a/games-emulation/higan/files/higan-106_p1-QA.patch b/games-emulation/higan/files/higan-106_p1-QA.patch
deleted file mode 100644
index 140fdf9a48e7..000000000000
--- a/games-emulation/higan/files/higan-106_p1-QA.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 3ca37e53f22bfbb4ef436829904dc75b1f4940ec Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:16:53 +0100
-Subject: [PATCH] Quickport higan-099-QA.patch to v106r1
-
----
- higan/GNUmakefile | 5 ++---
- higan/target-tomoko/GNUmakefile | 6 +++---
- icarus/GNUmakefile | 4 ++--
- nall/GNUmakefile | 19 -------------------
- 4 files changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/higan/GNUmakefile b/higan/GNUmakefile
-index 5eac824..2616ed1 100644
---- a/higan/GNUmakefile
-+++ b/higan/GNUmakefile
-@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux bsd),)
- flags += -fopenmp
- link += -fopenmp
- ifeq ($(binary),application)
-- flags += -march=native
- link += -Wl,-export-dynamic
- link += -lX11 -lXext
- else ifeq ($(binary),library)
-@@ -40,9 +39,9 @@ endif
- compile = \
- $(strip \
- $(if $(filter %.c,$<), \
-- $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
-+ $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \
- $(if $(filter %.cpp,$<), \
-- $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
-+ $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
- ) \
- ) \
- )
-diff --git a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile
-index bfdcbe2..bdb6d44 100644
---- a/higan/target-tomoko/GNUmakefile
-+++ b/higan/target-tomoko/GNUmakefile
-@@ -48,10 +48,10 @@ objects := $(ui_objects) $(objects)
- objects := $(patsubst %,obj/%.o,$(objects))
-
- obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
-- $(compiler) $(rubyflags) -c $< -o $@
-+ $(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@
-
- obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
-- $(compiler) $(hiroflags) -c $< -o $@
-+ $(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@
-
- obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/)
- obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/)
-@@ -67,7 +67,7 @@ obj/ui-resource.o:
-
- # targets
- build: $(objects)
-- $(strip $(compiler) -o out/$(name) $(objects) $(link))
-+ $(strip $(compiler) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- ifeq ($(platform),macos)
- @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/icarus/GNUmakefile b/icarus/GNUmakefile
-index d01465e..999c004 100644
---- a/icarus/GNUmakefile
-+++ b/icarus/GNUmakefile
-@@ -3,7 +3,7 @@ include ../nall/GNUmakefile
- include ../hiro/GNUmakefile
-
- name := icarus
--flags += -I..
-+flags += -I.. $(CXXFLAGS)
- link +=
-
- ifeq ($(platform),windows)
-@@ -15,7 +15,7 @@ objects += obj/icarus.o
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
-
- all: $(objects)
-- $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
-+ $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
- ifeq ($(platform),macos)
- @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f9865de..f864cde 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -59,25 +59,6 @@ ifeq ($(compiler),)
- endif
- endif
-
--# build settings
--ifeq ($(build),optimize)
-- flags += -O3
--else ifeq ($(build),release)
-- flags += -O2
--else ifeq ($(build),stable)
-- flags += -O1
--else ifeq ($(build),debug)
-- flags += -g
--else ifeq ($(build),profile)
-- flags += -pg
-- link += -pg
--else ifeq ($(build),instrument)
-- flags += -O3 -fprofile-generate
-- link += -lgcov
--else ifeq ($(build),optimize)
-- flags += -O3 -fprofile-use
--endif
--
- # clang settings
- ifeq ($(findstring clang++,$(compiler)),clang++)
- flags += -fno-strict-aliasing -fwrapv
---
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-header-locations.patch b/games-emulation/higan/files/higan-106_p1-header-locations.patch
deleted file mode 100644
index 7f72a1311491..000000000000
--- a/games-emulation/higan/files/higan-106_p1-header-locations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 420b10135f678367560621416799c48af0ef3764 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:44:22 +0100
-Subject: [PATCH] Patch header locations for Gentoo
-
----
- nall/GNUmakefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f864cde..41fdc08 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -82,6 +82,7 @@ endif
-
- # linux settings
- ifeq ($(platform),linux)
-+ flags += -I/usr/include/cairo/ -I/usr/include/gtk-2.0/ -I/usr/include/gtksourceview-2.0/
- link += -ldl
- endif
-
---
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-wrapper b/games-emulation/higan/files/higan-106_p1-wrapper
deleted file mode 100644
index 1de577fd1923..000000000000
--- a/games-emulation/higan/files/higan-106_p1-wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-[ -e "${HOME}"/.local/share/higan ] || mkdir "${HOME}"/.local/share/higan
-cp -ru /usr/share/higan/* "${HOME}"/.local/share/higan/
-exec ${0}.bin "$@"
diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
deleted file mode 100644
index 9fa08f508c25..000000000000
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A multi-system game emulator formerly known as bsnes"
-HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
-SRC_URI="https://gitlab.com/higan/higan/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}"/${PN}-${MY_COMMIT}-${MY_COMMIT}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
-REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
- || ( xv opengl sdl )"
-
-RDEPEND="
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- icarus? (
- x11-libs/gtksourceview:2.0
- x11-libs/gtk+:2
- x11-libs/pango
- dev-libs/atk
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype
- )
- ao? ( media-libs/libao )
- openal? ( media-libs/openal )
- alsa? ( media-libs/alsa-lib )
- pulseaudio? ( media-sound/pulseaudio )
- xv? ( x11-libs/libXv )
- opengl? ( virtual/opengl )
- sdl? ( media-libs/libsdl[X,joystick,video] )
- udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-arch/p7zip
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-header-locations.patch
- "${FILESDIR}"/${P}-QA.patch
-)
-
-disable_module() {
- sed -i \
- -e "s|$1\b||" \
- "${S}"/higan/target-tomoko/GNUmakefile || die
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
- nall/dl.hpp || die "fixing libdir failed!"
-
- # audio modules
- use ao || disable_module audio.ao
- use openal || disable_module audio.openal
- use pulseaudio || { disable_module audio.pulseaudio
- disable_module audio.pulseaudiosimple ;}
- use oss || disable_module audio.oss
- use alsa || disable_module audio.alsa
-
- # video modules
- use opengl || disable_module video.glx
- use xv || disable_module video.xvideo
- use sdl || disable_module video.sdl
-
- # input modules
- use sdl || disable_module input.sdl
- use udev || disable_module input.udev
-}
-
-src_compile() {
- local mytoolkit
-
- mytoolkit="gtk"
-
- # Needed for fluent audio (even on i5 hardware)
- export CFLAGS="${CFLAGS} -O3"
- export CXXFLAGS="${CXXFLAGS} -O3"
-
- if use icarus; then
- cd "${S}/icarus" || die
- emake \
- platform="linux" \
- compiler="$(tc-getCXX)"
- fi
-
- cd "${S}/higan" || die
- emake \
- platform="linux" \
- compiler="$(tc-getCXX)" \
- hiro="${mytoolkit}"
-}
-
-src_install() {
- if use icarus; then
- newbin "${S}"/icarus/out/icarus icarus
- fi
-
- newbin "${S}"/higan/out/${PN} ${PN}.bin
- newbin "${FILESDIR}"/${P}-wrapper ${PN}
- make_desktop_entry "${PN}" "${PN}"
-
- # copy home directory stuff to a global location (matching "${FILESDIR}"/${P}-wrapper)
- insinto /usr/share/${PN}
- doins -r higan/systems/*.sys
-
- doicon -s 512 higan/data/${PN}.png
- doicon higan/data/${PN}.svg
-}
-
-pkg_postinst() {
- #elog "optional dependencies:"
- #elog " dev-games/higan-ananke (extra rom load options)"
- #elog " games-util/higan-purify (Rom purifier)"
-
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
index b9316f15fc58..f23ba835ea1c 100644
--- a/games-emulation/higan/metadata.xml
+++ b/games-emulation/higan/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
- <flag name="icarus">Build icarus library manager</flag>
<flag name="gtk">Use GTK3 (Qt5 if disabled) user interface backend</flag>
</use>
<upstream>