public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2023-12-03 16:46 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2023-12-03 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4cd1adcdb96749a5e4efe5ad32ff776003e06657
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Fri Dec  1 23:14:41 2023 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sun Dec  3 16:45:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4cd1adcd

media-video/obs-streamfx: new package, add 0.12.0, 9999
* add beta 0.12.0
* dont add stable 0.11.1 and older since requires to download libobs during cmake

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Gonçalo Duarte <gonegrier.duarte <AT> gmail.com>

 media-video/obs-streamfx/Manifest                  |   9 ++
 media-video/obs-streamfx/metadata.xml              |  16 ++++
 .../obs-streamfx/obs-streamfx-0.12.0.ebuild        | 103 +++++++++++++++++++++
 media-video/obs-streamfx/obs-streamfx-9999.ebuild  | 103 +++++++++++++++++++++
 4 files changed, 231 insertions(+)

diff --git a/media-video/obs-streamfx/Manifest b/media-video/obs-streamfx/Manifest
new file mode 100644
index 0000000000..8642dbfc8b
--- /dev/null
+++ b/media-video/obs-streamfx/Manifest
@@ -0,0 +1,9 @@
+DIST MAXINE-AFX-SDK-4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4.tar.gz 31726703 BLAKE2B 399fbe7d3f5ab3d55831edd6d4820254a1f17e27dc422cf6eab86e278f31f5e8ac3c031cbbfa534cda10154cc5954e94e8049aa16fac7d2c8a12190426b91f70 SHA512 500de1780a6d31452581dc77690e4e7e24562d8371b23bc499ce3a42e977876471785842851b844cc4633e793afb230c2d528b7b20fea882e7964fba760ac8b9
+DIST MAXINE-AR-SDK-MAXINE-AR-SDK.tar.gz 36525210 BLAKE2B c176652e8ee57fe0c26518fe4de94393cb607c56eddf3d09fb844ae01ed87cbf286b2b4cde3b2d4bd31a2db2f050998a60e21cef09e15c4d329f957b347160a9 SHA512 09aff505d536780dd051925aab35704799faa3aa7651713068985431010ea02a7c16d007e33a326047a433ea0c345cfed9f3ede61e13c9fc0635a4e66e625383
+DIST MAXINE-VFX-SDK-3df6c37852afad9f15ee0b85e51b5b49e611cfc0.tar.gz 35162815 BLAKE2B fc33f80ea2bc33e9ce0babf787d403de8186ebc7dc497413458b509e047fa21f05d68fd7e010b457706ff931a43bf1b7f452708bf2b34fc9154ef2f783c756ff SHA512 a20fa0eac9576d25f409bcbdae0c5ade275037196b1fe3eaaf52c7e9da62a39faccebb43d8fdae7a643b44bbef53a0c23ce9cdbe6864205c83840158998f948c
+DIST cmake-clang-d2f9e3234313a7434dead5b957301ebbdddf13d7.tar.gz 1954 BLAKE2B dc79d54950bff2094930f6ee8095605f62e358d1d5088c804242d6b11b6b61a0e9dfd5efc4b5dc62f7c9d91416093bc6613bd2815c6566ab7f1605f5655743e1 SHA512 144b2f1c07e05bbd1d3c3f21a28014b2a54f53bb2dfe0b7460a028320fd7c4934fff1239020896d95ee0e66d07dfc4bf01efa6e86c72d2bb04294be618748812
+DIST cmake-version-3bef96bafab04161991c2cd98a1ed51f6362d670.tar.gz 11195 BLAKE2B 9a5e11a8dd7e7bf97bf26f0c5ca1e0cf3908bf5ea38e413c71eb3e867c2d98b9144127e12c82bd52d58bfabb4405d7a2f360725f1cd7f16da9db7024c6421185 SHA512 1dbcebafd97b5f961db69a2c865f612bfa8e055652a5777291d3c4f1f025bb8244c83099a2917e67ae0cd959c4e7afd243d0c3834ea3254d90114a13b6d6a805
+DIST json-e4643d1f1b03fc7a1d7b65f17e012ca93680cad8.tar.gz 7026075 BLAKE2B 5c04615b72f05c78c0ef30052e831f0864f3658a329e44ad51494872517e46cecce6dc0e5b59d7a94e8cad1e0ce998dc9708e12eb8c811073111f7f0a70fa218 SHA512 58bbc45b85afa7d95a37a46a95d8d278959f1f1fc9b43847e1881a42abfef347b6b0414e36b833652bc799b5a045d7cb7a90a12f9246bf2b7fda19b4842e64f6
+DIST msvc-redist-helper-7587246671340b683a0b8f06fb369d6574d8274f.tar.gz 11132 BLAKE2B 7caa2a510d84103203ed5e15b2544d4f956c3a21e2632ae61a216ca03b27bf0aff2981c8462e9dab1e0c4f3cd7a0b291426000e5f7dbac406bd3205b63518289 SHA512 389c25e63b56136ad1d940db408cb9a5d2c7caeb73cef0591601ec4f6d5af40bb7451bfcbc79ae116ab5a3eae68e4bb1cbd81bc36e7d50cc47b26dc62893a4a4
+DIST obs-streamfx-0.12.0.tar.gz 13008288 BLAKE2B 83b3d0ff385c02b38adea4ed7f74aa14b24618e84d14d5208ed193d4e64ee5d6b5949bb2b3f03c4b8dd511ed3a53f4104c6c973e9586141868b8bc08d93aa9d6 SHA512 87dc270b72d7d09b4ce734ea14d1638ba328a3bbb662a1cc4f11811ebe66f9a998053fcae8bc4d2d017baffb304f00d7821b5d046667c3d9645930a8f751f537
+DIST obs-studio-34ef67e212f24a085a63705a0ab81e3401c8eca4.tar.gz 15852743 BLAKE2B ecf4090d8c00948a06d8fb0fcf711e7c1e06a8713a7fcc1ff108add5c8bc8d0ccf833db4e01ac6e2eb0b1d406b547d505e108176ae4e5eaa48f8866122fb6b12 SHA512 634fc28090031cb05a6418cef7fdf462600dcb833b28a450f1858ba00bc7d3a70817f9bd45d7c14b441c4d01add780e9eb29adfa103df529c0403a120402f8b5

