diff --git a/multimedia/graphics/assimp/actions.py b/multimedia/graphics/assimp/actions.py index 37a9c27fe3..0e3cdb3a2d 100644 --- a/multimedia/graphics/assimp/actions.py +++ b/multimedia/graphics/assimp/actions.py @@ -20,4 +20,4 @@ def install(): cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("LICENSE", "Readme.md", "README") + pisitools.dodoc("LICENSE", "Readme.md") diff --git a/multimedia/graphics/assimp/pspec.xml b/multimedia/graphics/assimp/pspec.xml index 61e0276276..a9ec33dd49 100644 --- a/multimedia/graphics/assimp/pspec.xml +++ b/multimedia/graphics/assimp/pspec.xml @@ -11,7 +11,7 @@ BSD A JavaScript 3D rendering API for Qt Quick APIs are provided for C and C++. There are various bindings to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS. - https://github.com/assimp/assimp/archive/v5.0.1.tar.gz + https://github.com/assimp/assimp/archive/v5.2.5.tar.gz ninja boost-devel @@ -23,7 +23,7 @@ git - assimp-3.3.1-install-pkgconfig.patch + @@ -56,6 +56,13 @@ + + 2022-10-06 + 5.2.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-01-03 5.0.1 diff --git a/util/crypt/nss/actions.py b/util/crypt/nss/actions.py index 7db74dc316..abfce4e752 100644 --- a/util/crypt/nss/actions.py +++ b/util/crypt/nss/actions.py @@ -41,25 +41,25 @@ def build(): shelltools.export("PKG_CONFIG_ALLOW_SYSTEM_LIBS", "1") shelltools.export("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", "1") - autotools.make("-C nss/coreconf -j1") - autotools.make("-C nss/lib/util -j1") + autotools.make("-C nss/coreconf -j2") + autotools.make("-C nss/lib/util -j2") autotools.make("-C nss/lib/dbm") - autotools.make("-C nss/lib/sysinit -j1") - autotools.make("-C nss all -j1") + autotools.make("-C nss/lib/sysinit -j2") + autotools.make("-C nss all -j2") def install(): for binary in ["*util", "shlibsign", "signtool", "signver", "ssltap"]: pisitools.insinto("/usr/bin","dist/Linux*/bin/%s" % binary, sym=False) for lib in ["*.a","*.chk","*.so"]: - pisitools.insinto("/usr/lib/nss","dist/Linux*/lib/%s" % lib, sym=False) + pisitools.insinto("/usr/lib","dist/Linux*/lib/%s" % lib, sym=False) # Headers for header in ["dist/private/nss/*.h","dist/public/nss/*.h"]: - pisitools.insinto("/usr/include/nss", header, sym=False) + pisitools.insinto("/usr/include/nss3", header, sym=False) # Drop executable bits from headers - shelltools.chmod("%s/usr/include/nss/*.h" % get.installDIR(), mode=0644) + shelltools.chmod("%s/usr/include/nss3/*.h" % get.installDIR(), mode=0644) # Install nss-config and nss.pc pisitools.insinto("/usr/lib/pkgconfig", "dist/pkgconfig/nss.pc") @@ -67,7 +67,10 @@ def install(): # create empty NSS database pisitools.dodir("/etc/pki/nssdb") - shelltools.export("LD_LIBRARY_PATH", "%s/usr/lib/nss" % get.installDIR()) + shelltools.export("LD_LIBRARY_PATH", "%s/usr/lib" % get.installDIR()) shelltools.system("%s/usr/bin/modutil -force -dbdir \"sql:%s/etc/pki/nssdb\" -create" % (get.installDIR(), get.installDIR())) shelltools.chmod("%s/etc/pki/nssdb/*" % get.installDIR(), 0644) pisitools.dosed("%s/etc/pki/nssdb/*" % get.installDIR(), get.installDIR(), "") + + # srt Conflicts + pisitools.remove("/usr/lib/libgtest.a") diff --git a/util/crypt/nss/files/generate-pc-config.sh b/util/crypt/nss/files/generate-pc-config.sh index 7d355140fe..61f4183a0d 100644 --- a/util/crypt/nss/files/generate-pc-config.sh +++ b/util/crypt/nss/files/generate-pc-config.sh @@ -3,10 +3,10 @@ # Generate nss.pc and nss-config from nss.pc.in and nss-config.in # Ozan Caglayan, 2010 -LIBDIR="/usr/lib/nss" +LIBDIR="/usr/lib" PREFIX="/usr" EXEC_PREFIX="/usr" -INCLUDEDIR="/usr/include/nss" +INCLUDEDIR="/usr/include/nss3" PKGCONFIG="dist/pkgconfig/nss.pc.in" NSSCONFIG="dist/pkgconfig/nss-config.in" diff --git a/util/crypt/nss/files/generate-pc-config.sh- b/util/crypt/nss/files/generate-pc-config.sh- new file mode 100644 index 0000000000..7d355140fe --- /dev/null +++ b/util/crypt/nss/files/generate-pc-config.sh- @@ -0,0 +1,46 @@ +#!/bin/bash + +# Generate nss.pc and nss-config from nss.pc.in and nss-config.in +# Ozan Caglayan, 2010 + +LIBDIR="/usr/lib/nss" +PREFIX="/usr" +EXEC_PREFIX="/usr" +INCLUDEDIR="/usr/include/nss" + +PKGCONFIG="dist/pkgconfig/nss.pc.in" +NSSCONFIG="dist/pkgconfig/nss-config.in" + +NSS_VMAJOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` +NSS_VMINOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` +NSS_VPATCH=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` +NSS_VERSION="$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH" +NSPR_VERSION=`nspr-config --version` + +echo "NSS_VMAJOR: $NSS_VMAJOR" +echo "NSS_VMINOR: $NSS_VMINOR" +echo "NSS_VPATCH: $NSS_VPATCH" +echo "NSS_VERSION: $NSS_VERSION" + +# Setup nss-config +cat $NSSCONFIG | sed -e "s,@prefix@,$PREFIX,g" \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ + > dist/pkgconfig/nss-config + +# Set executable bit +chmod 755 dist/pkgconfig/nss-config + +# Setup pkgconfig file +cat $PKGCONFIG | sed -e "s,@libdir@,$LIBDIR,g" \ + -e "s,@prefix@,$PREFIX,g" \ + -e "s,@exec_prefix@,$EXEC_PREFIX,g" \ + -e "s,@includedir@,$INCLUDEDIR,g" \ + -e "s,@NSS_VERSION@,$NSS_VERSION,g" \ + -e "s,@NSPR_VERSION@,$NSPR_VERSION,g" \ + > dist/pkgconfig/nss.pc + + +# Clear .in files +rm -rf $PKGCONFIG $NSSCONFIG diff --git a/util/crypt/nss/pspec.xml b/util/crypt/nss/pspec.xml index 8744f3d07f..9e9c8b7f49 100644 --- a/util/crypt/nss/pspec.xml +++ b/util/crypt/nss/pspec.xml @@ -15,7 +15,7 @@ library Network Security Services Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. - https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_82_RTM/src/nss-3.82.tar.gz + https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_83_RTM/src/nss-3.83.tar.gz nss.pc.in nss-config.in @@ -72,11 +72,18 @@ /usr/bin/nss-config /usr/include /usr/lib/pkgconfig - /usr/lib/nss/*.a + /usr/lib/*.a + + 2022-10-08 + 3.83 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-08-24 3.82