* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2022-09-21 19:44 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-09-21 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 55c93c959734b5d180f2c35e9d3cefa5c81635e7
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Sep 20 03:29:14 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 03:29:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55c93c95
games-emulation/flycast: changes to submodules and build system
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/flycast/flycast-9999.ebuild | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index 8e597f576..eefcdbb67 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -10,7 +10,7 @@ inherit cmake git-r3 lua-single xdg
DESCRIPTION="Sega Dreamcast, Naomi and Atomiswave emulator"
HOMEPAGE="https://github.com/flyinghead/flycast"
EGIT_REPO_URI="https://github.com/flyinghead/flycast"
-EGIT_SUBMODULES=( 'core/deps/breakpad' )
+EGIT_SUBMODULES=( 'core/deps/breakpad' 'core/deps/volk' 'core/deps/VulkanMemoryAllocator' )
LICENSE="GPL-2"
SLOT="0"
@@ -81,6 +81,16 @@ src_prepare() {
# Ensure static libs are not built
sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt
+ # Vulkan-header
+ sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \
+ -e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt
+ # local fix for < 1.3.224
+ sed -i -e '/^1,$/d' core/rend/vulkan/compiler.cpp
+ sed -i -e '/swapchainExtent = /{s/= /&static_cast<VkExtent2D>(/;s/;/);/}' core/rend/vulkan/vulkan_context.cpp
+
+ # Do not use ccache
+ sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
+
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2023-01-30 18:24 Haelwenn Monnier
0 siblings, 0 replies; 6+ messages in thread
From: Haelwenn Monnier @ 2023-01-30 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 004c8a95c3a793c888018109818c545481ce4d0f
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Jan 30 10:37:05 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Jan 30 10:37:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=004c8a95
games-emulation/flycast: updates
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/flycast/flycast-9999.ebuild | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index eefcdbb67..f5235a1cc 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="
openmp? ( sys-devel/gcc:*[openmp] )
pulseaudio? ( media-sound/pulseaudio )
vulkan? (
- dev-util/glslang
+ >=dev-util/glslang-1.3.231
dev-util/spirv-headers
)
"
@@ -67,7 +67,6 @@ src_prepare() {
sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
core/rend/vulkan/compiler.cpp || die
- sed -i -e '/maxMeshViewCountNV/a1,' core/rend/vulkan/compiler.cpp || die
# Unbundle xxHash
sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' CMakeLists.txt || die
@@ -84,9 +83,6 @@ src_prepare() {
# Vulkan-header
sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \
-e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt
- # local fix for < 1.3.224
- sed -i -e '/^1,$/d' core/rend/vulkan/compiler.cpp
- sed -i -e '/swapchainExtent = /{s/= /&static_cast<VkExtent2D>(/;s/;/);/}' core/rend/vulkan/vulkan_context.cpp
# Do not use ccache
sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2023-02-14 12:02 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-02-14 12:02 UTC (permalink / raw
To: gentoo-commits
commit: a960b203c4ba687f0eb08e774d919982e791535c
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Feb 13 15:04:48 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 15:04:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a960b203
games-emulation/flycast: support lasted glslang, force system sdl
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/flycast/flycast-9999.ebuild | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index f5235a1cc..a77d24c1c 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -67,12 +67,17 @@ src_prepare() {
sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
core/rend/vulkan/compiler.cpp || die
+ # Crazy commit fix: 8d0654c
+ sed -i -e '/maxMeshViewCountNV/a256,256,128,128,128,128,128,128,4,' \
+ core/rend/vulkan/compiler.cpp || die
# Unbundle xxHash
- sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' CMakeLists.txt || die
+ sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' \
+ CMakeLists.txt || die
# Unbundle chdr
- sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' -e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
+ sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' \
+ -e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
# Do not use ccache
sed -i -e '/find_program(CCACHE_FOUND/d' CMakeLists.txt
@@ -87,6 +92,9 @@ src_prepare() {
# Do not use ccache
sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
+ # Revert crazy commit: #4408aa7
+ sed -i -e '/if(NOT APPLE AND (/s/.*/if( NOT APPLE )/' CMakeLists.txt
+
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2023-06-26 11:24 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2023-06-26 11:24 UTC (permalink / raw
To: gentoo-commits
commit: c8247708a2521c325b84d7bb0e265058427762e8
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sat Jun 24 12:05:57 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 12:05:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c8247708
games-emulation/flycast: update vulkan unbundling
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/flycast/flycast-9999.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index a77d24c1c..25e3b4ba5 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -88,6 +88,10 @@ src_prepare() {
# Vulkan-header
sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \
-e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt
+ sed -i -e 's:SPIRV/GlslangToSpv.h:glslang/&:' core/rend/vulkan/compiler.cpp
+ if use vulkan; then
+ sed -i -e '$atarget_link_libraries(${PROJECT_NAME} PRIVATE glslang-default-resource-limits)' CMakeLists.txt
+ fi
# Do not use ccache
sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2023-07-13 9:42 David Roman
0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-07-13 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 8500b40fb62863668b9794ce88f506773a215d48
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Jul 13 07:08:26 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 13 07:08:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8500b40f
games-emulation/flycast: depend on libpulse
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/flycast/flycast-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
index 25e3b4ba5..e1dcc5e02 100644
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ b/games-emulation/flycast/flycast-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
lua? ( ${LUA_DEPS} )
opengl? ( virtual/opengl )
openmp? ( sys-devel/gcc:*[openmp] )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
vulkan? (
>=dev-util/glslang-1.3.231
dev-util/spirv-headers
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/
@ 2024-05-21 21:33 Julien Roy
0 siblings, 0 replies; 6+ messages in thread
From: Julien Roy @ 2024-05-21 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 5886ae85c96e0eadfc074ebd27fc65f52e887bf1
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Tue May 21 21:27:07 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Tue May 21 21:29:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5886ae85
games-emulation/flycast: treeclean
Bug: https://bugs.gentoo.org/926271
Bug: https://bugs.gentoo.org/924444
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
games-emulation/flycast/flycast-9999.ebuild | 112 ----------------------------
games-emulation/flycast/metadata.xml | 14 ----
2 files changed, 126 deletions(-)
diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild
deleted file mode 100644
index 3cea66b7a..000000000
--- a/games-emulation/flycast/flycast-9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-
-inherit cmake git-r3 lua-single xdg
-
-DESCRIPTION="Sega Dreamcast, Naomi and Atomiswave emulator"
-HOMEPAGE="https://github.com/flyinghead/flycast"
-EGIT_REPO_URI="https://github.com/flyinghead/flycast"
-EGIT_SUBMODULES=( 'core/deps/breakpad' 'core/deps/volk' 'core/deps/VulkanMemoryAllocator' )
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="alsa ao lua opengl +openmp pulseaudio vulkan"
-
-DEPEND="
- dev-libs/libchdr
- dev-libs/libzip
- dev-libs/xxhash
- media-libs/libsdl2
- net-libs/miniupnpc
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- ao? ( media-libs/libao )
- lua? ( ${LUA_DEPS} )
- opengl? ( virtual/opengl )
- openmp? ( sys-devel/gcc:*[openmp] )
- pulseaudio? ( media-libs/libpulse )
- vulkan? (
- >=dev-util/glslang-1.3.231
- dev-util/spirv-headers
- )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( opengl vulkan ) || ( ao alsa pulseaudio )"
-
-src_unpack() {
- use lua && EGIT_SUBMODULES+=( 'core/deps/luabridge' )
- git-r3_src_unpack
-}
-src_prepare() {
- # Ensure unneeded deps are not bundled
- for dep in chdr dirent glslang libretro-common libzip miniupnpc oboe patches SDL vixl xxHash; do
- rm -rf core/deps/${dep}
- done
-
- # Skip alsa if flag not enabled
- use !alsa && sed -i -e '/find_package(ALSA)/d' CMakeLists.txt
-
- # Skip ao if flag not enabled
- use !ao && sed -i -e '/pkg_check_modules(AO/d' CMakeLists.txt
-
- # Skip lua if flag not enabled
- use !lua && sed -i -e '/find_package(Lua)/d' CMakeLists.txt
-
- # Skip pulseaudio if flag not enabled
- use !pulseaudio && sed -i -e '/pkg_check_modules(LIBPULSE/d' CMakeLists.txt
-
- # Unbundle glslang
- sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
- sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
- core/rend/vulkan/compiler.cpp || die
- # Crazy commit fix: 8d0654c
- sed -i -e '/maxMeshViewCountNV/a256,256,128,128,128,128,128,128,4,' \
- core/rend/vulkan/compiler.cpp || die
-
- # Unbundle xxHash
- sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' \
- CMakeLists.txt || die
-
- # Unbundle chdr
- sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' \
- -e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
-
- # Do not use ccache
- sed -i -e '/find_program(CCACHE_FOUND/d' CMakeLists.txt
-
- # Ensure static libs are not built
- sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt
-
- # Vulkan-header
- sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \
- -e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt
- sed -i -e 's:SPIRV/GlslangToSpv.h:glslang/&:' core/rend/vulkan/compiler.cpp
- if use vulkan; then
- sed -i -e '$atarget_link_libraries(${PROJECT_NAME} PRIVATE glslang-default-resource-limits)' CMakeLists.txt
- fi
-
- # Do not use ccache
- sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
-
- # Revert crazy commit: #4408aa7
- sed -i -e '/if(NOT APPLE AND (/s/.*/if( NOT APPLE )/' CMakeLists.txt
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENMP=$(usex openmp)
- -DUSE_VULKAN=$(usex vulkan)
- -DUSE_HOST_LIBZIP=ON
- -DWITH_SYSTEM_ZLIB=ON
- )
- cmake_src_configure
-}
diff --git a/games-emulation/flycast/metadata.xml b/games-emulation/flycast/metadata.xml
deleted file mode 100644
index 524f53682..000000000
--- a/games-emulation/flycast/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <name>mazes-80</name>
- <email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
- <flag name="vulkan">Compile vulkan backend</flag>
-</use>
-<upstream>
- <remote-id type="github">flyinghead/flycast</remote-id>
-</upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-21 21:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-14 12:02 [gentoo-commits] repo/proj/guru:master commit in: games-emulation/flycast/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-05-21 21:33 Julien Roy
2023-07-13 9:42 David Roman
2023-06-26 11:24 Andrew Ammerlaan
2023-01-30 18:24 Haelwenn Monnier
2022-09-21 19:44 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox