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