commit 3729a0573fdb1e25a8b68413537e2cbde63aa0a5 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Apr 20 11:47:51 2019 +1000 [notify] glslang: new dependency spirv-tools diff --git a/glslang/.footprint b/glslang/.footprint index a9041d55..0839bba1 100644 --- a/glslang/.footprint +++ b/glslang/.footprint @@ -1,16 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/glslangValidator --rwxr-xr-x root/root usr/bin/spirv-as --rwxr-xr-x root/root usr/bin/spirv-cfg --rwxr-xr-x root/root usr/bin/spirv-dis --rwxr-xr-x root/root usr/bin/spirv-lesspipe.sh --rwxr-xr-x root/root usr/bin/spirv-link --rwxr-xr-x root/root usr/bin/spirv-opt --rwxr-xr-x root/root usr/bin/spirv-reduce -rwxr-xr-x root/root usr/bin/spirv-remap --rwxr-xr-x root/root usr/bin/spirv-stats --rwxr-xr-x root/root usr/bin/spirv-val drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/SPIRV/ -rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.AMD.h @@ -65,25 +56,20 @@ drwxr-xr-x root/root usr/include/glslang/MachineIndependent/preprocessor/ -rw-r--r-- root/root usr/include/glslang/MachineIndependent/reflection.h drwxr-xr-x root/root usr/include/glslang/Public/ -rw-r--r-- root/root usr/include/glslang/Public/ShaderLang.h -drwxr-xr-x root/root usr/include/spirv-tools/ --rw-r--r-- root/root usr/include/spirv-tools/instrument.hpp --rw-r--r-- root/root usr/include/spirv-tools/libspirv.h --rw-r--r-- root/root usr/include/spirv-tools/libspirv.hpp --rw-r--r-- root/root usr/include/spirv-tools/linker.hpp --rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libHLSL.a -rwxr-xr-x root/root usr/lib/libHLSL.so +lrwxrwxrwx root/root usr/lib/libHLSL.so.0 -> libHLSL.so -rw-r--r-- root/root usr/lib/libOGLCompiler.a -rw-r--r-- root/root usr/lib/libOSDependent.a --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-opt.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-reduce.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools.so +-rw-r--r-- root/root usr/lib/libSPIRV.a -rwxr-xr-x root/root usr/lib/libSPIRV.so +lrwxrwxrwx root/root usr/lib/libSPIRV.so.0 -> libSPIRV.so +-rw-r--r-- root/root usr/lib/libSPVRemapper.a -rwxr-xr-x root/root usr/lib/libSPVRemapper.so +lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.0 -> libSPVRemapper.so -rwxr-xr-x root/root usr/lib/libglslang-default-resource-limits.so +lrwxrwxrwx root/root usr/lib/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so +-rw-r--r-- root/root usr/lib/libglslang.a -rwxr-xr-x root/root usr/lib/libglslang.so -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc --rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc +lrwxrwxrwx root/root usr/lib/libglslang.so.0 -> libglslang.so diff --git a/glslang/.signature b/glslang/.signature index 4f6c80cc..308f9780 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35ZoDEAqP/dvk4jcWJKOEOy83uqYeNHLq2u5VWCh4g3DLFjgzIkoy+svf0l5eiIMHwbP9Cf7IsJ0vvxgZt5aGgo= -SHA256 (Pkgfile) = 67d520f9ac908b1c65876f054c4cede7a4313b2a77e1207eba83f69fcc07112c -SHA256 (.footprint) = 35fb146142d61e33717e5d383b97477555ace56a0306e309b983ebfe22f0ef0f +RWSagIOpLGJF3wAlS/nnZzxtjIQQqCfdMvzdLPV5Ivqs+lCGMxth80YxxGuuwB2Fq6jCtweRitRgvSYgS6uf1ghn1H+ThSoKpwY= +SHA256 (Pkgfile) = ffeed3e18664eab46cc3b39cbc8a5924e6fe2450858b45f47d95f79684539bdc +SHA256 (.footprint) = 6efc8343d6d8e000bcb8127c467203b1c2938fcc087ab826a00dd97c6f5b51e0 SHA256 (glslang-7.11.3113.tar.gz) = 4d238000162029f791cfcd65a28f10defa574516b94d9392695d27c8a1ce8b62 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 6b5f2c24..e5a2eff9 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -1,23 +1,40 @@ # Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator # URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler # Maintainer: Pedja, predivan at mts dot rs -# Depends on: cmake git +# Depends on: spirv-tools name=glslang version=7.11.3113 -release=1 +release=2 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar....) #source=(https://bitbucket.org/predivan/distfiles/downloads/$name-$version.tar.bz2) build() { cd $name-$version - python update_glslang_sources.py - mkdir build - cd build - cmake \ + + mkdir -p build-{shared,static} + + (cd build-shared + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON + make + ) + + (cd build-static + cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON ../ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF make - make DESTDIR=$PKG install + ) + + make -C build-shared DESTDIR=$PKG install + make -C build-static DESTDIR=$PKG install + + cd $PKG/usr/lib + for lib in *.so; do + ln -sf "${lib}" "${lib}.0" + done }