xfce4-mixer: upgrade to latest master to fix build with xfce 4.16

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-01-04 17:52:16 +01:00
parent 5f4c22b23c
commit f08828a9b9
2 changed files with 9 additions and 69 deletions

View File

@@ -1,61 +0,0 @@
From 6ecaeced291f935a9d41e9bc33411358c95a5e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 22 Jan 2018 15:35:08 +0100
Subject: [PATCH] Fix build after update of xfconf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
xfconf stopped using dbus-glib so required flags must be included here
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
panel-plugin/Makefile.am | 2 ++
xfce4-mixer/Makefile.am | 2 ++
2 files changed, 4 insertions(+)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index a494682..b094472 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -27,6 +27,7 @@ libmixer_la_CFLAGS = \
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(XFCONF_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(KEYBINDER_CFLAGS)
@@ -48,6 +49,7 @@ libmixer_la_LIBADD = \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(XFCONF_LIBS) \
+ $(DBUS_GLIB_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-0.10 \
-lgstinterfaces-0.10 \
diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am
index 4af69e9..e076fc8 100644
--- a/xfce4-mixer/Makefile.am
+++ b/xfce4-mixer/Makefile.am
@@ -32,6 +32,7 @@ xfce4_mixer_CFLAGS = \
$(UNIQUE_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
$(XFCONF_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
@@ -46,6 +47,7 @@ xfce4_mixer_LDFLAGS = \
$(UNIQUE_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
+ $(DBUS_GLIB_LIBS) \
$(XFCONF_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-0.10 \
--
2.14.3

View File

@@ -2,17 +2,18 @@ SUMMARY = "A volume control application based on GStreamer"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
inherit xfce-panel-plugin
inherit xfce-panel-plugin xfce-git
DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
DEPENDS += "glib-2.0 gst-plugins-base gtk+3 xfce4-dev-tools-native xfconf libunique"
SRC_URI = " \
http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \
file://0001-Fix-build-after-update-of-xfconf.patch \
"
SRC_URI = "git://gitlab.xfce.org/apps/xfce4-mixer.git"
PV = "4.11.0+git${SRCPV}"
SRCREV = "cfcfd6fd1aaa497b5be421bb05b66526104727d3"
S = "${WORKDIR}/git"
SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
EXTRA_OECONF += "--disable-debug"
FILES_${PN} += "${datadir}/xfce4/mixer"
RDEPENDS_${PN} += " \
gstreamer \