commit 28b5c38b7964a3654fcd5a1fec8811ddaf619d0d Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Apr 21 12:52:51 2019 +1000 [notify] glslang-32: new dependency spirv-tools-32 diff --git a/glslang-32/.footprint b/glslang-32/.footprint index c61ac1d..561e638 100644 --- a/glslang-32/.footprint +++ b/glslang-32/.footprint @@ -1,16 +1,18 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ +-rw-r--r-- root/root usr/lib32/libHLSL.a -rwxr-xr-x root/root usr/lib32/libHLSL.so +lrwxrwxrwx root/root usr/lib32/libHLSL.so.0 -> libHLSL.so -rw-r--r-- root/root usr/lib32/libOGLCompiler.a -rw-r--r-- root/root usr/lib32/libOSDependent.a --rwxr-xr-x root/root usr/lib32/libSPIRV-Tools-link.so --rwxr-xr-x root/root usr/lib32/libSPIRV-Tools-opt.so --rwxr-xr-x root/root usr/lib32/libSPIRV-Tools-reduce.so --rwxr-xr-x root/root usr/lib32/libSPIRV-Tools-shared.so --rwxr-xr-x root/root usr/lib32/libSPIRV-Tools.so +-rw-r--r-- root/root usr/lib32/libSPIRV.a -rwxr-xr-x root/root usr/lib32/libSPIRV.so +lrwxrwxrwx root/root usr/lib32/libSPIRV.so.0 -> libSPIRV.so +-rw-r--r-- root/root usr/lib32/libSPVRemapper.a -rwxr-xr-x root/root usr/lib32/libSPVRemapper.so +lrwxrwxrwx root/root usr/lib32/libSPVRemapper.so.0 -> libSPVRemapper.so +-rwxr-xr-x root/root usr/lib32/libglslang-default-resource-limits.so +lrwxrwxrwx root/root usr/lib32/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so +-rw-r--r-- root/root usr/lib32/libglslang.a -rwxr-xr-x root/root usr/lib32/libglslang.so -drwxr-xr-x root/root usr/lib32/pkgconfig/ --rw-r--r-- root/root usr/lib32/pkgconfig/SPIRV-Tools-shared.pc --rw-r--r-- root/root usr/lib32/pkgconfig/SPIRV-Tools.pc +lrwxrwxrwx root/root usr/lib32/libglslang.so.0 -> libglslang.so diff --git a/glslang-32/.signature b/glslang-32/.signature index ed46cf4..befa310 100644 --- a/glslang-32/.signature +++ b/glslang-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXW9Twu5L2ZC75hxo0agmUXdfuHw2TvYOLWQlOc+reQazBqCtER2d5RoGoPftne9AR8p43iNtUY4aP5856QgRbwk= -SHA256 (Pkgfile) = c2bd21ed560fb14e2a720c8afeeabbd845430cccd43ee2f4b80e2f96940bff47 -SHA256 (.footprint) = b755ceb3a6b73a5f155dd087ba7d831efab236247725a77611129f80e9754af3 +RWSwxGo/zH7eXddzWNGaxf+8m66VvMN8xTGrFZkphMAtGVMhYOTZe+PM9foyOklYCXEzu57cOjOiA7dkHGwhklz/OC9a39htnwI= +SHA256 (Pkgfile) = 119711d8aa5e81c534b0d6fe3c6398fa7f44ea890023f3925b4dc0f905246b3c +SHA256 (.footprint) = 3ec5fe7cd3621d51f5b2c04fd168dfadd8aa60b4e2f4cb37b37d661ea8a7551a SHA256 (glslang-7.11.3113.tar.gz) = 4d238000162029f791cfcd65a28f10defa574516b94d9392695d27c8a1ce8b62 diff --git a/glslang-32/Pkgfile b/glslang-32/Pkgfile index 9a01317..62f5c3f 100644 --- a/glslang-32/Pkgfile +++ b/glslang-32/Pkgfile @@ -1,31 +1,44 @@ # 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: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang +# Depends on: spirv-tools-32 glslang name=glslang-32 version=7.11.3113 -release=1 +release=2 source=(https://github.com/KhronosGroup/glslang/archive/$version/${name%-*}-$version.tar.gz) #source=(https://bitbucket.org/predivan/distfiles/downloads/${name%-*}-$version.tar.bz2) build() { cd ${name%-*}-$version - /usr/bin/python update_glslang_sources.py +mkdir -p build-{shared,static} - mkdir build - cd build + (cd build-shared + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib32 \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON + make + ) - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DBUILD_SHARED_LIBS=ON \ - -DENABLE_GLSLANG_BINARIES=OFF + (cd build-static + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib32 \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF + make + ) - make - make DESTDIR=$PKG install + make -C build-shared DESTDIR=$PKG install + make -C build-static DESTDIR=$PKG install - rm -r $PKG/usr/{bin,include} + cd $PKG/usr/lib32 + for lib in *.so; do + ln -sf "${lib}" "${lib}.0" + done + + rm -r $PKG/usr/{bin,include} }