diff options
41 files changed, 114 insertions, 783 deletions
diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index ac23280aa..aa6e4c9e7 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: pkgname=curl -pkgver=7.65.1 +pkgver=7.65.3 pkgrel=0 pkgdesc="An URL retrival utility and library" url="https://curl.haxx.se" @@ -104,4 +104,4 @@ libcurl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4 curl-7.65.1.tar.xz" +sha512sums="fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b curl-7.65.3.tar.xz" diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD index c3e228d7d..30d291ec0 100644 --- a/system/e2fsprogs/APKBUILD +++ b/system/e2fsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=e2fsprogs -pkgver=1.45.2 +pkgver=1.45.3 pkgrel=0 pkgdesc="Standard ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" @@ -54,5 +54,5 @@ libcom_err() { mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -sha512sums="50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e e2fsprogs-1.45.2.tar.xz +sha512sums="9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52 e2fsprogs-1.45.3.tar.xz 34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch" diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index 984739111..b08cd6289 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=fakeroot -pkgver=1.22 +pkgver=1.23 pkgrel=0 pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user" arch="all" @@ -12,8 +12,7 @@ makedepends_host="libcap-dev acl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" checkdepends="bash" subpackages="$pkgname-doc" -source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2 - busybox-getopt.patch +source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.xz fakeroot-hide-dlsym-errors.patch fakeroot-no64.patch fakeroot-stdint.patch @@ -22,14 +21,12 @@ source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.o " build() { - if [ "$CLIBC" = "musl" ]; then - # musl does not have _STAT_VER, it's really not used for - # anything, so define it as zero (just like uclibc does) - export CFLAGS="-D_STAT_VER=0 $CFLAGS" - fi + # musl does not have _STAT_VER, it's really not used for + # anything, so define it as zero + export CFLAGS="-D_STAT_VER=0 $CFLAGS" - CONFIG_SHELL=/bin/sh ./bootstrap - CONFIG_SHELL=/bin/sh ./configure \ + ./bootstrap + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -41,15 +38,14 @@ build() { } check() { - bash -c 'make check' + make check } package() { make DESTDIR="$pkgdir" install } -sha512sums="193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a fakeroot_1.22.orig.tar.bz2 -9024263f4452bcb46c9670f8b8106e67c2d9b4cf45215def7ff4e78d2c908e4f98d494dd6f514fb3325165b0f61571fa031632b4642163cf9b1b3386d0867c5f busybox-getopt.patch +sha512sums="0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 fakeroot_1.23.orig.tar.xz 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch diff --git a/system/fakeroot/busybox-getopt.patch b/system/fakeroot/busybox-getopt.patch deleted file mode 100644 index e8172e8f1..000000000 --- a/system/fakeroot/busybox-getopt.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./scripts/fakeroot.in.orig -+++ ./scripts/fakeroot.in -@@ -43,9 +43,9 @@ - - libfound=no - --GETOPTEST=`getopt --version` -+GETOPTEST=`getopt --version 2>&1 | head -n2` - case $GETOPTEST in --getopt*) # GNU getopt -+getopt*|*BusyBox*) # GNU getopt - FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` - ;; - *) # POSIX getopt ? diff --git a/system/fakeroot/fakeroot-uclibc.patch b/system/fakeroot/fakeroot-uclibc.patch deleted file mode 100644 index 63708092d..000000000 --- a/system/fakeroot/fakeroot-uclibc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- fakeroot-1.18.2.orig/libfakeroot.c -+++ fakeroot-1.18.2/libfakeroot.c -@@ -1551,7 +1551,7 @@ - #endif /* LIBFAKEROOT_DEBUGGING */ - r=next_fts_read(ftsp); - if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ --# if defined(STAT64_SUPPORT) && !defined(__APPLE__) -+# if defined(STAT64_SUPPORT) && !defined(__APPLE__) && !defined(__UCLIBC__) - SEND_GET_STAT64(r->fts_statp, _STAT_VER); - # else - SEND_GET_STAT(r->fts_statp, _STAT_VER); -@@ -1574,7 +1574,7 @@ - first=next_fts_children(ftsp, options); - for(r = first; r; r = r->fts_link) { - if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ --# if defined(STAT64_SUPPORT) && !defined(__APPLE__) -+# if defined(STAT64_SUPPORT) && !defined(__APPLE__) && !defined(__UCLIBC__) - SEND_GET_STAT64(r->fts_statp, _STAT_VER); - # else - SEND_GET_STAT(r->fts_statp, _STAT_VER); diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index 53a0eb287..2ac534adf 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=certbot -pkgver=0.32.0 +pkgver=0.36.0 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -19,17 +19,14 @@ subpackages="py3-acme:acme" source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } @@ -41,4 +38,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4 certbot-0.32.0.tar.gz" +sha512sums="f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92 certbot-0.36.0.tar.gz" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index fcc9c4ebb..f9366a4de 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=0 pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870 enchant-2.2.4.tar.gz" +sha512sums="cc4d00ea2c94fcf2cef0281e13b86c49cfbff74c60315126bab8b1d91d8da1fb8fd0dc215a1eb44b07d8be33bc54cb9e63107874ef1caa04714fbe4b7484280f enchant-2.2.5.tar.gz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index a77cae8fd..1fd530507 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: pkgname=libevent -pkgver=2.1.8 -pkgrel=5 +pkgver=2.1.10 +pkgrel=0 pkgdesc="An event notification library" url="http://libevent.org/" arch="all" @@ -12,9 +12,6 @@ depends_dev="python3" makedepends="$depends_dev openssl-dev" subpackages="$pkgname-dev" source="https://github.com/$pkgname/$pkgname/releases/download/release-$pkgver-stable/$pkgname-$pkgver-stable.tar.gz - dont-test-fallback.patch - fix-test-on-32bit.patch - py3_dumpevents.patch py3_rpcgen.patch " @@ -26,13 +23,7 @@ source="https://github.com/$pkgname/$pkgname/releases/download/release-$pkgver-s builddir="$srcdir"/$pkgname-$pkgver-stable -prepare() { - cd "$builddir" - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR=$pkgdir install } @@ -59,8 +48,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 libevent-2.1.8-stable.tar.gz -d059a592252f83a918f0b6237e2dbee1d05822c83372bcd0f658a25428cce109fd088c5dec8320fef4c1aa7a713ada53aae9b7c04d7ca9b039ed4a483ba84146 dont-test-fallback.patch -7898a00eeab4af7ff3b7c1ee3b90e0d718beba435dfadf015f62084524b2b0f4049c8dd9e16926c61017c01faabf7a51c2f19be7f9532e01278d691acb98465d fix-test-on-32bit.patch -1f51788db3797870392997d0314fb744ee54d3b1a326d1b67f522fc7af65d50210cb137e8213d35a788bbf3c97aac18cd9860de8af3cb8c82f25e3ae07d662ae py3_dumpevents.patch -00d0b09425835638a5e29d96d70c855a5c57efb188157b80a3885a2dcbe88709b49ae57aeb6b8b590458a934116cf59934e6e32fbf684b2b3b8333c0dcac837e py3_rpcgen.patch" +sha512sums="2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086 libevent-2.1.10-stable.tar.gz +ca097528f88b0a86248be594b44eaa7edcb3a1ee2b808685c09aa7947bb5c10342f4b584e7f2fcef6bc4a185fecb80da4a7a6660dd5c075f3416f9a55a1389b0 py3_rpcgen.patch" diff --git a/user/libevent/dont-test-fallback.patch b/user/libevent/dont-test-fallback.patch deleted file mode 100644 index 42a40094a..000000000 --- a/user/libevent/dont-test-fallback.patch +++ /dev/null @@ -1,16 +0,0 @@ -The libevent fallback monotonic clock is broken, but it should never be used -anyway on musl, so disable testing it. - -(the brokenness involves gettimeofday, you don't want to know) - ---- libevent-2.1.8-stable/test/regress_util.c.old 2017-01-15 03:04:34.000000000 -0600 -+++ libevent-2.1.8-stable/test/regress_util.c 2017-09-14 16:25:58.887687965 -0500 -@@ -1482,7 +1482,7 @@ - { "monotonic_res_fallback", test_evutil_monotonic_res, TT_OFF_BY_DEFAULT, &basic_setup, (void*)"fallback" }, - { "monotonic_prc", test_evutil_monotonic_prc, 0, &basic_setup, (void*)"" }, - { "monotonic_prc_precise", test_evutil_monotonic_prc, 0, &basic_setup, (void*)"precise" }, -- { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0, &basic_setup, (void*)"fallback" }, -+ /* { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0, &basic_setup, (void*)"fallback" }, */ - { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL }, - END_OF_TESTCASES, - }; diff --git a/user/libevent/fix-test-on-32bit.patch b/user/libevent/fix-test-on-32bit.patch deleted file mode 100644 index ec120a78c..000000000 --- a/user/libevent/fix-test-on-32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libevent-2.1.8-stable/test/regress_util.c.old 2018-03-04 21:14:24.344542520 -0600 -+++ libevent-2.1.8-stable/test/regress_util.c 2018-03-04 21:24:23.788814572 -0600 -@@ -1411,7 +1411,7 @@ - { 1255132800, "Sat, 10 Oct 2009 00:00:00 GMT"}, - { 1289433600, "Thu, 11 Nov 2010 00:00:00 GMT"}, - { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"}, --#ifndef _WIN32 -+#if !defined(_WIN32) && (!defined(__SIZEOF_LONG__) || __SIZEOF_LONG__ > 4) - /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */ - { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, - /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */ diff --git a/user/libevent/libressl.patch b/user/libevent/libressl.patch deleted file mode 100644 index 21a750c2c..000000000 --- a/user/libevent/libressl.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -ru a/openssl-compat.h b/openssl-compat.h ---- a/openssl-compat.h -+++ b/openssl-compat.h -@@ -1,7 +1,7 @@ - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - { -@@ -30,6 +30,6 @@ - - #define TLS_method SSLv23_method - --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ - - #endif /* OPENSSL_COMPAT_H */ -diff -ru a/sample/https-client.c b/sample/https-client.c ---- a/sample/https-client.c -+++ b/sample/https-client.c -@@ -312,7 +312,7 @@ - } - uri[sizeof(uri) - 1] = '\0'; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // Initialize OpenSSL - SSL_library_init(); - ERR_load_crypto_strings(); -@@ -480,7 +480,7 @@ - SSL_CTX_free(ssl_ctx); - if (type == HTTP && ssl) - SSL_free(ssl); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_cleanup(); - ERR_free_strings(); - -@@ -492,7 +492,7 @@ - CRYPTO_cleanup_all_ex_data(); - - sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); --#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ - - #ifdef _WIN32 - WSACleanup(); -diff -ru a/sample/le-proxy.c b/sample/le-proxy.c ---- a/sample/le-proxy.c -+++ b/sample/le-proxy.c -@@ -259,7 +259,7 @@ - - if (use_ssl) { - int r; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); -diff -ru a/sample/openssl_hostname_validation.c b/sample/openssl_hostname_validation.c ---- a/sample/openssl_hostname_validation.c -+++ b/sample/openssl_hostname_validation.c -@@ -48,7 +48,7 @@ - - #define HOSTNAME_MAX_SIZE 255 - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_get0_data ASN1_STRING_data - #endif - -diff -ru a/test/regress_ssl.c b/test/regress_ssl.c ---- a/test/regress_ssl.c -+++ b/test/regress_ssl.c -@@ -186,7 +186,7 @@ - void - init_ssl(void) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); -@@ -194,6 +194,10 @@ - if (SSLeay() != OPENSSL_VERSION_NUMBER) { - TT_DECLARE("WARN", ("Version mismatch for openssl: compiled with %lx but running with %lx", (unsigned long)OPENSSL_VERSION_NUMBER, (unsigned long) SSLeay())); - } -+ if (SSLeay() != LIBRESSL_VERSION_NUMBER) { -+ TT_DECLARE("WARN", ("Version mismatch for libressl: compiled with %lx but running with %lx", (unsigned long)LIBRESSL_VERSION_NUMBER, (unsigned long) SSLeay())); -+ } -+ - #endif - } - diff --git a/user/libevent/py3_dumpevents.patch b/user/libevent/py3_dumpevents.patch deleted file mode 100644 index 3c012ef89..000000000 --- a/user/libevent/py3_dumpevents.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- libevent-2.1.8-stable/test/check-dumpevents.py 2016-10-04 14:55:31.000000000 -0500 -+++ libevent-2.1.8-py3-rpcgen/test/check-dumpevents.py 2017-09-14 15:51:16.000000000 -0500 -@@ -15,12 +15,12 @@ - got_inserted_pos = text.index("Inserted events:\n") - got_active_pos = text.index("Active events:\n") - except ValueError: -- print >>sys.stderr, "Missing expected dividing line in dumpevents output" -+ sys.stderr.write("Missing expected dividing line in dumpevents output\n") - sys.exit(1) - - if not (expect_inserted_pos < expect_active_pos < - got_inserted_pos < got_active_pos): -- print >>sys.stderr, "Sections out of order in dumpevents output" -+ sys.stderr.write("Sections out of order in dumpevents output\n") - sys.exit(1) - - now,T= text[1].split() -@@ -45,10 +45,10 @@ - if "Internal" not in s) - - if cleaned_inserted != want_inserted: -- print >>sys.stderr, "Inserted event lists were not as expected!" -+ sys.stderr.write("Inserted event lists were not as expected!\n") - sys.exit(1) - - if set(got_active) != set(want_active): -- print >>sys.stderr, "Active event lists were not as expected!" -+ sys.stderr.write("Active event lists were not as expected!\n") - sys.exit(1) - diff --git a/user/libevent/py3_rpcgen.patch b/user/libevent/py3_rpcgen.patch index 2ebe974a6..13c32edc1 100644 --- a/user/libevent/py3_rpcgen.patch +++ b/user/libevent/py3_rpcgen.patch @@ -1,423 +1,8 @@ --- libevent-2.1.8-stable/event_rpcgen.py 2016-12-06 03:44:11.000000000 -0600 +++ libevent-2.1.8-py3-rpcgen/event_rpcgen.py 2017-09-14 15:17:51.000000000 -0500 @@ -1,4 +1,4 @@ --#!/usr/bin/env python2 +-#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu> # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson -@@ -36,10 +36,10 @@ - - def declare(s): - if not QUIETLY: -- print s -+ print(s) - - def TranslateList(mylist, mydict): -- return map(lambda x: x % mydict, mylist) -+ return [x % mydict for x in mylist] - - # Exception class for parse errors - class RpcGenError(Exception): -@@ -57,7 +57,7 @@ - declare(' Created struct: %s' % name) - - def AddEntry(self, entry): -- if self._tags.has_key(entry.Tag()): -+ if entry.Tag() in self._tags: - raise RpcGenError( - 'Entry "%s" duplicates tag number %d from "%s" ' - 'around line %d' % (entry.Name(), entry.Tag(), -@@ -78,7 +78,8 @@ - def PrintIndented(self, file, ident, code): - """Takes an array, add indentation to each entry and prints it.""" - for entry in code: -- print >>file, '%s%s' % (ident, entry) -+ file.write('{}{}\n'.format(ident, entry)) -+ #file.write('%s%s' % (ident, entry)) - - class StructCCode(Struct): - """ Knows how to generate C code for a struct """ -@@ -88,20 +89,19 @@ - - def PrintTags(self, file): - """Prints the tag definitions for a structure.""" -- print >>file, '/* Tag definition for %s */' % self._name -- print >>file, 'enum %s_ {' % self._name.lower() -+ file.write('/* Tag definition for %s */\n' % self._name) -+ file.write('enum %s_ {\n' % self._name.lower()) - for entry in self._entries: -- print >>file, ' %s=%d,' % (self.EntryTagName(entry), -- entry.Tag()) -- print >>file, ' %s_MAX_TAGS' % (self._name.upper()) -- print >>file, '};\n' -+ file.write(' %s=%d,\n' % (self.EntryTagName(entry), entry.Tag())) -+ file.write(' %s_MAX_TAGS\n' % (self._name.upper())) -+ file.write('};\n\n') - - def PrintForwardDeclaration(self, file): -- print >>file, 'struct %s;' % self._name -+ file.write('struct %s;\n' % self._name) - - def PrintDeclaration(self, file): -- print >>file, '/* Structure declaration for %s */' % self._name -- print >>file, 'struct %s_access_ {' % self._name -+ file.write('/* Structure declaration for %s */\n' % self._name) -+ file.write('struct %s_access_ {\n' % self._name) - for entry in self._entries: - dcl = entry.AssignDeclaration('(*%s_assign)' % entry.Name()) - dcl.extend( -@@ -110,20 +110,19 @@ - dcl.extend( - entry.AddDeclaration('(*%s_add)' % entry.Name())) - self.PrintIndented(file, ' ', dcl) -- print >>file, '};\n' -+ file.write('};\n\n') - -- print >>file, 'struct %s {' % self._name -- print >>file, ' struct %s_access_ *base;\n' % self._name -+ file.write('struct %s {\n' % self._name) -+ file.write(' struct %s_access_ *base;\n\n' % self._name) - for entry in self._entries: - dcl = entry.Declaration() - self.PrintIndented(file, ' ', dcl) -- print >>file, '' -+ file.write('\n') - for entry in self._entries: -- print >>file, ' ev_uint8_t %s_set;' % entry.Name() -- print >>file, '};\n' -+ file.write(' ev_uint8_t %s_set;\n' % entry.Name()) -+ file.write('};\n\n') - -- print >>file, \ --"""struct %(name)s *%(name)s_new(void); -+ file.write("""struct %(name)s *%(name)s_new(void); - struct %(name)s *%(name)s_new_with_arg(void *); - void %(name)s_free(struct %(name)s *); - void %(name)s_clear(struct %(name)s *); -@@ -133,7 +132,7 @@ - void evtag_marshal_%(name)s(struct evbuffer *, ev_uint32_t, - const struct %(name)s *); - int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t, -- struct %(name)s *);""" % { 'name' : self._name } -+ struct %(name)s *);\n""" % { 'name' : self._name }) - - - # Write a setting function of every variable -@@ -146,22 +145,21 @@ - self.PrintIndented(file, '', entry.AddDeclaration( - entry.AddFuncName())) - -- print >>file, '/* --- %s done --- */\n' % self._name -+ file.write('/* --- %s done --- */\n\n' % self._name) - - def PrintCode(self, file): -- print >>file, ('/*\n' -+ file.write(('/*\n' - ' * Implementation of %s\n' -- ' */\n') % self._name -+ ' */\n\n') % self._name) - -- print >>file, \ -- 'static struct %(name)s_access_ %(name)s_base__ = {' % \ -- { 'name' : self._name } -+ file.write('static struct %(name)s_access_ %(name)s_base__ = {\n' % \ -+ { 'name' : self._name }) - for entry in self._entries: - self.PrintIndented(file, ' ', entry.CodeBase()) -- print >>file, '};\n' -+ file.write('};\n\n') - - # Creation -- print >>file, ( -+ file.write(( - 'struct %(name)s *\n' - '%(name)s_new(void)\n' - '{\n' -@@ -176,77 +174,77 @@ - ' event_warn("%%s: malloc", __func__);\n' - ' return (NULL);\n' - ' }\n' -- ' tmp->base = &%(name)s_base__;\n') % { 'name' : self._name } -+ ' tmp->base = &%(name)s_base__;\n\n') % { 'name' : self._name }) - - for entry in self._entries: - self.PrintIndented(file, ' ', entry.CodeInitialize('tmp')) -- print >>file, ' tmp->%s_set = 0;\n' % entry.Name() -+ file.write(' tmp->%s_set = 0;\n\n' % entry.Name()) - -- print >>file, ( -+ file.write(( - ' return (tmp);\n' -- '}\n') -+ '}\n\n')) - - # Adding - for entry in self._entries: - if entry.Array(): - self.PrintIndented(file, '', entry.CodeAdd()) -- print >>file, '' -+ file.write('\n') - - # Assigning - for entry in self._entries: - self.PrintIndented(file, '', entry.CodeAssign()) -- print >>file, '' -+ file.write('\n') - - # Getting - for entry in self._entries: - self.PrintIndented(file, '', entry.CodeGet()) -- print >>file, '' -+ file.write('\n') - - # Clearing -- print >>file, ( 'void\n' -+ file.write(( 'void\n' - '%(name)s_clear(struct %(name)s *tmp)\n' - '{' -- ) % { 'name' : self._name } -+ '\n') % { 'name' : self._name }) - for entry in self._entries: - self.PrintIndented(file, ' ', entry.CodeClear('tmp')) - -- print >>file, '}\n' -+ file.write('}\n\n') - - # Freeing -- print >>file, ( 'void\n' -+ file.write(( 'void\n' - '%(name)s_free(struct %(name)s *tmp)\n' - '{' -- ) % { 'name' : self._name } -+ '\n') % { 'name' : self._name }) - - for entry in self._entries: - self.PrintIndented(file, ' ', entry.CodeFree('tmp')) - -- print >>file, (' free(tmp);\n' -- '}\n') -+ file.write((' free(tmp);\n' -+ '}\n\n')) - - # Marshaling -- print >>file, ('void\n' -+ file.write(('void\n' - '%(name)s_marshal(struct evbuffer *evbuf, ' - 'const struct %(name)s *tmp)' -- '{') % { 'name' : self._name } -+ '{\n') % { 'name' : self._name }) - for entry in self._entries: - indent = ' ' - # Optional entries do not have to be set - if entry.Optional(): - indent += ' ' -- print >>file, ' if (tmp->%s_set) {' % entry.Name() -+ file.write(' if (tmp->%s_set) {\n' % entry.Name()) - self.PrintIndented( - file, indent, - entry.CodeMarshal('evbuf', self.EntryTagName(entry), - entry.GetVarName('tmp'), - entry.GetVarLen('tmp'))) - if entry.Optional(): -- print >>file, ' }' -+ file.write(' }\n') - -- print >>file, '}\n' -+ file.write('}\n\n') - - # Unmarshaling -- print >>file, ('int\n' -+ file.write(('int\n' - '%(name)s_unmarshal(struct %(name)s *tmp, ' - ' struct evbuffer *evbuf)\n' - '{\n' -@@ -255,14 +253,14 @@ - ' if (evtag_peek(evbuf, &tag) == -1)\n' - ' return (-1);\n' - ' switch (tag) {\n' -- ) % { 'name' : self._name } -+ '\n') % { 'name' : self._name }) - for entry in self._entries: -- print >>file, ' case %s:\n' % self.EntryTagName(entry) -+ file.write(' case %s:\n' % self.EntryTagName(entry)) - if not entry.Array(): -- print >>file, ( -+ file.write(( - ' if (tmp->%s_set)\n' - ' return (-1);' -- ) % (entry.Name()) -+ '\n') % (entry.Name())) - - self.PrintIndented( - file, ' ', -@@ -271,26 +269,26 @@ - entry.GetVarName('tmp'), - entry.GetVarLen('tmp'))) - -- print >>file, ( ' tmp->%s_set = 1;\n' % entry.Name() + -- ' break;\n' ) -- print >>file, ( ' default:\n' -+ file.write(( ' tmp->%s_set = 1;\n' % entry.Name() + -+ ' break;\n' )) -+ file.write(( ' default:\n' - ' return -1;\n' - ' }\n' -- ' }\n' ) -+ ' }\n\n' )) - # Check if it was decoded completely -- print >>file, ( ' if (%(name)s_complete(tmp) == -1)\n' -+ file.write(( ' if (%(name)s_complete(tmp) == -1)\n' - ' return (-1);' -- ) % { 'name' : self._name } -+ '\n') % { 'name' : self._name }) - - # Successfully decoded -- print >>file, ( ' return (0);\n' -- '}\n') -+ file.write(( ' return (0);\n' -+ '}\n\n')) - - # Checking if a structure has all the required data -- print >>file, ( -+ file.write(( - 'int\n' - '%(name)s_complete(struct %(name)s *msg)\n' -- '{' ) % { 'name' : self._name } -+ '{\n' ) % { 'name' : self._name }) - for entry in self._entries: - if not entry.Optional(): - code = [ -@@ -303,12 +301,12 @@ - self.PrintIndented( - file, ' ', - entry.CodeComplete('msg', entry.GetVarName('msg'))) -- print >>file, ( -+ file.write(( - ' return (0);\n' -- '}\n' ) -+ '}\n\n' )) - - # Complete message unmarshaling -- print >>file, ( -+ file.write(( - 'int\n' - 'evtag_unmarshal_%(name)s(struct evbuffer *evbuf, ' - 'ev_uint32_t need_tag, struct %(name)s *msg)\n' -@@ -330,10 +328,10 @@ - ' error:\n' - ' evbuffer_free(tmp);\n' - ' return (res);\n' -- '}\n' ) % { 'name' : self._name } -+ '}\n\n' ) % { 'name' : self._name }) - - # Complete message marshaling -- print >>file, ( -+ file.write(( - 'void\n' - 'evtag_marshal_%(name)s(struct evbuffer *evbuf, ev_uint32_t tag, ' - 'const struct %(name)s *msg)\n' -@@ -343,7 +341,7 @@ - ' %(name)s_marshal(buf_, msg);\n' - ' evtag_marshal_buffer(evbuf, tag, buf_);\n ' - ' evbuffer_free(buf_);\n' -- '}\n' ) % { 'name' : self._name } -+ '}\n\n' ) % { 'name' : self._name }) - - class Entry: - def __init__(self, type, name, tag): -@@ -420,7 +418,7 @@ - "optaddarg" : - self._optaddarg and ", const %s value" % self._ctype or "" - } -- for (k, v) in extradict.items(): -+ for (k, v) in list(extradict.items()): - mapping[k] = v - - return mapping -@@ -1127,7 +1125,7 @@ - - codearrayassign = self._entry.CodeArrayAssign( - 'msg->%(name)s_data[off]' % self.GetTranslation(), 'value') -- code += map(lambda x: ' ' + x, codearrayassign) -+ code += [' ' + x for x in codearrayassign] - - code += TranslateList([ - ' }', -@@ -1168,7 +1166,7 @@ - - code = TranslateList(code, self.GetTranslation()) - -- code += map(lambda x: ' ' + x, codearrayadd) -+ code += [' ' + x for x in codearrayadd] - - code += TranslateList([ - ' msg->%(name)s_set = 1;', -@@ -1196,7 +1194,7 @@ - - code = TranslateList(code, translate) - -- code += map(lambda x: ' ' + x, tmp) -+ code += [' ' + x for x in tmp] - - code += [ - ' }', -@@ -1261,7 +1259,7 @@ - code = TranslateList(code, translate) - - if codearrayfree: -- code += map(lambda x: ' ' + x, codearrayfree) -+ code += [' ' + x for x in codearrayfree] - code += [ - ' }' ] - -@@ -1687,23 +1685,23 @@ - - declare('... creating "%s"' % header_file) - header_fp = open(header_file, 'w') -- print >>header_fp, factory.HeaderPreamble(filename) -+ header_fp.write(factory.HeaderPreamble(filename)) - - # Create forward declarations: allows other structs to reference - # each other - for entry in entities: - entry.PrintForwardDeclaration(header_fp) -- print >>header_fp, '' -+ header_fp.write('\n') - - for entry in entities: - entry.PrintTags(header_fp) - entry.PrintDeclaration(header_fp) -- print >>header_fp, factory.HeaderPostamble(filename) -+ header_fp.write(factory.HeaderPostamble(filename)) - header_fp.close() - - declare('... creating "%s"' % impl_file) - impl_fp = open(impl_file, 'w') -- print >>impl_fp, factory.BodyPreamble(filename, header_file) -+ impl_fp.write(factory.BodyPreamble(filename, header_file)) - for entry in entities: - entry.PrintCode(impl_fp) - impl_fp.close() -@@ -1713,16 +1711,16 @@ - CommandLine(sys.argv).run() - sys.exit(0) - -- except RpcGenError, e: -- print >>sys.stderr, e -+ except RpcGenError as e: -+ sys.stderr.write(e) - sys.exit(1) - -- except EnvironmentError, e: -+ except EnvironmentError as e: - if e.filename and e.strerror: -- print >>sys.stderr, "%s: %s" % (e.filename, e.strerror) -+ sys.stderr.write("%s: %s" % (e.filename, e.strerror)) - sys.exit(1) - elif e.strerror: -- print >> sys.stderr, e.strerror -+ sys.stderr.write(e.strerror) - sys.exit(1) - else: - raise diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index 8af3e8313..93ef7b9dd 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: pkgname=libwebp -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="Libraries for working with WebP images" url="https://developers.google.com/speed/webp/" arch="all" -license="BSD" +license="BSD-3-Clause" makedepends="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="https://downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz" +source="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/doc/$pkgname install -Dm644 PATENTS README "$pkgdir"/usr/share/doc/$pkgname @@ -42,4 +39,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e libwebp-1.0.2.tar.gz" +sha512sums="3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9 libwebp-1.0.3.tar.gz" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 90d68eb2e..9f7d23674 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2019.05.29 +pkgver=2019.06.28 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -28,7 +28,6 @@ package() { for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do mkdir -p "$pkgdir"/usr/include/$f cp $f/include/*.h* "$pkgdir"/usr/include/$f - cp $f/lib${f}.a "$pkgdir"/usr/lib || true for so in $f/lib*.so.*; do soname=$(scanelf -B --format "#F%S" $so) cp $so "$pkgdir"/usr/lib/ @@ -51,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="10f641d5748af49bf9a85b2b31f6a215ccef131f257cb5e44a0c41a9d56c68f3ce757ab59be7e127f2696f03f8a797de4177e9dd2b09b1b2b695d4fbc691fe4c live.2019.05.29.tar.gz" +sha512sums="6ac241967a4374f0f584bc2f15f107788da658cedc81d9399cb408a6885e5b65d95a3418824b251d8df6c9315ef9a5003e0749b1344266aecdcda420f6e57ee9 live.2019.06.28.tar.gz" diff --git a/user/lmdb/APKBUILD b/user/lmdb/APKBUILD index d59738f6e..f862931fa 100644 --- a/user/lmdb/APKBUILD +++ b/user/lmdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: pkgname=lmdb -pkgver=0.9.23 +pkgver=0.9.24 pkgrel=0 pkgdesc="Lightning Memory-Mapped Database" url="http://symas.com/mdb/" @@ -13,17 +13,14 @@ source="https://github.com/LMDB/lmdb/archive/LMDB_$pkgver.tar.gz builddir="$srcdir/$pkgname-LMDB_$pkgver/libraries/liblmdb" build() { - cd "$builddir" make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -32,5 +29,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120 LMDB_0.9.23.tar.gz +sha512sums="c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1 LMDB_0.9.24.tar.gz 151022cad94d2138146e3cd36622171f07fb03cc66d116ac9ce766c61a8b1aa65b521bfda88b27456204f53ecd430bdeddb4d7786956a12ed0cd53f8323ffd03 lmdb_make.patch" diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index c42db62ba..ad94dd2ff 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.14.0 +pkgver=6.16.0 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" @@ -17,7 +17,6 @@ source="https://github.com/mltframework/mlt/releases/download/v$pkgver/mlt-$pkgv " build() { - cd "$builddir" local _maybe_asm="" case $CTARGET_ARCH in @@ -41,9 +40,8 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="86b26b0c421cc881f6bebbde2c0ae9d834f190d8f878fb279ab29a1d7ac5416077b7dd91420bf63a7821fade9ca9c044a92440e02673c7b330b8ff36982a9fb9 mlt-6.14.0.tar.gz +sha512sums="554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 mlt-6.16.0.tar.gz d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" diff --git a/user/nettle/APKBUILD b/user/nettle/APKBUILD index f13680455..f55301aca 100644 --- a/user/nettle/APKBUILD +++ b/user/nettle/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=nettle -pkgver=3.4.1 +pkgver=3.5.1 pkgrel=0 pkgdesc="Low-level cryptographic library" url="http://www.lysator.liu.se/~nisse/nettle/" @@ -16,7 +16,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz nettle-2.4-makefile.patch" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" make -C examples # required for rsa-encrypt make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -49,5 +46,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f nettle-3.4.1.tar.gz +sha512sums="f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784 nettle-3.5.1.tar.gz c7d9741a7a37d225f3f0db16d355e13b04cc0f1ac56882a6ff31ef15c1a1a0aee7a70cf1ec8bbf2c46b9b0dcec153da7a7aa6b8909a72d76dd4d669cbbaceaa4 nettle-2.4-makefile.patch" diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 0c0c764e7..d22758490 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.37.0 +pkgver=1.39.1 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f nghttp2-1.37.0.tar.xz" +sha512sums="36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa nghttp2-1.39.1.tar.xz" diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD index 0745f8a6a..235847209 100644 --- a/user/opencv/APKBUILD +++ b/user/opencv/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opencv -pkgver=4.0.1 +pkgver=4.1.0 pkgrel=0 pkgdesc="Computer vision and machine learning software library" url="https://opencv.org" @@ -13,7 +13,9 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev gtk+3.0-dev jasper-dev libdc1394-dev libgomp libgphoto2-dev libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev v4l-utils-dev" subpackages="$pkgname-dev $pkgname-libs" -source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz" +source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz + cmake-license.patch + " prepare() { default_prepare @@ -31,7 +33,6 @@ prepare() { } build() { - cd "$builddir"/build if [ "$CARCH" != "x86_64" ]; then local _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF" fi @@ -48,18 +49,13 @@ build() { -DWITH_OPENEXR=OFF \ -DWITH_IPP=OFF \ $_sse \ - .. - make -} - -check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="d74dd325029a67676dd2c7fdbecb2b14cb531441b2a1b74fc1ebe6db096ea87c12801c8b997ebbe280fbd401311c0220133a0c29911b0dae82cb93453be0b2b0 opencv-4.0.1.tar.gz" +sha512sums="492168c1260cd30449393c4b266d75202e751493a8f1e184af6c085d8f4a38800ee954d84fe8c36fcceb690b1ebb5e511b68c05901f64be79a0915f3f8a46dc0 opencv-4.1.0.tar.gz +ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch" diff --git a/user/opencv/cmake-license.patch b/user/opencv/cmake-license.patch new file mode 100644 index 000000000..be40f4edf --- /dev/null +++ b/user/opencv/cmake-license.patch @@ -0,0 +1,12 @@ +We remove the 3rdparty dir in build, and we don't need the OpenCL license. + +--- opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake.old 2019-04-07 17:09:10.000000000 +0000 ++++ opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake 2019-07-20 20:21:37.467680107 +0000 +@@ -5,7 +5,6 @@ + else() + set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library") + set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory") +- ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt") + endif() + mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) + diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 01b338ea7..53eada11d 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2019.3.9 +pkgver=2019.6.16 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -17,15 +17,13 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d86559b0d384f8114245b169391c73d5e6df02ba411cf9706c9d4e5958eeef610b6550bcb5eb519856b8fa25f3f5eb1cea02c0df1f6df72e16da8201732b0dd9 certifi-2019.3.9.tar.gz -afa381a68bbf117fcebb4cd020d8134dcf7c641a3258231249804c4b66d1c2c59fafe2dc1e55f0ddc2e269ad5f49ab10b96fd73d243d7b1df78f15fe70f279e4 use-system-certs.patch" +sha512sums="4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e certifi-2019.6.16.tar.gz +f9c7d953b08d6ef87bae07605e2c09e9de1d1e60285fa1f5043beeae1d9f00f3b70fdf598585cd350df2632e22c0197ea2e8b76127e2927ad53880b60b349c9c use-system-certs.patch" diff --git a/user/py3-certifi/use-system-certs.patch b/user/py3-certifi/use-system-certs.patch index 231e8c94d..a46e1c605 100644 --- a/user/py3-certifi/use-system-certs.patch +++ b/user/py3-certifi/use-system-certs.patch @@ -1,6 +1,6 @@ --- a/certifi/core.py +++ b/certifi/core.py -@@ -12,5 +12,3 @@ +@@ -11,5 +11,3 @@ def where(): - f = os.path.dirname(__file__) diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index d0a9842d7..1f3b6d7ba 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-cryptography _pkgname=${pkgname#py3-} -pkgver=2.6.1 +pkgver=2.7 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.org/project/cryptography" @@ -17,14 +17,12 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39 cryptography-2.6.1.tar.gz" +sha512sums="fa420f44b038b6fe1983c6f2c6d830e2668017c26e1e125ad621e37ea627a927ffe64d0e987e0a26dcc260834f2ec817cccd22da03b892190f46cb6e8131a5a8 cryptography-2.7.tar.gz" diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index 84cfd7d1f..baf70ee55 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-josepy _pkgname=${pkgname#py3-} -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="JOSE protocol implementation in Python" url="https://github.com/jezdez/josepy" @@ -17,13 +17,11 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/certbot/$_pkgname/archive/v builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="86533e896c7ca35f035ebb9e3667e36511c6ba693c7e056a0fdc28bec282643ade2eb5223271a7a6a4110b70b82ee5b788cfded8946f0c1133ecb050ca457b77 josepy-1.1.0.tar.gz" +sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index d31bd6040..d8faf68a3 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-markdown _pkgname=Markdown -pkgver=3.0.1 +pkgver=3.1.1 pkgrel=0 pkgdesc="A Python implementation of Markdown" url="https://python-markdown.github.io/" @@ -16,13 +16,11 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --root="$pkgdir" } -sha512sums="c648c1b8ecb3c907ff2bd636ec6c08b4b629967fb916913f77db641f6d61b83d16929af2f15f5695c8cdb9614031606110e02a7e0bbb3aab0be38a8e285f12f1 Markdown-3.0.1.tar.gz" +sha512sums="78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090 Markdown-3.1.1.tar.gz" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index 146a185ac..bfbf75df6 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-pbr _pkgname=${pkgname#py3-} -pkgver=5.1.3 +pkgver=5.4.1 pkgrel=0 pkgdesc="Python Build Reasonableness" url="https://pypi.org/project/pbr" @@ -17,14 +17,12 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="66927b835058efb24182806e9ba16ee2066798ec7a1bc8dc0e5ec2b9260297515f0cfae192eef665a16e866462a88d379bb56bea21e86083df71b05868219675 pbr-5.1.3.tar.gz" +sha512sums="ac955b472a3cbfdae1743ffb4c1f2196900dca2366d92bb1ace0ab7b47f100393bab0517c6788e7f58e6cf1dcceddf1ba3d70d1851f715ec1ab84251b2a2533c pbr-5.4.1.tar.gz" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index e68468221..81088c5d6 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -4,9 +4,9 @@ # Maintainer: pkgname=py3-pygments _pkgname=Pygments -pkgver=2.2.0 +pkgver=2.4.2 pkgrel=0 -pkgdesc="A syntax highlighting package written in Python." +pkgdesc="A syntax highlighting package written in Python" url="http://pygments.org/" arch="noarch" options="!check" # needs nose, flake8 @@ -18,25 +18,21 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } # Reactivate once nose and flake8 are packaged check() { - cd "$builddir" sed -i -e 's:python:python3:' Makefile make test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } doc() { - cd "$builddir" install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1 } -sha512sums="cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 Pygments-2.2.0.tar.gz" +sha512sums="c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66 Pygments-2.4.2.tar.gz" diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index 39126c2b2..61ed10714 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-pysocks _pkgname=PySocks -pkgver=1.6.8 +pkgver=1.7.0 pkgrel=0 pkgdesc="SOCKS client module for Python" url="https://github.com/Anorov/PySocks" @@ -18,13 +18,11 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/PySocks-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5 PySocks-1.6.8.tar.gz" +sha512sums="cc08ecbf65b59b6c4d4a24e01490dba19d93f2deb2860a49c4fc5679a9ceaba1860f05faaf8e299cf195e184a844f11989595e5046b07e2b30f9f3c682950e52 PySocks-1.7.0.tar.gz" diff --git a/user/py3-pyyaml/APKBUILD b/user/py3-pyyaml/APKBUILD index 5bdd8a36b..1ea1a41f6 100644 --- a/user/py3-pyyaml/APKBUILD +++ b/user/py3-pyyaml/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-pyyaml _pkgname=pyyaml -pkgver=5.1 +pkgver=5.1.1 pkgrel=0 pkgdesc="YAML parser and emitter for Python" url="https://pyyaml.org/wiki/PyYAML" @@ -15,20 +15,17 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/yaml/$_pkgname/archive/$pkgv builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" # Seems like they need Cython to build the C extension now, so it falls back to pure Python. # Once we ship Cython we can probably change this. python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="e49f593b9f60018efa19629b902ad1e56f79537106a4cd019baa324a74a8af7563d294db012280261fc7fa9d686dd5af656e22fb4bf6a6ccfd0084515b9591d5 py3-pyyaml-5.1.tar.gz" +sha512sums="5c89f432b370990702db74b1e54fa185c38d2666377d3325aebcbb4841897aa2039b10a2c8196ce7ed4bb1300a854312335d3475821d785016190d70195f1480 py3-pyyaml-5.1.1.tar.gz" diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index 0ace396c5..a065d6bd8 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-tz _pkgname=pytz -pkgver=2018.9 +pkgver=2019.1 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -20,15 +20,13 @@ source="https://pypi.io/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkg builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159 pytz-2018.9.tar.gz +sha512sums="981a5aa2430bb7740bc1fd53e6c7416552c4f19d33a82701854b087ca5624ec3211b55add802e1e004f3728c32447f93d934c0d2bff993cd1be5e96e41fd44d6 pytz-2019.1.tar.gz be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch -a09467dbb00c1ab9f7e7527d9b020a6d913b8da2380a5359e782f27ccf9ec4dd4f50bfc92c95dc2e793904242c8139793c15e78e651d2777fb3b3abc48fcd640 zoneinfo-fix.patch" +7629da5d76056789e7c29a4f047d25fe77586d4a78e8a1ce7ad7c513507d286098666edb24ee5cadc9b0a4d5623336bba8a6b0f786072ce741177022201fdc54 zoneinfo-fix.patch" diff --git a/user/py3-tz/zoneinfo-fix.patch b/user/py3-tz/zoneinfo-fix.patch index a0a3a1190..404e81c9f 100644 --- a/user/py3-tz/zoneinfo-fix.patch +++ b/user/py3-tz/zoneinfo-fix.patch @@ -1,7 +1,7 @@ Patch pulled from Gentoo. Forces package to use system tzinfo --- a/pytz/__init__.py +++ b/pytz/__init__.py -@@ -91,8 +91,7 @@ +@@ -92,8 +92,7 @@ if zoneinfo_dir is not None: filename = os.path.join(zoneinfo_dir, *name_parts) else: diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index 7082e8f91..ed6442453 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.24.1 +pkgver=1.25.3 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -18,14 +18,12 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/urllib3/urllib3/archive/$pkg builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2f5453cf0ec1b65de9a9fca0fdb45664f7481507c875b7115c063cb177628b4b611377e588508ab8433e0797fc78b60fd3ea5cc5ac0a3f105d36bfff9a56f1f4 py3-urllib3-1.24.1.tar.gz" +sha512sums="86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001 py3-urllib3-1.25.3.tar.gz" diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index d35055b8b..1b2a069df 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-zope-proxy _pkgname=zope.proxy -pkgver=4.3.1 +pkgver=4.3.2 pkgrel=0 pkgdesc="Zope module for class and function proxies" url="https://github.com/zopefoundation/zope.proxy" @@ -16,13 +16,11 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="1072258c35bf23162c4f347060ea79979cbfc551c308e809b7e63f1d9434f566b665954edf3d2ab0b72161fb74b0e707c5904775876188306411ed0401424612 zope.proxy-4.3.1.tar.gz" +sha512sums="4a42a4989775f01f1b663d71058aae9852690d713269b5d58c6e10784ed2ca6ca056be5261bb009f230e198818b92d4e1014961f1144dcfacb47202064a8a666 zope.proxy-4.3.2.tar.gz" diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index bf53d6890..1dbff373e 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=v4l-utils -pkgver=1.16.4 +pkgver=1.16.6 pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" @@ -17,8 +17,7 @@ source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2 " build() { - cd "$builddir" - [ "$CLIBC" = "musl" ] && export CFLAGS="$CFLAGS -D__off_t=off_t" + export CFLAGS="$CFLAGS -D__off_t=off_t" LIBS="-largp -lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install -Dm644 "$srcdir"/qv4l2.desktop \ "$pkgdir"/usr/share/applications/qv4l2.desktop @@ -76,7 +73,7 @@ ir_keytable() { "$subpkgdir"/etc } -sha512sums="451e3af203b43fcf9fc61e00a236c030c932eabc0b749269277fc42da05464a2b74581255e7d9bbbac35b43ece318b640c3fde8d074c71723a3594a27ee982ff v4l-utils-1.16.4.tar.bz2 +sha512sums="f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58 v4l-utils-1.16.6.tar.bz2 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop 9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch" diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index d5779a4f4..445ee8df8 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=wayland-protocols -pkgver=1.13 +pkgver=1.17 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" arch="noarch" license="MIT" -depends= -provides="$pkgname-dev" +depends="" makedepends="wayland-dev" -subpackages= +subpackages="" +provides="$pkgname-dev" source="https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f35c21da289038651b75af064ec7c10779158829f578e7320faf401e980da3c958d85e5bcad00994c574cac6319a3ab975aa5483a9b438f781b767bd6303e194 wayland-protocols-1.13.tar.xz" +sha512sums="5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643 wayland-protocols-1.17.tar.xz" diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD index 0c774d994..6dd1f52ff 100644 --- a/user/wayland/APKBUILD +++ b/user/wayland/APKBUILD @@ -2,22 +2,20 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: pkgname=wayland -pkgver=1.16.0 +pkgver=1.17.0 pkgrel=0 pkgdesc="A computer display server protocol" url="https://wayland.freedesktop.org" arch="all" -options="!check" # Buggy. license="MIT" -depends="$pkgname-libs-client $pkgname-libs-cursor $pkgname-libs-server" +depends="" depends_dev="libffi-dev expat-dev" makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash" -subpackages="$pkgname-dev $pkgname-libs-client:_libs - $pkgname-libs-cursor:_libs $pkgname-libs-server:_libs" +subpackages="$pkgname-dev" +replaces="wayland-libs-client wayland-libs-cursor wayland-libs-server" source="https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,11 +44,4 @@ dev() { default_dev } -_libs() { - local name=${subpkgname#$pkgname-libs-} - pkgdesc="$pkgdesc ($name library)" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/*-$name.so.* "$subpkgdir"/usr/lib -} - -sha512sums="64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c wayland-1.16.0.tar.xz" +sha512sums="c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz" diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index b11d45db9..a0b70daac 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.10 +pkgver=1.4.11 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" arch="all" -options="!check" # https://trac.xapian.org/ticket/764 +options="!check" # sortableserialise1 is still broken license="GPL-2.0+" depends="" depends_dev="zlib-dev util-linux-dev" @@ -25,7 +25,6 @@ esac # - CVE-2018-0499 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" - make VALGRIND= check + make AUTOMATED_TESTING=1 VALGRIND= check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -54,5 +51,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9 xapian-core-1.4.10.tar.xz +sha512sums="72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785 xapian-core-1.4.11.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xf86-video-siliconmotion/APKBUILD b/user/xf86-video-siliconmotion/APKBUILD index de2f1c4f4..0f8fcc546 100644 --- a/user/xf86-video-siliconmotion/APKBUILD +++ b/user/xf86-video-siliconmotion/APKBUILD @@ -5,7 +5,8 @@ pkgver=1.7.9 pkgrel=0 pkgdesc="X.Org driver for Silicon Motion video cards" url="https://www.X.Org/" -arch="all" +# Requires kernel interfaces unavailable on ARM. +arch="all !aarch64 !aarch64_be !armel !armeb !armhf !armv7" license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" diff --git a/user/xf86-video-vmware/APKBUILD b/user/xf86-video-vmware/APKBUILD index 99cfce3ba..d5cca69a2 100644 --- a/user/xf86-video-vmware/APKBUILD +++ b/user/xf86-video-vmware/APKBUILD @@ -5,7 +5,8 @@ pkgver=13.3.0 pkgrel=0 pkgdesc="X.Org driver for VMware's SVGA adaptor" url="https://www.X.Org/" -arch="all" +# Requires kernel interfaces unavailable on ARM. +arch="all !aarch64 !aarch64_be !armel !armeb !armhf !armv7" license="X11" depends="" makedepends="eudev-dev util-macros xorg-server-dev xorgproto-dev" diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD index 0d26e67ca..18bd7e6cf 100644 --- a/user/xorg-drivers/APKBUILD +++ b/user/xorg-drivers/APKBUILD @@ -16,9 +16,8 @@ depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-video-dummy xf86-video-fbdev xf86-video-freedreno xf86-video-glint xf86-video-mach64 xf86-video-mga xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 - xf86-video-rendition xf86-video-siliconmotion xf86-video-sis - xf86-video-sisusb xf86-video-tdfx xf86-video-trident xf86-video-v4l - xf86-video-vboxvideo xf86-video-vesa xf86-video-vmware" + xf86-video-rendition xf86-video-sis xf86-video-sisusb xf86-video-tdfx + xf86-video-trident xf86-video-v4l xf86-video-vboxvideo xf86-video-vesa" case $CTARGET_ARCH in pmmx) depends="$depends xf86-video-geode xf86-video-intel" ;; @@ -27,6 +26,12 @@ case $CTARGET_ARCH in sparc*) depends="$depends xf86-video-sunffb xf86-video-sunleo" ;; esac +case $CTARGET_ARCH in + aarch64*|arm*) + ;; + *) + depends="$depends xf86-video-siliconmotion xf86-video-vmware";; +esac source="" package() { |