* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2022-04-08 2:43 Ronny Gutbrod
0 siblings, 0 replies; 9+ messages in thread
From: Ronny Gutbrod @ 2022-04-08 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 7ff1408eee83c9a9179f3f8569822444dbbb7e32
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr 7 07:35:49 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Thu Apr 7 08:14:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ff1408e
games-fps/assaultcube: don't delete bundled includes
Closes: https://bugs.gentoo.org/837002
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index a4af1076e..305b968c2 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -19,7 +19,6 @@ BDEPEND="sys-devel/clang"
src_prepare() {
eapply_user
sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
- rm -rf "${S}/source/include"
}
src_compile() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2022-04-08 2:43 Ronny Gutbrod
0 siblings, 0 replies; 9+ messages in thread
From: Ronny Gutbrod @ 2022-04-08 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 0a2871c4de308b73cc8b406182e99b25e9ff5922
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr 7 07:46:18 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Thu Apr 7 08:14:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0a2871c4
games-fps/assaultcube: add USE flags to SDL dependencies
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 7676be084..76316ec86 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -12,7 +12,13 @@ S="${WORKDIR}/AC-${PV}"
LICENSE="ZLIB assaultcube"
SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="sys-libs/zlib media-libs/libsdl2 media-libs/sdl2-image x11-libs/libX11 media-libs/libogg media-libs/libvorbis media-libs/openal"
+RDEPEND="sys-libs/zlib
+ media-libs/libsdl2[opengl]
+ media-libs/sdl2-image[jpeg,png]
+ x11-libs/libX11
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
PATCHES=(
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2022-04-08 2:43 Ronny Gutbrod
0 siblings, 0 replies; 9+ messages in thread
From: Ronny Gutbrod @ 2022-04-08 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 94f0d4472fad48bfbdd36043820b339ef2dfc3ce
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr 7 08:14:00 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Thu Apr 7 08:14:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=94f0d447
games-fps/assaultcube: add debug USE flag
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 9ac5610c5..d66c888b2 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch
${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
)
+IUSE="debug"
src_prepare() {
eapply ${PATCHES}
@@ -34,7 +35,11 @@ src_prepare() {
src_compile() {
cd "${S}/source/src"
- emake
+ if use debug; then
+ DEBUGBUILD=1 emake
+ else
+ emake
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2022-04-08 2:43 Ronny Gutbrod
0 siblings, 0 replies; 9+ messages in thread
From: Ronny Gutbrod @ 2022-04-08 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 50e63d61ee7e03ad01281a7a3d006d15eba48824
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Apr 7 08:01:17 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Thu Apr 7 08:14:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50e63d61
games-fps/assaultcube: fix checkinstall.sh, server installation
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 76316ec86..9ac5610c5 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -22,7 +22,8 @@ RDEPEND="sys-libs/zlib
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
PATCHES=(
- "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch"
+ "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch
+ ${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
)
src_prepare() {
@@ -42,7 +43,7 @@ src_install() {
install -dm755 "${D}/usr/share/assaultcube"
install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} -t "${D}/usr/share/assaultcube"
- install -Dm755 "${S}/bin_unix/native_client" -t "${D}/usr/share/assaultcube/bin_unix"
+ install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${D}/usr/share/assaultcube/bin_unix"
cp -r "${S}"/{bot,config,demos,docs,mods,packages} "${D}/usr/share/assaultcube/"
install -Dm644 "${S}"/{CONTRIBUTING.md,GOVERNANCE.md,README.{html,md},SECURITY.md} -t "${D}/usr/share/assaultcube"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2022-04-10 12:35 Andrew Ammerlaan
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2022-04-10 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 27a7384c4c9299ee4854d9da2bacab66b8343953
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Sat Apr 9 12:19:52 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 12:19:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27a7384c
games-fps/assaultcube: replace eapply{,user} with default
Again, thanks to thesamesam for reporting this.
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index d66c888b2..ef8e8f81f 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -22,14 +22,13 @@ RDEPEND="sys-libs/zlib
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
PATCHES=(
- "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch
- ${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
+ "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch"
+ "${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
)
IUSE="debug"
src_prepare() {
- eapply ${PATCHES}
- eapply_user
+ default
sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
2022-12-01 11:02 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
@ 2022-12-01 11:02 ` Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2022-12-01 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 1fd0cd09337447564aec34510f0ccbee6f54559d
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 11:01:37 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 11:02:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fd0cd09
games-fps/assaultcube: improve ebuild, add missing die etc.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 53 ++++++++++++++----------
games-fps/assaultcube/metadata.xml | 3 ++
2 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index a1169191a..0eb39ae03 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -9,55 +9,64 @@ DESCRIPTION="Free multiplayer FPS based on the Cube engine"
HOMEPAGE="https://assault.cubers.net/"
SRC_URI="https://github.com/assaultcube/AC/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/AC-${PV}"
+
LICENSE="ZLIB assaultcube"
SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="sys-libs/zlib
- media-libs/libsdl2[opengl]
- media-libs/sdl2-image[jpeg,png]
- x11-libs/libX11
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal"
+IUSE="debug"
+
+RDEPEND="
+ sys-libs/zlib
+ media-libs/libsdl2[opengl]
+ media-libs/sdl2-image[jpeg,png]
+ x11-libs/libX11
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
PATCHES=(
"${FILESDIR}/${PN}-1.3.0.2-respect-ldflags.patch"
- "${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
+ # a script which checks for required libs and certain parts of the game
+ "${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch"
)
-IUSE="debug"
src_prepare() {
default
- sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
+ sed -i 's|//#define PRODUCTION|#define PRODUCTION|' source/src/cube.h || die
+}
+
+src_configure() {
filter-lto
}
src_compile() {
- cd "${S}/source/src"
if use debug; then
- DEBUGBUILD=1 emake
- else
- emake
+ local -x DEBUGBUILD=1
fi
+ emake -C source/src
}
src_install() {
- cd "${S}/source/src"
- emake install
+ emake -C source/src install
- install -dm755 "${D}/usr/share/assaultcube"
- install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} -t "${D}/usr/share/assaultcube"
- install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${D}/usr/share/assaultcube/bin_unix"
- cp -r "${S}"/{bot,config,demos,docs,mods,packages} "${D}/usr/share/assaultcube/"
- install -Dm644 "${S}"/{CONTRIBUTING.md,GOVERNANCE.md,README.{html,md},SECURITY.md} -t "${D}/usr/share/assaultcube"
+ install -dm755 "${ED}/usr/share/assaultcube" || die
+ install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} \
+ -t "${ED}/usr/share/assaultcube" || die
+ install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${ED}/usr/share/assaultcube/bin_unix" || die
+ cp -r {bot,config,demos,docs,mods,packages} "${ED}/usr/share/assaultcube/" || die
+
+ dodoc CONTRIBUTING.md GOVERNANCE.md README.{html,md} SECURITY.md
make_desktop_entry \
- "/usr/share/assaultcube/assaultcube.sh %u" \
+ "${EPREFIX}/usr/share/assaultcube/assaultcube.sh %u" \
AssaultCube \
/usr/share/assaultcube/packages/misc/icon.png \
Game \
"Keywords=assaultcube;game;fps;\nMimeType=x-scheme-handler/assaultcube"
+
+ dosym "${EPREFIX}/usr/share/assaultcube/assaultcube.sh" usr/bin/assaultcube
}
pkg_postinst() {
diff --git a/games-fps/assaultcube/metadata.xml b/games-fps/assaultcube/metadata.xml
index 62988a0d4..9c7d38989 100644
--- a/games-fps/assaultcube/metadata.xml
+++ b/games-fps/assaultcube/metadata.xml
@@ -5,4 +5,7 @@
<email>duje.mihanovic@skole.hr</email>
<name>Duje Mihanović</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">assaultcube/AC</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2023-01-06 8:51 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2023-01-06 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 244aa1aa86c7dbafd1183d999698b45f83ef7011
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Jan 5 14:46:38 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 14:46:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=244aa1aa
games-fps/assaultcube: create relative symlink
This is done to stop pkgcheck from complaining about an absolute
symlink.
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 1ea47bda7..344f501e7 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -72,7 +72,7 @@ src_install() {
Game \
"Keywords=assaultcube;game;fps;\nMimeType=x-scheme-handler/assaultcube"
- dosym "${EPREFIX}/usr/share/assaultcube/assaultcube.sh" usr/bin/assaultcube
+ dosym -r "${EPREFIX}/usr/share/assaultcube/assaultcube.sh" "${EPREFIX}/usr/bin/assaultcube"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2023-01-06 8:51 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2023-01-06 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 389a7f7591372eb91e7eb2ca9afc5c6589876e51
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Thu Jan 5 14:50:35 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 14:50:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=389a7f75
games-fps/assaultcube: restrict mirror
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
index 344f501e7..25001c061 100644
--- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/0001-Fix-unnecessary-rebuild-on-make-install.patch"
"${FILESDIR}/0002-Don-t-configure-libenet-in-Makefile.patch"
)
+RESTRICT="mirror"
src_prepare() {
default
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/
@ 2023-09-19 6:23 Haelwenn Monnier
0 siblings, 0 replies; 9+ messages in thread
From: Haelwenn Monnier @ 2023-09-19 6:23 UTC (permalink / raw
To: gentoo-commits
commit: 5477873cdcfc3ac323e4e61cf3a8b7d7265f932e
Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Mon Sep 18 15:05:27 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Sep 18 15:09:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5477873c
games-fps/assaultcube: retire duje.mihanovic
Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
games-fps/assaultcube/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/games-fps/assaultcube/metadata.xml b/games-fps/assaultcube/metadata.xml
index 9c7d389894..a0715e477f 100644
--- a/games-fps/assaultcube/metadata.xml
+++ b/games-fps/assaultcube/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
<pkgmetadata>
- <maintainer type="person">
- <email>duje.mihanovic@skole.hr</email>
- <name>Duje Mihanović</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">assaultcube/AC</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-09-19 6:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-19 6:23 [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/ Haelwenn Monnier
-- strict thread matches above, loose matches on Subject: below --
2023-01-06 8:51 Florian Schmaus
2023-01-06 8:51 Florian Schmaus
2022-12-01 11:02 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
2022-12-01 11:02 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
2022-04-10 12:35 Andrew Ammerlaan
2022-04-08 2:43 Ronny Gutbrod
2022-04-08 2:43 Ronny Gutbrod
2022-04-08 2:43 Ronny Gutbrod
2022-04-08 2:43 Ronny Gutbrod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox