diff --git a/bullet/PKGBUILD b/bullet/PKGBUILD index 4efb9b7..e8ee7dc 100644 --- a/bullet/PKGBUILD +++ b/bullet/PKGBUILD @@ -6,12 +6,10 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=bullet -pkgname=('bullet' 'bullet-docs' 'python-pybullet') +pkgname=('bullet' 'bullet-dp' 'bullet-docs' 'python-pybullet') pkgver=3.24 _pkgver=3.24 -# Upstream botched the tag so we're using the actual real commit for this release. -#_commit=6a59241074720e9df119f2f86bc01765917feb1e -pkgrel=01 +pkgrel=02 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('x86_64') url="http://www.bulletphysics.com/Bullet/" @@ -26,8 +24,9 @@ prepare() { } build() { - cd bullet3-${_pkgver} + cp -r bullet3-${_pkgver} bullet3-${_pkgver}-dp + cd bullet3-${_pkgver} cmake \ -Bbuild \ -GNinja \ @@ -39,22 +38,33 @@ build() { -DBUILD_PYBULLET_NUMPY=ON \ -DBUILD_OPENGL3_DEMOS=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DBULLET2_MULTITHREADING=ON \ -DCMAKE_SKIP_RPATH=YES - ninja -C build + # For Python and docs it doesn't matter whether we build multithreaded or not. python setup.py build doxygen + + cd ../bullet3-${_pkgver}-dp + cmake \ + -Bbuild \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=1 \ + -DINSTALL_LIBS=1 \ + -DINSTALL_EXTRA_LIBS=1 \ + -DBUILD_PYBULLET=ON \ + -DBUILD_PYBULLET_NUMPY=ON \ + -DBUILD_OPENGL3_DEMOS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DBULLET2_MULTITHREADING=ON \ + -DUSE_DOUBLE_PRECISION=ON \ + -DCMAKE_SKIP_RPATH=YES + ninja -C build } -package_bullet() { - optdepends=('glu: for the example browser' - 'python: python bindings' - 'python-numpy: python bindings' - 'bullet-docs: documentation') - - cd bullet3-${_pkgver} - +_package() { DESTDIR="${pkgdir}" ninja -C build install cd build @@ -67,7 +77,32 @@ package_bullet() { install -Dm755 examples/ExampleBrowser/App_ExampleBrowser "${pkgdir}"/opt/bullet/App_ExampleBrowser cp -r data "${pkgdir}"/opt/bullet/ - install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgbase}/LICENSE + install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_bullet() { + optdepends=('glu: for the example browser' + 'python: python bindings' + 'python-numpy: python bindings' + 'bullet-docs: documentation') + + cd bullet3-${_pkgver} + + _package +} + +package_bullet-dp() { + pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation (double precision)" + conflicts=("bullet") + provides=("bullet") + optdepends=('glu: for the example browser' + 'python: python bindings' + 'python-numpy: python bindings' + 'bullet-docs: documentation') + + cd bullet3-${_pkgver}-dp + + _package } package_python-pybullet() { @@ -101,3 +136,4 @@ license=('custom:zlib') sha256sums=(6b1e987d6f8156fa8a6468652f4eaad17b3e11252c9870359e5bca693e35780b # bullet-3.24.tar.gz 68ca940af489f7e9718fe9199cf0c3428c8e4d2b4ae1576847fffe56c0da50f7) # bullet3_examplebrowser.sh + diff --git a/bullet/PKGBUILD-arch b/bullet/PKGBUILD-arch index 18d10f9..85ff706 100644 --- a/bullet/PKGBUILD-arch +++ b/bullet/PKGBUILD-arch @@ -2,10 +2,10 @@ # Contributor: Christoph Zeiler pkgbase=bullet -pkgname=('bullet' 'bullet-docs' 'python-pybullet') +pkgname=('bullet' 'bullet-dp' 'bullet-docs' 'python-pybullet') pkgver=3.24 _pkgver=3.24 -pkgrel=1 +pkgrel=2 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('x86_64') url="http://www.bulletphysics.com/Bullet/" @@ -22,8 +22,9 @@ prepare() { } build() { - cd bullet3-${_pkgver} + cp -r bullet3-${_pkgver} bullet3-${_pkgver}-dp + cd bullet3-${_pkgver} cmake \ -Bbuild \ -GNinja \ @@ -35,22 +36,33 @@ build() { -DBUILD_PYBULLET_NUMPY=ON \ -DBUILD_OPENGL3_DEMOS=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DBULLET2_MULTITHREADING=ON \ -DCMAKE_SKIP_RPATH=YES - ninja -C build + # For Python and docs it doesn't matter whether we build multithreaded or not. python setup.py build doxygen + + cd ../bullet3-${_pkgver}-dp + cmake \ + -Bbuild \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=1 \ + -DINSTALL_LIBS=1 \ + -DINSTALL_EXTRA_LIBS=1 \ + -DBUILD_PYBULLET=ON \ + -DBUILD_PYBULLET_NUMPY=ON \ + -DBUILD_OPENGL3_DEMOS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DBULLET2_MULTITHREADING=ON \ + -DUSE_DOUBLE_PRECISION=ON \ + -DCMAKE_SKIP_RPATH=YES + ninja -C build } -package_bullet() { - optdepends=('glu: for the example browser' - 'python: python bindings' - 'python-numpy: python bindings' - 'bullet-docs: documentation') - - cd bullet3-${_pkgver} - +_package() { DESTDIR="${pkgdir}" ninja -C build install cd build @@ -63,7 +75,32 @@ package_bullet() { install -Dm755 examples/ExampleBrowser/App_ExampleBrowser "${pkgdir}"/opt/bullet/App_ExampleBrowser cp -r data "${pkgdir}"/opt/bullet/ - install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgbase}/LICENSE + install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_bullet() { + optdepends=('glu: for the example browser' + 'python: python bindings' + 'python-numpy: python bindings' + 'bullet-docs: documentation') + + cd bullet3-${_pkgver} + + _package +} + +package_bullet-dp() { + pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation (double precision)" + conflicts=("bullet") + provides=("bullet") + optdepends=('glu: for the example browser' + 'python: python bindings' + 'python-numpy: python bindings' + 'bullet-docs: documentation') + + cd bullet3-${_pkgver}-dp + + _package } package_python-pybullet() { diff --git a/bullet/deps b/bullet/deps index 6fa2622..02acd54 100644 --- a/bullet/deps +++ b/bullet/deps @@ -8,4 +8,3 @@ python python-numpy python-setuptools ninja - diff --git a/bullet/note b/bullet/note new file mode 100644 index 0000000..63a33c0 --- /dev/null +++ b/bullet/note @@ -0,0 +1 @@ +this build heats up your CPU, so lighten up on anything else running and choose some extra cool instance to run it diff --git a/bullet/time b/bullet/time index 9e3464e..5831120 100644 --- a/bullet/time +++ b/bullet/time @@ -1,4 +1,5 @@ -real 14m56.805s -user 50m14.314s -sys 3m39.807s +real 33m22.070s +user 96m7.343s +sys 5m15.576s + diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index bc3082f..94663a7 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -6,9 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=qt6-base -_qtver=6.3.0 +_qtver=6.3.1 pkgver=${_qtver/-/} -pkgrel=04 ## rebuild against postgresql +pkgrel=01 arch=(x86_64) url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework' @@ -29,12 +29,10 @@ groups=(qt6) #options=(debug) # uncomment this to have qt6-base-debug produced _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qtbug-102177.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=94751cbf qt6-base-cflags.patch qt6-base-nostrip.patch) prepare() { - patch -d $_pkgfn -p1 < qtbug-102177.patch # Fix crashes in QtCreator patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake @@ -83,7 +81,7 @@ package() { license=(GPL3 LGPL3 FDL custom) -sha256sums=(b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 # qtbase-everywhere-src-6.3.0.tar.xz - cc71e75acbda998a1f8f25ad3abe380886eef34899063344ead4df6a46efbcc9 # qtbug-102177.patch +sha256sums=(0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 # qtbase-everywhere-src-6.3.1.tar.xz 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch + diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index f316de6..4af262d 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino pkgname=qt6-base -_qtver=6.3.0 +_qtver=6.3.1 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -27,18 +27,15 @@ groups=(qt6) options=(debug) _pkgfn=${pkgname/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qtbug-102177.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=94751cbf qt6-base-cflags.patch qt6-base-nostrip.patch) -sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99' - 'cc71e75acbda998a1f8f25ad3abe380886eef34899063344ead4df6a46efbcc9' +sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') prepare() { patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake - patch -d $_pkgfn -p1 < qtbug-102177.patch # Fix crashes in QtCreator } build() { diff --git a/tor-alpha/deps b/tor-alpha/deps index 832a438..aa89d39 100644 --- a/tor-alpha/deps +++ b/tor-alpha/deps @@ -1,5 +1,4 @@ git -libevent asciidoc python automake diff --git a/tor/deps b/tor/deps index fd8b103..139597f 100644 --- a/tor/deps +++ b/tor/deps @@ -1,2 +1,2 @@ -libevent + diff --git a/unbound/PKGBUILD b/unbound/PKGBUILD index 941adbb..8873b9c 100644 --- a/unbound/PKGBUILD +++ b/unbound/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=unbound -pkgver=1.15.0 +pkgver=1.16.0 pkgrel=01 pkgdesc="Validating, recursive, and caching DNS resolver w/o systemd" arch=(x86_64) @@ -22,7 +22,7 @@ provides=(libunbound.so) backup=(etc/${pkgname}/${pkgname}.conf) source=( "https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc} - "${pkgname}-1.14.0-trust_anchor_file.patch" + ${pkgname}-1.14.0-trust_anchor_file.patch ${pkgname}-sysusers.conf ${pkgname}-tmpfiles.conf ${pkgname}-trusted-key.hook @@ -31,7 +31,7 @@ source=( prepare() { cd ${pkgname}-${pkgver} # enable trusted-anchor-file and set it to an unbound specific location - patch -Np1 -i ../"${pkgname}-1.14.0-trust_anchor_file.patch" + patch -p1 < ../${pkgname}-1.14.0-trust_anchor_file.patch autoreconf -fiv } @@ -87,22 +87,8 @@ license=(BSD) validpgpkeys=(EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D) # W.C.A. Wijngaards -sha512sums=('c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f' - 'SKIP' - '9590d3d459d96f99cbc7482fae0f5318dd22a034e45cff18079e4f3c9f9c3c1d7af90cdd5353fb469eac08c535555fd164097b496286b807b2117e8a3a6cd304' - 'ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585' - '6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712' - '613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d') - -b2sums=('e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870' - 'SKIP' - '0978ab5c0474ed29de9c0904a46d114413e094dafeadaac4f10cdbc19e4152fcc064d7cdb8c331da7c2531075aa699326b84e21da1a8218a6f00a10f0e107b3d' - '292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92' - 'd3951006b43068be904c6b91a9e0563d56228225854e12b40abbdd4ba9b47338e97265837297a6de879acbc8051bb749163f9457683f5e12fc29ac2e7b687fd3' - 'd28785390eb6c125bd26ca11f097fe8864b080482157deeb7c70e9bee47ff2844abaed574db59a7c152ed3ec0acba05cfee4c3751f7a9f553320b064578f86c7') - -sha256sums=(a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f # unbound-1.15.0.tar.gz - 6655bc6674d53caf652471bbb32d155f114beae6b0c4ae6d7108df75ef2c0fee # unbound-1.15.0.tar.gz.asc +sha256sums=(6701534c938eb019626601191edc6d012fc534c09d2418d5b92827db0cbe48a5 # unbound-1.16.0.tar.gz + ec42d27aa4b2e2733ff78196f9ef98e4a309ef3463a5057b15dd4e208ba3daea # unbound-1.16.0.tar.gz.asc 8e6e831e87484f8969a79bcd216b08b147935597c303101dad7ea1eb4cf3d326 # unbound-1.14.0-trust_anchor_file.patch 85b8f00881fb93bcce83bdfe3246463a396eb5b352c0d7f5fca32fcb839d22fa # unbound-sysusers.conf 31a573f43287dd7e3678be1680388bfc7d8dee8280eb2443f521a4b349aaa6b6 # unbound-tmpfiles.conf diff --git a/unbound/PKGBUILD-arch b/unbound/PKGBUILD-arch index 8edaaf0..21171ee 100644 --- a/unbound/PKGBUILD-arch +++ b/unbound/PKGBUILD-arch @@ -5,7 +5,7 @@ # Contributor: Massimiliano Torromeo pkgname=unbound -pkgver=1.15.0 +pkgver=1.16.0 pkgrel=1 pkgdesc="Validating, recursive, and caching DNS resolver" arch=(x86_64) @@ -22,18 +22,18 @@ provides=(libunbound.so) backup=(etc/${pkgname}/${pkgname}.conf) source=( "https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc} - "${pkgname}-1.14.0-trust_anchor_file.patch" + ${pkgname}-1.14.0-trust_anchor_file.patch ${pkgname}-sysusers.conf ${pkgname}-tmpfiles.conf ${pkgname}-trusted-key.hook ) -sha512sums=('c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f' +sha512sums=('134679c0baad6738541295fcfbf8cc701c647b5d5cd00f87e50394bc7b5b74b7326ed2fc42f3282cae8094b4980c1e580d7b748b7151642c9060c449b644715f' 'SKIP' '9590d3d459d96f99cbc7482fae0f5318dd22a034e45cff18079e4f3c9f9c3c1d7af90cdd5353fb469eac08c535555fd164097b496286b807b2117e8a3a6cd304' 'ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585' '6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712' '613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d') -b2sums=('e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870' +b2sums=('62d002e66a24d60a973c620855d9d33e2833f78bf45d9176081646683fe6f371564a40fb637e4b276c556e3b46eb57ff49ee6a7300e9a9e24cb09f4b8dd31695' 'SKIP' '0978ab5c0474ed29de9c0904a46d114413e094dafeadaac4f10cdbc19e4152fcc064d7cdb8c331da7c2531075aa699326b84e21da1a8218a6f00a10f0e107b3d' '292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92' @@ -44,7 +44,7 @@ validpgpkeys=(EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D) # W.C.A. Wijngaards