From 7545e032522f6fbb76de46328cd35d52557d8a5c Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Wed, 4 Aug 2021 16:42:02 +0100
Subject: [PATCH] fix libde265 on arm, for real this time

---
 packages/ffmpeg/build.sh      | 1 -
 packages/imagemagick/build.sh | 1 -
 packages/libde265/arm.h.patch | 6 +++---
 packages/libheif/build.sh     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 74c7e153f..88acc24b2 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -12,7 +12,6 @@ TERMUX_PKG_CONFLICTS="libav"
 TERMUX_PKG_BREAKS="ffmpeg-dev"
 TERMUX_PKG_REPLACES="ffmpeg-dev"
 
-
 termux_step_configure() {
 	cd $TERMUX_PKG_BUILDDIR
 
diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 53c629e26..10527ef0e 100644
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -26,7 +26,6 @@ TERMUX_PKG_RM_AFTER_INSTALL="
 share/ImageMagick-7/francais.xml
 "
 
-
 termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = "i686" ]; then
 		#Avoid "libMagickCore-7.Q16HDRI.so: error: undefined reference to '__atomic_load'"
diff --git a/packages/libde265/arm.h.patch b/packages/libde265/arm.h.patch
index 1be4c734d..44d808c7f 100644
--- a/packages/libde265/arm.h.patch
+++ b/packages/libde265/arm.h.patch
@@ -1,7 +1,7 @@
-diff --git a/arm.h b/arm.h
+diff --git a/libde265/arm/arm.h b/libde265/arm/arm.h
 index d64172ab9..6a9de311e 100644
---- a/arm.h
-+++ b/arm.h
+--- a/libde265/arm/arm.h
++++ b/libde265/arm/arm.h
 @@ -21,7 +21,7 @@
  #ifndef LIBDE265_ARM_H
  #define LIBDE265_ARM_H
diff --git a/packages/libheif/build.sh b/packages/libheif/build.sh
index abc522f93..06abcf28e 100644
--- a/packages/libheif/build.sh
+++ b/packages/libheif/build.sh
@@ -5,4 +5,4 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.12.0
 TERMUX_PKG_SRCURL=https://github.com/strukturag/libheif/releases/download/v$TERMUX_PKG_VERSION/libheif-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718
-TERMUX_PKG_DEPENDS="libde265, libx265, libdav1d, libaom"
+TERMUX_PKG_DEPENDS="libaom, libdav1d, libde265, libx265"