From 757b9e4d4ec53acf1bc524247ad2a1ba5c9bb9f3 Mon Sep 17 00:00:00 2001 From: Simeon Huang Date: Sat, 22 May 2021 13:58:07 +0100 Subject: [PATCH] use pulseaudio-glib for pavucontrol-qt the previous patch to try to use the primary mainloop doesn't work --- x11-packages/lxqt/build.sh | 2 +- x11-packages/pavucontrol-qt/build.sh | 2 +- .../pavucontrol-qt/fix_glib_linking.patch | 12 ----- .../pavucontrol-qt/no_pulse_glib.patch | 44 ------------------- 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 x11-packages/pavucontrol-qt/fix_glib_linking.patch delete mode 100644 x11-packages/pavucontrol-qt/no_pulse_glib.patch diff --git a/x11-packages/lxqt/build.sh b/x11-packages/lxqt/build.sh index 9fc547464..279118904 100644 --- a/x11-packages/lxqt/build.sh +++ b/x11-packages/lxqt/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=0.17.0 TERMUX_PKG_SKIP_SRC_EXTRACT=true -TERMUX_PKG_DEPENDS="pcman-qt, qterminal, lxqt-session, lxqt-panel, lxqt-runner, lxqt-openssh-askpass, lxqt-notificationd, lxqt-globalkeys, lxqt-config, lxqt-archiver, lxqt-about, lximage-qt, obconf-qt, lxqt-qtplugin, lxqt-themes, pavucontrol-qt" +TERMUX_PKG_DEPENDS="pcmanfm-qt, qterminal, lxqt-session, lxqt-panel, lxqt-runner, lxqt-openssh-askpass, lxqt-notificationd, lxqt-globalkeys, lxqt-config, lxqt-archiver, lxqt-about, lximage-qt, obconf-qt, lxqt-qtplugin, lxqt-themes, pavucontrol-qt" TERMUX_PKG_RECOMMENDS="kvantum" TERMUX_PKG_METAPACKAGE=true TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/x11-packages/pavucontrol-qt/build.sh b/x11-packages/pavucontrol-qt/build.sh index 501a633e0..0bac6dff6 100644 --- a/x11-packages/pavucontrol-qt/build.sh +++ b/x11-packages/pavucontrol-qt/build.sh @@ -5,6 +5,6 @@ TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=0.17.0 TERMUX_PKG_SRCURL="https://github.com/lxqt/pavucontrol-qt/releases/download/${TERMUX_PKG_VERSION}/pavucontrol-qt-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=6c274cd3a80a699c4b3f4dbf4eccaef3fafdc677c6240e2b45672bafe46da170 -TERMUX_PKG_DEPENDS="qt5-qtbase, kwindowsystem, glib, liblxqt, pulseaudio" +TERMUX_PKG_DEPENDS="qt5-qtbase, kwindowsystem, liblxqt, pulseaudio-glib" TERMUX_PKG_BUILD_DEPENDS="cmake, lxqt-build-tools, qt5-qtbase-cross-tools, qt5-qttools-cross-tools" diff --git a/x11-packages/pavucontrol-qt/fix_glib_linking.patch b/x11-packages/pavucontrol-qt/fix_glib_linking.patch deleted file mode 100644 index c4073f587..000000000 --- a/x11-packages/pavucontrol-qt/fix_glib_linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -glib is not properly linked, changing the variable so it is present ---- src/src/CMakeLists.txt 2021-04-13 18:13:27.000000000 +0000 -+++ src.mod/src/CMakeLists.txt 2021-05-20 14:03:49.449914000 +0000 -@@ -75,7 +75,7 @@ - target_link_libraries(pavucontrol-qt - Qt5::Widgets - ${PULSE_LDFLAGS} -- ${GLIB_LDFLAGS} -+ ${GLIB_LIBRARIES} - ) - - install(TARGETS diff --git a/x11-packages/pavucontrol-qt/no_pulse_glib.patch b/x11-packages/pavucontrol-qt/no_pulse_glib.patch deleted file mode 100644 index 90b052198..000000000 --- a/x11-packages/pavucontrol-qt/no_pulse_glib.patch +++ /dev/null @@ -1,44 +0,0 @@ -PulseAudio in Termux doesn't have glib feature. -This patch replaces the glib mainloop with the primary basic mainloop. ---- src/src/pavucontrol.cc 2021-04-13 18:13:27.000000000 +0000 -+++ src.mod/src/pavucontrol.cc 2021-05-20 13:56:35.699908000 +0000 -@@ -25,7 +25,7 @@ - #define PACKAGE_VERSION "0.1" - - #include --#include -+#include - #include - #include - -@@ -688,9 +688,9 @@ - if(parser.isSet(maximizeOption)) - mainWindow->showMaximized(); - -- pa_glib_mainloop *m = pa_glib_mainloop_new(g_main_context_default()); -+ pa_mainloop *m = pa_mainloop_new(); - g_assert(m); -- api = pa_glib_mainloop_get_api(m); -+ api = pa_mainloop_get_api(m); - g_assert(api); - - connect_to_pulse(mainWindow); -@@ -706,7 +706,7 @@ - - if (context) - pa_context_unref(context); -- pa_glib_mainloop_free(m); -+ pa_mainloop_free(m); - - return 0; - } ---- src/CMakeLists.txt 2021-04-13 18:13:27.000000000 +0000 -+++ src.mod/CMakeLists.txt 2021-05-20 13:57:15.588923000 +0000 -@@ -42,7 +42,6 @@ - pkg_check_modules( - PULSE REQUIRED - libpulse>=5.0 -- libpulse-mainloop-glib>=0.9.16 - ) - - add_subdirectory(src)