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

2019-06-03 Thread Ralph Seichter 
commit: 556708d30e281f2abcb923ab75ff263ea668c846
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Jun  3 08:52:41 2019 +
Commit: Ralph Seichter  seichter  de>
CommitDate: Mon Jun  3 08:52:41 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=556708d3

games-fps/gzdoom: Remove gzdoom package

The gzdoom ebuild has been merged to the Gentoo ebuild repository.

Signed-off-by: William Breathitt Gray  gmail.com>

 games-fps/gzdoom/Manifest  |   2 -
 .../0001-made-DUMB-library-always-static.patch |  26 
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 -
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 -
 games-fps/gzdoom/gzdoom-4.1.1.ebuild   |  65 --
 games-fps/gzdoom/gzdoom-4.1.2.ebuild   |  65 --
 games-fps/gzdoom/metadata.xml  |  19 ---
 7 files changed, 455 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
deleted file mode 100644
index 829f134..000
--- a/games-fps/gzdoom/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gzdoom-4.1.1.tar.gz 13008847 BLAKE2B 
ac2bddbcc618148ed9de15dfe9105d1f3b9f319496b995d2af06834eb1349415ab3ee48beaa3e1acac04c81152e32bc89b71ac53576cf7789c1471a29a0a5339
 SHA512 
649e8bbf7f7f669d1bda13f1ab654428b69fa3e03a97eefb2ff1e996dbf62c66df72dddee9b8c139664ce5374ffbcdd8a10d1c4e3d0e6e65848ed5660b547d34
-DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 
38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a
 SHA512 
915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399

diff --git 
a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch 
b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
deleted file mode 100644
index b6e0829..000
--- a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
-From: "alexey.lysiuk" 
-Date: Fri, 10 May 2019 15:35:57 +0300
-Subject: [PATCH] - made DUMB library always static
-
-DUMB uses dumb_decode_vorbis() function from the main executable, so it failed 
to link as a dynamic library

- dumb/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
-index 85e052209..904ca75c3 100644
 a/dumb/CMakeLists.txt
-+++ b/dumb/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
- 
- include_directories( include )
- 
--add_library( dumb
-+add_library( dumb STATIC
- src/core/unload.c
- src/core/rendsig.c
- src/core/rendduh.c
--- 
-2.21.0
-

diff --git 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
deleted file mode 100644
index f05a5f5..000
--- 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 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

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

2019-05-16 Thread Ralph Seichter 
commit: b0ff4b1b6b4b5b9e00525b46cd78311495e96d12
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed May 15 16:00:35 2019 +
Commit: Ralph Seichter  seichter  de>
CommitDate: Wed May 15 16:00:35 2019 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0ff4b1b

games-fps/gzdoom: Fix makefiles for bundled libraries

GZDoom includes bundled libraries with modifications made for GZDoom.
This commit adds patches to ensure the bundled libraries are built as
intended by the GZDoom project. The glslang dependency is removed since
GZDoom has its own modified bundled version.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray  gmail.com>

 .../0001-made-DUMB-library-always-static.patch |  26 
 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 +
 games-fps/gzdoom/gzdoom-4.1.1.ebuild   |   3 +-
 3 files changed, 167 insertions(+), 1 deletion(-)

diff --git 
a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch 
b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
new file mode 100644
index 000..b6e0829
--- /dev/null
+++ b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
@@ -0,0 +1,26 @@
+From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
+From: "alexey.lysiuk" 
+Date: Fri, 10 May 2019 15:35:57 +0300
+Subject: [PATCH] - made DUMB library always static
+
+DUMB uses dumb_decode_vorbis() function from the main executable, so it failed 
to link as a dynamic library
+---
+ dumb/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
+index 85e052209..904ca75c3 100644
+--- a/dumb/CMakeLists.txt
 b/dumb/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ 
+ include_directories( include )
+ 
+-add_library( dumb
++add_library( dumb STATIC
+ src/core/unload.c
+ src/core/rendsig.c
+ src/core/rendduh.c
+-- 
+2.21.0
+

diff --git 
a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
new file mode 100644
index 000..f05a5f5
--- /dev/null
+++ 
b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
@@ -0,0 +1,139 @@
+From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 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