Commit f12149fd authored by Guillaume Roguez's avatar Guillaume Roguez
Browse files

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
parent 789acd42
...@@ -55,7 +55,8 @@ RUN apt-get update && \ ...@@ -55,7 +55,8 @@ RUN apt-get update && \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libappindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-glib-dev libnm-glib-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
...@@ -55,7 +55,8 @@ RUN apt-get update && \ ...@@ -55,7 +55,8 @@ RUN apt-get update && \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libappindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-glib-dev libnm-glib-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \ ...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \ opus-devel \
patch \ patch \
jsoncpp-devel \ jsoncpp-devel \
libnatpmp-devel libnatpmp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \ ...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \ opus-devel \
patch \ patch \
jsoncpp-devel \ jsoncpp-devel \
libnatpmp-devel libnatpmp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \ ...@@ -46,7 +46,8 @@ RUN dnf upgrade -y && \
opus-devel \ opus-devel \
patch \ patch \
jsoncpp-devel \ jsoncpp-devel \
libnatpmp-devel libnatpmp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -56,7 +56,8 @@ RUN apt-get update && \ ...@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libappindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-glib-dev libnm-glib-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
...@@ -56,7 +56,8 @@ RUN apt-get update && \ ...@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libappindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-glib-dev libnm-glib-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
...@@ -56,7 +56,8 @@ RUN apt-get update && \ ...@@ -56,7 +56,8 @@ RUN apt-get update && \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libappindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-glib-dev libnm-glib-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
...@@ -66,7 +66,7 @@ OPENSUSE_DEPENDENCIES = [ ...@@ -66,7 +66,7 @@ OPENSUSE_DEPENDENCIES = [
'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel', 'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel',
'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel', 'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-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 # lrc
'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel', 'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
# gnome client # gnome client
...@@ -98,7 +98,7 @@ FEDORA_DEPENDENCIES = [ ...@@ -98,7 +98,7 @@ FEDORA_DEPENDENCIES = [
'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel', 'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel', 'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-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 = [ UBUNTU_DEPENDENCIES = [
...@@ -111,7 +111,8 @@ UBUNTU_DEPENDENCIES = [ ...@@ -111,7 +111,8 @@ UBUNTU_DEPENDENCIES = [
'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev', 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev',
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool', 'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig', '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 = [ DEBIAN_DEPENDENCIES = [
...@@ -124,7 +125,8 @@ DEBIAN_DEPENDENCIES = [ ...@@ -124,7 +125,8 @@ DEBIAN_DEPENDENCIES = [
'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev', 'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev',
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool', 'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig', '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 = [ ARCH_LINUX_DEPENDENCIES = [
...@@ -133,7 +135,7 @@ ARCH_LINUX_DEPENDENCIES = [ ...@@ -133,7 +135,7 @@ ARCH_LINUX_DEPENDENCIES = [
'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate', 'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base', 'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config', 'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
'automake' 'automake', 'libva'
] ]
OSX_DEPENDENCIES = [ OSX_DEPENDENCIES = [
......
...@@ -49,6 +49,7 @@ Build-Depends: debhelper (>= 9), ...@@ -49,6 +49,7 @@ Build-Depends: debhelper (>= 9),
libgsm1-dev, libgsm1-dev,
libjsoncpp-dev, libjsoncpp-dev,
libnatpmp-dev, libnatpmp-dev,
libva-dev,
# other # other
yasm, yasm,
libsamplerate0-dev libsamplerate0-dev
......
...@@ -63,6 +63,7 @@ BuildRequires: qt5-qttools-devel ...@@ -63,6 +63,7 @@ BuildRequires: qt5-qttools-devel
BuildRequires: qrencode-devel BuildRequires: qrencode-devel
BuildRequires: libappindicator-gtk3-devel BuildRequires: libappindicator-gtk3-devel
BuildRequires: NetworkManager-glib-devel BuildRequires: NetworkManager-glib-devel
BuildRequires: libva-devel
%description %description
Ring is free software for universal communication which respects freedoms Ring is free software for universal communication which respects freedoms
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment