Hello community, here is the log from the commit of package vulkan-loader for openSUSE:Factory checked in at 2018-12-10 12:26:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-loader (Old) and /work/SRC/openSUSE:Factory/.vulkan-loader.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-loader" Mon Dec 10 12:26:29 2018 rev:2 rq:653798 version:1.1.94 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-loader/vulkan-loader.changes 2018-11-27 10:39:46.504357413 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-loader.new.19453/vulkan-loader.changes 2018-12-10 12:26:30.874636276 +0100 @@ -1,0 +2,7 @@ +Sun Dec 2 15:19:57 UTC 2018 - Jan Engelhardt <[email protected]> + +- Update to new upstream release 1.1.94 + * loader: Fix unwrapped loader instance being used + * loader: Fix double free when enabling override + +------------------------------------------------------------------- Old: ---- Vulkan-Loader-1.1.91.tar.xz New: ---- Vulkan-Loader-1.1.94.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-loader.spec ++++++ --- /var/tmp/diff_new_pack.n5xNSZ/_old 2018-12-10 12:26:31.342635809 +0100 +++ /var/tmp/diff_new_pack.n5xNSZ/_new 2018-12-10 12:26:31.346635805 +0100 @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define version_unconverted 1.1.91 +%define version_unconverted 1.1.94 Name: vulkan-loader %define lname libvulkan1 -Version: 1.1.91 +Version: 1.1.94 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 @@ -31,10 +31,10 @@ Source9: baselibs.conf BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: vulkan-headers >= %version -BuildRequires: pkgconfig(pciaccess) BuildRequires: pkg-config BuildRequires: python3-base +BuildRequires: vulkan-headers >= %version +BuildRequires: pkgconfig(pciaccess) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) ++++++ Vulkan-Loader-1.1.91.tar.xz -> Vulkan-Loader-1.1.94.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/.travis.yml new/Vulkan-Loader-1.1.94/.travis.yml --- old/Vulkan-Loader-1.1.91/.travis.yml 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/.travis.yml 2018-11-29 00:52:59.000000000 +0100 @@ -52,8 +52,6 @@ fi - | if [[ "$VULKAN_BUILD_TARGET" == "MACOS" ]]; then - # We need to uninstall oclint or we get a gcc conflict when upgrading python - brew cask uninstall oclint # We need to upgrade to a newer python brew upgrade python3 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/loader/loader.c new/Vulkan-Loader-1.1.94/loader/loader.c --- old/Vulkan-Loader-1.1.91/loader/loader.c 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/loader/loader.c 2018-11-29 00:52:59.000000000 +0100 @@ -1589,7 +1589,7 @@ .tm_min = prop->expiration.minute, .tm_hour = prop->expiration.hour, .tm_mday = prop->expiration.day, - .tm_mon = prop->expiration.month, + .tm_mon = prop->expiration.month - 1, .tm_year = prop->expiration.year - 1900, .tm_isdst = tm_current.tm_isdst, // wday and yday are ignored by mktime @@ -2694,7 +2694,7 @@ } props->is_override = true; - expiration = cJSON_GetObjectItem(layer_node, "expiration"); + expiration = cJSON_GetObjectItem(layer_node, "expiration_date"); if (NULL != expiration) { char date_copy[32]; uint8_t cur_item = 0; @@ -2703,7 +2703,7 @@ temp = cJSON_Print(expiration); if (temp == NULL) { loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, - "Problem accessing layer value 'expiration' in manifest JSON file, skipping this layer"); + "Problem accessing layer value 'expiration_date' in manifest JSON file, skipping this layer"); result = VK_ERROR_OUT_OF_HOST_MEMORY; goto out; } @@ -2955,10 +2955,10 @@ if (vkGetInstanceProcAddr != NULL) { strncpy(props->functions.str_gipa, vkGetInstanceProcAddr, sizeof(props->functions.str_gipa)); if (version.major > 1 || version.minor >= 1) { - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, + loader_log(inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, "Layer \"%s\" using deprecated \'vkGetInstanceProcAddr\' tag which was deprecated starting with JSON " - "file version 1.1.0. Instead, use the new vkNegotiateLayerInterfaceVersion function to return the " - "GetInstanceProcAddr function for this layer.", + "file version 1.1.0. The new vkNegotiateLayerInterfaceVersion function is preferred, though for " + "compatibility reasons it may be desirable to continue using the deprecated tag.", name); } } @@ -2966,10 +2966,10 @@ if (vkGetDeviceProcAddr != NULL) { strncpy(props->functions.str_gdpa, vkGetDeviceProcAddr, sizeof(props->functions.str_gdpa)); if (version.major > 1 || version.minor >= 1) { - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, + loader_log(inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, "Layer \"%s\" using deprecated \'vkGetDeviceProcAddr\' tag which was deprecated starting with JSON " - "file version 1.1.0. Instead, use the new vkNegotiateLayerInterfaceVersion function to return the " - "GetDeviceProcAddr function for this layer.", + "file version 1.1.0. The new vkNegotiateLayerInterfaceVersion function is preferred, though for " + "compatibility reasons it may be desirable to continue using the deprecated tag.", name); } } @@ -3579,6 +3579,9 @@ if (rel_size == 0) { goto out; } else { +#if defined(__APPLE__) + search_path_size += MAXPATHLEN; +#endif #ifndef _WIN32 search_path_size += DetermineDataFilePathSize(xdgconfdirs, rel_size); search_path_size += DetermineDataFilePathSize(xdgdatadirs, rel_size); @@ -3611,6 +3614,24 @@ } else { #ifndef _WIN32 if (rel_size > 0) { +#if defined(__APPLE__) + // Add the bundle's Resources dir to the beginning of the search path. + // Looks for manifests in the bundle first, before any system directories. + CFBundleRef main_bundle = CFBundleGetMainBundle(); + if (NULL != main_bundle) { + CFURLRef ref = CFBundleCopyResourcesDirectoryURL(main_bundle); + if (NULL != ref) { + if (CFURLGetFileSystemRepresentation(ref, TRUE, (UInt8 *)cur_path_ptr, search_path_size)) { + cur_path_ptr += strlen(cur_path_ptr); + *cur_path_ptr++ = DIRECTORY_SYMBOL; + memcpy(cur_path_ptr, relative_location, rel_size); + cur_path_ptr += rel_size; + *cur_path_ptr++ = PATH_SEPARATOR; + } + CFRelease(ref); + } + } +#endif CopyDataFilePath(xdgconfdirs, relative_location, rel_size, &cur_path_ptr); CopyDataFilePath(SYSCONFDIR, relative_location, rel_size, &cur_path_ptr); #if defined(EXTRASYSCONFDIR) @@ -3780,6 +3801,7 @@ for (uint32_t i = 0; i < out_files->count; i++) { if (NULL != out_files->filename_list[i]) { loader_instance_heap_free(inst, out_files->filename_list[i]); + out_files->filename_list[i] = NULL; } } loader_instance_heap_free(inst, out_files->filename_list); @@ -4275,6 +4297,7 @@ res = loaderAddLayerProperties(inst, instance_layers, json, true, file_str); loader_instance_heap_free(inst, file_str); + manifest_files.filename_list[i] = NULL; cJSON_Delete(json); if (VK_ERROR_OUT_OF_HOST_MEMORY == res) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/loader/trampoline.c new/Vulkan-Loader-1.1.94/loader/trampoline.c --- old/Vulkan-Loader-1.1.91/loader/trampoline.c 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/loader/trampoline.c 2018-11-29 00:52:59.000000000 +0100 @@ -849,7 +849,7 @@ // Initialize WSI device extensions as part of core dispatch since loader // has dedicated trampoline code for these loader_init_device_extension_dispatch_table(&dev->loader_dispatch, inst->disp->layer_inst_disp.GetInstanceProcAddr, - dev->loader_dispatch.core_dispatch.GetDeviceProcAddr, (VkInstance)inst, *pDevice); + dev->loader_dispatch.core_dispatch.GetDeviceProcAddr, inst->instance, *pDevice); out: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/scripts/common_codegen.py new/Vulkan-Loader-1.1.94/scripts/common_codegen.py --- old/Vulkan-Loader-1.1.91/scripts/common_codegen.py 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/scripts/common_codegen.py 2018-11-29 00:52:59.000000000 +0100 @@ -52,7 +52,6 @@ 'fuchsia' : 'VK_USE_PLATFORM_FUCHSIA', 'ios' : 'VK_USE_PLATFORM_IOS_MVK', 'macos' : 'VK_USE_PLATFORM_MACOS_MVK', - 'mir' : 'VK_USE_PLATFORM_MIR_KHR', 'vi' : 'VK_USE_PLATFORM_VI_NN', 'wayland' : 'VK_USE_PLATFORM_WAYLAND_KHR', 'win32' : 'VK_USE_PLATFORM_WIN32_KHR', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/scripts/known_good.json new/Vulkan-Loader-1.1.94/scripts/known_good.json --- old/Vulkan-Loader-1.1.91/scripts/known_good.json 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/scripts/known_good.json 2018-11-29 00:52:59.000000000 +0100 @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "369e6ea7f9b8cf0155b183da7e5be1b39ef6138d" + "commit" : "4ca8ea36379b1be079d7f4b80c942af4c3172534" } ], "install_names" : { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/scripts/loader_extension_generator.py new/Vulkan-Loader-1.1.94/scripts/loader_extension_generator.py --- old/Vulkan-Loader-1.1.91/scripts/loader_extension_generator.py 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/scripts/loader_extension_generator.py 2018-11-29 00:52:59.000000000 +0100 @@ -32,7 +32,6 @@ 'VK_KHR_xlib_surface', 'VK_KHR_xcb_surface', 'VK_KHR_wayland_surface', - 'VK_KHR_mir_surface', 'VK_KHR_win32_surface', 'VK_KHR_android_surface', 'VK_MVK_macos_surface', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.91/scripts/update_deps.py new/Vulkan-Loader-1.1.94/scripts/update_deps.py --- old/Vulkan-Loader-1.1.91/scripts/update_deps.py 2018-11-06 22:16:30.000000000 +0100 +++ new/Vulkan-Loader-1.1.94/scripts/update_deps.py 2018-11-29 00:52:59.000000000 +0100 @@ -306,9 +306,9 @@ self.build_dir = None self.install_dir = None if json.get('build_dir'): - self.build_dir = json['build_dir'] + self.build_dir = os.path.normpath(json['build_dir']) if json.get('install_dir'): - self.install_dir = json['install_dir'] + self.install_dir = os.path.normpath(json['install_dir']) self.deps = json['deps'] if ('deps' in json) else [] self.prebuild = json['prebuild'] if ('prebuild' in json) else [] self.prebuild_linux = json['prebuild_linux'] if ( @@ -520,6 +520,8 @@ This information is baked into the CMake files of the home repo and so this dictionary is kept with the repo via the json file. """ + def escape(path): + return path.replace('\\', '\\\\') install_names = GetInstallNames(args) with open(filename, 'w') as helper_file: for repo in repos: @@ -527,7 +529,7 @@ helper_file.write('set({var} "{dir}" CACHE STRING "" FORCE)\n' .format( var=install_names[repo.name], - dir=repo.install_dir)) + dir=escape(repo.install_dir))) def main(): ++++++ _service ++++++ --- /var/tmp/diff_new_pack.n5xNSZ/_old 2018-12-10 12:26:31.650635501 +0100 +++ /var/tmp/diff_new_pack.n5xNSZ/_new 2018-12-10 12:26:31.650635501 +0100 @@ -2,9 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/KhronosGroup/Vulkan-Loader</param> - <param name="revision">6b6b0cf381226bbf4aa39ba8c7cf3ceb463acf04</param> - <param name="parent-tag">6b6b0cf381226bbf4aa39ba8c7cf3ceb463acf04</param> - <param name="versionformat">1.1.91</param> + <param name="revision">b9b384a6747a7b82fae30cfa356e36f49897502c</param> + <param name="parent-tag">b9b384a6747a7b82fae30cfa356e36f49897502c</param> + <param name="versionformat">1.1.94</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param>
