diff --git a/README.md b/README.md index 561035f..5b77ce7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -FFmpeg for Apple Platform +FFmpeg Build Scripts ====== diff --git a/build.sh b/build.sh index a9b3752..1449a3a 100755 --- a/build.sh +++ b/build.sh @@ -47,6 +47,7 @@ fi function compile() { ( + set -x export PROJ_ROOT="${PROJ_ROOT}" export PKG_NAME="${1}" diff --git a/patchs/ffmpeg/01_use_custom_config.patch b/patchs/ffmpeg/01_use_custom_config.patch index f1fe977..09b61c1 100644 --- a/patchs/ffmpeg/01_use_custom_config.patch +++ b/patchs/ffmpeg/01_use_custom_config.patch @@ -9,7 +9,7 @@ index 00c3cee33f..12800dcb21 100755 +if [ "${GITHUB_ACTIONS}" == "true" ]; then + FFMPEG_CONFIGURATION="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID} (${GITHUB_SHA})" +else -+ FFMPEG_CONFIGURATION="ffmpeg for apple - $(whoami)@$(uname -n) $(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')" ++ FFMPEG_CONFIGURATION="ffmpeg - $(whoami)@$(uname -n) $(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')" +fi + cat > ffbuild/config.mak <<EOF diff --git a/scripts/sdl2.sh b/scripts/sdl2.sh index f63c5e9..d82fbbe 100755 --- a/scripts/sdl2.sh +++ b/scripts/sdl2.sh @@ -7,7 +7,6 @@ set -e case ${PKG_TYPE} in "static") PKG_TYPE_FLAG="-D BUILD_SHARED_LIBS:BOOL=0" - PKG_LIBRARY_DEPS="-lmbedtls -lmbedx509 -lmbedcrypto -lp256m -leverest" ;; ?) printf "\e[1m\e[31m%s\e[0m\n" "Invalid PKG TYPE: '${PKG_TYPE}'." @@ -50,20 +49,6 @@ printf "\e[1m\e[36m%s\e[0m\n" "${CMAKE_COMMAND}" && eval ${CMAKE_COMMAND} cmake --build "${PKG_BULD_DIR}" -j ${PARALLEL_JOBS} cmake --install "${PKG_BULD_DIR}" ${PKG_INST_STRIP} -# PKG_CONFIG_FILE="${PKG_INST_DIR}/lib/pkgconfig/mbedtls.pc" -# mkdir -p -- "$(dirname ${PKG_CONFIG_FILE})" -# cat > "${PKG_CONFIG_FILE}" <<- EOF -# prefix=\${pcfiledir}/../.. -# libdir=\${prefix}/lib -# includedir=\${prefix}/include - -# Name: mbedtls -# Description: An open source, portable, easy to use, readable and flexible TLS library -# Version: ${PKG_VERSION} -# Libs: -L\${libdir} ${PKG_LIBRARY_DEPS} -# Cflags: -I\${includedir} -# EOF - if command -v tree >/dev/null 2>&1 ; then tree ${PKG_INST_DIR} else