diff options
Diffstat (limited to 'user')
89 files changed, 1822 insertions, 671 deletions
diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index 31c586984..b864f1105 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.1 +pkgver=8.0.2 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="be943e854c6c2d3f85332b456be9fb3c3528fac403228a7d4ab9362856d53ea622ba9e96b70f7be47058aa0016eec78381dc7649db3b06938d4547ba1e181517 alkimia-8.0.1.tar.xz" +sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz" diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 4f328d84f..7177dfbad 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.32.0 +pkgver=2.34.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -15,26 +15,17 @@ makedepends="$depends_dev at-spi2-core-dev glib-dev intltool libxml2-dev meson subpackages="$pkgname-dev" source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393 at-spi2-atk-2.32.0.tar.xz" +sha512sums="515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04 at-spi2-atk-2.34.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index edd3dd5f3..92c017b61 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.32.1 +pkgver=2.34.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -16,19 +16,16 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz" build() { - cd "$builddir" meson --prefix=/usr builddir/ ninja -C builddir/ } check() { - cd "$builddir" ninja -C builddir/ test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca at-spi2-core-2.32.1.tar.xz" +sha512sums="99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 at-spi2-core-2.34.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c87c8dfd7..c6040d0c6 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.32.0 +pkgver=2.34.1 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -11,26 +11,17 @@ makedepends="glib-dev gobject-introspection-dev gtk-doc meson musl-utils ninja" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr -Dintrospection=true -Ddocs=true - ninja + meson -Dprefix=/usr -Dintrospection=true -Ddocs=true build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22 atk-2.32.0.tar.xz" +sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e atk-2.34.1.tar.xz" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 872c88857..3f142bcfc 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.4 +pkgver=9.14.6 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -147,7 +147,7 @@ tools() { done } -sha512sums="f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 bind-9.14.4.tar.gz +sha512sums="129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 bind-9.14.6.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 4dfbcdec6..e8df804e5 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.2 +pkgver=3.7.4 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -46,4 +46,4 @@ package() { done } -sha512sums="3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147 ccache-3.7.2.tar.xz" +sha512sums="cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 ccache-3.7.4.tar.xz" diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index db7d90abe..052386d04 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=certbot -pkgver=0.37.1 +pkgver=0.39.0 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -38,4 +38,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="c6a54a795823d5ba7178adc3c494703c120a7c748f402c2afa626eadeca6d73acd03e0ec96c553ef12f6839dfb268608b590efc6b0d574382f3c44a258059999 certbot-0.37.1.tar.gz" +sha512sums="17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0 certbot-0.39.0.tar.gz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD new file mode 100644 index 000000000..ede81a9c5 --- /dev/null +++ b/user/cloc/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=cloc +pkgver=1.84 +pkgrel=0 +pkgdesc="Perl utility for counting lines of code in various languages" +url="https://github.com/AlDanial/cloc" +arch="all" +license="GPL-2.0+" +depends="perl perl-regexp-common perl-algorithm-diff" +checkdepends="perl-parallel-forkmanager" +subpackages="$pkgname-doc" +source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz" + +build() { + cd Unix + make DESTDIR="$pkgdir" doc +} + +check() { + cd Unix + make DESTDIR="$pkgdir" test-perl +} + +package() { + cd Unix + make DESTDIR="$pkgdir" install +} + +sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 988cfbae5..88160df56 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,11 +1,12 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=dconf -pkgver=0.32.0 +pkgver=0.34.0 pkgrel=0 pkgdesc="Configuration management for the Gnome desktop environment" url="https://gnome.org" arch="all" +options="!check" # Requires running D-Bus daemon. license="LGPL-2.0+ AND LGPL-2.1+" depends="dbus" makedepends="meson ninja @@ -14,24 +15,19 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz" build() { - cd "$builddir" meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ + -Dprefix=/usr \ --buildtype=release \ - . output - ninja -C output + . build + ninja -C build } check() { - cd "$builddir" + ninja -C build test } package() { - cd "$builddir" - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 dconf-0.32.0.tar.xz" +sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz" diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD index 438cf665b..9f02d79a6 100644 --- a/user/emacs/APKBUILD +++ b/user/emacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=emacs -pkgver=26.2 +pkgver=26.3 pkgrel=0 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch="all" @@ -133,5 +133,5 @@ gtk2() { _subpackage gtk2 } -sha512sums="c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1 emacs-26.2.tar.xz +sha512sums="4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 emacs-26.3.tar.xz 8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index ebaf536bf..aca2f0801 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -38,6 +38,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f fix-mutex-build.patch fix-seccomp-bpf.patch mozilla-build-arm.patch + ppc32-fix.patch + rust-32bit.patch rust-config.patch shut-up-warning.patch stackwalk-x86-ppc.patch @@ -108,8 +110,8 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then - JOBS=16 + if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then + JOBS=32 fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig @@ -117,6 +119,10 @@ prepare() { pmmx|x86*) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; + ppc) + echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig; + export LDFLAGS="$LDFLAGS -latomic" + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -200,6 +206,8 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch +06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch +7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch diff --git a/user/firefox-esr/ppc32-fix.patch b/user/firefox-esr/ppc32-fix.patch new file mode 100644 index 000000000..b4103c65f --- /dev/null +++ b/user/firefox-esr/ppc32-fix.patch @@ -0,0 +1,43 @@ +--- firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp ++++ firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp +@@ -45,11 +45,8 @@ invoke_copy_to_stack(uint32_t* d, + uint64_t tempu64; + + for(uint32_t i = 0; i < paramCount; i++, s++) { +- if(s->IsPtrData()) { +- if(s->type == nsXPTType::T_JSVAL) +- tempu32 = (uint32_t) &s->ptr; +- else +- tempu32 = (uint32_t) s->ptr; ++ if(s->IsIndirect()) { ++ tempu32 = (uint32_t) &s->val; + } + else { + switch(s->type) { +@@ -70,7 +67,7 @@ invoke_copy_to_stack(uint32_t* d, + } + } + +- if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { ++ if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.d; +@@ -88,7 +85,7 @@ invoke_copy_to_stack(uint32_t* d, + d += 2; + } + } +- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { ++ else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.f; // if passed in registers, floats are promoted to doubles +@@ -99,7 +96,7 @@ invoke_copy_to_stack(uint32_t* d, + else + *((float*) d++) = s->val.f; + } +- else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 ++ else if (!s->IsIndirect() && (s->type == nsXPTType::T_I64 + || s->type == nsXPTType::T_U64)) { + if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6 + if ((gpr + 1) < GPR_COUNT) { diff --git a/user/firefox-esr/rust-32bit.patch b/user/firefox-esr/rust-32bit.patch new file mode 100644 index 000000000..f9281cb7a --- /dev/null +++ b/user/firefox-esr/rust-32bit.patch @@ -0,0 +1,20 @@ +--- firefox-68.1.0/config/makefiles/rust.mk.old 2019-08-26 16:52:20.000000000 +0000 ++++ firefox-68.1.0/config/makefiles/rust.mk 2019-10-03 21:17:55.062373830 +0000 +@@ -47,7 +47,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds. +-cargo_rustc_flags += -C lto ++# OOMs on 32-bit machines: cargo_rustc_flags += -C lto + endif + endif + +@@ -246,7 +246,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + ifeq ($(OS_ARCH), Linux) +- $(call py_action,check_binary,--target --networking $@) ++# Fails because we disable LTO: $(call py_action,check_binary,--target --networking $@) + endif + endif + endif diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index f89c0cac6..34b38ebf2 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=freeglut -pkgver=3.0.0 +pkgver=3.2.1 pkgrel=0 pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="http://freeglut.sourceforge.net/" @@ -10,11 +10,10 @@ options="!check" # No test suite. license="X11" depends_dev="mesa-dev libx11-dev libice-dev libxxf86vm-dev libxi-dev glu-dev" makedepends="$depends_dev cmake" -subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -24,10 +23,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 freeglut-3.0.0.tar.gz" +sha512sums="aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 freeglut-3.2.1.tar.gz" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index f9e3fd7ce..365b7e906 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.3 +pkgver=2.62.0 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -14,10 +14,6 @@ makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool subpackages="$pkgname-lang" source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" -prepare() { - default_prepare -} - build() { meson -Dprefix=/usr _build ninja -C _build @@ -32,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f glib-networking-2.60.3.tar.xz" +sha512sums="2b9b0414baba307d35f8f6539fcbf0cf224da1970c532b130718deeeaa85f5601b8285ce822888273afed7fa643b62310bf306bbfa22f465134af345f3cd0e9d glib-networking-2.62.0.tar.xz" diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index 9ceb52bb2..a0bac403d 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=glibmm -pkgver=2.60.0 +pkgver=2.62.0 pkgrel=0 pkgdesc="C++ interfaces for glib" url="https://gnome.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/glibmm/${pkgver%.*}/glibmm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ea0477d5cb6e59019e87f929630ff32ac38dd5e4fb53fe84ef64b5b41c1090c8e10a0a67b26c786ab4d9ebf64b993fa0044333b4aa8554c331a0a6d02039c5ad glibmm-2.60.0.tar.xz" +sha512sums="f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de glibmm-2.62.0.tar.xz" diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index 37f1bc7ee..c1edaaa02 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=gmime -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=0 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" @@ -9,14 +9,19 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="gpgme-dev libidn2-dev zlib-dev" -makedepends="$depends_dev" checkdepends="gnupg" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 3.2.3-broken-tests.patch" + 3.2.3-broken-tests.patch + " + +prepare() { + default_prepare + autoreconf -vif +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,20 +34,13 @@ build() { make } -prepare() { - default_prepare - autoreconf -vif -} - check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 gmime-3.2.3.tar.xz +sha512sums="34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b gmime-3.2.4.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 81dca7aed..cc92875e1 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.2 +pkgver=1.62.0 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -15,26 +15,17 @@ subpackages="$pkgname-doc $pkgname-dev" replaces="libgirepository" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -46,4 +37,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e gobject-introspection-1.60.2.tar.xz" +sha512sums="b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638 gobject-introspection-1.62.0.tar.xz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index d571310e7..69c53c313 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub -pkgver=2.02 -pkgrel=8 +pkgver=2.04 +pkgrel=0 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -33,11 +33,10 @@ install="$pkgname.post-upgrade" triggers="$pkgname.trigger=/boot" source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz + adelie-branding.patch fix-gcc-no-pie-specs.patch grub2-accept-empty-module.patch grub-xen-host_grub.cfg - the-arch-everyone-uses-and-nobody-loves.patch - x86_64_asm.patch default-grub update-grub quirk-01_radeon_agpmode @@ -170,12 +169,11 @@ emu() { mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ } -sha512sums="cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 grub-2.02.tar.xz +sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb grub-2.04.tar.xz +f8c9af848c14abc3e4cc749b3ec80432d1d69bf945c8e48f1650ec35d2442450dc0436a02a4737d5d06f21d5fdef54a91120a393e8d77a6b55aeb897aa1fe85c adelie-branding.patch f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch -2fefc6d5c1388dba6d368451f47c216171136f03891e87777ee392884d7ef53c70b2a2565af676237216565f203f62b79aec0d1a82979b21aa29c4ebf87ac566 grub2-accept-empty-module.patch +6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -088455205f2f397d60e43eab19ed73994880ea1f442661f7975846cceaf2b112d92fd1341119d7dbfad3af2174dfd4d4721f31dead1ac35f4a3cb7c0d92f8a04 the-arch-everyone-uses-and-nobody-loves.patch -8752b5e689ec3b7e1f438c7207adc517d7acb4f7d15fda2907bc9177883a686f23994c66641bfc0c7620365415972b5d8b74f511c13dd234f5f3461dda4bb445 x86_64_asm.patch 1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub 0907a810e9ba5be92d10dae38403d1e50fb9b324799df36d2241ff59f545dace37a65f2b1c8f07367220da4fd341d8f21dd9a4fab8da6c87ae52d7ffbca3dbd7 update-grub 78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode" diff --git a/user/grub/adelie-branding.patch b/user/grub/adelie-branding.patch new file mode 100644 index 000000000..606c1e6e9 --- /dev/null +++ b/user/grub/adelie-branding.patch @@ -0,0 +1,25 @@ +--- grub-2.04/util/grub.d/10_linux.in.old 2018-11-24 17:13:02.000000000 +0000 ++++ grub-2.04/util/grub.d/10_linux.in 2019-10-03 01:22:34.593401423 +0000 +@@ -28,12 +28,16 @@ + + CLASS="--class gnu-linux --class gnu --class os" + +-if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then +- OS=GNU/Linux +-else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" +-fi ++case "x${GRUB_DISTRIBUTOR}" in ++ x) ++ OS=GNU/Linux;; ++ xAdélie|xAdelie) ++ OS="Adélie Linux"; ++ CLASS="--class adelie";; ++ *) ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux"; ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}";; ++esac + + # loop-AES arranges things so that /dev/loop/X can be our root device, but + # the initrds that Linux uses don't like that. diff --git a/user/grub/grub2-accept-empty-module.patch b/user/grub/grub2-accept-empty-module.patch index 16655b1a8..f4f62d433 100644 --- a/user/grub/grub2-accept-empty-module.patch +++ b/user/grub/grub2-accept-empty-module.patch @@ -10,13 +10,13 @@ also no relocations that's no problem (and that is checked independendly). --- grub-2.02~beta3/util/grub-module-verifierXX.c.mm 2016-02-11 10:57:41.000000000 +0000 +++ grub-2.02~beta3/util/grub-module-verifierXX.c 2016-08-31 15:26:36.000000000 +0000 -@@ -224,7 +224,8 @@ check_symbols (const struct grub_module_ - Elf_Shdr *s = find_section (arch, e, ".moddeps"); +@@ -225,7 +225,8 @@ check_symbols (const struct grub_module_ + s = find_section (arch, e, ".moddeps"); if (!s) -- grub_util_error ("no symbol table and no .moddeps section"); -+ /*grub_util_error ("no symbol table and no .moddeps section");*/ +- grub_util_error ("%s: no symbol table and no .moddeps section", modname); ++ /*grub_util_error ("%s: no symbol table and no .moddeps section", modname);*/ + return; /* An empty module happens for all_video.module for Xen */ if (!s->sh_size) - grub_util_error ("no symbol table and empty .moddeps section"); + grub_util_error ("%s: no symbol table and empty .moddeps section", modname); diff --git a/user/grub/the-arch-everyone-uses-and-nobody-loves.patch b/user/grub/the-arch-everyone-uses-and-nobody-loves.patch deleted file mode 100644 index 2d09149f7..000000000 --- a/user/grub/the-arch-everyone-uses-and-nobody-loves.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 -From: Michael Chang <mchang@suse.com> -Date: Mon, 26 Mar 2018 16:52:34 +0800 -Subject: Fix packed-not-aligned error on GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building with GCC 8, there are several errors regarding packed-not-aligned. - -./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] - -This patch fixes the build error by cleaning up the ambiguity of placing -aligned structure in a packed one. In "struct grub_btrfs_time" and "struct -grub_gpt_part_type", the aligned attribute seems to be superfluous, and also -has to be packed, to ensure the structure is bit-to-bit mapped to the format -laid on disk. I think we could blame to copy and paste error here for the -mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as -the name suggests. :) - -Signed-off-by: Michael Chang <mchang@suse.com> -Tested-by: Michael Chang <mchang@suse.com> -Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/btrfs.c | 2 +- - include/grub/efiemu/runtime.h | 2 +- - include/grub/gpt_partition.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4849c1ceb..be195448d 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -175,7 +175,7 @@ struct grub_btrfs_time - { - grub_int64_t sec; - grub_uint32_t nanosec; --} __attribute__ ((aligned (4))); -+} GRUB_PACKED; - - struct grub_btrfs_inode - { -diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 9b6b729f4..36d2dedf4 100644 ---- a/include/grub/efiemu/runtime.h -+++ b/include/grub/efiemu/runtime.h -@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel - - struct efi_variable - { -- grub_efi_guid_t guid; -+ grub_efi_packed_guid_t guid; - grub_uint32_t namelen; - grub_uint32_t size; - grub_efi_uint32_t attributes; -diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 1b32f6725..9668a68c3 100644 ---- a/include/grub/gpt_partition.h -+++ b/include/grub/gpt_partition.h -@@ -28,7 +28,7 @@ struct grub_gpt_part_type - grub_uint16_t data2; - grub_uint16_t data3; - grub_uint8_t data4[8]; --} __attribute__ ((aligned(8))); -+} GRUB_PACKED; - typedef struct grub_gpt_part_type grub_gpt_part_type_t; - - #define GRUB_GPT_PARTITION_TYPE_EMPTY \ --- -cgit v1.1-33-g03f6 - diff --git a/user/grub/x86_64_asm.patch b/user/grub/x86_64_asm.patch deleted file mode 100644 index 67a0d833f..000000000 --- a/user/grub/x86_64_asm.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Sat, 17 Feb 2018 06:47:28 -0800 -Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 - -Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a - -x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for -32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as -R_X86_64_PC32. - -Signed-off-by: H.J. Lu <hjl.tools@gmail.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/efiemu/i386/loadcore64.c | 1 + - grub-core/kern/x86_64/dl.c | 1 + - util/grub-mkimagexx.c | 1 + - util/grub-module-verifier.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c -index e49d0b6..18facf4 100644 ---- a/grub-core/efiemu/i386/loadcore64.c -+++ b/grub-core/efiemu/i386/loadcore64.c -@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - err = grub_efiemu_write_value (addr, - *addr32 + rel->r_addend - + sym.off -diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c -index 4406906..3a73e6e 100644 ---- a/grub-core/kern/x86_64/dl.c -+++ b/grub-core/kern/x86_64/dl.c -@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_int64_t value; - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index a2bb054..39d7efb 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_uint32_t *t32 = (grub_uint32_t *) target; - *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c -index 9179285..a79271f 100644 ---- a/util/grub-module-verifier.c -+++ b/util/grub-module-verifier.c -@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { - -1 - }, (int[]){ - R_X86_64_PC32, -+ R_X86_64_PLT32, - -1 - } - }, --- -1.9.1 - diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 185d15bdf..47bf9ddf4 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,45 +1,39 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.32.0 +pkgver=3.34.0 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" arch="noarch" -license="LGPL-2.0-or-later" +license="LGPL-2.0+" makedepends="glib-dev gobject-introspection-dev intltool meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" prepare() { default_prepare - cd "$builddir" sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in } build() { - cd "$builddir" - mkdir -p build && cd build - meson -Dprefix=/usr .. - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { default_dev depends="$pkgname" - cd "$builddir" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/share/pkgconfig "$subpkgdir"/usr/lib } -sha512sums="cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc gsettings-desktop-schemas-3.32.0.tar.xz" +sha512sums="6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 gsettings-desktop-schemas-3.34.0.tar.xz" diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 2682bc026..8788400ab 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,27 +1,24 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" options="!check" # fails overlaycomposition on ppc64 license="GPL LGPL" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" -replaces="gst-plugins-base1" +checkdepends="orc-compiler" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev opus-dev orc-dev pango-dev perl cmd:which !gst-plugins-base" -checkdepends="orc-compiler" -source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz - endian.patch - " +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +replaces="gst-plugins-base1" +source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" ldpath="/usr/lib/gstreamer-1.0" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +36,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } @@ -53,5 +48,4 @@ doc() { replaces="${pkgname}1-doc" } -sha512sums="4fa404156a384000e26e72ff0f701edb5a160181b48362350529177ca1c9325a3c58b83904bf5056262fe2609bc7f5913e835278973e049315deecfd1f26a3af gst-plugins-base-1.16.0.tar.xz -f146e76bedabd7b028cc64a9a671f7fb1ac1655164159d47953ea1afddafee1e40470593442f22152fb7e3579847dc4fc6e1f6e16a7c47252d5f3c25a6ae7353 endian.patch" +sha512sums="ce65b5d63d3ac6c20b051d477d09515bfb1c2e4b10c58346180265bdc4ae44dd9833727b5eea5fe9c409a3cd8874429be23654c7a5c23e881c0e8f9e89fb32c9 gst-plugins-base-1.16.1.tar.xz" diff --git a/user/gst-plugins-base/endian.patch b/user/gst-plugins-base/endian.patch deleted file mode 100644 index 403f40f69..000000000 --- a/user/gst-plugins-base/endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst-plugins-base-1.16.0/tests/check/libs/video.c.old 2019-03-29 12:21:21.000000000 +0000 -+++ gst-plugins-base-1.16.0/tests/check/libs/video.c 2019-05-01 15:49:10.000628817 +0000 -@@ -2828,7 +2828,7 @@ - fail_unless_equals_int (data[i + 3], 0x80); - #else - /* A - R - G - B */ -- fail_unless_equals_int (data[i], 0x00); -+ fail_unless_equals_int (data[i], 0x80); - fail_unless_equals_int (data[i + 1], 0x80); - fail_unless_equals_int (data[i + 2], 0x80); - fail_unless_equals_int (data[i + 3], 0x80); diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index 31f9963e5..c9147e89e 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" @@ -22,7 +22,6 @@ source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good- " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -55,5 +52,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="01ae64426d62500c12eb98073fcdf4bbbb7df69b5d30a153491a6e3bcd9bfa6e6a3a7fdedd7b7293ce9405e909a4a57c691f293a58525f21281136deac7c0a7c gst-plugins-good-1.16.0.tar.xz +sha512sums="06dc1887626864c30248df53d48e85ffdf0d1660d74f70f23c325c0844e9ca390556846cbae77fe9a4a90cb992e9a55117c15a9031b44a48d45dc07a61b18da4 gst-plugins-good-1.16.1.tar.xz 1cecf260cfeb19675a819f9858426aaed3b9627ed90b8facb6cb12dfc0b265232639b1888d7cc03edb87025e3eddab6e3606f16b5f7ca261a6b1c39b0dbdc6f7 endian-test.patch" diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 4beb70d0f..d781a46a8 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,21 +1,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" arch="all" options="!check" license="LGPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -replaces="gstreamer1" +depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" +replaces="gstreamer1" source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +46,4 @@ doc() { default_doc replaces="${pkgname}1-doc" } -sha512sums="d65d8ee78e5c245ed710fe7907e35d18bfe8729518552f86ea6f16bbcfef7b1c418e0fbe94fc79cb2626510fdf486d457fb040290e84d383964c8ab140455652 gstreamer-1.16.0.tar.xz" +sha512sums="30abcf20fa16cdedbacbecabef66367e614c9c5865311238397afbbe30fe6588909ddd7e917c4ec0749c4095c6f73b4de2e57a93ff2c1b97629206b05fc06173 gstreamer-1.16.1.tar.xz" diff --git a/user/gutenprint/APKBUILD b/user/gutenprint/APKBUILD index 67f344222..42198e73d 100644 --- a/user/gutenprint/APKBUILD +++ b/user/gutenprint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gutenprint -pkgver=5.3.1 +pkgver=5.3.3 pkgrel=0 pkgdesc="Open source printer drivers" url="http://gimp-print.sourceforge.net/" @@ -12,12 +12,9 @@ depends="" makedepends="cups-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" install="$pkgname.post-install $pkgname.post-upgrade" -source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz - freopen.patch - " +source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,14 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986 gutenprint-5.3.1.tar.xz -a4a74b7eeffdb12cc106c7da33bef24a7e80fca94091a8301b61df60e642e54fb57f5f00027530d86a83c3aff086ff43439b46bcfdcafa29073c60445d49781e freopen.patch" +sha512sums="d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6 gutenprint-5.3.3.tar.xz" diff --git a/user/gutenprint/freopen.patch b/user/gutenprint/freopen.patch deleted file mode 100644 index ddc351fec..000000000 --- a/user/gutenprint/freopen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gutenprint-5.3.1/src/xml/printers/check_duplicate_printers.c.old 2018-09-03 15:19:33.000000000 +0000 -+++ gutenprint-5.3.1/src/xml/printers/check_duplicate_printers.c 2019-05-01 20:32:48.290238929 +0000 -@@ -34,7 +34,7 @@ - if (getenv("BUILD_VERBOSE")) - dup2(2, 3); - (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid()); -- stdout = freopen(path, "w", stdout); -+ freopen(path, "w", stdout); - dup2(1, 2); - } - setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1); diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 1fcbe079d..02221d9c8 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20190316 +pkgver=20190818 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" @@ -16,12 +16,10 @@ source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" builddir="$srcdir/hwids-hwids-$pkgver" build() { - cd "$builddir" make UDEV=yes } package() { - cd "$builddir" make DESTDIR="$pkgdir" DOCDIR="/usr/share/doc/$pkgname-$pkgver" \ MISCDIR="/usr/share/hwdata" UDEV=yes install } @@ -67,4 +65,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e hwids-20190316.tar.gz" +sha512sums="74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2 hwids-20190818.tar.gz" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 51f3e4f3e..896a990a4 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.3 +pkgver=4.4 pkgrel=0 pkgdesc="Lists of country, language, and currency names" -url=" " +url="https://salsa.debian.org/iso-codes-team/iso-codes" arch="noarch" license="LGPL-2.1+" depends="" makedepends="python3" subpackages="$pkgname-lang $pkgname-dev" -source="http://anduin.linuxfromscratch.org/BLFS/$pkgname/$pkgname-$pkgver.tar.xz" +source="https://salsa.debian.org/iso-codes-team/$pkgname/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-$pkgname-$pkgver" build() { ./configure \ @@ -27,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="5217b8d9d7a0db3ee5f89831f9fb4938e79a7c33a73fcde9e057eb825a08973d6115aa7a709552cb9ef29c4ad094bb7a1e848cbb6f8fb01efb15d4205c235dc0 iso-codes-4.3.tar.xz" +sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 8fc592ba8..448b4561c 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.2.5 +pkgver=4.2.7.1 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -17,7 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev libraw-dev quazip-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" +source="https://download.kde.org/stable/krita/4.2.7/krita-$pkgver.tar.gz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="113bbea7cda7c97ba22da5ab78eef8fe6b8db48b54380ee12d93d28fc00e3f93ee1e5f3dbd7c1d257a577206486235ac75f3d3ef1e21f8ffcd1c5e3aa6f3b224 krita-4.2.5.tar.gz" +sha512sums="e1ce1eb9e38d4dc9de3fb6d48a6b5364dad8da1782f3e5780949bed4d819ad1c70be62d5d61748bec04e18c7b46279d393e976e8f8209f35587eacd96b1a84ef krita-4.2.7.1.tar.gz" diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index 5e586643b..d518e2996 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krusader -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=0 pkgdesc="Advanced, twin-panel (commander style) file manager" url="https://krusader.org/" @@ -18,7 +18,6 @@ source="https://download.kde.org/stable/krusader/$pkgver/krusader-$pkgver.tar.xz posix-headers.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,14 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d krusader-2.7.1.tar.xz +sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz 6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 000cc3d5f..d631f8629 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.3.4 +pkgver=3.3.6 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="91f3bcda48c194f5141f2f315bd3d89652ae4002a8fb0b765714358cb97e2093b13c8712ff1c16cf2e3a82024c8d1a1f136eaa0861387897ccd6cb123d137766 kstars-3.3.4.tar.xz" +sha512sums="07371c343456d60b3d5e7dd2fb13983926db811dc0ffedb56364c1a02783db501189328c7476762ac0535f43d372ace81d39f90cd0c170ce36385f8e5a185bf3 kstars-3.3.6.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index 0f816ab37..0a5a81798 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -19,7 +19,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/ktorrent/$pkgver/ktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,13 +34,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 ktorrent-5.1.1.tar.xz" +sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index a3ab3dff7..934c901f8 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.22 +pkgver=2.23 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45 libblockdev-2.22.tar.gz" +sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" diff --git a/user/libdvbpsi/APKBUILD b/user/libdvbpsi/APKBUILD index 9f818977d..a61855055 100644 --- a/user/libdvbpsi/APKBUILD +++ b/user/libdvbpsi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libdvbpsi -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=0 pkgdesc="Library decoding and generating MPEG TS and DVB PSI tables" url="https://www.videolan.org/developers/libdvbpsi.html" @@ -14,7 +14,6 @@ source="https://download.videolan.org/pub/libdvbpsi/$pkgver/$pkgname-$pkgver.tar " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,14 +23,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 libdvbpsi-1.3.2.tar.bz2 +sha512sums="70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69 libdvbpsi-1.3.3.tar.bz2 f612bf80b07ec37a83477a37d78971c4bd4331eec86686a8bc7b247f43df2c047c89de419d5cef0b960de2032daedc81a4c380802c76b4dc081e1c09ad364dcb fix-includes.patch" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index aac737a91..8e9083d17 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.7.0 +pkgver=1.8.0 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f libevdev-1.7.0.tar.xz" +sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 13f07cfe0..27de81126 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libgd pkgver=2.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" @@ -15,10 +15,20 @@ subpackages="$pkgname-dev" replaces="gd" source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz CVE-2016-7568.patch + CVE-2018-5711.patch + CVE-2018-1000222.patch + CVE-2019-6977.patch + CVE-2019-6978.patch " +# secfixes: +# 2.2.5-r1: +# - CVE-2018-5711 +# - CVE-2018-1000222 +# - CVE-2019-6977 +# - CVE-2019-6978 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +41,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,4 +56,8 @@ dev() { } sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz -8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch" +8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch +d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch +d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch +df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch +3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch" diff --git a/user/libgd/CVE-2018-1000222.patch b/user/libgd/CVE-2018-1000222.patch new file mode 100644 index 000000000..80f9712bf --- /dev/null +++ b/user/libgd/CVE-2018-1000222.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/user/libgd/CVE-2018-5711.patch b/user/libgd/CVE-2018-5711.patch new file mode 100644 index 000000000..dff2b9ea2 --- /dev/null +++ b/user/libgd/CVE-2018-5711.patch @@ -0,0 +1,61 @@ +From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Wed, 29 Nov 2017 19:37:38 +0100 +Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx + +Due to a signedness confusion in `GetCode_` a corrupt GIF file can +trigger an infinite loop. Furthermore we make sure that a GIF without +any palette entries is treated as invalid *after* open palette entries +have been removed. + +CVE-2018-5711 + +See also https://bugs.php.net/bug.php?id=75571. +--- + src/gd_gif_in.c | 12 ++++++------ + tests/gif/.gitignore | 1 + + tests/gif/CMakeLists.txt | 1 + + tests/gif/Makemodule.am | 2 ++ + tests/gif/php_bug_75571.c | 28 ++++++++++++++++++++++++++++ + tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes + 6 files changed, 38 insertions(+), 6 deletions(-) + create mode 100644 tests/gif/php_bug_75571.c + create mode 100644 tests/gif/php_bug_75571.gif + +diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c +index daf26e79..0a8bd717 100644 +--- a/src/gd_gif_in.c ++++ b/src/gd_gif_in.c +@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + return 0; + } + +- if(!im->colorsTotal) { +- gdImageDestroy(im); +- return 0; +- } +- + /* Check for open colors at the end, so + * we can reduce colorsTotal and ultimately + * BitsPerPixel */ +@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + } + } + ++ if(!im->colorsTotal) { ++ gdImageDestroy(im); ++ return 0; ++ } ++ + return im; + } + +@@ -447,7 +447,7 @@ static int + GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) + { + int i, j, ret; +- unsigned char count; ++ int count; + + if(flag) { + scd->curbit = 0; diff --git a/user/libgd/CVE-2019-6977.patch b/user/libgd/CVE-2019-6977.patch new file mode 100644 index 000000000..4cfb9ab98 --- /dev/null +++ b/user/libgd/CVE-2019-6977.patch @@ -0,0 +1,21 @@ +Bug: https://bts.adelielinux.org/show_bug.cgi?id=159 +Backported-From: http://git.php.net/?p=php-src.git;a=commit;h=7a12dad4dd6c370835b13afae214b240082c7538 +Author: A. Wilcox <awilfox@adelielinux.org> +Bug: https://bugs.php.net/bug.php?id=77270 +Author: Christoph M. Becker <cmbecker69@gmx.de> +Committer: Stanislav Malyshev <stas@php.net> +Upstream-Status: unknown + +--- libgd-2.2.5/src/gd_color_match.c.old 2017-08-30 11:05:54.000000000 +0000 ++++ libgd-2.2.5/src/gd_color_match.c 2019-10-03 16:17:55.842322245 +0000 +@@ -31,8 +31,8 @@ + return -4; /* At least 1 color must be allocated */ + } + +- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); +- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); ++ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); ++ memset( buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); + + for (x=0; x < im1->sx; x++) { + for( y=0; y<im1->sy; y++ ) { diff --git a/user/libgd/CVE-2019-6978.patch b/user/libgd/CVE-2019-6978.patch new file mode 100644 index 000000000..0cfdda919 --- /dev/null +++ b/user/libgd/CVE-2019-6978.patch @@ -0,0 +1,216 @@ +From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Thu, 17 Jan 2019 11:54:55 +0100 +Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() + +Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we +must not call `gdDPExtractData()`; otherwise a double-free would +happen. Since `gdImage*Ctx()` are void functions, and we can't change +that for BC reasons, we're introducing static helpers which are used +internally. + +We're adding a regression test for `gdImageJpegPtr()`, but not for +`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to +trigger failure of the respective `gdImage*Ctx()` calls. + +This potential security issue has been reported by Solmaz Salimi (aka. +Rooney). +--- + src/gd_gif_out.c | 18 +++++++++++++++--- + src/gd_jpeg.c | 20 ++++++++++++++++---- + src/gd_wbmp.c | 21 ++++++++++++++++++--- + tests/jpeg/.gitignore | 1 + + tests/jpeg/CMakeLists.txt | 1 + + tests/jpeg/Makemodule.am | 3 ++- + tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ + 7 files changed, 84 insertions(+), 11 deletions(-) + create mode 100644 tests/jpeg/jpeg_ptr_double_free.c + +diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c +index 298a5812..d5a95346 100644 +--- a/src/gd_gif_out.c ++++ b/src/gd_gif_out.c +@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); + static void char_out(int c, GifCtx *ctx); + static void flush_char(GifCtx *ctx); + ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); + + + +@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageGifCtx(im, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageGifCtx(im, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) + + */ + BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) ++{ ++ _gdImageGifCtx(im, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + { + gdImagePtr pim = 0, tim = im; + int interlace, BitsPerPixel; +@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + based temporary image. */ + pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); + if(!pim) { +- return; ++ return 1; + } + tim = pim; + } +@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + /* Destroy palette based temporary image. */ + gdImageDestroy( pim); + } ++ ++ return 0; + } + + +diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c +index fc058420..96ef4302 100644 +--- a/src/gd_jpeg.c ++++ b/src/gd_jpeg.c +@@ -123,6 +123,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) + exit(99); + } + ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); ++ + /* + * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality + * QUALITY. If QUALITY is in the range 0-100, increasing values +@@ -237,8 +239,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageJpegCtx(im, out, quality); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageJpegCtx(im, out, quality)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -259,6 +264,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); + + */ + BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) ++{ ++ _gdImageJpegCtx(im, outfile, quality); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + { + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; +@@ -293,7 +304,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row) { + gdFree(row); + } +- return; ++ return 1; + } + + cinfo.err->emit_message = jpeg_emit_message; +@@ -334,7 +345,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row == 0) { + gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); + jpeg_destroy_compress(&cinfo); +- return; ++ return 1; + } + + rowptr[0] = row; +@@ -411,6 +424,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + jpeg_finish_compress(&cinfo); + jpeg_destroy_compress(&cinfo); + gdFree(row); ++ return 0; + } + + +diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c +index f19a1c96..a49bdbec 100644 +--- a/src/gd_wbmp.c ++++ b/src/gd_wbmp.c +@@ -88,6 +88,8 @@ int gd_getin(void *in) + return (gdGetC((gdIOCtx *)in)); + } + ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); ++ + /* + Function: gdImageWBMPCtx + +@@ -100,6 +102,12 @@ int gd_getin(void *in) + out - the stream where to write + */ + BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) ++{ ++ _gdImageWBMPCtx(image, fg, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + { + int x, y, pos; + Wbmp *wbmp; +@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + /* create the WBMP */ + if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { + gd_error("Could not create WBMP\n"); +- return; ++ return 1; + } + + /* fill up the WBMP structure */ +@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + + /* write the WBMP to a gd file descriptor */ + if(writewbmp(wbmp, &gd_putout, out)) { ++ freewbmp(wbmp); + gd_error("Could not save WBMP\n"); ++ return 1; + } + + /* des submitted this bugfix: gdFree the memory. */ + freewbmp(wbmp); ++ ++ return 0; + } + + /* +@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageWBMPCtx(im, fg, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageWBMPCtx(im, fg, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 4d03d3c27..cb6ba3fcd 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libical -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" +sha512sums="d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc libical-3.0.6.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 666516c77..5ed7e4e7b 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -31,4 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec libinput-1.14.0.tar.xz" +sha512sums="8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c libinput-1.14.1.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index e35ca14b9..f64e03452 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" @@ -47,4 +47,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 libjpeg-turbo-2.0.2.tar.gz" +sha512sums="ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 libjpeg-turbo-2.0.3.tar.gz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 575fca74b..c226584a7 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libktorrent -pkgver=2.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,10 +13,9 @@ depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev boost-dev qca-dev libgcrypt-dev" makedepends="cmake extra-cmake-modules $depends_dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4 libktorrent-2.1.tar.xz" +sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD index f46f49f9b..5c97a2aec 100644 --- a/user/liblangtag/APKBUILD +++ b/user/liblangtag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liblangtag -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Interface library to access tags for identifying languages" url="https://bitbucket.org/tagoh/liblangtag" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f liblangtag-0.6.2.tar.bz2" +sha512sums="3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf liblangtag-0.6.3.tar.bz2" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 538c2ad0d..7301a17b2 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=libnftnl -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe libnftnl-1.1.3.tar.bz2" +sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2" diff --git a/user/libogg/APKBUILD b/user/libogg/APKBUILD index fc41e6f74..c452d7890 100644 --- a/user/libogg/APKBUILD +++ b/user/libogg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: pkgname=libogg -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="https://xiph.org/ogg/" arch="all" @@ -32,4 +32,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="16f9cbc7f5b77c1719d80e666995ad825a3d4b6facfa51e3df3b1a9678cca7dc3c4f6ee15096c394c97ed5e67fced1aaedacc563cddfe4e0c748dd39940b099e libogg-1.3.3.tar.gz" +sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9 libogg-1.3.4.tar.gz" diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 172a0003d..ed8bb27f2 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libpeas -pkgver=1.22.0 -pkgrel=1 +pkgver=1.24.0 +pkgrel=0 pkgdesc="GObject-based plugin framework" url="https://gnome.org" arch="all" +options="!check" # With Meson, you can't disable individual tests. + # Three require X11. Complain to Meson, not me. license="LGPL-2.1+" depends="" -makedepends="intltool glib-dev gobject-introspection-dev gtk+3.0-dev - py3-pygobject py3-pygobject-dev python3-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +makedepends="glib-dev gobject-introspection-dev gtk+3.0-dev + meson ninja py3-pygobject py3-pygobject-dev python3-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz" build() { - LIBS="-lintl" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - DISPLAY= make check + DISPLAY= ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91 libpeas-1.22.0.tar.xz" +sha512sums="b4baa03ded9d787e7a1ee2be943617f5c84564bf299699934c47ded6c60ff62a7f27ab2594cd0ffba2d8979d8b72113d1b5e910eebd80305f3aa538db0d45314 libpeas-1.24.0.tar.xz" diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD index 8b0c98a81..af76e2f49 100644 --- a/user/libpwquality/APKBUILD +++ b/user/libpwquality/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpwquality -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Password quality checking library" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-pwquality:py3" source="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$pkgver/libpwquality-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +40,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 libpwquality-1.4.0.tar.bz2" +sha512sums="0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257 libpwquality-1.4.1.tar.bz2" diff --git a/user/libraw/APKBUILD b/user/libraw/APKBUILD index 843c95427..d280c6402 100644 --- a/user/libraw/APKBUILD +++ b/user/libraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libraw -pkgver=0.19.4 +pkgver=0.19.5 pkgrel=0 pkgdesc="Read RAW image files from digital cameras" url="https://www.libraw.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c LibRaw-0.19.4.tar.gz" +sha512sums="4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 LibRaw-0.19.5.tar.gz" diff --git a/user/libusb/APKBUILD b/user/libusb/APKBUILD index f163c64ab..649c84c6a 100644 --- a/user/libusb/APKBUILD +++ b/user/libusb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libusb -pkgver=1.0.22 -pkgrel=1 +pkgver=1.0.23 +pkgrel=0 pkgdesc="Library for USB device communication" url="https://libusb.info/" arch="all" @@ -11,7 +11,6 @@ makedepends="eudev-dev linux-headers" source="https://github.com/libusb/libusb/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,13 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4 libusb-1.0.22.tar.bz2" +sha512sums="73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b libusb-1.0.23.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 6becf5507..4560d319c 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,35 +1,29 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.2 +pkgver=1.3 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" depends="" -makedepends="libx11-dev libxext-dev xorgproto-dev" +makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/libvdpau-1.2.tar.bz2" +source="https://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-$pkgver.tar.xz" build() { - LIBS="-lX11" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2" +sha512sums="a839ed06ac3bb1ceaa8020e38f40f6dd1d1af066878effbc02e3b02f0917ccdad4059ac2a4428ca39265bda3ba02885d905231f365b86151bae28d135d8de3d5 libvdpau-1.3.tar.xz" diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index 3ebe3e051..dd9d5aeed 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxfont2 -pkgver=2.0.3 -pkgrel=1 +pkgver=2.0.4 +pkgrel=0 pkgdesc="X11 font library from X.Org" url="https://www.X.Org/" arch="all" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b libXfont2-2.0.3.tar.bz2" +sha512sums="7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index 9953618d2..daabfc36e 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 libXvMC-1.0.11.tar.bz2" +sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2" diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 5761ea7be..b942c40b0 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7258e303a2012e9016385abd1e8882ffec47dd3baf479a54448742e41b03508d874387af6ea97c7ef9c4d37f2eecbe7bc0121d923df79b0f455f4f466747ca2 links-2.20.1.tar.bz2" +sha512sums="82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152 links-2.20.2.tar.bz2" diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 555799dab..487888387 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.51.1 +pkgver=0.51.2 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1 meson-0.51.1.tar.gz" +sha512sums="5d6bc5c59c026b67d065b28a5ce8c7901ffb9663d3cb1609ef1714ace50e3b1e0fc116466a34ba5ae8dbfb2337b7848008f3d865832ea537422221f1a6793ddd meson-0.51.2.tar.gz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index ad0c17e63..5a5804d96 100644 --- a/user/modemmanager/APKBUILD +++ b/user/modemmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager -pkgver=1.10.4 +pkgver=1.10.6 pkgrel=0 pkgdesc="Software to control mobile broadband modems" url="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -43,6 +43,6 @@ package() { "$srcdir"/01-org.freedesktop.ModemManager.rules } -sha512sums="ead9826efbd360cb47e52a8f8e8b44e92d2d93c6058f099e4bc2358c4ef03bec0b2631b6b4b552d75ff41ec9b6154b4f614c1be5a31e684c69cf3c04c9866dd7 ModemManager-1.10.4.tar.xz +sha512sums="9d0cdca7413c1ad7e44a0c65d620e3c36204919b896290878180c73d7843d217f7c759bcba1007cbed2ec75f615b7ab196989e90afddbcbbf38a1b4cd04a8e3a ModemManager-1.10.6.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 0b1935ebe..6fb844bf9 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.20.0 +pkgver=1.20.4 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b NetworkManager-1.20.0.tar.xz +sha512sums="d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb NetworkManager-1.20.4.tar.xz a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch 0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch 313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index d6eddcd70..f65d278ca 100644 --- a/user/opal-utils/APKBUILD +++ b/user/opal-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opal-utils -pkgver=6.3.1 +pkgver=6.5 pkgrel=0 pkgdesc="Tools for IBM FSP and OpenPOWER systems" url="https://lists.ozlabs.org/listinfo/skiboot" @@ -39,6 +39,6 @@ package() { done } -sha512sums="ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8 skiboot-6.3.1.tar.gz +sha512sums="f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571 skiboot-6.5.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch -944dd564a2c846a675544c8ecdb2fa4714235f3fd974e135a71220379640f94883811399fe03d2d697fcb49e219504af264af0f201a6a7b37029687dea6a28cf opal-prd.patch" +692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/opal-utils/opal-prd.patch b/user/opal-utils/opal-prd.patch index 29b38cd43..90a23e333 100644 --- a/user/opal-utils/opal-prd.patch +++ b/user/opal-utils/opal-prd.patch @@ -1,6 +1,6 @@ --- skiboot-6.3.1/external/opal-prd/thunk.S.old 2019-05-10 06:50:45.000000000 +0000 +++ skiboot-6.3.1/external/opal-prd/thunk.S 2019-06-04 08:01:00.851806263 +0000 -@@ -1,4 +1,4 @@ +@@ -3,4 +3,4 @@ -#include <endian.h> +#define __BYTE_ORDER __BIG_ENDIAN #include <asm/unistd.h> diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 026091d77..c5cf85a3a 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="a84a219c049147e9566967f96a01c84dde587e38da37b34ef756da99a2d14f1d418492030098f63c4ac60cb0db553f474aaf3b8a00c8abfd98f66adc14f523e4 openttd-1.9.2-source.tar.xz" +sha512sums="e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 openttd-1.9.3-source.tar.xz" diff --git a/user/orc/APKBUILD b/user/orc/APKBUILD index de40d3f31..fc760912f 100644 --- a/user/orc/APKBUILD +++ b/user/orc/APKBUILD @@ -2,37 +2,30 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=orc -pkgver=0.4.29 +pkgver=0.4.30 pkgrel=0 pkgdesc="The Oil Run-time Compiler" url="https://gstreamer.freedesktop.org/modules/orc.html" arch="all" license="BSD-2-Clause AND BSD-3-Clause" -makedepends="linux-headers" -subpackages="$pkgname-dev $pkgname-doc $pkgname-compiler" -source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz" +makedepends="linux-headers meson ninja" +subpackages="$pkgname-dev $pkgname-compiler" +source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz + ppc-fixes.patch + " build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - cd "$builddir" - make check + ninja -C build test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -47,4 +40,5 @@ compiler() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 orc-0.4.29.tar.xz" +sha512sums="da254347f5ebb278f0932a7bfa878adc2a14c42c7e6a20a4e6bb68c0883e307fef57bef867d54e150bd1d875f79eee27f9d34aede410d3eddd4093e5b055cd22 orc-0.4.30.tar.xz +b049e4ab9e2ee71013cc1f387dfc24df97c25fcf72dd3fd0502d891ee5e1e305dd710a639839ac64f6a58383b18d49ccffd32645dc64255b15945920acaf56d6 ppc-fixes.patch" diff --git a/user/orc/ppc-fixes.patch b/user/orc/ppc-fixes.patch new file mode 100644 index 000000000..ab4aecd40 --- /dev/null +++ b/user/orc/ppc-fixes.patch @@ -0,0 +1,990 @@ +diff --git a/orc-test/orctest.c b/orc-test/orctest.c +index 614421b..d9cb9d5 100644 +--- a/orc-test/orctest.c ++++ b/orc-test/orctest.c +@@ -523,14 +523,14 @@ float_compare (OrcArray *array1, OrcArray *array2, int i, int j) + if (isnan(*(float *)ptr1) && isnan(*(float *)ptr2)) return TRUE; + if (*(float *)ptr1 == *(float *)ptr2) return TRUE; + if ((*(float *)ptr1 < 0.0) == (*(float *)ptr2 < 0.0) && +- abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2) <= 2)) ++ abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2)) <= 2) + return TRUE; + return FALSE; + case 8: + if (isnan(*(double *)ptr1) && isnan(*(double *)ptr2)) return TRUE; + if (*(double *)ptr1 == *(double *)ptr2) return TRUE; + if ((*(double *)ptr1 < 0.0) == (*(double *)ptr2 < 0.0) && +- llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2) <= 2)) ++ llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2)) <= 2) + return TRUE; + return FALSE; + } +diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c +index e054d07..ed98437 100644 +--- a/orc/orcpowerpc.c ++++ b/orc/orcpowerpc.c +@@ -208,7 +208,7 @@ powerpc_emit_srawi (OrcCompiler *compiler, int regd, int rega, int shift, + powerpc_get_regname(regd), + powerpc_get_regname(rega), shift); + +- insn = (31<<26) | (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn = (31<<26) | (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= (shift<<11) | (824<<1) | record; + + powerpc_emit (compiler, insn); +@@ -233,7 +233,7 @@ powerpc_emit_D (OrcCompiler *compiler, const char *name, + ORC_ASM_CODE(compiler," %s %s, %s, %d\n", name, + powerpc_get_regname(regd), + powerpc_get_regname(rega), imm); +- insn |= (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn |= (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= imm&0xffff; + + powerpc_emit (compiler, insn); +@@ -543,7 +543,7 @@ powerpc_load_constant (OrcCompiler *p, int i, int reg) + { + unsigned int insn; + +- ORC_ASM_CODE(p," addi %s, %s, %db - %s\n", ++ ORC_ASM_CODE(p," addi %s, %s, %df - %s\n", + powerpc_get_regname(greg), + powerpc_get_regname(greg), p->constants[i].label, p->program->name); + insn = (14<<26) | (powerpc_regnum (greg)<<21) | (powerpc_regnum (greg)<<16); +@@ -740,3 +740,42 @@ void powerpc_emit_label (OrcCompiler *compiler, int label) + powerpc_add_label (compiler, compiler->codeptr, label); + } + ++void ++powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} ++ ++void ++powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} +diff --git a/orc/orcpowerpc.h b/orc/orcpowerpc.h +index e6b315a..ba824b2 100644 +--- a/orc/orcpowerpc.h ++++ b/orc/orcpowerpc.h +@@ -138,6 +138,9 @@ void powerpc_emit_full_constants (OrcCompiler* p); + void powerpc_emit_load_address (OrcCompiler* compiler, int regd, int rega, int imm); + void powerpc_load_constant (OrcCompiler* p, int i, int reg); + ++void powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++void powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++ + /* instructions */ + #define powerpc_emit_vand(p,a,b,c) powerpc_emit_VX_2 (p, "vand", 0x10000404, a, b, c) + #define powerpc_emit_vandc(p,a,b,c) powerpc_emit_VX_2 (p, "vandc", 0x10000444, a, b, c) +@@ -159,8 +162,10 @@ void powerpc_load_constant (OrcCompiler* p, int i, int reg); + + #define powerpc_emit_vmrghb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghb", 0x1000000c, a, b, c) + #define powerpc_emit_vmrghh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghh", 0x1000004c, a, b, c) ++#define powerpc_emit_vmrghw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghw", 0x1000008c, a, b, c) + #define powerpc_emit_vmrglb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglb", 0x1000010c, a, b, c) + #define powerpc_emit_vmrglh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglh", 0x1000014c, a, b, c) ++#define powerpc_emit_vmrglw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglw", 0x1000018c, a, b, c) + + #define powerpc_emit_vpkshss(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshss", 0x1000018e, a, b, c) + #define powerpc_emit_vpkshus(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshus", 0x1000010e, a, b, c) +diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c +index 659115e..808b4e1 100644 +--- a/orc/orcprogram-altivec.c ++++ b/orc/orcprogram-altivec.c +@@ -18,6 +18,8 @@ static void orc_compiler_powerpc_init (OrcCompiler *compiler); + static unsigned int orc_compiler_powerpc_get_default_flags (void); + static void orc_compiler_powerpc_assemble (OrcCompiler *compiler); + static const char* powerpc_get_flag_name (int shift); ++static int orc_powerpc_assemble_copy_check (OrcCompiler *compiler); ++static void orc_powerpc_assemble_copy (OrcCompiler *compiler); + + + static void +@@ -199,8 +201,8 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + +- orc_compiler_emit_invariants (compiler); +- ++ /* Load constants first, as they may be used by invariants */ ++ ORC_ASM_CODE(compiler,"# load constants\n"); + for(i=0;i<compiler->n_constants;i++) { + if (compiler->constants[i].is_long && + !compiler->constants[i].alloc_reg) { +@@ -212,6 +214,9 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + } ++ ++ ORC_ASM_CODE(compiler,"# load invariants\n"); ++ orc_compiler_emit_invariants (compiler); + } + + static void +@@ -219,6 +224,7 @@ powerpc_load_inner_constants (OrcCompiler *compiler) + { + int i; + ++ ORC_ASM_CODE(compiler,"# load inner constants\n"); + for(i=0;i<ORC_N_COMPILER_VARIABLES;i++){ + if (compiler->vars[i].name == NULL) continue; + switch (compiler->vars[i].vartype) { +@@ -305,6 +311,11 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + int label_leave; + int set_vscr = FALSE; + ++ if (orc_powerpc_assemble_copy_check (compiler)) { ++ orc_powerpc_assemble_copy (compiler); ++ return; ++ } ++ + label_outer_loop_start = orc_compiler_label_new (compiler); + label_loop_start = orc_compiler_label_new (compiler); + label_leave = orc_compiler_label_new (compiler); +@@ -312,6 +323,8 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + { + int i; + ++ /* Emit invariants also to check for constants */ ++ orc_compiler_emit_invariants (compiler); + orc_powerpc_emit_loop (compiler, 0); + + compiler->codeptr = compiler->code; +@@ -486,3 +499,199 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + powerpc_do_fixups (compiler); + } + ++static ++int orc_powerpc_assemble_copy_check (OrcCompiler *compiler) ++{ ++ if (compiler->program->n_insns == 1 && ++ compiler->program->is_2d == FALSE && ++ (strcmp (compiler->program->insns[0].opcode->name, "copyb") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyw") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyl") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyq") == 0) && ++ (compiler->program->insns[0].flags & ++ (ORC_INSTRUCTION_FLAG_X2 | ORC_INSTRUCTION_FLAG_X4)) == 0 && ++ compiler->program->n_param_vars == 0 && ++ compiler->program->n_const_vars == 0) { ++ /* TODO: add param & const support if this turns out to be faster */ ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static ++void orc_powerpc_assemply_copy_loop (OrcCompiler *compiler, int size, ++ int shift, int next_label) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_R7; ++ const int tmp = POWERPC_R0; ++ const int vtmp = POWERPC_V0; ++ const int vperm = POWERPC_V1; ++ int label_copy; ++ ++ label_copy = orc_compiler_label_new (compiler); ++ ++ ORC_ASM_CODE(compiler," cmplwi %s, %d\n", ++ powerpc_get_regname(count), size); ++ powerpc_emit(compiler, 0x28000000|(powerpc_regnum(count)<<16)|(size&0xffff)); ++ ++ ORC_ASM_CODE(compiler," blt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41800000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, src, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, dst, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_srawi (compiler, tmp, count, shift, 0); ++ ++ ORC_ASM_CODE (compiler, " mtctr %s\n", powerpc_get_regname(tmp)); ++ powerpc_emit (compiler, 0x7c0903a6 | (powerpc_regnum (tmp)<<21)); ++ ++ powerpc_emit_label (compiler, label_copy); ++ if (size == 16) { ++ ORC_ASM_CODE(compiler," lvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c0000ce, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ ORC_ASM_CODE(compiler," stvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c0001ce, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ } else { ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," lvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00000e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," lvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00004e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," lvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00008e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ } ++ powerpc_load_align (compiler, vperm, 0, src); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ powerpc_store_align (compiler, vperm, 0, dst); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," stvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00010e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," stvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00014e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," stvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00018e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ } ++ } ++ ++ powerpc_emit_addi (compiler, src, src, size); ++ powerpc_emit_addi (compiler, dst, dst, size); ++ powerpc_emit_addi (compiler, count, count, -size); ++ powerpc_emit_bne (compiler, label_copy); ++ ++ powerpc_emit_label (compiler, next_label); ++} ++ ++static ++void orc_powerpc_assemble_copy (OrcCompiler *compiler) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_V7; ++ OrcInstruction *insn; ++ int shift = 0; ++ int label_word; ++ int label_halfword; ++ int label_byte; ++ int label_done; ++ ++ insn = compiler->program->insns + 0; ++ ++ if (strcmp (insn->opcode->name, "copyw") == 0) { ++ shift = 1; ++ } else if (strcmp (insn->opcode->name, "copyl") == 0) { ++ shift = 2; ++ } else if (strcmp (insn->opcode->name, "copyq") == 0) { ++ shift = 3; ++ } ++ ++ label_word = orc_compiler_label_new (compiler); ++ label_halfword = orc_compiler_label_new (compiler); ++ label_byte = orc_compiler_label_new (compiler); ++ label_done = orc_compiler_label_new (compiler); ++ ++ powerpc_emit_prologue (compiler); ++ ++ powerpc_emit_load_address (compiler, ++ dst, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->dest_args[0]])); ++ powerpc_emit_load_address (compiler, ++ src, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->src_args[0]])); ++ powerpc_emit_lwz (compiler, count, POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, n)); ++ ++ powerpc_emit_addi (compiler, POWERPC_R0, 0, shift); ++ ORC_ASM_CODE(compiler, " slw %s, %s, %s\n", ++ powerpc_get_regname(count), ++ powerpc_get_regname(count), ++ powerpc_get_regname(POWERPC_R0)); ++ powerpc_emit (compiler, (31<<26) | ++ (powerpc_regnum (count)<<21) | ++ (powerpc_regnum (count)<<16) | ++ (powerpc_regnum (POWERPC_R0)<<11) | (24<<1)); ++ ++ orc_powerpc_assemply_copy_loop (compiler, 16, 4, label_word); ++ orc_powerpc_assemply_copy_loop (compiler, 4, 2, label_halfword); ++ orc_powerpc_assemply_copy_loop (compiler, 2, 1, label_byte); ++ orc_powerpc_assemply_copy_loop (compiler, 1, 0, label_done); ++ ++ powerpc_emit_epilogue (compiler); ++ powerpc_do_fixups (compiler); ++} +diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c +index fa40ac3..7729b69 100644 +--- a/orc/orcrules-altivec.c ++++ b/orc/orcrules-altivec.c +@@ -15,26 +15,6 @@ + + /* rules */ + +-static void +-powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) +-{ +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } else { +- ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } +-} +- + static inline int + powerpc_select_value (OrcCompiler *compiler, int be_value, int le_value) + { +@@ -322,19 +302,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + int perm = orc_compiler_get_temp_reg (compiler); + int tmp = orc_compiler_get_temp_reg (compiler); + +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsr %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } else { +- ORC_ASM_CODE(compiler," lvsl %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } ++ powerpc_store_align (compiler, perm, 0, dest->ptr_register); + powerpc_emit_vperm (compiler, tmp, src->alloc, src->alloc, perm); + + switch (size) { +@@ -370,8 +338,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + powerpc_regnum(tmp), + 0, powerpc_regnum(dest->ptr_register)); + +- powerpc_emit_D (compiler, "addi", 0x38000000, compiler->gp_tmpreg, +- 0, 4); ++ powerpc_emit_addi (compiler, compiler->gp_tmpreg, 0, 4); + + ORC_ASM_CODE(compiler," stvewx %s, %s, %s\n", + powerpc_get_regname (tmp), +@@ -397,6 +364,48 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + } + } + ++static void ++powerpc_denormalize_sp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequw", 0x10000086, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgnsp", 0xf0000687, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_sp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x7f800000, ++ 0x7f800000, 0x7f800000); ++ powerpc_denormalize_sp_full(p, reg, zero, mask); ++} ++ ++static void ++powerpc_denormalize_sp(OrcCompiler *p, int reg) ++{ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero(p, reg, zero); ++} ++ ++static void ++powerpc_denormalize_dp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_dp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ powerpc_denormalize_dp_full(p, reg, zero, mask); ++} + + + #define RULE(name, opcode, code) \ +@@ -409,6 +418,33 @@ powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ + powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2);\ + } + ++#define RULE_DP(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++ powerpc_denormalize_dp_zero (p, dest, zero); \ ++} ++ ++#define RULE_DP_SRC(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++} ++ + #define RULE_SHIFT(name, opcode, code) \ + static void \ + powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ +@@ -503,13 +539,11 @@ RULE(maxf, "vmaxfp", 0x1000040a) + RULE(minf, "vminfp", 0x1000044a) + RULE(cmpeqf, "vcmpeqfp", 0x100000c6) + +-RULE(addd, "xvadddp", 0xf0000307) +-RULE(subd, "xvsubdp", 0xf0000347) +-RULE(muld, "xvmuldp", 0xf0000387) +-RULE(divd, "xvdivdp", 0xf00003c7) +-RULE(mind, "xvmindp", 0xf0000747) +-RULE(maxd, "xvmaxdp", 0xf0000707) +-RULE(cmpeqd, "xvcmpeqdp", 0xf000031f) ++RULE_DP(addd, "xvadddp", 0xf0000307) ++RULE_DP(subd, "xvsubdp", 0xf0000347) ++RULE_DP(muld, "xvmuldp", 0xf0000387) ++RULE_DP(divd, "xvdivdp", 0xf00003c7) ++RULE_DP_SRC(cmpeqd, "xvcmpeqdp", 0xf000031f) + + RULE(addq, "vaddudm", 0x100000c0) + RULE(subq, "vsubudm", 0x100004c0) +@@ -541,13 +575,12 @@ powerpc_rule_mullb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x11011303, 0x15051707, ++ 0x19091b0b, 0x1d0d1f0f); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- powerpc_emit_vsldoi (p, dest, dest, dest, 1); +- } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -556,15 +589,12 @@ powerpc_rule_mulhsb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosb (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, src1, tmp); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -573,15 +603,12 @@ powerpc_rule_mulhub (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmuloub (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -590,16 +617,12 @@ powerpc_rule_mulhsw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -608,16 +631,12 @@ powerpc_rule_mulhuw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulouh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleuh(p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh(p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -765,10 +784,12 @@ powerpc_rule_mulsbw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -779,10 +800,12 @@ powerpc_rule_mulubw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -793,10 +816,12 @@ powerpc_rule_mulswl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -807,10 +832,12 @@ powerpc_rule_muluwl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleuh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulouh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -848,17 +875,13 @@ powerpc_rule_mulll (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp = orc_compiler_get_temp_reg(p); ++ int perm = powerpc_get_constant_full(p, 0x14151617, 0x04050607, ++ 0x1c1d1e1f, 0x0c0d0e0f); + +- if (IS_POWERPC_BE (p)) { +- int perm; +- +- powerpc_emit_vmuleuw (p, dest, src1, src2); +- perm = powerpc_get_constant_full (p, 0x04050607, 0x04050607, +- 0x0c0d0e0f, 0x0c0d0e0f); +- powerpc_emit_vperm (p, dest, dest, dest, perm); +- } else { +- powerpc_emit_vmulouw (p, dest, src1, src2); +- } ++ powerpc_emit_vmulouw (p, tmp, src1, src2); ++ powerpc_emit_vmuleuw (p, dest, src1, src2); ++ powerpc_emit_vperm (p, dest, tmp, dest, perm); + } + + static void +@@ -1428,20 +1451,11 @@ powerpc_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- int y = orc_compiler_get_temp_reg (p); +- int t = orc_compiler_get_temp_reg (p); +- int c1; +- int c0; +- +- c1 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x3f800000); /* 1.0 */ +- +- powerpc_emit_VX_db (p, "vrefp", 0x1000010a, y, src2); +- +- powerpc_emit_VA_acb (p, "vnmsubfp", 0x1000002f, t, y, c1, src2); +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, y, y, y, t); +- +- c0 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x00000000); /* 0.0 */ +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, dest, y, c0, src1); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); ++ powerpc_denormalize_sp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvdivsp", 0xf00002c7, dest, src1, src2); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1521,8 +1535,10 @@ powerpc_rule_sqrtf(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtsp", 0xf000022f, dest, src1); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1530,18 +1546,65 @@ powerpc_rule_sqrtd(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtdp", 0xf000032f, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +-powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++powerpc_rule_mind (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmindp", 0xf0000747, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp2, src1, tmp); ++} + +-// powerpc_emit_VXR (p, "vcmpgtfp", 0x100002c6, dest, src2, src1, FALSE); ++static void ++powerpc_rule_maxd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp3 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmaxdp", 0xf0000707, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp3, tmp2, src2, tmp); ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp3, src1, tmp); ++} ++ ++static void ++powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgtdp", 0xf000035f, dest, src2, src1); + } + +@@ -1551,8 +1614,9 @@ powerpc_rule_cmpled (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- +-// powerpc_emit_VXR (p, "vcmpgefp", 0x100001c6, dest, src2, src1, FALSE); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgedp", 0xf000039f, dest, src2, src1); + } + +@@ -1561,11 +1625,13 @@ powerpc_rule_convld (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); + + if (IS_POWERPC_LE (p)) { + powerpc_emit_vsldoi(p, src1, src1, src1, 4); + } + powerpc_emit_VX_db (p, "xvcvsxddp", 0xf00003e3, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +@@ -1573,8 +1639,19 @@ powerpc_rule_convdl (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int mask = powerpc_get_constant_full (p, 0xfff00000, 0x00000000, ++ 0xfff00000, 0x00000000); ++ int nan = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ int maxint = powerpc_get_constant_full (p, 0x7fffffff, 0x7fffffff, ++ 0x7fffffff, 0x7fffffff); ++ int tmp = p->tmpreg; + ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, nan); + powerpc_emit_VX_db (p, "xvcvdpsxws", 0xf0000363, dest, src1); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, dest, maxint, tmp); ++ + if (IS_POWERPC_LE (p)) { + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +@@ -1586,11 +1663,23 @@ powerpc_rule_convfd (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x00000000, ++ 0x7f800000, 0x00000000); ++ int tmp = p->tmpreg; + + if (IS_POWERPC_LE (p)) { +- powerpc_emit_vsldoi(p, src1, src1, src1, 4); ++ powerpc_emit_vsldoi(p, tmp2, src1, src1, 4); ++ } else { ++ powerpc_emit_vor(p, tmp2, src1, src1); + } +- powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, src1); ++ powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, tmp2); ++ ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, tmp2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, dest, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, dest, dest, tmp); + } + + static void +@@ -1604,6 +1693,7 @@ powerpc_rule_convdf (OrcCompiler *p, void *user, OrcInstruction *insn) + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); + } ++ powerpc_denormalize_sp(p, dest); + } + + +@@ -1757,7 +1847,6 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + REG(cmplef); + REG(cmpltf); + REG(mulf); +- REG(divf); + REG(convfl); + REG(convlf); + +@@ -1789,6 +1878,7 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + + rule_set = orc_rule_set_new(orc_opcode_set_get("sys"), target, ORC_TARGET_POWERPC_VSX); + ++ REG(divf); + REG(sqrtf); + REG(addd); + REG(subd); +diff --git a/orc/orctarget.h b/orc/orctarget.h +index 642bfe3..53000b3 100644 +--- a/orc/orctarget.h ++++ b/orc/orctarget.h +@@ -19,7 +19,7 @@ enum { + ORC_TARGET_FAST_DENORMAL = (1<<31) + }; + +-enum { ++typedef enum { + ORC_TARGET_POWERPC_64BIT = (1<<0), + ORC_TARGET_POWERPC_LE = (1<<1), + ORC_TARGET_POWERPC_ALTIVEC = (1<<2), +diff --git a/testsuite/exec_parse.c b/testsuite/exec_parse.c +index 0858413..859ad4e 100644 +--- a/testsuite/exec_parse.c ++++ b/testsuite/exec_parse.c +@@ -20,6 +20,7 @@ main (int argc, char *argv[]) + char *code; + int n; + int i; ++ int ret; + OrcProgram **programs; + const char *filename = NULL; + +@@ -45,7 +46,11 @@ main (int argc, char *argv[]) + + for(i=0;i<n;i++){ + if (verbose) printf("%s\n", programs[i]->name); +- orc_test_compare_output_full (programs[i], 0); ++ ret = orc_test_compare_output_full (programs[i], 0); ++ if (!ret) { ++ printf("failed %s\n", programs[i]->name); ++ error = TRUE; ++ } + orc_program_free (programs[i]); + } + +diff --git a/testsuite/memcpy_speed.c b/testsuite/memcpy_speed.c +index a1a69f1..4cf1c39 100644 +--- a/testsuite/memcpy_speed.c ++++ b/testsuite/memcpy_speed.c +@@ -102,7 +102,7 @@ main(int argc, char *argv[]) + max = 140; + } + +- for(i=0;i<max;i++){ ++ for(i=0;i<max;i+=2){ + double x = i*0.1 + 6.0; + int size = pow(2.0, x); + diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index f87f1c988..3e0bab284 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20190802 +pkgver=20190919 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="880681502d0b405e8a7962d6978d0a6cac3aec386723b69655d97157f8c5140fc88b711d7983e91b2900841e420af73a58f3ecb13f5e6122cd754a6ca26d84db papirus-icons-20190802.tar.gz" +sha512sums="183765db87863f46d5036ea020ef5f4da5f74b6b519bdf9409f95e904209ba308abf46af29d5d8e86a1abe95e18975bd9114cfc929cd4620a9cef49e6a5c939b papirus-icons-20190919.tar.gz" diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD new file mode 100644 index 000000000..77fe566db --- /dev/null +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-parallel-forkmanager +pkgver=2.02 +pkgrel=0 +pkgdesc="Perl library for managing fork()-based parallelization" +url="https://metacpan.org/pod/Parallel::ForkManager" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="perl perl-moo" +checkdepends="perl-test-warn" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Parallel-ForkManager-$pkgver.tar.gz" +builddir="$srcdir/Parallel-ForkManager-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb Parallel-ForkManager-2.02.tar.gz" diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD new file mode 100644 index 000000000..91cff6808 --- /dev/null +++ b/user/perl-regexp-common/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-regexp-common +_pkgname=Regexp-Common +pkgver=2017060201 +pkgrel=0 +pkgdesc="Perl library for common regular expression utilities" +url="https://metacpan.org/pod/Regexp::Common" +arch="noarch" +license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-$pkgver.tar.gz" +builddir="$srcdir/Regexp-Common-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608 Regexp-Common-2017060201.tar.gz" diff --git a/user/polkit-qt-1/APKBUILD b/user/polkit-qt-1/APKBUILD index bbfcde4f2..4a109e7d7 100644 --- a/user/polkit-qt-1/APKBUILD +++ b/user/polkit-qt-1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit-qt-1 -pkgver=0.112.0 +pkgver=0.113.0 pkgrel=0 pkgdesc="Qt wrapper library for PolicyKit" url="https://www.kde.org/" @@ -12,10 +12,9 @@ depends="" depends_dev="polkit-dev glib-dev" makedepends="$depends_dev cmake qt5-qtbase-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/apps/KDE4.x/admin/polkit-qt-1-$pkgver.tar.bz2" +source="https://download.kde.org/stable/$pkgname/polkit-qt-1-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,8 +31,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4cb17389b54a09c53052f6d72aa5cbfe09ccb19f7fd4edf8b43ccd4751f5e88609c5f89777f4af92167d32eb2ce1e78537cea7bcfb60a90072d1fe02d6a59b50 polkit-qt-1-0.112.0.tar.bz2" +sha512sums="deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38 polkit-qt-1-0.113.0.tar.xz" diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 53eada11d..8b9f2def3 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2019.6.16 +pkgver=2019.9.11 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -25,5 +25,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e certifi-2019.6.16.tar.gz +sha512sums="aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c certifi-2019.9.11.tar.gz f9c7d953b08d6ef87bae07605e2c09e9de1d1e60285fa1f5043beeae1d9f00f3b70fdf598585cd350df2632e22c0197ea2e8b76127e2927ad53880b60b349c9c use-system-certs.patch" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index 0b45bbf34..77c687851 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pbr _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=5.4.2 +pkgver=5.4.3 pkgrel=0 pkgdesc="Python Build Reasonableness" url="https://pypi.org/project/pbr" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="fd1ff768ed589760a1c9d339f3ddaaa0f13723a196913b0524659085333bbb3485506998875b9e293935ece2bb2ea042fba317822ac171ef99bdd43103525bed pbr-5.4.2.tar.gz" +sha512sums="546a24a84152f7e6929e456de08302fbc0a6f736d2b6a88078c4e07eb1c12736c88d5319a3e756c14ad11e879fd9efbcd5f14b4159f11526080561534543e2df pbr-5.4.3.tar.gz" diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index b6ad62c26..aaefdb947 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pysocks _pkgname=PySocks _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="SOCKS client module for Python" url="https://github.com/Anorov/PySocks" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="cc08ecbf65b59b6c4d4a24e01490dba19d93f2deb2860a49c4fc5679a9ceaba1860f05faaf8e299cf195e184a844f11989595e5046b07e2b30f9f3c682950e52 PySocks-1.7.0.tar.gz" +sha512sums="cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016 PySocks-1.7.1.tar.gz" diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD index a0b15b675..2286dc298 100644 --- a/user/py3-recommonmark/APKBUILD +++ b/user/py3-recommonmark/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-recommonmark _pkgname=recommonmark _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=0 pkgdesc="Bridge between CommonMark and docutils" url="https://pypi.org/project/recommonmark/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="581b3492e082ab4f0a53e50df0c9cfa3badda7ba9ee28dadbea85c55de96304257790e6aa06ebc793fba1d9ac399ce470fe821492106150b3a0db10dc734ee4b recommonmark-0.5.0.tar.gz" +sha512sums="f94f1ee426015478a95c2ed4b6ea87a75012447ae65d6623445f923d9d616b34efb055bcfde157862fcce38749c827905b839194fa1af3a1fe1cb7e11f18835a recommonmark-0.6.0.tar.gz" diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index 255e631d5..b877992d3 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -4,10 +4,10 @@ pkgname=py3-transitions _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.6.9 +pkgver=0.7.1 pkgrel=0 pkgdesc="Python state machine library" -url="https://pypi.org/project/passlib/" +url="https://pypi.org/project/transitions/" arch="noarch" options="!check" # requires nose, pygraphviz license="MIT" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="0cef11d547ae631afcb3dad557ab81b425f825028639787337f700f19073d7cb4c69ba9b6284155b3be85fb3eac4c4abd5b0cf3104dff8d2098c219729de4352 transitions-0.6.9.tar.gz" +sha512sums="4802e6a914270a183f66e70cf648c5f09c25b63e9233fdeb65b231ad24847d023182c6a45eaa1d47780d1f5d7f6f23695a6e578d4eaae55bf7a7ff121561e06b transitions-0.7.1.tar.gz" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index ed6442453..bde1340a1 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.25.3 +pkgver=1.25.6 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001 py3-urllib3-1.25.3.tar.gz" +sha512sums="02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 py3-urllib3-1.25.6.tar.gz" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 1e35fe052..0161221f4 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qastools -pkgver=0.21.0 +pkgver=0.22.0 pkgrel=0 pkgdesc="ALSA mixer and utilities for Qt" -url="https://xwmw.org/qastools/index.html" +url="https://gitlab.com/sebholt/qastools" arch="all" -license="GPL-3.0-only" +license="MIT" depends="bash" makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/qastools/qastools_$pkgver.tar.xz" -builddir="$srcdir/${pkgname}_${pkgver}" +source="https://gitlab.com/sebholt/qastools/-/archive/v$pkgver/qastools-v$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-v$pkgver" langdir="/usr/share/qastools/l10n" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b qastools_0.21.0.tar.xz" +sha512sums="5f4c845df00e00236d61ad1009fc6aa529996e02a03aeb92211a12facf9bdce5e1626f4c97d96d88827dfe689bd961d1a2fd3f9164dca6947c08b4fc1d78483d qastools-v0.22.0.tar.bz2" diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD index fc95087c1..274706d9a 100644 --- a/user/recode/APKBUILD +++ b/user/recode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=recode -pkgver=3.7.2 +pkgver=3.7.6 pkgrel=0 pkgdesc="Character set conversion utilities" url=" " @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5371c41cc0f08c5a15b4682b777b5dbf754aecea6fe61a90661ec0020ca6325c7a11cb04b21b87e08d1da51ee4e226fd84cbb74d61bbca9d181e51d9bb17042 recode-3.7.2.tar.gz" +sha512sums="ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f recode-3.7.6.tar.gz" diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index 0757ad517..fd3864d48 100644 --- a/user/rsibreak/APKBUILD +++ b/user/rsibreak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rsibreak -pkgver=0.12.10 +pkgver=0.12.11 pkgrel=0 pkgdesc="Helps you avoid wrist injury by telling you when to stop for a rest" url="https://www.kde.org/applications/utilities/rsibreak/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e5c5dabe0efa05f53b5a0b5823ef856ca6806ac1a3a1a45f57f236789190718b2ab73af35ee6617a42eb672e06554687dd41f3ab02e9c37d25ef926fee2240c rsibreak-0.12.10.tar.xz" +sha512sums="78498b747eeef842e40170236ace9d1ddd8b1f4bcc378134f2935cd2cf1c6933d44fa232f2f9b0724ee6b2638a34e4f71ebee2eac7664946093ed4df8eeb12ec rsibreak-0.12.11.tar.xz" diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index 3e132dee4..4c5f6198b 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,24 +1,23 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.12 +pkgver=1.14 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" license="GPL-2.0+" depends="" -makedepends="glib-dev intltool libxml2-dev libxml2-utils" +makedepends="glib-dev itstool libxml2-dev libxml2-utils" subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/aee9ae9646cbef724bbb1bd2ba146556/shared-mime-info-1.14.tar.xz" build() { ac_cv_func_fdatasync=no ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --enable-default-make-check \ --disable-update-mimedb make -j1 } @@ -31,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c9db138586fe4c789b5a89d3cdcf865d5b3258241accd254deecd7665e8b51fc538adeaeeda4fe332474f7d7ffa84f101cba26539a58e134201673d6d1495a2f shared-mime-info-1.12.tar.xz" +sha512sums="c25a4cec2e5aaa1e6aaef14f48f5910de5ccff1a5f3605da07fffea63e13624b945d7f40dfbe74fbfafd5364f143de88541c7fc5336d000ee16ad2eb06701c11 shared-mime-info-1.14.tar.xz" diff --git a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch b/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch deleted file mode 100644 index 51f588818..000000000 --- a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch +++ /dev/null @@ -1,60 +0,0 @@ -From de03266983ceb62e5365aac84fcd3b2fd4d16e6f Mon Sep 17 00:00:00 2001 -From: Phillip Lougher <phillip@squashfs.org.uk> -Date: Thu, 18 Sep 2014 01:28:11 +0100 -Subject: [PATCH] mksquashfs: fix rare race in fragment waiting in filesystem - finalisation - -Fix a rare race condition in fragment waiting when finalising the -filesystem. This is a race condition that was initially fixed in 2009, -but inadvertantly re-introduced in the latest release when the code -was rewritten. - -Background: - -When finalising the filesystem, the main control thread needs to ensure -all the in-flight fragments have been queued to the writer thread before -asking the writer thread to finish, and then writing the metadata. - -It does this by waiting on the fragments_outstanding counter. Once this -counter reaches 0, it synchronises with the writer thread, waiting until -the writer thread reports no outstanding data to be written. - -However, the main thread can race with the fragment deflator thread(s) -because the fragment deflator thread(s) decrement the fragments_outstanding -counter and release the mutex before queueing the compressed fragment -to the writer thread, i.e. the offending code is: - - fragments_outstanding --; - pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); - -In extremely rare circumstances, the main thread may see the -fragments_outstanding counter is zero before the fragment -deflator sends the fragment buffer to the writer thread, and synchronise -with the writer thread, and finalise before the fragment has been written. - -The fix is to ensure the fragment is queued to the writer thread -before releasing the mutex. - -Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> ---- - squashfs-tools/mksquashfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 87b7d86..f1fcff1 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -2419,8 +2419,8 @@ void *frag_deflator(void *arg) - write_buffer->block = bytes; - bytes += compressed_size; - fragments_outstanding --; -- pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); -+ pthread_mutex_unlock(&fragment_mutex); - TRACE("Writing fragment %lld, uncompressed size %d, " - "compressed size %d\n", file_buffer->block, - file_buffer->size, compressed_size); --- -2.10.2 - diff --git a/user/squashfs-tools/APKBUILD b/user/squashfs-tools/APKBUILD index 227faf11d..e33b06b16 100644 --- a/user/squashfs-tools/APKBUILD +++ b/user/squashfs-tools/APKBUILD @@ -1,35 +1,33 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=squashfs-tools -pkgver=4.3 -pkgrel=5 +pkgver=4.4 +pkgrel=0 pkgdesc="Tools for SquashFS, a highly compressed read-only filesystem" url="http://squashfs.sourceforge.net" arch="all" options="!check" # No test suite. license="GPL-2.0+" -depends= -makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev" -source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz +depends="" +makedepends="attr-dev lz4-dev lzo-dev xz-dev zlib-dev" +source="https://downloads.sourceforge.net/squashfs/squashfs$pkgver.tar.gz fix-compat.patch - vla-overlow.patch - CVE-2015-4645.patch - 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch -" -builddir="$srcdir/squashfs$pkgver" + " +builddir="$srcdir/squashfs$pkgver/$pkgname" + +# secfixes: +# 4.3-r5: +# - CVE-2015-4645 +# 4.4-r0: +# - CVE-2015-4646 build() { - cd "$builddir"/$pkgname make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 } package() { - cd "$builddir"/$pkgname mkdir -p "$pkgdir"/sbin cp -a mksquashfs unsquashfs "$pkgdir"/sbin } -sha512sums="854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 squashfs4.3.tar.gz -868e3923f98a7f8bb980fe8ab0d648e9ae9a55e324bea3830d6047aa348a4302dcb96d65bf59c6e04665891d822e18fad367a37c6704505b8492f64d749fc140 fix-compat.patch -975d09d047f4122866e83c4322ce3a15795c051b850d14a85a615c3beef970378e5a620ee16058b9c5104c53f973f9b3804d96c3ba1ab4f622f1e096c04e0360 vla-overlow.patch -77431a0a4a529ce63f1613a65a23af2fb8683a16d14ad1a5cfed3a9fac4df6a1212f081d1879ede188a25b77e860445058012131423c546657fb562069865d2c CVE-2015-4645.patch -1b2338a448ec8a2b75880ddc8c13f99392451847ab26277e1bc82b49a3a804796934e212dd1ba54a502940537a61891ee0103e913d0bda65cff0ca2827b8b41c 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch" +sha512sums="e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24 squashfs4.4.tar.gz +12f5739aa32b9e15ba3d22e5953034f17867a8837475f13bde5bbc378dbded0483cde42c0cdfc5d33ab3723b9de752c71b5ba8f4301ca7b59aa4054d669c262d fix-compat.patch" diff --git a/user/squashfs-tools/CVE-2015-4645.patch b/user/squashfs-tools/CVE-2015-4645.patch deleted file mode 100644 index f69025f18..000000000 --- a/user/squashfs-tools/CVE-2015-4645.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c -index ecdaac796f09..2c0cf63daf67 100644 ---- a/squashfs-tools/unsquash-4.c -+++ b/squashfs-tools/unsquash-4.c -@@ -31,9 +31,9 @@ static unsigned int *id_table; - int read_fragment_table_4(long long *directory_table_end) - { - int res, i; -- int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -- int indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -- long long fragment_table_index[indexes]; -+ size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -+ size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -+ long long *fragment_table_index; - - TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, -@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end) - return TRUE; - } - -+ fragment_table_index = malloc(indexes*sizeof(long long)); -+ if(fragment_table_index == NULL) -+ EXIT_UNSQUASH("read_fragment_table: failed to allocate " -+ "fragment table index\n"); -+ - fragment_table = malloc(bytes); - if(fragment_table == NULL) - EXIT_UNSQUASH("read_fragment_table: failed to allocate " diff --git a/user/squashfs-tools/fix-compat.patch b/user/squashfs-tools/fix-compat.patch index 2a3b33ca9..e93b6b827 100644 --- a/user/squashfs-tools/fix-compat.patch +++ b/user/squashfs-tools/fix-compat.patch @@ -1,6 +1,6 @@ ---- squashfs4.3.orig/squashfs-tools/action.c -+++ squashfs4.3/squashfs-tools/action.c -@@ -1905,6 +1905,9 @@ +--- squashfs-tools/action.c ++++ squashfs-tools/action.c +@@ -2236,6 +2236,9 @@ return 1; } @@ -10,9 +10,9 @@ TEST_FN(name, ACTION_ALL_LNK, \ return fnmatch(atom->argv[0], action_data->name, ---- squashfs4.3.orig/squashfs-tools/mksquashfs.c -+++ squashfs4.3/squashfs-tools/mksquashfs.c -@@ -4391,6 +4391,9 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -4665,6 +4665,9 @@ return paths; } @@ -22,19 +22,9 @@ int excluded_match(char *name, struct pathname *path, struct pathnames **new) { ---- squashfs4.3.orig/squashfs-tools/pseudo.c -+++ squashfs4.3/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/stat.h> - #include <ctype.h> - - #include "pseudo.h" ---- squashfs4.3.orig/squashfs-tools/unsquashfs.c -+++ squashfs4.3/squashfs-tools/unsquashfs.c -@@ -1410,6 +1410,9 @@ +--- squashfs-tools/unsquashfs.c ++++ squashfs-tools/unsquashfs.c +@@ -1457,6 +1457,9 @@ free(paths); } diff --git a/user/squashfs-tools/vla-overlow.patch b/user/squashfs-tools/vla-overlow.patch deleted file mode 100644 index a9840fe01..000000000 --- a/user/squashfs-tools/vla-overlow.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./squashfs-tools/unsquashfs.c.orig -+++ ./squashfs-tools/unsquashfs.c -@@ -2099,7 +2099,9 @@ - */ - void *inflator(void *arg) - { -- char tmp[block_size]; -+ char *tmp = malloc(block_size); -+ if(tmp == NULL) -+ EXIT_UNSQUASH("Out of memory allocating block buffer\n"); - - while(1) { - struct cache_entry *entry = queue_get(to_inflate); -@@ -2122,6 +2124,7 @@ - */ - cache_block_ready(entry, res == -1); - } -+ free(tmp); - } - - diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index ea8652b3e..376ca208c 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.10 +pkgver=0.99.11 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -10,8 +10,8 @@ license="GPL-2.0+" depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev - intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" + libgudev-dev libusb-dev libxslt linux-headers polkit-dev" +source="https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz" build() { DATADIRNAME=share ./configure \ @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aefe1b2ff5a390f1ea9676fe7e753750bebc56034365a9183e946a8463904047da0a4ac71340eb2efedc16bce6f6d9ef4609ddca37dc1fc31b56bcdbfbbfa59d upower-0.99.10.tar.xz" +sha512sums="67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803 upower-0.99.11.tar.xz" diff --git a/user/viewres/APKBUILD b/user/viewres/APKBUILD index 0185ca839..c7117860f 100644 --- a/user/viewres/APKBUILD +++ b/user/viewres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=viewres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="View widget class trees in software using Athena widgets (Xaw)" url="https://www.X.Org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/viewres-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2" +sha512sums="3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 5e72cbe9c..490c9a3e9 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.5 +pkgver=4.8.6 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -10,8 +10,8 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/Z3-$pkgver.tar.gz" -builddir="$srcdir/z3-Z3-$pkgver" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +builddir="$srcdir/z3-z3-$pkgver" build() { PYTHON=python3 ./configure \ @@ -37,4 +37,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 Z3-4.8.5.tar.gz" +sha512sums="d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 z3-4.8.6.tar.gz" |