Skip to contentSkip to conversation

Upgrade some of the packages I maintain

PATCH New Gilles Talis 2 participants 10 messages Sep 29, 2018 – Oct 5, 2018

lore
Share & tools
lore
#0 lore raw

cover Upgrade some of the packages I maintain

Hello,
This set of patches upgrades some of the packages I maintain. It also adds missing licenses hashes

Cheers
Gilles.

Gilles Talis (6):
webp: bump to version 1.0.0
leptonica: bump to version 1.76.0
tesseract-ocr: bump to version 3.05.02
ocrad: add license hash
httping: add license hash
iozone: bump to version 3_482

 package/httping/httping.hash                       |   1 +
 .../iozone/0001-Add-new-targets-for-iozone.patch   | 103 +++++++++++++++++++++
 package/iozone/0001-targets.patch                  |  92 ------------------
 package/iozone/iozone.hash                         |   2 +-
 package/iozone/iozone.mk                           |   2 +-
 package/leptonica/leptonica.hash                   |   3 +-
 package/leptonica/leptonica.mk                     |   2 +-
 package/ocrad/ocrad.hash                           |   1 +
 package/tesseract-ocr/tesseract-ocr.hash           |   3 +-
 package/tesseract-ocr/tesseract-ocr.mk             |   2 +-
 package/webp/webp.hash                             |   2 +-
 package/webp/webp.mk                               |   2 +-
 12 files changed, 115 insertions(+), 100 deletions(-)
 create mode 100644 package/iozone/0001-Add-new-targets-for-iozone.patch
 delete mode 100644 package/iozone/0001-targets.patch
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/6 webp: bump to version 1.0.0

---
 package/webp/webp.hash | 2 +-
 package/webp/webp.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/webp/webp.hash +1 -1
index ffb63b8..7dd954e 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab	libwebp-0.6.1.tar.gz
+sha256	84259c4388f18637af3c5a6361536d754a5394492f91be1abc2e981d4983225b	libwebp-1.0.0.tar.gz
 sha256	5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf	COPYING
package/webp/webp.mk +1 -1
index f5ca342..3036474 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBP_VERSION = 0.6.1
+WEBP_VERSION = 1.0.0
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
 WEBP_SITE = http://downloads.webmproject.org/releases/webp
 WEBP_LICENSE = BSD-3-Clause
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/6 leptonica: bump to version 1.76.0

In reply to Gilles Talis

Also added license hash

---
 package/leptonica/leptonica.hash | 3 ++-
 package/leptonica/leptonica.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/leptonica/leptonica.hash +2 -1
index f67f2b8..54fe878 100644
@@ -1,2 +1,3 @@
 # locally computed hash
-sha256 29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b  leptonica-1.74.4.tar.gz
+sha256 5e9a33b7ce33ab39fb03cee5a7ec353b044670176303265d7c64d51539616857  leptonica-1.76.0.tar.gz
+sha256 ca0ac11c7c0acad9599d54990942cc11c9f6d9b569f1a360d774a628819c3518  leptonica-license.txt
package/leptonica/leptonica.mk +1 -1
index 6a958a3..5e37f93 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LEPTONICA_VERSION = 1.74.4
+LEPTONICA_VERSION = 1.76.0
 LEPTONICA_SITE = http://www.leptonica.org/source
 LEPTONICA_LICENSE = BSD-2-Clause
 LEPTONICA_LICENSE_FILES = leptonica-license.txt
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/6 tesseract-ocr: bump to version 3.05.02

In reply to Gilles Talis

Also added license hash

---
 package/tesseract-ocr/tesseract-ocr.hash | 3 ++-
 package/tesseract-ocr/tesseract-ocr.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/tesseract-ocr/tesseract-ocr.hash +2 -1
index 9bb5b52..09c7a71 100644
@@ -1,5 +1,6 @@
 # locally computed
-sha256  3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996  tesseract-ocr-3.05.00.tar.gz
+sha256  494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445  tesseract-ocr-3.05.02.tar.gz
+sha256  d770c1ac1235bc018530701da1ce453367f7952a3075d12b9029f81a26c05f13  COPYING
 sha256  c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d  eng.traineddata
 sha256  86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab  fra.traineddata
 sha256  cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a  deu.traineddata
package/tesseract-ocr/tesseract-ocr.mk +1 -1
index 919a436..77b2181 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TESSERACT_OCR_VERSION = 3.05.00
+TESSERACT_OCR_VERSION = 3.05.02
 TESSERACT_OCR_DATA_VERSION = 3.04.00
 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION))
 TESSERACT_OCR_LICENSE = Apache-2.0
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/6 ocrad: add license hash

In reply to Gilles Talis
---
 package/ocrad/ocrad.hash | 1 +
 1 file changed, 1 insertion(+)
package/ocrad/ocrad.hash +1 -0
index 5f093d2..5cde4d3 100644
@@ -1,2 +1,3 @@
 # Locally calculated after checking pgp signature
 sha256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c  ocrad-0.26.tar.lz
+sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef  COPYING
Signature · 1 line
2.7.4
#6 lore raw

PATCH 5/6 httping: add license hash

In reply to Gilles Talis
---
 package/httping/httping.hash | 1 +
 1 file changed, 1 insertion(+)
package/httping/httping.hash +1 -0
index a50eedb..c396157 100644
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256	3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8	httping-2.5.tgz
+sha256  c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d	license.txt
Signature · 1 line
2.7.4
#8 lore raw

PATCH 6/6 iozone: bump to version 3_482

In reply to Gilles Talis

Reworked patch from Gustavo Zacharias to make it apply to this version

---
 .../iozone/0001-Add-new-targets-for-iozone.patch   | 103 +++++++++++++++++++++
 package/iozone/0001-targets.patch                  |  92 ------------------
 package/iozone/iozone.hash                         |   2 +-
 package/iozone/iozone.mk                           |   2 +-
 4 files changed, 105 insertions(+), 94 deletions(-)
 create mode 100644 package/iozone/0001-Add-new-targets-for-iozone.patch
 delete mode 100644 package/iozone/0001-targets.patch
package/iozone/0001-Add-new-targets-for-iozone.patch new file +103 -0
new file mode 100644
index 0000000..e6bfc18
@@ -0,0 +1,103 @@
+From 1584ffbfda3277b82997b9f1e0ef31a7061560e0 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Sun, 26 Aug 2018 18:39:06 +0200
+Subject: [PATCH] Add new targets for iozone:
+
+linux-noaio is for linux targets without AIO (use case: uClibc)
+linux-noth is for linux target without threads or AIO
+
+And make largefile support optional via CFLAGS.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+Signed-off-by: Gilles Talis <[email protected]>
+---
+ src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 47 insertions(+), 9 deletions(-)
+
+diff --git a/src/current/makefile b/src/current/makefile
+index cfef879..7925e62 100644
+--- a/src/current/makefile
++++ b/src/current/makefile
+@@ -168,10 +168,28 @@ hpux_no_ansi:	iozone_hpux_no.o  libbif.o
+ # GNU 'C' compiler Linux build with threads, largefiles, async I/O 
+ #
+ linux:	iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
+-	$(CC)  -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \
++		-lpthread -lrt -o iozone
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
++
++#
++# GNU 'C' compiler Linux build with threads, largefiles
++#
++linux-noaio: iozone_linux-noaio.o libbif.o fileop_linux.o pit_server.o
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux-noaio.o libbif.o \
++		-lpthread -lrt -o iozone
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
++
++#
++# GNU 'C' compiler Linux build with largefiles
++#
++linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux-noth.o libbif.o \
+ 		-lrt -o iozone
+-	$(CC)  -O3 -Dlinux fileop_linux.o -o fileop
+-	$(CC)  -O3 -Dlinux pit_server.o -o pit_server
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
+ 
+ #
+ # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O 
+@@ -814,13 +832,33 @@ iozone_linux.o:	iozone.c libbif.c libasync.c
+ 	@echo ""
+ 	@echo "Building iozone for Linux"
+ 	@echo ""
+-	$(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \
+-		-DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
+ 		-DNAME='"linux"' -o iozone_linux.o
+-	$(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
++		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
++		$(CFLAGS) libasync.c  -o libasync.o
++
++iozone_linux-noaio.o: iozone.c libbif.c
++	@echo ""
++	@echo "Building iozone for Linux no AIO"
++	@echo ""
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
++		-DNAME='"linux"' -o iozone_linux-noaio.o
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C \
++		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
++
++iozone_linux-noth.o: iozone.c libbif.c
++	@echo ""
++	@echo "Building iozone for Linux with no threads"
++	@echo ""
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
++		-DNAME='"linux"' -o iozone_linux-noth.o
++	$(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \
+ 		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
+-	$(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+-		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c  -o libasync.o 
+ 
+ fileop_AIX.o:	fileop.c
+ 	@echo ""
+@@ -924,7 +962,7 @@ fileop_linux.o:	fileop.c
+ 	@echo ""
+ 	@echo "Building fileop for Linux"
+ 	@echo ""
+-	$(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o
++	$(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o
+ 
+ fileop_openbsd.o:	fileop.c
+ 	@echo ""
+-- 
+2.7.4
+
package/iozone/0001-targets.patch deleted +0 -92

92 lines not on this page · raw message

package/iozone/iozone.hash +1 -1
index b387588..8f552ba 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	bbbda98d7c052d8654ea23fb2187d831107ab4ac89842fa21509276d9a6915f0	iozone3_446.tar
+sha256	2733feb63c96f77177c68f3d938f2294d5394d8554b2767c45cbe138b2f3ae30	iozone3_482.tar
package/iozone/iozone.mk +1 -1
index 477a60a..05b3973 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IOZONE_VERSION = 3_446
+IOZONE_VERSION = 3_482
 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
 IOZONE_SITE = http://www.iozone.org/src/current
 IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
Signature · 1 line
2.7.4
#9 lore raw

cover Upgrade some of the packages I maintain

In reply to Gilles Talis
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gilles" == Gilles Talis <[email protected]> writes:

Hello,
This set of patches upgrades some of the packages I maintain. It also adds missing licenses hashes

Cheers
Gilles.

Quoted 7 lines

Gilles Talis (6):
webp: bump to version 1.0.0
leptonica: bump to version 1.76.0
tesseract-ocr: bump to version 3.05.02
ocrad: add license hash
httping: add license hash
iozone: bump to version 3_482

Committed series, thanks.

Signature · 1 line
Bye, Peter Korsgaard