April 2021 - crux-commits

ports/opt (3.6): imagemagick: update to 7.0.11-6
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 7abf6566c4d3f53c3f38eb382b0b74214b60247b Author: Juergen Daubert <jue(a)jue.li> Date: Mon Apr 5 10:59:27 2021 +0200 imagemagick: update to 7.0.11-6 diff --git a/imagemagick/.signature b/imagemagick/.signature index a5df01e45..f8b411dba 100644 --- a/imagemagick/.signature +++ b/imagemagick/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ecrcCFo9nAJIMGOpesJb+C65m6iEHM+MeVFNu1SXDovKwFmLB8cqDmkuiNb9/3Zm0x43RE4B9LJi1ZtVxsY8Qw= -SHA256 (Pkgfile) = cde2305caa3388651fe39aa709d51df83acf133f39e4af956f7ee989646deede +RWSE3ohX2g5d/dNNdDtx5bd9Vvf1vwhzHMmnPSlhkT9vVlIbU4NkHmfRjTjMK8Q8fIidfUz4tpj7lg2RO63cObe2FbgRplVDrQ8= +SHA256 (Pkgfile) = 150c32259410ec1019bb240b9876fb33407c023bc1d677b6e0f5c42c651ea4fc SHA256 (.footprint) = ffc4222a66d64515d907c835a3b1be60abea72c74068f2c7b3ae4d24982b6429 -SHA256 (ImageMagick-7.0.11-5.tar.xz) = 9d2f65d6ee86a7c2a09c451b6d2635e44da3bc4ed3aa03241e011d04537eadf8 +SHA256 (ImageMagick-7.0.11-6.tar.xz) = 29f34d8f79de18f36080badc94859a6c054c7aa20ef1bd74abe92e3b2188f5ec diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile index a4b8296db..da9fc0267 100644 --- a/imagemagick/Pkgfile +++ b/imagemagick/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libtool lcms2 pango xorg-libxt chrpath name=imagemagick -version=7.0.11-5 +version=7.0.11-6 release=1 source=(https://www.imagemagick.org/download/releases/ImageMagick-$version.…

1 0

ports/core (3.6): [notify] python3: update to 3.9.4, ABI incompatibility fix
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 2159a80d5e36511144bb9c4f55d5afa86c235405 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Apr 5 10:50:09 2021 +0200 [notify] python3: update to 3.9.4, ABI incompatibility fix diff --git a/python3/.footprint b/python3/.footprint index 7b432ee4..d16babc7 100644 --- a/python3/.footprint +++ b/python3/.footprint @@ -2307,9 +2307,9 @@ drwxr-xr-x root/root usr/lib/python3.9/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.9/lib-dynload/zlib.cpython-39-x86_64-linux-gnu.so drwxr-xr-x root/root usr/lib/python3.9/lib2to3/ -rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar3.9.3.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar3.9.4.final.0.pickle -rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar3.9.3.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar3.9.4.final.0.pickle -rw-r--r-- root/root usr/lib/python3.9/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python3.9/lib2to3/__main__.py drwxr-xr-x root/root usr/lib/python3.9/lib2to3/__pycache__/ diff --git a/python3/.signature b/python3/.signature index 6c2af91f..f809e738 100644 --- a/python3/.signature +++ b/python3/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeql2eoNblJ37eSAs/awTqQXr4VoqUUSCQm8VruwrWiBCh2OEUnNURXZoTgxEYe4+3i5cPoTPujtbjZgudEAp18Ac= -SHA256 (Pkgfile) = 9f72f529253f1e22b8569e1bf0e178e441df60bef07afdd8fc677193dffa247d -SHA256 (.footprint) = cf9845714217c06f631cb1ecc5700b9e54ef2a737c7fa5f32ea83c184340adae -SHA256 (Python-3.9.3.tar.xz) = 30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5 +RWRJc1FUaeVeqo8TX68QFienEj8baHa2t+j44pGYLBG4ZBa7H5SNHIk4oA+l45NegvYSOITN5wZupefaMIQCB4fnkFIy2rMZLgg= +SHA256 (Pkgfile) = db61391c14dcad8a7d0de622a540cda9bd6530877613ddda9a74212d067c13e0 +SHA256 (.footprint) = 7f330b500c54ec888f26c0a7a39629673a94b77e1794885adb0b7f788e352921 +SHA256 (Python-3.9.4.tar.xz) = 4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134 SHA256 (mpdecimal-2.5.1.patch) = 8eb389be1babe03a0231001dc16dd2d69a3ea0fbf6b8c976a580787e7ff1594c diff --git a/python3/Pkgfile b/python3/Pkgfile index 625f2776..b0569d78 100644 --- a/python3/Pkgfile +++ b/python3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: bzip2 expat gdbm libffi libnsl libtirpc mpdecimal sqlite3 xz name=python3 -version=3.9.3 +version=3.9.4 release=1 source=(https://www.python.org/ftp/python/${version%rc*}/Python-$version.ta… mpdecimal-2.5.1.patch)

1 0

ports/contrib (3.6): [notify] shaderc: 2020.4-0dbd899 -> 2020.5 new dependnecie: spirv-tools
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 827e4959e333d1ff3413c383e6a710878ae32a11 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:14:07 2021 +1000 [notify] shaderc: 2020.4-0dbd899 -> 2020.5 new dependnecie: spirv-tools diff --git a/shaderc/.signature b/shaderc/.signature index 3793d2c8a..7bdaae7cd 100644 --- a/shaderc/.signature +++ b/shaderc/.signature @@ -1,9 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36qnZ4jJ+jbs3rNk1CjqXFmZ+s6D0LO9aQYvHiS0HU2dbGuIroX/CHa2lBCEupOuq04Wh3y2u5VHlQSG5BRESQM= -SHA256 (Pkgfile) = dd1d5075d82c9943215113594fbb618221f903fa077b2b22030b4f75f327124f +RWSagIOpLGJF39hJPlyU4RzQ4CVKodGXlM0sLx6UI6dn3+5WkpEMAohVxwZHtgXYmj4OgcjQPomZYf5Ho9UqFNZjAKPPAO6azgE= +SHA256 (Pkgfile) = 7a1dfa5c9dd47e1fcbd88dd9ce619ef05eccf00921c32e9a2fcf1adde79ada90 SHA256 (.footprint) = 768c5796cba31503e5e8a1c1d874f1d8699d410d17d6b98d9a6588ae17462816 -SHA256 (0dbd899941a43ffd55df527d65128b3b66e75c9c.zip) = ad7abeb81e37e900b7e21eb54b6be6f90fce6f9adcb5ac54f3ed8908ea2b2301 -SHA256 (glslc.1) = 267cddf289bffa4855950a5ce662f04ef3b0dea7e46447a6a694214614032a7d -SHA256 (glslc-asciidoc.patch) = 685d97223af4fcd169921ee5f9b2c49a2df3d84b7bf7df7dd1f6def4361321a6 -SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 060eb0e19a58b5e4c61ec087512de0ea52623b9aa33858f7a4b2f036f52169fb -SHA256 (glslang_linker_flags.patch) = 18c74c78ff62d53b522604e59aef595d442e8cae46233622dd9520571201d276 +SHA256 (shaderc-v2020.5.tar.gz) = e96d8cb208b796cecb9e6cce437c7d1116343158ef3ea26277eb13b62cf56834 +SHA256 (shaderc-a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8.tar.gz) = e64772eedd38749a4307060eb75fdb699a6dd1a383c6a7371e97741e9df1eeca +SHA256 (glslc.1) = 3ff32e70177fc4588ef2cc745a97e833a174a50223ed994b76efd828d9c8bded diff --git a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch deleted file mode 100644 index 52697f514..000000000 --- a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt ---- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 -+++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -102,18 +102,10 @@ endif(MSVC) - - # Configure subdirectories. - # We depend on these for later projects, so they should come first. --add_subdirectory(third_party) - - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) -- --add_custom_target(build-version -- ${PYTHON_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc -- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") - - function(define_pkg_config_file NAME LIBS) - add_custom_target(${NAME}-pkg-config ALL diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile index 027ef43e8..0acadb497 100644 --- a/shaderc/Pkgfile +++ b/shaderc/Pkgfile @@ -1,25 +1,20 @@ # Description: A collection of tools, libraries and tests for shader compilation. # URL: https://github.com/google/shaderc # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: glslang +# Depends on: glslang spirv-tools # Optional: asciidoctor name=shaderc -version=2020.4-0dbd899 +version=2020.5 +_spirv_headers=a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8 release=1 -source=(#https://github.com/google/shaderc/archive/v$version/$name-v$version.tar.gz - https://github.com/google/shaderc/archive/0dbd899941a43ffd55df527d65128b3b6… - glslc.1 glslc-asciidoc.patch - 0001-Drop-third-party-code-in-CMakeLists.txt.patch - glslang_linker_flags.patch) +source=(https://github.com/google/shaderc/archive/v$version/$name-v$version.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/$name… + glslc.1) build() { - mv $name-0dbd899941a43ffd55df527d65128b3b66e75c9c $name-$version - - patch -d $name-$version/glslc -p0 -i $SRC/glslc-asciidoc.patch - - patch -p1 -d $name-$version -i $SRC/0001-Drop-third-party-code-in-CMakeLists.txt.patch - patch -p1 -d $name-$version -i $SRC/glslang_linker_flags.patch + mkdir -p $name-$version/third_party/spirv-headers + mv SPIRV-Headers-$_spirv_headers/* $name-$version/third_party/spirv-headers # de-vendor libs and disable git versioning sed '/examples/d;/third_party/d' -i $name-$version/CMakeLists.txt @@ -30,17 +25,18 @@ build() { "$(prt-get info glslang | awk '/^Version:/ {print $2}')\\n" EOF - # Point to correct include - sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' $name-$version/libshaderc_util/src/compiler.cc + prt-get isinst ninja && PKGMK_SHADERC+=' -G Ninja' - cmake -S $name-$version -B build -G Ninja \ + cmake -S $name-$version -B build $PKGMK_SHADERC \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D CMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,defs" \ -D SHADERC_SKIP_TESTS=ON \ - -Wno-dev + -D glslang_SOURCE_DIR:PATH='/usr/include/glslang' \ + -D SPIRV-Headers_SOURCE_DIR:PATH="$SRC/$name-$version/third_party/spirv-headers" cmake --build build -j ${JOBS:-1} DESTDIR=$PKG cmake --install build diff --git a/shaderc/glslang_linker_flags.patch b/shaderc/glslang_linker_flags.patch deleted file mode 100644 index 9324f217c..000000000 --- a/shaderc/glslang_linker_flags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -47,7 +47,7 @@ - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util - ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ - endif(SHADERC_ENABLE_WGSL_OUTPUT) - - target_link_libraries(glslc PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries -+ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries - $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional - shaderc_util shaderc # internal Shaderc libraries - ${CMAKE_THREAD_LIBS_INIT}) - diff --git a/shaderc/glslc-asciidoc.patch b/shaderc/glslc-asciidoc.patch deleted file mode 100644 index 4f4e24292..000000000 --- a/shaderc/glslc-asciidoc.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- README.asciidoc.orig 2019-10-12 13:09:08.520937661 +1100 -+++ README.asciidoc 2019-10-12 13:07:36.402071472 +1100 -@@ -1,4 +1,4 @@ --= glslc Manual -+= glslc(1) - :toc: - :toclevels: 3 - :numbered: diff --git a/shaderc/glslc.1 b/shaderc/glslc.1 index 76fdb2edb..db7755097 100644 --- a/shaderc/glslc.1 +++ b/shaderc/glslc.1 @@ -1,13 +1,13 @@ '\" t -.\" Title: glslc +.\" Title: glslc Manual .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.12 -.\" Date: 2021-02-27 +.\" Date: 2021-02-19 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "`GLSLC`" "1" "2021-02-27" "\ \&" "\ \&" +.TH "`GLSLC`" "1" "2021-02-19" "\ \&" "\ \&" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0

1 0

ports/contrib (3.6): [notify] libplacebo: 3.104.0 -> 3.120.0 new dependnecies: ffmpeg glfw
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit fdeb87609313d2b17369458a8daad74694083051 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:11:45 2021 +1000 [notify] libplacebo: 3.104.0 -> 3.120.0 new dependnecies: ffmpeg glfw diff --git a/libplacebo/.footprint b/libplacebo/.footprint index d498e2f0a..d5e6c4d41 100644 --- a/libplacebo/.footprint +++ b/libplacebo/.footprint @@ -17,15 +17,20 @@ drwxr-xr-x root/root usr/include/libplacebo/shaders/ -rw-r--r-- root/root usr/include/libplacebo/shaders/av1.h -rw-r--r-- root/root usr/include/libplacebo/shaders/colorspace.h -rw-r--r-- root/root usr/include/libplacebo/shaders/custom.h +-rw-r--r-- root/root usr/include/libplacebo/shaders/icc.h +-rw-r--r-- root/root usr/include/libplacebo/shaders/lut.h -rw-r--r-- root/root usr/include/libplacebo/shaders/sampling.h -rw-r--r-- root/root usr/include/libplacebo/swapchain.h drwxr-xr-x root/root usr/include/libplacebo/utils/ +-rw-r--r-- root/root usr/include/libplacebo/utils/dav1d.h +-rw-r--r-- root/root usr/include/libplacebo/utils/dav1d_internal.h +-rw-r--r-- root/root usr/include/libplacebo/utils/frame_queue.h -rw-r--r-- root/root usr/include/libplacebo/utils/libav.h -rw-r--r-- root/root usr/include/libplacebo/utils/libav_internal.h -rw-r--r-- root/root usr/include/libplacebo/utils/upload.h -rw-r--r-- root/root usr/include/libplacebo/vulkan.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libplacebo.so -> libplacebo.so.104 --rwxr-xr-x root/root usr/lib/libplacebo.so.104 +lrwxrwxrwx root/root usr/lib/libplacebo.so -> libplacebo.so.120 +-rwxr-xr-x root/root usr/lib/libplacebo.so.120 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libplacebo.pc diff --git a/libplacebo/.signature b/libplacebo/.signature index c5b1810d2..8d71bf1f1 100644 --- a/libplacebo/.signature +++ b/libplacebo/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37t492dOeorGwfHSaPCOhE26l9eIb2QIAZLfdRiIUaWkz7J79xNqNCitQqqjzLu8WY/H5InVw0wsC7xaD2I60gE= -SHA256 (Pkgfile) = 69231183387fad8459b18230dc7490722ceca6994e83f196c902c82d653f1c51 -SHA256 (.footprint) = be55ff032b8288423bd9ba9dce2223623c29118eb688a8c0e669bb029c01dc35 -SHA256 (libplacebo-v3.104.0.tar.gz) = 55559d77d893d3f13f0a15ff6ff3b462451f8996bd3e0b8b6794a65502341aaf +RWSagIOpLGJF36/mggKIUsphgsZbQCwQkcCi1xzOSHkyde8i8qPJJKzKRsdwOn60a/EwxJE8mnOnjDpBoQVf0BaZHx3ZsZB/WAw= +SHA256 (Pkgfile) = aa37ba14702a76a019c6c697bcfb2f2a242b3f9a6ec0996c4faebfd967362fd2 +SHA256 (.footprint) = 9bbd90baf89d37f5025ae504d8fa5859b21a19f5051946a6dc7062d6dc545169 +SHA256 (libplacebo-v3.120.0.tar.gz) = 364baa60999d4660b8fa9c8fe53971bc090dd55cc302614e163d2db0f70a323e diff --git a/libplacebo/Pkgfile b/libplacebo/Pkgfile index 911c210db..559e0e2dc 100644 --- a/libplacebo/Pkgfile +++ b/libplacebo/Pkgfile @@ -1,10 +1,10 @@ # Description: Reusable library for GPU-accelerated video/image rendering primitives # URL: https://github.com/haasn/libplacebo # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: lcms2 libepoxy shaderc vulkan-loader +# Depends on: ffmpeg glfw lcms2 libepoxy shaderc vulkan-loader name=libplacebo -version=3.104.0 +version=3.120.0 release=1 source=(https://code.videolan.org/videolan/libplacebo/-/archive/v$version/$…

1 0

ports/contrib (3.6): glfw3: initial import
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit c5539473f4a9a2f64cc3af5d157fadace816c521 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:10:20 2021 +1000 glfw3: initial import diff --git a/glfw3/.footprint b/glfw3/.footprint new file mode 100644 index 000000000..91cd2cc6a --- /dev/null +++ b/glfw3/.footprint @@ -0,0 +1,17 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/GLFW/ +-rw-r--r-- root/root usr/include/GLFW/glfw3.h +-rw-r--r-- root/root usr/include/GLFW/glfw3native.h +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/cmake/ +drwxr-xr-x root/root usr/lib/cmake/glfw3/ +-rw-r--r-- root/root usr/lib/cmake/glfw3/glfw3Config.cmake +-rw-r--r-- root/root usr/lib/cmake/glfw3/glfw3ConfigVersion.cmake +-rw-r--r-- root/root usr/lib/cmake/glfw3/glfw3Targets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glfw3/glfw3Targets.cmake +lrwxrwxrwx root/root usr/lib/libglfw.so -> libglfw.so.3 +lrwxrwxrwx root/root usr/lib/libglfw.so.3 -> libglfw.so.3.3 +-rwxr-xr-x root/root usr/lib/libglfw.so.3.3 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/glfw3.pc diff --git a/glfw3/.signature b/glfw3/.signature new file mode 100644 index 000000000..2675ed8c5 --- /dev/null +++ b/glfw3/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3wc8jfid03O4+rcYJBxhtgjeEf1mpTpwAF+08+xC/5WhnQZZAf4B4jEQRtVMVLYGlVxQy6ptd0igsEtXpp0SYws= +SHA256 (Pkgfile) = 986289fa90334c71b72b101c367124faac708a3efc04a6422f89cb51aa9cbce3 +SHA256 (.footprint) = 615e7b3d531b623a1372e3d2899f06ef3050506777e33b70c3ff37c2c3b8e1b5 +SHA256 (glfw-3.3.3.zip) = 723087ad45b40cd333be7d1a2cd5e09a28facb7f3acdb69f3e5613bd20543977 diff --git a/glfw3/Pkgfile b/glfw3/Pkgfile new file mode 100644 index 000000000..6cae8d80d --- /dev/null +++ b/glfw3/Pkgfile @@ -0,0 +1,23 @@ +# Description: A multi-platform library for OpenGL, OpenGL ES and Vulkan development +# URL: https://www.glfw.org +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: libglvnd vulkan-loader xorg-libxcursor xorg-libxi xorg-libxinerama + +name=glfw3 +version=3.3.3 +release=1 +source=(https://github.com/glfw/glfw/releases/download/$version/glfw-$version.zip) + +build() { + prt-get isinst ninja && PKGMK_GLFW+=' -G Ninja' + + cmake -S glfw-$version -B build $PKGMK_GLFW \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ + -D BUILD_SHARED_LIBS=ON + + cmake --build build + DESTDIR=$PKG cmake --build build --target install +}

1 0

ports/opt (3.6): [notify] vulkan-validation-layers: 1.2.162.0 -> 1.2.174 New dependencies: spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 68f8930bcb989e4d7d6df5aa9149eba3d4869064 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:35:18 2021 +1000 [notify] vulkan-validation-layers: 1.2.162.0 -> 1.2.174 New dependencies: spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index f0b019b4c..b4b342446 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -1,35 +1,34 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/vulkan/ -drwxr-xr-x root/root usr/include/vulkan/vulkan/ --rw-r--r-- root/root usr/include/vulkan/vulkan/cast_utils.h --rw-r--r-- root/root usr/include/vulkan/vulkan/hash_util.h --rw-r--r-- root/root usr/include/vulkan/vulkan/hash_vk_types.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_dispatch_table_helper.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_enum_string_helper.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_extension_helper.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_format_utils.cpp --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_format_utils.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_config.cpp --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_config.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_data.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_dispatch_table.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_extension_utils.cpp --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_extension_utils.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_logging.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_utils.cpp --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_layer_utils.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_loader_platform.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_object_types.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_safe_struct.cpp --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_safe_struct.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_typemap_helper.h --rw-r--r-- root/root usr/include/vulkan/vulkan/vk_validation_error_messages.h --rw-r--r-- root/root usr/include/vulkan/vulkan/xxhash.c --rw-r--r-- root/root usr/include/vulkan/vulkan/xxhash.h +-rw-r--r-- root/root usr/include/vulkan/cast_utils.h +-rw-r--r-- root/root usr/include/vulkan/hash_util.h +-rw-r--r-- root/root usr/include/vulkan/hash_vk_types.h +-rw-r--r-- root/root usr/include/vulkan/vk_dispatch_table_helper.h +-rw-r--r-- root/root usr/include/vulkan/vk_enum_string_helper.h +-rw-r--r-- root/root usr/include/vulkan/vk_extension_helper.h +-rw-r--r-- root/root usr/include/vulkan/vk_format_utils.cpp +-rw-r--r-- root/root usr/include/vulkan/vk_format_utils.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_config.cpp +-rw-r--r-- root/root usr/include/vulkan/vk_layer_config.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_data.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_dispatch_table.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_extension_utils.cpp +-rw-r--r-- root/root usr/include/vulkan/vk_layer_extension_utils.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_logging.h +-rw-r--r-- root/root usr/include/vulkan/vk_layer_utils.cpp +-rw-r--r-- root/root usr/include/vulkan/vk_layer_utils.h +-rw-r--r-- root/root usr/include/vulkan/vk_loader_platform.h +-rw-r--r-- root/root usr/include/vulkan/vk_object_types.h +-rw-r--r-- root/root usr/include/vulkan/vk_safe_struct.cpp +-rw-r--r-- root/root usr/include/vulkan/vk_safe_struct.h +-rw-r--r-- root/root usr/include/vulkan/vk_typemap_helper.h +-rw-r--r-- root/root usr/include/vulkan/vk_validation_error_messages.h +-rw-r--r-- root/root usr/include/vulkan/xxhash.c +-rw-r--r-- root/root usr/include/vulkan/xxhash.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so --rwxr-xr-x root/root usr/lib/libVkLayer_utils.so +-rw-r--r-- root/root usr/lib/libVkLayer_utils.a drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/vulkan/ drwxr-xr-x root/root usr/share/vulkan/explicit_layer.d/ diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index 1ac47ac3b..1fe419c20 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,6 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/e78rAiKzQUYdro/nrWMKP/vpAGv4zuyfFX+qnqLpDlo1ppP0dBkzl44LZXHxkjsdKGs4TCBbN6XU1gsNRwSzgE= -SHA256 (Pkgfile) = 24cfba8965e08d0059b5299493eb6f7cc54526601da410fe2befe019462577fb -SHA256 (.footprint) = c9e556dbcb34ac51e23515472b1b4eaa1cd86eb5dcea3f1236a2664ed021059c -SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5 -SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +RWSE3ohX2g5d/alC5HqcE7s++tSHwABQunQD8WwkbKJaPAD8LECkAN8j/SlRJ/QHgL7vA2WCRD9hQyLWJp0+7pP7OBECUjPVnQQ= +SHA256 (Pkgfile) = 40c340c93b3e4cd4b6f764cafc237c97c51f4ee6b99238cd55e7ff31e02fb46d +SHA256 (.footprint) = 66e56224031ef22f7a9d7a66474b1c11317ff7ff78775daa1763b3e360e91e01 +SHA256 (Vulkan-ValidationLayers-1.2.174.tar.gz) = 5696a502a11ca0fb954b1dbf6b887ce6371c6a80666420102d5b6250117e06f7 +SHA256 (SPIRV-Headers-75b30a659c8a4979104986652c54cc421fc51129.tar.gz) = 60a5845bcd0ee30e000151bb725b461f67f95d703294ef74c034ff3a3e039324 +SHA256 (robin-hood-hashing-3.11.1.tar.gz) = 31143d316b49e29b57773e720ec9ac3f7a8223dc7710329b566c874c69e1d087 +SHA256 (known_good.py.in) = f5e5330201ab5686a84d9ff65fd372af510d564aa6eb2d3c332d59a6e69ce2e3 diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index 1c9b5e0fb..cf6b2c1e7 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -1,31 +1,42 @@ # Description: Vulkan validation layers # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: glslang vulkan-loader +# Depends on: cmake glslang spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr # Optional: wayland name=vulkan-validation-layers -version=1.2.162.0 +version=1.2.174 +_spirv_headers=75b30a659c8a4979104986652c54cc421fc51129 +_robin_hood=3.11.1 release=1 -source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz - fix_shared.patch) +source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v$version/Vulkan-ValidationLayers-$version.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV… + https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-h… + known_good.py.in) build() { - patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch + mkdir -p Vulkan-ValidationLayers-$version/headers/external/spirv-headers \ + Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing + cp -r SPIRV-Headers-$_spirv_headers/* Vulkan-ValidationLayers-$version/headers/external/spirv-headers + cp -r robin-hood-hashing-$_robin_hood/* Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing - cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_INSTALL_LIBDIR='lib' \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_TESTS=OFF \ - -DGLSLANG_INSTALL_DIR='/usr' \ - -DBUILD_LAYER_SUPPORT_FILES=ON \ - -DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv/' \ - -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \ + sed -e "s|@SRC@|$SRC/Vulkan-ValidationLayers-$version|" $SRC/known_good.py.in > $SRC/known_good.py + chmod u+x $SRC/known_good.py + $SRC/known_good.py + + prt-get isinst ninja && PKGMK_VULKAN_VALIDATION_LAYERS+=' -G Ninja' + prt-get isinst wayland || PKGMK_VULKAN_VALIDATION_LAYERS+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF' + + cmake -S Vulkan-ValidationLayers-$version -B build $PKGMK_VULKAN_VALIDATION_LAYERS \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ + -D BUILD_TESTS=OFF \ + -D BUILD_LAYER_SUPPORT_FILES=ON \ + -D GLSLANG_INSTALL_DIR:PATH='/usr/include/glslang' \ + -D ROBIN_HOOD_HASHING_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-$version/robin_hood/external/robin-hood-hashing" \ + -D SPIRV_HEADERS_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-$version/headers/external/spirv-headers" \ -Wno-dev cmake --build build diff --git a/vulkan-validation-layers/fix_shared.patch b/vulkan-validation-layers/fix_shared.patch deleted file mode 100644 index 8082da82d..000000000 --- a/vulkan-validation-layers/fix_shared.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt ---- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma 2019-02-13 09:20:44.590959278 +1000 -+++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt 2019-02-13 09:21:29.178151673 +1000 -@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi - # files directly in layers. - - add_library(VkLayer_utils -- STATIC -+ SHARED - layers/vk_layer_config.cpp - layers/vk_layer_extension_utils.cpp - layers/vk_layer_utils.cpp diff --git a/vulkan-validation-layers/known_good.py.in b/vulkan-validation-layers/known_good.py.in new file mode 100755 index 000000000..fc9ea78d0 --- /dev/null +++ b/vulkan-validation-layers/known_good.py.in @@ -0,0 +1,12 @@ +#!/usr/bin/python3 + +import json + +with open('@SRC@/scripts/known_good.json', 'r') as myfile: + data=myfile.read() + +obj = json.loads(data) + +print (str(obj['repos'][0]['name']) + ': ' + str(obj['repos'][0]['commit'])) +print (str(obj['repos'][1]['name']) + ': ' + str(obj['repos'][1]['commit'])) +print (str(obj['repos'][2]['name']) + ': ' + str(obj['repos'][2]['commit']))

1 0

ports/opt (3.6): vulkan-tools: 1.2.162.0 -> 1.2.174
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 5867636c06b06cf1e45555ba363231f9c5622f54 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:26:52 2021 +1000 vulkan-tools: 1.2.162.0 -> 1.2.174 diff --git a/vulkan-tools/.signature b/vulkan-tools/.signature index 27f122aa7..8a26f4316 100644 --- a/vulkan-tools/.signature +++ b/vulkan-tools/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f7V9M3QYgGuNxByda+IRlBwsOQgIxBtsV0T/OdIUm5x4Xg16G632x71a8CI9icSMB0fkwFIU7Qig5UTwPyK4Q4= -SHA256 (Pkgfile) = 4483a6d9ff543293d29a7801bbcca2ec75ea5ddc77900f8cbc9d279d4b234a22 +RWSE3ohX2g5d/U1vs5RDk+9sy5XN8Xmycy6j0ZztbAsyAQ0JBa37/L3wv3Mvly8fhXXZAYvXYznKVDDLuCWW9VFAaQPh331VcgI= +SHA256 (Pkgfile) = cb1c829b2582a3e0cba088a21bb35d290abacf9349b8f0b7af0ad5c0e93fd68a SHA256 (.footprint) = 2193acbc7cabcf79829a7caf3821d84e01bc4e695a36a948b8eb4379bbf8150f -SHA256 (Vulkan-Tools-sdk-1.2.162.0.tar.gz) = 8324a6dfd1bc20d4fad45c4ea56357d8354fc03e3e4529d0a4919f124d9e6106 +SHA256 (Vulkan-Tools-1.2.174.tar.gz) = c8b537d3a8f18550b8720a8a3c0006949e2575d547d88fa94858ab7413cee7de diff --git a/vulkan-tools/Pkgfile b/vulkan-tools/Pkgfile index 02f883a22..a8e0db0c2 100644 --- a/vulkan-tools/Pkgfile +++ b/vulkan-tools/Pkgfile @@ -5,22 +5,26 @@ # Optional: wayland name=vulkan-tools -version=1.2.162.0 +version=1.2.174 release=1 -source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$version/Vulkan-Tools-sdk-$version.tar.gz) +source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/v$version/Vulkan-Tools-$version.tar.gz) build() { - cmake -SVulkan-Tools-sdk-$version -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DBUILD_CUBE=True \ - -DBUILD_VULKANINFO=True \ - -DCUBE_WSI_SELECTION='XCB' \ - -DBUILD_WSI_XCB_SUPPORT=True \ - -DBUILD_WSI_XLIB_SUPPORT=True \ - -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \ - -DBUILD_ICD=OFF \ + prt-get isinst ninja && PKGMK_VULKAN_TOOLS+=' -G Ninja' + prt-get isinst wayland || PKGMK_VULKAN_TOOLS+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF' + + cmake -S Vulkan-Tools-$version -B build $PKGMK_VULKAN_TOOLS \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ + -D GLSLANG_INSTALL_DIR=/usr \ + -D BUILD_CUBE=True \ + -D BUILD_VULKANINFO=True \ + -D CUBE_WSI_SELECTION='XCB' \ + -D BUILD_WSI_XCB_SUPPORT=True \ + -D BUILD_WSI_XLIB_SUPPORT=True \ + -D BUILD_ICD=OFF \ -Wno-dev cmake --build build

1 0

ports/opt (3.6): vulkan-loader: 1.2.162.0 -> 1.2.174
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit e93c99eadea48aec736c46c3308b86358f3f6fc5 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:24:34 2021 +1000 vulkan-loader: 1.2.162.0 -> 1.2.174 diff --git a/vulkan-loader/.footprint b/vulkan-loader/.footprint index 21b360e19..2ccf3e2d8 100644 --- a/vulkan-loader/.footprint +++ b/vulkan-loader/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libvulkan.so -> libvulkan.so.1 -lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.162 --rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.162 +lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.174 +-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.174 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vulkan.pc diff --git a/vulkan-loader/.signature b/vulkan-loader/.signature index d3835346f..9a4295d24 100644 --- a/vulkan-loader/.signature +++ b/vulkan-loader/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QzDnmFzjhPvNK9f4t1k/CdBTUMNpejZh5/OeEn0ijIt2S5Rxv6sORIUO4Lx1MuoKTRbzxjKI1HFKEmQ8o3cBwo= -SHA256 (Pkgfile) = 2a23a15f53fc2dbb824347eadd02fde8c60667ff9984acfc9a26fc1584256382 -SHA256 (.footprint) = 5813d5857dc76fde9827dcb8b807af89dd9e313afd60fddce10eb86e0db956fd -SHA256 (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = f8f5ec2485e7fdba3f58c1cde5a25145ece1c6a686c91ba4016b28c0af3f21dd +RWSE3ohX2g5d/b52tlwXs4DxbpcmHXF1heJy08ysAsNzmvc8NvZZkh03TUZhDWz+SkwKxxHxFkZK1OKepN6HsTLSqci404PsVA0= +SHA256 (Pkgfile) = e2497c228863ddea3e0f3c57e1721b5e31809315287ab77832a1902e8df34ba9 +SHA256 (.footprint) = 6f3e447aa4cda128719757b9db5c24bff7d80d4061eb344f83ab677da14b6d8d +SHA256 (Vulkan-Loader-1.2.174.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b diff --git a/vulkan-loader/Pkgfile b/vulkan-loader/Pkgfile index 2831da04e..15ccc0339 100644 --- a/vulkan-loader/Pkgfile +++ b/vulkan-loader/Pkgfile @@ -4,21 +4,22 @@ # Depends on: vulkan-headers xorg-libxrandr name=vulkan-loader -version=1.2.162.0 +version=1.2.174 release=1 -source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$version/Vulkan-Loader-sdk-$version.tar.gz) +source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-$version.tar.gz) build() { - cmake -SVulkan-Loader-sdk-$version -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=True \ - -DBUILD_TESTS=False \ - -DBUILD_LOADER=True \ - -DBUILD_WSI_XCB_SUPPORT=True \ - -DBUILD_WSI_XLIB_SUPPORT=True \ - -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" + prt-get isinst ninja && PKGMK_VULKAN_LOADER+=' -G Ninja' + prt-get isinst wayland || PKGMK_VULKAN_LOADER+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF' + + cmake -S Vulkan-Loader-$version -B build $PKGMK_VULKAN_LOADER \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ + -D CMAKE_SKIP_RPATH=ON \ + -D BUILD_TESTS=OFF cmake --build build DESTDIR=$PKG cmake --install build

1 0

ports/opt (3.6): vulkan-headers: 1.2.162.0 -> 1.2.174
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit 82ba2601dd339e83df65310941a24cc6ca60f4c7 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:23:04 2021 +1000 vulkan-headers: 1.2.162.0 -> 1.2.174 diff --git a/vulkan-headers/.footprint b/vulkan-headers/.footprint index ad22f3192..81f877c1a 100644 --- a/vulkan-headers/.footprint +++ b/vulkan-headers/.footprint @@ -16,6 +16,7 @@ drwxr-xr-x root/root usr/include/vulkan/ -rw-r--r-- root/root usr/include/vulkan/vulkan_ios.h -rw-r--r-- root/root usr/include/vulkan/vulkan_macos.h -rw-r--r-- root/root usr/include/vulkan/vulkan_metal.h +-rw-r--r-- root/root usr/include/vulkan/vulkan_screen.h -rw-r--r-- root/root usr/include/vulkan/vulkan_vi.h -rw-r--r-- root/root usr/include/vulkan/vulkan_wayland.h -rw-r--r-- root/root usr/include/vulkan/vulkan_win32.h diff --git a/vulkan-headers/.signature b/vulkan-headers/.signature index 6c69bb808..99570b663 100644 --- a/vulkan-headers/.signature +++ b/vulkan-headers/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/V2VKkZttb5zgbLpV/GNBhhIP/qyBvGjS44Z3EyrZMAbws11tYlob5b/ECUn4t0i6LEzq9C3rAl1q365YlcHJgI= -SHA256 (Pkgfile) = 69c288170a4bc5cbcac643fc76c0f14906f35df756872c97f05b31b09fa078b1 -SHA256 (.footprint) = effd18e132c150c8a69399e92fd4eeed22b5271d37121dd6248212ff0043d3d5 -SHA256 (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = eb0f6a79ac38e137f55a0e13641140e63b765c8ec717a65bf3904614ef754365 +RWSE3ohX2g5d/bfr5o8Lfs3JQtKixKwSPydfb6P6Jx/OTNzc+zpihixg30aDUHAYOwzt+9jwiYTGlZgV+ldwCDv4sjwvsmaPIgk= +SHA256 (Pkgfile) = 1007525a36e72c10f2cf9d9b310ca9d314a108839e8796ac00b0d4a20d4a580d +SHA256 (.footprint) = bb1d8d1b927af6d39cda1ed1ea21266a1f6188e8939291246574b6001f5b475d +SHA256 (vulkan-headers-v1.2.174.tar.gz) = 32a0a842081412eac756bf07a6f7ded421c78b2dcba3d4a8f6c410b532d0c739 diff --git a/vulkan-headers/Pkgfile b/vulkan-headers/Pkgfile index e327a8c84..7b2d870e3 100644 --- a/vulkan-headers/Pkgfile +++ b/vulkan-headers/Pkgfile @@ -1,18 +1,18 @@ # Description: Vulkan Header files and API registry # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cmake ninja +# Depends on: cmake name=vulkan-headers -version=1.2.162.0 +version=1.2.174 release=1 -source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version/Vulkan-Headers-sdk-$version.tar.gz) +source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/v$version/$name-v$version.tar.gz) build() { - cmake -SVulkan-Headers-sdk-$version -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release + cmake -S Vulkan-Headers-$version -B build \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release cmake --build build DESTDIR=$PKG cmake --install build

1 0

ports/opt (3.6): spirv-tools: 2020.5-b27b1af -> 2020.7
by crux＠crux.nu 05 Apr '21

05 Apr '21

commit d3555778598f82304a14e9b7ed34cb89b0e8cd30 Author: Danny Rawlins <contact(a)romster.me> Date: Mon Apr 5 15:17:09 2021 +1000 spirv-tools: 2020.5-b27b1af -> 2020.7 diff --git a/spirv-tools/.signature b/spirv-tools/.signature index c6739500d..dd26dde21 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/R9X8LEdczwHJeBncaEPtow7dlk2QiGpdnkEGaKKuYke8u2sKwOfiaL+c/sUByqpwSImwDJLW2uwK0JeIzzQhAo= -SHA256 (Pkgfile) = bc956b06d1838c26e9efa599035ed21d9dc892c3c34a29f703d75912841434d7 +RWSE3ohX2g5d/VUhjywzBREZh//j/DtnELH5Bz1WG934Q3Z3RVDHK6r2ZX3I8JlCTYlW8Pv6mkzCZPyyCtCXlT/VAuJ0RK94dA0= +SHA256 (Pkgfile) = 12d0016c960de9c7ef6c9bb7027f9a9bae785deeaaf91f75ea882fb374c22b37 SHA256 (.footprint) = 792b1ed5f9cf11954a951716c2b0c3849acf6c2ef0a45d91ec512bcc0dd79ba5 -SHA256 (b27b1afd12d05bf238ac7368bb49de73cd620a8e.zip) = 6a5691e3ac4ad2fae14025be4535cbdf60becc311fd2c07a00019e6167f54222 -SHA256 (spirv-tools-gcc11.patch) = 44962127ac664e437619afdf16c1193b9579d832a9d7c2fae3595f65c3f17923 +SHA256 (SPIRV-Tools-v2020.7.tar.gz) = c06eed1c7a1018b232768481184b5ae4d91d614d7bd7358dc2fe306bd0a39c6e +SHA256 (f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a.zip) = b209fe7fd0db5a2eb61db5d93525ce0f39e4d615f2f82bd02ff0ee512bd45a1e diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index cf8a28831..52ca56dae 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -1,35 +1,38 @@ # Description: API and commands for processing SPIR-V modules # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: spirv-headers name=spirv-tools -version=2020.5-b27b1af +version=2020.7 release=1 -source=( - #https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz - https://github.com/KhronosGroup/SPIRV-Tools/archive/b27b1afd12d05bf238ac736… - spirv-tools-gcc11.patch) +source=(https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/f88a1f98fa7a44ccfcf33…) build() { - mv SPIRV-Tools-b27b1afd12d05bf238ac7368bb49de73cd620a8e SPIRV-Tools-$version + mv SPIRV-Headers-f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a SPIRV-Headers + prt-get isinst ninja && PKGMK_SPIRV_TOOLS+=' -G Ninja' - local config=" --SSPIRV-Tools-$version \ --DCMAKE_INSTALL_PREFIX=/usr \ --DCMAKE_INSTALL_LIBDIR=lib \ --DCMAKE_BUILD_TYPE=Release \ --DSPIRV_WERROR=OFF \ --DSPIRV-Headers_SOURCE_DIR=/usr \ --DPYTHON_EXECUTABLE=/usr/bin/python3 \ --GNinja" + PKGMK_GLSLANG+=" \ +-S SPIRV-Tools-$version \ +-D CMAKE_INSTALL_PREFIX=/usr \ +-D CMAKE_INSTALL_LIBDIR=lib \ +-D CMAKE_BUILD_TYPE=Release \ +-D SPIRV_WERROR=OFF \ +-D SPIRV-Headers_SOURCE_DIR=/usr \ +-D PYTHON_EXECUTABLE=/usr/bin/python3 \ +-DSPIRV-Headers_SOURCE_DIR="${SRC}"/SPIRV-Headers \ +-Wno-dev" - patch -d SPIRV-Tools-$version -p1 -i $SRC/spirv-tools-gcc11.patch - - cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF + cmake -B build-static $PKGMK_GLSLANG \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ + -D BUILD_SHARED_LIBS=OFF cmake --build build-static - cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON + cmake -B build-shared $PKGMK_GLSLANG \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ + -D BUILD_SHARED_LIBS=ON cmake --build build-shared DESTDIR=$PKG cmake --build build-static --target install diff --git a/spirv-tools/spirv-tools-gcc11.patch b/spirv-tools/spirv-tools-gcc11.patch deleted file mode 100644 index f5c82da08..000000000 --- a/spirv-tools/spirv-tools-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/diagnostic.cpp b/source/diagnostic.cpp -index edc27c8..77c29d7 100644 ---- a/source/diagnostic.cpp -+++ b/source/diagnostic.cpp -@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const spv_position position, - diagnostic->position = *position; - diagnostic->isTextSource = false; - memset(diagnostic->error, 0, length); -- strncpy(diagnostic->error, message, length); -+ memcpy(diagnostic->error, message, length); - return diagnostic; - } -

1 0