diff --git a/Makefile.in b/Makefile.in index 0a0f4cd0..58ccf26b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,7 +359,7 @@ $(DIST_FONTS): fonts ALL_TARGETS += dist GOAL_TARGETS += dist -dist_prefix: wine gst_good gst_libav +dist_prefix: wine gst_good gst_libav gst_plugins_rs find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+' find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+' rm -rf $(abspath $(DIST_PREFIX)) @@ -545,6 +545,30 @@ $(eval $(call rules-meson,gst_libav,32)) $(eval $(call rules-meson,gst_libav,64)) +## +## gst-plugins-rs +## + +GST_PLUGINS_RS_CARGO_ARGS = \ + -p gst-plugin-dav1d + +GST_PLUGINS_RS_DEPENDS = gst_orc gstreamer gst_base dav1d + +$(eval $(call rules-source,gst_plugins_rs,$(SRCDIR)/gst-plugins-rs)) +$(eval $(call rules-cargo,gst_plugins_rs,32)) +$(eval $(call rules-cargo,gst_plugins_rs,64)) + +$(OBJ)/.gst_plugins_rs-post-build64: + mkdir -p $(GST_PLUGINS_RS_DST64)/lib64/gstreamer-1.0/ + cp -a $(GST_PLUGINS_RS_OBJ64)/x86_64-unknown-linux-gnu/release/libgstrsdav1d.so $(GST_PLUGINS_RS_DST64)/lib64/gstreamer-1.0/ + touch $@ + +$(OBJ)/.gst_plugins_rs-post-build32: + mkdir -p $(GST_PLUGINS_RS_DST32)/lib/gstreamer-1.0/ + cp -a $(GST_PLUGINS_RS_OBJ32)/i686-unknown-linux-gnu/release/libgstrsdav1d.so $(GST_PLUGINS_RS_DST32)/lib/gstreamer-1.0/ + touch $@ + + ## ## Vulkan-Headers ## diff --git a/dist.LICENSE b/dist.LICENSE index dcb150e2..ad7aea9c 100644 --- a/dist.LICENSE +++ b/dist.LICENSE @@ -257,6 +257,7 @@ Visit orc at This software contains the following Rust libraries under the MIT license: gstreamer-rs + gst-plugins-rs array-init Copyright (c) 2017-2020 The array-init developers @@ -275,6 +276,9 @@ This software contains the following Rust libraries under the MIT license: crc32fast Copyright (c) 2018 Sam Rijs, Alex Crichton and contributors + dav1d-rs + Copyright (c) 2018 Luca Barbato + futures-channel futures-core futures-executor diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk index 2dbfe75f..b2af34ca 100644 --- a/make/rules-cargo.mk +++ b/make/rules-cargo.mk @@ -14,7 +14,13 @@ $$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-build$(3): @echo ":: building $(3)bit $(1)..." >&2 cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \ - cargo build $$(filter -j%,$$(MAKEFLAGS)) --target "$$(CARGO_TARGET_$(3))" --target-dir $$($(2)_OBJ$(3)) $$(CARGO_BUILD_ARG) + cargo build \ + $$(filter -j%,$$(MAKEFLAGS)) \ + --target "$$(CARGO_TARGET_$(3))" \ + --target-dir $$($(2)_OBJ$(3)) \ + $$(CARGO_BUILD_ARG) \ + $$($(2)_CARGO_ARGS) \ + $$($(2)_CARGO_ARGS$(3)) touch $$@ endif endef