From 48a9d48e5fbb9ffc9321439c6be404c6e01719dd Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 30 Apr 2021 14:25:16 +0200 Subject: [PATCH] Fix the build on 32 bit arches --- 250.patch | 25 +++++++++++++++++++++++++ libepoxy.spec | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 250.patch diff --git a/250.patch b/250.patch new file mode 100644 index 0000000..fffc301 --- /dev/null +++ b/250.patch @@ -0,0 +1,25 @@ +From 1403303e77ce0c5a4d4c52d6a3b2a820f47241ee Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Fri, 30 Apr 2021 12:15:25 +0100 +Subject: [PATCH] Remove redeclaration of khronos_uintptr_t + +The type is being redeclared because I didn't see the original +declaration when I wrote 144cbc9325250081f2eb584ca5deb13aaf1c2433. + +Fixes: #249 +--- + src/gen_dispatch.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py +index b686824..3daad84 100755 +--- a/src/gen_dispatch.py ++++ b/src/gen_dispatch.py +@@ -535,7 +535,6 @@ def write_header(self, out_file): + self.outln(' KHRONOS_TRUE = 1,') + self.outln(' KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM') + self.outln('} khronos_boolean_enum_t;') +- self.outln('typedef uintptr_t khronos_uintptr_t;') + + if self.target == "glx": + self.outln('#include ') diff --git a/libepoxy.spec b/libepoxy.spec index bc3c828..4858421 100644 --- a/libepoxy.spec +++ b/libepoxy.spec @@ -6,6 +6,10 @@ License: MIT URL: https://github.com/anholt/libepoxy Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +# Backported from upstream +# https://github.com/anholt/libepoxy/pull/250 +Patch0: 250.patch + BuildRequires: meson BuildRequires: gcc BuildRequires: pkgconfig(gl)