[gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/
@ 2021-04-04 13:23 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9073c4a350957787107ad8565cc5361412ede6de
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 12:48:54 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 13:19:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9073c4a3

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 <AT> gentoo.org>

 games-emulation/higan/Manifest                     |   1 -
 games-emulation/higan/files/higan-106_p1-QA.patch  | 117 ------------------
 .../files/higan-106_p1-header-locations.patch      |  24 ----
 games-emulation/higan/files/higan-106_p1-wrapper   |   5 -
 games-emulation/higan/higan-106_p1-r1.ebuild       | 137 ---------------------
 games-emulation/higan/metadata.xml                 |   1 -
 6 files changed, 285 deletions(-)

diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index f87f396c26e..b6fe03d83b0 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 140fdf9a48e..00000000000
--- 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 7f72a131149..00000000000
--- 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 1de577fd192..00000000000
--- 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 9fa08f508c2..00000000000
--- 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 b9316f15fc5..f23ba835ea1 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>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/
@ 2023-04-23  3:34 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-04-23  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     601039b9ab17b4ee94fedf6289d1050b7de33b7e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 03:21:34 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 03:33:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601039b9

games-emulation/higan: fix build w/ gcc13 + update deps

Doesn't overly need a revbump for the fix, but it's an excuse
to replace the mostly deprecated deps at same time.

Thankfully trivial considering that upstream is still inactive,
imagine this will break in a worse way sooner or later.

Closes: https://bugs.gentoo.org/898898
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/higan/files/higan-116_pre20210818-gcc13.patch      | 7 +++++++
 ...n-116_pre20210818-r1.ebuild => higan-116_pre20210818-r2.ebuild} | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/games-emulation/higan/files/higan-116_pre20210818-gcc13.patch b/games-emulation/higan/files/higan-116_pre20210818-gcc13.patch
new file mode 100644
index 000000000000..8e55894b521f
--- /dev/null
+++ b/games-emulation/higan/files/higan-116_pre20210818-gcc13.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/898898
+--- a/nall/arithmetic/natural.hpp
++++ b/nall/arithmetic/natural.hpp
+@@ -1 +1,3 @@
++#include <stdexcept>
++
+ #define ConcatenateType(Size) uint##Size##_t

diff --git a/games-emulation/higan/higan-116_pre20210818-r1.ebuild b/games-emulation/higan/higan-116_pre20210818-r2.ebuild
similarity index 94%
rename from games-emulation/higan/higan-116_pre20210818-r1.ebuild
rename to games-emulation/higan/higan-116_pre20210818-r2.ebuild
index a839c1ef8e50..79950540ab17 100644
--- a/games-emulation/higan/higan-116_pre20210818-r1.ebuild
+++ b/games-emulation/higan/higan-116_pre20210818-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,8 +24,8 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
 	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
+	opengl? ( media-libs/libglvnd[X] )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? ( media-libs/libsdl2[joystick] )
 	udev? ( virtual/libudev:= )
 	xv? ( x11-libs/libXv )
@@ -51,6 +51,7 @@ PATCHES=(
 	# insane build system, reinvents every built-in rule
 	"${FILESDIR}"/${PN}-116_pre20210404-makefile.patch
 	"${FILESDIR}"/${PN}-116_pre20210818-paths.patch
+	"${FILESDIR}"/${PN}-116_pre20210818-gcc13.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/
@ 2018-04-29 11:26 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-04-29 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c3a082f24694b6204ef4377c282314c61a4975b3
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 10:37:35 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 11:26:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a082f2

games-emulation/higan: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-emulation/higan/Manifest                 |   1 -
 games-emulation/higan/files/higan-099-QA.patch |  79 --------------
 games-emulation/higan/higan-099.ebuild         | 138 -------------------------
 3 files changed, 218 deletions(-)

diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 70d8f65c8fa..21f340144cd 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_v099-source.7z 1012348 BLAKE2B db3eb7b8819532786e6f2dd664225abddc49d12cf5c525862578523240c76ab3ac2680537e04b347130ae7e821d1d98e6c4bf25cf47449567afd90887989aa0e SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6

diff --git a/games-emulation/higan/files/higan-099-QA.patch b/games-emulation/higan/files/higan-099-QA.patch
deleted file mode 100644
index fd4eb13dd34..00000000000
--- a/games-emulation/higan/files/higan-099-QA.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile
---- a/higan/GNUmakefile	2016-06-17 18:56:06.414883957 +0200
-+++ b/higan/GNUmakefile	2016-06-17 18:56:19.075903050 +0200
-@@ -4,7 +4,7 @@
- # target := loki
- # console := true
- 
--flags += -I. -I.. -O3
-+flags += -I. -I..
- objects := libco audio video resource
- 
- # profile-guided optimization mode
-@@ -31,7 +31,7 @@
- else ifeq ($(platform),macosx)
-   flags += -march=native
- else ifneq ($(filter $(platform),linux bsd),)
--  flags += -march=native -fopenmp
-+  flags += -fopenmp
-   link += -fopenmp
-   link += -Wl,-export-dynamic
-   link += -lX11 -lXext
-@@ -42,9 +42,9 @@
- 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 $@ \
-       ) \
-     ) \
-   )
-
---- a/higan/target-tomoko/GNUmakefile	2016-06-17 19:10:27.729182818 +0200
-+++ b/higan/target-tomoko/GNUmakefile	2016-06-17 19:14:34.034554246 +0200
-@@ -45,10 +45,10 @@
- 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)/)
-@@ -64,7 +64,7 @@
- 
- # targets
- build: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link))
-+	$(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- ifeq ($(platform),macosx)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-
---- a/icarus/GNUmakefile	2016-07-05 16:42:09.198091772 +0200
-+++ b/icarus/GNUmakefile	2016-07-05 16:48:14.388351427 +0200
-@@ -2,7 +2,7 @@
- include ../hiro/GNUmakefile
- 
- name := icarus
--flags += -I.. -O3
-+flags += -I.. $(CXXFLAGS)
- link +=
- 
- ifeq ($(platform),windows)
-@@ -14,7 +14,7 @@
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
- 
- all: $(objects)
--	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
-+	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
- ifeq ($(platform),macosx)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/

diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
deleted file mode 100644
index 7bea4f56b14..00000000000
--- a/games-emulation/higan/higan-099.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils toolchain-funcs qmake-utils games
-
-MY_P=${PN}_v${PV}-source
-
-DESCRIPTION="A Nintendo multi-system emulator formerly known as bsnes"
-HOMEPAGE="http://byuu.org/higan/ https://code.google.com/p/higan/"
-SRC_URI="http://download.byuu.org/${MY_P}.7z"
-
-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}
-	app-arch/p7zip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-disable_module() {
-	sed -i \
-		-e "s|$1\b||" \
-		"${S}"/higan/target-tomoko/GNUmakefile || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
-
-	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.xv
-	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"
-
-	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}"
-
-	sed \
-		-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
-		< "${FILESDIR}"/${PN}-wrapper \
-		> out/${PN}-wrapper || die "generating wrapper failed!"
-}
-
-src_install() {
-	if use icarus; then
-		newgamesbin "${S}"/icarus/out/icarus icarus
-	fi
-	newgamesbin "${S}"/higan/out/${PN} ${PN}.bin
-	newgamesbin "${S}"/higan/out/${PN}-wrapper ${PN}
-	make_desktop_entry "${PN}" "${PN}"
-
-	# copy home directory stuff to a global location
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r higan/data/cheats.bml higan/profile/*
-
-	doicon -s 512 higan/data/${PN}.png
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	#elog "optional dependencies:"
-	#elog "  dev-games/higan-ananke (extra rom load options)"
-	#elog "  games-util/higan-purify (Rom purifier)"
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/
@ 2016-07-08 18:55 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-07-08 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a251319c0441428d1cad733669e56e8afdd7b9
Author:     Andrea Blankenstijn <a.b <AT> kaze <DOT> ch>
AuthorDate: Thu Jul  7 11:44:44 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 18:27:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a25131

games-emulation/higan: version bump to 099.

* new USE icarus: replace ananke.

* remove USE performance profiles doesn't exist anymore (?).

Package-Manager: portage-2.2.26
Closes: https://github.com/gentoo/gentoo/pull/1841

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 games-emulation/higan/Manifest                 |   1 +
 games-emulation/higan/files/higan-099-QA.patch |  79 ++++++++++++++
 games-emulation/higan/higan-099.ebuild         | 138 +++++++++++++++++++++++++
 games-emulation/higan/metadata.xml             |   1 +
 4 files changed, 219 insertions(+)

diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 69de8c5..1500194 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1 +1,2 @@
 DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
+DIST higan_v099-source.7z 1012348 SHA256 1c62f2f1ec98da9d098c2df5c8b539a192b5a70eff0896c3e27d541fb4d28e86 SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6 WHIRLPOOL 096b4da32f9f030a402690e81dc64e0a242072fd7cb3aa1520783a3a69bd76ff73d3fbcfb3624ad9cf9396e5123777a9cd4fd13f04191fe7faf9ec385c1a929e

diff --git a/games-emulation/higan/files/higan-099-QA.patch b/games-emulation/higan/files/higan-099-QA.patch
new file mode 100644
index 0000000..fd4eb13
--- /dev/null
+++ b/games-emulation/higan/files/higan-099-QA.patch
@@ -0,0 +1,79 @@
+diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile
+--- a/higan/GNUmakefile	2016-06-17 18:56:06.414883957 +0200
++++ b/higan/GNUmakefile	2016-06-17 18:56:19.075903050 +0200
+@@ -4,7 +4,7 @@
+ # target := loki
+ # console := true
+ 
+-flags += -I. -I.. -O3
++flags += -I. -I..
+ objects := libco audio video resource
+ 
+ # profile-guided optimization mode
+@@ -31,7 +31,7 @@
+ else ifeq ($(platform),macosx)
+   flags += -march=native
+ else ifneq ($(filter $(platform),linux bsd),)
+-  flags += -march=native -fopenmp
++  flags += -fopenmp
+   link += -fopenmp
+   link += -Wl,-export-dynamic
+   link += -lX11 -lXext
+@@ -42,9 +42,9 @@
+ 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 $@ \
+       ) \
+     ) \
+   )
+
+--- a/higan/target-tomoko/GNUmakefile	2016-06-17 19:10:27.729182818 +0200
++++ b/higan/target-tomoko/GNUmakefile	2016-06-17 19:14:34.034554246 +0200
+@@ -45,10 +45,10 @@
+ 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)/)
+@@ -64,7 +64,7 @@
+ 
+ # targets
+ build: $(objects)
+-	$(strip $(compiler) -o out/$(name) $(objects) $(link))
++	$(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
+ ifeq ($(platform),macosx)
+ 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
+ 	mkdir -p out/$(name).app/Contents/MacOS/
+
+--- a/icarus/GNUmakefile	2016-07-05 16:42:09.198091772 +0200
++++ b/icarus/GNUmakefile	2016-07-05 16:48:14.388351427 +0200
+@@ -2,7 +2,7 @@
+ include ../hiro/GNUmakefile
+ 
+ name := icarus
+-flags += -I.. -O3
++flags += -I.. $(CXXFLAGS)
+ link +=
+ 
+ ifeq ($(platform),windows)
+@@ -14,7 +14,7 @@
+ objects += $(if $(call streq,$(platform),windows),obj/resource.o)
+ 
+ all: $(objects)
+-	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
++	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
+ ifeq ($(platform),macosx)
+ 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
+ 	mkdir -p out/$(name).app/Contents/MacOS/

diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
new file mode 100644
index 0000000..58bee1c
--- /dev/null
+++ b/games-emulation/higan/higan-099.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils toolchain-funcs qmake-utils games
+
+MY_P=${PN}_v${PV}-source
+
+DESCRIPTION="A Nintendo multi-system emulator formerly known as bsnes"
+HOMEPAGE="http://byuu.org/higan/ https://code.google.com/p/higan/"
+SRC_URI="http://download.byuu.org/${MY_P}.7z"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ao +alsa +icarus openal opengl oss pulseaudio qt4 +sdl udev xv"
+REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
+	|| ( xv opengl sdl )"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	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 )
+	!qt4? ( x11-libs/gtk+:2 )
+	qt4? ( >=dev-qt/qtgui-4.5:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+disable_module() {
+	sed -i \
+		-e "s|$1\b||" \
+		"${S}"/higan/target-tomoko/GNUmakefile || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-QA.patch
+
+	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.xv
+	use sdl || disable_module video.sdl
+
+	# input modules
+	use sdl || disable_module input.sdl
+	use udev || disable_module input.udev
+
+	# regenerate .moc if needed
+	if use qt4; then
+		cd hiro/qt || die
+		 "$(qt4_get_bindir)"/moc -i -I. -o qt.moc qt.hpp || die
+	fi
+}
+
+src_compile() {
+	local mytoolkit
+
+	if use qt4; then
+		mytoolkit="qt"
+	else
+		mytoolkit="gtk"
+	fi
+
+	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}"
+
+	sed \
+		-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
+		< "${FILESDIR}"/${PN}-wrapper \
+		> out/${PN}-wrapper || die "generating wrapper failed!"
+}
+
+src_install() {
+	if use icarus; then
+		newgamesbin "${S}"/icarus/out/icarus icarus
+	fi
+	newgamesbin "${S}"/higan/out/${PN} ${PN}.bin
+	newgamesbin "${S}"/higan/out/${PN}-wrapper ${PN}
+	make_desktop_entry "${PN}" "${PN}"
+
+	# copy home directory stuff to a global location
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r higan/data/cheats.bml higan/profile/*
+
+	doicon -s 512 higan/data/${PN}.png
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	#elog "optional dependencies:"
+	#elog "  dev-games/higan-ananke (extra rom load options)"
+	#elog "  games-util/higan-purify (Rom purifier)"
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
index e8be774..fad703a 100644
--- a/games-emulation/higan/metadata.xml
+++ b/games-emulation/higan/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="icarus">Build icarus library manager</flag>
 		<flag name="profile_accuracy">
 			Compile a binary optimized for accuracy</flag>
 		<flag name="profile_balanced">


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-04-23  3:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-04 13:23 [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-04-23  3:34 Ionen Wolkens
2018-04-29 11:26 Pacho Ramos
2016-07-08 18:55 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox