From ccc85e7750a9aa308cab3b668d8f979e29724722 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 5 Jun 2019 11:04:00 +0800 Subject: pavucontrol: upgrade 3.0 -> 4.0 drop support of gtk2 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../0001-build-sys-Use-C-11-for-building.patch | 27 ---------------------- .../pulseaudio/pavucontrol_3.0.bb | 20 ---------------- .../pulseaudio/pavucontrol_4.0.bb | 18 +++++++++++++++ 3 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch delete mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb create mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb 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 b59569f2c8..0000000000 --- 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 -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_3.0.bb deleted file mode 100644 index 959068dd35..0000000000 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "intltool-native gtkmm 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" - -EXTRA_OECONF = " --disable-gtk3 --disable-lynx " - -RDEPENDS_${PN} += "pulseaudio-server" diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb new file mode 100644 index 0000000000..6a8274405b --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +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 \ + " +SRC_URI[md5sum] = "9dcc2c76292e7e5e075d51b8dcb20202" +SRC_URI[sha256sum] = "8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2" + +EXTRA_OECONF = "--disable-lynx " + +RDEPENDS_${PN} += "pulseaudio-server" -- cgit 1.2.3-korg