diff --git a/common/shlibs b/common/shlibs index 0c083d7fdf4..8e9864139d0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2125,7 +2125,7 @@ libp8-platform.so.2 p8-platform-2.1.0.1_1 libOIS.so.1.5.0 ois-1.5_1 libSILLY.so.1 silly-0.1.0_1 libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1 -libbrlapi.so.0.6 brltty-5.2_1 +libbrlapi.so.0.7 brltty-6.0_1 liblouis.so.17 liblouis-3.8.0_1 libCEGUIBase-0.7.9.so cegui07-0.7.9_1 libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1 diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index 9ae8c644de4..7a67e1c530c 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,22 +1,24 @@ # Template file for 'brltty' pkgname=brltty -version=5.6 -revision=4 +version=6.0 +revision=1 build_style=gnu-configure +configure_args="--enable-gpm --with-screen-driver=lx,sc + --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" hostmakedepends="pkg-config python3-Cython" makedepends="ncurses-devel alsa-lib-devel gpm-devel icu-devel python3-devel libbluetooth-devel" -configure_args="--enable-gpm --with-screen-driver=lx,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" short_desc="Braille display driver for Linux/Unix" maintainer="Juan RP " -license="GPL-2, LGPL-2.1" +license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://mielke.cc/brltty/" distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz" -checksum=6171258aca833bb2012afd9c63928573a48c3daab7b149a3e90001ba53beb80f +checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";; *) configure_args="${configure_args} --with-ports-package=none";; esac + # glibc is a misnomer here, it's just ioperm inb outp and friends, works # fine with musl. @@ -28,12 +30,14 @@ pre_configure() { export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" } + post_configure() { case "$XBPS_TARGET_MACHINE" in arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" esac } + do_install() { make INSTALL_ROOT=${DESTDIR} install vsv $pkgname @@ -48,8 +52,8 @@ brltty-devel_package() { pkg_install() { vmove usr/bin/brltty-config vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/share/man/man3 } }