git: c8c3b281c9b9 - main - multimedia/obs-studio: Update 29.0.2 → 29.1.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Mon, 19 Jun 2023 23:06:17 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c8c3b281c9b9f95c887953e8bed4beb8a445c11a

commit c8c3b281c9b9f95c887953e8bed4beb8a445c11a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-06-19 23:05:50 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-06-19 23:06:15 +0000

    multimedia/obs-studio: Update 29.0.2 → 29.1.3
---
 multimedia/obs-studio/Makefile                         |  9 ++-------
 multimedia/obs-studio/distinfo                         |  6 +++---
 .../files/patch-cmake_Modules_CompilerConfig.cmake     | 13 +++++++++++++
 .../files/patch-cmake_Modules_ObsHelpers.cmake         |  8 ++++----
 multimedia/obs-studio/pkg-plist                        | 18 ++++++++++++++----
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 0dfec4999a9f..2ea1c7c3d910 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,13 +1,7 @@
 PORTNAME=	obs-studio
-DISTVERSION=	29.0.2
-PORTREVISION=	2
+DISTVERSION=	29.1.3
 CATEGORIES=	multimedia
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	e98c9fbd65aa4e3d91da081b6020962c7b3e68ee.patch:-p1 \
-		0a257a71e83225d1e6b503a5cc2dc0eea99c1e13.patch:-p1 \
-		2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open source streaming/recording software
 WWW=		https://obsproject.com/
@@ -42,6 +36,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
+		libuuid.so:misc/e2fsprogs-libuuid \
 		libva.so:multimedia/libva \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_amd64=	libluajit-5.1.so:lang/luajit
diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo
index e9937c9bcc33..c0d693e45b07 100644
--- a/multimedia/obs-studio/distinfo
+++ b/multimedia/obs-studio/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1682027140
-SHA256 (obsproject-obs-studio-29.0.2_GH0.tar.gz) = 0e6260800b80c3fc9f67c4c3fb12ffae740ab1dd188e526a55e0fc8949168db2
-SIZE (obsproject-obs-studio-29.0.2_GH0.tar.gz) = 18939072
+TIMESTAMP = 1687208095
+SHA256 (obsproject-obs-studio-29.1.3_GH0.tar.gz) = 9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+SIZE (obsproject-obs-studio-29.1.3_GH0.tar.gz) = 26315797
 SHA256 (obsproject-obs-amd-encoder-d5a136c6834c39293ad749cf8f07bdaa772fe44b_GH0.tar.gz) = 6cfae1f4d378124d9621bde29d9ff5d49134dabcd1f17aad048f77e103ddee14
 SIZE (obsproject-obs-amd-encoder-d5a136c6834c39293ad749cf8f07bdaa772fe44b_GH0.tar.gz) = 347479
 SHA256 (obsproject-obs-browser-e2310b02df3e6c184fe6eb6608244a82e37f582e_GH0.tar.gz) = 6cfaa245da01f7d25f46c9823c6ff6cebe38599f699b98b46498f627ba904591
diff --git a/multimedia/obs-studio/files/patch-cmake_Modules_CompilerConfig.cmake b/multimedia/obs-studio/files/patch-cmake_Modules_CompilerConfig.cmake
new file mode 100644
index 000000000000..22a1c325af6f
--- /dev/null
+++ b/multimedia/obs-studio/files/patch-cmake_Modules_CompilerConfig.cmake
@@ -0,0 +1,13 @@
+- prevent warnings from breaking the build
+
+--- cmake/Modules/CompilerConfig.cmake.orig	2023-06-19 20:58:53 UTC
++++ cmake/Modules/CompilerConfig.cmake
+@@ -108,7 +108,7 @@ else()
+     - https://github.com/obsproject/obs-studio/issues/8850 for 13.1.1
+   ]]
+   add_compile_options(
+-    -Werror
++    #-Werror
+     -Wextra
+     -Wvla
+     -Wswitch
diff --git a/multimedia/obs-studio/files/patch-cmake_Modules_ObsHelpers.cmake b/multimedia/obs-studio/files/patch-cmake_Modules_ObsHelpers.cmake
index 2e81c051e7ae..8c819f580bcf 100644
--- a/multimedia/obs-studio/files/patch-cmake_Modules_ObsHelpers.cmake
+++ b/multimedia/obs-studio/files/patch-cmake_Modules_ObsHelpers.cmake
@@ -1,10 +1,10 @@
 - disable Qt5 search because it fails due to missing qmake for some reason
 
---- cmake/Modules/ObsHelpers.cmake.orig	2022-12-29 09:06:07 UTC
+--- cmake/Modules/ObsHelpers.cmake.orig	2023-06-18 22:05:22 UTC
 +++ cmake/Modules/ObsHelpers.cmake
-@@ -341,10 +341,10 @@ macro(find_qt)
-   cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}"
-                         ${ARGN})
+@@ -320,10 +320,10 @@ macro(find_qt)
+   set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
+   cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    set(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
 -  find_package(
 -    Qt5
diff --git a/multimedia/obs-studio/pkg-plist b/multimedia/obs-studio/pkg-plist
index f7aaaeafa7a6..84e70dea1a96 100644
--- a/multimedia/obs-studio/pkg-plist
+++ b/multimedia/obs-studio/pkg-plist
@@ -109,6 +109,7 @@ include/obs/util/text-lookup.h
 include/obs/util/threading-posix.h
 include/obs/util/threading.h
 include/obs/util/utf8.h
+include/obs/util/uthash.h
 include/obs/util/util.hpp
 include/obs/util/util_uint128.h
 include/obs/util/util_uint64.h
@@ -134,9 +135,6 @@ lib/libobs-scripting.so.29
 lib/libobs.so
 lib/libobs.so.0
 lib/libobs.so.29
-lib/libobsglad.so
-lib/libobsglad.so.1
-lib/libobsglad.so.29
 lib/obs-plugins/frontend-tools.so
 lib/obs-plugins/image-source.so
 lib/obs-plugins/linux-capture.so
@@ -190,6 +188,7 @@ share/obs/obs-plugins/frontend-tools/locale/an-ES.ini
 share/obs/obs-plugins/frontend-tools/locale/ar-SA.ini
 share/obs/obs-plugins/frontend-tools/locale/az-AZ.ini
 share/obs/obs-plugins/frontend-tools/locale/ba-RU.ini
+share/obs/obs-plugins/frontend-tools/locale/be-BY.ini
 share/obs/obs-plugins/frontend-tools/locale/bg-BG.ini
 share/obs/obs-plugins/frontend-tools/locale/bn-BD.ini
 share/obs/obs-plugins/frontend-tools/locale/ca-ES.ini
@@ -226,6 +225,7 @@ share/obs/obs-plugins/frontend-tools/locale/mn-MN.ini
 share/obs/obs-plugins/frontend-tools/locale/ms-MY.ini
 share/obs/obs-plugins/frontend-tools/locale/nb-NO.ini
 share/obs/obs-plugins/frontend-tools/locale/nl-NL.ini
+share/obs/obs-plugins/frontend-tools/locale/nn-NO.ini
 share/obs/obs-plugins/frontend-tools/locale/oc-FR.ini
 share/obs/obs-plugins/frontend-tools/locale/pl-PL.ini
 share/obs/obs-plugins/frontend-tools/locale/pt-BR.ini
@@ -260,6 +260,7 @@ share/obs/obs-plugins/frontend-tools/scripts/url-text.py
 share/obs/obs-plugins/image-source/locale/ar-SA.ini
 share/obs/obs-plugins/image-source/locale/az-AZ.ini
 share/obs/obs-plugins/image-source/locale/ba-RU.ini
+share/obs/obs-plugins/image-source/locale/be-BY.ini
 share/obs/obs-plugins/image-source/locale/bg-BG.ini
 share/obs/obs-plugins/image-source/locale/bn-BD.ini
 share/obs/obs-plugins/image-source/locale/ca-ES.ini
@@ -568,6 +569,7 @@ share/obs/obs-plugins/linux-v4l2/locale/ko-KR.ini
 share/obs/obs-plugins/linux-v4l2/locale/ms-MY.ini
 share/obs/obs-plugins/linux-v4l2/locale/nb-NO.ini
 share/obs/obs-plugins/linux-v4l2/locale/nl-NL.ini
+share/obs/obs-plugins/linux-v4l2/locale/nn-NO.ini
 share/obs/obs-plugins/linux-v4l2/locale/oc-FR.ini
 share/obs/obs-plugins/linux-v4l2/locale/pl-PL.ini
 share/obs/obs-plugins/linux-v4l2/locale/pt-BR.ini
@@ -650,6 +652,7 @@ share/obs/obs-plugins/obs-ffmpeg/locale/zh-TW.ini
 share/obs/obs-plugins/obs-filters/LUTs/black_and_white.png
 share/obs/obs-plugins/obs-filters/LUTs/grayscale.cube
 share/obs/obs-plugins/obs-filters/LUTs/grayscale.png
+share/obs/obs-plugins/obs-filters/LUTs/invert.png
 share/obs/obs-plugins/obs-filters/LUTs/original.cube
 share/obs/obs-plugins/obs-filters/LUTs/original.png
 share/obs/obs-plugins/obs-filters/LUTs/posterize.png
@@ -670,6 +673,7 @@ share/obs/obs-plugins/obs-filters/hdr_tonemap_filter.effect
 share/obs/obs-plugins/obs-filters/locale/ar-SA.ini
 share/obs/obs-plugins/obs-filters/locale/az-AZ.ini
 share/obs/obs-plugins/obs-filters/locale/ba-RU.ini
+share/obs/obs-plugins/obs-filters/locale/be-BY.ini
 share/obs/obs-plugins/obs-filters/locale/bg-BG.ini
 share/obs/obs-plugins/obs-filters/locale/bn-BD.ini
 share/obs/obs-plugins/obs-filters/locale/ca-ES.ini
@@ -802,6 +806,7 @@ share/obs/obs-plugins/obs-transitions/locale/de-DE.ini
 share/obs/obs-plugins/obs-transitions/locale/el-GR.ini
 share/obs/obs-plugins/obs-transitions/locale/en-GB.ini
 share/obs/obs-plugins/obs-transitions/locale/en-US.ini
+share/obs/obs-plugins/obs-transitions/locale/eo-UY.ini
 share/obs/obs-plugins/obs-transitions/locale/es-ES.ini
 share/obs/obs-plugins/obs-transitions/locale/et-EE.ini
 share/obs/obs-plugins/obs-transitions/locale/eu-ES.ini
@@ -931,6 +936,7 @@ share/obs/obs-plugins/obs-x264/locale/cs-CZ.ini
 share/obs/obs-plugins/obs-x264/locale/da-DK.ini
 share/obs/obs-plugins/obs-x264/locale/de-DE.ini
 share/obs/obs-plugins/obs-x264/locale/el-GR.ini
+share/obs/obs-plugins/obs-x264/locale/en-GB.ini
 share/obs/obs-plugins/obs-x264/locale/en-US.ini
 share/obs/obs-plugins/obs-x264/locale/es-ES.ini
 share/obs/obs-plugins/obs-x264/locale/et-EE.ini
@@ -1091,7 +1097,7 @@ share/obs/obs-plugins/rtmp-services/locale/zh-CN.ini
 share/obs/obs-plugins/rtmp-services/locale/zh-TW.ini
 share/obs/obs-plugins/rtmp-services/package.json
 share/obs/obs-plugins/rtmp-services/schema/package-schema.json
-share/obs/obs-plugins/rtmp-services/schema/service-schema-v4.json
+share/obs/obs-plugins/rtmp-services/schema/service-schema-v5.json
 share/obs/obs-plugins/rtmp-services/services.json
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/ar-SA.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/be-BY.ini
@@ -1136,6 +1142,7 @@ share/obs/obs-plugins/rtmp-services/services.json
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/sl-SI.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/sv-SE.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/szl-PL.ini
+%%SNDIO%%share/obs/obs-plugins/sndio/locale/th-TH.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/tr-TR.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/uk-UA.ini
 %%SNDIO%%share/obs/obs-plugins/sndio/locale/vi-VN.ini
@@ -1152,6 +1159,7 @@ share/obs/obs-plugins/text-freetype2/locale/de-DE.ini
 share/obs/obs-plugins/text-freetype2/locale/el-GR.ini
 share/obs/obs-plugins/text-freetype2/locale/en-GB.ini
 share/obs/obs-plugins/text-freetype2/locale/en-US.ini
+share/obs/obs-plugins/text-freetype2/locale/eo-UY.ini
 share/obs/obs-plugins/text-freetype2/locale/es-ES.ini
 share/obs/obs-plugins/text-freetype2/locale/et-EE.ini
 share/obs/obs-plugins/text-freetype2/locale/eu-ES.ini
@@ -1201,6 +1209,7 @@ share/obs/obs-plugins/text-freetype2/locale/zh-TW.ini
 share/obs/obs-plugins/text-freetype2/text_default.effect
 %%VLC%%share/obs/obs-plugins/vlc-video/locale/ar-SA.ini
 %%VLC%%share/obs/obs-plugins/vlc-video/locale/ba-RU.ini
+%%VLC%%share/obs/obs-plugins/vlc-video/locale/be-BY.ini
 %%VLC%%share/obs/obs-plugins/vlc-video/locale/bg-BG.ini
 %%VLC%%share/obs/obs-plugins/vlc-video/locale/bn-BD.ini
 %%VLC%%share/obs/obs-plugins/vlc-video/locale/ca-ES.ini
@@ -1401,6 +1410,7 @@ share/obs/obs-studio/themes/Dark/sources/text.svg
 share/obs/obs-studio/themes/Dark/sources/window.svg
 share/obs/obs-studio/themes/Dark/sources/windowaudio.svg
 share/obs/obs-studio/themes/Dark/trash.svg
+share/obs/obs-studio/themes/Dark/unassigned.svg
 share/obs/obs-studio/themes/Dark/up.svg
 share/obs/obs-studio/themes/Dark/updown.svg
 share/obs/obs-studio/themes/Dark/visible.svg