contrib: use internal CONF variables for the project configurations

This is how it's done for autotools target and some cmake targets. It makes
long lines a little better to read.

contrib/src/glslang/rules.mak

@@ -27,8 +27,9 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
 	$(APPLY) $(SRC)/glslang/glslang-win32.patch
 	$(MOVE)
 
+GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF
+
 .glslang: glslang toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) \
-	    -DENABLE_GLSLANG_BINARIES=OFF
+	cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/gme/rules.mak

@@ -21,7 +21,9 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
 	$(call pkg_static,"gme/libgme.pc.in")
 	$(MOVE)
 
+GME_CONF := -DENABLE_UBSAN=OFF
+
 .gme: game-music-emu toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) . -DENABLE_UBSAN=OFF
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) . $(GME_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/libebur128/rules.mak

@@ -18,7 +18,9 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
 	$(call pkg_static,"./ebur128/libebur128.pc.cmake")
 	$(MOVE)
 
+LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE
+
 .libebur128: libebur128 toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBEBUR128_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/mpcdec/rules.mak

@@ -41,8 +41,10 @@ ifdef HAVE_MACOSX
 endif
 	$(MOVE)
 
+MUSE_CONF := -DSHARED=OFF
+
 .mpcdec: musepack toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) $(MUSE_CONF)
 	+$(CMAKEBUILD) $< --target install
 	mkdir -p -- "$(PREFIX)/lib"
 	# Use globbing to work around cmake's change of destination file

contrib/src/mysofa/rules.mak

@@ -23,9 +23,11 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
 	$(UNPACK)
 	$(MOVE)
 
+MYSOFA_CONF := -DBUILD_TESTS=OFF
+
 .mysofa: mysofa toolchain.cmake
 	cd $< && rm -f CMakeCache.txt
-	cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_TESTS=OFF
+	cd $< && $(HOSTVARS) $(CMAKE) $(MYSOFA_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@
 

contrib/src/openjpeg/rules.mak

@@ -26,10 +26,9 @@ endif
 	$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
 	$(MOVE)
 
+OPENJPEG_CONF := -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC:bool=OFF
+
 .openjpeg: openjpeg toolchain.cmake
-	cd $< && $(HOSTVARS) $(CMAKE) \
-		-DBUILD_PKGCONFIG_FILES=ON \
-			-DBUILD_CODEC:bool=OFF \
-		.
+	cd $< && $(HOSTVARS) $(CMAKE) . $(OPENJPEG_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/projectM/rules.mak

@@ -15,6 +15,8 @@ ifeq ($(call need_pkg,"libprojectM"),)
 PKGS_FOUND += projectM
 endif
 
+DEPS_projectM = glew $(DEPS_glew)
+
 $(TARBALLS)/projectM-$(PROJECTM_VERSION)-Source.tar.gz:
 	$(call download_pkg,$(PROJECTM_URL),projectM)
 
@@ -33,14 +35,14 @@ endif
 	$(APPLY) $(SRC)/projectM/missing-includes.patch
 	$(MOVE)
 
-DEPS_projectM = glew $(DEPS_glew)
+PROJECTM_CONF := \
+		-DDISABLE_NATIVE_PRESETS:BOOL=ON \
+		-DUSE_FTGL:BOOL=OFF \
+		-DBUILD_PROJECTM_STATIC:BOOL=ON
 
 .projectM: projectM toolchain.cmake
 	cd $< && rm -f CMakeCache.txt
-	cd $< && $(HOSTVARS) $(CMAKE) \
-		-DDISABLE_NATIVE_PRESETS:BOOL=ON \
-		-DUSE_FTGL:BOOL=OFF \
-		-DBUILD_PROJECTM_STATIC:BOOL=ON .
+	cd $< && $(HOSTVARS) $(CMAKE) . $(PROJECTM_CONF)
 	+$(CMAKEBUILD) $< --target install
 	-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib
 	touch $@

contrib/src/soxr/rules.mak

@@ -33,13 +33,15 @@ SOXR_EXTRA_CONF=-DCMAKE_SYSTEM_NAME=Generic
 endif
 endif
 
-.soxr: soxr toolchain.cmake
-	rm -f $</CMakeCache.txt
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) \
+SOXR_CONF := \
 		$(SOXR_EXTRA_CONF) \
 		-DBUILD_TESTS=OFF \
 		-DWITH_LSR_BINDINGS=OFF \
 		-DWITH_OPENMP=OFF \
 		-DWITH_AVFFT=ON
+
+.soxr: soxr toolchain.cmake
+	rm -f $</CMakeCache.txt
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) $(SOXR_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/spatialaudio/rules.mak

@@ -20,8 +20,10 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
 	$(UNPACK)
 	$(MOVE)
 
+SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
+
 .spatialaudio: spatialaudio toolchain.cmake
 	cd $< && rm -f CMakeCache.txt
-	cd $< && $(HOSTVARS) $(CMAKE) -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
+	cd $< && $(HOSTVARS) $(CMAKE) $(SPATIALAUDIO_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/srt/rules.mak

@@ -29,8 +29,9 @@ 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: srt toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) \
-		-DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) $(SRT_CONF)
 	+$(CMAKEBUILD) $< --target install
 	touch $@

contrib/src/x265/rules.mak

@@ -35,9 +35,11 @@ ifndef HAVE_WIN32
 endif
 	$(MOVE)
 
+X265_CONF := -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF
+
 .x265: x265 toolchain.cmake
 	$(REQUIRE_GPL)
-	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF
+	cd $</source && $(HOSTVARS_PIC) $(CMAKE) $(X265_CONF)
 	+$(CMAKEBUILD) $</source --target install
 	sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
 	touch $@