Skip to contentSkip to conversation

brltty: add license

PATCH Superseded Fabrice Fontaine 2 participants 3 messages Sep 15, 2018 – Sep 17, 2018

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 brltty: add license

brltty 5.5 is licensed under GPL-2.0+ with exceptions in LGPL-2.1+ as specified in README so add this information in BRLTTY_LICENSE, update BRLTTY_LICENSE_FILES and add hash for README

---
 package/brltty/brltty.hash | 1 +
 package/brltty/brltty.mk   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
package/brltty/brltty.hash +1 -0
index 3bc2f9cf54..01b4c13fcc 100644
@@ -1,3 +1,4 @@
 sha256 4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 brltty-5.5.tar.xz
 sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE-GPL
 sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL
+sha256 6ba58188449642de8adefd7adabb436185792c5c51a4b5d04650423c2151dc50 README
package/brltty/brltty.mk +2 -1
index df3e9c7888..729062d579 100644
@@ -9,7 +9,8 @@ BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz
 BRLTTY_SITE = http://brltty.com/archive
 BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
 BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
-BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL
+BRLTTY_LICENSE = GPL-2.0+ with exceptions in LGPL-2.1+
+BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL README
 
 BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \
 	$(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 brltty: bump to version 5.6

- Remove first, second and third patch (already in version)
- Fix major/minor build failure with glibc 2.28, see:
https://github.com/brltty/brltty/commit/cee581fac78d29bdf9acb6d1378cf4d005ff3afd
- Update web site URL to brltty.app, see
https://github.com/brltty/brltty/commit/97efaecd6cfb665c0b5f0ac8ec69416618d45635
- Update license to LPGL-2.1+, see:
https://github.com/brltty/brltty/commit/16ccb7d13f018e7557633a24fc02866b85871fa0

Fixes:
- http://autobuild.buildroot.org/results/0fb2c33f00990e471736c4180f23026fa9adb982

---
 ...s-from-generating-spurious-log-messa.patch | 28 --------
 ...0001-buildsys-fix-cross-compilation.patch} |  0
 ...-to-make-sure-the-platform-supports-.patch | 31 ---------
 ...0003-Remove-MKOBJ-in-favour-of-MKMOD.patch | 64 -------------------
 package/brltty/Config.in                      |  2 +-
 package/brltty/brltty.hash                    |  4 +-
 package/brltty/brltty.mk                      |  4 +-
 7 files changed, 5 insertions(+), 128 deletions(-)
 delete mode 100644 package/brltty/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch
 rename package/brltty/{0004-buildsys-fix-cross-compilation.patch => 0001-buildsys-fix-cross-compilation.patch} (100%)
 delete mode 100644 package/brltty/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
 delete mode 100644 package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch
package/brltty/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch deleted +0 -28
deleted file mode 100644
index e6a2005d59..0000000000
@@ -1,28 +0,0 @@
-From 3ea213e47c6771b7e2481f64a98f30c02fcb4867 Mon Sep 17 00:00:00 2001
-From: Mario Lang <[email protected]>
-Date: Thu, 30 Nov 2017 13:14:47 +0100
-Subject: [PATCH] Prevent scancodes from generating spurious log messages. (ml)
-
-Signed-off-by: Mario Lang <[email protected]>
----
-This patch was taken from upstream, and can be removed when 5.6 is out.
-
- Drivers/Braille/HandyTech/braille.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c
-index ef95fd15b..f7e605c1a 100644
---- a/Drivers/Braille/HandyTech/braille.c
-+++ b/Drivers/Braille/HandyTech/braille.c
-@@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
-                   case HT_EXTPKT_Scancode: {
-                     while (length--)
-                       enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++));
--                    break;
-+                    continue;
-                   }
- 
-                   case HT_EXTPKT_GetRTC: {
--- 
-2.15.0
-
package/brltty/0001-buildsys-fix-cross-compilation.patch renamed from package/brltty/0004-buildsys-fix-cross-compilation.patch +0 -0
similarity index 100%
rename from package/brltty/0004-buildsys-fix-cross-compilation.patch
rename to package/brltty/0001-buildsys-fix-cross-compilation.patch
package/brltty/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch deleted +0 -31
deleted file mode 100644
index 3dbacb3b57..0000000000
@@ -1,31 +0,0 @@
-From 28dde6749327fd15a1b8b7bcf5cc74a95598582a Mon Sep 17 00:00:00 2001
-From: Mario Lang <[email protected]>
-Date: Fri, 29 Dec 2017 10:35:05 +0100
-Subject: [PATCH] Check for ioperm to make sure the platform supports ports
- I/O. (ml)
-
-Signed-off-by: Mario Lang <[email protected]>
----
-This patch was taken from upstream, and can be removed when 5.6 is out.
-
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5e94d33bd..07119dd9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
-       ports_package="kfreebsd"
-       ;;
-    linux*)
--      ports_package="glibc"
-+      AC_CHECK_FUNC([ioperm], [
-+         ports_package="glibc"
-+      ])
-       ;;
-    mingw*)
-       ports_package="windows"
--- 
-2.15.0
-
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch deleted +0 -64

