antonlyap/ffmpeg-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

remove unused workarounds from build scripts

Browse Source
This commit is contained in:
Taner Sener 2021-03-20 12:52:32 +00:00
parent f84880f383
commit c2bbc50dc5
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/apple/x264.sh
View File

@ -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.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 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 \ ./configure \
--prefix="${LIB_INSTALL_PREFIX}" \ --prefix="${LIB_INSTALL_PREFIX}" \
--enable-pic \ --enable-pic \

13
scripts/apple/x265.sh
View File

@ -19,7 +19,6 @@ esac
mkdir -p "${BUILD_DIR}" || return 1 mkdir -p "${BUILD_DIR}" || return 1
cd "${BUILD_DIR}" || return 1 cd "${BUILD_DIR}" || return 1
# @TODO TEST THESE
# fix x86 and x86_64 assembly # fix x86 and x86_64 assembly
${SED_INLINE} 's/win64/macho64 -DPREFIX/g' ${BASEDIR}/src/x265/source/cmake/CMakeASM_NASMInformation.cmake ${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 ${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/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 ${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 # 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 overwrite_file "${BASEDIR}"/tools/patch/cmake/x265/CMakeLists.txt "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1

4
scripts/function-android.sh
View File

@ -929,9 +929,7 @@ android_ndk_cmake() {
ASM_OPTIONS="" ASM_OPTIONS=""
case ${ARCH} in case ${ARCH} in
arm-v7a-neon) arm-v7a-neon)
ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi)" ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi) -DANDROID_ARM_NEON=TRUE"
# @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)" ASM_OPTIONS="-DANDROID_ABI=$(get_android_cmake_ndk_abi)"