[packages/obs-studio] - up to 26.1.1

[mrozowik]

commit 1c30f22397f74da7864ae7ff1084e31e8e1ce3a8
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Mar 6 00:23:06 2021 +0000

    - up to 26.1.1

 obs-studio-build.patch | 11 -----------
 obs-studio-pc.patch    | 11 -----------
 obs-studio.spec        | 16 +++++++---------
 3 files changed, 7 insertions(+), 31 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 9572326..c4b9b98 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,16 +1,14 @@
 Summary:	OBS Studio - live streaming and screen recording software
 Summary(pl.UTF-8):	OBS Studio - oprogramowanie do przesyłania strumieni na żywo i nagrywania ekranu
 Name:		obs-studio
-Version:	23.2.1
-Release:	3
+Version:	26.1.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 #Source0Download: https://github.com/obsproject/obs-studio/releases
 Source0:	https://github.com/jp9000/obs-studio/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	62075963ae4e08a5b0078ec0e4f411a6
+# Source0-md5:	a883b1d7c691e518cdd88c3b0072184b
 Patch0:		libobs_link.patch
-Patch1:		%{name}-build.patch
-Patch2:		%{name}-pc.patch
 URL:		https://obsproject.com/
 BuildRequires:	ImageMagick-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -79,8 +77,6 @@ Pliki nagłówkowe OBS Studio.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 install -d build
@@ -88,6 +84,7 @@ cd build
 
 export OBS_MULTIARCH_SUFFIX="%(echo "%{_lib}" | sed -e 's/^lib//')"
 %cmake .. \
+	-DUNIX_STRUCTURE=1 \
 	-DOBS_VERSION_OVERRIDE=%{version}
 
 %{__make}
@@ -102,7 +99,7 @@ builddir="$(pwd)"
 
 cd $RPM_BUILD_ROOT
 reldatadir="$(echo %{_datadir} | sed -e 's,^/,,')"
-for f in $reldatadir/obs/obs-studio/locale/??*-??.ini $reldatadir/obs/obs-plugins/*/locale/??*-??.ini ; do
+for f in $reldatadir/obs/obs-studio/locale/??*-??*.ini $reldatadir/obs/obs-plugins/*/locale/??*-??*.ini ; do
 	locale="$(basename "$f" .ini | tr - _)"
 	case "$locale" in
 	  en_US)
@@ -120,7 +117,7 @@ for f in $reldatadir/obs/obs-studio/locale/??*-??.ini $reldatadir/obs/obs-plugin
 done > "$builddir/%{name}.lang"
 
 # dir guard
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/obs/obs-plugins/decklink-ouput-ui/.keepme
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/obs/obs-plugins/{decklink-captions,decklink-ouput-ui}/.keepme
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,6 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libobs-scripting.so
 
 %dir %{_libdir}/obs-plugins
+%attr(755,root,root) %{_libdir}/obs-plugins/decklink-captions.so
 %attr(755,root,root) %{_libdir}/obs-plugins/decklink-ouput-ui.so
 %attr(755,root,root) %{_libdir}/obs-plugins/frontend-tools.so
 %attr(755,root,root) %{_libdir}/obs-plugins/image-source.so
diff --git a/obs-studio-build.patch b/obs-studio-build.patch
deleted file mode 100644
index a4f3a1b..0000000
--- a/obs-studio-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN obs-studio-21.0.1.orig/UI/frontend-plugins/frontend-tools/scripts.cpp obs-studio-21.0.1/UI/frontend-plugins/frontend-tools/scripts.cpp
---- obs-studio-21.0.1.orig/UI/frontend-plugins/frontend-tools/scripts.cpp	2018-01-23 01:44:22.000000000 +0100
-+++ obs-studio-21.0.1/UI/frontend-plugins/frontend-tools/scripts.cpp	2019-01-14 10:58:20.471181467 +0100
-@@ -2,6 +2,7 @@
- #include "frontend-tools-config.h"
- #include "../../properties-view.hpp"
- 
-+#include <QAction>
- #include <QFileDialog>
- #include <QPlainTextEdit>
- #include <QHBoxLayout>
diff --git a/obs-studio-pc.patch b/obs-studio-pc.patch
deleted file mode 100644
index 41978e0..0000000
--- a/obs-studio-pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obs-studio-23.2.1/libobs/CMakeLists.txt.orig	2019-08-09 15:59:30.144543059 +0200
-+++ obs-studio-23.2.1/libobs/CMakeLists.txt	2019-08-09 16:56:15.799426378 +0200
-@@ -454,7 +454,7 @@
- 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
- 	endforeach()
- 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
--	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${OBS_LIBRARY_DESTINATION}/pkgconfig")
- endif()
- 
- set_target_properties(libobs PROPERTIES
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/1c30f22397f74da7864ae7ff1084e31e8e1ce3a8