vlc/vlc-3.0 | branch: master | Konstantin Pavlov <[email protected]> | Fri Mar 13 22:41:52 2020 +0300| [df3c8bc95d03e54b72d5b27d460dddde3e2e3429] | committer: Konstantin Pavlov
snap: make it easier to run as a CI job Honor VLC_PREBUILT_CONTRIBS_URL env variable and produce packaged tarball if prebuilt contrib is not available. (cherry picked from commit adefe57379dd9551cb20e4ad888afbe6ef52f4c7) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=df3c8bc95d03e54b72d5b27d460dddde3e2e3429 --- extras/package/snap/snapcraft.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml index 04b8bf8191..c61dc9cf72 100644 --- a/extras/package/snap/snapcraft.yaml +++ b/extras/package/snap/snapcraft.yaml @@ -72,13 +72,19 @@ parts: export PATH=$PWD/extras/tools/build/bin:$PATH cd contrib && mkdir linux && cd linux ../bootstrap \ - --enable-libdsm \ - --enable-dvdcss \ - --disable-upnp \ - --disable-chromaprint - make list - make -j $(getconf _NPROCESSORS_ONLN) fetch - make -j $(getconf _NPROCESSORS_ONLN) -k install || make -j1 + --host=$TRIPLET \ + --enable-libdsm \ + --enable-dvdcss \ + --disable-upnp \ + --disable-chromaprint + if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then + make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" + else + make list + make -j $(getconf _NPROCESSORS_ONLN) fetch + make -j $(getconf _NPROCESSORS_ONLN) -k install || make -j1 + make package + fi cd ../../ export NOCONFIGURE=1 autoreconf -fi _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
