mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 03:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2019-06-03 14:24:16 +00:00
parent 5a394dd9d8 556708d30e
commit 90fa96bff8
7 changed files with 0 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games-fps/gzdoom/Manifest
View File

@@ -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

26
games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
View File

@@ -1,26 +0,0 @@
From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
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

139
games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
View File

@@ -1,139 +0,0 @@
From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 Mon Sep 17 00:00:00 2001
From: William Breathitt Gray <vilhelm.gray@gmail.com>
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
<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
---
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 8062f8067..03d34d8f4 100644
--- a/glslang/spirv/CMakeLists.txt
+++ b/glslang/spirv/CMakeLists.txt
@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
GLSL.ext.NV.h)
endif(ENABLE_NV_EXTENSIONS)
-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 ..)
diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
index 81834c742..33a3938cf 100644
--- a/jpeg/CMakeLists.txt
+++ b/jpeg/CMakeLists.txt
@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
endif()
-add_library( jpeg
+add_library( jpeg STATIC
jaricom.c
jcomapi.c
jdapimin.c
diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt
index 3948ea2ee..4246a34f8 100644
--- a/lzma/CMakeLists.txt
+++ b/lzma/CMakeLists.txt
@@ -34,5 +34,5 @@ else()
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
endif()
-add_library( lzma ${LZMA_FILES} )
+add_library( lzma STATIC ${LZMA_FILES} )
target_link_libraries( lzma )
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 52542bbaa..a1d6637a9 100644
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -137,7 +137,7 @@ if(MINGW)
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif()
-add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
--
2.21.0

139
games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
View File

@@ -1,139 +0,0 @@
From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
From: William Breathitt Gray <vilhelm.gray@gmail.com>
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
<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
---
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 8062f8067..03d34d8f4 100644
--- a/glslang/spirv/CMakeLists.txt
+++ b/glslang/spirv/CMakeLists.txt
@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
GLSL.ext.NV.h)
endif(ENABLE_NV_EXTENSIONS)
-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 ..)
diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
index 81834c742..33a3938cf 100644
--- a/jpeg/CMakeLists.txt
+++ b/jpeg/CMakeLists.txt
@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
endif()
-add_library( jpeg
+add_library( jpeg STATIC
jaricom.c
jcomapi.c
jdapimin.c
diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt
index 3948ea2ee..4246a34f8 100644
--- a/lzma/CMakeLists.txt
+++ b/lzma/CMakeLists.txt
@@ -34,5 +34,5 @@ else()
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
endif()
-add_library( lzma ${LZMA_FILES} )
+add_library( lzma STATIC ${LZMA_FILES} )
target_link_libraries( lzma )
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 52542bbaa..a1d6637a9 100644
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -137,7 +137,7 @@ if(MINGW)
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif()
-add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
--
2.21.0

65
games-fps/gzdoom/gzdoom-4.1.1.ebuild
View File

@@ -1,65 +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.2 GPL-3 LGPL-3 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="fluidsynth gtk openal openmp"
DEPEND="
media-libs/libsdl2[opengl]
sys-libs/zlib
virtual/jpeg:0
gtk? ( <x11-libs/gtk+-4:= )"
RDEPEND="
${DEPEND}
fluidsynth? ( media-sound/fluidsynth )
openal? (
media-libs/libsndfile
media-libs/openal
media-sound/mpg123
)"
S="${WORKDIR}/${PN}-g${PV}"
PATCHES="${FILESDIR}/${PV}"
src_prepare() {
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${P}/docs"
-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 "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
cmake-utils_src_install
}
pkg_preinst() {
xdg_pkg_preinst
}
pkg_postinst() {
xdg_pkg_postinst
}
pkg_postrm() {
xdg_pkg_postrm
}

65
games-fps/gzdoom/gzdoom-4.1.2.ebuild
View File

@@ -1,65 +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.2 GPL-3 LGPL-3 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="fluidsynth gtk openal openmp"
DEPEND="
media-libs/libsdl2[opengl]
sys-libs/zlib
virtual/jpeg:0
gtk? ( <x11-libs/gtk+-4:= )"
RDEPEND="
${DEPEND}
fluidsynth? ( media-sound/fluidsynth )
openal? (
media-libs/libsndfile
media-libs/openal
media-sound/mpg123
)"
S="${WORKDIR}/${PN}-g${PV}"
PATCHES="${FILESDIR}/${PV}"
src_prepare() {
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${P}/docs"
-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 "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
cmake-utils_src_install
}
pkg_preinst() {
xdg_pkg_preinst
}
pkg_postinst() {
xdg_pkg_postinst
}
pkg_postrm() {
xdg_pkg_postrm
}

19
games-fps/gzdoom/metadata.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">
GZDoom is a modder-friendly OpenGL source port based on the DOOM engine
</longdescription>
<maintainer type="person">
<email>vilhelm.gray@gmail.com</email>
<name>William Breathitt Gray</name>
</maintainer>
<use>
<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
</use>
<upstream>
<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
<doc lang="en">https://zdoom.org</doc>
<remote-id type="github">coelckers/gzdoom</remote-id>
</upstream>
</pkgmetadata>