diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-06-05 11:04:00 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-06-15 16:45:33 -0700 |
commit | ccc85e7750a9aa308cab3b668d8f979e29724722 (patch) | |
tree | 26dcf19ba0723564c7f19fa66b4c074e21fc2eb8 /meta-oe/recipes-multimedia | |
parent | 3dbdf5b000a3288fd62b158abf3ad131feb3d450 (diff) | |
download | meta-openembedded-ccc85e7750a9aa308cab3b668d8f979e29724722.tar.gz |
pavucontrol: upgrade 3.0 -> 4.0
drop support of gtk2
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r-- | meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb (renamed from meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb) | 10 |
2 files changed, 4 insertions, 33 deletions
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch deleted file mode 100644 index b59569f2c..000000000 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 1f92aa5c8d910519e3a74b2e3a9199aa9026a16c Mon Sep 17 00:00:00 2001 | ||
2 | From: Arun Raghavan <git@arunraghavan.net> | ||
3 | Date: Mon, 25 Jan 2016 08:41:42 +0530 | ||
4 | Subject: [PATCH 1/2] build-sys: Use C++11 for building | ||
5 | |||
6 | This requirement was added by gtkmm at some point: | ||
7 | |||
8 | http://www.murrayc.com/permalink/2015/07/31/gtkmm-now-uses-c11/ | ||
9 | --- | ||
10 | configure.ac | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 5b50e2d..8f28782 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -39,6 +39,7 @@ AC_PROG_CC | ||
18 | AC_PROG_LN_S | ||
19 | AC_TYPE_SIGNAL | ||
20 | AC_HEADER_STDC | ||
21 | +AX_CXX_COMPILE_STDCXX_11 | ||
22 | |||
23 | AC_ARG_ENABLE(gtk3, | ||
24 | [AS_HELP_STRING([--disable-gtk3], | ||
25 | -- | ||
26 | 2.12.1 | ||
27 | |||
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 959068dd3..6a8274405 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb | |||
@@ -2,19 +2,17 @@ DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based vol | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | DEPENDS = "intltool-native gtkmm libcanberra pulseaudio" | 5 | DEPENDS = "intltool-native gtkmm3 libcanberra pulseaudio" |
6 | 6 | ||
7 | inherit gnome distro_features_check | 7 | inherit gnome distro_features_check |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
10 | 10 | ||
11 | SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ | 11 | SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ |
12 | file://0001-build-sys-Use-C-11-for-building.patch \ | ||
13 | file://0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch \ | ||
14 | " | 12 | " |
15 | SRC_URI[md5sum] = "176308d2c03f8f3a7b2bd4f4d284fe71" | 13 | SRC_URI[md5sum] = "9dcc2c76292e7e5e075d51b8dcb20202" |
16 | SRC_URI[sha256sum] = "b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890" | 14 | SRC_URI[sha256sum] = "8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2" |
17 | 15 | ||
18 | EXTRA_OECONF = " --disable-gtk3 --disable-lynx " | 16 | EXTRA_OECONF = "--disable-lynx " |
19 | 17 | ||
20 | RDEPENDS_${PN} += "pulseaudio-server" | 18 | RDEPENDS_${PN} += "pulseaudio-server" |