[vlc-commits] contrib: x265: Skip building the CLI binaries altogether

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Mon Feb 26 13:09:09 2018 +0200| [3a9ef4076773ce9b878ba35d2d3f25d1175a7583] | committer: Martin Storsjö

contrib: x265: Skip building the CLI binaries altogether

This reverts 696cb02d7bbd491cdc8a2df29b53d48f391b59c5 and solves
the issue differently, by simply not trying to build the
problematic parts which aren't needed for VLC anyway.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a9ef4076773ce9b878ba35d2d3f25d1175a7583
---

 contrib/src/x265/rules.mak          |  3 +--
 contrib/src/x265/win-skip-res.patch | 12 ------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 146d9da045..9a0aa39ee2 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -27,7 +27,6 @@ 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/win-skip-res.patch
 	$(call pkg_static,"source/x265.pc.in")
 ifndef HAVE_WIN32
 	$(APPLY) $(SRC)/x265/x265-pkg-libs.patch
@@ -36,7 +35,7 @@ endif
 
 .x265: x265 toolchain.cmake
 	$(REQUIRE_GPL)
-	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH)
+	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF
 	cd $</source && $(MAKE) install
 	sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
 	touch $@
diff --git a/contrib/src/x265/win-skip-res.patch b/contrib/src/x265/win-skip-res.patch
deleted file mode 100644
index ffac8d5930..0000000000
--- a/contrib/src/x265/win-skip-res.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN x265-orig/source/CMakeLists.txt x265/source/CMakeLists.txt
---- x265-orig/source/CMakeLists.txt	2017-12-14 10:04:53.932080387 +0000
-+++ x265/source/CMakeLists.txt	2017-12-14 10:05:35.151167937 +0000
-@@ -441,7 +441,7 @@
-     ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
- 
--if(CMAKE_RC_COMPILER)
-+if(FALSE)
-     # The resource compiler does not need CFLAGS or macro defines. It
-     # often breaks them
-     string(REPLACE "<FLAGS>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")