Merge updates from master

dev-libs/gpds/Manifest

@@ -1,2 +1 @@
-DIST gpds-1.6.0.tar.gz 874971 BLAKE2B bc139365d5ed2ece5ab1b21c47830477e497a2a4bd8d489b801ceab91f815d022f1f8a1241d2724264d651c55d88674c7a4d4e7f8ee55e6f8049c48fb950c3ff SHA512 bf916c5542c9dc13e6febbe605fd2268f14dec94e29ead604359b51b8adbfc12538f905024b43b4d838ba39033beab89d89693a571a1e0a482e44ccdb6e32133
-DIST gpds-1.7.0.tar.gz 874784 BLAKE2B 6ab3edb5cda6e578695d3c7b79b57e8995e777bfafac603813ba06890811ac1ff0a3b41f7b8efe7dfc0a675c5799d60c9889760fa6ddab82a01e0219ab96eb9b SHA512 c51c9a96363a213084997d5705a2899ad3183527a1fb4567b1eef2ad68b7f3ad2c70068f7e648471a56c377a518be30cadcba7d8e2a928a6ad1d1300dc40b102
+DIST gpds-1.8.3.tar.gz 875674 BLAKE2B 18f4a8633960e68529255d2625d03bb652c30dc239969f97e9f1ac99031c104f3706bb55c7c755abb304889e9e6747ff76a16c4233f092f9175550280f80a6b9 SHA512 a981c2d136bd4e5cd81ddc457252fa8e87353f63bc8e00d42a8c4a9e6daa8e6b9fd5a18a11c402c1cfe9885f8ba5f995f97cb5ea2aa69e1339b02e4d66f08d43

dev-libs/gpds/gpds-1.7.0-r1.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A general purpose data serializer"
-HOMEPAGE="https://gpds.simulton.com"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/simulton/${PN}.git"
-else
-	SRC_URI="https://github.com/simulton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	S="${WORKDIR}/${PN}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples +spdlog static-libs test"
-RESTRICT="!test? ( test )"
-DEPEND="${RDEPEND}"
-
-DOCS=( license.txt readme.md )
-
-src_prepare() {
-	cmake_src_prepare
-	use static-libs || sed -i -e '/TARGET-STATIC/d' "${S}"/lib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGPDS_BUILD_EXAMPLES=$(usex examples)
-		-DGPDS_BUILD_TESTS=$(usex test)
-		-DGPDS_FEATURE_SPDLOG=$(usex spdlog)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
-}

dev-libs/qschematic/Manifest

@@ -1 +1 @@
-DIST qschematic-1.5.0.tar.gz 1509508 BLAKE2B b2850e0b31e1d44f750488b94d47beaf606981d77bfbb070b44beb235c531bf190d1e3edcafb214737dc376d74d5e08405a8b3844c9746f9dce9731484685ca8 SHA512 a5ad0a5068c0bed1307c89134814c68192e4af19067d221d27086585f93360307a1293ee7c63021b21c0348f3859a18d6dcd50b3e2e0fe19fd32bf4928942cd4
+DIST qschematic-1.5.1.tar.gz 1510872 BLAKE2B 4ecf1200f4aa8052aa1ded75f6247b2db4db8a85383b04bc4c7cec495d5d2b3d4b93d96c6fcbdf370d5470be6e7e00c032ba26d0e9d5b1ac491c78286d25b55c SHA512 4b748397e83369764f3f1df49701ffe3dccb18713c0e2f55c1110b31c294f0205da10c06fd56ca0011e3f8f5a0a9970149ed84a586d6edd4febe18170d89723d

dev-libs/qschematic/files/qschematic-1.5.1-gentoo-cmake-option.patch

@@ -1,32 +1,31 @@
-From 9beb6fcc19a27bd7a280420bdac8a95b650316ed Mon Sep 17 00:00:00 2001
+From ea877503228e0ce17451354d47ac151cbd94dcf5 Mon Sep 17 00:00:00 2001
 From: Huang Rui <vowstar@gmail.com>
-Date: Tue, 21 Nov 2023 10:25:53 +0800
-Subject: [PATCH] build: add build options for gentoo
+Date: Sat, 17 Feb 2024 23:30:42 +0800
+Subject: [PATCH] fix gentoo build with qt6
 
 Signed-off-by: Huang Rui <vowstar@gmail.com>
 ---
- CMakeLists.txt                        |  2 ++
- demo/CMakeLists.txt                   |  2 ++
- qschematic/CMakeLists.txt             | 10 ++++++----
- qschematic/external.cmake             |  2 ++
- qschematic/qschematic-config.cmake.in |  3 +++
- 5 files changed, 15 insertions(+), 4 deletions(-)
+ CMakeLists.txt                        | 1 +
+ demo/CMakeLists.txt                   | 2 ++
+ qschematic/CMakeLists.txt             | 6 +++---
+ qschematic/external.cmake             | 2 ++
+ qschematic/qschematic-config.cmake.in | 3 +++
+ 5 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a265d7e523f..bfe5cfe8d8bf 100644
+index 926b55adb8ee..7ece589f33f0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,6 +11,8 @@ project(
- # User options
+@@ -17,6 +17,7 @@ option(QSCHEMATIC_BUILD_STATIC "Whether to build a static library" ON)
+ option(QSCHEMATIC_BUILD_SHARED "Whether to build a shared library" ${OPTION_BUILD_SHARED_DEFAULT})
  option(QSCHEMATIC_BUILD_DEMO "Whether to build the demo project" ON)
  option(QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD "Whether to pull the GPDS dependency via FetchContent" ON)
 +option(QSCHEMATIC_BUILD_QT6 "Whether to build with QT6" ON)
-+option(QSCHEMATIC_BUILD_STATIC "Whether to build static library" ON)
  
  # User settings
  set(QSCHEMATIC_DEPENDENCY_GPDS_TARGET "gpds::gpds-static" CACHE STRING "The CMake target of the GPDS library to use")
 diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
-index 6c315c2894b2..db206dd156ac 100644
+index b077470fe4d3..1f81a9c8ee8b 100644
 --- a/demo/CMakeLists.txt
 +++ b/demo/CMakeLists.txt
 @@ -2,11 +2,13 @@
@@ -44,42 +43,29 @@ index 6c315c2894b2..db206dd156ac 100644
      find_package(
          Qt5
 diff --git a/qschematic/CMakeLists.txt b/qschematic/CMakeLists.txt
-index ec56b33ad264..6b4d353127bc 100644
+index 7e80a3a445cc..8368e5742b43 100644
 --- a/qschematic/CMakeLists.txt
 +++ b/qschematic/CMakeLists.txt
-@@ -150,7 +150,6 @@ setup_target_common(${TARGET_SHARED})
- ################################################################################
+@@ -153,7 +153,7 @@ endif()
  # Static library                                                               #
  ################################################################################
--
- add_library(${TARGET_STATIC} STATIC)
- setup_target_common(${TARGET_STATIC})
  
-@@ -160,7 +159,6 @@ target_compile_definitions(
-         QSCHEMATIC_STATIC_DEFINE
- )
+-if (QSCHEMATIC_BUILD_STATIC)
++# if (QSCHEMATIC_BUILD_STATIC)
+     add_library(${TARGET_STATIC} STATIC)
+     setup_target_common(${TARGET_STATIC})
+ 
+@@ -161,8 +161,8 @@ if (QSCHEMATIC_BUILD_STATIC)
+         ${TARGET_STATIC}
+             PUBLIC
+             QSCHEMATIC_STATIC_DEFINE
+-    )
+-endif()
++     )
++# endif()
+ 
  
--
  ################################################################################
- # Install                                                                      #
- ################################################################################
-@@ -171,10 +169,14 @@ include(CMakePackageConfigHelpers)
- set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/qschematic)
- 
- # Targets
-+if (QSCHEMATIC_BUILD_STATIC)
-+    set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_STATIC} ${TARGET_SHARED})
-+else()
-+    set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_SHARED})
-+endif()
- install(
-     TARGETS
--        ${TARGET_STATIC}
--        ${TARGET_SHARED}
-+        ${INSTALL_TARGETS}
-     EXPORT qschematic-targets
-     FILE_SET
-         HEADERS
 diff --git a/qschematic/external.cmake b/qschematic/external.cmake
 index 80aae6c29b94..7e57f0852ac5 100644
 --- a/qschematic/external.cmake
@@ -124,5 +110,5 @@ index 7452408bcd09..5b2a14a4c9c2 100644
      find_dependency(
          Qt5 5.15
 -- 
-2.42.1
+2.43.2
 

dev-libs/qschematic/qschematic-1.5.1.ebuild

@@ -38,7 +38,7 @@ RDEPEND="
 		>=dev-qt/qtimageformats-6.5:6
 		>=dev-qt/qtsvg-6.5:6
 	)
-	>=dev-libs/gpds-1.6.0[static-libs?]
+	>=dev-libs/gpds-1.8.1[static-libs?]
 "
 
 DEPEND="
@@ -50,7 +50,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-gentoo-cmake-option.patch"
+	"${FILESDIR}/${PN}-1.5.1-gentoo-cmake-option.patch"
 )
 
 src_configure() {
@@ -61,6 +61,7 @@ src_configure() {
 		-DQSCHEMATIC_BUILD_DEMO=$(usex examples)
 		-DQSCHEMATIC_BUILD_QT6=$(usex qt6)
 		-DQSCHEMATIC_BUILD_STATIC=$(usex static-libs)
+		-DQSCHEMATIC_BUILD_SHARED=ON
 	)
 
 	cmake_src_configure

media-video/obs-vkcapture/Manifest

@@ -1 +1,2 @@
 DIST obs-vkcapture-1.4.5.tar.gz 58958 BLAKE2B cbe2b506c8f5e51088ff2eac5cd12e1490114735957354c935d210f353c95b9dd1819f25ed15b4d4b0c6bf5ec636f236c153ebf392886ac5ffafd555f358239f SHA512 37e72d9dc01fc63dde666d90f17ef04e309771cbcf5e6fbd3e4115f9e88a788ca03bca0970182d9a1014d916b0a51fe799f70f2dc4579831bf3327764d33764c
+DIST obs-vkcapture-1.4.9.tar.gz 60230 BLAKE2B 6b83fb66476cde0f6979d571506efa4706a1273dcc545f85751d0e343cdd53c3131261bea64b16551c52c7a8ddc40482e508dcd8597a7e958a6d01079805fb01 SHA512 1a9da496cd2b1ce2d678ac118845709efdff13b2ddce8816b20c9c4b210b652b674f5e10da5c51a5fd648dce7d52305afa83ff984da5148ce8ca04d43da0c7a1

media-video/obs-vkcapture/obs-vkcapture-1.4.5.ebuild

@@ -20,7 +20,6 @@ HOMEPAGE="https://github.com/nowrep/obs-vkcapture"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 BDEPEND="
 	dev-util/vulkan-headers

media-video/obs-vkcapture/obs-vkcapture-1.4.9.ebuild

@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+inherit xdg cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture"
+else
+	SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="OBS Linux Vulkan/OpenGL game capture"
+HOMEPAGE="https://github.com/nowrep/obs-vkcapture"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="
+	dev-util/vulkan-headers
+	media-libs/shaderc
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	>=media-video/obs-studio-27[wayland]
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	media-libs/libglvnd[${MULTILIB_USEDEP}]
+	>=media-video/obs-studio-27[wayland]
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+"
+
+QA_SONAME="
+	/usr/lib64/libVkLayer_obs_vkcapture.so
+	/usr/lib64/libobs_glcapture.so
+	/usr/lib/libVkLayer_obs_vkcapture.so
+	/usr/lib/libobs_glcapture.so
+"
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+multilib_src_configure() {
+if ! multilib_is_native_abi; then
+	local mycmakeargs+=(
+	-DBUILD_PLUGIN=OFF
+	)
+fi
+	cmake_src_configure
+}

media-video/obs-vkcapture/obs-vkcapture-9999.ebuild

@@ -20,7 +20,6 @@ HOMEPAGE="https://github.com/nowrep/obs-vkcapture"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 BDEPEND="
 	dev-util/vulkan-headers