From 43fda27b828f2fccc99ff0c6f7febabf4281ed93 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sun, 23 Apr 2017 14:13:18 -0700 Subject: [PATCH] brltty: update to 5.5. --- srcpkgs/brltty/patches/crosspython.patch | 10 ++++++++++ srcpkgs/brltty/template | 19 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/brltty/patches/crosspython.patch diff --git a/srcpkgs/brltty/patches/crosspython.patch b/srcpkgs/brltty/patches/crosspython.patch new file mode 100644 index 0000000000..da3ee93a2b --- /dev/null +++ b/srcpkgs/brltty/patches/crosspython.patch @@ -0,0 +1,10 @@ +diff -Naur brltty-5.5/Bindings/Python/Makefile.in brltty-5.5.new/Bindings/Python/Makefile.in +--- Bindings/Python/Makefile.in 2017-04-18 15:35:13.000000000 -0700 ++++ Bindings/Python/Makefile.in 2017-04-23 17:36:27.797793633 -0700 +@@ -1,3 +1,6 @@ ++export LDFLAGS= @LDFLAGS@ @PYTHON_LIBS@ ++export CFLAGS= @CFLAGS@ @PYTHON_CPPFLAGS@ ++export LDSHARED= @CC@ -shared @LDFLAGS@ + ############################################################################### + # libbrlapi - A library providing access to braille terminals for applications. + # diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index ad535607ce..27b9401227 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,22 +1,33 @@ # Template file for 'brltty' pkgname=brltty -version=5.4 +version=5.5 revision=1 build_style=gnu-configure -makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel" -configure_args="--enable-gpm --with-screen-driver=lx --with-tables-directory=/usr/share/brltty" +hostmakedepends="pkg-config python3-Cython python3 xproto" +makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel dbus-devel glib-devel xproto icu-devel python3-devel libbluetooth-devel" +depends="python3" +configure_args="--enable-gpm --with-screen-driver=lx,a2,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" homepage="http://mielke.cc/brltty/" distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz" -checksum=5d071bd6be9e7f3f85745088e00471c8dec6ebb77fd5b5c89e8f4cbc2d2c5d4f +checksum=4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 + +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. pre_configure() { case "$XBPS_TARGET_MACHINE" in *-musl) # There is no ldconfig in musl libc sed -e "s;/sbin/ldconfig -n;echo;" -i configure esac + export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython3.5m" + export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.5m" } post_configure() { case "$XBPS_TARGET_MACHINE" in