diff options
author | 2019-10-24 13:16:53 +0200 | |
---|---|---|
committer | 2019-10-24 13:21:47 +0200 | |
commit | 056eea9a3a272e882c69b806244389b6a9cea009 (patch) | |
tree | 550126fde23b9bdfbc8dd26cba8e73eff625fd47 /games-fps | |
parent | Fix screenruler .desktop launcher not working (diff) | |
download | haarp-056eea9a3a272e882c69b806244389b6a9cea009.tar.gz haarp-056eea9a3a272e882c69b806244389b6a9cea009.tar.bz2 haarp-056eea9a3a272e882c69b806244389b6a9cea009.zip |
GZDoom 4.2.1
Signed-off-by: haarp <main.haarp@gmail.com>
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/gzdoom/Manifest | 5 | ||||
-rw-r--r-- | games-fps/gzdoom/files/Introduce-the-BUILD_NONFREE-option.patch | 36 | ||||
-rw-r--r-- | games-fps/gzdoom/gzdoom-4.2.1-r1.ebuild (renamed from games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild) | 34 |
3 files changed, 67 insertions, 8 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 6eba4bd..592e6d9 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,6 +1,7 @@ +AUX Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129 AUX fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1 AUX install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd -DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d -EBUILD gzdoom-4.2.0-r1.ebuild 2377 BLAKE2B 9cb78aefe60d89f23a89cb8b5f404236d1608fc93638e72d81a6a8a203e0615bb41d58502fbaa9db3f3b16dca1d48e2d7255f95e1e9bc571144ab5fe13d788bc SHA512 65cd0bb1481ebfe9d4c903536fdf515361fcf28e098113b2e3e45413f69f7ddefbe7877e6bbc2263a31c122016fdab4ed2e7c29e95f3b99fb708a807f04229cf +DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a +EBUILD gzdoom-4.2.1-r1.ebuild 3042 BLAKE2B 70b88adcfbc477cca26a54a89af0a17a840b5430143126a12183dc00011dc9e72c47ecc1acb97eca83fd973e2595c15ee71d1861372d14abbf5b5a1cc3dc61e5 SHA512 0f2b835549c2190d59921c395ba9521c4bf25ee077add740e96e22676a16796c3ede05ec0579aae9aae1d2188b57f72198deeb7f45001e2c01a7417684b39949 EBUILD gzdoom-9999-r2.ebuild 2324 BLAKE2B 3f14b7da313c66f16881a45683356613bd4d6c13c37259358cf913e2e75216d6e7fcbfa61a057a88762e43ec74615a3e710061e75b20f8390dc8a6d69536b21a SHA512 809dd97ea9e3095d05a6315daf1a37e8bcd93b1e190893c16ffae744818e12e789d126a72b5ccb25d0ca9c82e4dd2c2cb94beb35c15ea3c0d28cfba385c5c755 MISC metadata.xml 531 BLAKE2B a2e188eea5034e23871593861e3513ec34572fa204689aabbdff702e14e326265b38b068452e51810e635d629bec613df9365c63ed5fdcd67c869ccc33c05e98 SHA512 90a34550942005159c5f566e3267feab59a928ce125d748bd68972db8a182c0cebea23f5ed099a9df077f9aff718ba90d7dfd3b555a9e2e7875f295f8d9a9ac3 diff --git a/games-fps/gzdoom/files/Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/Introduce-the-BUILD_NONFREE-option.patch new file mode 100644 index 0000000..c74d08a --- /dev/null +++ b/games-fps/gzdoom/files/Introduce-the-BUILD_NONFREE-option.patch @@ -0,0 +1,36 @@ +From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +Date: Sat, 31 Aug 2019 21:23:23 +0900 +Subject: [PATCH] Introduce the BUILD_NONFREE option + +This allow users to disable building nonfree components (brightmaps.pk3 +and game_support.pk3) if they so desire. +--- + CMakeLists.txt | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7860358ef..23d317f42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma ) + add_subdirectory( tools ) + add_subdirectory( libraries/dumb ) + add_subdirectory( libraries/gdtoa ) ++ + add_subdirectory( wadsrc ) +-add_subdirectory( wadsrc_bm ) + add_subdirectory( wadsrc_lights ) +-add_subdirectory( wadsrc_extra ) ++option (BUILD_NONFREE "Build nonfree components" ON) ++if( BUILD_NONFREE ) ++ add_subdirectory( wadsrc_bm ) ++ add_subdirectory( wadsrc_extra ) ++endif() ++ + add_subdirectory( src ) + + if( NOT CMAKE_CROSSCOMPILING ) +-- +2.23.0 + diff --git a/games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild b/games-fps/gzdoom/gzdoom-4.2.1-r1.ebuild index 059b70f..2049568 100644 --- a/games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.2.1-r1.ebuild @@ -3,16 +3,17 @@ EAPI=7 -inherit cmake-utils desktop +inherit cmake-utils desktop xdg DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" HOMEPAGE="https://zdoom.org" SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT" +LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT + nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk gtk2 openmp" +IUSE="gtk gtk2 +nonfree openmp" DEPEND="media-libs/libsdl2[opengl] media-libs/libsndfile @@ -29,12 +30,17 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-g${PV}" PATCHES=( - "${FILESDIR}/fluidsynth2.patch" +## "${FILESDIR}/fluidsynth2.patch" "${FILESDIR}/install_soundfonts.patch" + "${FILESDIR}/Introduce-the-BUILD_NONFREE-option.patch" ) src_prepare() { rm -rf docs/licenses || die + if ! use nonfree ; then + rm -rf wadsrc_bm wadsrc_extra || die + fi + cmake-utils_src_prepare } @@ -50,6 +56,7 @@ src_configure() { -DNO_GTK="$(usex !gtk)" -DNO_OPENAL=OFF -DNO_OPENMP="$(usex !openmp)" + -DBUILD_NONFREE="$(usex nonfree)" ) cmake-utils_src_configure } @@ -60,13 +67,19 @@ src_install() { cmake-utils_src_install # don't install this now - rm "${D}/usr/share/doom/brightmaps.pk3" + if use nonfree ; then + rm "${D}/usr/share/doom/brightmaps.pk3" + fi } pkg_postinst() { # install here to avoid collisions with games-fps/zandronum # hacky, i know. should've listened to juippis :) please don't hit me. - cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" || die + if use nonfree ; then + cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" || die + fi + + xdg_pkg_postinst ewarn "For parity with the Gentoo ebuild, the data path has been changed yet again!" ewarn "It is ${EPREFIX}/usr/share/doom - copy/link wad files there or in \$HOME/.config/gzdoom" @@ -77,4 +90,13 @@ pkg_postinst() { elog "Unfortunately, it does not support system soundfonts directly." elog "To make them selectable, add /usr/share/timidity/<foo>/* to a zip archive and" elog "place it into ${EPREFIX}/usr/share/doom/soundfonts/ or \$HOME/.config/gzdoom/soundfonts/" + if ! use nonfree ; then + ewarn + ewarn "GZDoom installed without nonfree components." + ewarn "Note: The nonfree game_support.pk3 file is needed to play" + ewarn " games natively supported by GZDoom." + ewarn "A list of games natively supported by GZDoom may be found" + ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" + ewarn + fi } |