multimedia/obs-studio: Update 23.2.1 -> 24.0.0

Reported by:	portscout

5 files changed, 22 insertions, 47 deletions

diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 4db211e2a3ae..92dad68f03ca 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	obs-studio
-DISTVERSION=	23.2.1
-PORTREVISION=	2
+DISTVERSION=	24.0.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -32,7 +31,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libv4l2.so:multimedia/libv4l \
 		libx264.so:multimedia/libx264
 
-USES=		cmake compiler:c++11-lib gl lua pkgconfig python:3.4+ qt:5
+USES=		cmake compiler:c++11-lib gl lua pkgconfig python:3.4+ qt:5 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	obsproject
 USE_QT=		core gui svg widgets x11extras buildtools_build imageformats_run qmake_build
diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo
index cdd73e932a5b..bb36ba1484e1 100644
--- a/multimedia/obs-studio/distinfo
+++ b/multimedia/obs-studio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560932324
-SHA256 (obsproject-obs-studio-23.2.1_GH0.tar.gz) = 9e40d1b1552ea2e4f3aa079a8a867a1d94346069a0c199461af1cc90e5271760
-SIZE (obsproject-obs-studio-23.2.1_GH0.tar.gz) = 6204515
+TIMESTAMP = 1569047744
+SHA256 (obsproject-obs-studio-24.0.0_GH0.tar.gz) = 88e770c033550a6afb543fb9b915e810bfbe0a63c182cefab10ec101e7ab6193
+SIZE (obsproject-obs-studio-24.0.0_GH0.tar.gz) = 6284134
diff --git a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp
index e9babfb98983..f2f46d4cd4e6 100644
--- a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp
+++ b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp
@@ -1,6 +1,6 @@
---- UI/window-basic-preview.cpp.orig	2017-10-25 18:45:20 UTC
+--- UI/window-basic-preview.cpp.orig	2019-09-17 21:29:34 UTC
 +++ UI/window-basic-preview.cpp
-@@ -471,8 +471,8 @@ void OBSBasicPreview::mousePressEvent(QM
+@@ -572,8 +572,8 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *eve
  	GetStretchHandleData(startPos);
  
  	vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio);
@@ -11,7 +11,7 @@
  
  	mouseOverItems = SelectedAtPos(startPos);
  	vec2_zero(&lastMoveOffset);
