From c2bbc50dc55c4ddb071cce8ed6c2501027170d3d Mon Sep 17 00:00:00 2001
From: Taner Sener <tanersener@gmail.com>
Date: Sat, 20 Mar 2021 12:52:32 +0000
Subject: [PATCH] remove unused workarounds from build scripts

---
 scripts/apple/x264.sh       |  5 -----
 scripts/apple/x265.sh       | 13 -------------
 scripts/function-android.sh |  4 +---
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/scripts/apple/x264.sh b/scripts/apple/x264.sh
index fb66d06..4ab7fba 100755
--- a/scripts/apple/x264.sh
+++ b/scripts/apple/x264.sh
@@ -27,11 +27,6 @@ fi
 overwrite_file "${FFMPEG_KIT_TMPDIR}"/source/config/config.guess "${BASEDIR}"/src/"${LIB_NAME}"/config.guess || return 1
 overwrite_file "${FFMPEG_KIT_TMPDIR}"/source/config/config.sub "${BASEDIR}"/src/"${LIB_NAME}"/config.sub || return 1
 
-# WORKAROUND DISABLE INLINE -arch DEFINITIONS
-# @TODO TEST THESE
-# ${SED_INLINE} 's/CFLAGS=\"\$CFLAGS \-arch x86_64/CFLAGS=\"\$CFLAGS/g' configure
-# ${SED_INLINE} 's/LDFLAGS=\"\$LDFLAGS \-arch x86_64/LDFLAGS=\"\$CFLAGS/g' configure
-
 ./configure \
   --prefix="${LIB_INSTALL_PREFIX}" \
   --enable-pic \
diff --git a/scripts/apple/x265.sh b/scripts/apple/x265.sh
index d4d8812..68bf268 100755
--- a/scripts/apple/x265.sh
+++ b/scripts/apple/x265.sh
@@ -19,7 +19,6 @@ esac
 mkdir -p "${BUILD_DIR}" || return 1
 cd "${BUILD_DIR}" || return 1
 
-# @TODO TEST THESE
 # fix x86 and x86_64 assembly
 ${SED_INLINE} 's/win64/macho64 -DPREFIX/g' ${BASEDIR}/src/x265/source/cmake/CMakeASM_NASMInformation.cmake
 ${SED_INLINE} 's/win/macho/g' ${BASEDIR}/src/x265/source/cmake/CMakeASM_NASMInformation.cmake
@@ -31,18 +30,6 @@ ${SED_INLINE} 's/lsr 16/lsr #16/g' ${BASEDIR}/src/x265/source/common/arm/blockco
 ${SED_INLINE} 's/function x265_/function _x265_/g' ${BASEDIR}/src/x265/source/common/arm/*.S
 ${SED_INLINE} 's/ x265_/ _x265_/g' ${BASEDIR}/src/x265/source/common/arm/pixel-util.S
 
-# fixing relocation errors
-# ${SED_INLINE} 's/sad12_mask:/sad12_mask_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/sad-a.S
-# ${SED_INLINE} 's/g_lumaFilter:/g_lumaFilter_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
-# ${SED_INLINE} 's/g_chromaFilter:/g_chromaFilter_bytes:/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
-# ${SED_INLINE} 's/\.text/.equ sad12_mask, .-sad12_mask_bytes\
-# \
-# .text/g' ${BASEDIR}/src/x265/source/common/arm/sad-a.S
-# ${SED_INLINE} 's/\.text/.equ g_lumaFilter, .-g_lumaFilter_bytes\
-# .equ g_chromaFilter, .-g_chromaFilter_bytes\
-# \
-# .text/g' ${BASEDIR}/src/x265/source/common/arm/ipfilter8.S
-
 # WORKAROUND TO USE A CUSTOM BUILD FILE
 overwrite_file "${BASEDIR}"/tools/patch/cmake/x265/CMakeLists.txt "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1
 
diff --git a/scripts/function-android.sh b/scripts/function-android.sh
index 594f3ad..632eec7 100755
--- a/scripts/function-android.sh
+++ b/scripts/function-android.sh
@@ -929,9 +929,7 @@ android_ndk_cmake() {
   ASM_OPTIONS=""
   case ${ARCH} in
   arm-v7a-neon)
-    ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi)"
-    # @TODO TEST THIS
-    #ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi) -DANDROID_ARM_NEON=TRUE"
+    ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi) -DANDROID_ARM_NEON=TRUE"
     ;;
   *)
     ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi)"