[gentoo-commits] repo/gentoo:master commit in: games-action/nighthawk/
commit: 2ece89d3cd225052712a2e517f9730d4cb409d6b
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 19 20:32:55 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu May 19 20:34:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ece89d3
games-action/nighthawk: fix missing quotes
Overlooked that somehow.
Signed-off-by: Ionen Wolkens gentoo.org>
games-action/nighthawk/nighthawk-4.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/nighthawk/nighthawk-4.0.ebuild
b/games-action/nighthawk/nighthawk-4.0.ebuild
index 7eb832117342..5053cd117474 100644
--- a/games-action/nighthawk/nighthawk-4.0.ebuild
+++ b/games-action/nighthawk/nighthawk-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -45,7 +45,7 @@ src_install() {
dodoc WHATS_NEW
dodir /var/games
- > ${ED}/var/games/${PN}.scores || die
+ > "${ED}"/var/games/${PN}.scores || die
fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
fperms g+s /usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-action/nighthawk/files/, games-action/nighthawk/
commit: 729baebfd6c349644e41539c3d9990533a2189f7
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Sep 22 21:41:24 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Sep 22 22:25:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729baebf
games-action/nighthawk: drop 2.2-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-action/nighthawk/Manifest| 1 -
.../nighthawk/files/nighthawk-2.2-gcc42.patch | 24 ---
games-action/nighthawk/files/nighthawk.patch | 46 --
games-action/nighthawk/nighthawk-2.2-r1.ebuild | 28 -
4 files changed, 99 deletions(-)
diff --git a/games-action/nighthawk/Manifest b/games-action/nighthawk/Manifest
index cc8ef8758c7..22fd1e1c9ce 100644
--- a/games-action/nighthawk/Manifest
+++ b/games-action/nighthawk/Manifest
@@ -1,2 +1 @@
-DIST nighthawk-2.2-1.tar.gz 1079706 BLAKE2B
38b9e2fe6f9fe4b373ddae05f0277eea1dd65f921f99e0f728ca47630378ad865117846945ba5c708cef7120dbda8c5c1ac5a032738d974f2687be34fe561556
SHA512
dca5d0c01ed651dee0c29b939c832ae343ca70ff0eb7779e7c13007881cf75d96cadafbbac6b431cd473ce9b9e1347dd4ba90502627059439b5a9a557cbc3fcf
DIST nighthawk-4.0.tar.xz 3212124 BLAKE2B
ccd8d97ac03e6d984bdb56cad49ceabb7e6f61dd182d359e1410ff081e3fc456d2a844bc513238d6b10ba8c479661fb890a6c1e41815b7ac6f8f7f761209feb2
SHA512
f1d10026df3a2ab274b81c4e8f28c79c2ba21d6ccab59b217308b076fc7ed3ef4fa5f2b895b72902f72a652c950faa15e43f2e7c91bfc0e2c988ef1aee6859a6
diff --git a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
deleted file mode 100644
index a9ad8c98484..000
--- a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
a/src_sound/dsp_mixxer.c
-+++ b/src_sound/dsp_mixxer.c
-@@ -302,10 +302,8 @@
- for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
- {
- if(chmix[chan_no].funkctrl & 0x2)
--#pragma pack(1)
- sam = *((sDB *)chmix[chan_no].sample_addr +
- (unsigned long)chmix[chan_no].sample_ptr);
--#pragma pack()
- else
- sam = 0;
-
-@@ -364,10 +362,8 @@
- for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
- {
- if(chmix[chan_no].funkctrl & 0x2)
--#pragma pack(1)
- sam = *((sDW *)chmix[chan_no].sample_addr +
- (unsigned long)chmix[chan_no].sample_ptr);
--#pragma pack()
- else
- sam = 0;
- #ifdef DIGITAL_ECHOING
diff --git a/games-action/nighthawk/files/nighthawk.patch
b/games-action/nighthawk/files/nighthawk.patch
deleted file mode 100644
index accef759e68..000
--- a/games-action/nighthawk/files/nighthawk.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -c -3 -r nighthawk-2.2/src/nighthawk.cc nighthawk.orig/src/nighthawk.cc
-*** nighthawk-2.2/src/nighthawk.cc Sun May 23 01:10:59 1999
nighthawk.orig/src/nighthawk.ccFri Jul 12 04:18:38 2002
-***
-*** 20,25
20,26
- #include
- #include
- #include
-+ #include
- #include
- #include
- #include
-diff -c -3 -r nighthawk-2.2/src_sound/Make.common
nighthawk.orig/src_sound/Make.common
-*** nighthawk-2.2/src_sound/Make.commonSat May 1 18:04:08 1999
nighthawk.orig/src_sound/Make.common Fri Jul 12 04:23:51 2002
-***
-*** 10,16
-endif
- endif
-
-! HOST_SAFE = 0
-
- ifeq ($(HOSTTYPE),i386)
-HOST_SAFE = 1
10,16
-endif
- endif
-
-! HOST_SAFE = 1
-
- ifeq ($(HOSTTYPE),i386)
-HOST_SAFE = 1
-*** nighthawk-2.2/src/object.ccMon Sep 30 21:54:56 2002
nighthawk-orig/src/object.cc Mon Sep 30 21:55:05 2002
-***
-*** 32,37
32,39
- #include "tdroid_8xx.h"
- #include "tdroid_9xx.h"
-
-+ #include
-+
- /***
- *
- ***/
diff --git a/games-action/nighthawk/nighthawk-2.2-r1.ebuild
b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
deleted file mode 100644
index bba6757c9e1..000
--- a/games-action/nighthawk/nighthawk-2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tribute to Paradroid by Andrew Braybrook"
-HOMEPAGE="http://night-hawk.sourceforge.net/nighthawk.html;
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/arcade/${P}-1.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXpm"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/nighthawk.patch
- "${FILESDIR}"/${P}-gcc42.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's:AC_FD_MSG:6:g' configure || die #218936
- sed -i -e '/LDFLAGS = /d' src/Makefile.in || die
-}
[gentoo-commits] repo/gentoo:master commit in: games-action/nighthawk/files/, games-action/nighthawk/
commit: ee7266495040420fbf29d310f1e3f6df4802e4cb
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Sep 13 07:20:28 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Sep 13 08:07:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee726649
games-action/nighthawk: add 4.0
Brand new ebuild, upstream migrated to cmake which also
fixes clang issues wrt bug #730840.
Closes: https://bugs.gentoo.org/730840
Signed-off-by: Ionen Wolkens gentoo.org>
games-action/nighthawk/Manifest| 1 +
.../nighthawk/files/nighthawk-4.0-cmake.patch | 25 ++
games-action/nighthawk/nighthawk-4.0.ebuild| 56 ++
3 files changed, 82 insertions(+)
diff --git a/games-action/nighthawk/Manifest b/games-action/nighthawk/Manifest
index ce5f6e0b6b6..cc8ef8758c7 100644
--- a/games-action/nighthawk/Manifest
+++ b/games-action/nighthawk/Manifest
@@ -1 +1,2 @@
DIST nighthawk-2.2-1.tar.gz 1079706 BLAKE2B
38b9e2fe6f9fe4b373ddae05f0277eea1dd65f921f99e0f728ca47630378ad865117846945ba5c708cef7120dbda8c5c1ac5a032738d974f2687be34fe561556
SHA512
dca5d0c01ed651dee0c29b939c832ae343ca70ff0eb7779e7c13007881cf75d96cadafbbac6b431cd473ce9b9e1347dd4ba90502627059439b5a9a557cbc3fcf
+DIST nighthawk-4.0.tar.xz 3212124 BLAKE2B
ccd8d97ac03e6d984bdb56cad49ceabb7e6f61dd182d359e1410ff081e3fc456d2a844bc513238d6b10ba8c479661fb890a6c1e41815b7ac6f8f7f761209feb2
SHA512
f1d10026df3a2ab274b81c4e8f28c79c2ba21d6ccab59b217308b076fc7ed3ef4fa5f2b895b72902f72a652c950faa15e43f2e7c91bfc0e2c988ef1aee6859a6
diff --git a/games-action/nighthawk/files/nighthawk-4.0-cmake.patch
b/games-action/nighthawk/files/nighthawk-4.0-cmake.patch
new file mode 100644
index 000..83722b1e621
--- /dev/null
+++ b/games-action/nighthawk/files/nighthawk-4.0-cmake.patch
@@ -0,0 +1,25 @@
+Fix OpenGL underlink, man dir, and skip installing in $HOME.
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -111,5 +111,6 @@
+ # Check for OpenGL and GLU
+ #
+-pkg_check_modules (OPENGL glu)
++set(OpenGL_GL_PREFERENCE GLVND)
++find_package(OpenGL)
+ if (NOT OPENGL_FOUND)
+ message(FATAL_ERROR "OpenGL/GLU devel library not installed.")
+@@ -277,5 +278,5 @@
+ # Install nighthawk in games section of man page tree (iaw "man man")
+ #
+-install(FILES man/nighthawk.6 DESTINATION man/man6)
++install(FILES man/nighthawk.6 DESTINATION share/man/man6)
+
+ # From investigation work and a strong recommendation by GCB (aka wotnot),
+@@ -287,5 +288,5 @@
+ # risk that install will break on future distributions. JN, 08NOV20
+ #
+-if (UNIX AND NOT APPLE)
++if (0)
+ install(FILES ${CMAKE_BINARY_DIR}/nighthawk.desktop DESTINATION
${HOME_PATH}/Desktop)
+ install(CODE "execute_process(COMMAND chown ${USERNAME}.${USERNAME}
${HOME_PATH}/Desktop/nighthawk.desktop)")
diff --git a/games-action/nighthawk/nighthawk-4.0.ebuild
b/games-action/nighthawk/nighthawk-4.0.ebuild
new file mode 100644
index 000..7eb83211734
--- /dev/null
+++ b/games-action/nighthawk/nighthawk-4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Tribute to Paradroid by Andrew Braybrook"
+HOMEPAGE="https://night-hawk.sourceforge.io/;
+SRC_URI="mirror://sourceforge/night-hawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ acct-group/gamestat
+ media-libs/freeglut
+ media-libs/libglvnd
+ media-libs/libpng:=
+ media-libs/libvorbis
+ media-libs/openal
+ virtual/glu"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i '/SCORES_PATH/s|/var/tmp|${EPREFIX}/var/games|' CMakeLists.txt
|| die
+}
+
+src_configure() {
+ local mycmakeargs=( -DBUILD_NED=yes )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dodoc WHATS_NEW
+
+ dodir /var/games
+ > ${ED}/var/games/${PN}.scores || die
+
+ fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+ fperms g+s /usr/bin/${PN}
+ fperms 660 /var/games/${PN}.scores
+
+ newicon data/xpm/v4/nighthawk_desktop_icon.png ${PN}.png
+ make_desktop_entry ${PN} ${PN^}
+}
[gentoo-commits] repo/gentoo:master commit in: games-action/nighthawk/files/, games-action/nighthawk/
commit: 0e486ae3d6c75c193a3a56f9abbb6a802bcaef9f
Author: Austin English gentoo org>
AuthorDate: Wed Jul 27 16:53:27 2016 +
Commit: Austin English gentoo org>
CommitDate: Wed Jul 27 16:55:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e486ae3
games-action/nighthawk: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
.../nighthawk/files/nighthawk-2.2-gcc42.patch | 4 +--
games-action/nighthawk/nighthawk-2.2-r1.ebuild | 29 ++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
index 619acd3..a9ad8c9 100644
--- a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
+++ b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
@@ -1,5 +1,5 @@
src_sound/dsp_mixxer.c
-+++ src_sound/dsp_mixxer.c
+--- a/src_sound/dsp_mixxer.c
b/src_sound/dsp_mixxer.c
@@ -302,10 +302,8 @@
for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
{
diff --git a/games-action/nighthawk/nighthawk-2.2-r1.ebuild
b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
new file mode 100644
index 000..40f9521
--- /dev/null
+++ b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A tribute to Paradroid by Andrew Braybrook"
+HOMEPAGE="http://night-hawk.sourceforge.net/nighthawk.html;
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/arcade/${P}-1.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/nighthawk.patch
+ "${FILESDIR}"/${P}-gcc42.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:AC_FD_MSG:6:g' configure || die #218936
+ sed -i -e '/LDFLAGS = /d' src/Makefile.in || die
+}
