Added x264 and x265 encoders.

Author: System233

.github/workflows/build.yml

@@ -14,6 +14,7 @@ on:
       tag_name:
         description: "Tag"
         required: true
+
 jobs:
   build:
     strategy:
@@ -37,6 +38,7 @@ jobs:
         with:
           ref: ${{env.TAG_NAME}}
           submodules: recursive
+
       - uses: msys2/setup-msys2@v2
         with:
           install: >-
@@ -47,24 +49,18 @@ jobs:
             yasm
             nasm
 
-      - name: Rebase
-        if: ${{inputs.tag_name}}
-        shell: msys2 {0}
-        run: |
-          cd FFmpeg
-          git fetch --tags
-          git checkout ${{inputs.tag_name}}
-          git submodule update --init --recursive --depth 1
-
       - name: Remove MSYS2 link
         shell: msys2 {0}
-        run: rm $(which link)
+        run: |
+          rm $(which link)
+          rm -rf /usr/local
 
       - name: Build
         shell: cmd
         run: |
           CALL "${{steps.msvc.outputs.installationPath}}\VC\Auxiliary\Build\vcvarsall.bat" ${{env.target}} ${{env.SDK_VER}}
           msys2 -c "./build.sh ${{matrix.arch}} ${{matrix.type}} ${{matrix.license}}"
+
       - name: Debug log
         if: ${{ failure() }}
         shell: bash
@@ -73,16 +69,18 @@ jobs:
           cat FFmpeg/ffbuild/config.log
           cat FFmpeg/ffbuild/config.mak
           cat FFmpeg/config.h
+
       - name: Pack
         shell: msys2 {0}
         run: |
-          cd dist
-          zip -9 ../${{env.name}}.zip -r .
-          cd ..
+          CWD=$(pwd)
+          cd /usr/local
+          zip -9 ${CWD}/${{env.name}}.zip -r .
+          cd ${CWD}
           sha1sum ${{env.name}}.zip >${{env.name}}.sha1
           ./build-changelog.sh > changelog
       - name: Release
-        if: ${{startsWith(github.ref, 'refs/tags/')||inputs.tag_name}}
+        if: ${{startsWith(github.ref, 'refs/tags/')}}
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{env.TAG_NAME}}

.gitmodules

@@ -25,3 +25,9 @@ url = https://github.com/madler/zlib.git
 [submodule "openexr"]
 path = openexr
 url = https://github.com/AcademySoftwareFoundation/openexr.git
+[submodule "x265_git"]
+	path = x265_git
+	url = https://bitbucket.org/multicoreware/x265_git.git
+[submodule "x264"]
+	path = x264
+	url = https://code.videolan.org/videolan/x264.git

README.md

@@ -1,20 +1,71 @@
-# FFmpeg Builder
+# FFmpeg GitHub Action Builds (MSVC)
+
+This repository provides **FFmpeg builds** compiled with **MSVC (Microsoft Visual C++)**, leveraging GitHub Actions to automate the process. Each release includes complete precompiled binaries, libraries, and development files, optimized for various platforms and configurations.
 
 [![Build FFmpeg](https://github.com/System233/ffmpeg-builds/actions/workflows/build.yml/badge.svg)](https://github.com/System233/ffmpeg-builds/actions/workflows/build.yml)
 
-Build results: [Download](https://github.com/System233/ffmpeg-msvc-prebuilt/releases)
+## Contents of the Release Packages
+
+Each release provides the following for all build variants, architectures, and licenses:
+
+1. **Precompiled binaries** (`ffmpeg`, `ffplay`, `ffprobe`, etc.).
+2. **Dynamic and static libraries** for FFmpeg and included dependencies.
+3. **Header files** for development.
+4. **pkg-config (.pc) files** for library integration.
+5. **CMake configuration files** for easy integration with CMake-based projects.
+6. **SHA1 checksum files** for verifying integrity.
+
+The files are packaged into **.zip** archives for each configuration, making it easy to download and integrate into your workflow.
+
+## Downloading and Using the Builds
+
+1. Visit the **[Releases](https://github.com/System233/ffmpeg-msvc-prebuilt/releases)** section.
+2. Download the `.zip` archive and its corresponding `.sha1` checksum file for your desired configuration.
+3. Verify the archive integrity using the `.sha1` checksum file.
+   ```sh
+   sha1sum -c <filename>.sha1
+   ```
+4. Extract the archive to access binaries, libraries, and development files.
+
+## Features
+
+### Built with MSVC
+
+- Ensures compatibility with Windows development environments.
+- Generates high-performance binaries optimized for modern Windows platforms.
+
+### Build Variants
+
+- **Shared**: Includes dynamic libraries and runtime dependencies.
+- **Static**: Fully self-contained binaries for standalone usage.
+
+### Supported Architectures
+
+- **amd64** (x86_64)
+- **x86** (32-bit)
+- **arm** (armv7l)
+- **arm64** (aarch64)
+
+### Licensing Options
+
+- **GPL Builds**: Includes additional components like **x264** and **x265** encoders.
+- **LGPL Builds**: Excludes GPL-licensed components for more permissive licensing.
+
+### Included Dependencies
 
-## Build Info
+All builds include the following libraries:
 
-- Binaries: Now includes ffmpeg, ffplay and ffprobe executable files, as well as related header files and lib.
-- Arch support: x64, x86, arm and arm64.
-- Linker: static, shared
-- License: GPLv3, LGPLv2.1
+- [nv-codec-headers](https://github.com/FFmpeg/nv-codec-headers.git)
+- [zlib](https://github.com/madler/zlib.git)
+- [libjxl](https://github.com/libjxl/libjxl.git)
+  - [openexr](https://github.com/AcademySoftwareFoundation/openexr.git)
+- [freetype](https://gitlab.freedesktop.org/freetype/freetype.git)
+- [harfbuzz](https://github.com/harfbuzz/harfbuzz.git)
+- [SDL2](https://github.com/libsdl-org/SDL.git)
+- [x264](https://code.videolan.org/videolan/x264.git) (GPL builds only)
+- [x265](https://bitbucket.org/multicoreware/x265_git.git) (GPL builds only)
 
-## Enabled dependencies
+## License
 
-- freetype2 (filter)
-- harfbuzz (filter)
-- libjxl (jxl,exr)
-- SDL2 (ffplay)
-- zlib (libpng,png/apng)
+- The scripts in this repository are licensed under the **MIT License**.
+- The binaries inherit the licensing terms of FFmpeg and its dependencies, which may include **GPL** or **LGPL**.

RELEASE.md

@@ -0,0 +1,21 @@
+This release contains FFmpeg builds, compiled with MSVC (Microsoft Visual C++) via GitHub Actions, and organized as follows:
+
+- **Variants**: Includes both **shared** and **static** builds.
+- **Architectures**: Each variant is available for **amd64**, **x86**, **arm**, and **arm64**.
+- **Licenses**:
+  - **GPL**: Includes GPL components such as the **x264** and **x265** encoders.
+  - **LGPL**: Excludes GPL-licensed components.
+
+#### Included Dependencies
+
+- [nv-codec-headers](https://github.com/FFmpeg/nv-codec-headers.git)
+- [zlib](https://github.com/madler/zlib.git)
+- [libjxl](https://github.com/libjxl/libjxl.git)
+  - [openexr](https://github.com/AcademySoftwareFoundation/openexr.git)
+- [freetype](https://gitlab.freedesktop.org/freetype/freetype.git)
+- [harfbuzz](https://github.com/harfbuzz/harfbuzz.git)
+- [SDL2](https://github.com/libsdl-org/SDL.git)
+- [x264](https://code.videolan.org/videolan/x264.git) (GPL builds only)
+- [x265](https://bitbucket.org/multicoreware/x265_git.git) (GPL builds only)
+
+#### Release Notes

build-changelog.sh

@@ -4,6 +4,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+cat RELEASE.md
 flag=0
 while IFS= read -r line; do
     if [[ "$line" =~ ^version ]]; then

build-cmake-dep.sh

@@ -22,12 +22,12 @@ 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 $@
+cmake "$SRC_DIR" -G "NMake Makefiles" --install-prefix "$INSTALL_PREFIX" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS -DCMAKE_MSVC_RUNTIME_LIBRARY=$CMAKE_MSVC_RUNTIME_LIBRARY $@
 cmake --build . --config Release -j$(nproc)
 cmake --install . --config Release

build-ffmpeg.sh

@@ -11,8 +11,10 @@ shift 1
 cd $SRC_DIR
 
 if [ $BUILD_TYPE == "static" ]; then
-    TYPE_ARGS="--enable-static"
+    CFLAGS="$CFLAGS /MT"
+    TYPE_ARGS="--enable-static --pkg-config-flags=--static"
 else
+    CFLAGS="$CFLAGS /MD"
     TYPE_ARGS="--enable-shared"
 fi
 if [[ $BUILD_ARCH =~ arm ]]; then

build-make-dep.sh

@@ -9,5 +9,8 @@ echo -e "\n[Build $1]"
 SRC_DIR=$(pwd)/$1
 shift 1
 cd $SRC_DIR
+if [ -e ./configure ]; then
+    ./configure $@
+fi
 make -j$(nproc)
-make install PREFIX=$INSTALL_PREFIX $@
+make ${INSTALL_TARGET:-install} PREFIX=$INSTALL_PREFIX

build-meson-dep.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
@@ -32,13 +28,55 @@ echo BUILD_TYPE=$BUILD_TYPE
 echo BUILD_LICENSE=$BUILD_LICENSE
 echo FF_ARGS=$FF_ARGS
 
-git -C zlib apply ../zlib.patch
-git -C FFmpeg apply ../ffmpeg.patch || true
+apply-patch() {
+    GIT_CMD="git -C $1 apply ../patches/$2 --ignore-whitespace"
+    if ! $GIT_CMD -R --check; then
+        $GIT_CMD --ignore-whitespace
+    else
+        echo Skip $2 for $1
+    fi
+}
+
+apply-patch zlib zlib.patch
+apply-patch FFmpeg ffmpeg.patch
+apply-patch harfbuzz harfbuzz.patch
 
 # --enable-libfribidi --enable-libass
 # ./build-meson-dep.sh fribidi -Ddocs=false
 # ./build-meson-dep.sh libass
 
+if [ "$BUILD_LICENSE" == "gpl" ]; then
+
+    apply-patch x265_git 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
+    fi
+
+    if [ "$BUILD_ARCH" == arm ]; then
+        apply-patch x265_git x265_git-arm.patch
+    fi
+
+    git -C x265_git fetch --tags
+    ./build-cmake-dep.sh x265_git/source -DCMAKE_SYSTEM_NAME=Windows -DENABLE_SHARED=$ENABLE_SHARED -DENABLE_CLI=OFF $X265_ARGS
+    FF_ARGS="$FF_ARGS --enable-libx265"
+
+    if [ "$BUILD_TYPE" == "shared" ]; then
+        apply-patch x264 x264-${BUILD_TYPE}.patch
+    fi
+    if [[ "$BUILD_ARCH" =~ arm ]]; then
+        X264_ARGS="--disable-asm"
+    fi
+
+    INSTALL_TARGET=install-lib-${BUILD_TYPE} ./build-make-dep.sh x264 --enable-${BUILD_TYPE} $X264_ARGS
+    FF_ARGS="$FF_ARGS --enable-libx264"
+
+fi
+
 ./build-make-dep.sh nv-codec-headers
 
 CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ./build-cmake-dep.sh zlib
@@ -56,8 +94,16 @@ if [ -n "$ENABLE_SDL" ]; then
 fi
 
 if [ -n "$ENABLE_LIBJXL" ]; then
-    ./build-cmake-dep.sh openexr -DOPENEXR_INSTALL_TOOLS=OFF
-    ./build-cmake-dep.sh libjxl -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF #-DJPEGXL_STATIC=ON
+
+    if [ "$BUILD_TYPE" == "shared" ]; then
+        JPEGXL_STATIC=OFF
+    else
+        JPEGXL_STATIC=ON
+    fi
+
+    apply-patch libjxl libjxl.patch
+    ./build-cmake-dep.sh openexr -DOPENEXR_INSTALL_TOOLS=OFF -DOPENEXR_BUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DOPENEXR_IS_SUBPROJECT=ON
+    ./build-cmake-dep.sh libjxl -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_STATIC=$JPEGXL_STATIC
 fi
 
 ./build-ffmpeg.sh FFmpeg $FF_ARGS