[vlc-commits] [Git][videolan/vlc][master] snap: move to core20
Jean-Baptiste Kempf
gitlab at videolan.org
Sun Jun 13 14:44:48 UTC 2021
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
dfd92fa0 by Konstantin Pavlov at 2021-06-13T13:47:29+00:00
snap: move to core20
Fixes #25612
- - - - -
4 changed files:
- extras/ci/gitlab-ci.yml
- extras/package/snap/package.mak
- extras/package/snap/snapcraft.yaml
- extras/tools/tools.mak
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -18,7 +18,7 @@ variables:
VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20201201150955
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200529132440
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20200529135226
- VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
+ VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20210611174203
VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-debian-raspbian:20200213203125
.variables-debian: &variables-debian
=====================================
extras/package/snap/package.mak
=====================================
@@ -1,5 +1,5 @@
snap:
- snapcraft prime
+ export SNAPCRAFT_BUILD_INFO=1
snapcraft snap
snap-clean:
=====================================
extras/package/snap/snapcraft.yaml
=====================================
@@ -2,7 +2,7 @@ name: vlc
version-script: cat $SNAPCRAFT_STAGE/version
version: "daily"
grade: stable
-base: core18
+base: core20
summary: Read, capture, broadcast your multimedia streams
description: |
VLC is a free and open source cross-platform multimedia player and
@@ -14,7 +14,7 @@ confinement: strict
apps:
vlc:
desktop: usr/share/applications/vlc.desktop
- command: desktop-launch $SNAP/bin/vlc-snap-wrapper.sh
+ command: bin/desktop-launch $SNAP/bin/vlc-snap-wrapper.sh
common-id: org.videolan.vlc
plugs:
- unity7
@@ -42,7 +42,7 @@ apps:
parts:
desktop-qt5-vlc:
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
- source-commit: 622e2aa7a840b3a7dbb6ea4d432d687d5cc2e8ef
+ source-commit: c12ad1891667b49b8401e606341ad7ba7ba6a69e
source-subdir: qt/
plugin: make
make-parameters: ["FLAVOR=qt5"]
@@ -80,7 +80,7 @@ parts:
--enable-dvdcss \
--disable-upnp \
--disable-chromaprint
- if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
+ if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then
make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
else
make list
@@ -97,7 +97,7 @@ parts:
--enable-merge-ffmpeg
make -j $(getconf _NPROCESSORS_ONLN)
echo $(git describe --always HEAD) > $SNAPCRAFT_STAGE/version
- make install
+ make -j $(getconf _NPROCESSORS_ONLN) install
sed -i 's|Icon=vlc|Icon=/usr/share/icons/hicolor/256x256/apps/vlc\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/vlc.desktop
sed -i 's|TryExec=.*|TryExec=/snap/bin/vlc|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/vlc.desktop
build-packages:
@@ -105,7 +105,6 @@ parts:
- git
- g++
- make
- - yasm
- autoconf
- libtool
- libtool-bin
@@ -120,7 +119,6 @@ parts:
- libdbus-1-dev
- libdirectfb-dev
- libegl1-mesa-dev
- - libfreerdp-dev
- libfreetype6-dev
- libfribidi-dev
- libgles2-mesa-dev
@@ -171,13 +169,12 @@ parts:
- qml-module-qtquick-layouts
- qml-module-qtquick-templates2
- qml-module-qtgraphicaleffects
+ - libgcrypt20-dev
+ - libsystemd-dev
stage-packages:
- fonts-freefont-ttf
- dbus-x11
- libegl1-mesa
- - libfreerdp-client1.1
- - libfreerdp-core1.1
- - libfreerdp-gdi1.1
- libfreetype6
- libfribidi0
- libdb5.3
@@ -206,7 +203,7 @@ parts:
- libxinerama1
- libxkbcommon-x11-0
- libxpm4
- - vdpau-va-driver
+ - vdpau-driver-all
- i965-va-driver
- mesa-utils
- mesa-vdpau-drivers
@@ -221,7 +218,7 @@ parts:
- libgtk-3-0
- liblua5.2-0
- libmtp9
- - libupnp6
+ - libupnp13
- libzvbi0
- libnotify4
- libvulkan1
@@ -233,6 +230,13 @@ parts:
- qml-module-qtquick-layouts
- qml-module-qtquick-templates2
- qml-module-qtgraphicaleffects
+ - libgcrypt20
+ - libidn11
+ - libxcomposite1
+ - libxcursor1
+ - libxrandr2
+ - libatk1.0-0
+ - libgtk2.0-0
filesets:
exclusion:
- "-usr/lib/*/cmake/*"
=====================================
extras/tools/tools.mak
=====================================
@@ -36,7 +36,7 @@ SHA512SUM = $(error SHA-512 checksumming not found!)
endif
download_pkg = $(call download,$(VIDEOLAN)/$(2)/$(lastword $(subst /, ,$(@)))) || \
- ( $(call download,$(1)) && echo "Please upload package $(lastword $(subst /, ,$(@))) to our FTP" ) \
+ ( $(call download,$(1)) && echo "Please upload this package $(lastword $(subst /, ,$(@))) to our FTP" ) \
&& grep $(@) $(TOOLS)/SHA512SUMS| $(SHA512SUM)
UNPACK = $(RM) -R $@ \
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dfd92fa024e023527f10c6f6c0f728ca67db46a6
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dfd92fa024e023527f10c6f6c0f728ca67db46a6
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list