diff options
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/Manifest.gz | bin | 20403 -> 20406 bytes | |||
-rw-r--r-- | games-fps/eduke32/Manifest | 2 | ||||
-rw-r--r-- | games-fps/eduke32/eduke32-20181010.7067.ebuild | 233 | ||||
-rw-r--r-- | games-fps/urbanterror/Manifest | 9 | ||||
-rw-r--r-- | games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch | 59 | ||||
-rw-r--r-- | games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch (renamed from games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch) | 35 | ||||
-rw-r--r-- | games-fps/urbanterror/metadata.xml | 1 | ||||
-rw-r--r-- | games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild (renamed from games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild) | 11 |
8 files changed, 259 insertions, 91 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz Binary files differindex 81fe03137040..1a2678f018ee 100644 --- a/games-fps/Manifest.gz +++ b/games-fps/Manifest.gz diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index 7a892047fcce..13faa76ba6a4 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -9,5 +9,7 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833 DIST eduke32_src_20180906-6978.tar.xz 14706836 BLAKE2B ed7b3718d73fe633ada5312ffc21feec00bcbcc07844038976efc16c8c91f8d7f3de4f0887a8a5914b33d118bd34b87ccbfce424b3d0803fa89db63fb0bd377b SHA512 6637966c8ace0fe197805a472b46b485dbc759ad7505964a32338c50b806cf269815e773e965cd5c3ddf11b02f3aa2c4e2b27bdb9dda4c909fcd8ac1bef22115 +DIST eduke32_src_20181010-7067.tar.xz 14710088 BLAKE2B 7b2ed7d1c8b81b1b53699d1cb6898525896a534577ac79827b508da33e334dfab3b390323b051a53139c0860ab3ff3b1965015316a81a340d406e66d1d5242ec SHA512 f858d39947dd1f07363c003cefa0289f78f8c37a95019b13e8657769a1bd814399a5b137b0b601aa1330055ebae017dd1bf06db7ec2bb647121628d5187a55dd EBUILD eduke32-20180906.6978.ebuild 6078 BLAKE2B ffdd69b00e482624e930d11d9dd040d5c77d185258ef930c86baa66a1960b84d8f9806ce0db4632531388932f82046f6065b786b99386164bde036464fc9aa67 SHA512 46b0c0353bf81b0d66e3edff1a8905b5d0a6779de9fe29cc1308c76cbc537474d1656d1398ff5fa4b868661273ddbc88e416ca1bc36b6b3f578f46a57293c7d4 +EBUILD eduke32-20181010.7067.ebuild 5920 BLAKE2B fdb0f2dac48024488735f9c699a081e574dadef8b7747049cc6dd661e190fd17521ad020f57c3113fe1de97ee4d1e82b4d5be9f7c2f3e334a160917bded42150 SHA512 5191e9a577cdb9889139fcdfb6482d1f4505eca885a6a406914fc64803ad3224df08aed73331b520beed51f85949a29b29cfe7b19039ee7cdffa6ff2f12cb83a MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a diff --git a/games-fps/eduke32/eduke32-20181010.7067.ebuild b/games-fps/eduke32/eduke32-20181010.7067.ebuild new file mode 100644 index 000000000000..07b68e2de18b --- /dev/null +++ b/games-fps/eduke32/eduke32-20181010.7067.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit desktop eapi7-ver gnome2-utils toolchain-funcs + +MY_BUILD="$(ver_cut 2)" +MY_DATE="$(ver_cut 1)" + +MY_PV_HRP="5.4" +MY_PV_OFFENSIVE_XXX="1.33" +MY_PV_OPL="2.01" +MY_PV_PSX="1.11" +MY_PV_SC55="4.02" +MY_PV_VOXELS="1.21" + +DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D" +HOMEPAGE="http://www.eduke32.com/" +SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz + http://www.eduke32.com/images/eduke32_classic.png + hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip ) + offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip ) + opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip ) + psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip ) + sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip ) + voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )" + +KEYWORDS="~amd64 ~hppa ~x86" +LICENSE="BUILDLIC GPL-2 HRP" +SLOT="0" +IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp" +REQUIRED_USE="cdinstall? ( !demo ) + demo? ( !cdinstall ) + hrp? ( ^^ ( demo cdinstall ) + !voxels ) + offensive? ( ^^ ( demo cdinstall ) ) + opl? ( ^^ ( demo cdinstall ) + !sc-55 ) + psx? ( ^^ ( demo cdinstall ) ) + sc-55? ( ^^ ( demo cdinstall ) + !opl ) + voxels? ( !hrp ) + vpx? ( opengl )" + +S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}" + +MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X] + media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] + sys-libs/zlib:= + flac? ( media-libs/flac ) + gtk? ( x11-libs/gtk+:2 ) + opengl? ( virtual/glu + virtual/opengl ) + png? ( media-libs/libpng:0= ) + timidity? ( media-sound/timidity-freepats ) + vpx? ( media-libs/libvpx:= ) + vorbis? ( media-libs/libogg + media-libs/libvorbis ) + xmp? ( media-libs/exempi:= )" + +RDEPEND="${MY_DEPEND_RDEPEND} + cdinstall? ( games-fps/duke3d-data ) + demo? ( games-fps/duke3d-demodata )" + +DEPEND="${MY_DEPEND_RDEPEND} + app-arch/unzip + x86? ( dev-lang/nasm )" + +PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" ) + +src_unpack() { + # Extract only the eduke32 archive + unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz + + # Unpack only the documentation + if use hrp; then + unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die + fi + if use offensive; then + unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die + fi + if use opl; then + unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die + mv readme.txt opl_readme.txt || die + fi + if use sc-55; then + unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die + fi + if use voxels; then + unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die + fi +} + +src_compile() { + local myemakeopts=( + ALLOCACHE_AS_MALLOC=0 + AS=$(tc-getAS) + CC=$(tc-getCC) + CXX=$(tc-getCXX) + CLANG=0 + CPLUSPLUS=1 + CUSTOMOPT="" + DEBUGANYWAY=0 + F_JUMP_TABLES="" + FORCEDEBUG=0 + HAVE_FLAC=$(usex flac 1 0) + HAVE_GTK2=$(usex gtk 1 0) + HAVE_VORBIS=$(usex vorbis 1 0) + HAVE_XMP=$(usex xmp 1 0) + LINKED_GTK=$(usex gtk 1 0) + LTO=1 + LUNATIC=0 + KRANDDEBUG=0 + MEMMAP=0 + MIXERTYPE=SDL + NETCODE=$(usex server 1 0) + NOASM=0 + OPTLEVEL=0 + OPTOPT="" + PACKAGE_REPOSITORY=1 + POLYMER=$(usex opengl 1 0) + PRETTY_OUTPUT=0 + PROFILER=0 + RELEASE=1 + RENDERTYPE=SDL + SDL_TARGET=2 + SIMPLE_MENU=0 + STRIP="" + TANDALONE=0 + STARTUP_WINDOW=$(usex gtk 1 0) + USE_OPENGL=$(usex opengl 1 0) + USE_LIBVPX=$(usex vpx 1 0) + USE_LIBPNG=$(usex png 1 0) + USE_LUAJIT_2_1=0 + WITHOUT_GTK=$(usex gtk 0 1) + ) + + emake "${myemakeopts[@]}" + + if use tools; then + emake utils "${myemakeopts[@]}" + fi +} + +src_test() { + # There are no tests + # Instead it tries to build a test game, which does not compile + :; +} + +src_install() { + dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin + + if use tools; then + local tools=( + arttool + bsuite + cacheinfo + generateicon + givedepth + ivfrate + kextract + kgroup + kmd2tool + makesdlkeytrans + map2stl + md2tool + mkpalette + transpal + unpackssi + wad2art + wad2map + ) + + dobin "${tools[@]}" + fi + + keepdir /usr/share/games/eduke32 + insinto /usr/share/games/eduke32 + if use hrp; then + doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip + fi + if use offensive; then + doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip + fi + if use opl; then + doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip + fi + if use psx; then + doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip + fi + if use sc-55; then + doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip + fi + if use sdk; then + doins -r package/sdk + fi + if use voxels; then + doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip + fi + + newicon "${DISTDIR}"/eduke32_classic.png eduke32.png + + make_desktop_entry eduke32-bin EDuke32 eduke32 Game + make_desktop_entry mapster32 Mapster32 eduke32 Game + + local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt ) + if use hrp; then + DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt ) + fi + if use offensive; then + DOCS+=( "${WORKDIR}"/xxx_readme.txt ) + fi + if use opl; then + DOCS+=( "${WORKDIR}"/opl_readme.txt ) + fi + if use sc-55; then + DOCS+=( "${WORKDIR}"/readme/music_readme.txt ) + fi + if use voxels; then + DOCS+=( "${WORKDIR}"/voxelpack_readme.txt ) + fi + einstalldocs +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index d2cc4f1ff165..032a6f57ee44 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,5 +1,4 @@ -AUX urbanterror-4.3-fix-build_system.patch 2774 BLAKE2B d750fab8dcf67e6ac37d6b9e44abf3c7961320bbd51093b198d31e470396dc415219b09ac910a7938a557b6af4d9df39bb7f35cf5e90bb56f97cd334b584db4c SHA512 90d06ee5bb77e13e34923f446c0e8e90fdef5628c6199a4f9508336aa0bb30c0ab273ac794a8eb483c2534e64bf81f76ef449ed90000314f227d39de572809f2 -AUX urbanterror-4.3.3_p20180218-fix-loop.patch 1442 BLAKE2B 045a018bb3476f94b471f62ccf3bacce2b68523de235698b47f2e98979f3a1284b826e9dc74f4fd225ba930057df6d9bed599872568330952fa4ffe0389e2563 SHA512 7a31cded5b99fda6f4c92f5d1ce9ef7606dc87f08a70efc3aea970e6a870e22aeb0a772f63a11d151cd227f68803e028b2f5adee381d8f65c523c585a474b53c -DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef -EBUILD urbanterror-4.3.4_p20180627.ebuild 4525 BLAKE2B 66031a89f019f983363ad4d19f2cdaa6a28040234785ff2c873384bfa64070c51c037764f6158dd95d5c046e0b7c820afdf412119c99666bfc5ff64b348189cf SHA512 f67174fe11786d9dca773548c39fed04aa7ec2744d9f9887261253e52fdfa1ac2b03cb1dcc863db59819b87a2a3f055d2b0dd50bdccfc0dbe668df130ec3c52b -MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc +AUX urbanterror-4.3.4_p20180708-fix-build_system.patch 2736 BLAKE2B 1feaa3012915877abfc2b10b3ab602f9047d16ae7c69a234558aac286548eb91d9e49dcdc41cd51e7c0c9d28b1545a66e0b54a1cf996a370515bbba811715853 SHA512 9afd32a706d6c5de39b6fc1a7d3831873e2fbaa3e13ae41046b6e7a1e639c22bcfc7e2e61cff8d0fb87094b4dc31157c7f4d6f9ea7b1b97504bf40a61acb0906 +DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227 SHA512 97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58 +EBUILD urbanterror-4.3.4_p20180708.ebuild 4472 BLAKE2B 43cdee7cb52cf419d35ce8b6718fb8855004dbc0afd9f953e76bf403232dafdffdb281018ac6eab3554a2881905e1fe7adf204c840ae4229fd123b06f74f4859 SHA512 1e0744d75bc10592a850da07b86e6c64b7da54093fe5d2cbd6ee5d2f22b021bcb94833a1dee6c2a01023dafeb24c0097fb9199cf199674947cb2f37aac5ad7a9 +MISC metadata.xml 1058 BLAKE2B 7e000518ec710f0a6d93d7bdaf28a512e60412bb63bccc7ed9f5d40585eb03ead1515ee26d97068c33dcf41fb45ab15b8296e40ed522fceba1a50958cc488690 SHA512 7bbd3c72cd0fe48c428fd27979289dc8ad68a743cc6e73fdf5c9286007fbfa5d0529e68495af0679c47c6e4b367d3801cec625d07a688ec15269db30d4d51ae2 diff --git a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch deleted file mode 100644 index c34ebe84cedf..000000000000 --- a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch +++ /dev/null @@ -1,59 +0,0 @@ -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) diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch index e0c4eb27f539..fddd8df5bf37 100644 --- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch +++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch @@ -5,19 +5,11 @@ Respect CFLAGS, CPPFLAGS etc. This patch is inspired by hasufell’s patch. Edit 2018-03-19: Now with server support! +Edit 2018-09-01: Update to take Makefile changes into account. ---- 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 @@ +--- a/Makefile 2018-07-08 11:00:00.000000000 +0200 ++++ b/Makefile 2018-09-01 11:00:00.000000001 +0200 +@@ -308,34 +308,33 @@ CLIENT_EXTRA_FILES= ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) @@ -46,13 +38,13 @@ Edit 2018-03-19: Now with server support! HAVE_VM_COMPILED=true else ifeq ($(ARCH),ppc) -- BASE_CFLAGS += -maltivec -+ BASE_CFLAGS += +- ALTIVEC_CFLAGS = -maltivec ++ ALTIVEC_CFLAGS = HAVE_VM_COMPILED=true endif ifeq ($(ARCH),ppc64) -- BASE_CFLAGS += -maltivec -+ BASE_CFLAGS += +- ALTIVEC_CFLAGS = -maltivec ++ ALTIVEC_CFLAGS = HAVE_VM_COMPILED=true endif ifeq ($(ARCH),sparc) @@ -63,7 +55,7 @@ Edit 2018-03-19: Now with server support! HAVE_VM_COMPILED=true endif ifeq ($(ARCH),armv7l) -@@ -1130,12 +1129,12 @@ +@@ -1143,7 +1142,7 @@ define DO_CC $(echo_cmd) "CC $<" @@ -71,14 +63,17 @@ Edit 2018-03-19: Now with server support! +$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< endef + define DO_CC_ALTIVEC +@@ -1153,7 +1152,7 @@ + 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_REF_CC_ALTIVEC +@@ -1171,7 +1170,7 @@ define DO_BOT_CC $(echo_cmd) "BOT_CC $<" @@ -87,7 +82,7 @@ Edit 2018-03-19: Now with server support! endef ifeq ($(GENERATE_DEPENDENCIES),1) -@@ -1162,7 +1161,7 @@ +@@ -1185,7 +1184,7 @@ define DO_DED_CC $(echo_cmd) "DED_CC $<" diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml index 38fad51f813c..c57b90db2fc0 100644 --- a/games-fps/urbanterror/metadata.xml +++ b/games-fps/urbanterror/metadata.xml @@ -17,7 +17,6 @@ <flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag> <flag name="client">Build binary for client (includes code for non-dedicated server)</flag> <flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag> - <flag name="opus">Use opus as sound codec</flag> <flag name="server">Build binary for dedicated server</flag> <flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag> <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag> diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild index 04d4459533ea..2eed0405afcc 100644 --- a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild +++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils +inherit desktop 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" @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/mickael9/ioq3.git" EGIT_BRANCH="urt" else - COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64" + COMMIT_ID="167cb6b611ad27f30787a2fe204a7c65ec1fa18e" SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/ioq3-${COMMIT_ID}" KEYWORDS="~amd64 ~x86" @@ -28,8 +28,7 @@ REQUIRED_USE="|| ( client server ) 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 + "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch ) RDEPEND=" |