- v4l fix is needed only on x32

diff --git a/obs-studio.spec b/obs-studio.spec
index 1f0727b946bc18cbc484b7916621b599d802f0e8..0768523270e257ff8d187e2190ce0e9b162e4359 100644 (file)
--- 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 d3cf004bba450e0e72840ba666a27d97eab1391b..1acd8ebddf32c44afca9725db1ec91b55899c972 100644 (file)
--- 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 (file)
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);
+