[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: libplacebo: build without vulkan support on emscripten

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f39c18f2 by Steve Lhomme at 2022-10-13T10:55:21+00:00
contrib: libplacebo: build without vulkan support on emscripten

- - - - -
ea2066b2 by Steve Lhomme at 2022-10-13T10:55:21+00:00
extras: wasm: remove disable-harfbuzz

It's actually built since we build libass.

- - - - -
f6591c68 by Steve Lhomme at 2022-10-13T10:55:21+00:00
ci: update wasm Docker image with proper python packages

So libplacebo can be built.

- - - - -
4ddfb447 by Steve Lhomme at 2022-10-13T10:55:21+00:00
extras: wasm: enable libplacebo build

Requires a Docker image with this patch [1] to build

[1] https://code.videolan.org/videolan/docker-images/-/merge_requests/196

- - - - -


3 changed files:

- contrib/src/libplacebo/rules.mak
- extras/ci/gitlab-ci.yml
- extras/package/wasm-emscripten/build.sh


Changes:

=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -24,9 +24,11 @@ endif
 
 # We don't want vulkan on darwin for now
 ifndef HAVE_DARWIN_OS
+ifndef HAVE_EMSCRIPTEN
 DEPS_libplacebo += vulkan-loader $(DEPS_vulkan-loader) vulkan-headers $(DEPS_vulkan-headers)
 PLACEBOCONF += -Dvulkan-registry=${PREFIX}/share/vulkan/registry/vk.xml
 endif
+endif
 
 $(TARBALLS)/$(PLACEBO_ARCHIVE):
 	$(call download_pkg,$(PLACEBO_URL),libplacebo)


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -27,7 +27,7 @@ variables:
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20220728132611
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20220810081944
     VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20220505175523
-    VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20210915101305
+    VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20221011224907
 
 .variables-debian: &variables-debian
         HOST_ARCH: x86_64


=====================================
extras/package/wasm-emscripten/build.sh
=====================================
@@ -117,9 +117,9 @@ diagnostic "vlc contribs: bootstrap"
             --disable-mad --disable-libmpeg2 --disable-nvcodec \
             --disable-tremor --disable-vpx --disable-theora \
             --disable-postproc --disable-gmp --disable-gcrypt \
-            --disable-gpgerror --disable-harfbuzz --disable-fontconfig \
+            --disable-gpgerror --disable-fontconfig \
             --disable-asdcplib --disable-caca --disable-gettext \
-            --disable-goom --disable-libplacebo \
+            --disable-goom \
             --disable-lua --disable-luac --disable-sqlite \
             --disable-medialibrary --disable-mpcdec --disable-schroedinger \
             --disable-orc --disable-protobuf --disable-sidplay2 \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4240eedabe5ef823d929d48449d36c64a71ada8...4ddfb4474df8547453b928d52f09b1f4013d3f02

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4240eedabe5ef823d929d48449d36c64a71ada8...4ddfb4474df8547453b928d52f09b1f4013d3f02
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance