[Buildroot] [PATCH v2,1/2] package/ocrad: fix license

[Buildroot] [PATCH v2,1/2] package/ocrad: fix license

[Fabrice Fontaine]

ocrad is licensed under GPL-2.0+ since version 0.24, here is an extract
of https://lists.gnu.org/archive/html/bug-ocrad/2014-10/msg00000.html:

"The license has been changed to GPL version 2 or later for better GPL
compatibility. GPLv2 and GPLv2+ programs may use the library now."

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Gilles Talis):
 - add a patch to fix license 

 package/ocrad/ocrad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk
index e037a08195..914d53a59c 100644
--- a/package/ocrad/ocrad.mk
+++ b/package/ocrad/ocrad.mk
@@ -7,7 +7,7 @@
 OCRAD_VERSION = 0.27
 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
 OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
-OCRAD_LICENSE = GPL-3.0+
+OCRAD_LICENSE = GPL-2.0+
 OCRAD_LICENSE_FILES = COPYING
 OCRAD_INSTALL_STAGING = YES
 
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2,2/2] package/ocrad: bump to version 0.28

[Fabrice Fontaine]

- Add libpng mandatory dependency

https://lists.gnu.org/archive/html/bug-ocrad/2022-01/msg00000.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ocrad/Config.in  | 1 +
 package/ocrad/ocrad.hash | 2 +-
 package/ocrad/ocrad.mk   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in
index 38d37c612a..b6c4300f86 100644
--- a/package/ocrad/Config.in
+++ b/package/ocrad/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_OCRAD
 	bool "ocrad"
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBPNG
 	help
 	  GNU Ocrad is an OCR (Optical Character Recognition) program
 	  based on a feature extraction method.
diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash
index b8db1723a3..cd5b0039ea 100644
--- a/package/ocrad/ocrad.hash
+++ b/package/ocrad/ocrad.hash
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256  a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36  ocrad-0.27.tar.lz
+sha256  34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e  ocrad-0.28.tar.lz
 sha256  3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef  COPYING
diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk
index 914d53a59c..78638b770a 100644
--- a/package/ocrad/ocrad.mk
+++ b/package/ocrad/ocrad.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-OCRAD_VERSION = 0.27
+OCRAD_VERSION = 0.28
 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
 OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
 OCRAD_LICENSE = GPL-2.0+
 OCRAD_LICENSE_FILES = COPYING
 OCRAD_INSTALL_STAGING = YES
+OCRAD_DEPENDENCIES = libpng
 
 # This is not a true autotools package.
 define OCRAD_CONFIGURE_CMDS
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,1/2] package/ocrad: fix license

[Thomas Petazzoni via buildroot]

On Sun,  7 Aug 2022 23:46:57 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> ocrad is licensed under GPL-2.0+ since version 0.24, here is an extract
> of https://lists.gnu.org/archive/html/bug-ocrad/2014-10/msg00000.html:
> 
> "The license has been changed to GPL version 2 or later for better GPL
> compatibility. GPLv2 and GPLv2+ programs may use the library now."
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Gilles Talis):
>  - add a patch to fix license 

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,1/2] package/ocrad: fix license

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > ocrad is licensed under GPL-2.0+ since version 0.24, here is an extract
 > of https://lists.gnu.org/archive/html/bug-ocrad/2014-10/msg00000.html:

 > "The license has been changed to GPL version 2 or later for better GPL
 > compatibility. GPLv2 and GPLv2+ programs may use the library now."

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Gilles Talis):
 >  - add a patch to fix license 

Committed to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot