summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/autoconf/module.defs6
-rw-r--r--contrib/autoconf/module.rules2
-rw-r--r--contrib/automake/module.defs6
-rw-r--r--contrib/automake/module.rules2
-rw-r--r--contrib/ffmpeg/module.defs8
-rw-r--r--contrib/libbluray/module.defs7
-rw-r--r--contrib/libdvdnav/module.defs7
-rw-r--r--contrib/libdvdread/module.defs7
-rw-r--r--contrib/libgnurx/module.defs5
-rw-r--r--contrib/libtool/module.defs10
-rw-r--r--contrib/libtool/module.rules2
-rw-r--r--contrib/m4/module.defs6
-rw-r--r--contrib/m4/module.rules2
-rw-r--r--contrib/pkgconfig/module.defs12
-rw-r--r--contrib/pkgconfig/module.rules2
-rw-r--r--make/configure.py48
-rw-r--r--make/include/contrib.defs2
-rw-r--r--make/include/main.defs18
18 files changed, 22 insertions, 130 deletions
diff --git a/contrib/autoconf/module.defs b/contrib/autoconf/module.defs
deleted file mode 100644
index 9a68df4e8..000000000
--- a/contrib/autoconf/module.defs
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call import.MODULE.defs,AUTOCONF,autoconf,M4))
-$(eval $(call import.CONTRIB.defs,AUTOCONF))
-
-AUTOCONF.FETCH.url = https://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.gz
-AUTOCONF.FETCH.url += https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
-AUTOCONF.FETCH.sha256 = 954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969
diff --git a/contrib/autoconf/module.rules b/contrib/autoconf/module.rules
deleted file mode 100644
index 3132ae5a0..000000000
--- a/contrib/autoconf/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,AUTOCONF))
-$(eval $(call import.CONTRIB.rules,AUTOCONF))
diff --git a/contrib/automake/module.defs b/contrib/automake/module.defs
deleted file mode 100644
index 71e133cea..000000000
--- a/contrib/automake/module.defs
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call import.MODULE.defs,AUTOMAKE,automake,AUTOCONF))
-$(eval $(call import.CONTRIB.defs,AUTOMAKE))
-
-AUTOMAKE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/automake-1.15.tar.gz
-AUTOMAKE.FETCH.url += https://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
-AUTOMAKE.FETCH.sha256 = 7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924
diff --git a/contrib/automake/module.rules b/contrib/automake/module.rules
deleted file mode 100644
index a33554e9c..000000000
--- a/contrib/automake/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,AUTOMAKE))
-$(eval $(call import.CONTRIB.rules,AUTOMAKE))
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 690f2c1e7..47a67aa99 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -81,13 +81,9 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
FFMPEG.CONFIGURE.extra += \
--target-os=mingw32 \
--arch=$(BUILD.machine) \
- --cross-prefix=$(BUILD.cross.prefix)
+ --cross-prefix=$(BUILD.cross.prefix) \
+ --pkg-config=$(PKGCONFIG.exe)
FFMPEG.GCC.args.extra += -fno-common
- ifeq (1,$(FEATURE.local_pkgconfig))
- FFMPEG.CONFIGURE.extra += --pkg-config="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/$(PKGCONFIG.exe))"
- else
- FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe)
- endif
endif
ifneq (none,$(FFMPEG.GCC.g))
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 3af40bdbf..62580fa5e 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
+$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,LIBXML2 FREETYPE))
$(eval $(call import.CONTRIB.defs,LIBBLURAY))
LIBBLURAY.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libbluray-1.0.2.tar.bz2
@@ -11,11 +11,6 @@ endif
LIBBLURAY.CONFIGURE.extra += --disable-doxygen-doc --disable-examples --disable-bdjava-jar --without-freetype --without-fontconfig
-ifeq (1,$(FEATURE.local_pkgconfig))
- LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
- LIBBLURAY.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif
-
ifeq (mingw,$(BUILD.system))
LIBBLURAY.GCC.D += MINGW_HAS_SECURE_API=1
endif
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index d5fc399b7..cb6e44982 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
+$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
$(eval $(call import.CONTRIB.defs,LIBDVDNAV))
LIBDVDNAV.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.3.tar.bz2
@@ -8,8 +8,3 @@ LIBDVDNAV.FETCH.sha256 = 5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5
ifneq (max,$(LIBDVDNAV.GCC.g))
LIBDVDNAV.GCC.D += NDEBUG
endif
-
-ifeq (1,$(FEATURE.local_pkgconfig))
- LIBDVDNAV.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
- LIBDVDNAV.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index f226365cf..06454e24a 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread,PKGCONFIG))
+$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread))
$(eval $(call import.CONTRIB.defs,LIBDVDREAD))
LIBDVDREAD.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.3.tar.bz2
@@ -8,8 +8,3 @@ LIBDVDREAD.FETCH.sha256 = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb286
ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
LIBDVDREAD.CONFIGURE.extra = --enable-dlfcn
endif
-
-ifeq (1,$(FEATURE.local_pkgconfig))
- LIBDVDREAD.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
- LIBDVDREAD.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif
diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs
index 2db2d5ee1..65f23baa3 100644
--- a/contrib/libgnurx/module.defs
+++ b/contrib/libgnurx/module.defs
@@ -22,8 +22,3 @@ define LIBGNURX.UNINSTALL
$(RM.exe) -f $(CONTRIB.build/)include/regex.h
$(RM.exe) -f $(LIBGNURX.INSTALL.target)
endef
-
-ifeq (1,$(FEATURE.local_pkgconfig))
- LIBGNURX.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
- LIBGNURX.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif
diff --git a/contrib/libtool/module.defs b/contrib/libtool/module.defs
deleted file mode 100644
index 4222f5a0e..000000000
--- a/contrib/libtool/module.defs
+++ /dev/null
@@ -1,10 +0,0 @@
-$(eval $(call import.MODULE.defs,LIBTOOL,libtool,AUTOCONF AUTOMAKE PKGCONFIG))
-$(eval $(call import.CONTRIB.defs,LIBTOOL))
-
-LIBTOOL.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.gz
-LIBTOOL.FETCH.url += https://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
-LIBTOOL.FETCH.sha256 = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
-
-# TODO: libtool >= 2.4.6
-#LIBTOOL.FETCH.url = https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
-#LIBTOOL.FETCH.sha256 = e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
diff --git a/contrib/libtool/module.rules b/contrib/libtool/module.rules
deleted file mode 100644
index 875b4594e..000000000
--- a/contrib/libtool/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,LIBTOOL))
-$(eval $(call import.CONTRIB.rules,LIBTOOL))
diff --git a/contrib/m4/module.defs b/contrib/m4/module.defs
deleted file mode 100644
index 996153ca1..000000000
--- a/contrib/m4/module.defs
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call import.MODULE.defs,M4,m4))
-$(eval $(call import.CONTRIB.defs,M4))
-
-M4.FETCH.url = https://download.handbrake.fr/handbrake/contrib/m4-1.4.17.tar.bz2
-M4.FETCH.url += https://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.bz2
-M4.FETCH.sha256 = 8e4e1f963932136ed45dcd5afb0c6e237e96a6fcdcd2a2fa6755040859500d70
diff --git a/contrib/m4/module.rules b/contrib/m4/module.rules
deleted file mode 100644
index 69c279563..000000000
--- a/contrib/m4/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,M4))
-$(eval $(call import.CONTRIB.rules,M4))
diff --git a/contrib/pkgconfig/module.defs b/contrib/pkgconfig/module.defs
deleted file mode 100644
index e73c6549b..000000000
--- a/contrib/pkgconfig/module.defs
+++ /dev/null
@@ -1,12 +0,0 @@
-$(eval $(call import.MODULE.defs,PKGCONFIG,pkgconfig))
-$(eval $(call import.CONTRIB.defs,PKGCONFIG))
-
-PKGCONFIG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.gz
-PKGCONFIG.FETCH.url += https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-PKGCONFIG.FETCH.sha256 = 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845
-
-# TODO: pkg-config >= 0.29 (test this extensively)
-#PKGCONFIG.FETCH.url = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
-#PKGCONFIG.FETCH.sha256 = c8507705d2a10c67f385d66ca2aae31e81770cc0734b4191eb8c489e864a006b
-
-PKGCONFIG.CONFIGURE.extra = --with-internal-glib --disable-host-tool
diff --git a/contrib/pkgconfig/module.rules b/contrib/pkgconfig/module.rules
deleted file mode 100644
index 3d6747c89..000000000
--- a/contrib/pkgconfig/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,PKGCONFIG))
-$(eval $(call import.CONTRIB.rules,PKGCONFIG))
diff --git a/make/configure.py b/make/configure.py
index 2c92e1028..0d9aec183 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1344,12 +1344,8 @@ def createCLI():
grp.add_option( '--minver', default=None, action='store', metavar='VER',
help=h )
- h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h )
h = IfHost( 'Build and use local cmake', '*-*-*', none=optparse.SUPPRESS_HELP ).value
grp.add_option( '--enable-local-cmake', default=False, action='store_true', help=h )
- h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h )
cli.add_option_group( grp )
## add Xcode options
@@ -1513,28 +1509,28 @@ try:
## create tools in a scope
class Tools:
- ar = ToolProbe( 'AR.exe', 'ar' )
- cp = ToolProbe( 'CP.exe', 'cp' )
+ ar = ToolProbe( 'AR.exe', 'ar', abort=True )
+ cp = ToolProbe( 'CP.exe', 'cp', abort=True )
gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ))
if host.match( '*-*-darwin*' ):
- gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )
+ gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake', abort=True )
else:
- gmake = ToolProbe( 'GMAKE.exe', 'gmake', 'make' )
-
- m4 = ToolProbe( 'M4.exe', 'gm4', 'm4' )
- mkdir = ToolProbe( 'MKDIR.exe', 'mkdir' )
- patch = ToolProbe( 'PATCH.exe', 'gpatch', 'patch' )
- rm = ToolProbe( 'RM.exe', 'rm' )
- ranlib = ToolProbe( 'RANLIB.exe', 'ranlib' )
- strip = ToolProbe( 'STRIP.exe', 'strip' )
- tar = ToolProbe( 'TAR.exe', 'gtar', 'tar' )
+ gmake = ToolProbe( 'GMAKE.exe', 'gmake', 'make', abort=True )
+
+ m4 = ToolProbe( 'M4.exe', 'gm4', 'm4', abort=True )
+ mkdir = ToolProbe( 'MKDIR.exe', 'mkdir', abort=True )
+ patch = ToolProbe( 'PATCH.exe', 'gpatch', 'patch', abort=True )
+ rm = ToolProbe( 'RM.exe', 'rm', abort=True )
+ ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', abort=True )
+ strip = ToolProbe( 'STRIP.exe', 'strip', abort=True )
+ tar = ToolProbe( 'TAR.exe', 'gtar', 'tar', abort=True )
nasm = ToolProbe( 'NASM.exe', 'nasm', abort=False, minversion=[2,13,0] )
- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
- automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
+ autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=True )
+ automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=True )
cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=False )
- libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=False )
- pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=False )
+ libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=True )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=True )
xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
lipo = ToolProbe( 'LIPO.exe', 'lipo', abort=False )
@@ -1596,21 +1592,11 @@ try:
elif Tools.nasm.version.inadequate():
raise AbortError( 'error: minimum required nasm version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.nasm.version.minversion]),Tools.nasm.pathname,Tools.nasm.version.svers) )
- ## enable local autotools when any of { autoconf, automake, libtool } probe fails
- if not options.enable_local_autotools and (Tools.autoconf.fail or Tools.automake.fail or Tools.libtool.fail):
- stdout.write( 'note: enabling local autotools\n' )
- options.enable_local_autotools = True
-
## enable local cmake when cmake probe fails
if not options.enable_local_cmake and (Tools.cmake.fail):
stdout.write( 'note: enabling local cmake\n' )
options.enable_local_cmake = True
- ## enable local pkg-config when probe fails
- if not options.enable_local_pkgconfig and Tools.pkgconfig.fail:
- stdout.write( 'note: enabling local pkgconfig\n' )
- options.enable_local_pkgconfig = True
-
if build.system == 'mingw':
dlfcn_test = """
#include <dlfcn.h>
@@ -1855,9 +1841,7 @@ int main()
doc.add( 'PREFIX/', cfg.prefix_final + os.sep )
doc.addBlank()
- doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools ))
doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake ))
- doc.add( 'FEATURE.local_pkgconfig', int( options.enable_local_pkgconfig ))
doc.add( 'FEATURE.asm', 'disabled' )
doc.add( 'FEATURE.flatpak', int( options.flatpak ))
doc.add( 'FEATURE.gtk', int( not options.disable_gtk ))
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 3d2aa9074..062135f7b 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -26,7 +26,7 @@ define import.CONTRIB.defs
$(1).src/ = $$(SRC/)contrib/$($(1).dir)/
$(1).build/ = $$(CONTRIB.build/)$($(1).dir)/
## add prerequisites and autotool modules for all contribs
- $(1).deps = $$(foreach n,$($(1).prerequisites) $(if $(filter $1,$(AUTOTOOL_MODULES)),,$(AUTOTOOL_MODULES)),$$($$n.INSTALL.target))
+ $(1).deps = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target))
$(1).build_dir =
##
diff --git a/make/include/main.defs b/make/include/main.defs
index 7db389b52..3ac75c8de 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -7,30 +7,12 @@ include $(SRC/)make/include/tool.defs
###############################################################################
-ifeq (1,$(FEATURE.local_pkgconfig))
- MODULES += contrib/pkgconfig
-endif
-
HB_TOOLS_PATH =
ifeq (1,$(FEATURE.local_cmake))
MODULES += contrib/cmake
HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
endif
-ifeq (1,$(FEATURE.local_autotools))
- MODULES += contrib/autoconf
- MODULES += contrib/automake
- MODULES += contrib/libtool
- MODULES += contrib/m4
-ifneq (1,$(FEATURE.local_pkgconfig))
- MODULES += contrib/pkgconfig
-endif
- AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 PKGCONFIG
- HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
-else
- AUTOTOOL_MODULES =
-endif
-
ifneq (,$(HB_TOOLS_PATH))
PATH := $(HB_TOOLS_PATH):$(PATH)
endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 18:22:13 +0000