vlc/vlc-3.0 | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri May 18 16:32:17 2018 +0200| [c6575163e3c1c9505a05971d259104f2aaf11563] | committer: Jean-Baptiste Kempf
contrib: x265: do not copy .pdb files that don't exist (cherry picked from commit 61a022426778489a73eb5cd85591a904e513820e) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c6575163e3c1c9505a05971d259104f2aaf11563 --- contrib/src/x265/rules.mak | 1 + contrib/src/x265/x265-no-pdb-install.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak index 4cdd0de896..0a07154b04 100644 --- a/contrib/src/x265/rules.mak +++ b/contrib/src/x265/rules.mak @@ -27,6 +27,7 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265 mkdir -p $@-$(X265_VERSION) tar xvjf "$<" --strip-components=1 -C $@-$(X265_VERSION) $(APPLY) $(SRC)/x265/x265-ldl-linking.patch + $(APPLY) $(SRC)/x265/x265-no-pdb-install.patch $(call pkg_static,"source/x265.pc.in") ifndef HAVE_WIN32 $(APPLY) $(SRC)/x265/x265-pkg-libs.patch diff --git a/contrib/src/x265/x265-no-pdb-install.patch b/contrib/src/x265/x265-no-pdb-install.patch new file mode 100644 index 0000000000..38ed618ecd --- /dev/null +++ b/contrib/src/x265/x265-no-pdb-install.patch @@ -0,0 +1,11 @@ +--- x265/source/CMakeLists.txt.nopdb 2018-05-18 16:28:43.150790700 +0200 ++++ x265/source/CMakeLists.txt 2018-05-18 16:28:53.838634400 +0200 +@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS) + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) + endif() + install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) +-if(WIN32) ++if(WIN32 AND MSVC_IDE) + if(MSVC_IDE) + install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) + install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
