August 2019 - crux-commits

ports/contrib (3.5): mono: 6.0.0.319 -> 6.0.0.327
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit dab7232c5b0768e61d8ac1e675bea1c9885e9c45 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Aug 30 16:51:14 2019 +0000 mono: 6.0.0.319 -> 6.0.0.327 diff --git a/mono/.signature b/mono/.signature index 9d4d95cb..36677d74 100644 --- a/mono/.signature +++ b/mono/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34pjxd5MozFyX1VNb8zhv+0YCavFvJ7Ujf3IRxIuARwxEERAW6bbx2NJ1CrFKLgF010oBky03sgH72KC0FGxXQ0= -SHA256 (Pkgfile) = 1f40336da326ce90adb98ad730bf1d0532182df7e112bd3e4f1e6aa02f78efcc +RWSagIOpLGJF302KHQKw6aX/5aTwv4QCdm2ZJoO/sisz708uKlrOxBWAj/RRrVQHtMKNQOL5g2uzzsml4tLgqyfO7GV8jXAChw8= +SHA256 (Pkgfile) = 290c9c36a03486c81374181920b6fc2a92bae3ea194e03069692d326ee4b2c59 SHA256 (.footprint) = 96eb29adc33b055e0300717cb2fc2cfecfbcc7227415ce6f73673f1661b7847c -SHA256 (mono-6.0.0.319.tar.xz) = 6b4c80b88bf7688178797bfecc681e3dbc4c6810413c97d6f3c476061a8d261a +SHA256 (mono-6.0.0.327.tar.xz) = f51184ce4b90c93fc2bf5ca02775dd2a1ea023e056089d286ea72f1c68586442 diff --git a/mono/Pkgfile b/mono/Pkgfile index 968f623e..097343f3 100644 --- a/mono/Pkgfile +++ b/mono/Pkgfile @@ -5,7 +5,7 @@ # Depends on: python cmake zlib name=mono -version=6.0.0.319 +version=6.0.0.327 release=1 source=(http://download.mono-project.com/sources/$name/$name-$version.tar.x… build() {

1 0

ports/contrib (3.5): libappindicator-gtk3: some fixes
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 492ef7723d38e534b02cff0a464145e83c51dcbe Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Aug 30 16:05:56 2019 +0000 libappindicator-gtk3: some fixes diff --git a/libappindicator-gtk3/.signature b/libappindicator-gtk3/.signature index e385520e..27e46778 100644 --- a/libappindicator-gtk3/.signature +++ b/libappindicator-gtk3/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/aJUA5j6jKiQ4kmzf0vvIukUeqz3zMx3U6mwtIJ9zKhsAmzFowZdVvvNSrnmPPj2snL2X4SYcQaqlqMzARlhwU= -SHA256 (Pkgfile) = e577e49e7a988e39eb67b20802f37cb4c7332ca6be89eec7ce1f0018b6f6a16c +RWSagIOpLGJF35XPauo7dwjJM9lEgICoKsbA9nnyzv0G+V0TiJJGWgLq9G/S6KKdgb+dE/UP85SQ8bwEuBHDNs+SbF6NhEDEowQ= +SHA256 (Pkgfile) = 161f4ba9298502b5d2ada5abda6d9e24e0d26a4a9e8c463127f203e74d6316b9 SHA256 (.footprint) = 0f344ad028e87844c0bd006fe75421196f846e80ab02b84fd57a88452d9bbc37 SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 diff --git a/libappindicator-gtk3/Pkgfile b/libappindicator-gtk3/Pkgfile index 39e36de9..cf8f36eb 100644 --- a/libappindicator-gtk3/Pkgfile +++ b/libappindicator-gtk3/Pkgfile @@ -5,30 +5,30 @@ name=libappindicator-gtk3 version=16.10 -release=1 +release=2 source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz 0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch conditional-py-bindings.patch disable-mono.patch gtk3.patch improved-plasma-support.patch vala-inherit.patch) build() { cd libappindicator-$version - patch -p1 --verbose < ../gtk3.patch + patch -p1 -i $SRC/gtk3.patch # The next 3 patches shamelessly pinched from Arch - patch -p1 --verbose < ../0001-Glib.Timeout-fix.patch - patch -p1 --verbose < ../0002-Fix-mono-nunit-pkgconfig-name.patch - patch -p1 --verbose < ../0003-Fix-Mono-assemblies-directory.patch + patch -p1 -i $SRC/0001-Glib.Timeout-fix.patch + patch -p1 -i $SRC/0002-Fix-mono-nunit-pkgconfig-name.patch + patch -p1 -i $SRC/0003-Fix-Mono-assemblies-directory.patch # This one is also from Arch(ish), but had to be recreated best it could - patch -p1 --verbose < ../improved-plasma-support.patch + patch -p1 -i $SRC/improved-plasma-support.patch # Patch pinched from Gentoo - patch -p1 --verbose < ../conditional-py-bindings.patch + patch -p1 -i $SRC/conditional-py-bindings.patch # Removed a function which had no declaration - patch -p1 --verbose < ../badfunction.patch + patch -p1 -i $SRC/badfunction.patch # Having mono or gtk-sharp installed kills this build - patch -p1 --verbose < ../disable-mono.patch + patch -p1 -i $SRC/disable-mono.patch sed -i -e 's/ -Werror//' src/Makefile.am sed -e 's/--enable-gtk-doc//g' -i autogen.sh @@ -36,8 +36,12 @@ build() { CXXFLAGS="$CXXFLAGS -std=c++11" \ ./configure --prefix=/usr \ --localstatedir=/var \ - --disable-{gtk-doc-html,mono-test,static,tests} \ + --disable-{gtk-doc-html,python,mono-test,static,tests} \ --with-gtk=3 + #sed -e 's/DIST_SUBDIRS = vala python mono/DIST_SUBDIRS = vala/g' \ + # -e 's/am__append_1 = python//g' \ + # -e 's/am__append_2 = mono//g' \ + # -i bindings/Makefile make make DESTDIR=$PKG -j1 install #make DESTDIR=$PKG -j1 -C bindings/mono uninstall

1 0

ports/compat-32 (3.5): libgcrypt-32: 1.8.4 -> 1.8.5
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 912e6df995e4d8e7a6af9151a66387dbfc9b321c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:22:17 2019 +1000 libgcrypt-32: 1.8.4 -> 1.8.5 diff --git a/libgcrypt-32/.footprint b/libgcrypt-32/.footprint index 4141434..5363406 100644 --- a/libgcrypt-32/.footprint +++ b/libgcrypt-32/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgcrypt.a -rwxr-xr-x root/root usr/lib32/libgcrypt.la -lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.2.4 -lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.2.4 --rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.2.4 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.2.5 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.2.5 +-rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.2.5 +drwxr-xr-x root/root usr/lib32/pkgconfig/ +-rw-r--r-- root/root usr/lib32/pkgconfig/libgcrypt.pc diff --git a/libgcrypt-32/.signature b/libgcrypt-32/.signature index 7218137..be67c5c 100644 --- a/libgcrypt-32/.signature +++ b/libgcrypt-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXaJJKG5PuBhc/BXOVHL6SoaXsySMyjefNmPNGIETZ3gCcmO3T53F0Z5sfrPTz1MdVozOp7jhsRkEnk440GVQgAU= -SHA256 (Pkgfile) = d19bafe4e2dfa4209214dcfdbd68b8c24c7cc7c9e997e387149eb2c8e9fd06e2 -SHA256 (.footprint) = fc8ffbc9065515c3bbb14d5be4df165b845adf56e522ccdb0caedf95c72d3d0b -SHA256 (libgcrypt-1.8.4.tar.bz2) = f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 +RWSwxGo/zH7eXaqD1qYYQF3ZBjUZE2cZ/gMAzA6XOPasDs7EqanX2fdewmhviVxXC8lNsHqS7BPsbOCr28wiq03ZJ8i3qBlxZQU= +SHA256 (Pkgfile) = cf5ceb8cfbe0d203a997fe40e56d8b4c6b0a5d3e73391a5a53069e818b45b36f +SHA256 (.footprint) = 9e359d4317d9f90f9af9bfd62453e0b294a956e833ded34a0b3b20ba3b9cef9c +SHA256 (libgcrypt-1.8.5.tar.bz2) = 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 diff --git a/libgcrypt-32/Pkgfile b/libgcrypt-32/Pkgfile index ccbfd47..e3c16f4 100644 --- a/libgcrypt-32/Pkgfile +++ b/libgcrypt-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgcrypt libgpg-error-32 name=libgcrypt-32 -version=1.8.4 +version=1.8.5 release=1 source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar…

1 0

ports/compat-32 (3.5): libusb-32: 1.0.22 -> 1.0.23
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit b5f4e937b3fa91564f072ed2553402c547c5357e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:21:42 2019 +1000 libusb-32: 1.0.22 -> 1.0.23 diff --git a/libusb-32/.footprint b/libusb-32/.footprint index a252424..d42d539 100644 --- a/libusb-32/.footprint +++ b/libusb-32/.footprint @@ -2,8 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libusb-1.0.a -rwxr-xr-x root/root usr/lib32/libusb-1.0.la -lrwxrwxrwx root/root usr/lib32/libusb-1.0.so -> libusb-1.0.so.0.1.0 -lrwxrwxrwx root/root usr/lib32/libusb-1.0.so.0 -> libusb-1.0.so.0.1.0 --rwxr-xr-x root/root usr/lib32/libusb-1.0.so.0.1.0 +lrwxrwxrwx root/root usr/lib32/libusb-1.0.so -> libusb-1.0.so.0.2.0 +lrwxrwxrwx root/root usr/lib32/libusb-1.0.so.0 -> libusb-1.0.so.0.2.0 +-rwxr-xr-x root/root usr/lib32/libusb-1.0.so.0.2.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libusb-1.0.pc diff --git a/libusb-32/.signature b/libusb-32/.signature index 6d56768..7bd6edb 100644 --- a/libusb-32/.signature +++ b/libusb-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXbuNj+63/nwEtdF96IgqR9VE1djmRXywk30rM4EwaOAHssFhm7oGld/xcCnIGPPlqOcbRHy2rWcyu5/hb9m1iAY= -SHA256 (Pkgfile) = 8a7a01c8d7d6bb613a3122cdcf64a5c1c7b85803a3466884d44a94f1ff32b73b -SHA256 (.footprint) = 786e1b41388ed36921aa9b7209374d4cad9a0384eee93b819519b614d725ef60 -SHA256 (libusb-1.0.22.tar.bz2) = 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 +RWSwxGo/zH7eXdHcD3MNSyIQSMtVqguxryBPqtqj+mGVVRBniK9CLqbVKUdylZB3bsdjPFUg2lKuEGupJLWolLM3krplU2b/TQM= +SHA256 (Pkgfile) = 530a1c550a5e760c087973dad3ca653c35c283a4a274d586e2cefc3e7119644b +SHA256 (.footprint) = 5dfaf35f1b9fcedd9207842ef7c55efe83a433fcfe9906de24f7a67b5faaea6a +SHA256 (libusb-1.0.23.tar.bz2) = db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d diff --git a/libusb-32/Pkgfile b/libusb-32/Pkgfile index 155788b..de72513 100644 --- a/libusb-32/Pkgfile +++ b/libusb-32/Pkgfile @@ -4,9 +4,9 @@ # Depends on: eudev-32 libusb name=libusb-32 -version=1.0.22 +version=1.0.23 release=1 -source=(https://downloads.sourceforge.net/project/${name%-*}/${name%-*}-1.0/${name%-*}-${version%-*}/${name%-*}-$version.tar.bz2) +source=(https://github.com/libusb/libusb/releases/download/v$version/${name%-*}-$version.tar.bz2) build () { cd ${name%-*}-$version

1 0

ports/compat-32 (3.5): [notify] vulkan-validation-layers-32: add build jobs, added deps: spirv-tools-32 glslang removed: glslang-32
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit fa8b0976aad510c34dcd8b0f7df2b9298bf56b00 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:02:35 2019 +1000 [notify] vulkan-validation-layers-32: add build jobs, added deps: spirv-tools-32 glslang removed: glslang-32 diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index 89e7323..aadea0c 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXThO16l1OVdaZCIDzdc3wwEBkx8itw9SwTY0rYdFhXubRgcNiT0U46Qpya8hITgCMCU/Vr6JKYNFBGH2125qcw8= -SHA256 (Pkgfile) = 7bb0b5dc7923804523bbeb60b77de4d53b808bcd50b966533bdd3d4fa0cca038 +RWSwxGo/zH7eXaitYo9BAc4UbJc8jOwfbVKJ8T7T6aFncwDirzcSrnYs3IDtOEL7MLbM2B1+MX2tOSeec4GaquqgGK2EirNfoQc= +SHA256 (Pkgfile) = a268b6fa1661ca1a075b104db967b6d98a86896fa7a0684a1e5ff74529b590aa SHA256 (.footprint) = a3c7b208aceb77f2d83a5e706f9ef3b951e047be12e9cd17dbfa14123cf91cba SHA256 (Vulkan-ValidationLayers-sdk-1.1.114.0.tar.gz) = b1634aea4cc130b1fcbeea576e65a17c40daf4fa8b1eaafbc6c36e447aa2344e diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index 2840cf9..b0dc552 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -1,7 +1,7 @@ # Description: Vulkan validation layers, 32bit # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang-32 vulkan-loader-32 vulkan-validation-layers +# Depends on: spirv-tools-32 vulkan-loader-32 vulkan-validation-layers name=vulkan-validation-layers-32 version=1.1.114.0 @@ -28,7 +28,7 @@ build() { -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -GNinja - ninja + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install rm -r $PKG/usr/{include,share}

1 0

ports/compat-32 (3.5): [notify] vulkan-tools-32: add build jobs, change dependency glslang-32 -> glslang
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit a507a4ea86799e576403952682608729789956cb Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:01:10 2019 +1000 [notify] vulkan-tools-32: add build jobs, change dependency glslang-32 -> glslang diff --git a/vulkan-tools-32/.signature b/vulkan-tools-32/.signature index 44c6bdd..aa0734f 100644 --- a/vulkan-tools-32/.signature +++ b/vulkan-tools-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXTAI7sAcSo68OWyF7Whvq7axVPUELf0DkoHfWVtnlaSfMjXx7uVUwWXbaZgESIu0sgFhPlfPtsYrChY8v7do4QE= -SHA256 (Pkgfile) = 00c415bf917aa12dc1b9646564ae24d8978eb86aaca46e1339f9c700711b76a8 +RWSwxGo/zH7eXd2bSsMOxSpGzPvSCfHRVyJu0jjDbvTX5Pa2Jx9Yvgq/Z+umy7HKXcbfjr2T4Z7FnYsyCiAfUbNl4IA4gzqkdQo= +SHA256 (Pkgfile) = 23559044b76935a4433219a866d835d1fc7da6937e93dc758f38a6e5c21fe86f SHA256 (.footprint) = 87637197eea1098d4b7b48a2c38eaf7d6a306005fb53696ed5fb268190daf397 SHA256 (Vulkan-Tools-sdk-1.1.114.0.tar.gz) = 7310390143479d633abac152f08220448a458598e04d8c8c3ff354abb93d1184 diff --git a/vulkan-tools-32/Pkgfile b/vulkan-tools-32/Pkgfile index ce984fb..2048868 100644 --- a/vulkan-tools-32/Pkgfile +++ b/vulkan-tools-32/Pkgfile @@ -1,7 +1,7 @@ # Description: Vulkan tools # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang-32 vulkan-loader-32 +# Depends on: glslang vulkan-loader-32 name=vulkan-tools-32 version=1.1.114.0 @@ -30,7 +30,7 @@ build() { -DBUILD_ICD=OFF \ -GNinja - ninja + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install for app in $PKG/usr/bin/* ; do

1 0

ports/compat-32 (3.5): vulkan-loader-32: use ninja, add build jobs
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 3c9ed6dfb3a85d9272d5f53ce69ccb180fdc93ef Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 00:59:39 2019 +1000 vulkan-loader-32: use ninja, add build jobs diff --git a/vulkan-loader-32/.signature b/vulkan-loader-32/.signature index 64467a7..dc19f27 100644 --- a/vulkan-loader-32/.signature +++ b/vulkan-loader-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXZfkdgacKKit6xfGuNePYEZHeCmuNx1ABUxf+nMva84B/m36wXAW13fPYpUlV8kfxNovToeHfNWasBsZC47fGAw= -SHA256 (Pkgfile) = dd367eaa39f84b478c95c0188b9844b602cfb0bdb6da6cdec403a4811fff7fbc +RWSwxGo/zH7eXQk6Dl7qi96gHffh94RW6UhlmKZxj9lPgerCinSjt7RVkdW17N4ip/oaXO0emz7U8M6uD5R1F3Dot2oDwnashAE= +SHA256 (Pkgfile) = 9c7fd9a0ddfd9fdde35da2fc5dc4175a9151e1a2184d801f873f237fcea0bbb1 SHA256 (.footprint) = 6f758bc3c45eb40cb869dd4a522aa951a9f0f713e5ac1eef7d8e497ae788a208 SHA256 (Vulkan-Loader-sdk-1.1.114.0.tar.gz) = 00d88ebd6d48be23e24a88faf0225b0c1faf28f0532083a12019095312edff43 diff --git a/vulkan-loader-32/Pkgfile b/vulkan-loader-32/Pkgfile index 68e456f..d0e81fd 100644 --- a/vulkan-loader-32/Pkgfile +++ b/vulkan-loader-32/Pkgfile @@ -25,8 +25,9 @@ build() { -DBUILD_LOADER=True \ -DBUILD_WSI_XCB_SUPPORT=True \ -DBUILD_WSI_XLIB_SUPPORT=True \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ + -GNinja - make - make DESTDIR=$PKG install + ninja -j ${JOBS:-1} + DESTDIR=$PKG ninja install }

1 0

ports/compat-32 (3.5): spirv-tools-32: add build jobs
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit bb669a76d5cdceec1a8a7d15b00dbc212488c793 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 00:58:43 2019 +1000 spirv-tools-32: add build jobs diff --git a/spirv-tools-32/.signature b/spirv-tools-32/.signature index 7ef0211..040de0c 100644 --- a/spirv-tools-32/.signature +++ b/spirv-tools-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXYypuOky86GnFJRdU83L0GsMXEUmn4znyAtfhgGJ3biBEvDYRhFRYtbZMAa9S06GCG0hPVFzYEUGG3RcbyInYAA= -SHA256 (Pkgfile) = 10eb76ee9822bf30751ecf382b2ea5d69e1cca7f50569dee4561d879e3765c47 +RWSwxGo/zH7eXXEo/qY2btEL/IueGF07GlfvfiY0nuYwVIJ6DnQxP1uwP1Gg9zJlfBbV8KrOMZb9dbkPwZiFBjbQ7QAdmw96WwI= +SHA256 (Pkgfile) = 12e8e37a324071b7aa2b20e3e25d896390fd94899330461a6abd35415743570b SHA256 (.footprint) = 18875d5e13ef976316368e5988ca8109818607102812599965f9dbfd4675b9ca SHA256 (aa9e8f538041db3055ea443080e0ccc315fa114f) = 7d84713e5760108991edb02b0e65dcf46ce7a1137108a46a9e9d204c8a8fb40d diff --git a/spirv-tools-32/Pkgfile b/spirv-tools-32/Pkgfile index e85ee05..42bb95a 100644 --- a/spirv-tools-32/Pkgfile +++ b/spirv-tools-32/Pkgfile @@ -31,7 +31,7 @@ build() { -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -G Ninja - ninja + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install rm -r $PKG/usr/{bin,include}

1 0

ports/compat-32 (3.5): [notify] glslang-32: dropped, not required
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 8a28a9337f85ce9edb90a9810f81a55e9be5a8ae Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 00:57:52 2019 +1000 [notify] glslang-32: dropped, not required diff --git a/glslang-32/.32bit b/glslang-32/.32bit deleted file mode 100644 index e69de29..0000000 diff --git a/glslang-32/.footprint b/glslang-32/.footprint deleted file mode 100644 index 561e638..0000000 --- a/glslang-32/.footprint +++ /dev/null @@ -1,18 +0,0 @@ -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 --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 -lrwxrwxrwx root/root usr/lib32/libglslang.so.0 -> libglslang.so diff --git a/glslang-32/.signature b/glslang-32/.signature deleted file mode 100644 index 0ebe2c8..0000000 --- a/glslang-32/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXduui1p/vktONppv0YkQJwCQDU0xWjAgwo36+ae22ohUmQTLsdwIQ00REKJeUXnDud9Sg+h+HdEM/XmeScO2qwE= -SHA256 (Pkgfile) = 2d5f0f314493aaea694a1551babd2a41c4a2508cb18d352e5791ce693bc0c2d8 -SHA256 (.footprint) = 3ec5fe7cd3621d51f5b2c04fd168dfadd8aa60b4e2f4cb37b37d661ea8a7551a -SHA256 (glslang-7.12.3352.tar.gz) = 4ecce011b73dd7196a5114f66776d5a4c4c3674fc9bc6f39ad3c1ee15a8abbe1 -SHA256 (0001-pkg-config-compatibility.patch) = efd22887303f1c6cdaacd31d6049438502bc7d699859fd501d075b8ab6f3ae42 diff --git a/glslang-32/0001-pkg-config-compatibility.patch b/glslang-32/0001-pkg-config-compatibility.patch deleted file mode 100644 index 38592ff..0000000 --- a/glslang-32/0001-pkg-config-compatibility.patch +++ /dev/null @@ -1,225 +0,0 @@ -https://src.fedoraproject.org/rpms/glslang/raw/master/f/0001-pkg-config-compatibility.patch -https://src.fedoraproject.org/rpms/glslang/tree/master -https://github.com/KhronosGroup/glslang/pull/1621 - -From d2a8230cc05d77dad82a60329881244814797e4c Mon Sep 17 00:00:00 2001 -From: Rafael Amador Galvan <rafael.amador(a)gmail.com> -Date: Fri, 8 Mar 2019 11:39:58 -0600 -Subject: [PATCH 1/2] pkg-config compatibility - ---- - CMakeLists.txt | 13 ++++++++----- - SPIRV/CMakeLists.txt | 19 +++++++++++++++++-- - SPIRV/SpvTools.cpp | 4 ++-- - SPIRV/spirv.pc.cmake.in | 11 +++++++++++ - StandAlone/CMakeLists.txt | 9 ++++++++- - glslang/CMakeLists.txt | 3 +++ - glslang/glslang.pc.cmake.in | 11 +++++++++++ - 7 files changed, 60 insertions(+), 10 deletions(-) - create mode 100644 SPIRV/spirv.pc.cmake.in - create mode 100644 glslang/glslang.pc.cmake.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aafa70ed1..21ecef08d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,13 @@ macro(glslang_pch SRCS PCHCPP) - endmacro(glslang_pch) - - project(glslang) -+ -+# using pkg-config to configure include paths and link libraries -+include(FindPkgConfig) -+pkg_check_modules(SPIRV_TOOLS REQUIRED SPIRV-Tools>=2019.2.1) -+if(BUILD_SHARED_LIBS) -+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1) -+endif(BUILD_SHARED_LIBS) - # make testing optional - include(CTest) - -@@ -117,11 +124,7 @@ endfunction(glslang_set_link_args) - # We depend on these for later projects, so they should come first. - add_subdirectory(External) - --if(NOT TARGET SPIRV-Tools-opt) -- set(ENABLE_OPT OFF) --endif() -- --if(ENABLE_OPT) -+if(${SPIRV_TOOLS_FOUND} EQUAL 1) - message(STATUS "optimizer enabled") - add_definitions(-DENABLE_OPT=1) - else() -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 1997e74c3..1760a065b 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -48,6 +48,10 @@ set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC ..) - -+ -+set(SPIRV_NAME spirv) -+set(SPIRV_VERSION 1.3) -+ - if (ENABLE_SPVREMAPPER) - add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -@@ -61,13 +65,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - endif() - -+target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) -+target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_CFLAGS_OTHER}) -+target_link_libraries(SPIRV ${SPIRV_TOOLS_LIBRARIES}) -+if(BUILD_SHARED_LIBS) -+ target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) -+ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER}) -+ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES}) -+endif(BUILD_SHARED_LIBS) -+ - if(ENABLE_OPT) - target_include_directories(SPIRV - PRIVATE ${spirv-tools_SOURCE_DIR}/include - PRIVATE ${spirv-tools_SOURCE_DIR}/source - ) -- target_link_libraries(SPIRV glslang SPIRV-Tools-opt) -- target_include_directories(SPIRV PUBLIC ../External) -+ target_link_libraries(SPIRV glslang) - else() - target_link_libraries(SPIRV glslang) - endif(ENABLE_OPT) -@@ -96,5 +108,8 @@ if(ENABLE_GLSLANG_INSTALL) - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -+ # spirv.pc Configuration -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp -index eec06e0ac..723a64452 100644 ---- a/SPIRV/SpvTools.cpp -+++ b/SPIRV/SpvTools.cpp -@@ -43,8 +43,8 @@ - #include <iostream> - - #include "SpvTools.h" --#include "spirv-tools/optimizer.hpp" --#include "spirv-tools/libspirv.h" -+#include <spirv-tools/optimizer.hpp> -+#include <spirv-tools/libspirv.h> - - namespace glslang { - -diff --git a/SPIRV/spirv.pc.cmake.in b/SPIRV/spirv.pc.cmake.in -new file mode 100644 -index 000000000..dfcad940b ---- /dev/null -+++ b/SPIRV/spirv.pc.cmake.in -@@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @SPIRV_NAME@ -+ Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan -+ Requires: -+ Version: @SPIRV_VERSION@ -+ Libs: -L${libdir} -lSPIRV -+ Cflags: -I${includedir} -\ No newline at end of file -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 5cea53d9f..89a7da9c4 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -23,6 +23,14 @@ set(LIBRARIES - SPVRemapper - glslang-default-resource-limits) - -+if(BUILD_SHARED_LIBS) -+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) -+else() -+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) -+endif(BUILD_SHARED_LIBS) -+ - if(WIN32) - set(LIBRARIES ${LIBRARIES} psapi) - elseif(UNIX) -@@ -33,7 +41,6 @@ endif(WIN32) - - target_link_libraries(glslangValidator ${LIBRARIES}) - target_link_libraries(spirv-remap ${LIBRARIES}) --target_include_directories(glslangValidator PUBLIC ../External) - - if(WIN32) - source_group("Source" FILES ${SOURCES}) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 5f51476ba..daf717fab 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -80,6 +80,7 @@ set(HEADERS - # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) - -+set(VERSION 7.11.3113) - glslang_pch(SOURCES MachineIndependent/pch.cpp) - - add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -113,6 +114,8 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif(ENABLE_GLSLANG_INSTALL) - - if(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in -new file mode 100644 -index 000000000..921497eb6 ---- /dev/null -+++ b/glslang/glslang.pc.cmake.in -@@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @PROJECT_NAME@ -+ Description: OpenGL and OpenGL ES shader front end and validator -+ Requires: -+ Version: @VERSION@ -+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -+ Cflags: -I${includedir} -\ No newline at end of file - -From 0ebd323091567c65be3f2831a3bcac6223b0aa52 Mon Sep 17 00:00:00 2001 -From: Rafael Amador Galvan <rafael.amador(a)gmail.com> -Date: Fri, 8 Mar 2019 11:50:49 -0600 -Subject: [PATCH 2/2] removed the section belonging to the SPIRV-Tools - dependency - ---- - External/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt -index 4d9690134..24f03237a 100644 ---- a/External/CMakeLists.txt -+++ b/External/CMakeLists.txt -@@ -34,10 +34,3 @@ if(BUILD_TESTING) - endif() - endif() - --if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) -- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) -- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") -- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) -- endif() --endif() -- diff --git a/glslang-32/Pkgfile b/glslang-32/Pkgfile deleted file mode 100644 index 609021c..0000000 --- a/glslang-32/Pkgfile +++ /dev/null @@ -1,49 +0,0 @@ -# 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 spirv-tools-32 - -name=glslang-32 -version=7.12.3352 -release=1 -source=(https://github.com/KhronosGroup/glslang/archive/$version/${name%-*}-$version.tar.gz - 0001-pkg-config-compatibility.patch) - -build() { - cd ${name%-*}-$version - - # Patch to build against system spirv-tools - patch -p1 -i $SRC/0001-pkg-config-compatibility.patch - - mkdir -p build-{shared,static} - - (cd build-shared - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=ON - ninja - ) - - (cd build-static - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=OFF - ninja - ) - - DESTDIR=$PKG ninja -C build-shared install - DESTDIR=$PKG ninja -C build-static install - - cd $PKG/usr/lib32 - for lib in *.so; do - ln -sf "${lib}" "${lib}.0" - done - - rm -r $PKG/usr/{bin,include} -}

1 0

ports/opt (3.5): glslang: add build jobs, clean dependencies and clean up cmake options
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 743e6fc75da4f06d4999d83d1ca9c90927f1fbfd Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 00:44:47 2019 +1000 glslang: add build jobs, clean dependencies and clean up cmake options diff --git a/glslang/.signature b/glslang/.signature index 786e0775e..93495e7c2 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YuV3BdLYNX0t6/D9KsUD4fYvKe3YuPHQd1qnSCyFeDUUzZLIpe7vfJyfJefn9b+Yz6DK7TuKbEyP4YH2kAPSAM= -SHA256 (Pkgfile) = dad44f1814ec929b22159294bdc0d312d38679c20b9e1eecc9258004b4f685aa +RWSE3ohX2g5d/Sg5KlrHswWUMt55cON/wslr+lpO5bRyuGwQmyYprr2EoAMTmNAUDmFpHDvks3UrLKZxsOM6FIFoY/yz3gpu1Aw= +SHA256 (Pkgfile) = b76e4aeec44d6710f56a654385ed581ddfc1cefd144c27b3199fda8850b76163 SHA256 (.footprint) = b90552690b53fdf57ea6da5448d7e9e18ddabc8bba8ff7fd3fcef7b58c1bed1c SHA256 (glslang-7.12.3352.tar.gz) = 4ecce011b73dd7196a5114f66776d5a4c4c3674fc9bc6f39ad3c1ee15a8abbe1 SHA256 (0001-pkg-config-compatibility.patch) = efd22887303f1c6cdaacd31d6049438502bc7d699859fd501d075b8ab6f3ae42 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index c3398102f..55b5f2de1 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -17,24 +17,20 @@ build() { mkdir -p build-{shared,static} + local config=" +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DCMAKE_BUILD_TYPE=Release \ +-GNinja" + (cd build-shared - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=ON - ninja + cmake .. $config -DBUILD_SHARED_LIBS=ON + ninja -j ${JOBS:-1} ) (cd build-static - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=OFF - ninja + cmake .. $config -DBUILD_SHARED_LIBS=OFF + ninja -j ${JOBS:-1} ) DESTDIR=$PKG ninja -C build-shared install

1 0