diff options
| author | Bradley Sepos <[email protected]> | 2018-06-10 22:04:02 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:34 -0400 |
| commit | a426369977502e3b3245d8341b71593c368bc2e3 (patch) | |
| tree | c99f64867d5d8d450ba827a043a7b6b88adeafbc /contrib | |
| parent | 517ed0030f340d3b8f3f2aee1cbac23f5e9da30a (diff) | |
contrib: make: Remove CMake contrib.
Still required, only HandBrake will not build it anymore.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cmake/module.defs | 15 | ||||
| -rw-r--r-- | contrib/cmake/module.rules | 2 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 2 | ||||
| -rw-r--r-- | contrib/x265_10bit/module.defs | 2 | ||||
| -rw-r--r-- | contrib/x265_12bit/module.defs | 2 | ||||
| -rw-r--r-- | contrib/x265_8bit/module.defs | 2 |
6 files changed, 4 insertions, 21 deletions
diff --git a/contrib/cmake/module.defs b/contrib/cmake/module.defs deleted file mode 100644 index 15c822e9d..000000000 --- a/contrib/cmake/module.defs +++ /dev/null @@ -1,15 +0,0 @@ -$(eval $(call import.MODULE.defs,CMAKE,cmake)) -$(eval $(call import.CONTRIB.defs,CMAKE)) - -CMAKE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/cmake-3.9.6.tar.gz -CMAKE.FETCH.url += https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz -CMAKE.FETCH.sha256 = 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218 - -CMAKE.CONFIGURE.deps = -CMAKE.CONFIGURE.shared = -CMAKE.CONFIGURE.static = -CMAKE.CONFIGURE.extra = --no-qt-gui - -ifeq (darwin,$(BUILD.system)) - CMAKE.CONFIGURE.extra += --system-curl -endif diff --git a/contrib/cmake/module.rules b/contrib/cmake/module.rules deleted file mode 100644 index fb046bdb9..000000000 --- a/contrib/cmake/module.rules +++ /dev/null @@ -1,2 +0,0 @@ -$(eval $(call import.MODULE.rules,CMAKE)) -$(eval $(call import.CONTRIB.rules,CMAKE)) diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index 1d6ff38a3..e3a82c42c 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -1,4 +1,4 @@ -__deps__ := CMAKE X265_8 X265_10 X265_12 +__deps__ := X265_8 X265_10 X265_12 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__))) $(eval $(call import.CONTRIB.defs,X265)) diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs index 756dfc1d9..d5088c520 100644 --- a/contrib/x265_10bit/module.defs +++ b/contrib/x265_10bit/module.defs @@ -1,4 +1,4 @@ -__deps__ := CMAKE X265_8 +__deps__ := X265_8 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265)) $(eval $(call import.CONTRIB.defs,X265_10)) diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs index d773aa6ac..3642c0920 100644 --- a/contrib/x265_12bit/module.defs +++ b/contrib/x265_12bit/module.defs @@ -1,4 +1,4 @@ -__deps__ := CMAKE X265_8 +__deps__ := X265_8 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265)) $(eval $(call import.CONTRIB.defs,X265_12)) diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs index 92f0a7ff7..4d42a6bcb 100644 --- a/contrib/x265_8bit/module.defs +++ b/contrib/x265_8bit/module.defs @@ -1,4 +1,4 @@ -__deps__ := CMAKE +__deps__ := $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265)) $(eval $(call import.CONTRIB.defs,X265_8)) |