test

Author: System233

build-cmake-dep.sh

@@ -22,10 +22,10 @@ amd64)
 esac
 
 if [ $BUILD_TYPE == "static" ]; then
-    BUILD_SHARED_LIBS=ON
+    BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF}
     CMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY:-MultiThreaded}
 else
-    BUILD_SHARED_LIBS=ON
+    BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-ON}
     CMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY:-MultiThreadedDLL}
 fi
 cmake "$SRC_DIR" --install-prefix "$INSTALL_PREFIX" -A=$BUILD_ARCH -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS -DCMAKE_MSVC_RUNTIME_LIBRARY=$CMAKE_MSVC_RUNTIME_LIBRARY $@

build.sh

@@ -8,10 +8,6 @@ HELP_MSG="Usage: build.sh <x86,amd64,arm,arm64> [static,shared] [gpl,lgpl] ...FF
 set -e
 source ./env.sh
 
-export BUILD_ARCH=${1:-$VSCMD_ARG_TGT_ARCH}
-export BUILD_TYPE=${2:-shared}
-export BUILD_LICENSE=${3:-gpl}
-
 if [ -z $BUILD_ARCH ]; then
     echo "$HELP_MSG" >&2
     exit 1
@@ -34,22 +30,32 @@ echo FF_ARGS=$FF_ARGS
 
 git -C zlib apply ../zlib.patch
 git -C FFmpeg apply ../ffmpeg.patch || true
-git -C x265_git apply ../x265_git.patch
 
 # --enable-libfribidi --enable-libass
 # ./build-meson-dep.sh fribidi -Ddocs=false
 # ./build-meson-dep.sh libass
 
 if [ "$BUILD_LICENSE" == "gpl" ]; then
 
+    git -C x265_git apply ../x265_git-${BUILD_TYPE}.patch
+    if [ "$BUILD_TYPE" == "static" ]; then
+        X265_ARGS="-DSTATIC_LINK_CRT=ON"
+        ENABLE_SHARED=OFF
+    else
+        X265_ARGS="-DSTATIC_LINK_CRT=OFF"
+        ENABLE_SHARED=ON
+
+        git -C x264 apply ../x264-${BUILD_TYPE}.patch
+    fi
+
     if [ "$BUILD_ARCH" == arm ]; then
         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"
     fi
 
     git -C x265_git fetch --tags
-    ./build-cmake-dep.sh x265_git/source -DENABLE_SHARED=on -DENABLE_CLI=off $X265_ARGS
+    ./build-cmake-dep.sh x265_git/source -DENABLE_SHARED=$ENABLE_SHARED -DENABLE_CLI=OFF $X265_ARGS
     FF_ARGS="$FF_ARGS --enable-libx265"
 
     if [[ "$BUILD_ARCH" =~ arm ]]; then
@@ -59,9 +65,6 @@ if [ "$BUILD_LICENSE" == "gpl" ]; then
     INSTALL_TARGET=install-lib-${BUILD_TYPE} ./build-make-dep.sh x264 --enable-${BUILD_TYPE} $X264_ARGS
     FF_ARGS="$FF_ARGS --enable-libx264"
 
-    if [ "$BUILD_TYPE" == "static" ]; then
-        X265_ARGS="-DSTATIC_LINK_CRT=on"
-    fi
 fi
 
 ./build-make-dep.sh nv-codec-headers

env.sh

@@ -5,5 +5,10 @@
 
 export INSTALL_PREFIX=${INSTALL_PREFIX:-/usr/local}
 export PKG_CONFIG_PATH=$INSTALL_PREFIX/lib/pkgconfig:$INSTALL_PREFIX/share/pkgconfig
+
+export BUILD_ARCH=${1:-$VSCMD_ARG_TGT_ARCH}
+export BUILD_TYPE=${2:-shared}
+export BUILD_LICENSE=${3:-gpl}
+
 export CC=cl
 export CXX=cl

x264-shared.patch

@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index e242e73c..a95af920 100755
+--- a/configure
++++ b/configure
+@@ -1633,7 +1633,7 @@ includedir=$includedir
+ Name: x264
+ Description: H.264 (MPEG4 AVC) encoder library
+ Version: $(grep POINTVER < x264_config.h | sed -e 's/.* "//; s/".*//; s/ .*//')
+-Libs: -L$libdir -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl)
++Libs: -L$libdir -llibx264.dll $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl)
+ Libs.private: $([ "$shared" = "yes" ] && echo $libpthread $libm $libdl)
+ Cflags: -I$includedir $([ "$shared" = "yes" ] && echo "-DX264_API_IMPORTS")
+ EOF

x265_git-shared.patch

@@ -0,0 +1,12 @@
+diff --git a/source/x265.pc.in b/source/x265.pc.in
+index 0bf99e938..7b1a0550e 100644
+--- a/source/x265.pc.in
++++ b/source/x265.pc.in
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: @CMAKE_PROJECT_NAME@
+ Description: H.265/HEVC video encoder
+ Version: @X265_LATEST_TAG@
+-Libs: -L${libdir} -lx265
++Libs: -L${libdir} -llibx265
+ Libs.private: @PRIVATE_LIBS@
+ Cflags: -I${includedir}

x265_git-static.patch

@@ -0,0 +1,12 @@
+diff --git a/source/x265.pc.in b/source/x265.pc.in
+index 0bf99e938..051470536 100644
+--- a/source/x265.pc.in
++++ b/source/x265.pc.in
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: @CMAKE_PROJECT_NAME@
+ Description: H.265/HEVC video encoder
+ Version: @X265_LATEST_TAG@
+-Libs: -L${libdir} -lx265
++Libs: -L${libdir} -lx265-static
+ Libs.private: @PRIVATE_LIBS@
+ Cflags: -I${includedir}