+++ /dev/null
-Author: Nils Freydank <holgersson@posteo.de>
-Date: Fri Nov 17 20:30:00 2017 +0100
-
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired
-by hasufell’s patch.
-
-Edit 2018-03-19: Now with server support!
-
---- a/Makefile 2018-03-19 11:00:00.000000000 +0100
-+++ b/Makefile 2018-03-19 11:00:00.000000001 +0100
-@@ -223,7 +223,7 @@
- ifndef USE_ALTGAMMA
- # Clearskies - X11-based gamma for Linux
- USE_ALTGAMMA=1
--endif
-+ endif
-
- ifndef USE_SKEETMOD
- USE_SKEETMOD=0
-@@ -306,34 +306,33 @@
- CLIENT_EXTRA_FILES=
-
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
- CLIENT_CFLAGS += $(SDL_CFLAGS)
-
-- OPTIMIZEVM = -O3
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
-
- ifeq ($(ARCH),x86_64)
-- OPTIMIZEVM = -O3
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED = true
- else
- ifeq ($(ARCH),x86)
-- OPTIMIZEVM = -O3 -march=i586
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED=true
- else
- ifeq ($(ARCH),ppc)
-- BASE_CFLAGS += -maltivec
-+ BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),ppc64)
-- BASE_CFLAGS += -maltivec
-+ BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),sparc)
-- OPTIMIZE += -mtune=ultrasparc3 -mv8plus
-- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+ OPTIMIZE +=
-+ OPTIMIZEVM +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),armv7l)
-@@ -1130,12 +1129,12 @@
-
- define DO_CC
- $(echo_cmd) "CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
-
- define DO_REF_CC
- $(echo_cmd) "REF_CC $<"
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
-
- define DO_REF_STR
-@@ -1148,7 +1147,7 @@
-
- define DO_BOT_CC
- $(echo_cmd) "BOT_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
- endef
-
- ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1162,7 +1161,7 @@
-
- define DO_DED_CC
- $(echo_cmd) "DED_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
-
- define DO_WINDRES
-
+++ /dev/null
-Author: Nils Freydank <holgersson@posteo.de>
-Date: Wed Mar 14 21:00:00 2017 +0100
-
-Imported patch written by Tom Murphy via github.com:
-
-https://github.com/ioquake/ioq3/pull/356
-
-diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c
-index 2c2b595cf..58f178ade 100644
---- a/code/sys/con_tty.c
-+++ b/code/sys/con_tty.c
-@@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0;
- #define TTY_CONSOLE_PROMPT "]"
- #endif
-
--/*
--==================
--CON_FlushIn
--
--Flush stdin, I suspect some terminals are sending a LOT of shit
--FIXME relevant?
--==================
--*/
--static void CON_FlushIn( void )
--{
-- char key;
-- while (read(STDIN_FILENO, &key, 1)!=-1);
--}
--
- /*
- ==================
- CON_Back
-@@ -441,7 +427,7 @@ char *CON_Input( void )
- TTY_con = *history;
- CON_Show();
- }
-- CON_FlushIn();
-+ tcflush(STDIN_FILENO, TCIFLUSH);
- return NULL;
- break;
- case 'B':
-@@ -455,7 +441,7 @@ char *CON_Input( void )
- Field_Clear(&TTY_con);
- }
- CON_Show();
-- CON_FlushIn();
-+ tcflush(STDIN_FILENO, TCIFLUSH);
- return NULL;
- break;
- case 'C':
-@@ -467,7 +453,7 @@ char *CON_Input( void )
- }
- }
- Com_DPrintf("droping ISCTL sequence: %d, TTY_erase: %d\n", key, TTY_erase);
-- CON_FlushIn();
-+ tcflush(STDIN_FILENO, TCIFLUSH);
- return NULL;
- }
- if (TTY_con.cursor >= sizeof(text) - 1)
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
- voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
- "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
- client? (
- media-libs/libsdl2:=[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble:= )
- openal? ( media-libs/openal:= )
- opus? ( media-libs/opusfile:= )
- vorbis? ( media-libs/libvorbis:= )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.4
- sys-libs/zlib:=[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_configure() {
- default
-
- tc-export CC
-}
-
-src_compile() {
- # Workaround for used zlib macro, which got renamed in Gentoo
- # wrt bug #449510
- append-cppflags "-DOF=_Z_OF"
-
- local myemakeargs=(
- ARCH=$(usex amd64 "x86_64" "i686" )
- DEFAULT_BASEDIR="/usr/share/urbanterror"
- BUILD_CLIENT=$(usex "client" 1 0)
- BUILD_SERVER=$(usex "server" 1 0)
- BUILD_BASEGAME=1
- BUILD_MISSIONPACK=0
- BUILD_GAME_SO=0
- BUILD_GAME_QVM=0
- BUILD_STANDALONE=1
- SERVERBIN="Quake3-UrT-Ded"
- CLIENTBIN="Quake3-UrT"
- USE_RENDERER_DLOPEN=0
- USE_YACC=0
- BASEGAME="q3ut4"
- BASEGAME_CFLAGS="${CFLAGS}"
- USE_OPENAL=$(usex "openal" 1 0)
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
- USE_CURL=$(usex "curl" 1 0)
- USE_CURL_DLOPEN=$(usex "curl" 1 0)
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
- USE_CODEC_OPUS=$(usex "opus" 1 0)
- USE_MUMBLE=$(usex "mumble" 1 0)
- USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
- USE_VOIP=$(usex "mumble" 1 0)
- USE_INTERNAL_LIBS=0
- USE_LOCAL_HEADERS=0
- USE_ALTGAMMA=$(usex "altgamma" 1 0)
- $(usex "debug" "debug" "release")
- )
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myarch=$(usex amd64 "x86_64" "i386")
- local myreleasetype=$(usex debug "debug" "release")
-
- if use client; then
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use client && xdg_desktop_database_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # ^this is a new installation, so:
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- elog "Be aware that altgamme works on a global scale, so external"
- elog "applications like redshift can cause trouble. Disabling"
- elog "these while playing is a usable workaround."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
-
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
-
- if use skeetshootmod; then
- elog ""
- elog "You might need to set:"
- elog " seta sv_skeetshoot \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && xdg_desktop_database_update
-}
projects / gentoo.git / commitdiff