[libde265] Update to 1.0.19 (#51985)

This commit is contained in:
Weihang Ding 2026-05-27 08:20:07 +08:00 committed by GitHub
parent 033331fa33
commit 9b965a1168
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 45 additions and 57 deletions

View File

@ -1,24 +0,0 @@
diff --git a/libde265/arm/CMakeLists.txt b/libde265/arm/CMakeLists.txt
--- a/libde265/arm/CMakeLists.txt
+++ b/libde265/arm/CMakeLists.txt
@@ -3,12 +3,17 @@ add_library(arm OBJECT arm.cc arm.h)
if(HAVE_NEON)
add_library(arm_neon OBJECT
cpudetect.S
hevcdsp_qpel_neon.S
)
+ # LLVM's integrated assembler (used by Android NDK's clang) does not
+ # support the .func/.endfunc directives enabled by HAVE_AS_FUNC.
+ if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ set(AS_FUNC_FLAG -DHAVE_AS_FUNC)
+ endif()
target_compile_options(arm_neon PRIVATE
-mfpu=neon
-DHAVE_NEON
-DEXTERN_ASM=
- -DHAVE_AS_FUNC
+ ${AS_FUNC_FLAG}
-DHAVE_SECTION_DATA_REL_RO
)

View File

@ -0,0 +1,36 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c2ef054..14fa2e08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,21 +134,20 @@ endif()
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
-include(CheckCXXSymbolExists)
-check_cxx_symbol_exists(_LIBCPP_VERSION cstdlib HAVE_LIBCPP)
-
-# Build Libs.private contents for libde265.pc.
-set(_libs_private "")
-if(NOT MSVC)
- if(HAVE_LIBCPP)
- list(APPEND _libs_private "-lc++")
+set(LIBS_PRIVATE "")
+foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
+ if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
+ continue()
+ elseif(EXISTS "${lib}")
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
else()
- list(APPEND _libs_private "-lstdc++")
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
endif()
-endif()
+endforeach()
+
# Emit '-lpthread' rather than '-pthread' so consumers using
# `pkg-config --libs --static` get an unambiguous linker flag (see #453).
-if(CMAKE_USE_PTHREADS_INIT)
+if(CMAKE_USE_PTHREADS_INIT AND NOT ANDROID)
list(APPEND _libs_private "-lpthread")
endif()
if(UNIX)

View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,13 +118,16 @@
if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
add_definitions(-Wall -Werror=return-type -Werror=unused-result -Werror=reorder)
endif()
-include(CheckCXXSymbolExists)
-check_cxx_symbol_exists(_LIBCPP_VERSION cstdlib HAVE_LIBCPP)
-if(HAVE_LIBCPP)
- set(LIBS_PRIVATE "-lc++")
-else()
- set(LIBS_PRIVATE "-lstdc++")
-endif()
+set(LIBS_PRIVATE "")
+foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
+ if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
+ continue()
+ elseif(EXISTS "${lib}")
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
+ else()
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
+ endif()
+endforeach()
option(BUILD_SHARED_LIBS "Build shared library" ON)

View File

@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO strukturag/libde265
REF "v${VERSION}"
SHA512 111b85ea9f92cc4a93f1022fc8ac17ef436f9c32698842f041b18ccc382306fbcb5102d44966b059a750bf380c3aeba5dc5124716f253340d91cf9713f90552d
SHA512 3e8de169ac6dfcdb67558ea762c02de2b71bd47e3755c5c604893c53b211ab7d43c4d55ee2d178819994303c917620c091a5a413e35ab0d25eb8c78e04f8f254
HEAD_REF master
PATCHES
fix-arm-neon-clang.patch
pkgconfig-cxx-linkage.diff
fix-linkage.patch
)
vcpkg_cmake_configure(

View File

@ -1,6 +1,6 @@
{
"name": "libde265",
"version": "1.0.18",
"version": "1.0.19",
"description": "Open h.265 video codec implementation.",
"homepage": "https://www.libde265.org/",
"license": "LGPL-3.0-only",

View File

@ -4873,7 +4873,7 @@
"port-version": 0
},
"libde265": {
"baseline": "1.0.18",
"baseline": "1.0.19",
"port-version": 0
},
"libdeflate": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a44db420c321ab0e2f78652085b6f028000b623f",
"version": "1.0.19",
"port-version": 0
},
{
"git-tree": "77066961e9de83b97fd62af2701a8725172d40c0",
"version": "1.0.18",