From a864564949c1d18d2abf8ee828d95aa03ca3b5d5 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Tue, 16 May 2017 15:41:45 -0400
Subject: [PATCH] add libvdpau to dependencies for linux
Adds libvdpau dev package to dependencies for linux distros. Depends
on https://gerrit-ring.savoirfairelinux.com/5473/
Change-Id: I1cb33adf5707eb5bdf6efe998ecc6dde5b6ae909
---
docker/Dockerfile_debian_8 | 3 ++-
docker/Dockerfile_debian_8_i386 | 3 ++-
docker/Dockerfile_debian_9 | 3 ++-
docker/Dockerfile_debian_9_i386 | 3 ++-
docker/Dockerfile_fedora_22 | 3 ++-
docker/Dockerfile_fedora_22_i386 | 3 ++-
docker/Dockerfile_fedora_23 | 3 ++-
docker/Dockerfile_fedora_23_i386 | 3 ++-
docker/Dockerfile_fedora_24 | 3 ++-
docker/Dockerfile_fedora_24_i386 | 3 ++-
docker/Dockerfile_fedora_25 | 3 ++-
docker/Dockerfile_fedora_25_i386 | 3 ++-
docker/Dockerfile_ubuntu_14.04 | 3 ++-
docker/Dockerfile_ubuntu_14.04_i386 | 3 ++-
docker/Dockerfile_ubuntu_15.10 | 3 ++-
docker/Dockerfile_ubuntu_15.10_i386 | 3 ++-
docker/Dockerfile_ubuntu_16.04 | 3 ++-
docker/Dockerfile_ubuntu_16.04_i386 | 3 ++-
docker/Dockerfile_ubuntu_16.10 | 3 ++-
docker/Dockerfile_ubuntu_16.10_i386 | 3 ++-
docker/Dockerfile_ubuntu_17.04 | 3 ++-
docker/Dockerfile_ubuntu_17.04_i386 | 3 ++-
make-ring.py | 9 +++++----
packaging/rules/debian/control | 1 +
packaging/rules/fedora/ring.spec | 1 +
25 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index ce826df3..cf5febce 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -58,7 +58,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index 465a4b91..16e44c7d 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -58,7 +58,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-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 05ccc501..e39b948b 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -58,7 +58,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 063a05d6..b0e1de00 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -58,7 +58,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-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 fe32d344..0f0363ea 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386
index 8520c7b4..594de75e 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-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 aeabbf60..d9805edf 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386
index 39294c0d..11ea0d3d 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-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 b5222398..403e0d29 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386
index 8f3ecc06..7a928c84 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index 8b2f7c73..475bf4c5 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 63f3be18..28e369cf 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
- libva-devel
+ libva-devel \
+ libvdpau-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 51be5cd6..8d4ebcf8 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index c42ec970..4a8e8c8c 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-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 79c567d2..abdd5bcd 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index 9d6b339e..e604061f 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-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 84edcae8..f80a4653 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index e82823b8..37a7545c 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -59,7 +59,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
index 758f9394..d33ce7cf 100644
--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -69,7 +69,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index 2db9463b..36aac090 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -69,7 +69,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index 881688b3..952b329f 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -69,7 +69,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index d99c0689..9cb32c29 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -69,7 +69,8 @@ RUN apt-get update && \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
- libva-dev
+ libva-dev \
+ libvdpau-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/make-ring.py b/make-ring.py
index c6e1c9b5..dac524de 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -71,6 +71,7 @@ OPENSUSE_DEPENDENCIES = [
'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', 'libva-devel',
+ 'libvdpau-devel'
# lrc
'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
# gnome client
@@ -104,7 +105,7 @@ FEDORA_DEPENDENCIES = [
'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', 'libva-devel',
- 'webkitgtk4-devel', 'NetworkManager-glib-devel'
+ 'webkitgtk4-devel', 'NetworkManager-glib-devel', 'libvdpau-devel'
]
UBUNTU_DEPENDENCIES = [
@@ -119,7 +120,7 @@ UBUNTU_DEPENDENCIES = [
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
'libva-dev', 'libnm-glib-dev',
- 'libwebkit2gtk-4.0-dev'
+ 'libwebkit2gtk-4.0-dev', 'libvdpau-dev'
]
DEBIAN_DEPENDENCIES = [
@@ -133,7 +134,7 @@ DEBIAN_DEPENDENCIES = [
'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',
- 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev'
+ 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev', 'libvdpau-dev'
]
ARCH_LINUX_DEPENDENCIES = [
@@ -142,7 +143,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', 'libva', 'webkitgtk', 'libnm-glib'
+ 'automake', 'libva', 'webkitgtk', 'libnm-glib', 'libvdpau'
]
OSX_DEPENDENCIES = [
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 9003c977..a30291c9 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -52,6 +52,7 @@ Build-Depends: debhelper (>= 9),
libnatpmp-dev,
libva-dev,
libcrypto++-dev,
+ libvdpau-dev,
# other
yasm,
libsamplerate0-dev
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index 7b750b58..af3424b5 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -66,6 +66,7 @@ BuildRequires: NetworkManager-glib-devel
BuildRequires: libva-devel
BuildRequires: webkitgtk4-devel
BuildRequires: cryptopp-devel
+BuildRequires: libvdpau-devel
%description
Ring is free software for universal communication which respects freedoms
--
GitLab