assaultcube git - overlay - drkhsh gentoo overlay
HTML git clone git://git.drkhsh.at/overlay.git
DIR Log
DIR Files
DIR Refs
DIR README
---
DIR commit aec054ebdb5d8f2f1c1084e2948700d07c3d46a2
DIR parent 473497f8a8b7355ef957427f3725ad96d9ccfeb2
HTML Author: aaron marcher <me@drkhsh.at>
Date: Thu, 27 Jul 2017 21:53:44 +0200
assaultcube git
Diffstat:
D games-fps/assaultcube/Manifest | 1 -
D games-fps/assaultcube/assaultcube-… | 95 ------------------------------
A games-fps/assaultcube/assaultcube-… | 66 +++++++++++++++++++++++++++++++
A games-fps/assaultcube/files/assaul… | 3 +++
D games-fps/assaultcube/files/assaul… | 133 -------------------------------
A games-fps/assaultcube/files/assaul… | 12 ++++++++++++
6 files changed, 81 insertions(+), 229 deletions(-)
---
DIR diff --git a/games-fps/assaultcube/Manifest b/games-fps/assaultcube/Manifest
@@ -1 +0,0 @@
-DIST AssaultCube_v1.2.0.2.tar.bz2 52975325 SHA256 77ac41bdf07f6d74367e29089c2ee34da5ef53fdf979d7dfad58c3edce5f0717 SHA512 9563970403578c946ce03561621e2ea203604e3c3d9d1d784b62122a7f65eaa2e238ac4b88052336a0f18171da0e94342bf3d73f732bceb86eb58a6111e70d7b WHIRLPOOL 26c474b13f301075c6bbc8b293960811b770fbd7b4be8f5d66d9580f63744bafd98fc77a56f0c3dbcd4ce9f019a793dc41758f8d76198480c22f83d132c1d611
DIR diff --git a/games-fps/assaultcube/assaultcube-1.2.0.2-r2.ebuild b/games-fps/assaultcube/assaultcube-1.2.0.2-r2.ebuild
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils games
-
-MY_PN="AssaultCube"
-DESCRIPTION="Fast and fun first-person-shooter based on the Cube fps"
-HOMEPAGE="http://assault.cubers.net"
-SRC_URI="https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated doc server"
-
-RDEPEND="
- net-libs/enet
- sys-libs/zlib
- net-misc/curl
- !dedicated? (
- media-libs/libsdl[X,opengl,video]
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- media-libs/sdl-image[jpeg,png]
- virtual/opengl
- x11-libs/libX11
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/AssaultCube_v${PV}
-
-src_prepare() {
- # patch makefile
- epatch "${FILESDIR}"/${PN}-${PV}-makefile.patch
-
- # remove unsued stuff
- rm -r bin_unix/* || die
- find packages -name *.txt -delete || die
-
- # respect fhs and fix binary name
- sed -i \
- -e "/^CUBE_DIR=/d ; 2iCUBE_DIR=$(games_get_libdir)/${PN}" \
- -e "s:bin_unix/\${SYSTEM_NAME}\${MACHINE_NAME}:ac_:" \
- -e "s:cd \${CUBE_DIR}:cd ${GAMES_DATADIR}/${PN}:" \
- ${PN}.sh server.sh || die
-
- # remove bundled enet
- rm -r source/enet || die
-}
-
-src_compile() {
- BUNDLED_ENET=NO \
- emake -C source/src \
- $(usex dedicated "" "client") \
- $(usex dedicated "server" "$(usex server "server" "")")
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r config packages
-
- exeinto "$(games_get_libdir)/${PN}"
- if ! use dedicated ; then
- doexe source/src/ac_client
- newgamesbin ${PN}.sh ${PN}
- make_desktop_entry ${PN} ${MY_PN} ${PN}
- fi
-
- if use dedicated || use server ; then
- doexe source/src/ac_server
- newgamesbin server.sh ${PN}-server
- make_desktop_entry ${PN}-server "${MY_PN} Server" ${PN}
- fi
-
- if use doc ; then
- rm -r docs/autogen || die
- dohtml -r docs/*
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
-}
-
-pkg_postinst() {
- games_pkg_postinst
-}
DIR diff --git a/games-fps/assaultcube/assaultcube-9999.ebuild b/games-fps/assaultcube/assaultcube-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-2 games
+
+MY_PN="AssaultCube"
+DESCRIPTION="Fast and fun first-person-shooter based on the Cube fps"
+HOMEPAGE="http://assault.cubers.net"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+EGIT_REPO_URI="https://github.com/assaultcube/AC"
+
+RDEPEND="
+ sys-libs/zlib
+ net-misc/curl
+ !dedicated? (
+ media-libs/libsdl[X,opengl,video]
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+ media-libs/sdl-image[jpeg,png]
+ virtual/opengl
+ x11-libs/libX11
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # patch makefile
+ epatch "${FILESDIR}"/${PN}-g++.patch
+
+ # remove unsued stuff
+ rm -r bin_win32/* || die
+ find packages -name *.txt -delete || die
+}
+
+src_compile() {
+ emake -C source/src
+}
+
+src_install() {
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r config packages
+
+ exeinto "$(games_get_libdir)/${PN}"
+ doexe source/src/ac_client
+ newgamesbin "${FILESDIR}"/${PN} ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+}
DIR diff --git a/games-fps/assaultcube/files/assaultcube b/games-fps/assaultcube/files/assaultcube
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/games/lib64/assaultcube/ac_client "--home=${HOME}/.assaultcube" "--init=${HOME}/.assaultcube/config/init.cfg" "$@"
DIR diff --git a/games-fps/assaultcube/files/assaultcube-1.2.0.2-makefile.patch b/games-fps/assaultcube/files/assaultcube-1.2.0.2-makefile.patch
@@ -1,133 +0,0 @@
---- source/src/Makefile 2013-11-10 00:12:11.000000000 +0100
-+++ source/src/Makefile 2017-07-27 20:23:13.255683357 +0200
-@@ -1,29 +1,65 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
--CXX=clang++ # Use clang++, as g++ optimizations cause crashes...
-+CXXFLAGS ?= -O2 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char
-
- PLATFORM= $(shell uname -s)
- PLATFORM_PREFIX=native
-
--INCLUDES= -I. -Ibot -I../enet/include
-+PKG_CONFIG ?= pkg-config
-
--STRIP=
--ifeq (,$(findstring -g,$(CXXFLAGS)))
--ifeq (,$(findstring -pg,$(CXXFLAGS)))
-- STRIP=strip
--endif
-+INCLUDES= -I. -Ibot
-+
-+BUNDLED_ENET ?= YES
-+ifeq ($(BUNDLED_ENET),YES)
-+INCLUDES += -I../enet/include
-+else
-+INCLUDES += $(shell $(PKG_CONFIG) --cflags libenet)
- endif
-
-+STRIP=
-+
- MV=mv
- ifneq (,$(findstring MINGW,$(PLATFORM)))
-+MINGWBUILD=yes
-+endif
-+
-+ifeq ($(MINGWBUILD),YES)
- WINDRES= windres
- CLIENT_INCLUDES= $(INCLUDES) -I../include
- CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibintl -lws2_32 -lwinmm -lcurl
- else
--USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
--# override CXXFLAGS+= -rdynamic # clang++ doesn't use this...
--CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
--CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
-+CLIENT_INCLUDES= \
-+ $(INCLUDES) \
-+ -I/usr/include \
-+ `sdl-config --cflags` \
-+ -idirafter ../include \
-+ $(shell $(PKG_CONFIG) --cflags SDL_image) \
-+ $(shell $(PKG_CONFIG) --cflags zlib) \
-+ $(shell $(PKG_CONFIG) --cflags gl) \
-+ $(shell $(PKG_CONFIG) --cflags openal) \
-+ $(shell $(PKG_CONFIG) --cflags vorbisfile) \
-+ $(shell $(PKG_CONFIG) --cflags x11) \
-+ $(shell $(PKG_CONFIG) --cflags libcurl)
-+
-+ifneq ($(BUNDLED_ENET),YES)
-+CLIENT_INCLUDES += $(shell $(PKG_CONFIG) --cflags libenet)
-+endif
-+
-+CLIENT_LIBS= \
-+ `sdl-config --libs` \
-+ $(shell $(PKG_CONFIG) --libs SDL_image) \
-+ $(shell $(PKG_CONFIG) --libs zlib) \
-+ $(shell $(PKG_CONFIG) --libs gl) \
-+ $(shell $(PKG_CONFIG) --libs openal) \
-+ $(shell $(PKG_CONFIG) --libs vorbisfile) \
-+ $(shell $(PKG_CONFIG) --libs x11) \
-+ $(shell $(PKG_CONFIG) --libs libcurl)
-+
-+ifeq ($(BUNDLED_ENET),YES)
-+CLIENT_LIBS += -L../enet/.libs -lenet
-+else
-+CLIENT_LIBS += $(shell $(PKG_CONFIG) --libs libenet)
-+endif
-+
- endif
-
- CLIENT_OBJS= \
-@@ -83,12 +119,21 @@
-
- CLIENT_PCH= cube.h.gch
-
--ifneq (,$(findstring MINGW,$(PLATFORM)))
-+ifeq ($(MINGWBUILD),YES)
- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
- SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
- else
--SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
--SERVER_LIBS= -L../enet/.libs -lenet -lz
-+SERVER_INCLUDES= \
-+ -DSTANDALONE \
-+ $(INCLUDES) \
-+ $(shell $(PKG_CONFIG) --cflags zlib)
-+
-+SERVER_LIBS= $(shell $(PKG_CONFIG) --libs zlib)
-+ifeq ($(BUNDLED_ENET),YES)
-+SERVER_LIBS += -L../enet/.libs -lenet
-+else
-+SERVER_LIBS += $(shell $(PKG_CONFIG) --libs libenet)
-+endif
- endif
-
- SERVER_OBJS= \
-@@ -155,13 +200,24 @@
- server_install: server
-
- else
-+ifeq ($(BUNDLED_ENET),YES)
- client: libenet $(CLIENT_OBJS)
-- $(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-
- server: libenet $(SERVER_OBJS)
-- $(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
- master: libenet $(MASTER_OBJS)
-- $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
-+else
-+client: $(CLIENT_OBJS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-+
-+server: $(SERVER_OBJS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
-+
-+master: $(MASTER_OBJS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
-+endif
-
- client_install: client
- install -d ../../bin_unix/
DIR diff --git a/games-fps/assaultcube/files/assaultcube-g++.patch b/games-fps/assaultcube/files/assaultcube-g++.patch
@@ -0,0 +1,12 @@
+--- source/src/Makefile 2017-07-25 18:24:19.000000000 +0200
++++ source/src/Makefile 2017-07-27 21:48:02.335010800 +0200
+@@ -6,7 +6,7 @@
+ # found to have been caused by the g++ compiler in the past. This seems to have
+ # been fixed now by relaxing the optimization that g++ does, so although we'll
+ # continue using clang++ (just in case), you can use g++ if you prefer.
+-CXX=clang++
++CXX=g++
+
+ # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube.
+ ACDEBUG=no
+