[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: freetype2: disable building doc and brotli

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0afd8196 by Steve Lhomme at 2022-09-27T17:25:21+02:00
contrib: freetype2: disable building doc and brotli

Fix regression from d9c9482b253762312bcb5c0ab5043e34bb23575f

Ref. #27365

- - - - -
d284babe by Steve Lhomme at 2022-09-27T17:25:21+02:00
contrib: flac: don't build the documentation

Ref. #27365

- - - - -
afcd73cf by Steve Lhomme at 2022-09-27T17:25:21+02:00
contrib: glslang: don't use CTest

- - - - -
12e6d7ab by Steve Lhomme at 2022-09-27T17:25:22+02:00
contrib: srt: don't build standalone apps

- - - - -
2599291b by Steve Lhomme at 2022-09-27T17:25:28+02:00
contrib: taglib: disable C bindings

We use it with the C++ interface.

- - - - -


5 changed files:

- contrib/src/flac/rules.mak
- contrib/src/freetype2/rules.mak
- contrib/src/glslang/rules.mak
- contrib/src/srt/rules.mak
- contrib/src/taglib/rules.mak


Changes:

=====================================
contrib/src/flac/rules.mak
=====================================
@@ -30,7 +30,8 @@ FLAC_CONF = \
 	-DINSTALL_MANPAGES=OFF \
 	-DBUILD_CXXLIBS=OFF \
 	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_PROGRAMS=OFF
+	-DBUILD_PROGRAMS=OFF \
+	-DBUILD_DOCS=OFF
 
 ifeq ($(ARCH),i386)
 # nasm doesn't like the -fstack-protector-strong that's added to its flags


=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -20,7 +20,9 @@ freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
 
 DEPS_freetype2 = zlib $(DEPS_zlib)
 
-FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON -DFT_DISABLE_BZIP2=NO -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=ON
+FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON -DFT_DISABLE_BZIP2=NO \
+                -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=ON -DFT_DISABLE_HARFBUZZ=ON \
+                -DFT_DISABLE_BROTLI=ON
 
 .freetype2: freetype toolchain.cmake
 ifndef AD_CLAUSES


=====================================
contrib/src/glslang/rules.mak
=====================================
@@ -27,7 +27,7 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
 	$(APPLY) $(SRC)/glslang/glslang-win32.patch
 	$(MOVE)
 
-GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF
+GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF -DENABLE_CTEST=OFF
 
 .glslang: glslang toolchain.cmake
 	$(CMAKECLEAN)


=====================================
contrib/src/srt/rules.mak
=====================================
@@ -29,7 +29,7 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
 	$(call pkg_static,"scripts/srt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@
 
-SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF
+SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF -DENABLE_APPS=OFF
 
 .srt: srt toolchain.cmake
 	$(CMAKECLEAN)


=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -19,9 +19,11 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
 	$(APPLY) $(SRC)/taglib/0001-FileTypeResolver-Fix-IOStream-usage-with-custom-reso.patch
 	$(MOVE)
 
+TAGLIB_CONF := -DBUILD_BINDINGS=OFF
+
 .taglib: taglib toolchain.cmake
 	$(CMAKECLEAN)
-	$(HOSTVARS_PIC) $(CMAKE)
+	$(HOSTVARS_PIC) $(CMAKE) $(TAGLIB_CONF)
 	+$(CMAKEBUILD)
 	+$(CMAKEBUILD) --target install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/420e9f62fe57a3891f68e551ec7df1f21a4fe3bd...2599291bb489512b20147a1df3175345b0411e26

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/420e9f62fe57a3891f68e551ec7df1f21a4fe3bd...2599291bb489512b20147a1df3175345b0411e26
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance