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 14:16:51 +0000 (UTC) [thread overview]
Message-ID: <1703945804.4b81bf7dba79c5da4f608d2dc238c11dee9a7c77.gonegrier.duarte@gentoo> (raw)
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"
)
next reply other threads:[~2023-12-30 14:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 14:16 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 17:26 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=1703945804.4b81bf7dba79c5da4f608d2dc238c11dee9a7c77.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