x265: Update to 3.6

0001-fix-windows-arm64-detection.patch: fix is included in the new release

use CMAKE_DLL_NAME_WITH_SOVERSION while at it
This commit is contained in:
Christoph Reiter
2024-06-24 07:30:15 +02:00
parent 8812d3f132
commit 29e2cbd96b
2 changed files with 5 additions and 21 deletions

View File

@@ -1,13 +0,0 @@
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a407271..845cb37 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
# System architecture detection
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
set(X86_ALIASES x86 i386 i686 x86_64 amd64)
-set(ARM_ALIASES armv6l armv7l aarch64)
+set(ARM_ALIASES armv6l armv7l aarch64 arm64)
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
set(POWER_ALIASES ppc64 ppc64le)

View File

@@ -4,8 +4,8 @@
_realname=x265
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.5
pkgrel=3
pkgver=3.6
pkgrel=1
pkgdesc='Open Source H265/HEVC video encoder (mingw-w64)'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -23,10 +23,8 @@ msys2_references=(
"cpe: cpe:/a:multicorewareinc:x265"
"cpe: cpe:/a:multicorewareinc:x265_high_efficiency_video_coding"
)
source=("${_realname}-${pkgver}.tar.gz"::"https://bitbucket.org/multicoreware/x265_git/get/${pkgver}.tar.gz"
0001-fix-windows-arm64-detection.patch)
sha256sums=('5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618'
'6bae7afde90a9605e9627b3b11f028c28d1585e41be217ae96cbb95a91d9d99e')
source=("${_realname}-${pkgver}.tar.gz"::"https://bitbucket.org/multicoreware/x265_git/get/${pkgver}.tar.gz")
sha256sums=('206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b')
prepare() {
@@ -39,8 +37,6 @@ prepare() {
fi
mkdir -p ${srcdir}/build-${CARCH}-${d}
done
patch -p 1 -i "${srcdir}/0001-fix-windows-arm64-detection.patch"
}
@@ -89,6 +85,7 @@ build() {
-G Ninja \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DENABLE_SHARED=ON \
-DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
-DENABLE_ASSEMBLY=${_ENABLE_ASM} \
-DENABLE_HDR10_PLUS=ON \
-DEXTRA_LIB='x265_main10.a;x265_main12.a' \