sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use pulseaudio-glib for pavucontrol-qt

Browse Source 
the previous patch to try to use the primary mainloop doesn't work
This commit is contained in:
Simeon Huang 2021-05-22 13:58:07 +01:00 committed by Yaksh Bariya
parent b2e1548fe1
commit 757b9e4d4e
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
4 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-packages/lxqt/build.sh
View File

@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Public Domain"
TERMUX_PKG_MAINTAINER="Simeon Huang <symeon@librehat.com>"
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

2
x11-packages/pavucontrol-qt/build.sh
View File

@ -5,6 +5,6 @@ TERMUX_PKG_MAINTAINER="Simeon Huang <symeon@librehat.com>"
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"

12
x11-packages/pavucontrol-qt/fix_glib_linking.patch
View File

@ -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

44
x11-packages/pavucontrol-qt/no_pulse_glib.patch
View File

@ -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 <pulse/pulseaudio.h>
-#include <pulse/glib-mainloop.h>
+#include <pulse/mainloop.h>
#include <pulse/ext-stream-restore.h>
#include <pulse/ext-device-manager.h>
@@ -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)