commit 922eb03edfd084d3a2260ce614203c80203b86d1
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Nov 5 00:51:33 2023 +0100
- v4l fix is needed only on x32
obs-studio.spec | 4 ++++
size_t.patch | 14 --------------
x32.patch | 14 ++++++++++++++
3 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 1f0727b..0768523 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -11,6 +11,7 @@ Source0:
https://github.com/jp9000/obs-studio/archive/%{version}/%{name}-%{versi
# Source0-md5: 5597636f9c66342566f47d68aa4c6693
Patch0: disable-missing-plugins.patch
Patch1: size_t.patch
+Patch2: x32.patch
URL: https://obsproject.com/
BuildRequires: ImageMagick-devel
BuildRequires: OpenGL-GLX-devel
@@ -83,6 +84,9 @@ Pliki nagłówkowe OBS Studio.
%setup -q
%patch0 -p1
%patch1 -p1
+%ifarch x32
+%patch2 -p1
+%endif
%build
install -d build
diff --git a/size_t.patch b/size_t.patch
index d3cf004..1acd8eb 100644
--- a/size_t.patch
+++ b/size_t.patch
@@ -23,17 +23,3 @@
*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);
-
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..a6c04e7
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- 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);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/922eb03edfd084d3a2260ce614203c80203b86d1
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
