public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-15 12:21 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-15 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     32d09ded171a39af45e008d7df20c0ce7678f78b
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Mon Jul 14 01:31:11 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul 14 01:31:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=32d09ded

app-emulation/lsfg-vk: add forgotten dependency on dev-util/spirv-headers

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 0dd3b2122a..8d06342ff0 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -28,6 +28,7 @@ else
 fi
 
 BDEPEND="
+	dev-util/spirv-headers
 	dev-util/vulkan-headers
 "
 DEPEND="


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-15 12:21 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-15 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0a0faef73f608167525081373b31bc8b8a5d1620
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Mon Jul 14 01:13:25 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul 14 01:28:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0a0faef7

app-emulation/lsfg-vk: new ebuild

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 58 +++++++++++++++++++++++++++++++
 app-emulation/lsfg-vk/metadata.xml        | 12 +++++++
 2 files changed, 70 insertions(+)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
new file mode 100644
index 0000000000..0dd3b2122a
--- /dev/null
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
+HOMEPAGE="https://github.com/PancakeTAS/lsfg-vk"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PancakeTAS/lsfg-vk"
+	EGIT_SUBMODULES=(
+		dxbc
+		pe-parse
+	)
+else
+	HASH_DXBC="04ca5e9ae5fef6c0c65ea72bbaa7375327f11454"
+	PEPARSE_VERSION="2.1.1"
+	SRC_URI="
+		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz
+		https://github.com/PancakeTAS/dxbc/archive/${HASH_DXBC}.tar.gz
+		https://github.com/trailofbits/pe-parse/archive/refs/tags/v${PEPARSE_VERSION}.tar.gz
+	"
+fi
+
+BDEPEND="
+	dev-util/vulkan-headers
+"
+DEPEND="
+	media-libs/vulkan-loader
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		mv ../dxbc-${HASH_DXBC} dxbc || die
+		mv ../pe-parse-${PEPARSE_VERSION} pe-parse || die
+	fi
+
+	sed -i 's/^option(BUILD_SHARED_LIBS "Build Shared Libraries" ON)$/option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)/' pe-parse/CMakeLists.txt || die
+	sed -i 's|add_library(${PROJECT_NAME} ${PEPARSERLIB_SOURCEFILES})|add_library(${PROJECT_NAME} STATIC ${PEPARSERLIB_SOURCEFILES})|' pe-parse/pe-parser-library/CMakeLists.txt || die
+
+	sed -i '/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d' CMakeLists.txt dxbc/CMakeLists.txt || die
+	sed -i 's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|' VkLayer_LS_frame_generation.json || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_install() {
+	insinto "/usr/share/vulkan/implicit_layer.d/"
+	doins "${S}/VkLayer_LS_frame_generation.json"
+	dolib.so "${WORKDIR}/${P}_build/liblsfg-vk.so"
+}

diff --git a/app-emulation/lsfg-vk/metadata.xml b/app-emulation/lsfg-vk/metadata.xml
new file mode 100644
index 0000000000..65ccfa2e6f
--- /dev/null
+++ b/app-emulation/lsfg-vk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+    <maintainer type="person">
+        <email>w.iron.zombie@gmail.com</email>
+        <name>Charlie Quinet</name>
+        <description>Username404-59</description>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">PancakeTAS/lsfg-vk</remote-id>
+    </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-18 22:11 Haelwenn Monnier
  0 siblings, 0 replies; 17+ messages in thread
From: Haelwenn Monnier @ 2025-07-18 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1dc3d288ced8916bd1dd5dc46740607769d15f7a
Author:     ingenarel <ingenarelitems <AT> gmail <DOT> com>
AuthorDate: Fri Jul 18 11:04:59 2025 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul 18 11:04:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1dc3d288

app-emulation/lsfg-vk: break up long lines

fixes the following pkgcheck warning:

app-emulation/lsfg-vk
    ExcessiveLineLength: version 9999: excessive line length (over 120 characters) on lines: 45, 48, 49

