From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 473CB13835A for ; Fri, 8 May 2020 11:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EA83E0857; Fri, 8 May 2020 11:07:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 337E4E0857 for ; Fri, 8 May 2020 11:07:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1361134EEF9 for ; Fri, 8 May 2020 11:07:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 705A11F2 for ; Fri, 8 May 2020 11:07:14 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1588936003.7c6510c00764dad11d3d1d6f1d02f013c0ed1d2e.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/eureka/files/, games-util/eureka/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/eureka/Manifest games-util/eureka/eureka-1.27b.ebuild games-util/eureka/files/eureka-Makefile.patch games-util/eureka/metadata.xml X-VCS-Directories: games-util/eureka/files/ games-util/eureka/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 7c6510c00764dad11d3d1d6f1d02f013c0ed1d2e X-VCS-Branch: master Date: Fri, 8 May 2020 11:07:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a284ea1-6a76-428e-929d-73d54e0e2f65 X-Archives-Hash: 96c399c1cdf52d46dde39c6470102b03 commit: 7c6510c00764dad11d3d1d6f1d02f013c0ed1d2e Author: James Le Cuirot gentoo org> AuthorDate: Fri May 8 11:06:43 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Fri May 8 11:06:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6510c0 games-util/eureka: New package Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot gentoo.org> games-util/eureka/Manifest | 1 + games-util/eureka/eureka-1.27b.ebuild | 52 +++++++++++++++++++ games-util/eureka/files/eureka-Makefile.patch | 74 +++++++++++++++++++++++++++ games-util/eureka/metadata.xml | 11 ++++ 4 files changed, 138 insertions(+) diff --git a/games-util/eureka/Manifest b/games-util/eureka/Manifest new file mode 100644 index 00000000000..958451c501b --- /dev/null +++ b/games-util/eureka/Manifest @@ -0,0 +1 @@ +DIST eureka-1.27b-source.tar.gz 1159366 BLAKE2B 00410b0cd53c907983241bf94c631c3068015e29ac947d092048a5701a4e0102d66d99134731b152a1310473dd30513e1fdc89bde82a5ede47185419575c9dd2 SHA512 4b2ce44a99acbe1b9dd2cf31ee5c3307f5f667422ba18bee8c3f9858e9244ee05c48e96b5afa4cdf65dfd079bca19a5693b6d123b5563549d1f84ca03137eb5e diff --git a/games-util/eureka/eureka-1.27b.ebuild b/games-util/eureka/eureka-1.27b.ebuild new file mode 100644 index 00000000000..f31ff7c9e48 --- /dev/null +++ b/games-util/eureka/eureka-1.27b.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs xdg + +DESCRIPTION="Graphical map editor for games using the DOOM engine" +HOMEPAGE="http://eureka-editor.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}-editor/Eureka/${PV%[a-z]}/${P}-source.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+opengl" + +DEPEND=" + media-libs/glu + sys-libs/zlib + x11-libs/fltk:1[opengl?] + opengl? ( virtual/opengl ) +" + +RDEPEND=" + ${DEPEND} +" + +S="${WORKDIR}/${P}-source" + +PATCHES=( + "${FILESDIR}"/${PN}-Makefile.patch +) + +DOCS=( + AUTHORS.txt + CHANGES.txt + README.txt + TODO.txt +) + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + OPENGL="$(usex opengl 1 0)" +} + +src_install() { + emake install PREFIX="${ED}/usr" + einstalldocs + + doicon -s 32 misc/${PN}.xpm + domenu misc/${PN}.desktop +} diff --git a/games-util/eureka/files/eureka-Makefile.patch b/games-util/eureka/files/eureka-Makefile.patch new file mode 100644 index 00000000000..567f5476c03 --- /dev/null +++ b/games-util/eureka/files/eureka-Makefile.patch @@ -0,0 +1,74 @@ +From faf9c604becc44135d6c5a7c8427982e203a327f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 8 May 2020 11:26:18 +0100 +Subject: [PATCH 1/2] Allow software rendering to be easily chosen over OpenGL + with OPENGL=0 + +--- + Makefile | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index ebbd53a4..adabaa92 100644 +--- a/Makefile ++++ b/Makefile +@@ -26,19 +26,26 @@ CPPFLAGS ?= + LDFLAGS ?= $(OPTIMISE) + LIBS ?= + ++# set this to 0 to use software rendering instead of OpenGL ++OPENGL = 1 ++ + # general things needed by Eureka + CXXFLAGS += $(CXX_DIALECT) +-LIBS += -lGLU -lGL + LIBS += -lz -lm ++FLTK_CONFIG_FLAGS = + +-# add this for software rendering, remove '--use-gl' below, remove -lGL and -lGLU from LIBS +-# CXXFLAGS += -DNO_OPENGL ++ifeq ($(OPENGL),1) ++LIBS += -lGLU -lGL ++FLTK_CONFIG_FLAGS += --use-gl ++else ++CXXFLAGS += -DNO_OPENGL ++endif + + # FLTK flags (this assumes a system-wide FLTK installation) + FLTK_CONFIG ?= fltk-config + +-CXXFLAGS += $(shell $(FLTK_CONFIG) --use-images --use-gl --cxxflags) +-LDFLAGS += $(shell $(FLTK_CONFIG) --use-images --use-gl --ldflags) ++CXXFLAGS += $(shell $(FLTK_CONFIG) --use-images --cxxflags $(FLTK_CONFIG_FLAGS)) ++LDFLAGS += $(shell $(FLTK_CONFIG) --use-images --ldflags $(FLTK_CONFIG_FLAGS)) + + # NOTE: the following is commented out since it does not work as expected. + # the --libs option gives us static libraries, but --ldflags option +-- +2.26.2 + +From decee12e317e58128420771392b77c44a7c81122 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 8 May 2020 11:27:49 +0100 +Subject: [PATCH 2/2] Ensure bin directory is present before installing binary + +It might not be when using DESTDIR. +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index adabaa92..424ad4b5 100644 +--- a/Makefile ++++ b/Makefile +@@ -158,6 +158,7 @@ stripped: all + INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka + + install: all ++ install -d $(DESTDIR)$(PREFIX)/bin + install -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/ + install -d $(INSTALL_DIR)/games + install -d $(INSTALL_DIR)/common +-- +2.26.2 + diff --git a/games-util/eureka/metadata.xml b/games-util/eureka/metadata.xml new file mode 100644 index 00000000000..d122d0e0090 --- /dev/null +++ b/games-util/eureka/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + eureka-editor + +