From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 4 Nov 2023 23:37:00 +0000 (+0100)
Subject: - fix type confusion on non-x8664 archs
X-Git-Tag: auto/th/obs-studio-29.1.3-1~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=20a089434124cefc0d083c3bfaa4b5644f632018;p=packages%2Fobs-studio.git

- fix type confusion on non-x8664 archs
- really no lua on x32
---

diff --git a/obs-studio.spec b/obs-studio.spec
index 0467290..1f0727b 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -10,13 +10,16 @@ Group:		X11/Applications/Multimedia
 Source0:	https://github.com/jp9000/obs-studio/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	5597636f9c66342566f47d68aa4c6693
 Patch0:		disable-missing-plugins.patch
+Patch1:		size_t.patch
 URL:		https://obsproject.com/
 BuildRequires:	ImageMagick-devel
 BuildRequires:	OpenGL-GLX-devel
-BuildRequires:	Qt6Core-devel >= 5
-BuildRequires:	Qt6Gui-devel >= 5
-BuildRequires:	Qt6Svg-devel >= 5
-BuildRequires:	Qt6Widgets-devel >= 5
+BuildRequires:	Qt6Core-devel
+BuildRequires:	Qt6Gui-devel
+BuildRequires:	Qt6Network-devel
+BuildRequires:	Qt6Svg-devel
+BuildRequires:	Qt6Widgets-devel
+BuildRequires:	Qt6Xml-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	curl-devel
@@ -79,6 +82,7 @@ Pliki nagłówkowe OBS Studio.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -106,6 +110,9 @@ export OBS_MULTIARCH_SUFFIX="%(echo "%{_lib}" | sed -e 's/^lib//')"
 	-DCMAKE_SKIP_RPATH=1 \
 	-DOBS_VERSION_OVERRIDE=%{version} \
 	-DENABLE_AJA=OFF \
+%ifarch x32
+	-DENABLE_SCRIPTING_LUA=OFF \
+%endif
 	-DBUILD_BROWSER=OFF
 
 %{__make}
diff --git a/size_t.patch b/size_t.patch
new file mode 100644
index 0000000..d3cf004
--- /dev/null
+++ b/size_t.patch
@@ -0,0 +1,39 @@
+--- obs-studio-29.1.3/libobs/obs.c~	2023-06-19 00:05:22.000000000 +0200
++++ obs-studio-29.1.3/libobs/obs.c	2023-11-05 00:28:11.859696298 +0100
+@@ -873,7 +873,11 @@
+ 		obs->video.mixes.array[i] = NULL;
+ 	}
+ 	if (num_views > 0)
++#ifdef __ILP32__
++		blog(LOG_WARNING, "Number of remaining views: %d", num_views);
++#else
+ 		blog(LOG_WARNING, "Number of remaining views: %ld", num_views);
++#endif
+ 	pthread_mutex_unlock(&obs->video.mixes_mutex);
+ 
+ 	pthread_mutex_destroy(&obs->video.mixes_mutex);
+--- obs-studio-29.1.3/libobs-opengl/gl-egl-common.c~	2023-06-19 00:05:22.000000000 +0200
++++ obs-studio-29.1.3/libobs-opengl/gl-egl-common.c	2023-11-05 00:30:13.543492738 +0100
+@@ -373,7 +373,7 @@
+ 		return false;
+ 	}
+ 	if (!query_dmabuf_modifiers(egl_display, drm_format, modifiers,
+-				    n_modifiers)) {
++				    (EGLuint64KHR *)n_modifiers)) {
+ 		*n_modifiers = 0;
+ 		*modifiers = NULL;
+ 		return false;
+--- obs-studio-29.1.3/plugins/linux-v4l2/v4l2-input.c~	2023-06-19 00:05:22.000000000 +0200
++++ obs-studio-29.1.3/plugins/linux-v4l2/v4l2-input.c	2023-11-05 00:32:37.108931868 +0100
+@@ -259,7 +259,11 @@
+ 		}
+ 
+ 		blog(LOG_DEBUG,
++#ifdef __ILP32__
++		     "%s: ts: %06lld buf id #%d, flags 0x%08X, seq #%d, len %d, used %d",
++#else
+ 		     "%s: ts: %06ld buf id #%d, flags 0x%08X, seq #%d, len %d, used %d",
++#endif
+ 		     data->device_id, buf.timestamp.tv_usec, buf.index,
+ 		     buf.flags, buf.sequence, buf.length, buf.bytesused);
+