REBUILD

Author: System233

build-ffmpeg.sh

@@ -11,8 +11,10 @@ shift 1
 cd $SRC_DIR
 
 if [ $BUILD_TYPE == "static" ]; then
+    CFLAGS="$CFLAGS /MT"
     TYPE_ARGS="--enable-static"
 else
+    CFLAGS="$CFLAGS /MD"
     TYPE_ARGS="--enable-shared"
 fi
 if [[ $BUILD_ARCH =~ arm ]]; then
@@ -22,7 +24,7 @@ fi
 if [ $BUILD_LICENSE == "gpl" ]; then
     LICENSE_ARGS="--enable-gpl --enable-version3"
 fi
-CFLAGS="$CFLAGS -I${SRC_DIR}/compat/stdbit"
+CFLAGS="$CFLAGS -I${SRC_DIR}/compat/stdbit "
 EX_BUILD_ARGS="$TYPE_ARGS $CROSS_ARGS $LICENSE_ARGS"
 
 ./configure --toolchain=msvc --arch=$BUILD_ARCH $EX_BUILD_ARGS $@

build.sh

@@ -49,6 +49,7 @@ if [ "$BUILD_LICENSE" == "gpl" ]; then
     fi
 
     if [ "$BUILD_ARCH" == arm ]; then
+        git -C x265_git apply ../x265_git-arm.patch
         X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=armv7l -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM=ON"
     elif [ "$BUILD_ARCH" == arm64 ]; then
         X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=arm64 -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM64=ON"
@@ -58,6 +59,9 @@ if [ "$BUILD_LICENSE" == "gpl" ]; then
     ./build-cmake-dep.sh x265_git/source -DENABLE_SHARED=$ENABLE_SHARED -DENABLE_CLI=OFF $X265_ARGS
     FF_ARGS="$FF_ARGS --enable-libx265"
 
+    if [ "$BUILD_TYPE" == "shared" ]; then
+        git -C x264 apply ../x264-${BUILD_TYPE}.patch
+    fi
     if [[ "$BUILD_ARCH" =~ arm ]]; then
         X264_ARGS="--disable-asm"
     fi

x265_git-arm.patch

@@ -0,0 +1,16 @@
+diff --git a/source/common/cpu.h b/source/common/cpu.h
+index 52a9e9cba..103432442 100644
+--- a/source/common/cpu.h
++++ b/source/common/cpu.h
+@@ -38,8 +38,9 @@ extern "C" void PFX(safe_intel_cpu_indicator_init)(void);
+ #if _MSC_VER && _WIN64
+ #define x265_emms() PFX(cpu_emms)()
+ #elif _MSC_VER
+-#include <mmintrin.h>
+-#define x265_emms() _mm_empty()
++#define x265_emms() PFX(cpu_emms)()
++// #include <mmintrin.h>
++// #define x265_emms() _mm_empty()
+ #elif __GNUC__
+ // Cannot use _mm_empty() directly without compiling all the source with
+ // a fixed CPU arch, which we would like to avoid at the moment