-@@ -789,8 +789,8 @@ void OBSBasicPreview::ClampAspect(vec3 &
+@@ -1159,8 +1159,8 @@ void OBSBasicPreview::ClampAspect(vec3 &tl, vec3 &br, 
  			size.y = size.x / baseAspect * -1.0f;
  	}
  
@@ -22,32 +22,7 @@
  
  	if (stretchFlags & ITEM_LEFT)
  		tl.x = br.x - size.x;
-@@ -936,18 +936,18 @@ void OBSBasicPreview::CropItem(const vec
- 	crop = startCrop;
- 
- 	if (stretchFlags & ITEM_LEFT)
--		crop.left += int(std::round(tl.x / scale.x));
-+		crop.left += int(::round(tl.x / scale.x));
- 	else if (stretchFlags & ITEM_RIGHT)
--		crop.right += int(std::round((stretchItemSize.x - br.x) / scale.x));
-+		crop.right += int(::round((stretchItemSize.x - br.x) / scale.x));
- 
- 	if (stretchFlags & ITEM_TOP)
--		crop.top += int(std::round(tl.y / scale.y));
-+		crop.top += int(::round(tl.y / scale.y));
- 	else if (stretchFlags & ITEM_BOTTOM)
--		crop.bottom += int(std::round((stretchItemSize.y - br.y) / scale.y));
-+		crop.bottom += int(::round((stretchItemSize.y - br.y) / scale.y));
- 
- 	vec3_transform(&newPos, &newPos, &itemToScreen);
--	newPos.x = std::round(newPos.x);
--	newPos.y = std::round(newPos.y);
-+	newPos.x = ::round(newPos.x);
-+	newPos.y = ::round(newPos.y);
- 
- #if 0
- 	vec3 curPos;
-@@ -1032,7 +1032,7 @@ void OBSBasicPreview::StretchItem(const 
+@@ -1401,7 +1401,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
  	vec3_transform(&pos3, &pos3, &itemToScreen);
  
  	vec2 newPos;
@@ -56,7 +31,7 @@
  	obs_sceneitem_set_pos(stretchItem, &newPos);
  }
  
-@@ -1059,8 +1059,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo
+@@ -1428,8 +1428,8 @@ void OBSBasicPreview::mouseMoveEvent(QMouseEvent *even
  			mouseOverItems = SelectedAtPos(startPos);
  		}
  
@@ -66,4 +41,4 @@
 +		pos.y = ::round(pos.y);
  
  		if (stretchHandle != ItemHandle::None) {
- 			if (cropping)
+ 			selectionBox = false;
diff --git a/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h b/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h
deleted file mode 100644
index d9d6661f87cd..000000000000
--- a/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/obs-outputs/net-if.h.orig	2017-10-25 18:45:20 UTC
-+++ plugins/obs-outputs/net-if.h
-@@ -49,6 +49,7 @@
- #      undef ___NET_IF_GNU_SOURCE__
- #      undef _GNU_SOURCE
- #    endif
-+#    include <netinet/in.h>
- #  endif
- 
- #endif
diff --git a/multimedia/obs-studio/pkg-plist b/multimedia/obs-studio/pkg-plist
index a8e6dfea335c..72f7d184431a 100644
--- a/multimedia/obs-studio/pkg-plist
+++ b/multimedia/obs-studio/pkg-plist
@@ -139,7 +139,9 @@ share/obs/libobs/opaque.effect
 share/obs/libobs/premultiplied_alpha.effect
 share/obs/libobs/repeat.effect
 share/obs/libobs/solid.effect
+share/obs/obs-plugins/obs-%%LUA_LIBDIR%%fdk/locale/bg-BG.ini
 share/obs/obs-plugins/decklink-ouput-ui/.keepme
+share/obs/obs-plugins/frontend-tools/locale/af-ZA.ini
 share/obs/obs-plugins/frontend-tools/locale/ar-SA.ini
 share/obs/obs-plugins/frontend-tools/locale/bg-BG.ini
 share/obs/obs-plugins/frontend-tools/locale/bn-BD.ini
@@ -157,6 +159,7 @@ share/obs/obs-plugins/frontend-tools/locale/fi-FI.ini
 share/obs/obs-plugins/frontend-tools/locale/fil-PH.ini
 share/obs/obs-plugins/frontend-tools/locale/fr-FR.ini
 share/obs/obs-plugins/frontend-tools/locale/gd-GB.ini
+share/obs/obs-plugins/frontend-tools/locale/gl-ES.ini
 share/obs/obs-plugins/frontend-tools/locale/he-IL.ini
 share/obs/obs-plugins/frontend-tools/locale/hr-HR.ini
 share/obs/obs-plugins/frontend-tools/locale/hu-HU.ini
@@ -174,6 +177,7 @@ share/obs/obs-plugins/frontend-tools/locale/pt-BR.ini
 share/obs/obs-plugins/frontend-tools/locale/pt-PT.ini
 share/obs/obs-plugins/frontend-tools/locale/ro-RO.ini
 share/obs/obs-plugins/frontend-tools/locale/ru-RU.ini
+share/obs/obs-plugins/frontend-tools/locale/sl-SI.ini
 share/obs/obs-plugins/frontend-tools/locale/sk-SK.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-CS.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-SP.ini
@@ -193,6 +197,7 @@ share/obs/obs-plugins/frontend-tools/scripts/clock-source/minute.png
 share/obs/obs-plugins/frontend-tools/scripts/clock-source/second.png
 share/obs/obs-plugins/frontend-tools/scripts/countdown.lua
 share/obs/obs-plugins/frontend-tools/scripts/instant-replay.lua
+share/obs/obs-plugins/frontend-tools/scripts/pause-scene.lua
 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/bg-BG.ini
@@ -577,6 +582,7 @@ share/obs/obs-plugins/obs-outputs/locale/en-US.ini
 share/obs/obs-plugins/obs-outputs/locale/es-ES.ini
 share/obs/obs-plugins/obs-outputs/locale/et-EE.ini
 share/obs/obs-plugins/obs-outputs/locale/eu-ES.ini
+share/obs/obs-plugins/obs-outputs/locale/fa-IR.ini
 share/obs/obs-plugins/obs-outputs/locale/fi-FI.ini
 share/obs/obs-plugins/obs-outputs/locale/fil-PH.ini
 share/obs/obs-plugins/obs-outputs/locale/fr-FR.ini
@@ -645,6 +651,7 @@ share/obs/obs-plugins/obs-transitions/locale/pt-PT.ini
 share/obs/obs-plugins/obs-transitions/locale/ro-RO.ini
 share/obs/obs-plugins/obs-transitions/locale/ru-RU.ini
 share/obs/obs-plugins/obs-transitions/locale/sk-SK.ini
+share/obs/obs-plugins/obs-transitions/locale/sl-SI.ini
 share/obs/obs-plugins/obs-transitions/locale/sr-CS.ini
 share/obs/obs-plugins/obs-transitions/locale/sr-SP.ini
 share/obs/obs-plugins/obs-transitions/locale/sv-SE.ini
@@ -740,6 +747,7 @@ share/obs/obs-plugins/obs-x264/locale/vi-VN.ini
 share/obs/obs-plugins/obs-x264/locale/zh-CN.ini
 share/obs/obs-plugins/obs-x264/locale/zh-TW.ini
 share/obs/obs-plugins/rtmp-services/locale/ar-SA.ini
+share/obs/obs-plugins/rtmp-services/locale/bg-BG.ini
 share/obs/obs-plugins/rtmp-services/locale/bn-BD.ini
 share/obs/obs-plugins/rtmp-services/locale/ca-ES.ini
 share/obs/obs-plugins/rtmp-services/locale/cs-CZ.ini
@@ -750,6 +758,7 @@ share/obs/obs-plugins/rtmp-services/locale/en-US.ini
 share/obs/obs-plugins/rtmp-services/locale/es-ES.ini
 share/obs/obs-plugins/rtmp-services/locale/et-EE.ini
 share/obs/obs-plugins/rtmp-services/locale/eu-ES.ini
+share/obs/obs-plugins/rtmp-services/locale/fa-IR.ini
 share/obs/obs-plugins/rtmp-services/locale/fi-FI.ini
 share/obs/obs-plugins/rtmp-services/locale/fil-PH.ini
 share/obs/obs-plugins/rtmp-services/locale/fr-FR.ini
@@ -839,6 +848,7 @@ share/obs/obs-studio/license/gplv2.txt
 share/obs/obs-studio/locale.ini
 share/obs/obs-studio/locale/af-ZA.ini
 share/obs/obs-studio/locale/ar-SA.ini
+share/obs/obs-studio/locale/az-AZ.ini
 share/obs/obs-studio/locale/bg-BG.ini
 share/obs/obs-studio/locale/bn-BD.ini
 share/obs/obs-studio/locale/ca-ES.ini
@@ -913,6 +923,7 @@ share/obs/obs-studio/themes/Dark.qss
 share/obs/obs-studio/themes/Dark/down.svg
 share/obs/obs-studio/themes/Dark/expand.svg
 share/obs/obs-studio/themes/Dark/locked.svg
+share/obs/obs-studio/themes/Dark/media-pause.svg
 share/obs/obs-studio/themes/Dark/minus.svg
 share/obs/obs-studio/themes/Dark/mute.svg
 share/obs/obs-studio/themes/Dark/no_sources.svg