Revert "Revert "update dav1d v0.7.1""

This reverts commit 06f297b.

Author: gc-locks

app/.gitignore

@@ -1 +1,2 @@
 /build
+/release

glideavif/build.gradle

@@ -9,7 +9,7 @@ def deployTo = new File(rootDir, "repository")
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
-    ndkVersion "21.1.6352462"
+    ndkVersion "21.3.6528147"
 
     defaultConfig {
         minSdkVersion 16
@@ -66,7 +66,7 @@ uploadArchives {
     repositories {
         mavenDeployer {
             repository url: "file://${deployTo}"
-            pom.version = '0.6.0'
+            pom.version = '0.6.1'
             pom.groupId = 'jp.co.link_u.library.glideavif'
             pom.artifactId = 'glideavif'
         }

glideavif/libdav1d_builder/docker-compose.yml

@@ -4,8 +4,9 @@ services:
   arm64-v8a:
     build:
       context: docker
-      args:
-        DAV1D_VERSION: 0.7.0
+      args: &args
+        NDK: r21d
+        DAV1D_VERSION: 0.7.1
         CLANG: "%CPU_FAMILY-linux-android%API_LEVEL-clang"
         UTIL: "%CPU_FAMILY-linux-android"
         CPU_FAMILY: aarch64
@@ -20,43 +21,37 @@ services:
     build:
       context: docker
       args:
-        DAV1D_VERSION: 0.7.0
+        <<: *args
         CLANG: "%CPU_FAMILY-linux-androideabi%API_LEVEL-clang"
         UTIL: arm-linux-androideabi
         CPU_FAMILY: armv7a
         CPU: armv7
         API_LEVEL: 16
         ARCH: armeabi-v7a
-        LIBTYPE: static
     volumes:
       - ./build:/mnt/libdav1d
 
   x86_64:
     build:
       context: docker
       args:
-        DAV1D_VERSION: 0.7.0
-        CLANG: "%CPU_FAMILY-linux-android%API_LEVEL-clang"
-        UTIL: "%CPU_FAMILY-linux-android"
+        <<: *args
         CPU_FAMILY: x86_64
         CPU: i686
-        API_LEVEL: 21
         ARCH: x86_64
-        LIBTYPE: static
     volumes:
       - ./build:/mnt/libdav1d
 
   x86:
     build:
       context: docker
       args:
-        DAV1D_VERSION: 0.7.0
+        <<: *args
         CLANG: "%CPU-linux-android%API_LEVEL-clang"
         UTIL: "%CPU-linux-android"
         CPU_FAMILY: x86
         CPU: i686
         API_LEVEL: 16
         ARCH: x86
-        LIBTYPE: static
     volumes:
       - ./build:/mnt/libdav1d

glideavif/libdav1d_builder/docker/Dockerfile

@@ -6,10 +6,11 @@ RUN apt-get update \
 
 WORKDIR /usr/local/src
 
-RUN curl -SL https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip > android-ndk-r21-linux-x86_64.zip && \
-    unzip -q android-ndk-r21-linux-x86_64.zip && \
-    mv android-ndk-r21 android-ndk && \
-    rm android-ndk-r21-linux-x86_64.zip
+ARG NDK
+RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux-x86_64.zip > android-ndk-${NDK}-linux-x86_64.zip && \
+    unzip -q android-ndk-${NDK}-linux-x86_64.zip && \
+    mv android-ndk-${NDK} android-ndk && \
+    rm android-ndk-${NDK}-linux-x86_64.zip
 
 RUN ln -s /usr/bin/python3 /usr/bin/python && \
     pip3 install --user --no-warn-script-location meson

glideavif/libyuv_builder/docker-compose.yml

@@ -4,7 +4,8 @@ services:
   arm64-v8a:
     build:
       context: docker
-      args:
+      args: &args
+        NDK: r21d
         YUV_VERSION: 45f1f2b201672b699b35da20267a5f2c41318264
         API_LEVEL: 21
         ARCH: arm64-v8a
@@ -15,7 +16,7 @@ services:
     build:
       context: docker
       args:
-        YUV_VERSION: 45f1f2b201672b699b35da20267a5f2c41318264
+        <<: *args
         API_LEVEL: 16
         ARCH: armeabi-v7a
     volumes:
@@ -25,8 +26,7 @@ services:
     build:
       context: docker
       args:
-        YUV_VERSION: 45f1f2b201672b699b35da20267a5f2c41318264
-        API_LEVEL: 21
+        <<: *args
         ARCH: x86_64
     volumes:
       - ./build:/mnt/libyuv
@@ -35,7 +35,7 @@ services:
     build:
       context: docker
       args:
-        YUV_VERSION: 45f1f2b201672b699b35da20267a5f2c41318264
+        <<: *args
         API_LEVEL: 16
         ARCH: x86
     volumes:

glideavif/libyuv_builder/docker/Dockerfile

@@ -6,10 +6,11 @@ RUN apt-get update && \
 
 WORKDIR /usr/local/src
 
-RUN curl -SL https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip > android-ndk-r21-linux-x86_64.zip && \
-    unzip -q android-ndk-r21-linux-x86_64.zip && \
-    mv android-ndk-r21 android-ndk && \
-    rm android-ndk-r21-linux-x86_64.zip
+ARG NDK
+RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux-x86_64.zip > android-ndk-${NDK}-linux-x86_64.zip && \
+    unzip -q android-ndk-${NDK}-linux-x86_64.zip && \
+    mv android-ndk-${NDK} android-ndk && \
+    rm android-ndk-${NDK}-linux-x86_64.zip
 
 ## libyuv
 ARG YUV_VERSION

glideavif/src/main/cpp/CMakeLists.txt

@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.4.1)
 
 project(avif_decoder CXX)
 
+# ignore warning of shared textrel
+string(REPLACE "-Wl,--fatal-warnings " "" NOWARNING ${CMAKE_SHARED_LINKER_FLAGS})
+set(CMAKE_SHARED_LINKER_FLAGS ${NOWARNING})
+
 set(DAV1D_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DAV1D_INCLUDES ${DAV1D_DIR}/include)
 set(DAV1D_LIBS ${DAV1D_DIR}/lib/${ANDROID_ABI})
@@ -21,7 +25,7 @@ include_directories(jni_util/include)
 
 # libavif
 set(DAV1D_LIBRARY dav1d)
-set(AVIF_CODEC_DAV1D ON CACHE BOOL "Use the dav1d codec for decoding (overrides AOM decoding if also enabled)" FORCE)
+set(AVIF_CODEC_DAV1D ON CACHE BOOL "Use the dav1d codec for decoding (overrides AOM decoding if also enabled) " FORCE)
 add_subdirectory(libavif EXCLUDE_FROM_ALL)
 
 add_library(avif_decoder SHARED common.cpp avif_decoder.cpp my_bitmap.cpp avif_wrapper.cpp)

glideavif/src/main/cpp/include/dav1d/version.h

@@ -29,6 +29,6 @@
 
 #define DAV1D_API_VERSION_MAJOR 4
 #define DAV1D_API_VERSION_MINOR 0
-#define DAV1D_API_VERSION_PATCH 1
+#define DAV1D_API_VERSION_PATCH 2
 
 #endif /* DAV1D_VERSION_H */