Merge branch 'release-2021-07-19'

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-## [v2021-07-19](https://github.com/OCR-D/ocrd_all/releases/v2021-07-19)
+## [v2021-07-21](https://github.com/OCR-D/ocrd_all/releases/v2021-07-21)
 
 ### [cor-asv-ann](https://github.com/ASVLeipzig/cor-asv-ann) [e919020](https://github.com/ASVLeipzig/cor-asv-ann/commits/e919020)..[1b8c120](https://github.com/ASVLeipzig/cor-asv-ann/commits/1b8c120)
 
@@ -62,8 +62,10 @@
 
 ### [ocrd_calamari](https://github.com/OCR-D/ocrd_calamari) [da98713](https://github.com/OCR-D/ocrd_calamari/commits/da98713)..[34013dd](https://github.com/OCR-D/ocrd_calamari/commits/34013dd)
 
-> Release: [v1.0.2](https://github.com/OCR-D/ocrd_calamari/releases/v1.0.2)
+> Release: [v1.0.3](https://github.com/OCR-D/ocrd_calamari/releases/v1.0.3)
 
+  > * 📦 v1.0.3
+  > * 🐛 Fix TensorFlow (and h3py) dependency
   > * 📝 Reduce process() docstring again
   > * Merge pull request #65 from bertsky/setup-init
   > * Merge pull request #64 from bertsky/patch-1
@@ -79,6 +81,7 @@
 
 > Release: [v0.1.3](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/releases/v0.1.3)
 
+  > * rename ocrd-{pixelclasifier,pc} in code
   > * Remove extras_require from setup.py, no longer needed
   > * Remove extra flags for GPU use (see ocr-d-modul-2-segmentierung/page-segmentation#4)
   > * ocrd-tool.json: ocrd-{pixelclassifier,pc}-segmentation
@@ -92,8 +95,10 @@
 
 ### [ocrd_tesserocr](https://github.com/OCR-D/ocrd_tesserocr) [b755b26](https://github.com/OCR-D/ocrd_tesserocr/commits/b755b26)..[c9a27bd](https://github.com/OCR-D/ocrd_tesserocr/commits/c9a27bd)
 
-> Release: [v0.13.3](https://github.com/OCR-D/ocrd_tesserocr/releases/v0.13.3)
+> Release: [v0.13.4](https://github.com/OCR-D/ocrd_tesserocr/releases/v0.13.4)
 
+  > * :package: 0.13.4
+  > * Merge pull request #179 from bertsky/improve-tessapi-reset
   > * recognize: fix 318cefd5 (inverted ChoiceIterator conf threshold)
   > * recognize: improve Tesseract API state wrapper:
   > * typo

Makefile

@@ -426,10 +426,10 @@ OCRD_EXECUTABLES += $(OCRD_PC_SEGMENTATION)
 OCRD_PC_SEGMENTATION := $(BIN)/ocrd-pc-segmentation
 $(OCRD_PC_SEGMENTATION): ocrd_pc_segmentation
 ifeq (0,$(MAKELEVEL))
-	$(MAKE) -B -o $< $(notdir $(OCRD_PC_SEGMENTATION)) VIRTUAL_ENV=$(SUB_VENV)/headless-tf21
-	$(call delegate_venv,$(OCRD_PC_SEGMENTATION),$(SUB_VENV)/headless-tf21)
+	$(MAKE) -B -o $< $(notdir $(OCRD_PC_SEGMENTATION)) VIRTUAL_ENV=$(SUB_VENV)/headless-tf2
+	$(call delegate_venv,$(OCRD_PC_SEGMENTATION),$(SUB_VENV)/headless-tf2)
 ocrd_pc_segmentation-check:
-	$(MAKE) check OCRD_MODULES=ocrd_pc_segmentation VIRTUAL_ENV=$(SUB_VENV)/headless-tf21
+	$(MAKE) check OCRD_MODULES=ocrd_pc_segmentation VIRTUAL_ENV=$(SUB_VENV)/headless-tf2
 else
 	. $(ACTIVATE_VENV) && $(MAKE) -C $< deps
 	$(pip_install)
@@ -658,9 +658,13 @@ ifneq ($(findstring tesseract, $(OCRD_MODULES)),)
 # Tesseract.
 
 # when not installing via PPA, we must cope without ocrd_tesserocr's deps-ubuntu-modules
-CUSTOM_DEPS += g++ make automake libleptonica-dev
-# but since we are building statically, we need more (static) libs at build time
-CUSTOM_DEPS += libarchive-dev libcurl4-nss-dev libgif-dev libjpeg-dev libpng-dev libtiff-dev
+CUSTOM_DEPS += automake ca-certificates g++ libtool make pkg-config
+# Required library.
+CUSTOM_DEPS += libleptonica-dev
+# Optional libraries for enhanced functionality.
+CUSTOM_DEPS += libarchive-dev libcurl4-nss-dev
+# Optional library for training tools.
+CUSTOM_DEPS += libpango1.0-dev
 
 XDG_DATA_HOME ?= $(if $(HOME),$(HOME)/.local/share,/usr/local/share)
 DEFAULT_RESLOC ?= $(XDG_DATA_HOME)/ocrd-resources