Browse Source

contrib: allow building with CMake 4.x

Support for versions older than 3.5 has been dropped.
The minimum version can be forced in most cases via a configuration flag.
We require 3.28 for proper tvOS support anyway.

This will be needed until these contribs are updated. Although some are not
maintained anymore.
pull/188/head
Steve Lhomme 6 months ago
parent
commit
cb76be2e2f
  1. 2
      contrib/src/ebml/rules.mak
  2. 2
      contrib/src/glew/rules.mak
  3. 3
      contrib/src/libebur128/rules.mak
  4. 2
      contrib/src/matroska/rules.mak
  5. 2
      contrib/src/mpcdec/rules.mak
  6. 3
      contrib/src/mysofa/rules.mak
  7. 3
      contrib/src/projectM/rules.mak
  8. 3
      contrib/src/spatialaudio/rules.mak
  9. 3
      contrib/src/srt/rules.mak
  10. 2
      contrib/src/vorbis/rules.mak

2
contrib/src/ebml/rules.mak

@ -21,7 +21,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
.ebml: ebml toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE)
$(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@

2
contrib/src/glew/rules.mak

@ -18,7 +18,7 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
.glew: glew toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake
$(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@

3
contrib/src/libebur128/rules.mak

@ -18,7 +18,8 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
$(call pkg_static,"./ebur128/libebur128.pc.cmake")
$(MOVE)
LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE
LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
.libebur128: libebur128 toolchain.cmake
$(CMAKECLEAN)

2
contrib/src/matroska/rules.mak

@ -23,7 +23,7 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
.matroska: matroska toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE)
$(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@

2
contrib/src/mpcdec/rules.mak

@ -30,7 +30,7 @@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
.mpcdec: musepack toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE)
$(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@

3
contrib/src/mysofa/rules.mak

@ -23,7 +23,8 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
$(UNPACK)
$(MOVE)
MYSOFA_CONF := -DBUILD_TESTS=OFF
MYSOFA_CONF := -DBUILD_TESTS=OFF \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
.mysofa: mysofa toolchain.cmake
$(CMAKECLEAN)

3
contrib/src/projectM/rules.mak

@ -40,7 +40,8 @@ PROJECTM_CONF := \
-DCMAKE_CXX_STANDARD=98 \
-DDISABLE_NATIVE_PRESETS:BOOL=ON \
-DUSE_FTGL:BOOL=OFF \
-DBUILD_PROJECTM_STATIC:BOOL=ON
-DBUILD_PROJECTM_STATIC:BOOL=ON \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
.projectM: projectM toolchain.cmake
$(CMAKECLEAN)

3
contrib/src/spatialaudio/rules.mak

@ -20,7 +20,8 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
$(UNPACK)
$(MOVE)
SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
.spatialaudio: spatialaudio toolchain.cmake
$(CMAKECLEAN)

3
contrib/src/srt/rules.mak

@ -39,7 +39,8 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
$(call pkg_static,"scripts/srt.pc.in")
$(MOVE)
SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF -DENABLE_APPS=OFF
SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF -DENABLE_APPS=OFF \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
.srt: srt toolchain.cmake
$(CMAKECLEAN)

2
contrib/src/vorbis/rules.mak

@ -37,7 +37,7 @@ DEPS_vorbis = ogg $(DEPS_ogg)
.vorbis: libvorbis toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE)
$(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@

Loading…
Cancel
Save