From nobody Sun Jun 19 18:15:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5A01D860BD6; Sun, 19 Jun 2022 18:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LR1DH3gqxz3mkh; Sun, 19 Jun 2022 18:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655662543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESwKy5xa/WCH2xnkCpWs9xU2rExJOR7hkB8FbyPmwoA=; b=FTyRprxgEc9X/ndzJoCrsv+aeX2VnzCne8emWJmURbYIB24l74RbfJrXuV/Sa1fTV61GH0 AEl6jybem+/c/uNqD1lEW0F/irJmjIVR44jzBUODF7u8CA97cl2rrBSyFVMEZyn8AzmInK aaGWBtc4h7tSotmYrBM4tJEN8ErsJ0F0aW57RgVP8mFwKUHmNQ1OE8o5aF/Er8RCm3cQYq W5tWuwYiTBr3MER0sq5izya+2RdI7KwlOQhYQ9WVDV/VH4bboHXZFELWlE09Vo0GDM/8q2 dWuEGlncdrbjaKUIY1dSVLOksbBj4G7f8aBp7Q+iK3Y+eRYqdNzqh64oZ3UBzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A96D159D4; Sun, 19 Jun 2022 18:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25JIFgMd003182; Sun, 19 Jun 2022 18:15:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25JIFg3t003181; Sun, 19 Jun 2022 18:15:42 GMT (envelope-from git) Date: Sun, 19 Jun 2022 18:15:42 GMT Message-Id: <202206191815.25JIFg3t003181@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 3bed76ee3f53 - main - multimedia/obs-streamfx: Update 0.9.3 -> 0.11.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bed76ee3f53867e3304df4822b6b5a9a2a9d2f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655662543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESwKy5xa/WCH2xnkCpWs9xU2rExJOR7hkB8FbyPmwoA=; b=M0kTPGpHM2eN9vUv0E3Lc3J2hbmAdFylyzWZpDpHMRvCpnTkGRdhuJXzMRT4r3Mt0ppWZQ a+19l6UaDG/sh6vCi7HRvxP5QZk4alJVtv/qXy5rnxjldp3uT6hlLm3UAyN75ZyLHP+b3d 9FlOZUvT+QtHsYInIaEAp4k8UOPU441P0GuIzzjQna9jBLdHk62PDJ5jzTh9zo5JjzeAlW +tph89mPdrvdY9YKOs/+eJ2i/q6Uep+mTNxr4kPxKFnI/Os4q6tR0EeX/kUbHqohWXKu8m r5yYxXEH8y1DMlIVmHiYyFRILXc7XCg+Dd4gZujMYm/JGIAJlRyYLCnbHIjA0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655662543; a=rsa-sha256; cv=none; b=BXvOaMuQ01THfKgV+JjB3O4E6LEcAFkHW0Q0ZLoziZQEtnl2HELM5LrLE3eHT/Mwhn+GcL GT1u6+g/P5CYkjWcfc7I/GllImzrIgIUjZ/2amVlFAIrQopwrFgiCeI+MtGqRRnXpz3/mh yBWIZ2EFfTO3lj6WHAj17Txbm8CsjHf3fwYdjsVMKgn6ev6rAHwERKwtyNbIU8DlAVTwmD 2J3HUKYb3bsn7Fxxy0KP+RLCXM7vb6+V9elrrwf8PaS/2oMlTEE2pRrYuObAJRkagRLDn9 2pcQWOeNyiu97MBHJ5MdLXn2+6G5IBtGfjE7B0nKDMiwDyK8I604P0Uw2IFuVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bed76ee3f53867e3304df4822b6b5a9a2a9d2f4 commit 3bed76ee3f53867e3304df4822b6b5a9a2a9d2f4 Author: Yuri Victorovich AuthorDate: 2022-06-19 18:15:00 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-19 18:15:00 +0000 multimedia/obs-streamfx: Update 0.9.3 -> 0.11.1 Reported by: portscout --- multimedia/obs-streamfx/Makefile | 19 +++- multimedia/obs-streamfx/distinfo | 20 +++- multimedia/obs-streamfx/files/patch-CMakeLists.txt | 118 ++++++++++++++++----- .../files/patch-cmake_modules_Architecture.cmake | 12 +++ .../patch-source_encoders_handlers_amf__shared.cpp | 11 ++ .../files/patch-source_gfx_gfx-opengl.cpp | 29 +++++ .../files/patch-templates_config.hpp.in | 10 ++ multimedia/obs-streamfx/pkg-plist | 45 +++++++- 8 files changed, 225 insertions(+), 39 deletions(-) diff --git a/multimedia/obs-streamfx/Makefile b/multimedia/obs-streamfx/Makefile index 9b4fec13fd17..026f809e4b28 100644 --- a/multimedia/obs-streamfx/Makefile +++ b/multimedia/obs-streamfx/Makefile @@ -1,10 +1,7 @@ PORTNAME= obs-streamfx -DISTVERSION= 0.9.3 +DISTVERSION= 0.11.1 CATEGORIES= multimedia -PATCH_SITES= https://github.com/Xaymar/obs-StreamFX/commit/ -PATCHFILES= 612c2f52139ba7255abf133edf8008b2c6ece41a.patch:-p1 - MAINTAINER= yuri@FreeBSD.org COMMENT= OBS Studio Plugin: Modern effects @@ -19,11 +16,23 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libobs.so:multimedia/obs-studio -USES= cmake +USES= cmake localbase:ldflags qt:5 # localbase:ldflags is related to https://github.com/Xaymar/obs-StreamFX/issues/828 +USE_QT= core gui widgets buildtools_build qmake_build + USE_GITHUB= yes GH_ACCOUNT= Xaymar GH_PROJECT= obs-StreamFX +GH_TUPLE= Xaymar:cmake-clang:f249747ff0a460b3e564801079445a2216b7c068:Xaymar_cmake_clang/cmake/clang \ + Xaymar:cmake-codesign:d02ee94cb9c47ef6f8d2e9a5d67473b7e5cfc5bf:Xaymar_cmake_codesign/cmake/codesign \ + nlohmann:json:db78ac1d7716f56fc9f1b030b715f872f93964e4:nlohmann_json/third-party/nlohmann-json \ + Xaymar:msvc-redist-helper:aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d:Xaymar_msvc_redist_helper/third-party/msvc-redist-helper \ + NVIDIA:MAXINE-AR-SDK:3bd2be62a4b309d56e270bbf05a622395ce95f04:NVIDIA_MAXINE_AR_SDK/third-party/nvidia-maxine-ar-sdk \ + NVIDIA:MAXINE-VFX-SDK:7f69da2ee4dcb02e6b024b3f40c5892de84fcb45:NVIDIA_MAXINE_VFX_SDK/third-party/nvidia-maxine-vfx-sdk \ + Xaymar:cmake-clang:18ba565ff80cb5e6103a93e88a0265545c004707:Xaymar_cmake_clang/third-party/msvc-redist-helper/cmake/clang + CMAKE_ARGS= -DOBS_STUDIO_DIR=${LOCALBASE}/lib +CMAKE_ON= STRUCTURE_PACKAGEMANAGER +CXXFLAGS+= -I${LOCALBASE}/include/obs # workaround for https://github.com/Xaymar/obs-StreamFX/issues/828 .include diff --git a/multimedia/obs-streamfx/distinfo b/multimedia/obs-streamfx/distinfo index 603ea924d31e..de13a856ea08 100644 --- a/multimedia/obs-streamfx/distinfo +++ b/multimedia/obs-streamfx/distinfo @@ -1,5 +1,15 @@ -TIMESTAMP = 1641089548 -SHA256 (Xaymar-obs-StreamFX-0.9.3_GH0.tar.gz) = 163255a2721e2257d8c9b097ec0a6f743c64f91b4d79e8040a93e9da9e8ac5ae -SIZE (Xaymar-obs-StreamFX-0.9.3_GH0.tar.gz) = 13769257 -SHA256 (612c2f52139ba7255abf133edf8008b2c6ece41a.patch) = 63a06eccb18d2fb15974fbc6f7491653837ccdbeb4ed9ec548fb3e77c5839159 -SIZE (612c2f52139ba7255abf133edf8008b2c6ece41a.patch) = 594 +TIMESTAMP = 1655659058 +SHA256 (Xaymar-obs-StreamFX-0.11.1_GH0.tar.gz) = e3d05410e539dcaf2d5b0a3c096206ae04def178ccfe09056bda95acf896c823 +SIZE (Xaymar-obs-StreamFX-0.11.1_GH0.tar.gz) = 14232768 +SHA256 (Xaymar-cmake-clang-18ba565ff80cb5e6103a93e88a0265545c004707_GH0.tar.gz) = 6b953a328f25730f3c5885a6b89f172644481f2ae796afd85163ac96ff4aff46 +SIZE (Xaymar-cmake-clang-18ba565ff80cb5e6103a93e88a0265545c004707_GH0.tar.gz) = 4706 +SHA256 (Xaymar-cmake-codesign-d02ee94cb9c47ef6f8d2e9a5d67473b7e5cfc5bf_GH0.tar.gz) = f24c3c3a5063627d435e7ede199e323027346df24f279d431ce1178e143a1b90 +SIZE (Xaymar-cmake-codesign-d02ee94cb9c47ef6f8d2e9a5d67473b7e5cfc5bf_GH0.tar.gz) = 4377 +SHA256 (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 048aa963b1d551b99c8a4c05d8e666d50c282ba745623ac1c98c6c3300af38cf +SIZE (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 6883371 +SHA256 (Xaymar-msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d_GH0.tar.gz) = 005c0492a840396be46f0a9bd4802e25aaf280176128bfde7c3ed3e18a6c9c8d +SIZE (Xaymar-msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d_GH0.tar.gz) = 13129 +SHA256 (NVIDIA-MAXINE-AR-SDK-3bd2be62a4b309d56e270bbf05a622395ce95f04_GH0.tar.gz) = 438a1b680d4e95101f7adcea4ac347aea605500e552fcf86c83c5a01a2b672dd +SIZE (NVIDIA-MAXINE-AR-SDK-3bd2be62a4b309d56e270bbf05a622395ce95f04_GH0.tar.gz) = 35631489 +SHA256 (NVIDIA-MAXINE-VFX-SDK-7f69da2ee4dcb02e6b024b3f40c5892de84fcb45_GH0.tar.gz) = 9cc3a3a24d17dc263f8d2c400b1f8d3b3e08fb5492099ffae6a8b01752b3dd8c +SIZE (NVIDIA-MAXINE-VFX-SDK-7f69da2ee4dcb02e6b024b3f40c5892de84fcb45_GH0.tar.gz) = 35086564 diff --git a/multimedia/obs-streamfx/files/patch-CMakeLists.txt b/multimedia/obs-streamfx/files/patch-CMakeLists.txt index 76b3a70778ca..08c6b1b8e6a3 100644 --- a/multimedia/obs-streamfx/files/patch-CMakeLists.txt +++ b/multimedia/obs-streamfx/files/patch-CMakeLists.txt @@ -1,15 +1,79 @@ ---- CMakeLists.txt.orig 2020-09-25 19:33:09 UTC +--- CMakeLists.txt.orig 2022-02-26 20:04:54 UTC +++ CMakeLists.txt -@@ -184,7 +184,7 @@ else() - set(CMAKE_PACKAGE_SUFFIX_OVERRIDE "" CACHE STRING "Override for the suffix.") - - if(UNIX) -- set(UNIX_LOCAL_STRUCTURE TRUE CACHE BOOL "Package for a local linux install.") -+ #set(UNIX_LOCAL_STRUCTURE TRUE CACHE BOOL "Package for a local linux install.") +@@ -191,6 +191,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(D_PLATFORM_OS "linux") + set(D_PLATFORM_LINUX 1) ++elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ set(D_PLATFORM_OS "freebsd") ++ set(D_PLATFORM_FREEBSD 1) + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(D_PLATFORM_OS "macos") + set(D_PLATFORM_MAC 1) +@@ -331,7 +334,7 @@ set(${PREFIX}ENABLE_PROFILING OFF CACHE BOOL "Enable C + # Installation / Packaging + if(STANDALONE) + set(STRUCTURE_UNIFIED CACHE BOOL "Install for use in a Plugin Manager") +- if(D_PLATFORM_LINUX) ++ if(D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) + set(STRUCTURE_PACKAGEMANAGER CACHE BOOL "Install for use in a Package Manager (system-wide installation)") endif() - if(NOT ${PropertyPrefix}OBS_DOWNLOAD) -@@ -636,9 +636,9 @@ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") +@@ -382,7 +385,7 @@ endif() + # Standalone Build: OBS Studio + ################################################################################ + +-if(NOT ${PREFIX}OBS_NATIVE) ++if(FALSE AND NOT ${PREFIX}OBS_NATIVE) + # Options + set(${PREFIX}DOWNLOAD_OBS_URL "" CACHE STRING "(Optional) URL of prebuilt libOBS archive to download.") + set(${PREFIX}DOWNLOAD_OBS_HASH "" CACHE STRING "(Optional) The hash for the libOBS archive.") +@@ -410,7 +413,7 @@ if(NOT ${PREFIX}OBS_NATIVE) + message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.") + return() + endif() +- elseif(D_PLATFORM_LINUX) ++ elseif(D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) + if (D_PLATFORM_ARCH_X86) + set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-ubuntu-${D_PLATFORM_ARCH}-${D_PLATFORM_BITS}.7z") + if (D_PLATFORM_BITS EQUAL 64) +@@ -458,7 +461,7 @@ endif() + # Standalone Build: OBS Studio Dependencies + ################################################################################ + +-if(STANDALONE AND NOT D_PLATFORM_LINUX) ++if(STANDALONE AND NOT D_PLATFORM_LINUX AND NOT D_PLATFORM_FREEBSD) + # Options + set(${PREFIX}DOWNLOAD_OBSDEPS_URL "" CACHE STRING "(Optional) URL of prebuilt libOBS archive to download.") + set(${PREFIX}DOWNLOAD_OBSDEPS_HASH "" CACHE STRING "(Optional) The hash for the libOBS archive.") +@@ -534,7 +537,7 @@ endif() + # Standalone Build: Qt v5.x + ################################################################################ + +-if(STANDALONE AND NOT D_PLATFORM_LINUX) ++if(STANDALONE AND NOT D_PLATFORM_LINUX AND NOT D_PLATFORM_FREEBSD) + set(${PREFIX}DOWNLOAD_QT OFF CACHE BOOL "Download Qt?") + + if(${PREFIX}DOWNLOAD_QT) +@@ -1075,7 +1078,7 @@ if(D_PLATFORM_WINDOWS) # Windows Support + endif() + + # Minimum Dependencies +-list(APPEND PROJECT_LIBRARIES libobs) ++list(APPEND PROJECT_LIBRARIES obs) + + # Components + if(HAVE_CURL) +@@ -1118,7 +1121,7 @@ if(TRUE) # OpenGL + PRIVATE + "${PROJECT_SOURCE_DIR}/third-party/khronos/glad/src/wgl.c" + ) +- elseif(D_PLATFORM_LINUX) ++ elseif(D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) + target_sources(khronos_glad + PRIVATE + "${PROJECT_SOURCE_DIR}/third-party/khronos/glad/src/glx.c" +@@ -1782,9 +1785,9 @@ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) @@ -22,23 +86,21 @@ endif() endif() -@@ -1226,8 +1226,8 @@ else() - else() - install( - TARGETS ${PROJECT_NAME} -- RUNTIME DESTINATION "./obs-plugins/${BITS}bit/" COMPONENT Runtime -- LIBRARY DESTINATION "./obs-plugins/${BITS}bit/" COMPONENT Runtime -+ RUNTIME DESTINATION "lib/obs-plugins" COMPONENT Runtime -+ LIBRARY DESTINATION "lib/obs-plugins" COMPONENT Runtime - ) - if(MSVC) +@@ -2011,7 +2014,7 @@ else() + DESTINATION "data/" COMPONENT StreamFX + ) + endif() +- elseif(D_PLATFORM_LINUX) ++ elseif(D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) + install( + TARGETS ${PROJECT_NAME} + RUNTIME DESTINATION "bin/linux-${D_PLATFORM_INSTR}-${D_PLATFORM_BITS}/" COMPONENT StreamFX +@@ -2062,7 +2065,7 @@ else() + DESTINATION "data/obs-plugins/${PROJECT_NAME}/" COMPONENT StreamFX + ) + endif() +- elseif(D_PLATFORM_LINUX) ++ elseif(D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) + if(STRUCTURE_PACKAGEMANAGER) install( -@@ -1239,7 +1239,7 @@ else() - - install( - DIRECTORY "data/" -- DESTINATION "./data/obs-plugins/${PROJECT_NAME}/" -+ DESTINATION "share/obs/obs-plugins/${PROJECT_NAME}/" - ) - - add_custom_target( + TARGETS ${PROJECT_NAME} diff --git a/multimedia/obs-streamfx/files/patch-cmake_modules_Architecture.cmake b/multimedia/obs-streamfx/files/patch-cmake_modules_Architecture.cmake new file mode 100644 index 000000000000..ca0abec39b4a --- /dev/null +++ b/multimedia/obs-streamfx/files/patch-cmake_modules_Architecture.cmake @@ -0,0 +1,12 @@ +--- cmake/modules/Architecture.cmake.orig 2022-02-26 20:04:54 UTC ++++ cmake/modules/Architecture.cmake +@@ -1,7 +1,7 @@ + # Setup + set(ARCH_INSTR_32 "i386;i686;x86;arm;ARM") +-set(ARCH_INSTR_64 "x86_64;AMD64;IA64;arm64;ARM64") +-set(ARCH_INSTR_X86 "i386;i686;x86;x86_64;AMD64") ++set(ARCH_INSTR_64 "x86_64;amd64;AMD64;IA64;arm64;ARM64") ++set(ARCH_INSTR_X86 "i386;i686;x86;x86_64;amd64;AMD64") + set(ARCH_INSTR_ARM "arm;ARM;arm64;ARM64") + set(ARCH_INSTR_ITANIUM "IA64") + set(ARCH_BITS 0) diff --git a/multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp b/multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp new file mode 100644 index 000000000000..ad2aa6f115f3 --- /dev/null +++ b/multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp @@ -0,0 +1,11 @@ +--- source/encoders/handlers/amf_shared.cpp.orig 2022-06-19 17:00:02 UTC ++++ source/encoders/handlers/amf_shared.cpp +@@ -109,7 +109,7 @@ bool streamfx::encoder::ffmpeg::handler::amf::is_avail + #else + std::filesystem::path lib_name = std::filesystem::u8path("amfrt32.dll"); + #endif +-#elif defined(D_PLATFORM_LINUX) ++#elif defined(D_PLATFORM_LINUX) || defined(D_PLATFORM_FREEBSD) + #if defined(D_PLATFORM_64BIT) + std::filesystem::path lib_name = std::filesystem::u8path("libamfrt64.so.1"); + #else diff --git a/multimedia/obs-streamfx/files/patch-source_gfx_gfx-opengl.cpp b/multimedia/obs-streamfx/files/patch-source_gfx_gfx-opengl.cpp new file mode 100644 index 000000000000..f20fc3e1c1c9 --- /dev/null +++ b/multimedia/obs-streamfx/files/patch-source_gfx_gfx-opengl.cpp @@ -0,0 +1,29 @@ +--- source/gfx/gfx-opengl.cpp.orig 2022-06-19 17:00:46 UTC ++++ source/gfx/gfx-opengl.cpp +@@ -28,7 +28,7 @@ + #ifdef D_PLATFORM_WINDOWS + #include "glad/wgl.h" + #endif +-#ifdef D_PLATFORM_LINUX ++#if defined(D_PLATFORM_LINUX) || defined(D_PLATFORM_FREEBSD) + #include "glad/glx.h" + #endif + +@@ -67,7 +67,7 @@ streamfx::gfx::opengl::opengl() + // ToDo: Figure out the HDC for which we need to load. + //gladLoaderLoadWGL(); + #endif +-#ifdef D_PLATFORM_LINUX ++#if defined(D_PLATFORM_LINUX) || defined(D_PLATFORM_FREEBSD) + //gladLoaderLoadGLX(); + #endif // D_PLATFORM_LINUX + D_LOG_INFO("Version %d.%d initialized.", GLAD_VERSION_MAJOR(version), GLAD_VERSION_MINOR(version)); +@@ -80,7 +80,7 @@ streamfx::gfx::opengl::~opengl() + // Does not appear to exist. + //gladLoaderUnloadWGL(); + #endif +-#ifdef D_PLATFORM_LINUX ++#if defined(D_PLATFORM_LINUX) || defined(D_PLATFORM_FREEBSD) + //gladLoaderUnloadGLX(); + #endif + D_LOG_INFO("Finalized.", ""); diff --git a/multimedia/obs-streamfx/files/patch-templates_config.hpp.in b/multimedia/obs-streamfx/files/patch-templates_config.hpp.in new file mode 100644 index 000000000000..1fc7d45d858a --- /dev/null +++ b/multimedia/obs-streamfx/files/patch-templates_config.hpp.in @@ -0,0 +1,10 @@ +--- templates/config.hpp.in.orig 2022-06-19 17:02:21 UTC ++++ templates/config.hpp.in +@@ -23,6 +23,7 @@ + #define D_PLATFORM_OS "@D_PLATFORM_OS@" + #cmakedefine D_PLATFORM_WINDOWS + #cmakedefine D_PLATFORM_LINUX ++#cmakedefine D_PLATFORM_FREEBSD + #cmakedefine D_PLATFORM_MAC + #cmakedefine D_PLATFORM_UNKNOWN + diff --git a/multimedia/obs-streamfx/pkg-plist b/multimedia/obs-streamfx/pkg-plist index e4cdef6872a3..61f5161a006f 100644 --- a/multimedia/obs-streamfx/pkg-plist +++ b/multimedia/obs-streamfx/pkg-plist @@ -1,26 +1,55 @@ lib/obs-plugins/StreamFX.so share/obs/obs-plugins/StreamFX/effects/blur/box-linear.effect share/obs/obs-plugins/StreamFX/effects/blur/box.effect +share/obs/obs-plugins/StreamFX/effects/blur/common.effect share/obs/obs-plugins/StreamFX/effects/blur/dual-filtering.effect share/obs/obs-plugins/StreamFX/effects/blur/gaussian-linear.effect share/obs/obs-plugins/StreamFX/effects/blur/gaussian.effect share/obs/obs-plugins/StreamFX/effects/channel-mask.effect -share/obs/obs-plugins/StreamFX/effects/color-conversion.effect share/obs/obs-plugins/StreamFX/effects/color-grade.effect +share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_hsl.effect +share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_hsv.effect +share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_yuv.effect share/obs/obs-plugins/StreamFX/effects/displace.effect +share/obs/obs-plugins/StreamFX/effects/lut-consumer.effect +share/obs/obs-plugins/StreamFX/effects/lut-producer.effect +share/obs/obs-plugins/StreamFX/effects/lut.effect share/obs/obs-plugins/StreamFX/effects/mask.effect share/obs/obs-plugins/StreamFX/effects/mipgen.effect share/obs/obs-plugins/StreamFX/effects/pack-unpack.effect share/obs/obs-plugins/StreamFX/effects/sdf/sdf-consumer.effect share/obs/obs-plugins/StreamFX/effects/sdf/sdf-producer.effect +share/obs/obs-plugins/StreamFX/effects/shared.effect +share/obs/obs-plugins/StreamFX/effects/standard.effect +share/obs/obs-plugins/StreamFX/effects/transform.effect +share/obs/obs-plugins/StreamFX/effects/virtual-greenscreen.effect share/obs/obs-plugins/StreamFX/examples/normal-maps/neutral.png share/obs/obs-plugins/StreamFX/examples/normal-maps/stretch-middle.png +share/obs/obs-plugins/StreamFX/examples/shaders/base.effect +share/obs/obs-plugins/StreamFX/examples/shaders/colorconversion_rgb_yuv.effect share/obs/obs-plugins/StreamFX/examples/shaders/feature-test.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/blur-gaussian.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/bulge_pinch.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/colorize.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/crt-curvature.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/crt-scanlines.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/displace.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/drunk.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/fxaa.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/hexagonize.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/pixelation.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/posterize.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/repeat.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/rounded-rect.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/semiline.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/smaa.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/smaa/areatex.png +share/obs/obs-plugins/StreamFX/examples/shaders/filter/smaa/searchtex.png +share/obs/obs-plugins/StreamFX/examples/shaders/filter/swirl.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/vignette.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/wave.effect +share/obs/obs-plugins/StreamFX/examples/shaders/filter/zigzag.effect +share/obs/obs-plugins/StreamFX/examples/shaders/source/flip-ab-texture.effect share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-3l23Rh.effect share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-3tlXWS.effect share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-MslGRn.effect @@ -33,11 +62,20 @@ share/obs/obs-plugins/StreamFX/examples/shaders/transition/color-shift.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/luma-burn.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/pixelator.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/sliding-bars.effect +share/obs/obs-plugins/StreamFX/examples/shaders/transition/spin-blur.effect share/obs/obs-plugins/StreamFX/examples/white.png +share/obs/obs-plugins/StreamFX/locale/ar-SA.ini +share/obs/obs-plugins/StreamFX/locale/bg-BG.ini share/obs/obs-plugins/StreamFX/locale/bo-BT.ini +share/obs/obs-plugins/StreamFX/locale/bs-BA.ini +share/obs/obs-plugins/StreamFX/locale/cs-CZ.ini share/obs/obs-plugins/StreamFX/locale/cy-GB.ini +share/obs/obs-plugins/StreamFX/locale/da-DK.ini share/obs/obs-plugins/StreamFX/locale/de-DE.ini share/obs/obs-plugins/StreamFX/locale/el-GR.ini +share/obs/obs-plugins/StreamFX/locale/en-AU.ini +share/obs/obs-plugins/StreamFX/locale/en-CA.ini +share/obs/obs-plugins/StreamFX/locale/en-GB.ini share/obs/obs-plugins/StreamFX/locale/en-US.ini share/obs/obs-plugins/StreamFX/locale/es-ES.ini share/obs/obs-plugins/StreamFX/locale/et-EE.ini @@ -48,6 +86,7 @@ share/obs/obs-plugins/StreamFX/locale/fo-FO.ini share/obs/obs-plugins/StreamFX/locale/fr-FR.ini share/obs/obs-plugins/StreamFX/locale/ga-IE.ini share/obs/obs-plugins/StreamFX/locale/he-IL.ini +share/obs/obs-plugins/StreamFX/locale/hr-HR.ini share/obs/obs-plugins/StreamFX/locale/hu-HU.ini share/obs/obs-plugins/StreamFX/locale/id-ID.ini share/obs/obs-plugins/StreamFX/locale/is-IS.ini @@ -72,6 +111,8 @@ share/obs/obs-plugins/StreamFX/locale/pt-BR.ini share/obs/obs-plugins/StreamFX/locale/pt-PT.ini share/obs/obs-plugins/StreamFX/locale/ro-RO.ini share/obs/obs-plugins/StreamFX/locale/ru-RU.ini +share/obs/obs-plugins/StreamFX/locale/sh-HR.ini +share/obs/obs-plugins/StreamFX/locale/si-LK.ini share/obs/obs-plugins/StreamFX/locale/su-ID.ini share/obs/obs-plugins/StreamFX/locale/sv-SE.ini share/obs/obs-plugins/StreamFX/locale/sw-KE.ini @@ -81,4 +122,6 @@ share/obs/obs-plugins/StreamFX/locale/tr-TR.ini share/obs/obs-plugins/StreamFX/locale/uk-UA.ini share/obs/obs-plugins/StreamFX/locale/vi-VN.ini share/obs/obs-plugins/StreamFX/locale/zh-CN.ini +share/obs/obs-plugins/StreamFX/locale/zh-HK.ini share/obs/obs-plugins/StreamFX/locale/zh-TW.ini +share/obs/obs-plugins/StreamFX/thanks.json