[x265] Update to 3.5 (#35531)

This commit is contained in:
Kai Pastor 2023-12-06 23:02:56 +01:00 committed by GitHub
parent ea958c708e
commit e6c6bb1deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 24 deletions

View File

@ -1,13 +0,0 @@
diff --git a/source/cmake/version.cmake b/source/cmake/version.cmake
index b1e995f..d7df148 100644
--- a/source/cmake/version.cmake
+++ b/source/cmake/version.cmake
@@ -7,7 +7,7 @@ find_package(Git QUIET) # present in 2.8.8
# defaults, in case everything below fails
set(X265_VERSION "unknown")
-set(X265_LATEST_TAG "0.0")
+set(X265_LATEST_TAG "0.0" CACHE STRING "x265 version")
set(X265_TAG_DISTANCE "0")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.hg_archival.txt)

View File

@ -1,12 +1,12 @@
vcpkg_from_github(
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO videolan/x265
REF 07295ba7ab551bb9c1580fdaee3200f1b45711b7 #v3.4
SHA512 21a4ef8733a9011eec8b336106c835fbe04689e3a1b820acb11205e35d2baba8c786d9d8cf5f395e78277f921857e4eb8622cf2ef3597bce952d374f7fe9ec29
REPO multicoreware/x265_git
REF "${VERSION}"
SHA512 e95e454b438114cf90e32818847afa65b54caf69442a4a39dc92f125a7ec6f99c83ec509549ced3395cd5a77305abef0ecdad38b4a359f82fb17fce6c4c7cc7a
HEAD_REF master
PATCHES
disable-install-pdb.patch
fix-pkgconfig-version.patch
version.patch
)
set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF")
@ -23,7 +23,7 @@ vcpkg_cmake_configure(
${ASSEMBLY_OPTIONS}
-DENABLE_SHARED=${ENABLE_SHARED}
-DENABLE_LIBNUMA=OFF
-DX265_LATEST_TAG=3.4
"-DVERSION=${VERSION}"
OPTIONS_DEBUG
-DENABLE_CLI=OFF
MAYBE_UNUSED_VARIABLES
@ -64,4 +64,4 @@ foreach(FILE IN LISTS pc_files)
endforeach()
# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

View File

@ -1,7 +1,6 @@
{
"name": "x265",
"version": "3.4",
"port-version": 10,
"version": "3.5",
"description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.",
"homepage": "https://github.com/videolan/x265",
"license": "GPL-2.0-or-later",

16
ports/x265/version.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/source/cmake/Version.cmake b/source/cmake/Version.cmake
index 3bbf42f..e77f639 100644
--- a/source/cmake/Version.cmake
+++ b/source/cmake/Version.cmake
@@ -28,6 +28,11 @@
set(X265_VERSION "unknown")
set(X265_LATEST_TAG "0.0")
set(X265_TAG_DISTANCE "0")
+if(VERSION)
+ set(X265_VERSION "${VERSION}-vcpkg")
+ set(X265_LATEST_TAG "${VERSION}")
+ return()
+endif()
#Find version control software to be used for live and extracted repositories from compressed tarballs
if(CMAKE_VERSION VERSION_LESS "2.8.10")

View File

@ -9137,8 +9137,8 @@
"port-version": 0
},
"x265": {
"baseline": "3.4",
"port-version": 10
"baseline": "3.5",
"port-version": 0
},
"x86-simd-sort": {
"baseline": "3.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b234c25f697f72c031c5d243a78be3dbb98c93c2",
"version": "3.5",
"port-version": 0
},
{
"git-tree": "8aa499d4919383c463198cedf2bc8cea9b01adff",
"version": "3.4",