pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vulkan-loader: Update to 1.3.296
Module Name: pkgsrc-wip
Committed By: Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By: frederic
Date: Tue Nov 26 22:51:35 2024 +0100
Changeset: ed437185ad0c72a847bfe1d9a7ac348cd2598228
Modified Files:
vulkan-loader/Makefile
vulkan-loader/PLIST
vulkan-loader/distinfo
Added Files:
vulkan-loader/COMMIT_MSG
Removed Files:
vulkan-loader/patches/patch-CMakeLists.txt
vulkan-loader/patches/patch-loader_CMakeLists.txt
vulkan-loader/patches/patch-loader_loader.c
vulkan-loader/patches/patch-loader_vk__loader__platform.h
vulkan-loader/patches/patch-tests_test__common.h
Log Message:
vulkan-loader: Update to 1.3.296
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed437185ad0c72a847bfe1d9a7ac348cd2598228
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vulkan-loader/COMMIT_MSG | 8 ++++
vulkan-loader/Makefile | 15 ++++---
vulkan-loader/PLIST | 5 ++-
vulkan-loader/distinfo | 11 ++---
vulkan-loader/patches/patch-CMakeLists.txt | 46 --------------------
vulkan-loader/patches/patch-loader_CMakeLists.txt | 50 ----------------------
vulkan-loader/patches/patch-loader_loader.c | 31 --------------
.../patches/patch-loader_vk__loader__platform.h | 37 ----------------
vulkan-loader/patches/patch-tests_test__common.h | 13 ------
9 files changed, 23 insertions(+), 193 deletions(-)
diffs:
diff --git a/vulkan-loader/COMMIT_MSG b/vulkan-loader/COMMIT_MSG
new file mode 100644
index 0000000000..45fe488d28
--- /dev/null
+++ b/vulkan-loader/COMMIT_MSG
@@ -0,0 +1,8 @@
+graphics/vulkan-loader: Add to version 1.3.296
+
+Packaged in wip by Niclas Rosenvik
+Update prepared in wip by Frédéric Fauberteau
+
+It is suggested upstream to use sdk tags which are of better quality. The
+version of graphics/vulkan-headers and graphics/vulkan-loader should be the
+same.
diff --git a/vulkan-loader/Makefile b/vulkan-loader/Makefile
index 44555bd0e5..575979fdf2 100644
--- a/vulkan-loader/Makefile
+++ b/vulkan-loader/Makefile
@@ -1,12 +1,11 @@
# $NetBSD$
-GITHUB_PROJECT= Vulkan-Loader
-DISTNAME= sdk-1.2.162.0
-PKGNAME= ${GITHUB_PROJECT:tl}-${DISTNAME:S/sdk-//}
+DISTNAME= vulkan-loader-1.3.296
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=KhronosGroup/}
DIST_SUBDIR= ${GITHUB_PROJECT}
-GITHUB_TAG= ${DISTNAME}
+GITHUB_PROJECT= Vulkan-Loader
+GITHUB_TAG= vulkan-sdk-${PKGVERSION_NOREV}
EXTRACT_USING= bsdtar
MAINTAINER= nros%NetBSD.org@localhost
@@ -14,19 +13,21 @@ HOMEPAGE= https://github.com/KhronosGroup/Vulkan-Loader/
COMMENT= Loader for Vulkan Graphics API
LICENSE= apache-2.0
+WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
USE_TOOLS+= pkg-config
-USE_CMAKE= yes
USE_LANGUAGES= c c++
# wayland support missing in pkgsrc
CMAKE_CONFIGURE_ARGS+= -DBUILD_WSI_WAYLAND_SUPPORT=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
PKGCONFIG_OVERRIDE+= loader/vulkan.pc.in
-.include "../../devel/googletest/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
+
+#.include "../../devel/googletest/buildlink3.mk"
.include "../../lang/python/tool.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../graphics/vulkan-headers/buildlink3.mk"
diff --git a/vulkan-loader/PLIST b/vulkan-loader/PLIST
index 8a6386b86e..d11625e268 100644
--- a/vulkan-loader/PLIST
+++ b/vulkan-loader/PLIST
@@ -1,5 +1,8 @@
@comment $NetBSD$
+lib/cmake/VulkanLoader/VulkanLoaderConfig-noconfig.cmake
+lib/cmake/VulkanLoader/VulkanLoaderConfig.cmake
+lib/cmake/VulkanLoader/VulkanLoaderConfigVersion.cmake
lib/libvulkan.so
lib/libvulkan.so.1
-lib/libvulkan.so.1.2.162
+lib/libvulkan.so.${PKGVERSION}
lib/pkgconfig/vulkan.pc
diff --git a/vulkan-loader/distinfo b/vulkan-loader/distinfo
index 197fe00d5a..aa11b975d1 100644
--- a/vulkan-loader/distinfo
+++ b/vulkan-loader/distinfo
@@ -1,10 +1,5 @@
$NetBSD$
-RMD160 (Vulkan-Loader/sdk-1.2.162.0.tar.gz) = dc8a47de9dcefbe29b6a48b0d9fd914f390c397b
-SHA512 (Vulkan-Loader/sdk-1.2.162.0.tar.gz) = 13e2ff119828cadf87aad0f2c54a577801ff817fcaa10c11e3c2af768a1e2809ffff9b14c63cd0993cc1d9458f06d69b7949ab024eecf8141c794c394e8a6542
-Size (Vulkan-Loader/sdk-1.2.162.0.tar.gz) = 1422604 bytes
-SHA1 (patch-CMakeLists.txt) = 12ac6ae27cbb51d2da4306f72c8e500bbe1a459b
-SHA1 (patch-loader_CMakeLists.txt) = ef042d20d2a01a01ee3df832dfea40c1e4c9f3b7
-SHA1 (patch-loader_loader.c) = 0eba348c6f3146cb0f0ff0c190e17c3f076f12c0
-SHA1 (patch-loader_vk__loader__platform.h) = 6297921cb7eb3717622bd586acc38a7bccf99f3c
-SHA1 (patch-tests_test__common.h) = 8a1a730027929791b7bbc9ffc0172f0fc8aafb73
+BLAKE2s (Vulkan-Loader/vulkan-loader-1.3.296.tar.gz) = 54d2a4343ca548c234c6bb8179d3ceeca6d0495d5b91a46a80a7ae8283abffd6
+SHA512 (Vulkan-Loader/vulkan-loader-1.3.296.tar.gz) = 6a6a6ab8c50acf711b3ba7dfd7d6dffca83e1e7ee1bfa5ee79a2601dafae6e9fa2ae230a8a05db0ab0d4c93cdadf926e2636e8e21cf723c1c17532da3f40d61d
+Size (Vulkan-Loader/vulkan-loader-1.3.296.tar.gz) = 1719181 bytes
diff --git a/vulkan-loader/patches/patch-CMakeLists.txt b/vulkan-loader/patches/patch-CMakeLists.txt
deleted file mode 100644
index 53be45cc55..0000000000
--- a/vulkan-loader/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-* Use cmakes way of setting language standards.
---- CMakeLists.txt.orig 2020-12-01 20:50:08.000000000 +0000
-+++ CMakeLists.txt
-@@ -148,6 +148,13 @@ endif()
-
- option(BUILD_LOADER "Build loader" ON)
-
-+set(CMAKE_C_STANDARD 99)
-+set(CMAKE_C_STANDARD_REQUIRED ON)
-+set(CMAKE_C_VISIBILITY_PRESET "hidden")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
-+
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
- set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp")
-@@ -169,16 +176,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_CO
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -std=c++11 -fno-rtti")
- # clang (not clang-cl) or gcc
- else()
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${COMMON_COMPILE_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILE_FLAGS}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
- endif()
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILE_FLAGS}")
--
-- if(UNIX)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-- endif()
- endif()
-
- if(MSVC)
-@@ -232,7 +234,7 @@ if(BUILD_LOADER)
- add_subdirectory(loader)
- endif()
-
--add_subdirectory(external)
-+#add_subdirectory(external)
- if(BUILD_TESTS)
- add_subdirectory(tests)
- endif()
diff --git a/vulkan-loader/patches/patch-loader_CMakeLists.txt b/vulkan-loader/patches/patch-loader_CMakeLists.txt
deleted file mode 100644
index 79df0f78a9..0000000000
--- a/vulkan-loader/patches/patch-loader_CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-* use CMake findthreads instead of hardcoding -lpthread
-* install pkg-config file on mac
-* set the right libs in Libs.private
---- loader/CMakeLists.txt.orig 2020-12-01 20:50:08.000000000 +0000
-+++ loader/CMakeLists.txt
-@@ -21,6 +21,10 @@ include_directories(${CMAKE_CURRENT_SOUR
- include(CheckFunctionExists)
- include(CheckIncludeFile)
-
-+set(CMAKE_THREAD_PREFER_PTHREAD ON)
-+set(THREADS_PREFER_PTHREAD_FLAG ON)
-+find_package(Threads REQUIRED)
-+
- check_function_exists(secure_getenv HAVE_SECURE_GETENV)
- check_function_exists(__secure_getenv HAVE___SECURE_GETENV)
- if(NOT (HAVE_SECURE_GETENV OR HAVE__SECURE_GETENV))
-@@ -259,7 +263,7 @@ else()
- "1"
- VERSION
- "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
-- target_link_libraries(vulkan ${CMAKE_DL_LIBS} pthread m)
-+ target_link_libraries(vulkan ${CMAKE_DL_LIBS} Threads::Threads m)
- target_link_libraries(vulkan Vulkan::Headers)
- if(APPLE)
- find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation)
-@@ -289,7 +293,7 @@ else()
- add_library(vulkan-framework SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS} ${FRAMEWORK_HEADERS})
- endif()
- add_dependencies(vulkan-framework loader_asm_gen_files)
-- target_link_libraries(vulkan-framework -ldl -lpthread -lm "-framework CoreFoundation")
-+ target_link_libraries(vulkan-framework -ldl Threads::Threads -lm "-framework CoreFoundation")
- target_link_libraries(vulkan-framework Vulkan::Headers)
-
- # The FRAMEWORK_VERSION needs to be "A" here so that Xcode code-signing works when a user adds their framework to an Xcode
-@@ -323,9 +327,12 @@ endif()
- include(FindPkgConfig QUIET)
- if(PKG_CONFIG_FOUND)
- set(VK_API_VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
-- foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-- set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
-+ foreach(LIB ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS} ${CMAKE_DL_LIBS} m)
-+ list(APPEND PRIVATE_LIBS_LIST "-l${LIB}")
- endforeach()
-+ list(APPEND PRIVATE_LIBS_LIST "${CMAKE_THREAD_LIBS_INIT}")
-+ list(REMOVE_DUPLICATES PRIVATE_LIBS_LIST)
-+ list(JOIN PRIVATE_LIBS_LIST " " PRIVATE_LIBS)
- if(WIN32)
- set(LIB_SUFFIX "-1")
- endif ()
diff --git a/vulkan-loader/patches/patch-loader_loader.c b/vulkan-loader/patches/patch-loader_loader.c
deleted file mode 100644
index 1c88d0431e..0000000000
--- a/vulkan-loader/patches/patch-loader_loader.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-* add netbsd support
---- loader/loader.c.orig 2020-12-01 20:50:08.000000000 +0000
-+++ loader/loader.c
-@@ -44,6 +44,8 @@
-
- #if defined(__APPLE__)
- #include <CoreFoundation/CoreFoundation.h>
-+#endif
-+#if defined(__APPLE__) || defined(__NetBSD__)
- #include <sys/param.h>
- #endif
-
-@@ -253,7 +255,7 @@ void *loader_device_heap_realloc(const s
- }
-
- // Environment variables
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__NetBSD__)
-
- static inline bool IsHighIntegrity() {
- return geteuid() != getuid() || getegid() != getgid();
-@@ -268,7 +270,7 @@ static inline char *loader_getenv(const
-
- static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
- char *out;
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__NetBSD__)
- // Apple does not appear to have a secure getenv implementation.
- // The main difference between secure getenv and getenv is that secure getenv
- // returns NULL if the process is being run with elevated privileges by a normal user.
diff --git a/vulkan-loader/patches/patch-loader_vk__loader__platform.h b/vulkan-loader/patches/patch-loader_vk__loader__platform.h
deleted file mode 100644
index a6a5c316b4..0000000000
--- a/vulkan-loader/patches/patch-loader_vk__loader__platform.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-* add netbsd support
---- loader/vk_loader_platform.h.orig 2020-12-01 20:50:08.000000000 +0000
-+++ loader/vk_loader_platform.h
-@@ -35,7 +35,7 @@
- #include "vulkan/vk_platform.h"
- #include "vulkan/vk_sdk_platform.h"
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__NetBSD__)
- /* Linux-specific common code: */
-
- // Headers:
-@@ -122,6 +122,23 @@ static inline char *loader_platform_exec
- buffer[ret] = '\0';
- return buffer;
- }
-+#elif defined(__NetBSD__)
-+#include <sys/sysctl.h>
-+static inline char *loader_platform_executable_path(char *buffer, size_t size) {
-+ int mib[4];
-+ size_t len;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = getpid();
-+ mib[3] = KERN_PROC_PATHNAME;
-+
-+ if (sysctl(mib, 4, NULL, &len, NULL, 0)) return NULL;
-+ if (len > size) return NULL;
-+ if (sysctl(mib, 4, buffer, &len, NULL, 0)) return NULL;
-+
-+ return buffer;
-+}
- #elif defined(__Fuchsia__)
- static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; }
- #endif // defined (__APPLE__)
diff --git a/vulkan-loader/patches/patch-tests_test__common.h b/vulkan-loader/patches/patch-tests_test__common.h
deleted file mode 100644
index 711840acd2..0000000000
--- a/vulkan-loader/patches/patch-tests_test__common.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* add netbsd support
---- tests/test_common.h.orig 2019-09-18 21:32:16.041186928 +0000
-+++ tests/test_common.h
-@@ -105,7 +105,7 @@ static inline void test_error_callback(c
- ADD_FAILURE_AT(file, line) << "Assertion: `" << expr << "'";
- }
-
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__NetBSD__)
- /* Linux-specific common code: */
-
- #include <pthread.h>
Home |
Main Index |
Thread Index |
Old Index