Signed-off-by: ingenarel <ingenarelitems <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 8d06342ff0..9b4e97589f 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -42,11 +42,20 @@ src_prepare() {
 		mv ../pe-parse-${PEPARSE_VERSION} pe-parse || die
 	fi
 
-	sed -i 's/^option(BUILD_SHARED_LIBS "Build Shared Libraries" ON)$/option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)/' pe-parse/CMakeLists.txt || die
-	sed -i 's|add_library(${PROJECT_NAME} ${PEPARSERLIB_SOURCEFILES})|add_library(${PROJECT_NAME} STATIC ${PEPARSERLIB_SOURCEFILES})|' pe-parse/pe-parser-library/CMakeLists.txt || die
+	sed -i\
+		's/^option(BUILD_SHARED_LIBS "Build Shared Libraries" ON)$/option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)/'\
+		pe-parse/CMakeLists.txt || die
 
-	sed -i '/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d' CMakeLists.txt dxbc/CMakeLists.txt || die
-	sed -i 's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|' VkLayer_LS_frame_generation.json || die
+	sed -i\
+		's|add_library(${PROJECT_NAME} ${PEPARSERLIB_SOURCEFILES})|add_library(${PROJECT_NAME} STATIC ${PEPARSERLIB_SOURCEFILES})|'\
+		pe-parse/pe-parser-library/CMakeLists.txt || die
+
+	sed -i\
+		'/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
+		CMakeLists.txt dxbc/CMakeLists.txt || die
+	sed -i\
+		's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|'\
+		VkLayer_LS_frame_generation.json || die
 
 	eapply_user
 	cmake_src_prepare


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-18 22:11 Haelwenn Monnier
  0 siblings, 0 replies; 17+ messages in thread
From: Haelwenn Monnier @ 2025-07-18 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     4eaf8cf260ae133a87f24df037ff14675b4e1b57
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Fri Jul 18 17:50:32 2025 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul 18 17:50:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4eaf8cf2

app-emulation/lsfg-vk: update ebuild for new changes upstream

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 33 ++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 9b4e97589f..1c3d677c02 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PancakeTAS/lsfg-vk"
 	EGIT_SUBMODULES=(
-		dxbc
-		pe-parse
+		thirdparty/dxbc
+		thirdparty/pe-parse
 	)
 else
 	HASH_DXBC="04ca5e9ae5fef6c0c65ea72bbaa7375327f11454"
@@ -30,29 +30,48 @@ fi
 BDEPEND="
 	dev-util/spirv-headers
 	dev-util/vulkan-headers
+	>=media-libs/raylib-9999
 "
 DEPEND="
+	dev-cpp/toml11
 	media-libs/vulkan-loader
 "
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		mv ../dxbc-${HASH_DXBC} dxbc || die
-		mv ../pe-parse-${PEPARSE_VERSION} pe-parse || die
+		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
+		mv ../pe-parse-${PEPARSE_VERSION} thirdparty/pe-parse || die
 	fi
 
+	# Static linking pe-parse
 	sed -i\
 		's/^option(BUILD_SHARED_LIBS "Build Shared Libraries" ON)$/option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)/'\
-		pe-parse/CMakeLists.txt || die
+		thirdparty/pe-parse/CMakeLists.txt || die
 
 	sed -i\
 		's|add_library(${PROJECT_NAME} ${PEPARSERLIB_SOURCEFILES})|add_library(${PROJECT_NAME} STATIC ${PEPARSERLIB_SOURCEFILES})|'\
-		pe-parse/pe-parser-library/CMakeLists.txt || die
+		thirdparty/pe-parse/pe-parser-library/CMakeLists.txt || die
 
+	# Using system toml11 and raylib
+	sed -i\
+		-e '/add_subdirectory(thirdparty\/toml11 EXCLUDE_FROM_ALL)/d' \
+		-e '/add_subdirectory(thirdparty\/raylib EXCLUDE_FROM_ALL)/d' \
+		-e '/get_target_property(TOML11_INCLUDE_DIRS toml11 INTERFACE_INCLUDE_DIRECTORIES)/{
+N
+/target_include_directories(lsfg-vk SYSTEM PRIVATE ${TOML11_INCLUDE_DIRS})/c\
+find_package(toml11 REQUIRED)\
+find_library(raylib_LIBRARY NAMES raylib)
+}'\
+		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/}'\
+		CMakeLists.txt || die
+
+	# GCC support
 	sed -i\
 		'/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
-		CMakeLists.txt dxbc/CMakeLists.txt || die
+		CMakeLists.txt thirdparty/dxbc/CMakeLists.txt || die
+
+	# Fixed library path
 	sed -i\
 		's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|'\
 		VkLayer_LS_frame_generation.json || die


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-18 22:11 Haelwenn Monnier
  0 siblings, 0 replies; 17+ messages in thread
