mirror of https://github.com/microsoft/vcpkg.git
[libde265] update to 1.0.18 (#51284)
This commit is contained in:
parent
d95608069a
commit
b8b8d01f8d
|
|
@ -0,0 +1,24 @@
|
|||
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
|
||||
)
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
|
||||
index 9fa2837..d17097c 100644
|
||||
--- a/libde265/CMakeLists.txt
|
||||
+++ b/libde265/CMakeLists.txt
|
||||
@@ -123,7 +123,7 @@ endif()
|
||||
|
||||
add_library(de265 ${libde265_sources} ${libde265_public_headers} ${ENCODER_OBJECTS} ${X86_OBJECTS})
|
||||
target_link_libraries(de265 PRIVATE Threads::Threads)
|
||||
-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
+target_include_directories(de265 PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}> PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
|
||||
write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion)
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4da9921..14cef0d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -44,13 +44,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
|
||||
add_definitions(-Wall)
|
||||
@@ -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)
|
||||
|
|
@ -24,5 +24,5 @@ index 4da9921..14cef0d 100644
|
|||
+ endif()
|
||||
+endforeach()
|
||||
|
||||
|
||||
option(BUILD_SHARED_LIBS "Build shared library" ON)
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO strukturag/libde265
|
||||
REF "v${VERSION}"
|
||||
SHA512 bda239b4827c81552855dc540724b74c86f6b02bcd0fe556650bc16d665a8eed1ddbde76ac0972d26b3002b14575bb9b6f70b367c39eb7de45c5c9df324e3d05
|
||||
SHA512 111b85ea9f92cc4a93f1022fc8ac17ef436f9c32698842f041b18ccc382306fbcb5102d44966b059a750bf380c3aeba5dc5124716f253340d91cf9713f90552d
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-interface-include.patch
|
||||
fix-arm-neon-clang.patch
|
||||
pkgconfig-cxx-linkage.diff
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "libde265",
|
||||
"version": "1.0.16",
|
||||
"port-version": 1,
|
||||
"version": "1.0.18",
|
||||
"description": "Open h.265 video codec implementation.",
|
||||
"homepage": "https://www.libde265.org/",
|
||||
"license": "LGPL-3.0-only",
|
||||
|
|
|
|||
|
|
@ -4833,8 +4833,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"libde265": {
|
||||
"baseline": "1.0.16",
|
||||
"port-version": 1
|
||||
"baseline": "1.0.18",
|
||||
"port-version": 0
|
||||
},
|
||||
"libdeflate": {
|
||||
"baseline": "1.25",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "77066961e9de83b97fd62af2701a8725172d40c0",
|
||||
"version": "1.0.18",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "48f50bad067ea7eea6d5db8bd58c493f4d5de736",
|
||||
"version": "1.0.16",
|
||||
|
|
|
|||
Loading…
Reference in New Issue