Skip to contentSkip to conversation

package/brltty: bump to version 6.0

PATCH New Fabrice Fontaine 2 participants 4 messages Sep 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/brltty: bump to version 6.0

- Remove first patch (already in version)
- Update hash of README: small updates in year, version
- Remove --without-viavoice option (not available anymore)
- Disable espeak-ng (not available in buildroot yet)

---
 ... 0001-Fix-linking-error-on-mips64el.patch} |  0
 .../0001-buildsys-fix-cross-compilation.patch | 41 -------------------
 package/brltty/brltty.hash                    |  4 +-
 package/brltty/brltty.mk                      | 10 ++---
 4 files changed, 7 insertions(+), 48 deletions(-)
 rename package/brltty/{0002-Fix-linking-error-on-mips64el.patch => 0001-Fix-linking-error-on-mips64el.patch} (100%)
 delete mode 100644 package/brltty/0001-buildsys-fix-cross-compilation.patch
package/brltty/0001-Fix-linking-error-on-mips64el.patch renamed from package/brltty/0002-Fix-linking-error-on-mips64el.patch +0 -0
similarity index 100%
rename from package/brltty/0002-Fix-linking-error-on-mips64el.patch
rename to package/brltty/0001-Fix-linking-error-on-mips64el.patch
package/brltty/0001-buildsys-fix-cross-compilation.patch deleted +0 -41

41 lines not on this page · raw message

package/brltty/brltty.hash +2 -2
index 6b9470c82e..4373d7da96 100644
@@ -1,3 +1,3 @@
-sha256 6171258aca833bb2012afd9c63928573a48c3daab7b149a3e90001ba53beb80f brltty-5.6.tar.xz
+sha256 cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7 brltty-6.0.tar.xz
 sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL
-sha256 42685d8fa420f618e325d423be110c69abd976afdef183dfac385ccd44cb12e9 README
+sha256 69d7cbb371bcb165ccde6c496f61481a557d17f0afa0aaa86ece214c4bd698cb README
package/brltty/brltty.mk +5 -5
index 21f6877bb8..30114606f1 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BRLTTY_VERSION = 5.6
+BRLTTY_VERSION = 6.0
 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz
 BRLTTY_SITE = http://brltty.com/archive
 BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
@@ -22,14 +22,14 @@ BRLTTY_CONF_OPTS = \
 	--disable-python-bindings \
 	--disable-tcl-bindings \
 	--disable-x \
+	--without-espeak-ng \
 	--without-midi-package \
 	--without-mikropuhe --without-speechd --without-swift \
-	--without-theta --without-viavoice
+	--without-theta
 
 # Autoreconf is needed because we're patching configure.ac in
-# 0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch. However,
-# a plain autoreconf doesn't work, because this package is only
-# autoconf-based.
+# 0001-Fix-linking-error-on-mips64el. However, a plain autoreconf doesn't work,
+# because this package is only autoconf-based.
 define BRLTTY_AUTOCONF
 	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
 endef
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/3 package/brltty: add expat optional dependency

expat optional dependency has been added in version 6.0 with
https://github.com/brltty/brltty/commit/a37febee8cc4215eaac668a064ebc590684122b7

---
 package/brltty/brltty.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/brltty/brltty.mk +7 -0
index 30114606f1..aee18d0b9a 100644
@@ -50,6 +50,13 @@ else
 BRLTTY_CONF_OPTS += --without-espeak
 endif
 
+ifeq ($(BR2_PACKAGE_EXPAT),y)
+BRLTTY_DEPENDENCIES += expat
+BRLTTY_CONF_OPTS += --enable-expat
+else
+BRLTTY_CONF_OPTS += --disable-expat
+endif
+
 ifeq ($(BR2_PACKAGE_FLITE),y)
 BRLTTY_DEPENDENCIES += flite
 BRLTTY_CONF_OPTS += --with-flite=$(STAGING_DIR)/usr
Signature · 1 line
2.23.0
#2 lore raw

PATCH 3/3 package/brltty: add pcre optional dependency

In reply to Fabrice Fontaine

pcre/pcre2 has been added in version 6.0 with:
- https://github.com/brltty/brltty/commit/579cae458ad9e47a689c7063e600d7bc492cb176
- https://github.com/brltty/brltty/commit/e7f36c00dbfb2030ad67b9b7e159c6d847f1d7d9

---
 package/brltty/brltty.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/brltty/brltty.mk +10 -0
index aee18d0b9a..b9d608b9f5 100644
@@ -78,6 +78,16 @@ else
 BRLTTY_CONF_OPTS += --without-curses
 endif
 
+ifeq ($(BR2_PACKAGE_PCRE2_32),y)
+BRLTTY_DEPENDENCIES += pcre2
+BRLTTY_CONF_OPTS += --with-rgx-package
+else ifeq ($(BR2_PACKAGE_PCRE_32),y)
+BRLTTY_DEPENDENCIES += pcre
+BRLTTY_CONF_OPTS += --with-rgx-package
+else
+BRLTTY_CONF_OPTS += --without-rgx-package
+endif
+
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 BRLTTY_DEPENDENCIES += systemd
 BRLTTY_CONF_OPTS += --with-service-package
Signature · 1 line
2.23.0
#3 lore raw

PATCH 1/3 package/brltty: bump to version 6.0

In reply to Fabrice Fontaine
Quoted 6 lines · On Sat, 28 Sep 2019 14:08:33 +0200 Fabrice Fontaine…

- Remove first patch (already in version)
- Update hash of README: small updates in year, version
- Remove --without-viavoice option (not available anymore)
- Disable espeak-ng (not available in buildroot yet)

Quoted 8 lines
---
 ... 0001-Fix-linking-error-on-mips64el.patch} |  0
 .../0001-buildsys-fix-cross-compilation.patch | 41 -------------------
 package/brltty/brltty.hash                    |  4 +-
 package/brltty/brltty.mk                      | 10 ++---
 4 files changed, 7 insertions(+), 48 deletions(-)
 rename package/brltty/{0002-Fix-linking-error-on-mips64el.patch => 0001-Fix-linking-error-on-mips64el.patch} (100%)
 delete mode 100644 package/brltty/0001-buildsys-fix-cross-compilation.patch

Series applied, thanks. Note that to be better in this series, you should have added unconditional --disable-expat --without-rgx-package in the first patch. Indeed, if I applied only your first patch, the expat and pcre optional dependencies would not be correctly handled.

But that's really nitpicking, since we anyway have lots of optional dependencies in many packages that are not correctly handled.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com