summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2018-05-29 12:50:22 -0700
committerJohn Stebbins <[email protected]>2018-05-29 14:29:29 -0700
commite52abd8813732080752eff10e4762e47ddca037c (patch)
tree9a5ee6381db0b113fe29d72ad12840135086a619 /contrib
parentf314b7673fcd0d95a30d10e5f1e5b32bebbad092 (diff)
contrib: add lzma support
lzma may be used by the ffmpeg tiff decoder which can be used in matroska files.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ffmpeg/module.defs3
-rw-r--r--contrib/xz/module.defs15
-rw-r--r--contrib/xz/module.rules2
3 files changed, 19 insertions, 1 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 173bc3459..d671dbe81 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX
+__deps__ := YASM FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
ifeq (1,$(FEATURE.qsv))
__deps__ += LIBMFX
endif
@@ -63,6 +63,7 @@ FFMPEG.CONFIGURE.extra = \
--disable-decoder=wmv3_crystalhd \
--disable-bzlib \
--disable-zlib \
+ --enable-lzma \
--cc="$(FFMPEG.GCC.gcc)" \
--extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
diff --git a/contrib/xz/module.defs b/contrib/xz/module.defs
new file mode 100644
index 000000000..eeeb286c4
--- /dev/null
+++ b/contrib/xz/module.defs
@@ -0,0 +1,15 @@
+$(eval $(call import.MODULE.defs,XZ,xz))
+$(eval $(call import.CONTRIB.defs,XZ))
+
+XZ.FETCH.url = https://download.handbrake.fr/handbrake/contrib/xz-5.2.4.tar.bz2
+XZ.FETCH.url += https://tukaani.org/xz/xz-5.2.4.tar.bz2
+XZ.FETCH.sha256 = 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf
+
+XZ.CONFIGURE.extra = \
+ --disable-xz \
+ --disable-xzdec \
+ --disable-lzmadec \
+ --disable-lzmainfo \
+ --disable-scripts \
+ --disable-doc
+
diff --git a/contrib/xz/module.rules b/contrib/xz/module.rules
new file mode 100644
index 000000000..af55a9033
--- /dev/null
+++ b/contrib/xz/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,XZ))
+$(eval $(call import.CONTRIB.rules,XZ))