[vlc-commits] [Git][videolan/vlc][master] 3 commits: snap: build all required tools

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e7512b7f by Steve Lhomme at 2023-09-29T07:31:58+00:00
snap: build all required tools

The forced nasm builds nothing and we may need other tools. But
the logs only mention meson is needed.

- - - - -
79bf5b31 by Steve Lhomme at 2023-09-29T07:31:58+00:00
snap: enable chromaprint

It should build fine.

- - - - -
da8f5875 by Steve Lhomme at 2023-09-29T07:31:58+00:00
snap: don't "install" contribs

All build scripts just call the build that way and end up installing
each contrib.

- - - - -


1 changed file:

- extras/package/snap/snapcraft.yaml


Changes:

=====================================
extras/package/snap/snapcraft.yaml
=====================================
@@ -75,23 +75,21 @@ parts:
       sed -i 's|0\.19\.8|0\.19\.7|'  configure.ac
       cd extras/tools
       ./bootstrap
-      make -j $(getconf _NPROCESSORS_ONLN) .nasm
-      make -j $(getconf _NPROCESSORS_ONLN) .meson
+      make -j $(getconf _NPROCESSORS_ONLN)
       cd ../../
       export PATH=$PWD/extras/tools/build/bin:$PATH
       cd contrib && mkdir linux && cd linux
       ../bootstrap \
           --host=$TRIPLET \
           --enable-libdsm \
-          --enable-dvdcss \
-          --disable-chromaprint
+          --enable-dvdcss
       if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then
           make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
           make -j $(getconf _NPROCESSORS_ONLN) tools
       else
           make list
           make -j $(getconf _NPROCESSORS_ONLN) fetch
-          make -j $(getconf _NPROCESSORS_ONLN) -k install || make -j1
+          make -j $(getconf _NPROCESSORS_ONLN) -k || make -j1
           make package
       fi
       cd ../../



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3b728b54f2ab4caccbe2d5a5e69473e19597f482...da8f5875428fffbf0ab09b61e476173b2ba52db7

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


VideoLAN code repository instance