diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 03a7b5db7..50d0793c2 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -127,6 +127,7 @@ RUN apt -y update -qq \ build-essential \ ccache \ autoconf \ + autopoint \ libtool \ pkg-config \ zlib1g-dev \ diff --git a/contrib/android/p4a_recipes/libzbar/__init__.py b/contrib/android/p4a_recipes/libzbar/__init__.py index 531ed598f..2a8fb9b23 100644 --- a/contrib/android/p4a_recipes/libzbar/__init__.py +++ b/contrib/android/p4a_recipes/libzbar/__init__.py @@ -6,13 +6,15 @@ from pythonforandroid.util import load_source util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) -assert LibZBarRecipe._version == "0.10" assert LibZBarRecipe.depends == ['libiconv'] assert LibZBarRecipe.python_depends == [] class LibZBarRecipePinned(util.InheritedRecipeMixin, LibZBarRecipe): - sha512sum = "d624f8ab114bf59c62e364f8b3e334bece48f5c11654739d810ed2b8553b8390a70763b0ae12d83c1472cfeda5d9e1a0b7c9c60228a79bf9f5a6fae4a9f7ccb9" + version = "bb05ec54eec57f8397cb13fb9161372a281a1219" + url = "https://github.com/mchehab/zbar/archive/{version}.zip" + sha512sum = "186312ef0a50404efef79a5fbed34534569fab2873a6bb6d2e3d8ea64fa461c5537ca4fb0e659670d72b021e514f8fd4651b1e85954bf987015d8eb2e6f68375" + patches = [] # werror.patch not needed for modern zbar recipe = LibZBarRecipePinned() diff --git a/contrib/make_zbar.sh b/contrib/make_zbar.sh index 0ea201510..e4cd1845a 100755 --- a/contrib/make_zbar.sh +++ b/contrib/make_zbar.sh @@ -10,7 +10,8 @@ # Or for a Windows x86_64 (64-bit) target, run: # $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh -ZBAR_VERSION="aac86d5f08d64ab4c3da78188eb622fa3cb07182" +ZBAR_VERSION="bb05ec54eec57f8397cb13fb9161372a281a1219" +# ^ tag 0.23.93 set -e