[6/7] pavucontrol: upgrade 3.0 -> 4.0

Submitted by changqing.li@windriver.com on June 5, 2019, 3:04 a.m. | Patch ID: 161967

Details

Message ID 1559703841-263740-7-git-send-email-changqing.li@windriver.com
State Accepted
Commit ccc85e7750a9aa308cab3b668d8f979e29724722
Headers show

Commit Message

changqing.li@windriver.com June 5, 2019, 3:04 a.m.
From: Changqing Li <changqing.li@windriver.com>

drop support of gtk2

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../0001-build-sys-Use-C-11-for-building.patch     | 27 ----------------------
 .../{pavucontrol_3.0.bb => pavucontrol_4.0.bb}     | 10 ++++----
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch
 rename meta-oe/recipes-multimedia/pulseaudio/{pavucontrol_3.0.bb => pavucontrol_4.0.bb} (52%)

Patch hide | download patch | download mbox

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 b59569f..0000000
--- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 1f92aa5c8d910519e3a74b2e3a9199aa9026a16c Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <git@arunraghavan.net>
-Date: Mon, 25 Jan 2016 08:41:42 +0530
-Subject: [PATCH 1/2] build-sys: Use C++11 for building
-
-This requirement was added by gtkmm at some point:
-
-http://www.murrayc.com/permalink/2015/07/31/gtkmm-now-uses-c11/
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5b50e2d..8f28782 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,6 +39,7 @@ AC_PROG_CC
- AC_PROG_LN_S
- AC_TYPE_SIGNAL
- AC_HEADER_STDC
-+AX_CXX_COMPILE_STDCXX_11
- 
- AC_ARG_ENABLE(gtk3,
-    [AS_HELP_STRING([--disable-gtk3],
--- 
-2.12.1
-
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb
similarity index 52%
rename from meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb
rename to meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb
index 959068d..6a82744 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
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "intltool-native gtkmm libcanberra pulseaudio"
+DEPENDS = "intltool-native gtkmm3 libcanberra pulseaudio"
 
 inherit gnome distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \
-           file://0001-build-sys-Use-C-11-for-building.patch \
-           file://0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch \
           "
-SRC_URI[md5sum] = "176308d2c03f8f3a7b2bd4f4d284fe71"
-SRC_URI[sha256sum] = "b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890"
+SRC_URI[md5sum] = "9dcc2c76292e7e5e075d51b8dcb20202"
+SRC_URI[sha256sum] = "8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2"
 
-EXTRA_OECONF = " --disable-gtk3 --disable-lynx "
+EXTRA_OECONF = "--disable-lynx "
 
 RDEPENDS_${PN} += "pulseaudio-server"