From 00072c4d574db125823504ec19410e7aec57d58e Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Oct 06 2017 17:33:42 +0000 Subject: add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) --- diff --git a/fix_x86_TEXTREL.patch b/fix_x86_TEXTREL.patch new file mode 100644 index 0000000..877db23 --- /dev/null +++ b/fix_x86_TEXTREL.patch @@ -0,0 +1,23 @@ +From 560f9cdf78d3d03dbf97be638becd1a7df5fa154 Mon Sep 17 00:00:00 2001 +From: Lenny Komow +Date: Fri, 6 Oct 2017 11:13:15 -0600 +Subject: [PATCH] loader: Fix TEXTREL on 32-bit linux loader + +Change-Id: I5fc568ce0ad17c280c484f37b2797eead08169b3 +--- + loader/unknown_ext_chain_gas.asm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm +index 798760bd8..aca92ea5b 100644 +--- a/loader/unknown_ext_chain_gas.asm ++++ b/loader/unknown_ext_chain_gas.asm +@@ -89,7 +89,7 @@ vkPhysDevExtTermin\num: + terminError\num: + mov eax, [eax + INSTANCE_OFFSET_ICD_TERM] # Load the loader_instance into eax + push [eax + (HASH_OFFSET_INSTANCE + (HASH_SIZE * \num) + FUNC_NAME_OFFSET_HASH)] # Push the func name (fifth arg) +- push offset termin_error_string # Push the error string (fourth arg) ++ push offset termin_error_string@GOT # Push the error string (fourth arg) + push 0 # Push zero (third arg) + push VK_DEBUG_REPORT_ERROR_BIT_EXT # Push the error logging bit (second arg) + push eax # Push the loader_instance (first arg) diff --git a/vulkan.spec b/vulkan.spec index 8adc43f..7d71419 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -16,9 +16,9 @@ Name: vulkan Version: 1.0.61.1 %if 0%{?use_git} -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Vulkan loader and validation layers @@ -36,6 +36,7 @@ Source3: %url/%{srcname3}/archive/%{commit3}.tar.gz#/%{srcname3}-%{commit Patch0: 0003-layers-Don-t-set-an-rpath.patch Patch1: 0008-demos-Don-t-build-tri-or-cube.patch +Patch2: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -179,6 +180,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Fri Oct 06 2017 Leigh Scott - 1.0.61.1-2 +- add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) + * Thu Sep 21 2017 Leigh Scott - 1.0.61.1-1 - Update to 1.0.61.1 release (rhbz 1493425)