From: Haelwenn Monnier @ 2025-07-18 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b5c4b675d0969d4c249299afd91f2abca9ae7b60
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Fri Jul 18 19:24:05 2025 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul 18 19:31:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5c4b675

app-emulation/lsfg-vk: remove the now useless sed for unsetting compiler vars

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 1c3d677c02..2c5c64d67e 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -66,11 +66,6 @@ find_library(raylib_LIBRARY NAMES raylib)
 		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/}'\
 		CMakeLists.txt || die
 
-	# GCC support
-	sed -i\
-		'/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
-		CMakeLists.txt thirdparty/dxbc/CMakeLists.txt || die
-
 	# Fixed library path
 	sed -i\
 		's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|'\


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-21 13:05 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-21 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     e6bdcca1e1a899752c4f6c18da2e56e656921733
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Mon Jul 21 08:32:46 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul 21 09:21:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e6bdcca1

app-emulation/lsfg-vk: bring back compiler vars unsetting

They are set again: https://github.com/PancakeTAS/lsfg-vk/commit/60e2335f860bf23358602378082d12ef8a4ae2ab

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index ee2ebe89c3..40dbbf9327 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -70,6 +70,7 @@ find_package(toml11 REQUIRED)\
 find_library(raylib_LIBRARY NAMES raylib)
 }'\
 		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/}'\
+		-e '/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
 		CMakeLists.txt || die
 
 	# Fixed library path


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-21 13:05 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-21 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     dd9de91771c9c6311f9515bbea3725655dd5d78e
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Mon Jul 21 09:12:23 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul 21 09:21:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd9de917

app-emulation/lsfg-vk: force usage of system spirv headers

They switched to using a submodule

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 40dbbf9327..87cf404d7e 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -69,10 +69,21 @@ N
 find_package(toml11 REQUIRED)\
 find_library(raylib_LIBRARY NAMES raylib)
 }'\
-		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/}'\
+		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/;s/ SPIRV-Headers//}'\
 		-e '/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
 		CMakeLists.txt || die
 
+	# Using system spirv headers
+	sed -i \
+		-e '/add_subdirectory(spirv)/d' \
+		-e '/target_link_libraries(dxbc/,/SPIRV-Headers)/d' \
+		-e '/target_include_directories(dxbc SYSTEM/,/include\/dxvk)/c\
+target_include_directories(dxbc\
+	SYSTEM PUBLIC include/dxbc\
+	SYSTEM PUBLIC include/spirv include/util include/dxvk\
+)' \
+		thirdparty/dxbc/CMakeLists.txt || die
+
 	# Fixed library path
 	sed -i\
 		's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|'\


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-21 13:05 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-21 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2bd42c83263772b2273789f3e42b5776b18512ed
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Mon Jul 21 09:56:38 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul 21 09:56:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2bd42c83

app-emulation/lsfg-vk: fix gcc support sed

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 87cf404d7e..773e4d4523 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -70,7 +70,7 @@ find_package(toml11 REQUIRED)\
 find_library(raylib_LIBRARY NAMES raylib)
 }'\
 		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/;s/ SPIRV-Headers//}'\
-		-e '/^set(CMAKE_C_COMPILER clang)$/d; /^set(CMAKE_CXX_COMPILER clang++)$/d'\
+		-e '/set(CMAKE_CXX_COMPILER clang++) # gcc release build crashes/d;/set(CMAKE_C_COMPILER clang)     # feel free to fix :3/d'\
 		CMakeLists.txt || die
 
 	# Using system spirv headers


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-25 10:49 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-25 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     64bf791e8a4a71221680198ee40ee28817ed4848
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Thu Jul 24 16:38:17 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 24 16:43:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=64bf791e

app-emulation/lsfg-vk: update DXBC hash just in case

For whenever a point release will be made

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 773e4d4523..62796616c3 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		thirdparty/pe-parse
 	)
 else
-	HASH_DXBC="04ca5e9ae5fef6c0c65ea72bbaa7375327f11454"
+	HASH_DXBC="80e316fd13d7e8938d99a08f1f405a0679c3ccfa"
 	PEPARSE_VERSION="2.1.1"
 	SRC_URI="
 		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-25 10:49 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-25 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0c6e33483856abb81a88fcc7fc637d3b4247daa1
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Thu Jul 24 16:38:28 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 24 16:43:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0c6e3348

app-emulation/lsfg-vk: add gui USE flag

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 38 ++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 62796616c3..1817781a8e 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake cargo
 
 DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
 HOMEPAGE="https://github.com/PancakeTAS/lsfg-vk"
 LICENSE="MIT"
 SLOT="0"
