From: "Gonçalo Negrier Duarte" <gonegrier.duarte@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/
Date: Sat, 30 Dec 2023 17:26:06 +0000 (UTC) [thread overview]
Message-ID: <1703957146.1b833f4d2bb5a700932d776735b22c0bcba13699.gonegrier.duarte@gentoo> (raw)
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
next reply other threads:[~2023-12-30 17:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 17:26 Gonçalo Negrier Duarte [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-22 18:06 [gentoo-commits] repo/proj/guru:dev commit in: media-video/obs-streamfx/ 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 14:16 Gonçalo Negrier Duarte
2023-12-03 16:46 Gonçalo Negrier Duarte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1703957146.1b833f4d2bb5a700932d776735b22c0bcba13699.gonegrier.duarte@gentoo \
--to=gonegrier.duarte@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox