diff options
-rw-r--r-- | user/gcompat/APKBUILD | 4 | ||||
-rw-r--r-- | user/gprbuild/APKBUILD | 14 | ||||
-rw-r--r-- | user/horizon/APKBUILD | 4 | ||||
-rw-r--r-- | user/kdiff3/APKBUILD | 5 | ||||
-rw-r--r-- | user/libmaxminddb/APKBUILD | 4 | ||||
-rw-r--r-- | user/mach64-drm/APKBUILD | 4 | ||||
-rw-r--r-- | user/scummvm/APKBUILD | 6 | ||||
-rw-r--r-- | user/sntpd/APKBUILD | 19 | ||||
-rw-r--r-- | user/sntpd/select.patch | 8 | ||||
-rw-r--r-- | user/x264/APKBUILD | 2 | ||||
-rw-r--r-- | user/xf86-video-openchrome/APKBUILD | 2 |
11 files changed, 38 insertions, 34 deletions
diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index 5dc8d6c74..b515cb6ef 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gcompat -pkgver=0.9.0 +pkgver=1.0.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" url="https://code.foxkit.us/adelie/gcompat" @@ -32,4 +32,4 @@ package() { make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } -sha512sums="d19a1b450f84de80579ce562946ad3da155fa50c2c0642f4b94c8ec22517151493852888455f6d813529816d7518468ec7b5178bb536514045596700fd05738c gcompat-0.9.0.tar.xz" +sha512sums="61e355445571760b7cb8c8a828e7182544fefb403dca602f0b3756f39430974b5161517b0fdf4636a8a513be8e64d4dcb13553b28e9c7833f15c3b9871c94455 gcompat-1.0.0.tar.xz" diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD index 4ffe06950..9400b0400 100644 --- a/user/gprbuild/APKBUILD +++ b/user/gprbuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=gprbuild -pkgver=2019 -_pkgver=2019-20190517-194D8 -_xmlver=2019-20190429-19B9D +pkgver=2020 +_pkgver=2020-20200814-19ABE +_xmlver=2020-20200814-19BC4 pkgrel=0 pkgdesc="An advanced build system for multi-language systems" url="https://github.com/AdaCore/gprbuild" @@ -11,8 +11,8 @@ options="!check" # No test suite. license="GPL-3.0+" depends="" makedepends="gcc-gnat" -source="https://distfiles.adelielinux.org/source/$pkgname-$_pkgver-src.tar.gz - https://distfiles.adelielinux.org/source/xmlada-$_xmlver-src.tar.gz +source="$pkgname-$_pkgver-src.tar.gz::https://community.download.adacore.com/v1/4e13d41920eac86fd139b5d7984eb908d697d868?filename=$pkgname-$_pkgver-src.tar.gz + xmlada-$_xmlver-src.tar.gz::https://community.download.adacore.com/v1/9cf1ab59b526d1260e007fa9719126c5498632d2?filename=xmlada-$_xmlver-src.tar.gz foxkit.xml " builddir="$srcdir/$pkgname-$_pkgver-src" @@ -47,6 +47,6 @@ package() { "$pkgdir"/usr/share/gprconfig } -sha512sums="0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b gprbuild-2019-20190517-194D8-src.tar.gz -f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 xmlada-2019-20190429-19B9D-src.tar.gz +sha512sums="cd9cb2a1f7867f17a5b69d8500476f3a97ca4856b171344d3bf887f55a4860d0ae32ec89ad82e9c7cec13fa20e58cd8ab890554115774095111ed38f9760050e gprbuild-2020-20200814-19ABE-src.tar.gz +51365bc1baaa0886caf46d75d3d27d56b37d5a02f04673321a60bda14a2adda0edd43321f8b34583d4aeaf852f4a21a924f841899c458076b3f261d881bb29a1 xmlada-2020-20200814-19BC4-src.tar.gz e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc foxkit.xml" diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index 4fb711bbb..b17cf786e 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" @@ -156,4 +156,4 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="202830a4e1313d0761484aeb65bef1e2a109917d4bec8f963672f4017a5fda2dac1383be6dfe2ed9aa3daa913cc62f816e88d2e760824957dbc18070ca901f76 horizon-0.9.4.tar.xz" +sha512sums="373cbf87aa468d0ea41abad07f61cdaa6088cfdcba13c0beff245dbd8e270aa42c3e301a22913299d148e829114bd0b5aa746541c4b4b0c7286da35015c54d88 horizon-0.9.5.tar.xz" diff --git a/user/kdiff3/APKBUILD b/user/kdiff3/APKBUILD index e55724ca1..ff523e7ed 100644 --- a/user/kdiff3/APKBUILD +++ b/user/kdiff3/APKBUILD @@ -20,6 +20,11 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + case $CTARGET_ARCH in + ppc) export LDFLAGS="$LDFLAGS -Wl,--no-as-needed -latomic -Wl,--as-needed";; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/user/libmaxminddb/APKBUILD b/user/libmaxminddb/APKBUILD index f1762c4ca..c03397a46 100644 --- a/user/libmaxminddb/APKBUILD +++ b/user/libmaxminddb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=libmaxminddb -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="Library for the MaxMind DB file format" url="http://maxmind.github.io/libmaxminddb/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 libmaxminddb-1.4.2.tar.gz" +sha512sums="7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e libmaxminddb-1.4.3.tar.gz" diff --git a/user/mach64-drm/APKBUILD b/user/mach64-drm/APKBUILD index 26d84ce56..96fe34b04 100644 --- a/user/mach64-drm/APKBUILD +++ b/user/mach64-drm/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> -_kver="5.4.5-mc0" +_kver="5.4.66-mc1" pkgname=mach64-drm pkgver=5.6 pkgrel=0 pkgdesc="Kernel driver for Mach64 GPUs" url=" " -arch="pmmx ppc x86_64" +arch="pmmx ppc" options="!check !dbg !strip" # No test suite. license="MIT" depends="easy-kernel-modules-$_kver" diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD index edbb2078b..938c66721 100644 --- a/user/scummvm/APKBUILD +++ b/user/scummvm/APKBUILD @@ -18,9 +18,13 @@ source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2 " build() { + _extra_conf="" + [ $CTARGET_ARCH = "pmmx" ] && _extra_conf="--disable-nasm" + ./configure \ --prefix=/usr \ - --disable-readline + --disable-readline \ + ${_extra_conf} make } diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD index d15fbff92..5171813e7 100644 --- a/user/sntpd/APKBUILD +++ b/user/sntpd/APKBUILD @@ -1,24 +1,17 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=sntpd -pkgver=3.0_git20190119 -_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e +pkgver=3.0 pkgrel=0 pkgdesc="A small SNTP client for UNIX systems, implementing RFC 1305 and RFC 4330" url="https://github.com/troglobit/sntpd" arch="all" license="GPL-2.0-only" depends="" -makedepends="autoconf automake" +makedepends="" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz +source="https://github.com/troglobit/sntpd/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz select.patch " -builddir="$srcdir/$pkgname-$_commit" - -prepare() { - default_prepare - autoreconf -vif -} build() { ./configure \ @@ -31,6 +24,8 @@ build() { --localstatedir=/var \ --disable-debug \ --enable-replay \ + --with-adjtimex \ + --with-ntpclient \ --without-systemd make } @@ -43,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5 sntpd-3.0_git20190119.tar.gz -09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678 select.patch" +sha512sums="664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea sntpd-3.0.tar.gz +966ae71a41f31b37b0be8dc361471f72d085ca06161deeedc37cc82d6b80852ca79b37bfc8f9948988bedaeba6a77a0b4edf19848a12e8107ec13ab86524c5dd select.patch" diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch index 00121d80b..f0e25055a 100644 --- a/user/sntpd/select.patch +++ b/user/sntpd/select.patch @@ -1,10 +1,10 @@ select(3) does not modify its timeout in musl, as permitted by POSIX ---- sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c -+++ sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c -@@ -686,7 +686,7 @@ static void primary_loop(int usd, struct ntp_control *ntpc) - ERR(errno, "Failed select()"); +--- sntpd-3.0/src/sntpd.c ++++ sntpd-3.0/src/sntpd.c +@@ -663,7 +663,7 @@ static void loop(struct ntp_control *ntpc) continue; } + - if (to.tv_sec == 0) { + if (1) { if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0) diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD index c7c18cb67..2ae88e2eb 100644 --- a/user/x264/APKBUILD +++ b/user/x264/APKBUILD @@ -10,7 +10,7 @@ license="GPL-2.0+" depends="" makedepends="bash coreutils libx11-dev perl" case $CTARGET_ARCH in - x86_64) makedepends="$makedepends yasm";; + x86_64) makedepends="$makedepends nasm";; esac subpackages="$pkgname-dev $pkgname-libs" source="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD index 1b71f0b87..3d32b7dff 100644 --- a/user/xf86-video-openchrome/APKBUILD +++ b/user/xf86-video-openchrome/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libxvmc-dev xorgproto-dev xorg-server-dev" +makedepends="libxv-dev libxvmc-dev xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2" |