[vlc-devel] [PATCH v2 1/3] contrib: add vulkan-headers rules

[Alexandre Janniaux]

Hi,

On Mon, Nov 09, 2020 at 08:07:03AM +0100, Steve Lhomme wrote:
> On 2020-11-08 16:37, Alexandre Janniaux wrote:
> > ---
> >   contrib/src/vulkan-headers/SHA512SUMS |  1 +
> >   contrib/src/vulkan-headers/rules.mak  | 20 ++++++++++++++++++++
> >   2 files changed, 21 insertions(+)
> >   create mode 100644 contrib/src/vulkan-headers/SHA512SUMS
> >   create mode 100644 contrib/src/vulkan-headers/rules.mak
> >
> > diff --git a/contrib/src/vulkan-headers/SHA512SUMS b/contrib/src/vulkan-headers/SHA512SUMS
> > new file mode 100644
> > index 0000000000..34574ab872
> > --- /dev/null
> > +++ b/contrib/src/vulkan-headers/SHA512SUMS
> > @@ -0,0 +1 @@
> > +7472ec31fe74bc3a98303f668eb0c88bf4e4a93b1e3bcf4df2b20fe731cc2efd754d8b64e6507d8ee470841ee575c3092b2b20c4325a44e2e5cd830b7c7dc8ab  Vulkan-Headers-1.1.127.tar.gz
> > diff --git a/contrib/src/vulkan-headers/rules.mak b/contrib/src/vulkan-headers/rules.mak
> > new file mode 100644
> > index 0000000000..edf1402c51
> > --- /dev/null
> > +++ b/contrib/src/vulkan-headers/rules.mak
> > @@ -0,0 +1,20 @@
> > +VULKAN_HEADER_VERSION := 1.1.127
> > +VULKAN_HEADER_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/v$(VULKAN_HEADER_VERSION).tar.gz
> > +VULKAN_HEADER_ARCHIVE := Vulkan-Headers-$(VULKAN_HEADER_VERSION).tar.gz
> > +
> > +DEPS_vulkan-headers =
> > +
> > +$(TARBALLS)/$(VULKAN_HEADER_ARCHIVE):
> > +	$(call download_pkg,$(VULKAN_HEADER_URL),vulkan-headers)
> > +
> > +.sum-vulkan-headers: $(VULKAN_HEADER_ARCHIVE)
> > +
> > +vulkan-headers: $(VULKAN_HEADER_ARCHIVE) .sum-vulkan-headers
> > +	$(UNPACK)
> > +	$(MOVE)
> > +
> > +.vulkan-headers: vulkan-headers toolchain.cmake
> > +	cd $< && rm -rf ./build && mkdir -p build
> > +	cd $</build && $(HOSTVARS) $(CMAKE) .. -G Ninja
>
> Why force ninja here ? That's now what all other CMAKE contribs do. It
> should be done the same way Zhao Zhili patched Cmake usage: with $(CMAKE)
> and $(CMAKEBUILD)
>
> In that case selecting ninja instead of make should be done globally to
> contribs.

Indeed, that's a leftover of the previous version of this
patchset that I sent a while ago, but didn't merge because
it wasn't working with UWP platforms.

Fixed locally.

> > +	cd $< && cd build && ninja install
> > +	touch $@
> > --
> > 2.29.2
> >
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> >
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel