diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8 index ce826df366cb87ae1ab44b05f06c3e11b4cd6da5..cf5febce0bc46f84c46f940e8b2ea4232bf7d05d 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 465a4b9140e5c6cdca6959216bff54e298283eba..16e44c7d0545ea0d37454f4d89eb38c6ab8e72b8 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 05ccc501d93eeb8acbca575390f4e05affc5f313..e39b948b898ca2b65235934a4b4b867a9d64e707 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 063a05d6ab2e4d4f3bdedb430c01aae56c926893..b0e1de00b897164e41b9778dce95c453d0396274 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 fe32d3441c547297225e0a006f3e6a3e28873201..0f0363eaeb67d2221071d159a7eb3a03a73881be 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 8520c7b4f5b0b9ff6d89131ec43db27620aa547a..594de75e236c3ae775773a736f2e2a1c5b345d75 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 aeabbf6095bae451b33ead3ab250c867e495e203..d9805edf8d74eafd1a1be99cd7546f94f390cc46 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 39294c0d39262f45564cc223eb37b8591ad6b0e3..11ea0d3d4742f4581a1ca7eadf2a316cdaf6587c 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 b52223986d8cfca5126d4c7e56a47f877596be4e..403e0d291ddd453ff57e8577e551038634d6fdd7 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 8f3ecc06c61d9efc304adceb4bafda74f01c75f0..7a928c84c8eee4ceed1f0cf4b863b67f8f3ef02b 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 8b2f7c734bfbfb1ca52004931b4afb517f5ddf45..475bf4c5b8dcf98c4234fb7e325bebe2066e7488 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 63f3be181830cc1a2905685f1287376a1dbe66c1..28e369cf142afc4f24a2db41010fa54cfb29acab 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 51be5cd684650bd7af6422f751291cbaa428a79e..8d4ebcf8f387cb158b8d1bff1b82fab15bb0ce20 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 c42ec970d653ec7bbb5689da86989edca95b1b4d..4a8e8c8cea3428cd6b8f5d26401b75fec8226e6d 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 79c567d290ee21bc391a3faa3c7b6b0ef3cbb2e3..abdd5bcdaadf3e27c3bf3bbb39413a0d75f928ae 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 9d6b339eda9d27840eaff8ed1c5ecce5c01f9ad7..e604061fed63f320477a6c3c6e9a0887c3e8b848 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 84edcae857571f0f36cde93f86eda4c015195654..f80a4653e1911bc2ac31a72975c1e1aa466ff5a5 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 e82823b8c906760ce929942ef5e49140087d22df..37a7545c606c28848c1c77c1e9d60c90ea3ac103 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 758f9394f4bbc1dcf4436585323446e6e661352b..d33ce7cfc29e82a6b029840c21c2a2784a940006 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 2db9463b9c6a5ec8c2b2d4de25a8b694c778865c..36aac09062f3973ba18eeff74f5526ee98b8bf35 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 881688b3b40484b5b8d9b919d893491dcdddc656..952b329fe580b8a4390b4a76f6aee0dd210a1954 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 d99c06891b94db859beca7659422f79da25163b3..9cb32c295b2976a626ae04926a5d40d44cbe6317 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 c6e1c9b506d2bcdbc2ab5891b53792a993e9dfb6..dac524dead69963c43ffce437b4a9cf44d6e0263 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 9003c977f7a4833d360c17f57501fb1445fe0995..a30291c9d7b4346bd7f0ff10cef10650fb0708c6 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 7b750b5870afbe3c26ab1102cf4a76f3972dc9c1..af3424b529dbb2661732b77d4f62b8b734d4f72d 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