From f12149fd1270682cadb12e0f17489a67705357b7 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 5 Oct 2016 10:26:15 -0400
Subject: [PATCH] add libva as new dependencies for all GNU platforms
This is needed to build video HW acceleration code.
Dockers, packaging deps and make-ring.py changed by this patch.
Change-Id: Ia6c50aacc8a0f36db36b05c66bcd2db75291bce9
---
docker/Dockerfile_debian_8 | 3 ++-
docker/Dockerfile_debian_9 | 3 ++-
docker/Dockerfile_fedora_22 | 3 ++-
docker/Dockerfile_fedora_23 | 3 ++-
docker/Dockerfile_fedora_24 | 3 ++-
docker/Dockerfile_ubuntu_14.04 | 3 ++-
docker/Dockerfile_ubuntu_15.10 | 3 ++-
docker/Dockerfile_ubuntu_16.04 | 3 ++-
make-ring.py | 12 +++++++-----
packaging/rules/debian/control | 1 +
packaging/rules/fedora/ring.spec | 1 +
11 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index be9a3d7d..9a3eab40 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -55,7 +55,8 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev
+ libnm-glib-dev \
+ libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index 16fae846..a5f5c712 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -55,7 +55,8 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev
+ libnm-glib-dev \
+ libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index 58b16634..8c73277d 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \
patch \
jsoncpp-devel \
- libnatpmp-devel
+ libnatpmp-devel \
+ libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23
index 3dca2d2f..122f0001 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \
patch \
jsoncpp-devel \
- libnatpmp-devel
+ libnatpmp-devel \
+ libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24
index b96a6d10..87d72f59 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \
patch \
jsoncpp-devel \
- libnatpmp-devel
+ libnatpmp-devel \
+ libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04
index 5233db51..1cf17a41 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev
+ libnm-glib-dev \
+ libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10
index 01e758b4..ca4d44f4 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev
+ libnm-glib-dev \
+ libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index 204077f2..ec6892dc 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev
+ libnm-glib-dev \
+ libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/make-ring.py b/make-ring.py
index 45781b89..711d3f4a 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -66,7 +66,7 @@ OPENSUSE_DEPENDENCIES = [
'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel',
'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-devel',
- 'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel',
+ 'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
# lrc
'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
# gnome client
@@ -98,7 +98,7 @@ FEDORA_DEPENDENCIES = [
'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
- 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch'
+ 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel'
]
UBUNTU_DEPENDENCIES = [
@@ -111,7 +111,8 @@ UBUNTU_DEPENDENCIES = [
'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev',
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
- 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev'
+ 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
+ 'libva-dev'
]
DEBIAN_DEPENDENCIES = [
@@ -124,7 +125,8 @@ DEBIAN_DEPENDENCIES = [
'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev',
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
- 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev'
+ 'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
+ 'libva-dev'
]
ARCH_LINUX_DEPENDENCIES = [
@@ -133,7 +135,7 @@ ARCH_LINUX_DEPENDENCIES = [
'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
- 'automake'
+ 'automake', 'libva'
]
OSX_DEPENDENCIES = [
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 14e48d02..38bcce38 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -49,6 +49,7 @@ Build-Depends: debhelper (>= 9),
libgsm1-dev,
libjsoncpp-dev,
libnatpmp-dev,
+ libva-dev,
# other
yasm,
libsamplerate0-dev
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index f8c05054..35589e6b 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -63,6 +63,7 @@ BuildRequires: qt5-qttools-devel
BuildRequires: qrencode-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: NetworkManager-glib-devel
+BuildRequires: libva-devel
%description
Ring is free software for universal communication which respects freedoms
--
GitLab