diff options
| -rw-r--r-- | tools/depends/target/fmt/001-windows-pdb-symbol-gen.patch | 7 | ||||
| -rw-r--r-- | tools/depends/target/fmt/FMT-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/target/fmt/Makefile | 4 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Utils/AERingBuffer.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/tools/depends/target/fmt/001-windows-pdb-symbol-gen.patch b/tools/depends/target/fmt/001-windows-pdb-symbol-gen.patch index fed1a83a89..d4429afe05 100644 --- a/tools/depends/target/fmt/001-windows-pdb-symbol-gen.patch +++ b/tools/depends/target/fmt/001-windows-pdb-symbol-gen.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -268,9 +268,20 @@ +@@ -249,10 +249,21 @@ set(FMT_DEBUG_POSTFIX d CACHE STRING "Debug library postfix.") @@ -16,12 +16,13 @@ +else() set_target_properties(fmt PROPERTIES VERSION ${FMT_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR} + PUBLIC_HEADER "${FMT_HEADERS}" DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}") +endif() # Set FMT_LIB_NAME for pkg-config fmt.pc. We cannot use the OUTPUT_NAME target # property because it's not set by default. -@@ -361,6 +372,18 @@ +@@ -339,6 +350,18 @@ install(EXPORT ${targets_export_name} DESTINATION ${FMT_CMAKE_DIR} NAMESPACE fmt::) @@ -39,4 +40,4 @@ + install(FILES $<TARGET_PDB_FILE:${INSTALL_TARGETS}> DESTINATION ${FMT_LIB_DIR} OPTIONAL) - install(FILES ${FMT_HEADERS} DESTINATION "${FMT_INC_DIR}/fmt") + install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}") diff --git a/tools/depends/target/fmt/FMT-VERSION b/tools/depends/target/fmt/FMT-VERSION index cbaa58dd7d..f887185bd7 100644 --- a/tools/depends/target/fmt/FMT-VERSION +++ b/tools/depends/target/fmt/FMT-VERSION @@ -1,6 +1,6 @@ LIBNAME=fmt -VERSION=8.0.1 +VERSION=9.1.0 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=643e68d5b2e0e9c83231ab2b0036596a6297b1d9ed6bd7b1172bee4ff134c8af8f09174c06c94225132c1b635b0977ea4ce783748d7bd76a9a0b5ad597456c84 +SHA512=a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be BYPRODUCT=libfmt.a BYPRODUCT_WIN=fmt.lib diff --git a/tools/depends/target/fmt/Makefile b/tools/depends/target/fmt/Makefile index f6c46ce89d..abff52527d 100644 --- a/tools/depends/target/fmt/Makefile +++ b/tools/depends/target/fmt/Makefile @@ -1,6 +1,7 @@ -include ../../Makefile.include include FMT-VERSION -DEPS = Makefile FMT-VERSION ../../download-files.include +DEPS = Makefile FMT-VERSION ../../download-files.include \ + 001-windows-pdb-symbol-gen.patch CMAKE_OPTIONS=-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF @@ -41,6 +42,7 @@ endif rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build + cd $(PLATFORM); patch -p1 -i ../001-windows-pdb-symbol-gen.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) diff --git a/xbmc/cores/AudioEngine/Utils/AERingBuffer.h b/xbmc/cores/AudioEngine/Utils/AERingBuffer.h index a1a8b0a3bf..8a2a1aaf74 100644 --- a/xbmc/cores/AudioEngine/Utils/AERingBuffer.h +++ b/xbmc/cores/AudioEngine/Utils/AERingBuffer.h @@ -206,7 +206,7 @@ public: } } bufferContents[m_iSize*m_planes] = '\0'; - CLog::Log(LOGDEBUG, "AERingBuffer::Dump()\n{}", bufferContents); + CLog::LogF(LOGDEBUG, "Buffer Content: {}", reinterpret_cast<const char*>(bufferContents)); KODI::MEMORY::AlignedFree(bufferContents); } |