[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2024-05-01 Thread James Le Cuirot 
commit: 3523c47190db130876b884d353e713e0a801f1d7
Author: Alexandra Parker  gmail  com>
AuthorDate: Mon Apr 15 04:51:32 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed May  1 21:32:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3523c471

games-fps/gzdoom: bump to 4.12.2

Deactivates buidl too that reads the program's version from 'git
describe' by generating a src/gitinfo.h from ${PV}.

Bug: https://bugs.gentoo.org/926024
Signed-off-by: Alexandra Parker  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36449
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest |   1 +
 games-fps/gzdoom/gzdoom-4.12.2.ebuild | 100 ++
 2 files changed, 101 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index eeb05548f0af..a0775c9f044a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B 
a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586
 SHA512 
fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
+DIST gzdoom-4.12.2.tar.gz 25910359 BLAKE2B 
3f456136cfc161d67451d8bf1f359d748d6f30f4461a3bff4ab6b02fd949e4057dcbee79eae9ebc0566e33d2f1f3f42add18417b1932e3bccf8b4d5cae9b9a38
 SHA512 
1e9f34af0d5bf9f3797e0cfef01f993c0b8a742ba0af53b4b13cbce9ecefa15f22949bdbbba5a09e890a01dc32af81806fcb6fc632e0dc9261494580782a5007

diff --git a/games-fps/gzdoom/gzdoom-4.12.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
new file mode 100644
index ..dcb9477e00de
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg flag-o-matic
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libjpeg-turbo:0=
+   media-libs/libsdl2[gles2?,opengl,vulkan?]
+   media-libs/libvpx:=
+   media-libs/libwebp
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
+   fi
+
+   {
+   echo "// 0"
+   echo "// The above line prevents UpdateRevision.cmake from 
replacing this file."
+   echo "// This file was generated by the Gentoo ebuild."
+   echo
+   echo "#define GIT_DESCRIPTION \"g${PV}\""
+   echo "#define GIT_HASH \"0\""
+   echo "#define GIT_TIME \"\""
+   } > "${S}/src/gitinfo.h"
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://bugs.gentoo.org/858749
+   filter-lto
+   append-flags -fno-strict-aliasing
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=OFF
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_OPENAL=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DHAVE_VULKAN="$(usex vulkan)"
+   -DHAVE_GLES2="$(usex gles2)"
+   -DNO_OPENMP="$(usex !openmp)"
+   -DZDOOM_ENABLE_SWR="$(usex swr)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   )
+
+   use debug || append-cppflags -DNDEBUG
+   use telemetry || append-cppflags -DNO_SEND_STATS
+
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
+   ewarn "  games natively supported by GZDoom."
+   ewarn "A list of games natively supported by GZDoom is 
available"
+   ewarn "on

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2024-05-01 Thread James Le Cuirot 
commit: 464c6025f0303dfa6e7bd4fc4583f8d3f59b544e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed May  1 21:39:20 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed May  1 21:39:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464c6025

games-fps/gzdoom: Move S, die for gitinfo.h

Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/gzdoom-4.12.2.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.12.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
index dcb9477e00de..b308fb3d0b50 100644
--- a/games-fps/gzdoom/gzdoom-4.12.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,6 +8,7 @@ inherit cmake desktop xdg flag-o-matic
 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"
+S="${WORKDIR}/${PN}-g${PV}"
 
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
@@ -27,8 +28,6 @@ DEPEND="
gtk? ( x11-libs/gtk+:3 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-g${PV}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
 )
@@ -48,7 +47,7 @@ src_prepare() {
echo "#define GIT_DESCRIPTION \"g${PV}\""
echo "#define GIT_HASH \"0\""
echo "#define GIT_TIME \"\""
-   } > "${S}/src/gitinfo.h"
+   } > "${S}/src/gitinfo.h" || die
 
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2024-03-02 Thread James Le Cuirot 
commit: 855638848766104463b5fc94c18137d3c1b522c2
Author: William Breathitt Gray  linaro  org>
AuthorDate: Sat Mar  2 13:42:15 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  2 14:14:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85563884

games-fps/gzdoom: update maintainers

Signed-off-by: William Breathitt Gray  linaro.org>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index b337177bc8a0..dc9f81322c53 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -1,14 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   vilhelm.g...@gmail.com
-   William Breathitt Gray
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

ga...@gentoo.org
Gentoo Games Project

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2023-08-07 Thread James Le Cuirot 
commit: afdcd6a6ce9c7dbe5e3a87bf6405363efb959c9e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Aug  7 15:04:37 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Aug  7 15:05:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdcd6a6

games-fps/gzdoom: Backport my local vs system headers fix

Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch | 106 +
 games-fps/gzdoom/gzdoom-4.10.0.ebuild  |   3 +-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch 
b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
new file mode 100644
index ..3a3a153b5a6e
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
@@ -0,0 +1,106 @@
+From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sat, 1 Jul 2023 13:36:48 +0100
+Subject: [PATCH] Ensure local headers are used over system headers to avoid
+ breakage
+
+types.h was being picked up from webp rather than locally due to the
+`include_directories` call for GTK (and therefore its -I arguments)
+coming before the same call for the local sources. webp can be pulled in
+via GTK -> gdk-pixbuf -> tiff -> webp.
+
+This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate
+when calling `include_directories`. I have done both for good measure.
+---
+ src/CMakeLists.txt  | 18 ++
+ tools/zipdir/CMakeLists.txt |  2 +-
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index cf254ad6a..b4d06f9ce 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -97,7 +97,7 @@ else()
+   if( NOT DYN_GTK )
+   set( PROJECT_LIBRARIES 
${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
+   endif()
+-  include_directories( ${GTK3_INCLUDE_DIRS} )
++  include_directories( SYSTEM 
${GTK3_INCLUDE_DIRS} )
+   link_directories( ${GTK3_LIBRARY_DIRS} )
+   else()
+   pkg_check_modules( GTK2 gtk+-2.0 )
+@@ -105,7 +105,7 @@ else()
+   if( NOT DYN_GTK )
+   set( PROJECT_LIBRARIES 
${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
+   endif()
+-  include_directories( 
${GTK2_INCLUDE_DIRS} )
++  include_directories( SYSTEM 
${GTK2_INCLUDE_DIRS} )
+   link_directories( ${GTK2_LIBRARY_DIRS} )
+   else()
+   set( NO_GTK ON )
+@@ -132,7 +132,7 @@ else()
+   # Non-Windows version also needs SDL except native OS X backend
+   if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
+   find_package( SDL2 REQUIRED )
+-  include_directories( "${SDL2_INCLUDE_DIR}" )
++  include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" )
+   set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
+   endif()
+ 
+@@ -143,7 +143,7 @@ if( NOT NO_OPENAL )
+   find_package( OpenAL )
+   mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
+   if( OPENAL_INCLUDE_DIR )
+-  include_directories( ${OPENAL_INCLUDE_DIR} )
++  include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} )
+   mark_as_advanced(CLEAR OPENAL_LIBRARY)
+   if( OPENAL_LIBRARY )
+   set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} 
${PROJECT_LIBRARIES} )
+@@ -373,17 +373,17 @@ endif()
+ 
+ if( VPX_FOUND )
+   add_definitions( "-DUSE_LIBVPX=1" )
+-  include_directories( "${VPX_INCLUDE_DIR}" )
++  include_directories( SYSTEM "${VPX_INCLUDE_DIR}" )
+   set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
+ else()
+   message( SEND_ERROR "Could not find libvpx" )
+ endif()
+ 
+-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" 
"${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" 
"${DRPC_INCLUDE_DIR}")
++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" 
"${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" 
"${DRPC_INCLUDE_DIR}")
+ 
+ if( ${HAVE_VM_JIT} )
+   add_definitions( -DHAVE_VM_JIT )
+-  include_directories( "${ASMJIT_INCLUDE_DIR}" )
++  include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" )
+   set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
+ endif()
+ 
+@@ -1243,7 +1243,9 @@ endif()
+ 
+ target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma 
${ZMUSIC_LIBRARIES} )
+ 
+-include_directories( .

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2023-06-19 Thread James Le Cuirot 
commit: a97fdf8a6d805af5f0116d24dcd0edcf0f459cee
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jun 19 20:59:06 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jun 19 20:59:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97fdf8a

games-fps/gzdoom: Patch to fix building with GCC 13

Thanks to Chris Lundgren.

Closes: https://bugs.gentoo.org/907087
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch | 14 ++
 games-fps/gzdoom/gzdoom-4.10.0.ebuild |  1 +
 2 files changed, 15 insertions(+)

diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch 
b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
new file mode 100644
index ..d34cb749e7f5
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/907087
+
+diff --git 
a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h 
b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+index fd44722..7189d0e 100644
+--- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
 b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+@@ -20,6 +20,8 @@
+ // THE SOFTWARE.
+ //
+
++#include 
++
+ #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+ #define AMD_VULKAN_MEMORY_ALLOCATOR_H

diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
index a9545cb61896..16c223070e34 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -30,6 +30,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+   "${FILESDIR}"/${P}-gcc-13.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2023-06-19 Thread James Le Cuirot 
commit: b86bff22fa2c93a74b6c39c47326760a1780e01a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jun 19 20:53:31 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jun 19 20:59:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86bff22

games-fps/gzdoom: Drop old 4.8.2-r1

Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 -
 .../gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch | 36 -
 games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild| 89 --
 3 files changed, 126 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 66a88cc2bfa1..eeb05548f0af 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B 
a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586
 SHA512 
fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B 
b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5
 SHA512 
5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch 
b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch
deleted file mode 100644
index 6070d47566e0..
--- a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b132d2c3fe7f9074e1c08dbab77fc1270e8736fb Mon Sep 17 00:00:00 2001
-From: Omar Polo 
-Date: Mon, 11 Jul 2022 11:52:43 +0200
-Subject: [PATCH] fix gzdoom.pk3 not found error
-
-Move the initialization before BaseFileSearch is called, otherwise
-GameConfig is used not initialized and it doesn't find the gzdoom.pk3
-file.
-
-GameConfig used uninitalized was spotted by @LoneFox78.

- src/d_main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/d_main.cpp b/src/d_main.cpp
-index b64142c07fe..005f8cf8cd5 100644
 a/src/d_main.cpp
-+++ b/src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
-   
-   std::set_new_handler(NewFailure);
-   const char *batchout = Args->CheckValue("-errorlog");
-+
-+  D_DoomInit();
-   
-   // [RH] Make sure zdoom.pk3 is always loaded,
-   // as it contains magic stuff we need.
-@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void)
- 
-   if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, 
GetVersionString());
- 
--  D_DoomInit();
--
-   extern void D_ConfirmSendStats();
-   D_ConfirmSendStats();
- 

diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild 
b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
deleted file mode 100644
index e8ae3900cb9f..
--- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg flag-o-matic
-
-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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libjpeg-turbo:0=
-   media-libs/libsdl2[gles2?,opengl,vulkan?]
-   media-libs/libvpx:=
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
-   "${FILESDIR}"/${P}-fix-gzdoom-pk3.patch
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # https://bugs.gentoo.org/858749
-   filter-lto
-   append-flags -fno-strict-aliasing
-
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=OFF
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_OPENAL=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DHAVE_VULKAN="$(usex vulkan)"
-   -DHAVE_GLES2="$(usex gles2)"
-

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2023-05-22 Thread Sam James 
commit: f4073e9351bf49fd5d20b662e72f8ed68481f6a0
Author: Sam James  gentoo  org>
AuthorDate: Tue May 23 02:43:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 23 02:51:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4073e93

games-fps/gzdoom: defer to new global USE=vulkan description

Signed-off-by: Sam James  gentoo.org>

 games-fps/gzdoom/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 79b8864223c7..41b3c9962102 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
Enable GLES2 backend
Enable non-free components
Enable software renderer
-   Enable Vulkan support


https://forum.zdoom.org/viewforum.php?f=2

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2022-12-08 Thread James Le Cuirot 
commit: fde8d7ffb7b7d232992df97de1a4fc804c6ef7e8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Dec  8 22:02:45 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Dec  8 22:02:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde8d7ff

games-fps/gzdoom: Drop old 4.7.1

Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 -
 games-fps/gzdoom/gzdoom-4.7.1.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 1d6e0cc12cac..66a88cc2bfa1 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,2 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B 
a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586
 SHA512 
fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B 
b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5
 SHA512 
5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/gzdoom-4.7.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
deleted file mode 100644
index d0da35c22a25..
--- a/games-fps/gzdoom/gzdoom-4.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libsdl2[gles2?,opengl,vulkan?]
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_OPENAL=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DHAVE_VULKAN="$(usex vulkan)"
-   -DHAVE_GLES2="$(usex gles2)"
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex non-free)"
-   )
-
-   use debug || append-cppflags -DNDEBUG
-   use telemetry || append-cppflags -DNO_SEND_STATS
-
-   cmake_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   if ! use non-free ; then
-   ewarn
-   ewarn "GZDoom installed without non-free components."
-   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
-   ewarn "  games natively supported by GZDoom."
-   ewarn "A list of games natively supported by GZDoom is 
available"
-   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
-   ewarn
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2022-12-08 Thread James Le Cuirot 
commit: 5b68f6835d7b3e29b9037cd4bf631e2c13bbf1b4
Author: William Breathitt Gray  linaro  org>
AuthorDate: Fri Dec  2 16:43:19 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Dec  8 21:59:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b68f683

games-fps/gzdoom: version bump to 4.10.0

The 'swr' USE flag is introduced to configure support for the software
renderer. This is mainly to allow users to disable the software
renderer for new games that have been designed for hardware rendering.

Closes: https://bugs.gentoo.org/884037
Signed-off-by: William Breathitt Gray  linaro.org>
Closes: https://github.com/gentoo/gentoo/pull/28511
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest |  1 +
 games-fps/gzdoom/gzdoom-4.10.0.ebuild | 89 +++
 games-fps/gzdoom/metadata.xml |  1 +
 3 files changed, 91 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 3fad5682d972..1d6e0cc12cac 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,3 @@
+DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B 
a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586
 SHA512 
fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B 
b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5
 SHA512 
5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
new file mode 100644
index ..a9545cb61896
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg flag-o-matic
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libjpeg-turbo:0=
+   media-libs/libsdl2[gles2?,opengl,vulkan?]
+   media-libs/libvpx:=
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://bugs.gentoo.org/858749
+   filter-lto
+   append-flags -fno-strict-aliasing
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=OFF
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_OPENAL=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DHAVE_VULKAN="$(usex vulkan)"
+   -DHAVE_GLES2="$(usex gles2)"
+   -DNO_OPENMP="$(usex !openmp)"
+   -DZDOOM_ENABLE_SWR="$(usex swr)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   )
+
+   use debug || append-cppflags -DNDEBUG
+   use telemetry || append-cppflags -DNO_SEND_STATS
+
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
+   ewarn "  games natively supported by GZDoom."
+   ewarn "A list of games natively supported by GZDoom is 
available"
+

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2022-09-19 Thread Michał Górny 
commit: d712bd78d4f28fc0e7d13969ef0281481cbc6f03
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Sep 19 01:08:59 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 19 06:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d712bd78

games-fps/gzdoom: Keyword 4.8.2-r1 arm64, #849866

Signed-off-by: matoro  users.noreply.github.com>
Signed-off-by: Michał Górny  gentoo.org>

 games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild 
b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
index 03a5359074ef..e8ae3900cb9f 100644
--- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2022-08-06 Thread James Le Cuirot 
commit: 05de9a1d409e70f9075fefb93b6f21d705699ead
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Aug  6 13:06:08 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug  6 13:06:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05de9a1d

games-fps/gzdoom: Apply proper gzdoom.pk3 path issue fix

Signed-off-by: James Le Cuirot  gentoo.org>

 ...rt-load-the-hex-font-as-early-as-possible.patch | 129 -
 .../gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch |  36 ++
 ...{gzdoom-4.8.2.ebuild => gzdoom-4.8.2-r1.ebuild} |   2 +-
 3 files changed, 37 insertions(+), 130 deletions(-)

diff --git 
a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
 
b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
deleted file mode 100644
index 58a2f7a2b2f4..
--- 
a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 2d00bc6b9f25ae045eecba6e198eaceee9046647 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Wed, 6 Jul 2022 23:37:30 +0100
-Subject: [PATCH] Revert "- load the hex font as early as possible."
-
-This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44.
-
-Bug: https://github.com/coelckers/gzdoom/issues/1615

- src/common/fonts/hexfont.cpp | 24 +++-
- src/d_main.cpp   | 17 +++--
- 2 files changed, 14 insertions(+), 27 deletions(-)
-
-diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp
-index 8b50427f4..e2bdbff7a 100644
 a/src/common/fonts/hexfont.cpp
-+++ b/src/common/fonts/hexfont.cpp
-@@ -58,12 +58,11 @@ struct HexDataSource
-   //
-   
//==
- 
--  void ParseDefinition(FResourceLump* font)
-+  void ParseDefinition(int lumpnum)
-   {
-   FScanner sc;
- 
--  auto data = font->Lock();
--  sc.OpenMem("newconsolefont.hex", (const char*)data, 
font->Size());
-+  sc.OpenLumpNum(lumpnum);
-   sc.SetCMode(true);
-   glyphdata.Push(0);  // ensure that index 0 can be used as 
'not present'.
-   while (sc.GetString())
-@@ -97,7 +96,6 @@ struct HexDataSource
-   lumb = i * 255 / 17;
-   SmallPal[i] = PalEntry(255, lumb, lumb, lumb);
-   }
--  font->Unlock();
-   }
- };
- 
-@@ -402,7 +400,7 @@ public:
- 
- FFont *CreateHexLumpFont (const char *fontname, int lump)
- {
--  assert(hexdata.FirstChar != INT_MAX);
-+  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
-   return new FHexFont(fontname, lump);
- }
- 
-@@ -414,7 +412,7 @@ FFont *CreateHexLumpFont (const char *fontname, int lump)
- 
- FFont *CreateHexLumpFont2(const char *fontname, int lump)
- {
--  assert(hexdata.FirstChar != INT_MAX);
-+  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
-   return new FHexFont2(fontname, lump);
- }
- 
-@@ -426,7 +424,8 @@ FFont *CreateHexLumpFont2(const char *fontname, int lump)
- 
- uint8_t* GetHexChar(int codepoint)
- {
--  assert(hexdata.FirstChar != INT_MAX);
-+  auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0);
// This is always loaded from gzdoom.pk3 to prevent overriding it with 
incomplete replacements.
-+  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
- 
-   if (hexdata.glyphmap[codepoint] > 0)
-   {
-@@ -434,13 +433,4 @@ uint8_t* GetHexChar(int codepoint)
-   return [offset];
-   }
-   return nullptr;
--}
--
--void LoadHexFont(const char* filename)
--{
--  auto resf = FResourceFile::OpenResourceFile(filename);
--  if (resf == nullptr) I_FatalError("Unable to open %s", filename);
--  auto hexfont = resf->FindLump("newconsolefont.hex");
--  if (hexfont == nullptr) I_FatalError("Unable to find newconsolefont.hex 
in %s", filename);
--  hexdata.ParseDefinition(hexfont);
--}
-+}
-\ No newline at end of file
-diff --git a/src/d_main.cpp b/src/d_main.cpp
-index b64142c07..d61807012 100644
 a/src/d_main.cpp
-+++ b/src/d_main.cpp
-@@ -175,7 +175,6 @@ void FreeSBarInfoScript();
- void I_UpdateWindowTitle();
- void S_ParseMusInfo();
- void D_GrabCVarDefaults();
--void LoadHexFont(const char* filename);
- 
- // PRIVATE FUNCTION PROTOTYPES -
- 
-@@ -3535,15 +3534,6 @@ static int D_DoomMain_Internal (void)
-   std::set_new_handler(NewFailure);
-   const char *batchout = Args->CheckValue("-errorlog");
-   
--  // [RH] Make sure zdoom.pk3 is always loaded,
--  // as it contains magic stuff we need.
--  wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
--  if (wad == NULL)
--  {
--  I_FatalError("Cannot find " BASEWAD);
--  }
--  LoadHexFont(wad);

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2022-08-04 Thread Joonas Niilola 
commit: a19c006e1cf58d10c82fe9a944b490780cbddcc0
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri Jul 22 20:36:23 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  4 07:04:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19c006e

games-fps/gzdoom: Filter LTO and disable strict aliasing

Closes: https://bugs.gentoo.org/858749
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26525
Signed-off-by: Joonas Niilola  gentoo.org>

 games-fps/gzdoom/gzdoom-4.8.2.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-fps/gzdoom/gzdoom-4.8.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
index f697ad1bc5eb..ab1b0da8c59c 100644
--- a/games-fps/gzdoom/gzdoom-4.8.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
@@ -44,6 +44,10 @@ src_prepare() {
 }
 
 src_configure() {
+   # https://bugs.gentoo.org/858749
+   filter-lto
+   append-flags -fno-strict-aliasing
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2022-07-06 Thread James Le Cuirot 
commit: 6d678996b67e8cf3150d03fb17067754587f42d7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jul  6 22:45:35 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jul  6 22:45:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d678996

games-fps/gzdoom: Version bump to 4.8.2

Upstream broke this for distros in 4.8.0. This still hasn't been properly fixed,
so we just have to revert the breaking commit in the meantime. OpenSUSE has
already done the same for a while.

Upstream has seemingly also dropped support for 32-bit platforms. OpenSUSE is
reverting the line that prevents the build for working, but I'm trying to find
out more from upstream before we take action.

Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |   1 +
 ...rt-load-the-hex-font-as-early-as-possible.patch | 129 +
 games-fps/gzdoom/gzdoom-4.8.2.ebuild   |  85 ++
 3 files changed, 215 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 9712094c2ea3..3fad5682d972 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
+DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B 
b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5
 SHA512 
5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git 
a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
 
b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
new file mode 100644
index ..58a2f7a2b2f4
--- /dev/null
+++ 
b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch
@@ -0,0 +1,129 @@
+From 2d00bc6b9f25ae045eecba6e198eaceee9046647 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Wed, 6 Jul 2022 23:37:30 +0100
+Subject: [PATCH] Revert "- load the hex font as early as possible."
+
+This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44.
+
+Bug: https://github.com/coelckers/gzdoom/issues/1615
+---
+ src/common/fonts/hexfont.cpp | 24 +++-
+ src/d_main.cpp   | 17 +++--
+ 2 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp
+index 8b50427f4..e2bdbff7a 100644
+--- a/src/common/fonts/hexfont.cpp
 b/src/common/fonts/hexfont.cpp
+@@ -58,12 +58,11 @@ struct HexDataSource
+   //
+   
//==
+ 
+-  void ParseDefinition(FResourceLump* font)
++  void ParseDefinition(int lumpnum)
+   {
+   FScanner sc;
+ 
+-  auto data = font->Lock();
+-  sc.OpenMem("newconsolefont.hex", (const char*)data, 
font->Size());
++  sc.OpenLumpNum(lumpnum);
+   sc.SetCMode(true);
+   glyphdata.Push(0);  // ensure that index 0 can be used as 
'not present'.
+   while (sc.GetString())
+@@ -97,7 +96,6 @@ struct HexDataSource
+   lumb = i * 255 / 17;
+   SmallPal[i] = PalEntry(255, lumb, lumb, lumb);
+   }
+-  font->Unlock();
+   }
+ };
+ 
+@@ -402,7 +400,7 @@ public:
+ 
+ FFont *CreateHexLumpFont (const char *fontname, int lump)
+ {
+-  assert(hexdata.FirstChar != INT_MAX);
++  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+   return new FHexFont(fontname, lump);
+ }
+ 
+@@ -414,7 +412,7 @@ FFont *CreateHexLumpFont (const char *fontname, int lump)
+ 
+ FFont *CreateHexLumpFont2(const char *fontname, int lump)
+ {
+-  assert(hexdata.FirstChar != INT_MAX);
++  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+   return new FHexFont2(fontname, lump);
+ }
+ 
+@@ -426,7 +424,8 @@ FFont *CreateHexLumpFont2(const char *fontname, int lump)
+ 
+ uint8_t* GetHexChar(int codepoint)
+ {
+-  assert(hexdata.FirstChar != INT_MAX);
++  auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0);
// This is always loaded from gzdoom.pk3 to prevent overriding it with 
incomplete replacements.
++  if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump);
+ 
+   if (hexdata.glyphmap[codepoint] > 0)
+   {
+@@ -434,13 +433,4 @@ uint8_t* GetHexChar(int codepoint)
+   return [offset];
+   }
+   return nullptr;
+-}
+-
+-void LoadHexFont(const char* filename)
+-{
+-  auto resf =

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2021-12-28 Thread Ionen Wolkens 
commit: 9d448e9f319856efa39c33057917ec2b89075e24
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 28 15:06:03 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 28 17:00:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d448e9f

games-fps/gzdoom: drop 4.7.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-fps/gzdoom/Manifest  |  2 -
 ...-4.5.0-Introduce-the-BUILD_NONFREE-option.patch | 36 -
 games-fps/gzdoom/gzdoom-4.7.0.ebuild   | 86 --
 3 files changed, 124 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 759883275350..9712094c2ea3 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1 @@
-DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 
4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb
 SHA512 
539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
-DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 64a230dcd984..
--- 
a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-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,
-game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.

- CMakeLists.txt | 9 ++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3763ec1f..d0c4720bd 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/gdtoa )
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
--add_subdirectory( wadsrc_widescreen )
- add_subdirectory( src )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+   add_subdirectory( wadsrc_bm )
-+   add_subdirectory( wadsrc_extra )
-+   add_subdirectory( wadsrc_widescreen )
-+endif()
- 
- if( NOT CMAKE_CROSSCOMPILING )
-   export(TARGETS ${CROSS_EXPORTS} FILE 
"${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
--- 
-2.28.0
-

diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
deleted file mode 100644
index 52da570e32f4..
--- a/games-fps/gzdoom/gzdoom-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libsdl2[gles2?,opengl,vulkan?]
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-   else
-   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ ||

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-10-23 Thread James Le Cuirot 
commit: cfc00948735b4a3e627b1023a8aa2b65743c551a
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Oct 23 01:41:51 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 23 07:34:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc00948

games-fps/gzdoom: Drop old version 4.6.1

Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22678
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 -
 games-fps/gzdoom/gzdoom-4.6.1.ebuild | 83 
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 0cb8608c746..75988327535 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,3 @@
-DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 
4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb
 SHA512 
539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
deleted file mode 100644
index 7d3705e66a4..000
--- a/games-fps/gzdoom/gzdoom-4.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libsdl2[opengl]
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-   else
-   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_OPENAL=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex non-free)"
-   )
-
-   use debug || append-cppflags -DNDEBUG
-
-   cmake_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   if ! use non-free ; then
-   ewarn
-   ewarn "GZDoom installed without non-free components."
-   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
-   ewarn "  games natively supported by GZDoom."
-   ewarn "A list of games natively supported by GZDoom is 
available"
-   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
-   ewarn
-   fi

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2021-10-23 Thread James Le Cuirot 
commit: df34395764ddccaa2fe8454d739802be4aa3c0c4
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Oct 23 01:38:14 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 23 07:34:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df343957

games-fps/gzdoom: Version bump to 4.7.1

Closes: https://bugs.gentoo.org/815274
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 +
 ...-4.7.1-Introduce-the-BUILD_NONFREE-option.patch | 36 ++
 games-fps/gzdoom/gzdoom-4.7.1.ebuild   | 82 ++
 3 files changed, 119 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 830e1f26f61..0cb8608c746 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,4 @@
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 
4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb
 SHA512 
539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
+DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 
48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e
 SHA512 
040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000..9e012a25307
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From d164cfcde29980c23ece15f0be1b09dac5853843 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+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,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
+---
+ CMakeLists.txt | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9013d8921..77bd703b1 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -411,11 +411,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widepix )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++   add_subdirectory( wadsrc_bm )
++   add_subdirectory( wadsrc_extra )
++   add_subdirectory( wadsrc_widepix )
++endif()
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+   export(TARGETS ${CROSS_EXPORTS} FILE 
"${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.33.1
+

diff --git a/games-fps/gzdoom/gzdoom-4.7.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
new file mode 100644
index 000..d0da35c22a2
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libsdl2[gles2?,opengl,vulkan?]
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-10-09 Thread James Le Cuirot 
commit: e246606b23079ee0cdf4190b0c8fd915a1aba7e6
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Oct  2 09:05:37 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct  9 22:12:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e246606b

games-fps/gzdoom: Drop old

Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22464
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 -
 games-fps/gzdoom/gzdoom-4.6.0.ebuild | 83 
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bb35095aad0..830e1f26f61 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,3 @@
-DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B 
acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4
 SHA512 
d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 
4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb
 SHA512 
539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
deleted file mode 100644
index 7d3705e66a4..000
--- a/games-fps/gzdoom/gzdoom-4.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libsdl2[opengl]
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-   else
-   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_OPENAL=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex non-free)"
-   )
-
-   use debug || append-cppflags -DNDEBUG
-
-   cmake_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   if ! use non-free ; then
-   ewarn
-   ewarn "GZDoom installed without non-free components."
-   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
-   ewarn "  games natively supported by GZDoom."
-   ewarn "A list of games natively supported by GZDoom is 
available"
-   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
-   ewarn
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-10-09 Thread James Le Cuirot 
commit: f7e4330240ab0d0aea5b1617c54c6d8cedd65fc3
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Oct  2 08:54:16 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct  9 22:12:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e43302

games-fps/gzdoom: Version bump to 4.7.0

The gles2, telemetry, and vulkan USE flags are introduced.

Closes: https://bugs.gentoo.org/815274
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.7.0.ebuild | 86 
 games-fps/gzdoom/metadata.xml|  2 +
 3 files changed, 89 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c3394f88378..bb35095aad0 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,4 @@
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B 
acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4
 SHA512 
d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
+DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 
4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb
 SHA512 
539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
new file mode 100644
index 000..52da570e32f
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libsdl2[gles2?,opengl,vulkan?]
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+   else
+   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_OPENAL=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DHAVE_VULKAN="$(usex vulkan)"
+   -DHAVE_GLES2="$(usex gles2)"
+   -DNO_OPENMP="$(usex !openmp)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   )
+
+   use debug || append-cppflags -DNDEBUG
+   use telemetry || append-cppflags -DNO_SEND_STATS
+
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-07-26 Thread James Le Cuirot 
commit: 382eb8c6920f100f768332a573f950035f1fb88b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 26 22:49:01 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 26 22:49:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382eb8c6

games-fps/gzdoom: Drop old 4.5.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  2 -
 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 82 
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index fc79096e54d..c3394f88378 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,3 @@
-DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B 
b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5
 SHA512 
0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B 
acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4
 SHA512 
d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
-DIST widepix-9273804.tar.gz 1327209 BLAKE2B 
9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832
 SHA512 
8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
deleted file mode 100644
index a07fb6ae4bc..000
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-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
-   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz
 -> widepix-9273804.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-   app-arch/bzip2
-   media-libs/libsdl2[opengl]
-   media-libs/openal
-   media-libs/zmusic
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   rm -rf libraries/{bzip2,jpeg,zlib} || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-   else
-   mv 
"${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" 
wadsrc_widescreen/static/ || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_OPENAL=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex non-free)"
-   )
-
-   use debug || append-cppflags -DNDEBUG
-
-   cmake_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   if ! use non-free ; then
-   ewarn
-   ewarn "GZDoom installed without non-free components."
-   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
-   ewarn "  games

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-07-26 Thread James Le Cuirot 
commit: bbd68a90169d297abfea633f88235673a0f3b837
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 26 22:48:40 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 26 22:48:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd68a90

games-fps/gzdoom: Version bump to 4.6.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.6.1.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ece4cfb4eb8..fc79096e54d 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,5 @@
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B 
b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5
 SHA512 
0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B 
acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4
 SHA512 
d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
+DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 
59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764
 SHA512 
cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 
9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832
 SHA512 
8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
new file mode 100644
index 000..7d3705e66a4
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gtk +non-free openmp"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libsdl2[opengl]
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+   else
+   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_OPENAL=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DNO_OPENMP="$(usex !openmp)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   )
+
+   use debug || append-cppflags -DNDEBUG
+
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
+

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-05-22 Thread James Le Cuirot 
commit: ad44c782b5118e1fb1db83163a21ae293002fbc5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat May 22 23:04:58 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat May 22 23:04:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad44c782

games-fps/gzdoom: Version bump to 4.6.0 (including WidePix)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  2 +
 games-fps/gzdoom/gzdoom-4.6.0.ebuild | 83 
 2 files changed, 85 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ad998dc6aa7..ece4cfb4eb8 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,4 @@
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B 
b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5
 SHA512 
0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
+DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B 
acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4
 SHA512 
d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 
9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832
 SHA512 
8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
+DIST widepix-d458411.tar.gz 2542783 BLAKE2B 
622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f
 SHA512 
fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
new file mode 100644
index 000..7d3705e66a4
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> 
widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gtk +non-free openmp"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libsdl2[opengl]
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   rm -rf libraries/{bzip2,jpeg,zlib} || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+   else
+   mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" 
wadsrc_widescreen/static/ || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_OPENAL=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DNO_OPENMP="$(usex !openmp)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   )
+
+   use debug || append-cppflags -DNDEBUG
+
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
+   ewarn "  games natively supported by GZDoom."
+   ewarn "A list of games natively supported by GZDoom is 
available"
+   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
+   ewarn
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-02-07 Thread Andreas Sturmlechner 
commit: 32d6ac6c3ae62c80040f7a4b69029408409b3659
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Feb  8 06:32:33 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb  8 06:49:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d6ac6c

games-fps/gzdoom: Drop optional gtk2 support

Closes: https://bugs.gentoo.org/769071
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19373
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 7 ++-
 games-fps/gzdoom/metadata.xml| 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index 60680a131e1..a07fb6ae4bc 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk gtk2 +non-free openmp"
+IUSE="debug gtk +non-free openmp"
 
 DEPEND="
