fix build on x32

diff --git a/vlc.spec b/vlc.spec
index dfae782b5004c8b32b57c489136518963184b8eb..17c8991ccea425006c7f5a2c3e571a6543dc4323 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -84,6 +84,7 @@ Patch4:               no-cache.patch
 Patch5:                %{name}-fdk_aac.patch
 Patch7:                %{name}-vsxu.patch
 Patch8:                qt-5.15.patch
+Patch9:                x32.patch
 Patch11:       opencv4.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
@@ -430,6 +431,7 @@ Akcje klienta VLC dla Solid.
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch11 -p1
 
 %build

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..28a1a6b
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- vlc-3.0.18/src/linux/thread.c.orig 2022-05-31 18:10:59.000000000 +0200
++++ vlc-3.0.18/src/linux/thread.c      2022-12-02 22:42:09.213075307 +0100
+@@ -59,8 +59,9 @@
+      */
+     static_assert (sizeof (time_t) == sizeof (long) || sizeof (time_t) == 8,
+                    "Unrecognised time_t type definition");
+-
+-#if !defined (__NR_futex)
++#if defined(__x86_64__) && defined(__ILP32__)
++    const long num = __NR_futex;
++#elif !defined (__NR_futex)
+     /* Recent 32-bit platforms (e.g. riscv32) only support 64-bit time_t. */
+     static_assert (sizeof (time_t) == 8, "Expected 64-bit time_t");
+     const long num = __NR_futex_time64;