64 lines not on this page · raw message

package/brltty/Config.in +1 -1
index 48ceb04c99..de11af3bbe 100644
@@ -8,7 +8,7 @@ config BR2_PACKAGE_BRLTTY
 	  A daemon providing access to the Linux console for a blind
 	  person using a refreshable braille display.
 
-	  http://brltty.com/
+	  http://brltty.app/
 
 if BR2_PACKAGE_BRLTTY
 
package/brltty/brltty.hash +2 -2
index 01b4c13fcc..ca0b06242a 100644
@@ -1,4 +1,4 @@
-sha256 4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 brltty-5.5.tar.xz
+sha256 6171258aca833bb2012afd9c63928573a48c3daab7b149a3e90001ba53beb80f brltty-5.6.tar.xz
 sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE-GPL
 sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL
-sha256 6ba58188449642de8adefd7adabb436185792c5c51a4b5d04650423c2151dc50 README
+sha256 42685d8fa420f618e325d423be110c69abd976afdef183dfac385ccd44cb12e9 README
package/brltty/brltty.mk +2 -2
index 729062d579..3f85d06bf3 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-BRLTTY_VERSION = 5.5
+BRLTTY_VERSION = 5.6
 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz
 BRLTTY_SITE = http://brltty.com/archive
 BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
 BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
-BRLTTY_LICENSE = GPL-2.0+ with exceptions in LGPL-2.1+
+BRLTTY_LICENSE = LGPL-2.1+
 BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL README
 
 BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 brltty: bump to version 5.6

Quoted 1 line · Fabrice Fontaine

- Remove first, second and third patch (already in version)

The third patch (which changes a linker call from ld to gcc) is actually not merged upstream. The upstream author decided to "fix" the issue in a different way.

From looking at the git log, I think the new way of fixing things is to override the MKREL make variable with something that calls gcc instead of ld.

Longer story: Changing from ld to gcc fixed our cross-build issue, but generated a failure while building on Mac OS X. Forcing gcc over ld shouldn't matter for buildroot, since we do not build on OS X.

Quoted 6 lines

- Fix major/minor build failure with glibc 2.28, see:
https://github.com/brltty/brltty/commit/cee581fac78d29bdf9acb6d1378cf4d005ff3afd
- Update web site URL to brltty.app, see
https://github.com/brltty/brltty/commit/97efaecd6cfb665c0b5f0ac8ec69416618d45635
- Update license to LPGL-2.1+, see:
https://github.com/brltty/brltty/commit/16ccb7d13f018e7557633a24fc02866b85871fa0

All fine, thanks!

What is likely missing is systemd integration. 5.6 changed its systemd files, in particular, it is now using .path instead of .target units. So brltty.mk likely needs updating.

P.S.: 5.7 is about to be released. I was actually waiting for that to happen.

Signature · 2 lines
CYa,
  ?????