[vlc-commits] snap: link with contrib-provided protobuf.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Wed Feb 21 16:13:03 2018 +0300| [24d7f63507b4c209372b391d203964523b7bf164] | committer: Konstantin Pavlov

snap: link with contrib-provided protobuf.

(cherry picked from commit 17f720a061eb21545221a935caf5299fbc78149f)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=24d7f63507b4c209372b391d203964523b7bf164
---

 extras/package/snap/snapcraft.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
index 76c874f81f..8f927c5839 100644
--- a/extras/package/snap/snapcraft.yaml
+++ b/extras/package/snap/snapcraft.yaml
@@ -41,9 +41,15 @@ parts:
     prepare: |
       sed -i 's|0\.19\.8|0\.19\.7|'  configure.ac
     build: |
+      cd extras/tools
+      ./bootstrap
+      make -j $(getconf _NPROCESSORS_ONLN) .protoc
+      cd ../../
+      export PATH=$PWD/extras/tools/build/bin:$PATH
       cd contrib && mkdir linux && cd linux
       ../bootstrap
       make list
+      make -j $(getconf _NPROCESSORS_ONLN) .protobuf
       make -j $(getconf _NPROCESSORS_ONLN) .libplacebo
       make -j $(getconf _NPROCESSORS_ONLN) .ffmpeg
       make -j $(getconf _NPROCESSORS_ONLN) .spatialaudio
@@ -175,8 +181,6 @@ parts:
       - bison
       - flex
       - zsh
-      - protobuf-compiler
-      - protobuf-c-compiler
     stage-packages:
       - fonts-freefont-ttf
       - dbus-x11