[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/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/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/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/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