diff --git a/media-video/obs-streamfx/metadata.xml b/media-video/obs-streamfx/metadata.xml
new file mode 100644
index 0000000000..07241812e1
--- /dev/null
+++ b/media-video/obs-streamfx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>adel.ks@zegrapher.com</email>
+		<name>Adel KARA SLIMANE</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gonegrier.duarte@gmail.com</email>
+		<name>Gonçalo Negrier Duarte</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Xaymar/obs-StreamFX</remote-id>
+		<bugs-to>https://github.com/Xaymar/obs-StreamFX/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
new file mode 100644
index 0000000000..63bf14be36
--- /dev/null
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+CMAKE_CLANG_COMMIT="d2f9e3234313a7434dead5b957301ebbdddf13d7"
+CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
+NHOHMANN_JSON_COMMIT="e4643d1f1b03fc7a1d7b65f17e012ca93680cad8"
+MSVC_REDIST_HELPER_COMMIT="7587246671340b683a0b8f06fb369d6574d8274f"
+NVIDIA_MAXINE_AR_SDK_COMMIT="c4154fa68fc2f91a26f2475e3cf98f64c50483b7"
+NVIDIA_MAXINE_VFX_SDK_COMMIT="3df6c37852afad9f15ee0b85e51b5b49e611cfc0"
+NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
+OBS_STUDIO_COMMIT="34ef67e212f24a085a63705a0ab81e3401c8eca4"
+
+#remove when stable release (make life easy later because of new submodules)
+M_PV="0.12.0b366"
+
+DESCRIPTION="OBS® Studio plugin which adds many new effects."
+HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
+else
+	SRC_URI="
+			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
+			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz -> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz -> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
+			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz -> json-${NHOHMANN_JSON_COMMIT}.tar.gz
+			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz -> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz -> MAXINE-AR-SDK-${NVIDIA-MAXINE-AR-SDK}.tar.gz
+			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz -> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz -> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
+			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz -> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RDEPEND="
+	media-video/obs-studio
+"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}/obs-StreamFX-${M_PV}"
+fi
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		rm -d "${S}/cmake/clang"
+		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
+
+		rm -d "${S}/cmake/version"
+		mv cmake-version-${CMAKE_VERSION_COMMIT} "${S}/cmake/version"
+
+		rm -d "${S}/third-party/nlohmann-json"
+		mv json-${NHOHMANN_JSON_COMMIT} "${S}/third-party/nlohmann-json"
+
+		rm -d "${S}/third-party/msvc-redist-helper"
+		mv msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT} "${S}/third-party/msvc-redist-helper"
+
+		rm -d "${S}/third-party/nvidia-maxine-ar-sdk"
+		mv MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT} "${S}/third-party/nvidia-maxine-ar-sdk"
+
+		rm -d "${S}/third-party/nvidia-maxine-vfx-sdk"
+		mv MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-vfx-sdk"
+
+		rm -d "${S}/third-party/nvidia-maxine-afx-sdk"
+		mv MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-afx-sdk"
+
+		rm -d "${S}/third-party/obs-studio"
+		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
+	fi
+}
+
+src_prepare() {
+	default
+
+	#fix CMakeLists.txt libdir
+	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
+	if [[ ${PV} != 9999 ]]; then
+		sed -i "/Not a git repository, automatic version detection disabled./a \    set(_VERSION \"${M_PV}\")" "${S}/CMakeLists.txt"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs+=(
+		-DENABLE_UPDATER=FALSE
+		-DSTRUCTURE_PACKAGEMANAGER=TRUE
+		-DPACKAGE_NAME="obs-streamfx"
+	)
+
+	cmake_src_configure
+}

diff --git a/media-video/obs-streamfx/obs-streamfx-9999.ebuild b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
new file mode 100644
index 0000000000..63bf14be36
--- /dev/null
+++ b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+CMAKE_CLANG_COMMIT="d2f9e3234313a7434dead5b957301ebbdddf13d7"
+CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
+NHOHMANN_JSON_COMMIT="e4643d1f1b03fc7a1d7b65f17e012ca93680cad8"
+MSVC_REDIST_HELPER_COMMIT="7587246671340b683a0b8f06fb369d6574d8274f"
+NVIDIA_MAXINE_AR_SDK_COMMIT="c4154fa68fc2f91a26f2475e3cf98f64c50483b7"
+NVIDIA_MAXINE_VFX_SDK_COMMIT="3df6c37852afad9f15ee0b85e51b5b49e611cfc0"
+NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
+OBS_STUDIO_COMMIT="34ef67e212f24a085a63705a0ab81e3401c8eca4"
+
+#remove when stable release (make life easy later because of new submodules)
+M_PV="0.12.0b366"
+
+DESCRIPTION="OBS® Studio plugin which adds many new effects."
+HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
+else
+	SRC_URI="
+			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
+			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz -> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz -> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
+			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz -> json-${NHOHMANN_JSON_COMMIT}.tar.gz
+			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz -> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz -> MAXINE-AR-SDK-${NVIDIA-MAXINE-AR-SDK}.tar.gz
+			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz -> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz -> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
+			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz -> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RDEPEND="
+	media-video/obs-studio
+"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}/obs-StreamFX-${M_PV}"
+fi
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		rm -d "${S}/cmake/clang"
+		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
+
+		rm -d "${S}/cmake/version"
+		mv cmake-version-${CMAKE_VERSION_COMMIT} "${S}/cmake/version"
+
+		rm -d "${S}/third-party/nlohmann-json"
+		mv json-${NHOHMANN_JSON_COMMIT} "${S}/third-party/nlohmann-json"
+
+		rm -d "${S}/third-party/msvc-redist-helper"
+		mv msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT} "${S}/third-party/msvc-redist-helper"
+
+		rm -d "${S}/third-party/nvidia-maxine-ar-sdk"
+		mv MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT} "${S}/third-party/nvidia-maxine-ar-sdk"
+
+		rm -d "${S}/third-party/nvidia-maxine-vfx-sdk"
+		mv MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-vfx-sdk"
+
+		rm -d "${S}/third-party/nvidia-maxine-afx-sdk"
+		mv MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-afx-sdk"
+
+		rm -d "${S}/third-party/obs-studio"
+		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
+	fi
+}
+
+src_prepare() {
+	default
+
+	#fix CMakeLists.txt libdir
+	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
+	if [[ ${PV} != 9999 ]]; then
+		sed -i "/Not a git repository, automatic version detection disabled./a \    set(_VERSION \"${M_PV}\")" "${S}/CMakeLists.txt"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs+=(
+		-DENABLE_UPDATER=FALSE
+		-DSTRUCTURE_PACKAGEMANAGER=TRUE
+		-DPACKAGE_NAME="obs-streamfx"
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2023-12-30 14:16 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2023-12-30 14:16 UTC (permalink / raw
  To: gentoo-commits

commit:     4b81bf7dba79c5da4f608d2dc238c11dee9a7c77
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sat Dec 30 14:09:51 2023 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sat Dec 30 14:16:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b81bf7d

media-video/obs-streamfx: fix outdated CMAKE variable

Closes: https://bugs.gentoo.org/919145
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-video/obs-streamfx/Manifest                  |  2 +-
 .../obs-streamfx/obs-streamfx-0.12.0.ebuild        | 28 ++++++++++++----------
 media-video/obs-streamfx/obs-streamfx-9999.ebuild  | 28 ++++++++++++----------
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/media-video/obs-streamfx/Manifest b/media-video/obs-streamfx/Manifest
index 8642dbfc8b..5659c76989 100644
--- a/media-video/obs-streamfx/Manifest
+++ b/media-video/obs-streamfx/Manifest
@@ -1,5 +1,5 @@
 DIST MAXINE-AFX-SDK-4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4.tar.gz 31726703 BLAKE2B 399fbe7d3f5ab3d55831edd6d4820254a1f17e27dc422cf6eab86e278f31f5e8ac3c031cbbfa534cda10154cc5954e94e8049aa16fac7d2c8a12190426b91f70 SHA512 500de1780a6d31452581dc77690e4e7e24562d8371b23bc499ce3a42e977876471785842851b844cc4633e793afb230c2d528b7b20fea882e7964fba760ac8b9
-DIST MAXINE-AR-SDK-MAXINE-AR-SDK.tar.gz 36525210 BLAKE2B c176652e8ee57fe0c26518fe4de94393cb607c56eddf3d09fb844ae01ed87cbf286b2b4cde3b2d4bd31a2db2f050998a60e21cef09e15c4d329f957b347160a9 SHA512 09aff505d536780dd051925aab35704799faa3aa7651713068985431010ea02a7c16d007e33a326047a433ea0c345cfed9f3ede61e13c9fc0635a4e66e625383
+DIST MAXINE-AR-SDK-c4154fa68fc2f91a26f2475e3cf98f64c50483b7.tar.gz 36525210 BLAKE2B c176652e8ee57fe0c26518fe4de94393cb607c56eddf3d09fb844ae01ed87cbf286b2b4cde3b2d4bd31a2db2f050998a60e21cef09e15c4d329f957b347160a9 SHA512 09aff505d536780dd051925aab35704799faa3aa7651713068985431010ea02a7c16d007e33a326047a433ea0c345cfed9f3ede61e13c9fc0635a4e66e625383
 DIST MAXINE-VFX-SDK-3df6c37852afad9f15ee0b85e51b5b49e611cfc0.tar.gz 35162815 BLAKE2B fc33f80ea2bc33e9ce0babf787d403de8186ebc7dc497413458b509e047fa21f05d68fd7e010b457706ff931a43bf1b7f452708bf2b34fc9154ef2f783c756ff SHA512 a20fa0eac9576d25f409bcbdae0c5ade275037196b1fe3eaaf52c7e9da62a39faccebb43d8fdae7a643b44bbef53a0c23ce9cdbe6864205c83840158998f948c
 DIST cmake-clang-d2f9e3234313a7434dead5b957301ebbdddf13d7.tar.gz 1954 BLAKE2B dc79d54950bff2094930f6ee8095605f62e358d1d5088c804242d6b11b6b61a0e9dfd5efc4b5dc62f7c9d91416093bc6613bd2815c6566ab7f1605f5655743e1 SHA512 144b2f1c07e05bbd1d3c3f21a28014b2a54f53bb2dfe0b7460a028320fd7c4934fff1239020896d95ee0e66d07dfc4bf01efa6e86c72d2bb04294be618748812
 DIST cmake-version-3bef96bafab04161991c2cd98a1ed51f6362d670.tar.gz 11195 BLAKE2B 9a5e11a8dd7e7bf97bf26f0c5ca1e0cf3908bf5ea38e413c71eb3e867c2d98b9144127e12c82bd52d58bfabb4405d7a2f360725f1cd7f16da9db7024c6421185 SHA512 1dbcebafd97b5f961db69a2c865f612bfa8e055652a5777291d3c4f1f025bb8244c83099a2917e67ae0cd959c4e7afd243d0c3834ea3254d90114a13b6d6a805

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
index 63bf14be36..cf7e189231 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
@@ -25,14 +25,22 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="
 			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
-			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz -> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
-			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz -> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
-			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz -> json-${NHOHMANN_JSON_COMMIT}.tar.gz
-			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz -> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz -> MAXINE-AR-SDK-${NVIDIA-MAXINE-AR-SDK}.tar.gz
-			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz -> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz -> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
-			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz -> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
+				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
+				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
+			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
+				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
+			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
+				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
+				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
+				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
+				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
+			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
+				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -84,9 +92,6 @@ src_prepare() {
 
 	#fix CMakeLists.txt libdir
 	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
-	if [[ ${PV} != 9999 ]]; then
-		sed -i "/Not a git repository, automatic version detection disabled./a \    set(_VERSION \"${M_PV}\")" "${S}/CMakeLists.txt"
-	fi
 
 	cmake_src_prepare
 }
@@ -94,7 +99,6 @@ src_prepare() {
 src_configure() {
 
 	local mycmakeargs+=(
-		-DENABLE_UPDATER=FALSE
 		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
 	)

diff --git a/media-video/obs-streamfx/obs-streamfx-9999.ebuild b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
index 63bf14be36..dabbb6aa28 100644
--- a/media-video/obs-streamfx/obs-streamfx-9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
@@ -25,14 +25,22 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="
 			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
-			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz -> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
-			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz -> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
-			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz -> json-${NHOHMANN_JSON_COMMIT}.tar.gz
-			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz -> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz -> MAXINE-AR-SDK-${NVIDIA-MAXINE-AR-SDK}.tar.gz
-			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz -> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz -> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
-			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz -> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
+				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
+			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
+				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
+			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
+				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
+			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
+				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
+				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
+				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
+			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
+				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
+			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
+				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -84,9 +92,6 @@ src_prepare() {
 
 	#fix CMakeLists.txt libdir
 	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
-	if [[ ${PV} != 9999 ]]; then
-		sed -i "/Not a git repository, automatic version detection disabled./a \    set(_VERSION \"${M_PV}\")" "${S}/CMakeLists.txt"
-	fi
 
 	cmake_src_prepare
 }
@@ -95,7 +100,6 @@ src_configure() {
 
 	local mycmakeargs+=(
 		-DENABLE_UPDATER=FALSE
-		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
 	)
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2023-12-30 17:26 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2023-12-30 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1b833f4d2bb5a700932d776735b22c0bcba13699
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sat Dec 30 15:17:53 2023 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sat Dec 30 17:25:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b833f4d

media-video/obs-streamfx: update submodules
* need to fix version detection

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-video/obs-streamfx/Manifest                  | 14 ++++++------
 .../obs-streamfx/obs-streamfx-0.12.0.ebuild        | 23 ++++++++++----------
 media-video/obs-streamfx/obs-streamfx-9999.ebuild  | 25 +++++++++++-----------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/media-video/obs-streamfx/Manifest b/media-video/obs-streamfx/Manifest
index 5659c76989..0e9afdfcdc 100644
--- a/media-video/obs-streamfx/Manifest
+++ b/media-video/obs-streamfx/Manifest
@@ -1,9 +1,9 @@
 DIST MAXINE-AFX-SDK-4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4.tar.gz 31726703 BLAKE2B 399fbe7d3f5ab3d55831edd6d4820254a1f17e27dc422cf6eab86e278f31f5e8ac3c031cbbfa534cda10154cc5954e94e8049aa16fac7d2c8a12190426b91f70 SHA512 500de1780a6d31452581dc77690e4e7e24562d8371b23bc499ce3a42e977876471785842851b844cc4633e793afb230c2d528b7b20fea882e7964fba760ac8b9
-DIST MAXINE-AR-SDK-c4154fa68fc2f91a26f2475e3cf98f64c50483b7.tar.gz 36525210 BLAKE2B c176652e8ee57fe0c26518fe4de94393cb607c56eddf3d09fb844ae01ed87cbf286b2b4cde3b2d4bd31a2db2f050998a60e21cef09e15c4d329f957b347160a9 SHA512 09aff505d536780dd051925aab35704799faa3aa7651713068985431010ea02a7c16d007e33a326047a433ea0c345cfed9f3ede61e13c9fc0635a4e66e625383
-DIST MAXINE-VFX-SDK-3df6c37852afad9f15ee0b85e51b5b49e611cfc0.tar.gz 35162815 BLAKE2B fc33f80ea2bc33e9ce0babf787d403de8186ebc7dc497413458b509e047fa21f05d68fd7e010b457706ff931a43bf1b7f452708bf2b34fc9154ef2f783c756ff SHA512 a20fa0eac9576d25f409bcbdae0c5ade275037196b1fe3eaaf52c7e9da62a39faccebb43d8fdae7a643b44bbef53a0c23ce9cdbe6864205c83840158998f948c
-DIST cmake-clang-d2f9e3234313a7434dead5b957301ebbdddf13d7.tar.gz 1954 BLAKE2B dc79d54950bff2094930f6ee8095605f62e358d1d5088c804242d6b11b6b61a0e9dfd5efc4b5dc62f7c9d91416093bc6613bd2815c6566ab7f1605f5655743e1 SHA512 144b2f1c07e05bbd1d3c3f21a28014b2a54f53bb2dfe0b7460a028320fd7c4934fff1239020896d95ee0e66d07dfc4bf01efa6e86c72d2bb04294be618748812
+DIST MAXINE-AR-SDK-ca10ac3b3984357aab84b3c6319d35c82d49e836.tar.gz 39653657 BLAKE2B acdb2db362678cfd644ca4a57418d21dab447087c736a7a37b372c511b2f53fef096cee81caacd2f9cca526dd80036f686c66c7bf894a4b88dfe71595da4b8cc SHA512 664be3f83ace3e9b53952d6d2b1c912883e488db67c449abfe6b4073fd9c816180d2785ab745810ba3e96e69a935fedf3fca5324c8d89dabbfb0070b3b6a7b4b
+DIST MAXINE-VFX-SDK-f63d9d1dbd14c905d56648817f132d3eb9a8690d.tar.gz 42596279 BLAKE2B 50e00f93ab3691dd98e74eff0a54d61cd44b4e2d04e7328134ded19dcf8cd8f75f01e949e6646afd488a5e0439443a7e3cde74b535506f89745815bec1c025dd SHA512 1fed18cfd69880d6ff7157faa41286846b38517b11be15afc49dc894f5a034690ab88fa79b6ef0bb9ca5bfadecf24d51529b5e40cb61cab04102848f4e7e8715
+DIST cmake-clang-7e577af2e963e3dfcce611942fce305c70583b2a.tar.gz 6058 BLAKE2B a1b0c118d7a936759589b9690f850a5fcebce87e204442439b813e67dc2c4a6a482073573cf24ca87768c22029df11d0896a6137d2918db272715a0380177f16 SHA512 e5c804c76c0e4f176d61b8d69ae7e615cee3c5c60cfbb62e79893f509bb9137e23505bb79f23acb8d220ebe24cd9794b6170fcc341a30a7e48b533508ded0510
 DIST cmake-version-3bef96bafab04161991c2cd98a1ed51f6362d670.tar.gz 11195 BLAKE2B 9a5e11a8dd7e7bf97bf26f0c5ca1e0cf3908bf5ea38e413c71eb3e867c2d98b9144127e12c82bd52d58bfabb4405d7a2f360725f1cd7f16da9db7024c6421185 SHA512 1dbcebafd97b5f961db69a2c865f612bfa8e055652a5777291d3c4f1f025bb8244c83099a2917e67ae0cd959c4e7afd243d0c3834ea3254d90114a13b6d6a805
-DIST json-e4643d1f1b03fc7a1d7b65f17e012ca93680cad8.tar.gz 7026075 BLAKE2B 5c04615b72f05c78c0ef30052e831f0864f3658a329e44ad51494872517e46cecce6dc0e5b59d7a94e8cad1e0ce998dc9708e12eb8c811073111f7f0a70fa218 SHA512 58bbc45b85afa7d95a37a46a95d8d278959f1f1fc9b43847e1881a42abfef347b6b0414e36b833652bc799b5a045d7cb7a90a12f9246bf2b7fda19b4842e64f6
-DIST msvc-redist-helper-7587246671340b683a0b8f06fb369d6574d8274f.tar.gz 11132 BLAKE2B 7caa2a510d84103203ed5e15b2544d4f956c3a21e2632ae61a216ca03b27bf0aff2981c8462e9dab1e0c4f3cd7a0b291426000e5f7dbac406bd3205b63518289 SHA512 389c25e63b56136ad1d940db408cb9a5d2c7caeb73cef0591601ec4f6d5af40bb7451bfcbc79ae116ab5a3eae68e4bb1cbd81bc36e7d50cc47b26dc62893a4a4
-DIST obs-streamfx-0.12.0.tar.gz 13008288 BLAKE2B 83b3d0ff385c02b38adea4ed7f74aa14b24618e84d14d5208ed193d4e64ee5d6b5949bb2b3f03c4b8dd511ed3a53f4104c6c973e9586141868b8bc08d93aa9d6 SHA512 87dc270b72d7d09b4ce734ea14d1638ba328a3bbb662a1cc4f11811ebe66f9a998053fcae8bc4d2d017baffb304f00d7821b5d046667c3d9645930a8f751f537
-DIST obs-studio-34ef67e212f24a085a63705a0ab81e3401c8eca4.tar.gz 15852743 BLAKE2B ecf4090d8c00948a06d8fb0fcf711e7c1e06a8713a7fcc1ff108add5c8bc8d0ccf833db4e01ac6e2eb0b1d406b547d505e108176ae4e5eaa48f8866122fb6b12 SHA512 634fc28090031cb05a6418cef7fdf462600dcb833b28a450f1858ba00bc7d3a70817f9bd45d7c14b441c4d01add780e9eb29adfa103df529c0403a120402f8b5
+DIST json-db78ac1d7716f56fc9f1b030b715f872f93964e4.tar.gz 6883371 BLAKE2B ef241d3c0bb0e5a0b928992afba8652fefb9b5db1ea4466ef93617274b6e854bba1cdcf9362498040853abfe33dbefff27887b23001221e48ee99f20100375fa SHA512 29cc71821e7595ce432142a1d167b69b280d1232e0331c0765f2c5edc302e5d717e6009d1a3347fffa0dbe49765ecd6be5d6d4705f71ccb1129f9226d9cc4016
+DIST msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d.tar.gz 13129 BLAKE2B 6a6566ec530f57a4fd66d5ea4d958e8d5dd452bd7d10c9e47f50d6b49ea6f8889d4bd5c4f3a44796dca453bc1e29455f86f8b0736dff3fb1dc0e11bb1e812680 SHA512 2e3feacdd5b8bd1d6cc0ad584ca07114feb12a59253e0448c3cab048838620c3cbf334645e8873d7f8690ce8dbad2d25a9188acc239cbadd847312a383410034
+DIST obs-streamfx-0.12.0b366.tar.gz 13008288 BLAKE2B 83b3d0ff385c02b38adea4ed7f74aa14b24618e84d14d5208ed193d4e64ee5d6b5949bb2b3f03c4b8dd511ed3a53f4104c6c973e9586141868b8bc08d93aa9d6 SHA512 87dc270b72d7d09b4ce734ea14d1638ba328a3bbb662a1cc4f11811ebe66f9a998053fcae8bc4d2d017baffb304f00d7821b5d046667c3d9645930a8f751f537
+DIST obs-studio-abb80571351438bebd018a45d896b26f95881fbe.tar.gz 26315930 BLAKE2B 51656a33b80f53b172b4e6f12cadb79e4e51e5215d1e90be56c2aacf3b43221e295e32565df6c4ee495c77058f4ae9f6b1882c5f40ce99d0b764b2f9c1bfb3bb SHA512 75d3f91f6b4fa94069e131821b7ec66842756973e683dcd667a9a0c31a8f849d9fb4e586b4a6e22c00be6255799c9916074433f5acc57e0510aad3708c8ff910

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
index cf7e189231..e06f2c4f4a 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 inherit cmake
 
-CMAKE_CLANG_COMMIT="d2f9e3234313a7434dead5b957301ebbdddf13d7"
+CMAKE_CLANG_COMMIT="7e577af2e963e3dfcce611942fce305c70583b2a"
 CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
-NHOHMANN_JSON_COMMIT="e4643d1f1b03fc7a1d7b65f17e012ca93680cad8"
-MSVC_REDIST_HELPER_COMMIT="7587246671340b683a0b8f06fb369d6574d8274f"
-NVIDIA_MAXINE_AR_SDK_COMMIT="c4154fa68fc2f91a26f2475e3cf98f64c50483b7"
-NVIDIA_MAXINE_VFX_SDK_COMMIT="3df6c37852afad9f15ee0b85e51b5b49e611cfc0"
+NHOHMANN_JSON_COMMIT="db78ac1d7716f56fc9f1b030b715f872f93964e4"
+MSVC_REDIST_HELPER_COMMIT="aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d"
+NVIDIA_MAXINE_AR_SDK_COMMIT="ca10ac3b3984357aab84b3c6319d35c82d49e836"
+NVIDIA_MAXINE_VFX_SDK_COMMIT="f63d9d1dbd14c905d56648817f132d3eb9a8690d"
 NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
-OBS_STUDIO_COMMIT="34ef67e212f24a085a63705a0ab81e3401c8eca4"
+OBS_STUDIO_COMMIT="abb80571351438bebd018a45d896b26f95881fbe"
 
 #remove when stable release (make life easy later because of new submodules)
 M_PV="0.12.0b366"
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
 else
 	SRC_URI="
-			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
+			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
 			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
 				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
 			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
@@ -58,9 +58,7 @@ fi
 src_unpack() {
 	default
 
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
+	if [[ ${PV} != 9999 ]]; then
 		rm -d "${S}/cmake/clang"
 		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
 
@@ -84,6 +82,9 @@ src_unpack() {
 
 		rm -d "${S}/third-party/obs-studio"
 		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
+
+	else
+		git-r3_src_unpack
 	fi
 }
 
@@ -92,7 +93,6 @@ src_prepare() {
 
 	#fix CMakeLists.txt libdir
 	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
-
 	cmake_src_prepare
 }
 
@@ -101,6 +101,7 @@ src_configure() {
 	local mycmakeargs+=(
 		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
+		$([[ ${PV} != "9999" ]] && echo "-DVERSION=${M_PV}")
 	)
 
 	cmake_src_configure

diff --git a/media-video/obs-streamfx/obs-streamfx-9999.ebuild b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
index dabbb6aa28..e06f2c4f4a 100644
--- a/media-video/obs-streamfx/obs-streamfx-9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 inherit cmake
 
-CMAKE_CLANG_COMMIT="d2f9e3234313a7434dead5b957301ebbdddf13d7"
+CMAKE_CLANG_COMMIT="7e577af2e963e3dfcce611942fce305c70583b2a"
 CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
-NHOHMANN_JSON_COMMIT="e4643d1f1b03fc7a1d7b65f17e012ca93680cad8"
-MSVC_REDIST_HELPER_COMMIT="7587246671340b683a0b8f06fb369d6574d8274f"
-NVIDIA_MAXINE_AR_SDK_COMMIT="c4154fa68fc2f91a26f2475e3cf98f64c50483b7"
-NVIDIA_MAXINE_VFX_SDK_COMMIT="3df6c37852afad9f15ee0b85e51b5b49e611cfc0"
+NHOHMANN_JSON_COMMIT="db78ac1d7716f56fc9f1b030b715f872f93964e4"
+MSVC_REDIST_HELPER_COMMIT="aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d"
+NVIDIA_MAXINE_AR_SDK_COMMIT="ca10ac3b3984357aab84b3c6319d35c82d49e836"
+NVIDIA_MAXINE_VFX_SDK_COMMIT="f63d9d1dbd14c905d56648817f132d3eb9a8690d"
 NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
-OBS_STUDIO_COMMIT="34ef67e212f24a085a63705a0ab81e3401c8eca4"
+OBS_STUDIO_COMMIT="abb80571351438bebd018a45d896b26f95881fbe"
 
 #remove when stable release (make life easy later because of new submodules)
 M_PV="0.12.0b366"
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
 else
 	SRC_URI="
-			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${P}.tar.gz
+			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
 			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
 				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
 			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
@@ -58,9 +58,7 @@ fi
 src_unpack() {
 	default
 
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
+	if [[ ${PV} != 9999 ]]; then
 		rm -d "${S}/cmake/clang"
 		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
 
@@ -84,6 +82,9 @@ src_unpack() {
 
 		rm -d "${S}/third-party/obs-studio"
 		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
+
+	else
+		git-r3_src_unpack
 	fi
 }
 
@@ -92,15 +93,15 @@ src_prepare() {
 
 	#fix CMakeLists.txt libdir
 	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
-
 	cmake_src_prepare
 }
 
 src_configure() {
 
 	local mycmakeargs+=(
-		-DENABLE_UPDATER=FALSE
+		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
+		$([[ ${PV} != "9999" ]] && echo "-DVERSION=${M_PV}")
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-01-02 14:53 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-01-02 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     57098b7ff13ab55204ee70027a49a02d07b77092
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue Jan  2 14:51:16 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Tue Jan  2 14:52:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=57098b7f

media-video/obs-streamfx: add 0.12.0.9999, remove 0.12.0

Closes: https://bugs.gentoo.org/921153
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 .../{obs-streamfx-0.12.0.ebuild => obs-streamfx-0.12.0.9999.ebuild}      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
similarity index 99%
rename from media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
rename to media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
index e06f2c4f4a..f011e661ff 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
+	EGIT_BRANCH="${M_PV}"
 else
 	SRC_URI="
 			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-01-06 21:43 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-01-06 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c210544c631293cc021b781e2cf8de1d92ff07ae
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sat Jan  6 20:33:50 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sat Jan  6 21:42:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c210544c

media-video/obs-streamfx: make 0.12.0.9999 live ebuild

Closes: https://bugs.gentoo.org/921341
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-video/obs-streamfx/Manifest                  |  9 ----
 .../obs-streamfx/obs-streamfx-0.12.0.9999.ebuild   | 48 +++++++++++-----------
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/media-video/obs-streamfx/Manifest b/media-video/obs-streamfx/Manifest
deleted file mode 100644
index 0e9afdfcdc..0000000000
--- a/media-video/obs-streamfx/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST MAXINE-AFX-SDK-4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4.tar.gz 31726703 BLAKE2B 399fbe7d3f5ab3d55831edd6d4820254a1f17e27dc422cf6eab86e278f31f5e8ac3c031cbbfa534cda10154cc5954e94e8049aa16fac7d2c8a12190426b91f70 SHA512 500de1780a6d31452581dc77690e4e7e24562d8371b23bc499ce3a42e977876471785842851b844cc4633e793afb230c2d528b7b20fea882e7964fba760ac8b9
-DIST MAXINE-AR-SDK-ca10ac3b3984357aab84b3c6319d35c82d49e836.tar.gz 39653657 BLAKE2B acdb2db362678cfd644ca4a57418d21dab447087c736a7a37b372c511b2f53fef096cee81caacd2f9cca526dd80036f686c66c7bf894a4b88dfe71595da4b8cc SHA512 664be3f83ace3e9b53952d6d2b1c912883e488db67c449abfe6b4073fd9c816180d2785ab745810ba3e96e69a935fedf3fca5324c8d89dabbfb0070b3b6a7b4b
-DIST MAXINE-VFX-SDK-f63d9d1dbd14c905d56648817f132d3eb9a8690d.tar.gz 42596279 BLAKE2B 50e00f93ab3691dd98e74eff0a54d61cd44b4e2d04e7328134ded19dcf8cd8f75f01e949e6646afd488a5e0439443a7e3cde74b535506f89745815bec1c025dd SHA512 1fed18cfd69880d6ff7157faa41286846b38517b11be15afc49dc894f5a034690ab88fa79b6ef0bb9ca5bfadecf24d51529b5e40cb61cab04102848f4e7e8715
-DIST cmake-clang-7e577af2e963e3dfcce611942fce305c70583b2a.tar.gz 6058 BLAKE2B a1b0c118d7a936759589b9690f850a5fcebce87e204442439b813e67dc2c4a6a482073573cf24ca87768c22029df11d0896a6137d2918db272715a0380177f16 SHA512 e5c804c76c0e4f176d61b8d69ae7e615cee3c5c60cfbb62e79893f509bb9137e23505bb79f23acb8d220ebe24cd9794b6170fcc341a30a7e48b533508ded0510
-DIST cmake-version-3bef96bafab04161991c2cd98a1ed51f6362d670.tar.gz 11195 BLAKE2B 9a5e11a8dd7e7bf97bf26f0c5ca1e0cf3908bf5ea38e413c71eb3e867c2d98b9144127e12c82bd52d58bfabb4405d7a2f360725f1cd7f16da9db7024c6421185 SHA512 1dbcebafd97b5f961db69a2c865f612bfa8e055652a5777291d3c4f1f025bb8244c83099a2917e67ae0cd959c4e7afd243d0c3834ea3254d90114a13b6d6a805
-DIST json-db78ac1d7716f56fc9f1b030b715f872f93964e4.tar.gz 6883371 BLAKE2B ef241d3c0bb0e5a0b928992afba8652fefb9b5db1ea4466ef93617274b6e854bba1cdcf9362498040853abfe33dbefff27887b23001221e48ee99f20100375fa SHA512 29cc71821e7595ce432142a1d167b69b280d1232e0331c0765f2c5edc302e5d717e6009d1a3347fffa0dbe49765ecd6be5d6d4705f71ccb1129f9226d9cc4016
-DIST msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d.tar.gz 13129 BLAKE2B 6a6566ec530f57a4fd66d5ea4d958e8d5dd452bd7d10c9e47f50d6b49ea6f8889d4bd5c4f3a44796dca453bc1e29455f86f8b0736dff3fb1dc0e11bb1e812680 SHA512 2e3feacdd5b8bd1d6cc0ad584ca07114feb12a59253e0448c3cab048838620c3cbf334645e8873d7f8690ce8dbad2d25a9188acc239cbadd847312a383410034
-DIST obs-streamfx-0.12.0b366.tar.gz 13008288 BLAKE2B 83b3d0ff385c02b38adea4ed7f74aa14b24618e84d14d5208ed193d4e64ee5d6b5949bb2b3f03c4b8dd511ed3a53f4104c6c973e9586141868b8bc08d93aa9d6 SHA512 87dc270b72d7d09b4ce734ea14d1638ba328a3bbb662a1cc4f11811ebe66f9a998053fcae8bc4d2d017baffb304f00d7821b5d046667c3d9645930a8f751f537
-DIST obs-studio-abb80571351438bebd018a45d896b26f95881fbe.tar.gz 26315930 BLAKE2B 51656a33b80f53b172b4e6f12cadb79e4e51e5215d1e90be56c2aacf3b43221e295e32565df6c4ee495c77058f4ae9f6b1882c5f40ce99d0b764b2f9c1bfb3bb SHA512 75d3f91f6b4fa94069e131821b7ec66842756973e683dcd667a9a0c31a8f849d9fb4e586b4a6e22c00be6255799c9916074433f5acc57e0510aad3708c8ff910

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
index f011e661ff..1f8ade5e91 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
@@ -19,32 +19,32 @@ M_PV="0.12.0b366"
 
 DESCRIPTION="OBS® Studio plugin which adds many new effects."
 HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
-if [[ ${PV} == 9999 ]]; then
+#if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
 	EGIT_BRANCH="${M_PV}"
-else
-	SRC_URI="
-			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
-			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
-				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
-			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
-				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
-			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
-				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
-			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
-				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
-				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
-				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
-				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
-			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
-				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
+#else
+#	SRC_URI="
+#			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
+#			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
+#				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
+#			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
+#				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
+#			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
+#				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
+#			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
+#				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
+#			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
+#				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
+#			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
+#				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
+#			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
+#				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
+#			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
+#				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
+#	"
+#	KEYWORDS="~amd64"
+#fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -102,7 +102,7 @@ src_configure() {
 	local mycmakeargs+=(
 		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
-		$([[ ${PV} != "9999" ]] && echo "-DVERSION=${M_PV}")
+		#$([[ ${PV} != "9999" ]] && echo "-DVERSION=${M_PV}")
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-02-22 16:57 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-02-22 16:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0ab08c716c958cf2e61bb5154b2b740879c6b20a
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 16:27:39 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Thu Feb 22 16:57:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0ab08c71

media-video/obs-streamfx: add 0.11.0
* since the version detection dosent work without .git repo
* and the version override seems to be broken upstream
* all ebuild use the git version and then change to the version tag

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 .../obs-streamfx/obs-streamfx-0.11.0.ebuild        | 40 +++++++++++
 .../obs-streamfx/obs-streamfx-0.12.0.9999.ebuild   | 78 ++--------------------
 media-video/obs-streamfx/obs-streamfx-9999.ebuild  | 75 +--------------------
 3 files changed, 48 insertions(+), 145 deletions(-)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild
new file mode 100644
index 0000000000..0aac7561c6
--- /dev/null
+++ b/media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake git-r3
+
+M_PV="0.11.0"
+
+DESCRIPTION="OBS® Studio plugin which adds many new effects."
+HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
+
+EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
+EGIT_BRANCH="${M_PV}"
+
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+RDEPEND="
+	media-video/obs-studio
+"
+
+src_prepare() {
+	default
+
+	#fix CMakeLists.txt libdir
+	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs+=(
+		-DSTRUCTURE_PACKAGEMANAGER=TRUE
+		-DPACKAGE_NAME="obs-streamfx"
+	)
+
+	cmake_src_configure
+}

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
index 1f8ade5e91..0ac624011e 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
@@ -3,48 +3,18 @@
 
 EAPI=8
 
-inherit cmake
-
-CMAKE_CLANG_COMMIT="7e577af2e963e3dfcce611942fce305c70583b2a"
-CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
-NHOHMANN_JSON_COMMIT="db78ac1d7716f56fc9f1b030b715f872f93964e4"
-MSVC_REDIST_HELPER_COMMIT="aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d"
-NVIDIA_MAXINE_AR_SDK_COMMIT="ca10ac3b3984357aab84b3c6319d35c82d49e836"
-NVIDIA_MAXINE_VFX_SDK_COMMIT="f63d9d1dbd14c905d56648817f132d3eb9a8690d"
-NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
-OBS_STUDIO_COMMIT="abb80571351438bebd018a45d896b26f95881fbe"
+inherit cmake git-r3
 
 #remove when stable release (make life easy later because of new submodules)
 M_PV="0.12.0b366"
 
 DESCRIPTION="OBS® Studio plugin which adds many new effects."
 HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
-#if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
-	EGIT_BRANCH="${M_PV}"
-#else
-#	SRC_URI="
-#			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
-#			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
-#				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
-#			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
-#				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
-#			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
-#				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
-#			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
-#				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
-#			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
-#				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
-#			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
-#				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
-#			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
-#				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
-#			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
-#				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
-#	"
+
+EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
+EGIT_BRANCH="${M_PV}"
+
 #	KEYWORDS="~amd64"
-#fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -52,43 +22,6 @@ RDEPEND="
 	media-video/obs-studio
 "
 
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/obs-StreamFX-${M_PV}"
-fi
-
-src_unpack() {
-	default
-
-	if [[ ${PV} != 9999 ]]; then
-		rm -d "${S}/cmake/clang"
-		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
-
-		rm -d "${S}/cmake/version"
-		mv cmake-version-${CMAKE_VERSION_COMMIT} "${S}/cmake/version"
-
-		rm -d "${S}/third-party/nlohmann-json"
-		mv json-${NHOHMANN_JSON_COMMIT} "${S}/third-party/nlohmann-json"
-
-		rm -d "${S}/third-party/msvc-redist-helper"
-		mv msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT} "${S}/third-party/msvc-redist-helper"
-
-		rm -d "${S}/third-party/nvidia-maxine-ar-sdk"
-		mv MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT} "${S}/third-party/nvidia-maxine-ar-sdk"
-
-		rm -d "${S}/third-party/nvidia-maxine-vfx-sdk"
-		mv MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-vfx-sdk"
-
-		rm -d "${S}/third-party/nvidia-maxine-afx-sdk"
-		mv MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-afx-sdk"
-
-		rm -d "${S}/third-party/obs-studio"
-		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
-
-	else
-		git-r3_src_unpack
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -102,7 +35,6 @@ src_configure() {
 	local mycmakeargs+=(
 		-DSTRUCTURE_PACKAGEMANAGER=TRUE
 		-DPACKAGE_NAME="obs-streamfx"
-		#$([[ ${PV} != "9999" ]] && echo "-DVERSION=${M_PV}")
 	)
 
 	cmake_src_configure

diff --git a/media-video/obs-streamfx/obs-streamfx-9999.ebuild b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
index e06f2c4f4a..d30ea84efe 100644
--- a/media-video/obs-streamfx/obs-streamfx-9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-9999.ebuild
@@ -3,47 +3,15 @@
 
 EAPI=8
 
-inherit cmake
-
-CMAKE_CLANG_COMMIT="7e577af2e963e3dfcce611942fce305c70583b2a"
-CMAKE_VERSION_COMMIT="3bef96bafab04161991c2cd98a1ed51f6362d670"
-NHOHMANN_JSON_COMMIT="db78ac1d7716f56fc9f1b030b715f872f93964e4"
-MSVC_REDIST_HELPER_COMMIT="aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d"
-NVIDIA_MAXINE_AR_SDK_COMMIT="ca10ac3b3984357aab84b3c6319d35c82d49e836"
-NVIDIA_MAXINE_VFX_SDK_COMMIT="f63d9d1dbd14c905d56648817f132d3eb9a8690d"
-NVIDIA_MAXINE_AFX_SDK_COMMIT="4d4ed8d8aca914f4dbf8570f1626cf4108e19bb4"
-OBS_STUDIO_COMMIT="abb80571351438bebd018a45d896b26f95881fbe"
+inherit cmake git-r3
 
 #remove when stable release (make life easy later because of new submodules)
 M_PV="0.12.0b366"
 
 DESCRIPTION="OBS® Studio plugin which adds many new effects."
 HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
-else
-	SRC_URI="
-			https://github.com/Xaymar/obs-StreamFX/archive/refs/tags/${M_PV}.tar.gz -> ${PN}-${M_PV}.tar.gz
-			https://github.com/Xaymar/cmake-clang/archive/${CMAKE_CLANG_COMMIT}.tar.gz \
-				-> cmake-clang-${CMAKE_CLANG_COMMIT}.tar.gz
-			https://github.com/Xaymar/cmake-version/archive/${CMAKE_VERSION_COMMIT}.tar.gz \
-				-> cmake-version-${CMAKE_VERSION_COMMIT}.tar.gz
-			https://github.com/nlohmann/json/archive/${NHOHMANN_JSON_COMMIT}.tar.gz \
-				-> json-${NHOHMANN_JSON_COMMIT}.tar.gz
-			https://github.com/Xaymar/msvc-redist-helper/archive/${MSVC_REDIST_HELPER_COMMIT}.tar.gz \
-				-> msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AR-SDK/archive/${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz \
-				-> MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-VFX-SDK/archive/${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz \
-				-> MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT}.tar.gz
-			https://github.com/NVIDIA/MAXINE-AFX-SDK/archive/${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz \
-				-> MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT}.tar.gz
-			https://github.com/obsproject/obs-studio/archive/${OBS_STUDIO_COMMIT}.tar.gz \
-				-> obs-studio-${OBS_STUDIO_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
+
+EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -51,43 +19,6 @@ RDEPEND="
 	media-video/obs-studio
 "
 
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/obs-StreamFX-${M_PV}"
-fi
-
-src_unpack() {
-	default
-
-	if [[ ${PV} != 9999 ]]; then
-		rm -d "${S}/cmake/clang"
-		mv cmake-clang-${CMAKE_CLANG_COMMIT} "${S}/cmake/clang"
-
-		rm -d "${S}/cmake/version"
-		mv cmake-version-${CMAKE_VERSION_COMMIT} "${S}/cmake/version"
-
-		rm -d "${S}/third-party/nlohmann-json"
-		mv json-${NHOHMANN_JSON_COMMIT} "${S}/third-party/nlohmann-json"
-
-		rm -d "${S}/third-party/msvc-redist-helper"
-		mv msvc-redist-helper-${MSVC_REDIST_HELPER_COMMIT} "${S}/third-party/msvc-redist-helper"
-
-		rm -d "${S}/third-party/nvidia-maxine-ar-sdk"
-		mv MAXINE-AR-SDK-${NVIDIA_MAXINE_AR_SDK_COMMIT} "${S}/third-party/nvidia-maxine-ar-sdk"
-
-		rm -d "${S}/third-party/nvidia-maxine-vfx-sdk"
-		mv MAXINE-VFX-SDK-${NVIDIA_MAXINE_VFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-vfx-sdk"
-
-		rm -d "${S}/third-party/nvidia-maxine-afx-sdk"
-		mv MAXINE-AFX-SDK-${NVIDIA_MAXINE_AFX_SDK_COMMIT} "${S}/third-party/nvidia-maxine-afx-sdk"
-
-		rm -d "${S}/third-party/obs-studio"
-		mv obs-studio-${OBS_STUDIO_COMMIT} "${S}/third-party/obs-studio"
-
-	else
-		git-r3_src_unpack
-	fi
-}
-
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-02-22 17:15 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-02-22 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     86e11c5e850c8c059b474e4ac17eab9d88ef5296
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 17:14:23 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Thu Feb 22 17:14:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=86e11c5e

media-video/obs-streamfx: add 0.11.1, drop 0.11.0
* use EGIT_COMMIT instead for tags

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 .../{obs-streamfx-0.11.0.ebuild => obs-streamfx-0.11.1.ebuild}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild b/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
similarity index 96%
rename from media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild
rename to media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
index 0aac7561c6..f12a34f720 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.11.0.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OBS® Studio plugin which adds many new effects."
 HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
 
 EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
-EGIT_BRANCH="${M_PV}"
+EGIT_COMMIT="${M_PV}"
 
 KEYWORDS="~amd64"
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-02-22 17:42 Julien Roy
  0 siblings, 0 replies; 10+ messages in thread
From: Julien Roy @ 2024-02-22 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f2b5dab01f922a2ff3ca8109572be0979a3d39ff
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Thu Feb 22 17:41:56 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Feb 22 17:41:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f2b5dab0

media-video/obs-streamfx: unkeyword 0.11.1 for ~amd64

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild b/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
index f12a34f720..5f25768945 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,6 @@ HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
 EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
 EGIT_COMMIT="${M_PV}"
 
-KEYWORDS="~amd64"
-
 LICENSE="GPL-2"
 SLOT="0"
 RDEPEND="


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-02-22 17:57 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-02-22 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1a9044aa01793fefdeb9b68d0e9460b10f907b5d
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 17:56:38 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Thu Feb 22 17:56:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a9044aa

media-video/obs-streamfx: drop 0.11.1
* no way to overwrite LibObs_DIR to a local downloaded copy

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 .../obs-streamfx/obs-streamfx-0.11.1.ebuild        | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild b/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
deleted file mode 100644
index 5f25768945..0000000000
--- a/media-video/obs-streamfx/obs-streamfx-0.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-M_PV="0.11.0"
-
-DESCRIPTION="OBS® Studio plugin which adds many new effects."
-HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
-
-EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
-EGIT_COMMIT="${M_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-RDEPEND="
-	media-video/obs-studio
-"
-
-src_prepare() {
-	default
-
-	#fix CMakeLists.txt libdir
-	sed -i 's|"lib/obs-plugins/"|"${CMAKE_INSTALL_LIBDIR}/obs-plugins/"|g' "${S}/CMakeLists.txt"
-	cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs+=(
-		-DSTRUCTURE_PACKAGEMANAGER=TRUE
-		-DPACKAGE_NAME="obs-streamfx"
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
@ 2024-02-22 18:06 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 10+ messages in thread
From: Gonçalo Negrier Duarte @ 2024-02-22 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b0d1800db5428be44319a8ad86ac2a38b8ac7b7b
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 18:06:22 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Thu Feb 22 18:06:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0d1800d

media-video/obs-streamfx: use EGIT_COMMIT to use a tag

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
index 0ac624011e..ca189fc08e 100644
--- a/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
+++ b/media-video/obs-streamfx/obs-streamfx-0.12.0.9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OBS® Studio plugin which adds many new effects."
 HOMEPAGE="https://github.com/Xaymar/obs-StreamFX"
 
 EGIT_REPO_URI="https://github.com/Xaymar/obs-StreamFX.git"
-EGIT_BRANCH="${M_PV}"
+EGIT_COMMIT="${M_PV}"
 
 #	KEYWORDS="~amd64"
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-02-22 18:07 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-30 14:16 [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/ Gonçalo Negrier Duarte
  -- strict thread matches above, loose matches on Subject: below --
2024-02-22 18:06 Gonçalo Negrier Duarte
2024-02-22 17:57 Gonçalo Negrier Duarte
2024-02-22 17:42 Julien Roy
2024-02-22 17:15 Gonçalo Negrier Duarte
2024-02-22 16:57 Gonçalo Negrier Duarte
2024-01-06 21:43 Gonçalo Negrier Duarte
2024-01-02 14:53 Gonçalo Negrier Duarte
2023-12-30 17:26 Gonçalo Negrier Duarte
2023-12-03 16:46 Gonçalo Negrier Duarte

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