summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ffmpeg/module.defs18
-rw-r--r--contrib/fribidi/module.defs4
-rw-r--r--contrib/harfbuzz/module.defs4
-rw-r--r--contrib/lame/module.defs2
-rw-r--r--contrib/libass/module.defs6
-rw-r--r--contrib/libbluray/module.defs4
-rw-r--r--contrib/libiconv/module.defs6
-rw-r--r--contrib/libmfx/module.defs2
-rw-r--r--contrib/libsamplerate/module.defs2
-rw-r--r--contrib/libtheora/module.defs2
-rw-r--r--contrib/libvpx/module.defs16
-rw-r--r--contrib/libxml2/module.defs2
-rw-r--r--contrib/x264/module.defs4
-rw-r--r--contrib/x265/module.defs2
-rw-r--r--contrib/x265_10bit/module.defs6
-rw-r--r--contrib/x265_12bit/module.defs6
-rw-r--r--contrib/x265_8bit/module.defs6
-rw-r--r--contrib/zlib/module.defs2
18 files changed, 47 insertions, 47 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 46ca1d715..abeb88df5 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -58,7 +58,7 @@ FFMPEG.CONFIGURE.extra = \
--cc="$(FFMPEG.GCC.gcc)" \
--extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
-ifeq (1-linux,$(FEATURE.qsv)-$(BUILD.system))
+ifeq (1-linux,$(FEATURE.qsv)-$(HOST.system))
FFMPEG.CONFIGURE.extra += --enable-vaapi
FFMPEG.CONFIGURE.extra += --disable-xlib
else
@@ -80,24 +80,24 @@ FFMPEG.CONFIGURE.extra += \
--enable-muxer=psp \
--enable-muxer=ipod
-ifeq (darwin,$(BUILD.system))
+ifeq (darwin,$(HOST.system))
FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage \
--enable-encoder=h264_videotoolbox \
--enable-encoder=hevc_videotoolbox
- ifeq (x86_64,$(BUILD.arch))
+ ifeq (x86_64,$(HOST.arch))
FFMPEG.CONFIGURE.extra += --arch=x86_64
endif
endif
## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag
-ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
+ifeq (0-cygwin,$(HOST.cross)-$(HOST.system))
FFMPEG.GCC.args.extra += -fno-common
-else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+else ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
FFMPEG.CONFIGURE.extra += \
--target-os=mingw32 \
- --arch=$(BUILD.machine) \
- --cross-prefix=$(BUILD.cross.prefix) \
+ --arch=$(HOST.machine) \
+ --cross-prefix=$(HOST.cross.prefix) \
--pkg-config=$(PKGCONFIG.exe)
FFMPEG.GCC.args.extra += -fno-common
endif
@@ -137,11 +137,11 @@ endif
FFMPEG.BUILD.extra = V=1
## For POSIX.1-2001
-ifeq (solaris,$(BUILD.system))
+ifeq (solaris,$(HOST.system))
FFMPEG.CONFIGURE.extra += --extra-libs=/usr/lib/values-xpg6.o
endif
## MPC8 Doesn't compile on SPARC
-ifeq (solaris-sparc,$(BUILD.system)-$(BUILD.machine))
+ifeq (solaris-sparc,$(HOST.system)-$(HOST.machine))
FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
endif
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index ecc59c6a3..2e29553a8 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -8,8 +8,8 @@ FRIBIDI.FETCH.basename = fribidi-1.0.5.tar.gz
FRIBIDI.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
FRIBIDI.CONFIGURE.extra = --with-glib=no
-else ifeq (darwin,$(BUILD.system))
+else ifeq (darwin,$(HOST.system))
FRIBIDI.CONFIGURE.extra = --with-glib=no
endif
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index 6fb3ffcfe..191d4e24f 100644
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -15,11 +15,11 @@ HARFBUZZ.CONFIGURE.extra = \
HARFBUZZ.CONFIGURE.extra += --with-fontconfig=no
-ifeq ($(BUILD.system),darwin)
+ifeq ($(HOST.system),darwin)
HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-glib=no
endif
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
HARFBUZZ.CONFIGURE.extra += --with-directwrite=no --with-glib=no \
--with-gobject=no --with-cairo=no --with-icu=no --with-graphite2=no \
--with-uniscribe=no
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index 05c8bd013..a874fb3a2 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -10,6 +10,6 @@ ifneq (none,$(FFMPEG.GCC.g))
LAME.CONFIGURE.extra += --enable-debug
endif
-ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+ifeq (1-msys,$(HOST.cross)-$(BUILD.system))
LAME.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
endif
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 5ab5f9461..139c6711e 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -1,6 +1,6 @@
__deps__ := FREETYPE FRIBIDI HARFBUZZ
-ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
+ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
__deps__ += FONTCONFIG
endif
@@ -17,7 +17,7 @@ LIBASS.CONFIGURE.extra = \
FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
+ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
# Tell configure where to find our version of fontconfig
LIBASS.CONFIGURE.extra += \
--enable-fontconfig \
@@ -27,7 +27,7 @@ else
LIBASS.CONFIGURE.extra += --disable-fontconfig
endif
-ifneq ($(BUILD.system),linux)
+ifneq ($(HOST.system),linux)
LIBASS.CONFIGURE.extra += \
FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \
FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index fcf31d4ee..1dd964ca6 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -11,11 +11,11 @@ endif
LIBBLURAY.CONFIGURE.extra += --disable-doxygen-doc --disable-examples --disable-bdjava-jar --without-freetype --without-fontconfig
-ifeq (mingw,$(BUILD.system))
+ifeq (mingw,$(HOST.system))
LIBBLURAY.GCC.D += MINGW_HAS_SECURE_API=1
endif
-ifeq (freebsd,$(BUILD.system))
+ifeq (freebsd,$(HOST.system))
LIBBLURAY.GCC.D += _XOPEN_SOURCE=700
endif
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 9c645cc38..be20e6849 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -5,13 +5,13 @@ LIBICONV.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libicon
LIBICONV.FETCH.url += https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz
LIBICONV.FETCH.sha256 = ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
-ifeq (1,$(BUILD.cross))
+ifeq (1,$(HOST.cross))
# this contrib will not build under MinGW with -std=gnu99
- ifeq (mingw,$(BUILD.system))
+ ifeq (mingw,$(HOST.system))
LIBICONV.GCC.args.c_std = -std=gnu89
endif
- ifeq (msys,$(HOST.system))
+ ifeq (msys,$(BUILD.system))
LIBICONV.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
endif
endif
diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs
index b999aeeb0..2aec1a7af 100644
--- a/contrib/libmfx/module.defs
+++ b/contrib/libmfx/module.defs
@@ -6,7 +6,7 @@ LIBMFX.FETCH.sha256 = 9dc8bcb67f5df3dfac29a2777c1bdc9ac2bb6b0e68169af4059089f517
LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
-ifeq (1,$(BUILD.cross))
+ifneq (linux,$(HOST.system))
LIBMFX.CONFIGURE.extra = --without-libva_drm --without-libva_x11
endif
diff --git a/contrib/libsamplerate/module.defs b/contrib/libsamplerate/module.defs
index f079c66a3..f5d6ac01a 100644
--- a/contrib/libsamplerate/module.defs
+++ b/contrib/libsamplerate/module.defs
@@ -13,6 +13,6 @@ LIBSAMPLERATE.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure;
# Disable to avoid Carbon.h dependency on OSX
LIBSAMPLERATE.CONFIGURE.extra = --disable-sndfile
-ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+ifeq (1-msys,$(HOST.cross)-$(BUILD.system))
LIBSAMPLERATE.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
endif
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index 5e4fb57c3..2cd163139 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -15,6 +15,6 @@ LIBTHEORA.CONFIGURE.extra = \
--with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \
HAVE_PKG_CONFIG=no
-ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+ifeq (1-msys,$(HOST.cross)-$(BUILD.system))
LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
endif
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index d10b0d91b..f4f869f4b 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -17,29 +17,29 @@ LIBVPX.CONFIGURE.extra = \
--disable-docs \
--disable-unit-tests
-ifeq (1,$(BUILD.cross))
- LIBVPX.CONFIGURE.env.CROSS = CROSS="$(BUILD.spec)-"
+ifeq (1,$(HOST.cross))
+ LIBVPX.CONFIGURE.env.CROSS = CROSS="$(HOST.spec)-"
LIBVPX.CONFIGURE.args.build =
LIBVPX.CONFIGURE.extra += --enable-static-msvcrt
- ifeq (i686,$(BUILD.machine))
+ ifeq (i686,$(HOST.machine))
LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc
- else ifeq (x86_64,$(BUILD.machine))
+ else ifeq (x86_64,$(HOST.machine))
LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc
endif
endif
-ifeq (linux,$(BUILD.system))
- ifeq (x86_64,$(BUILD.machine))
+ifeq (linux,$(HOST.system))
+ ifeq (x86_64,$(HOST.machine))
LIBVPX.CONFIGURE.extra += --enable-pic
endif
endif
-ifeq (0-darwin,$(BUILD.cross)-$(BUILD.system))
+ifeq (0-darwin,$(HOST.cross)-$(BUILD.system))
ifeq (x86_64,$(BUILD.machine))
LIBVPX.CONFIGURE.extra += --target=x86_64-darwin14-gcc
endif
endif
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
LIBVPX.CONFIGURE.extra += --disable-avx512
endif
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index d6b4f2898..4e2893384 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -13,6 +13,6 @@ LIBXML2.CONFIGURE.extra = --without-lzma
# in the MinGW environment.
LIBXML2.CONFIGURE.extra += --without-python --without-threads
-ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+ifeq (1-msys,$(HOST.cross)-$(BUILD.system))
LIBXML2.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
endif
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index e40703315..f256c3313 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -12,9 +12,9 @@ X264.CONFIGURE.shared =
X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli
-ifeq (1,$(BUILD.cross))
+ifeq (1,$(HOST.cross))
X264.CONFIGURE.build =
- X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)-
+ X264.CONFIGURE.extra += --cross-prefix=$(HOST.spec)-
X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"
endif
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index f3cc1e3a1..ac21f799b 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -42,7 +42,7 @@ X265.SOURCE.libs = \
$(X265.BUILD.dir)/10bit/libx265_main10.a \
$(X265.BUILD.dir)/12bit/libx265_main12.a
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
X265.O.ext = .obj
else
X265.O.ext = .o
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 8b950709a..f6698607d 100644
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -29,8 +29,8 @@ else
X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release
endif
-ifeq (1,$(BUILD.cross))
- ifeq (mingw,$(BUILD.system))
+ifeq (1,$(HOST.cross))
+ ifeq (mingw,$(HOST.system))
X265_10.CONFIGURE.extra += -DWIN32=ON
X265_10.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
X265_10.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_10.GCC.gcc)
@@ -39,7 +39,7 @@ ifeq (1,$(BUILD.cross))
X265_10.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_10.GCC.gxx)
X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
X265_10.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
- X265_10.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
+ X265_10.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
endif
X265_10.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)"
X265_10.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.build)"
diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index b8827a93a..b7fcfff70 100644
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -29,8 +29,8 @@ else
X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release
endif
-ifeq (1,$(BUILD.cross))
- ifeq (mingw,$(BUILD.system))
+ifeq (1,$(HOST.cross))
+ ifeq (mingw,$(HOST.system))
X265_12.CONFIGURE.extra += -DWIN32=ON
X265_12.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
X265_12.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_12.GCC.gcc)
@@ -39,7 +39,7 @@ ifeq (1,$(BUILD.cross))
X265_12.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_12.GCC.gxx)
X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
X265_12.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
- X265_12.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
+ X265_12.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
endif
X265_12.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_12.CONFIGURE.host)"
X265_12.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.build)"
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index 4a4411517..88caa4453 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -26,8 +26,8 @@ else
X265_8.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release
endif
-ifeq (1,$(BUILD.cross))
- ifeq (mingw,$(BUILD.system))
+ifeq (1,$(HOST.cross))
+ ifeq (mingw,$(HOST.system))
X265_8.CONFIGURE.extra += -DWIN32=ON
X265_8.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
X265_8.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_8.GCC.gcc)
@@ -36,7 +36,7 @@ ifeq (1,$(BUILD.cross))
X265_8.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_8.GCC.gxx)
X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
X265_8.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
- X265_8.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
+ X265_8.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
endif
X265_8.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_8.CONFIGURE.host)"
X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)"
diff --git a/contrib/zlib/module.defs b/contrib/zlib/module.defs
index f973bcfec..6f19b8130 100644
--- a/contrib/zlib/module.defs
+++ b/contrib/zlib/module.defs
@@ -7,7 +7,7 @@ ZLIB.FETCH.sha256 = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197
ZLIB.CONFIGURE.args = !sete @dir !env !exe @prefix !extra
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
ZLIB.CONFIGURE.env.AR = AR="$(AR.exe)"
ZLIB.CONFIGURE.env.ARFLAGS = ARFLAGS="rc"
ZLIB.CONFIGURE.env.RANLIB = RANLIB="$(RANLIB.exe)"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 20:23:08 +0000