app-arch/bzip2
@@ -23,10 +23,7 @@ DEPEND="
media-libs/zmusic
sys-libs/zlib
virtual/jpeg:0
-   gtk? (
-   gtk2? ( x11-libs/gtk+:2 )
-   !gtk2? ( x11-libs/gtk+:3 )
-   )"
+   gtk? ( x11-libs/gtk+:3 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 656eb066e47..a805c66b7d1 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,7 +14,6 @@
Gentoo Games Project


-   Enable support for GTK+2 instead of 
GTK+3
Enable non-free components

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2021-01-19 Thread James Le Cuirot 
commit: e4838ac91243db3cc2fc510d7fbab6fe368e6278
Author: TheGreatMcPain  gmail  com>
AuthorDate: Tue Jan 19 22:38:54 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 23:03:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4838ac9

games-fps/gzdoom: Add '-DNDEBUG' to CXXFLAGS

Allows certain mods, like Project Brutality's git master, to work.

See: https://github.com/coelckers/gzdoom/issues/1279

I've also added a 'debug' useflag that skips 'append-cppflags -DNDEBUG'
just incase.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: James McClain  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19121
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index bf1ddc570ec..60680a131e1 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg
+inherit cmake desktop xdg flag-o-matic
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org;
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +non-free openmp"
+IUSE="debug gtk gtk2 +non-free openmp"
 
 DEPEND="
app-arch/bzip2
@@ -58,6 +58,9 @@ src_configure() {
-DNO_OPENMP="$(usex !openmp)"
-DBUILD_NONFREE="$(usex non-free)"
)
+
+   use debug || append-cppflags -DNDEBUG
+
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2020-11-03 Thread James Le Cuirot 
commit: a6575ca68477fadceb81b99153e13d1e28c34c6a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Nov  3 22:31:42 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Nov  3 22:33:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6575ca6

games-fps/gzdoom: Drop old 4.3.3 and 4.4.2

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  2 -
 ...-4.2.1-Introduce-the-BUILD_NONFREE-option.patch | 35 -
 .../files/gzdoom-4.2.1-install_soundfonts.patch| 34 -
 ...-STATIC-for-internal-GZDoom-SPIRV-library.patch | 30 
 ...-4.4.2-Introduce-the-BUILD_NONFREE-option.patch | 35 -
 games-fps/gzdoom/gzdoom-4.3.3.ebuild   | 88 --
 games-fps/gzdoom/gzdoom-4.4.2.ebuild   | 81 
 games-fps/gzdoom/metadata.xml  |  2 -
 8 files changed, 307 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 094ab4d9cf1..ad998dc6aa7 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,2 @@
-DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 
4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea
 SHA512 
ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
-DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 
7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b
 SHA512 
cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B 
b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5
 SHA512 
0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 
9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832
 SHA512 
8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 5a8460e6419..000
--- 
a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-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 -Naur a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2019-10-20 15:16:08.0 +0100
-+++ b/CMakeLists.txt   2019-10-24 21:27:58.104006569 +0100
-@@ -444,10 +444,15 @@
- add_subdirectory( libraries/wildmidi )
- add_subdirectory( libraries/oplsynth )
- add_subdirectory( libraries/zmusic )
-+
- 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/files/gzdoom-4.2.1-install_soundfonts.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8..000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.

- src/CMakeLists.txt | 9 +
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
-   ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn 
$/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+  set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts 
and WOPL/WOPN banks will be

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/, licenses/

2020-11-03 Thread James Le Cuirot 
commit: 75a853812e3a99e93d228867b7154ae7af465f4f
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Oct 31 15:55:18 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Nov  3 22:32:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a85381

games-fps/gzdoom: version bump to 4.5.0

Closes: https://bugs.gentoo.org/752036
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18092
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  2 +
 ...-4.5.0-Introduce-the-BUILD_NONFREE-option.patch | 36 ++
 games-fps/gzdoom/gzdoom-4.5.0.ebuild   | 82 ++
 licenses/WidePix   | 13 
 4 files changed, 133 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index dbfc90a7a34..094ab4d9cf1 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,4 @@
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 
4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea
 SHA512 
ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
 DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 
7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b
 SHA512 
cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba
+DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B 
b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5
 SHA512 
0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
+DIST widepix-9273804.tar.gz 1327209 BLAKE2B 
9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832
 SHA512 
8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000..64a230dcd98
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+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,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
+---
+ CMakeLists.txt | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3763ec1f..d0c4720bd 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widescreen )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++   add_subdirectory( wadsrc_bm )
++   add_subdirectory( wadsrc_extra )
++   add_subdirectory( wadsrc_widescreen )
++endif()
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+   export(TARGETS ${CROSS_EXPORTS} FILE 
"${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.28.0
+

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
new file mode 100644
index 000..bf1ddc570ec
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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
+   non-free? ( 
https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz
 -> widepix-9273804.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist 
WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk gtk2 +non-free openmp"
+
+DEPEND="
+   app-arch/bzip2
+   media-libs/libsdl2[opengl]
+   media-libs/openal
+   media-libs/zmusic
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? (
+   gtk2? ( x11-libs/gtk+:2 )
+

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2020-09-05 Thread Sam James 
commit: aa2806889f78fa099bb618f4f934e38175f7df6b
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  5 23:42:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  5 23:43:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa280688

games-fps/gzdoom: Keyword 4.4.2 arm, #740422

Signed-off-by: Sam James  gentoo.org>

 games-fps/gzdoom/gzdoom-4.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
index 5c345dd665b..976f3384a39 100644
--- a/games-fps/gzdoom/gzdoom-4.4.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk gtk2 +non-free openmp"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2020-09-02 Thread James Le Cuirot 
commit: a5d01020198a3aca269e0cc5666db8da0727be0c
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed Jun 17 18:50:17 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Sep  2 21:33:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d01020

games-fps/gzdoom: Version bump to 4.4.2

Closes: https://bugs.gentoo.org/727448
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16301
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 +
 ...-STATIC-for-internal-GZDoom-SPIRV-library.patch | 30 
 ...-4.4.2-Introduce-the-BUILD_NONFREE-option.patch | 35 ++
 games-fps/gzdoom/gzdoom-4.4.2.ebuild   | 81 ++
 4 files changed, 147 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c7de0cf9fa7..dbfc90a7a34 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 
4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea
 SHA512 
ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
+DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 
7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b
 SHA512 
cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
 
b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
new file mode 100644
index 000..779268ca6d7
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
@@ -0,0 +1,30 @@
+From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Wed, 17 Jun 2020 15:17:49 -0400
+Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library
+
+This makes sure the internal version of this library bundled with the
+GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with an incompatible external library (see
+commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and
+).
+---
+ libraries/glslang/spirv/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/glslang/spirv/CMakeLists.txt 
b/libraries/glslang/spirv/CMakeLists.txt
+index 453ac16b5..d39a6e300 100644
+--- a/libraries/glslang/spirv/CMakeLists.txt
 b/libraries/glslang/spirv/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
+ SPVRemapper.h
+ doc.h)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC
+-- 
+2.26.2
+

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000..d7ece785e25
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,35 @@
+From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+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 | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4e59452..c2f49b2 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++   add_subdirectory( wadsrc_bm )
++   add_subdirectory( wadsrc_extra )
++endif()
++
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+   export(TARGETS ${CROSS_EXPORTS} FILE 
"${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.26.2
+

diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild 
b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
new file mode 100644
index 000..5c345dd665b
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2020-01-25 Thread James Le Cuirot 
commit: 49c7e42863ef52bcc5fed594e7ea4660c4107b1f
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun Jan 12 23:08:47 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan 25 14:15:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c7e428

games-fps/gzdoom: Version bump to 4.3.3

Closes: https://bugs.gentoo.org/705322
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14324
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.3.3.ebuild | 88 
 2 files changed, 89 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 1fb177efd01..a4ae231fe4b 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 
3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32
 SHA512 
6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
+DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 
4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea
 SHA512 
ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1

diff --git a/games-fps/gzdoom/gzdoom-4.3.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.3.3.ebuild
new file mode 100644
index 000..1ba984d753b
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.3.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
+
+DEPEND="
+   media-libs/libsdl2[opengl]
+   media-libs/openal
+   sys-libs/zlib
+   virtual/jpeg:0
+   alsa? ( media-libs/alsa-lib )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   gtk? (
+   gtk2? ( x11-libs/gtk+:2 )
+   !gtk2? ( x11-libs/gtk+:3 )
+   )
+   mpg123? ( media-sound/mpg123 )
+   sndfile? ( media-libs/libsndfile )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+   "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   if ! use non-free ; then
+   rm -rf wadsrc_bm wadsrc_extra || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_FLUIDSYNTH=OFF
+   -DDYN_OPENAL=OFF
+   -DDYN_SNDFILE=OFF
+   -DDYN_MPG123=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DNO_OPENMP="$(usex !openmp)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   if ! use non-free ; then
+   ewarn
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
+   ewarn "  games natively supported by GZDoom."
+   ewarn "A list of games natively supported by GZDoom is 
available"
+   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
+   ewarn
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2020-01-25 Thread James Le Cuirot 
commit: d7e2fdca55e75a4b2ddc2f0e9daba8383ba4810e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan 25 14:19:23 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan 25 14:19:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e2fdca

games-fps/gzdoom: Drop old 4.3.1

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 -
 games-fps/gzdoom/gzdoom-4.3.1.ebuild | 88 
 2 files changed, 89 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index a4ae231fe4b..c7de0cf9fa7 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 
3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32
 SHA512 
6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 
4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea
 SHA512 
ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1

diff --git a/games-fps/gzdoom/gzdoom-4.3.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
deleted file mode 100644
index 1ba984d753b..000
--- a/games-fps/gzdoom/gzdoom-4.3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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
-   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
-
-DEPEND="
-   media-libs/libsdl2[opengl]
-   media-libs/openal
-   sys-libs/zlib
-   virtual/jpeg:0
-   alsa? ( media-libs/alsa-lib )
-   fluidsynth? ( media-sound/fluidsynth:= )
-   gtk? (
-   gtk2? ( x11-libs/gtk+:2 )
-   !gtk2? ( x11-libs/gtk+:3 )
-   )
-   mpg123? ( media-sound/mpg123 )
-   sndfile? ( media-libs/libsndfile )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
-   "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-   rm -rf docs/licenses || die
-   if ! use non-free ; then
-   rm -rf wadsrc_bm wadsrc_extra || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_FLUIDSYNTH=OFF
-   -DDYN_OPENAL=OFF
-   -DDYN_SNDFILE=OFF
-   -DDYN_MPG123=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex non-free)"
-   -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
-   -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
-   -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
-   -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   if ! use non-free ; then
-   ewarn
-   ewarn "GZDoom installed without non-free components."
-   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
-   ewarn "  games natively supported by GZDoom."
-   ewarn "A list of games natively supported by GZDoom is 
available"
-   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
-   ewarn
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2020-01-07 Thread James Le Cuirot 
commit: 1f0e7a72bdd75897993248ccd8bf8480148b7062
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Jan  6 18:24:49 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan  7 23:05:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0e7a72

games-fps/gzdoom: Version bump to 4.3.1

The "nonfree" USE flag is renamed to "non-free". The "alsa",
"fluidsynth", "mpg123", and "sndfile" USE flags are added to control
support of their respective packages.

Closes: https://bugs.gentoo.org/704880
Bug: https://bugs.gentoo.org/676158
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14272
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  2 +-
 .../{gzdoom-4.2.4.ebuild => gzdoom-4.3.1.ebuild}   | 29 +-
 games-fps/gzdoom/metadata.xml  |  4 ++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index b1ac6d58a84..1fb177efd01 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1 @@
-DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B 
cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f
 SHA512 
555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a
+DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 
3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32
 SHA512 
6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96

diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild 
b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
similarity index 67%
rename from games-fps/gzdoom/gzdoom-4.2.4.ebuild
rename to games-fps/gzdoom/gzdoom-4.3.1.ebuild
index f6844ab0cf1..1ba984d753b 100644
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,24 @@ 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
-   nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+   non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
+IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
 
 DEPEND="
media-libs/libsdl2[opengl]
-   media-libs/libsndfile
media-libs/openal
-   media-sound/fluidsynth:=
-   media-sound/mpg123
sys-libs/zlib
virtual/jpeg:0
+   alsa? ( media-libs/alsa-lib )
+   fluidsynth? ( media-sound/fluidsynth:= )
gtk? (
gtk2? ( x11-libs/gtk+:2 )
!gtk2? ( x11-libs/gtk+:3 )
-   )"
+   )
+   mpg123? ( media-sound/mpg123 )
+   sndfile? ( media-libs/libsndfile )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
@@ -38,7 +39,7 @@ PATCHES=(
 
 src_prepare() {
rm -rf docs/licenses || die
-   if ! use nonfree ; then
+   if ! use non-free ; then
rm -rf wadsrc_bm wadsrc_extra || die
fi
 
@@ -57,7 +58,11 @@ src_configure() {
-DNO_GTK="$(usex !gtk)"
-DNO_OPENAL=OFF
-DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex nonfree)"
+   -DBUILD_NONFREE="$(usex non-free)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
)
cmake_src_configure
 }
@@ -71,10 +76,10 @@ src_install() {
 pkg_postinst() {
xdg_pkg_postinst
 
-   if ! use nonfree ; then
+   if ! use non-free ; then
ewarn
-   ewarn "GZDoom installed without nonfree components."
-   ewarn "Note: The nonfree game_support.pk3 file is needed to 
play"
+   ewarn "GZDoom installed without non-free components."
+   ewarn "Note: The non-free game_support.pk3 file is needed to 
play"
ewarn "  games natively supported by GZDoom."
ewarn "A list of games natively supported by GZDoom is 
available"
ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 5b213dc3991..5e66764ba70 100644
---

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2019-11-07 Thread James Le Cuirot 
commit: 01720b4e5e9176247590947ece391c1ee80e315f
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun Nov  3 23:53:15 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Nov  7 21:23:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01720b4e

games-fps/gzdoom: Version bump to 4.2.4

Closes: https://bugs.gentoo.org/699264
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13539
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 +
 games-fps/gzdoom/gzdoom-4.2.4.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 41800813492..77c9697b179 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 
33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a
 SHA512 
d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6
+DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B 
cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f
 SHA512 
555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a

diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild 
b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
new file mode 100644
index 000..da843dc71ad
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+   nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk gtk2 +nonfree openmp"
+
+DEPEND="
+   media-libs/libsdl2[opengl]
+   media-libs/libsndfile
+   media-libs/openal
+   media-sound/fluidsynth:=
+   media-sound/mpg123
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? (
+   gtk2? ( x11-libs/gtk+:2 )
+   !gtk2? ( x11-libs/gtk+:3 )
+   )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+   "${FILESDIR}/${PN}-4.2.1-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
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_FLUIDSYNTH=OFF
+   -DDYN_OPENAL=OFF
+   -DDYN_SNDFILE=OFF
+   -DDYN_MPG123=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL=OFF
+   -DNO_OPENMP="$(usex !openmp)"
+   -DBUILD_NONFREE="$(usex nonfree)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+   cmake-utils_src_install
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   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 is 
available"
+   ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD;
+   ewarn
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2019-11-07 Thread James Le Cuirot 
commit: 72472af53164bec4d2df5c2090288986582a6448
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Nov  7 21:23:49 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Nov  7 21:23:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72472af5

games-fps/gzdoom: Drop old 4.2.3

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest|  1 -
 games-fps/gzdoom/gzdoom-4.2.3.ebuild | 83 
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 77c9697b179..b1ac6d58a84 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 
33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a
 SHA512 
d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6
 DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B 
cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f
 SHA512 
555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a

diff --git a/games-fps/gzdoom/gzdoom-4.2.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
deleted file mode 100644
index e59ca414756..000
--- a/games-fps/gzdoom/gzdoom-4.2.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-   nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
-
-DEPEND="
-   media-libs/libsdl2[opengl]
-   media-libs/libsndfile
-   media-libs/openal
-   media-sound/fluidsynth:=
-   media-sound/mpg123
-   sys-libs/zlib
-   virtual/jpeg:0
-   gtk? (
-   gtk2? ( x11-libs/gtk+:2 )
-   !gtk2? ( x11-libs/gtk+:3 )
-   )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
-   "${FILESDIR}/${PN}-4.2.1-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
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-   -DDYN_FLUIDSYNTH=OFF
-   -DDYN_OPENAL=OFF
-   -DDYN_SNDFILE=OFF
-   -DDYN_MPG123=OFF
-   -DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL=OFF
-   -DNO_OPENMP="$(usex !openmp)"
-   -DBUILD_NONFREE="$(usex nonfree)"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   newicon src/posix/zdoom.xpm "${PN}.xpm"
-   make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-   cmake-utils_src_install
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2019-10-24 Thread James Le Cuirot 
commit: 3faf4a588314618d2747164741de1918205ffbf3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Oct 24 20:36:30 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Oct 24 20:36:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3faf4a58

games-fps/gzdoom: Version bump to 4.2.3

The shm_open issue with libasmjit has gone away, at least temporarily,
because upstream have reverted to an older version that doesn't use
librt.

Closes: https://bugs.gentoo.org/695192
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest |  2 +-
 .../gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch | 15 +++
 .../gzdoom/{gzdoom-4.2.1.ebuild => gzdoom-4.2.3.ebuild}   |  5 +++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bcb0430e517..41800813492 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1 @@
-DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B 
f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6
 SHA512 
37a21bf101442cbe36574666dfb92b286b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a
+DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 
33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a
 SHA512 
d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
index c74d08a24a4..5a8460e6419 100644
--- 
a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ 
b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -9,14 +9,13 @@ 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 )
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2019-10-20 15:16:08.0 +0100
 b/CMakeLists.txt   2019-10-24 21:27:58.104006569 +0100
+@@ -444,10 +444,15 @@
+ add_subdirectory( libraries/wildmidi )
+ add_subdirectory( libraries/oplsynth )
+ add_subdirectory( libraries/zmusic )
 +
  add_subdirectory( wadsrc )
 -add_subdirectory( wadsrc_bm )

diff --git a/games-fps/gzdoom/gzdoom-4.2.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
similarity index 94%
rename from games-fps/gzdoom/gzdoom-4.2.1.ebuild
rename to games-fps/gzdoom/gzdoom-4.2.3.ebuild
index baca2173701..e59ca414756 100644
--- a/games-fps/gzdoom/gzdoom-4.2.1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
@@ -30,9 +30,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
+
 PATCHES=(
-   "${FILESDIR}/${P}-install_soundfonts.patch"
-   "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+   "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
+   "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2019-09-19 Thread James Le Cuirot 
commit: 2b3f989d1c050c6d792283a958138dd12d93ef73
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep 19 22:10:10 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep 19 22:10:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3f989d

games-fps/gzdoom: Drop old 4.2.0

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 -
 ...-4.2.0-Introduce-the-BUILD_NONFREE-option.patch | 36 --
 .../gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch| 28 
 .../files/gzdoom-4.2.0-install_soundfonts.patch| 34 --
 games-fps/gzdoom/gzdoom-4.2.0.ebuild   | 79 --
 5 files changed, 178 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 6ea2bde6cef..bcb0430e517 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 
5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803
 SHA512 
07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
 DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B 
f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6
 SHA512 
37a21bf101442cbe36574666dfb92b286b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index c74d08a24a4..000
--- 
a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-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/files/gzdoom-4.2.0-fluidsynth2.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
deleted file mode 100644
index 1ae12a832b4..000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Engelhardt 
-Date: 2018-10-16 14:29:56.900427855 +0200
-
-Make the build work with fluidsynth 2.x.
-

- src/sound/mididevices/music_fluidsynth_mididevice.cpp |5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-===
 gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
- 
- #endif
- 
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
-+#endif
-+
- // TYPES ---
- 
- // EXTERNAL FUNCTION PROTOTYPES 

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8..000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.

- src/CMakeLists.txt | 9 +
- 1 file changed, 9

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2019-09-19 Thread James Le Cuirot 
commit: cc51ed57d5b277bf9d2df5af62df28265839357b
Author: William Breathitt Gray  gmail  com>
AuthorDate: Tue Sep 10 10:33:09 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep 19 22:08:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc51ed57

games-fps/gzdoom: Bump to version 4.2.1

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12895
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 +
 ...-4.2.1-Introduce-the-BUILD_NONFREE-option.patch | 36 ++
 .../files/gzdoom-4.2.1-install_soundfonts.patch| 34 +
 games-fps/gzdoom/gzdoom-4.2.1.ebuild   | 82 ++
 4 files changed, 153 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 1a1880d9565..6ea2bde6cef 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 
5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803
 SHA512 
07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
+DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B 
f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6
 SHA512 
37a21bf101442cbe36574666dfb92b286b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000..c74d08a24a4
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+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/files/gzdoom-4.2.1-install_soundfonts.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
new file mode 100644
index 000..1fe0b99d9a8
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
@@ -0,0 +1,34 @@
+From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Thu, 13 Jun 2019 18:01:08 +0900
+Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
+
+The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
+installation directory.
+---
+ src/CMakeLists.txt | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0bb16f39e..4ff15062d 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
+   ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn 
$/fm_banks/gs-by-papiezak-and-sneakernets.wopn
+ )
+ 
++if( WIN32 )
++  set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts 
and WOPL/WOPN banks will be placed during install." )
++else()
++  set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory 
where soundfonts and WOPL/WOPN banks will be placed during install." )
++endif()
++install(FILES "${PROJECT_BINARY_DIR}/soundfonts" 
"${PROJECT_BINARY_DIR}/fm_banks"
++  DESTINATION ${INSTALL_SOUNDFONT_PATH}
++  COMPONENT "Soundfont resources")
++
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   # GCC misoptimizes this file
+   set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES 
COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
+-- 
+2.21.0
+

diff --git a/games-fps/gzdoom/gzdoom-4.2.1.ebuild 
b/games-fps/gzdoom/gzdoom-4.2.1.ebuild
new file mode 100644
index 000..baca2173701
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.2.1.ebuild
@@ -0,0 +1,82 @@
+#

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2019-09-15 Thread Mikle Kolyada 
commit: b2fbb00a985976b87c86f3a08cfd8e9002afa14a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep 15 09:12:50 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep 15 09:12:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2fbb00a

games-fps/gzdoom: Add ~arm keyword wrt bug #693870

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-fps/gzdoom/gzdoom-4.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild 
b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
index 4fbfe9b905b..578941b1a1d 100644
--- a/games-fps/gzdoom/gzdoom-4.2.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
@@ -12,7 +12,7 @@ 
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
nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk gtk2 +nonfree openmp"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/

2019-09-05 Thread James Le Cuirot 
commit: 657a8f058b0cf5ee648ea8376ed7c73bbae83c45
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Aug 31 11:25:49 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  5 20:20:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657a8f05

games-fps/gzdoom: Drop old

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 -
 .../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch| 28 --
 .../files/gzdoom-4.1.3-install_soundfonts.patch| 34 
 games-fps/gzdoom/gzdoom-4.1.3.ebuild   | 62 --
 4 files changed, 125 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index d7ccd5b9e28..1a1880d9565 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B 
d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64
 SHA512 
16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
 DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 
5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803
 SHA512 
07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
deleted file mode 100644
index 1ae12a832b4..000
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Engelhardt 
-Date: 2018-10-16 14:29:56.900427855 +0200
-
-Make the build work with fluidsynth 2.x.
-

- src/sound/mididevices/music_fluidsynth_mididevice.cpp |5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-===
 gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
- 
- #endif
- 
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
-+#endif
-+
- // TYPES ---
- 
- // EXTERNAL FUNCTION PROTOTYPES 

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8..000
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.

- src/CMakeLists.txt | 9 +
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
-   ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn 
$/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+  set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts 
and WOPL/WOPN banks will be placed during install." )
-+else()
-+  set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory 
where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" 
"${PROJECT_BINARY_DIR}/fm_banks"
-+  DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+  COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
-   # GCC misoptimizes this file
-   set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES 
COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
--- 
-2.21.0
-

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
deleted file mode 100644
index 242bd4e9287..000
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/, licenses/

2019-09-05 Thread James Le Cuirot 
commit: 705eb56685009e7e2f6b68f2e55af8d8202fd37d
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sat Aug 31 12:09:57 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  5 20:20:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705eb566

games-fps/gzdoom: Bump to version 4.2.0

The 'nonfree' USE flag is introduced to allow users to control whether
nonfree assets are installed.

Doom assets are under the Doom Collector's Edition license. Heretic and
Hexen assets are under the Activision license. Chex Quest assets are
under the Chex Quest 3 license. Strife assets are freely distributable
according to Stephen Kick, CEO of Nightdive Studios.

Closes: https://bugs.gentoo.org/692584
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12833
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/Manifest  |   1 +
 ...-4.2.0-Introduce-the-BUILD_NONFREE-option.patch |  36 ++
 .../gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch|  28 +
 .../files/gzdoom-4.2.0-install_soundfonts.patch|  34 +
 games-fps/gzdoom/gzdoom-4.2.0.ebuild   |  79 
 games-fps/gzdoom/metadata.xml  |   1 +
 licenses/Activision| 139 +
 licenses/ChexQuest3|   1 +
 licenses/DOOM-COLLECTORS-EDITION   |  88 +
 9 files changed, 407 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index a1c5d339328..d7ccd5b9e28 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B 
d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64
 SHA512 
16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
+DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 
5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803
 SHA512 
07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d

diff --git 
a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000..c74d08a24a4
--- /dev/null
+++ 
b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+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/files/gzdoom-4.2.0-fluidsynth2.patch 
b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
new file mode 100644
index 000..1ae12a832b4
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
@@ -0,0 +1,28 @@
+From: Jan Engelhardt 
+Date: 2018-10-16 14:29:56.900427855 +0200
+
+Make the build work with fluidsynth 2.x.
+
+---
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp |5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+===
+--- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
 gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
+ #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
+ #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
+ #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
+-#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
+ 
+ #endif
+ 
++#ifndef FLUID_CHORUS_DEFAULT_TYPE
++#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
++#endif
++
+ // TYPES

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2019-06-18 Thread James Le Cuirot 
commit: 22b70de1892785b9f2dc5d3bb2ddab234410cc92
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed Jun 12 23:13:06 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jun 18 20:55:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b70de1

games-fps/gzdoom: Always build with fluidsynth and openal support

FluidSynth is a dependency of GZDoom and cannot be disabled. Similarly,
OpenAL is a dependency of GZDoom on Linux and cannot be disabled.

Closes: https://bugs.gentoo.org/687922
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12248
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/gzdoom/gzdoom-4.1.3.ebuild | 17 +++--
 games-fps/gzdoom/metadata.xml|  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index d3d5f880537..48957b791ac 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,24 +12,21 @@ 
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"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk gtk2 +openal openmp"
+IUSE="gtk gtk2 openmp"
 
 DEPEND="
media-libs/libsdl2[opengl]
+   media-libs/libsndfile
+   media-libs/openal
+   media-sound/fluidsynth:=
+   media-sound/mpg123
sys-libs/zlib
virtual/jpeg:0
gtk? (
gtk2? ( x11-libs/gtk+:2 )
!gtk2? ( x11-libs/gtk+:3 )
)"
-RDEPEND="
-   ${DEPEND}
-   fluidsynth? ( media-sound/fluidsynth:= )
-   openal? (
-   media-libs/libsndfile
-   media-libs/openal
-   media-sound/mpg123
-   )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
 PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
@@ -48,7 +45,7 @@ src_configure() {
-DDYN_SNDFILE=OFF
-DDYN_MPG123=OFF
-DNO_GTK="$(usex !gtk)"
-   -DNO_OPENAL="$(usex !openal)"
+   -DNO_OPENAL=OFF
-DNO_OPENMP="$(usex !openmp)"
)
cmake-utils_src_configure

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 95f6ed619ed..cfd1b5ffe56 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
Gentoo Games Project


-   Use media-sound/fluidsynth 
for MIDI support
Enable support for GTK+2 instead of 
GTK+3

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2019-06-18 Thread James Le Cuirot 
commit: 48c74ea34071e23a10d1548cb719b5d0a82dc300
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu Jun 13 11:52:21 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jun 18 20:55:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c74ea3

games-fps/gzdoom: Install soundfonts

Closes: https://bugs.gentoo.org/687990
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/gzdoom-4.1.3-install_soundfonts.patch| 34 ++
 games-fps/gzdoom/gzdoom-4.1.3.ebuild   |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
new file mode 100644
index 000..1fe0b99d9a8
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
@@ -0,0 +1,34 @@
+From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Thu, 13 Jun 2019 18:01:08 +0900
+Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
+
+The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
+installation directory.
+---
+ src/CMakeLists.txt | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0bb16f39e..4ff15062d 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
+   ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn 
$/fm_banks/gs-by-papiezak-and-sneakernets.wopn
+ )
+ 
++if( WIN32 )
++  set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts 
and WOPL/WOPN banks will be placed during install." )
++else()
++  set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory 
where soundfonts and WOPL/WOPN banks will be placed during install." )
++endif()
++install(FILES "${PROJECT_BINARY_DIR}/soundfonts" 
"${PROJECT_BINARY_DIR}/fm_banks"
++  DESTINATION ${INSTALL_SOUNDFONT_PATH}
++  COMPONENT "Soundfont resources")
++
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   # GCC misoptimizes this file
+   set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES 
COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
+-- 
+2.21.0
+

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index 48957b791ac..242bd4e9287 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -29,7 +29,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
-PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
+PATCHES=(
+   "${FILESDIR}/${P}-fluidsynth2.patch"
+   "${FILESDIR}/${P}-install_soundfonts.patch"
+)
 
 src_prepare() {
rm -rf docs/licenses || die
@@ -40,6 +43,7 @@ src_configure() {
local mycmakeargs=(
-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-DDYN_FLUIDSYNTH=OFF
-DDYN_OPENAL=OFF
-DDYN_SNDFILE=OFF

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2019-06-10 Thread Andreas Sturmlechner 
commit: ed2b8086c1005200d8f164448b334afba349a257
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Jun 10 11:21:18 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 10 19:50:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2b8086

games-fps/gzdoom: Drop old version

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-fps/gzdoom/Manifest  |   1 -
 .../files/gzdoom-4.1.2-static-libraries.patch  | 139 -
 games-fps/gzdoom/gzdoom-4.1.2.ebuild   |  70 ---
 3 files changed, 210 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index afab53dec94..a1c5d339328 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399
 DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B 
d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64
 SHA512 
16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
deleted file mode 100644
index 344fc0193d2..000
--- a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray 
-Date: Wed, 15 May 2019 23:58:28 +0900
-Subject: [PATCH] Force STATIC for internal GZDoom libraries
-
-This makes sure the internal versions of these libraries bundled with
-the GZDoom source code is used. This prevents the system from building
-GZDoom for dynamic linking with incompatible external libraries (see
-).

- asmjit/CMakeLists.txt | 2 +-
- bzip2/CMakeLists.txt  | 2 +-
- game-music-emu/gme/CMakeLists.txt | 2 +-
- gdtoa/CMakeLists.txt  | 2 +-
- glslang/glslang/CMakeLists.txt| 2 +-
- glslang/spirv/CMakeLists.txt  | 2 +-
- jpeg/CMakeLists.txt   | 2 +-
- lzma/CMakeLists.txt   | 2 +-
- zlib/CMakeLists.txt   | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
-index ab5c2fb4f..6b7636ebe 100644
 a/asmjit/CMakeLists.txt
-+++ b/asmjit/CMakeLists.txt
-@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
- asmjit/x86/x86regalloc.cpp
- )
- 
--add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
-+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
- 
- set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
- 
-diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
-index 6ff9a2172..7fefb2bf2 100644
 a/bzip2/CMakeLists.txt
-+++ b/bzip2/CMakeLists.txt
-@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
- endif()
- 
- add_definitions( -DBZ_NO_STDIO )
--add_library( bz2
-+add_library( bz2 STATIC
- blocksort.c
- bzlib.c
- compress.c
-diff --git a/game-music-emu/gme/CMakeLists.txt 
b/game-music-emu/gme/CMakeLists.txt
-index a5e06bc8a..5c37ebd29 100644
 a/game-music-emu/gme/CMakeLists.txt
-+++ b/game-music-emu/gme/CMakeLists.txt
-@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- # Add library to be compiled.
--add_library(gme ${libgme_SRCS})
-+add_library(gme STATIC ${libgme_SRCS})
- 
- if(ZLIB_FOUND)
- message(" ** ZLib library located, compressed file formats will be 
supported")
-diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
-index a0b76e0c3..485f3778b 100644
 a/gdtoa/CMakeLists.txt
-+++ b/gdtoa/CMakeLists.txt
-@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
-   set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h 
${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
- endif()
- 
--add_library( gdtoa
-+add_library( gdtoa STATIC
-   ${GEN_FP_FILES}
-   dmisc.c
-   dtoa.c
-diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
-index c86eccb6e..e376a9178 100644
 a/glslang/glslang/CMakeLists.txt
-+++ b/glslang/glslang/CMakeLists.txt
-@@ -120,7 +120,7 @@ endmacro(glslang_pch)
- 
- glslang_pch(SOURCES MachineIndependent/pch.cpp)
- 
--add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} 
${HEADERS})
-+add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} 
${SOURCES} ${HEADERS})
- set_property(TARGET glslang PROPERTY

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/

2019-06-10 Thread Andreas Sturmlechner 
commit: f165f854c3b61f2bd719a384cd1887a117824ace
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 10 19:45:30 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 10 19:50:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f165f854

games-fps/gzdoom: Add missing media-sound/fluidsynth slot op

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-fps/gzdoom/gzdoom-4.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index 8a614dd5cde..d3d5f880537 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -24,7 +24,7 @@ DEPEND="
)"
 RDEPEND="
${DEPEND}
-   fluidsynth? ( media-sound/fluidsynth )
+   fluidsynth? ( media-sound/fluidsynth:= )
openal? (
media-libs/libsndfile
media-libs/openal

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2019-06-10 Thread Andreas Sturmlechner 
commit: 8aa71216840d5cd875f4321a8a03ce8ed98375df
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun Jun  9 06:56:10 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 10 19:50:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa71216

games-fps/gzdoom: Bump to version 4.1.3

The openal flag is default on since end users typically expect audio
support by default. Adds patch to allow FluidSynth 2 builds.

Closes: https://bugs.gentoo.org/687692
Closes: https://bugs.gentoo.org/687716
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12228
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-fps/gzdoom/Manifest  |  1 +
 .../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch| 28 ++
 games-fps/gzdoom/gzdoom-4.1.3.ebuild   | 61 ++
 3 files changed, 90 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c4522753675..afab53dec94 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399
+DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B 
d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64
 SHA512 
16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
new file mode 100644
index 000..1ae12a832b4
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
@@ -0,0 +1,28 @@
+From: Jan Engelhardt 
+Date: 2018-10-16 14:29:56.900427855 +0200
+
+Make the build work with fluidsynth 2.x.
+
+---
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp |5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+===
+--- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
 gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
+ #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
+ #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
+ #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
+-#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
+ 
+ #endif
+ 
++#ifndef FLUID_CHORUS_DEFAULT_TYPE
++#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
++#endif
++
+ // TYPES ---
+ 
+ // EXTERNAL FUNCTION PROTOTYPES 

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild 
b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
new file mode 100644
index 000..8a614dd5cde
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fluidsynth gtk gtk2 +openal openmp"
+
+DEPEND="
+   media-libs/libsdl2[opengl]
+   sys-libs/zlib
+   virtual/jpeg:0
+   gtk? (
+   gtk2? ( x11-libs/gtk+:2 )
+   !gtk2? ( x11-libs/gtk+:3 )
+   )"
+RDEPEND="
+   ${DEPEND}
+   fluidsynth? ( media-sound/fluidsynth )
+   openal? (
+   media-libs/libsndfile
+   media-libs/openal
+   media-sound/mpg123
+   )"
+
+S="${WORKDIR}/${PN}-g${PV}"
+PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
+
+src_prepare() {
+   rm -rf docs/licenses || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+   -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+   -DDYN_FLUIDSYNTH=OFF
+   -DDYN_OPENAL=OFF
+   -DDYN_SNDFILE=OFF
+   -DDYN_MPG123=OFF
+   -DNO_GTK="$(usex !gtk)"
+   -DNO_OPENAL="$(usex !openal)"
+   -DNO_OPENMP="$(usex !openmp)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   newicon src/posix/zdoom.xpm "${PN}.xpm"
+   make_desktop_entry

[gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/files/, games-fps/gzdoom/

2019-06-02 Thread Stefan Strogin 
commit: 98a6807d2b7584ad5f97e38c2dc19f8551e7e8ff
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu May  2 13:00:54 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sun Jun  2 19:32:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a6807d

games-fps/gzdoom: New package

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11967
Signed-off-by: Stefan Strogin  gentoo.org>

 games-fps/gzdoom/Manifest  |   1 +
 .../files/gzdoom-4.1.2-static-libraries.patch  | 139 +
 games-fps/gzdoom/gzdoom-4.1.2.ebuild   |  70 +++
 games-fps/gzdoom/metadata.xml  |  28 +
 4 files changed, 238 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
new file mode 100644
index 000..c4522753675
--- /dev/null
+++ b/games-fps/gzdoom/Manifest
@@ -0,0 +1 @@
+DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399

diff --git a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch 
b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
new file mode 100644
index 000..344fc0193d2
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
@@ -0,0 +1,139 @@
+From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray 
+Date: Wed, 15 May 2019 23:58:28 +0900
+Subject: [PATCH] Force STATIC for internal GZDoom libraries
+
+This makes sure the internal versions of these libraries bundled with
+the GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with incompatible external libraries (see
+).
+---
+ asmjit/CMakeLists.txt | 2 +-
+ bzip2/CMakeLists.txt  | 2 +-
+ game-music-emu/gme/CMakeLists.txt | 2 +-
+ gdtoa/CMakeLists.txt  | 2 +-
+ glslang/glslang/CMakeLists.txt| 2 +-
+ glslang/spirv/CMakeLists.txt  | 2 +-
+ jpeg/CMakeLists.txt   | 2 +-
+ lzma/CMakeLists.txt   | 2 +-
+ zlib/CMakeLists.txt   | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
+index ab5c2fb4f..6b7636ebe 100644
+--- a/asmjit/CMakeLists.txt
 b/asmjit/CMakeLists.txt
+@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
+ asmjit/x86/x86regalloc.cpp
+ )
+ 
+-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
++add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
+ 
+ set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
+ 
+diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
+index 6ff9a2172..7fefb2bf2 100644
+--- a/bzip2/CMakeLists.txt
 b/bzip2/CMakeLists.txt
+@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ endif()
+ 
+ add_definitions( -DBZ_NO_STDIO )
+-add_library( bz2
++add_library( bz2 STATIC
+ blocksort.c
+ bzlib.c
+ compress.c
+diff --git a/game-music-emu/gme/CMakeLists.txt 
b/game-music-emu/gme/CMakeLists.txt
+index a5e06bc8a..5c37ebd29 100644
+--- a/game-music-emu/gme/CMakeLists.txt
 b/game-music-emu/gme/CMakeLists.txt
+@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ # Add library to be compiled.
+-add_library(gme ${libgme_SRCS})
++add_library(gme STATIC ${libgme_SRCS})
+ 
+ if(ZLIB_FOUND)
+ message(" ** ZLib library located, compressed file formats will be 
supported")
+diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
+index a0b76e0c3..485f3778b 100644
+--- a/gdtoa/CMakeLists.txt
 b/gdtoa/CMakeLists.txt
+@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
+   set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h 
${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
+ endif()
+ 
+-add_library( gdtoa
++add_library( gdtoa STATIC
+   ${GEN_FP_FILES}
+   dmisc.c
+   dtoa.c
+diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
+index c86eccb6e..e376a9178 100644
+--- a/glslang/glslang/CMakeLists.txt
 b/glslang/glslang/CMakeLists.txt
+@@ -120,7 +120,7 @@ endmacro(glslang_pch)
+ 
+ glslang_pch(SOURCES MachineIndependent/pch.cpp)
+ 
+-add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} 
${HEADERS})
++add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} 
${SOURCES} ${HEADERS})
+ set_property(TARGET glslang PROPERTY FOLDER glslang)
+ set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(glslang OGLCompiler OSDependent)
+diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt
+index