+IUSE="+gui"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -35,6 +36,11 @@ BDEPEND="
 DEPEND="
 	dev-cpp/toml11
 	dev-util/glslang
+	gui? (
+		dev-libs/glib:2
+		gui-libs/gtk:4
+		gui-libs/libadwaita
+	)
 	|| (
 		media-libs/glfw
 		media-libs/libsdl2
@@ -44,6 +50,35 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	if [[ ${PV} != 9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+	fi
+
+	if use gui; then
+		oldS="${S}"
+		S="${S}/ui"
+		if [[ ${PV} != 9999 ]]; then
+			cargo_src_unpack
+		else
+			cargo_live_src_unpack
+		fi
+		S="${oldS}"
+	fi
+}
+
+src_configure() {
+	cmake_src_configure
+	use gui && cd ui && cargo_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use gui && cd ui && cargo_src_compile
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
@@ -97,4 +132,5 @@ src_install() {
 	insinto "/usr/share/vulkan/implicit_layer.d/"
 	doins "${S}/VkLayer_LS_frame_generation.json"
 	dolib.so "${WORKDIR}/${P}_build/liblsfg-vk.so"
+	use gui && newbin "${S}/ui/target/release/ui" "lsfg-vk-gui"
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-25 10:49 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-25 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b270d64bbe6a9576eba46cd5f631061725f6512e
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Thu Jul 24 17:51:26 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 24 17:51:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b270d64b

app-emulation/lsfg-vk: filter out LTO on gcc

It causes segmentation faults

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 1817781a8e..b5dc740cde 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake cargo
+inherit cmake cargo toolchain-funcs
 
 DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
 HOMEPAGE="https://github.com/PancakeTAS/lsfg-vk"
@@ -70,6 +70,7 @@ src_unpack() {
 }
 
 src_configure() {
+	tc-is-gcc && filter-lto # LTO with gcc causes segfaults at runtime
 	cmake_src_configure
 	use gui && cd ui && cargo_src_configure
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-25 10:49 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-25 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     eb4eab6d5c6ad73087eaef42036f084af23fef86
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Thu Jul 24 22:03:10 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 24 22:03:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eb4eab6d

app-emulation/lsfg-vk: improve ebuild, use CARGO_OPTIONAL

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index b5dc740cde..66c3327f84 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake cargo toolchain-funcs
+CARGO_OPTIONAL=1
+inherit cargo cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
 HOMEPAGE="https://github.com/PancakeTAS/lsfg-vk"
@@ -31,6 +32,7 @@ fi
 BDEPEND="
 	dev-util/spirv-headers
 	dev-util/vulkan-headers
+	gui? ( ${RUST_DEPEND} )
 	>=media-libs/raylib-9999
 "
 DEPEND="
@@ -61,6 +63,7 @@ src_unpack() {
 		oldS="${S}"
 		S="${S}/ui"
 		if [[ ${PV} != 9999 ]]; then
+			A=$(printf '%s\n' "${A[@]}" | grep '\.crate$' || true) # Workaroud to avoid unpacking twice
 			cargo_src_unpack
 		else
 			cargo_live_src_unpack
@@ -69,17 +72,6 @@ src_unpack() {
 	fi
 }
 
-src_configure() {
-	tc-is-gcc && filter-lto # LTO with gcc causes segfaults at runtime
-	cmake_src_configure
-	use gui && cd ui && cargo_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use gui && cd ui && cargo_src_compile
-}
-
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
@@ -129,9 +121,20 @@ target_include_directories(dxbc\
 	cmake_src_prepare
 }
 
+src_configure() {
+	tc-is-gcc && filter-lto # LTO with gcc causes segfaults at runtime
+	cmake_src_configure
+	use gui && { pushd ui > /dev/null || die; cargo_src_configure; }
+}
+
+src_compile() {
+	cmake_src_compile
+	use gui && { pushd ui > /dev/null || die; cargo_src_compile; }
+}
+
 src_install() {
 	insinto "/usr/share/vulkan/implicit_layer.d/"
 	doins "${S}/VkLayer_LS_frame_generation.json"
 	dolib.so "${WORKDIR}/${P}_build/liblsfg-vk.so"
-	use gui && newbin "${S}/ui/target/release/ui" "lsfg-vk-gui"
+	use gui && newbin "${S}/ui/$(cargo_target_dir)/ui" "lsfg-vk-gui"
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-26 21:13 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-26 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     09d47e4a5c469b13dcc74fa3a69e00779b2a9860
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Fri Jul 25 14:08:51 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Jul 25 14:12:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=09d47e4a

app-emulation/lsfg-vk: remove bad workaround

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 66c3327f84..b916f2eaac 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -54,21 +54,20 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	if [[ ${PV} != 9999 ]]; then
-		default
+		use gui || default
 	else
 		git-r3_src_unpack
 	fi
 
 	if use gui; then
-		oldS="${S}"
-		S="${S}/ui"
 		if [[ ${PV} != 9999 ]]; then
-			A=$(printf '%s\n' "${A[@]}" | grep '\.crate$' || true) # Workaroud to avoid unpacking twice
 			cargo_src_unpack
 		else
+			oldS="${S}"
+			S="${S}/ui"
 			cargo_live_src_unpack
+			S="${oldS}"
 		fi
-		S="${oldS}"
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-26 21:13 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-26 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ccde343f7c5b802035ee9acfcb82a8557456b3c7
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Sat Jul 26 01:00:04 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Jul 26 01:00:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ccde343f

app-emulation/lsfg-vk: update for upstream changes

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index b916f2eaac..2dcdf1ef9d 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CARGO_OPTIONAL=1
-inherit cargo cmake flag-o-matic toolchain-funcs
+inherit cargo cmake desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
 HOMEPAGE="https://github.com/PancakeTAS/lsfg-vk"
@@ -18,14 +18,17 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_SUBMODULES=(
 		thirdparty/dxbc
 		thirdparty/pe-parse
+		thirdparty/volk
 	)
 else
 	HASH_DXBC="80e316fd13d7e8938d99a08f1f405a0679c3ccfa"
+	HASH_VOLK="be3dbd49bf77052665e96b6c7484af855e7e5f67"
 	PEPARSE_VERSION="2.1.1"
 	SRC_URI="
 		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz
 		https://github.com/PancakeTAS/dxbc/archive/${HASH_DXBC}.tar.gz
 		https://github.com/trailofbits/pe-parse/archive/refs/tags/v${PEPARSE_VERSION}.tar.gz
+		https://github.com/zeux/volk/archive/${HASH_VOLK}.tar.gz
 	"
 fi
 
@@ -33,14 +36,13 @@ BDEPEND="
 	dev-util/spirv-headers
 	dev-util/vulkan-headers
 	gui? ( ${RUST_DEPEND} )
-	>=media-libs/raylib-9999
 "
 DEPEND="
 	dev-cpp/toml11
 	dev-util/glslang
 	gui? (
 		dev-libs/glib:2
-		gui-libs/gtk:4
+		gui-libs/gtk:4[introspection]
 		gui-libs/libadwaita
 	)
 	|| (
@@ -75,6 +77,7 @@ src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
 		mv ../pe-parse-${PEPARSE_VERSION} thirdparty/pe-parse || die
+		mv ../volk-${HASH_VOLK} thirdparty/volk || die
 	fi
 
 	# Static linking pe-parse
@@ -86,18 +89,15 @@ src_prepare() {
 		's|add_library(${PROJECT_NAME} ${PEPARSERLIB_SOURCEFILES})|add_library(${PROJECT_NAME} STATIC ${PEPARSERLIB_SOURCEFILES})|'\
 		thirdparty/pe-parse/pe-parser-library/CMakeLists.txt || die
 
-	# Using system toml11 and raylib
+	# Using system toml11
 	sed -i\
 		-e '/add_subdirectory(thirdparty\/toml11 EXCLUDE_FROM_ALL)/d' \
-		-e '/add_subdirectory(thirdparty\/raylib EXCLUDE_FROM_ALL)/d' \
 		-e '/get_target_property(TOML11_INCLUDE_DIRS toml11 INTERFACE_INCLUDE_DIRECTORIES)/{
 N
 /target_include_directories(lsfg-vk SYSTEM PRIVATE ${TOML11_INCLUDE_DIRS})/c\
-find_package(toml11 REQUIRED)\
-find_library(raylib_LIBRARY NAMES raylib)
+find_package(toml11 REQUIRED)
 }'\
-		-e '/target_link_libraries(lsfg-vk PRIVATE/{N;N;s/toml11 raylib/toml11::toml11 raylib/;s/ SPIRV-Headers//}'\
-		-e '/set(CMAKE_CXX_COMPILER clang++) # gcc release build crashes/d;/set(CMAKE_C_COMPILER clang)     # feel free to fix :3/d'\
+		-e '/target_link_libraries(lsfg-vk PRIVATE/{:a;N;/)/!ba;s/\btoml11\b/toml11::toml11/g;s/\bSPIRV-Headers\b *//g}'\
 		CMakeLists.txt || die
 
 	# Using system spirv headers
@@ -111,11 +111,6 @@ target_include_directories(dxbc\
 )' \
 		thirdparty/dxbc/CMakeLists.txt || die
 
-	# Fixed library path
-	sed -i\
-		's|"library_path": "\.\./\.\./\.\./lib/liblsfg-vk\.so"|"library_path": "liblsfg-vk.so"|'\
-		VkLayer_LS_frame_generation.json || die
-
 	eapply_user
 	cmake_src_prepare
 }
@@ -135,5 +130,9 @@ src_install() {
 	insinto "/usr/share/vulkan/implicit_layer.d/"
 	doins "${S}/VkLayer_LS_frame_generation.json"
 	dolib.so "${WORKDIR}/${P}_build/liblsfg-vk.so"
-	use gui && newbin "${S}/ui/$(cargo_target_dir)/ui" "lsfg-vk-gui"
+	if use gui; then
+		dobin "${S}/ui/$(cargo_target_dir)/lsfg-vk-ui"
+		domenu "${S}/ui/rsc/gay.pancake.lsfg-vk-ui.desktop"
+		newicon -s 256 "${S}/ui/rsc/icon.png" "gay.pancake.lsfg-vk-ui.png"
+	fi
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-27  9:44 Lucio Sauer
  0 siblings, 0 replies; 17+ messages in thread
From: Lucio Sauer @ 2025-07-27  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b4af1704cd0aa1417649534647a4bc34000db223
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Sun Jul 27 02:40:45 2025 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Sun Jul 27 02:40:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4af1704

app-emulation/lsfg-vk: update 9999

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 2dcdf1ef9d..9958b78d71 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 CARGO_OPTIONAL=1
+
 inherit cargo cmake desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Lossless Scaling Frame Generation on Linux via DXVK/Vulkan"
@@ -21,19 +22,21 @@ if [[ ${PV} == 9999 ]]; then
 		thirdparty/volk
 	)
 else
-	HASH_DXBC="80e316fd13d7e8938d99a08f1f405a0679c3ccfa"
+	KEYWORDS="~amd64 ~arm64"
+	HASH_DXBC="78ab59a8aaeb43cd1b0a5e91ba86722433a10b78"
 	HASH_VOLK="be3dbd49bf77052665e96b6c7484af855e7e5f67"
 	PEPARSE_VERSION="2.1.1"
 	SRC_URI="
-		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz
-		https://github.com/PancakeTAS/dxbc/archive/${HASH_DXBC}.tar.gz
+		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz -> lsfg-vk-${PV}.tar.gz
+		https://github.com/PancakeTAS/dxbc/archive/${HASH_DXBC}.tar.gz -> dxbc-${HASH_DXBC}.tar.gz
 		https://github.com/trailofbits/pe-parse/archive/refs/tags/v${PEPARSE_VERSION}.tar.gz
-		https://github.com/zeux/volk/archive/${HASH_VOLK}.tar.gz
+			-> pe-parse-${PEPARSE_VERSION}.tar.gz
+		https://github.com/zeux/volk/archive/${HASH_VOLK}.tar.gz -> volk-${HASH_VOLK}.tar.gz
+		${CARGO_CRATE_URIS}
 	"
 fi
 
 BDEPEND="
-	dev-util/spirv-headers
 	dev-util/vulkan-headers
 	gui? ( ${RUST_DEPEND} )
 "
@@ -75,6 +78,7 @@ src_unpack() {
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
+		rmdir thirdparty/* || die
 		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
 		mv ../pe-parse-${PEPARSE_VERSION} thirdparty/pe-parse || die
 		mv ../volk-${HASH_VOLK} thirdparty/volk || die
@@ -97,20 +101,9 @@ N
 /target_include_directories(lsfg-vk SYSTEM PRIVATE ${TOML11_INCLUDE_DIRS})/c\
 find_package(toml11 REQUIRED)
 }'\
-		-e '/target_link_libraries(lsfg-vk PRIVATE/{:a;N;/)/!ba;s/\btoml11\b/toml11::toml11/g;s/\bSPIRV-Headers\b *//g}'\
+		-e '/target_link_libraries(lsfg-vk PRIVATE/{:a;N;/)/!ba;s/\btoml11\b/toml11::toml11/g}'\
 		CMakeLists.txt || die
 
-	# Using system spirv headers
-	sed -i \
-		-e '/add_subdirectory(spirv)/d' \
-		-e '/target_link_libraries(dxbc/,/SPIRV-Headers)/d' \
-		-e '/target_include_directories(dxbc SYSTEM/,/include\/dxvk)/c\
-target_include_directories(dxbc\
-	SYSTEM PUBLIC include/dxbc\
-	SYSTEM PUBLIC include/spirv include/util include/dxvk\
-)' \
-		thirdparty/dxbc/CMakeLists.txt || die
-
 	eapply_user
 	cmake_src_prepare
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-07-31 10:10 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-07-31 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2fb0adf21b9f2f77f1cdea83c072264202b2e7d1
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Wed Jul 30 20:05:53 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 30 20:05:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fb0adf2

app-emulation/lsfg-vk: add 1.0.0, drop 0.9.0

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/Manifest                                       | 2 +-
 app-emulation/lsfg-vk/{lsfg-vk-0.9.0.ebuild => lsfg-vk-1.0.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lsfg-vk/Manifest b/app-emulation/lsfg-vk/Manifest
index 4fb63de468..a2f254dd3c 100644
--- a/app-emulation/lsfg-vk/Manifest
+++ b/app-emulation/lsfg-vk/Manifest
@@ -64,7 +64,7 @@ DIST libloading-0.8.8.crate 31345 BLAKE2B 6b06cd450a16b8480e5853c92e2a07700f4e1e
 DIST libproc-0.14.10.crate 75452 BLAKE2B 3abd30e7c41c292f47ad76985e98dc72eeb0065673b88f36d22550b108fee58f1232835e23d413488516df99d1ec8d9105e029c34e5366b66de62dbe71b69a12 SHA512 ca0bfd7b6ea838c8ea268e0da84ecfaaede40e4fbc4b15174c0cce2fd8e80a4c72b487ab0f6b11948a959822c475e67532560b21a52d34af3ed15c2f594ebf0a
 DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135 SHA512 b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309
 DIST log-0.4.27.crate 48120 BLAKE2B 09a2159032baaff7eede480062da30ffec1c1d4c77e76288467941dc13722ab1566742c1821326ca5f8c2f9f7597099e235213ecbf883fd93daf5ae9ad5ee981 SHA512 8d57219b76c8a25bae193e4d16d4d03bf0b8523e1ed3bdc80a692cabe00fc0359ae9bc3be989f04476ecda7187f27e4ad23fe260a96fcefc819af00fe12a1151
-DIST lsfg-vk-0.9.0.tar.gz 85231 BLAKE2B 61d87d14683e1032747c9689c5af80d1e3fc9bbed955de85a2ca4dd3d0ade754d36e830170d2ced761f6b9fdb4b990972a431d35e652ecf27105e658c3914551 SHA512 d945d2b0f3120a9b2e12ada05a1f06251bae7f205089f9b67f840252878e4d4d91a3ac4e2d8ab286e1d861d3b73839956c31020049235fa3fa31d0d86e3e97a7
+DIST lsfg-vk-1.0.0.tar.gz 85297 BLAKE2B 8b7e831462917d3fa47e597983b054c48428a4283746cf81b09eda34902cec2d73244d14a0e88866f74ea40a85434092d60c7540a978539f9d90a136ec7ff347 SHA512 b6e98ffe38629ed3b38976e67937138d45a74032f874b2b5b8f2069c7b7894396e34bf4b301d244eeba62476509f001045860ff5ad07de092d9eec9ad9973afe
 DIST mach2-0.4.3.crate 22180 BLAKE2B 7667b42c1a59d2f16405a09e554701eaf447b1361705839eead236e7d9a38f7fd40d4fe55c8f2fbf22551b818390a3a9859e2819dee23e0071461c92fa2137c4 SHA512 ad8e5e287b30d5945f6ead08b05709aa0e06bf975eb18cdfb37afeebec31ae7d0100a9792796394194e258cdab54929fdcd1dc7cca6db4a6c42688b5f5835aa8
 DIST memchr-2.7.5.crate 97603 BLAKE2B ee41ef722d90265064db3ffe22d52eff8f7627ac1ae9b0bad6ca9fa06c1027dca8d67e594e03b03c944dbf85930d2dbf030c5aaed369020ca1a1ba00f153d91a SHA512 2606ee16a7dc02db95dac17cebd2cac9deb2e23d7ea62972cdb19145c06eaf75631347a49c4e6ceeff89fb6e90e992f9bca0a9c955eb5130f89ba2bd865936e1
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa

diff --git a/app-emulation/lsfg-vk/lsfg-vk-0.9.0.ebuild b/app-emulation/lsfg-vk/lsfg-vk-1.0.0.ebuild
similarity index 100%
rename from app-emulation/lsfg-vk/lsfg-vk-0.9.0.ebuild
rename to app-emulation/lsfg-vk/lsfg-vk-1.0.0.ebuild


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/
@ 2025-08-18 10:44 David Roman
  0 siblings, 0 replies; 17+ messages in thread
From: David Roman @ 2025-08-18 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     195bc90334d58ec76ddea1c4b2a7797a8609bcd8
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Sat Aug 16 20:13:07 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Aug 16 20:16:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=195bc903

app-emulation/lsfg-vk: update 9999

Closes: https://bugs.gentoo.org/961467

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-emulation/lsfg-vk/lsfg-vk-9999.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
index 9958b78d71..f3854d3ca2 100644
--- a/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
+++ b/app-emulation/lsfg-vk/lsfg-vk-9999.ebuild
@@ -17,18 +17,15 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PancakeTAS/lsfg-vk"
 	EGIT_SUBMODULES=(
-		thirdparty/dxbc
 		thirdparty/pe-parse
 		thirdparty/volk
 	)
 else
 	KEYWORDS="~amd64 ~arm64"
-	HASH_DXBC="78ab59a8aaeb43cd1b0a5e91ba86722433a10b78"
 	HASH_VOLK="be3dbd49bf77052665e96b6c7484af855e7e5f67"
 	PEPARSE_VERSION="2.1.1"
 	SRC_URI="
 		https://github.com/PancakeTAS/lsfg-vk/archive/refs/tags/v${PV}.tar.gz -> lsfg-vk-${PV}.tar.gz
-		https://github.com/PancakeTAS/dxbc/archive/${HASH_DXBC}.tar.gz -> dxbc-${HASH_DXBC}.tar.gz
 		https://github.com/trailofbits/pe-parse/archive/refs/tags/v${PEPARSE_VERSION}.tar.gz
 			-> pe-parse-${PEPARSE_VERSION}.tar.gz
 		https://github.com/zeux/volk/archive/${HASH_VOLK}.tar.gz -> volk-${HASH_VOLK}.tar.gz
@@ -79,7 +76,6 @@ src_unpack() {
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir thirdparty/* || die
-		mv ../dxbc-${HASH_DXBC} thirdparty/dxbc || die
 		mv ../pe-parse-${PEPARSE_VERSION} thirdparty/pe-parse || die
 		mv ../volk-${HASH_VOLK} thirdparty/volk || die
 	fi
@@ -101,7 +97,7 @@ N
 /target_include_directories(lsfg-vk SYSTEM PRIVATE ${TOML11_INCLUDE_DIRS})/c\
 find_package(toml11 REQUIRED)
 }'\
-		-e '/target_link_libraries(lsfg-vk PRIVATE/{:a;N;/)/!ba;s/\btoml11\b/toml11::toml11/g}'\
+		-e '/target_link_libraries(lsfg-vk PUBLIC/{:a;N;/)/!ba;s/\btoml11\b/toml11::toml11/g}'\
 		CMakeLists.txt || die
 
 	eapply_user


^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2025-08-18 10:44 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-18 22:11 [gentoo-commits] repo/proj/guru:master commit in: app-emulation/lsfg-vk/ Haelwenn Monnier
  -- strict thread matches above, loose matches on Subject: below --
2025-08-18 10:44 David Roman
2025-07-31 10:10 David Roman
2025-07-27  9:44 Lucio Sauer
2025-07-26 21:13 David Roman
2025-07-26 21:13 David Roman
2025-07-25 10:49 David Roman
2025-07-25 10:49 David Roman
2025-07-25 10:49 David Roman
2025-07-25 10:49 David Roman
2025-07-21 13:05 David Roman
2025-07-21 13:05 David Roman
2025-07-21 13:05 David Roman
2025-07-18 22:11 Haelwenn Monnier
2025-07-18 22:11 Haelwenn Monnier
2025-07-15 12:21 David Roman
2025-07-15 12:21 David Roman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox