nss, assimp ver. bump

This commit is contained in:
Rmys
2022-10-08 20:38:19 +03:00
parent cfdc131152
commit 70bf119116
6 changed files with 78 additions and 15 deletions
+1 -1
View File
@@ -20,4 +20,4 @@ def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("LICENSE", "Readme.md", "README")
pisitools.dodoc("LICENSE", "Readme.md")
+9 -2
View File
@@ -11,7 +11,7 @@
<License>BSD</License>
<Summary>A JavaScript 3D rendering API for Qt Quick</Summary>
<Description>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.</Description>
<Archive sha1sum="f148ba31dc1e7e00e59cc09b25535af997dc1998" type="targz">https://github.com/assimp/assimp/archive/v5.0.1.tar.gz</Archive>
<Archive sha1sum="bf10d68c0c5417db48c327587a75c3a2a1613434" type="targz">https://github.com/assimp/assimp/archive/v5.2.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>ninja</Dependency>
<Dependency>boost-devel</Dependency>
@@ -23,7 +23,7 @@
<Dependency>git</Dependency>
</BuildDependencies>
<Patches>
<Patch>assimp-3.3.1-install-pkgconfig.patch</Patch>
<!-- <Patch>assimp-3.3.1-install-pkgconfig.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -56,6 +56,13 @@
</Package>
<History>
<Update release="7">
<Date>2022-10-06</Date>
<Version>5.2.5</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2021-01-03</Date>
<Version>5.0.1</Version>
+11 -8
View File
@@ -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")
+2 -2
View File
@@ -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"
@@ -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
+9 -2
View File
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>Network Security Services</Summary>
<Description>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.</Description>
<Archive sha1sum="badd239937a0bc7ee8f7e6d804256cd84e2dfc4b" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_82_RTM/src/nss-3.82.tar.gz</Archive>
<Archive sha1sum="d70ee12d64b3456065fd431ac993f1a41727b365" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_83_RTM/src/nss-3.83.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="dist/pkgconfig/nss.pc.in">nss.pc.in</AdditionalFile>
<AdditionalFile target="dist/pkgconfig/nss-config.in">nss-config.in</AdditionalFile>
@@ -72,11 +72,18 @@
<Path fileType="executable">/usr/bin/nss-config</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="library">/usr/lib/nss/*.a</Path>
<Path fileType="library">/usr/lib/*.a</Path>
</Files>
</Package>
<History>
<Update release="43">
<Date>2022-10-08</Date>
<Version>3.83</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="42">
<Date>2022-08-24</Date>
<Version>3.82</Version>