packages/ukui-media
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update new version 3.1.0

Browse Source
This commit is contained in:
peijiankang 2023-05-23 10:50:00 +08:00
parent cdb5a345f1
commit cab865b4fb
8 changed files with 259 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Fix-system-volume-slider-error.patch
View File

@ -1,24 +0,0 @@
From d6b5cdabeaead09a9c3b2879d9b7600632f8ac84 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 28 Dec 2022 13:34:10 +0800
Subject: [PATCH] Fix system volume slider error
---
ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp b/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp
index 8838375..61cfea3 100644
--- a/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp
+++ b/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp
@@ -1966,6 +1966,7 @@ void DeviceSwitchWidget::on_stream_control_added (MateMixerStream *stream,const
}
if (strcmp(m_pAppName,"ukui-session") != 0 && strcmp(m_pAppName,"ukui-volume-control-applet-qt") != 0 && strcmp(m_pAppName,"Volume Control") && \
strcmp(m_pAppName,"ALSA plug-in [mate-screenshot]") && strcmp(m_pAppName,"ALSA plug-in [ukui-volume-control-applet-qt]") && !strstr(m_pAppName,"paplay") && \
+ strcmp(m_pAppName,"ALSA plug-in [ukui-session]") && \
strcmp(m_pAppName,"Ukui Volume Control App") && !strstr(m_pAppName,"QtPulseAudio") && strcmp(m_pAppName,"ukuimedia-volume-control") != 0 && \
!strstr(m_pAppName,"ukui-settings-daemon") && strcmp(m_pAppName,"multimedia-volume-control") != 0 && !strstr(m_pAppName,"ukui-notification") && \
!strstr(m_pAppName,"kylin-kmre-audio")) {
--
2.33.0

85
0001-fix-compile-error-of-ukui-media.patch Normal file
View File

@ -0,0 +1,85 @@
From 06aec2beb9230a5650fa6b0924b15ee074398748 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 1 Dec 2022 14:04:34 +0800
Subject: [PATCH] fix compile error of ukui-media
---
audio/translate_generation.sh | 2 +-
ukui-media.pro | 12 ++++++++++
.../ukui-volume-control-applet-qt.pro | 22 ++++++++++++++-----
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/audio/translate_generation.sh b/audio/translate_generation.sh
index 72f748b..6ab2acc 100755
--- a/audio/translate_generation.sh
+++ b/audio/translate_generation.sh
@@ -10,6 +10,6 @@ do
if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then
lrelease-qt5 "${ts}"
else
- lrelease "${ts}"
+ lrelease-qt5 "${ts}"
fi
done
diff --git a/ukui-media.pro b/ukui-media.pro
index 7bc990b..b345aae 100644
--- a/ukui-media.pro
+++ b/ukui-media.pro
@@ -7,4 +7,16 @@ SUBDIRS = \
ukui-volume-control-applet-qt \
ukui-media-control-led
+desktop.files = data/ukui-volume-control-applet.desktop
+desktop.path = /etc/xdg/autostart
+xml.files = data/org.ukui.media.sound.gschema.xml
+xml.path = /usr/share/glib-2.0/schemas
+
+scripts.files = scripts/detection_output_mode.sh
+scripts.path = /usr/share/ukui-media/scripts
+
+service.files = data/ukui-media-control-mute-led.service
+service.path = /lib/systemd/system
+
+INSTALLS += desktop xml scripts service
diff --git a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
index a2af743..0834ce5 100644
--- a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
+++ b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
@@ -83,16 +83,28 @@ TRANSLATIONS += \
translations/tr.ts \
translations/bo.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
-qm_file.path = $${PREFIX}/translations/
+qm_file.path = /usr/share/ukui-media/translations/
-data_files.files = data/*
-data_files.path = $${PREFIX}/
+data_files.files = data/img data/qss
+data_files.path = /usr/share/ukui-media/
+
+data_sounds.files = data/sounds/ukui-sound.xml data/sounds/*.ogg
+data_sounds.path = /usr/share/ukui-media/sounds
+
+data_theme.files = data/sounds/index.theme
+data_theme.path = /usr/share/sounds/ukui
+
+sounds.file = data/sounds/*.ogg
+sounds.path = /usr/share/sounds
+
+xml.files = data/org.ukui.audio.gschema.xml data/org.ukui.sound.gschema.xml data/org.ukui.media.sound.gschema.xml
+xml.path = /usr/share/glib-2.0/schemas
INSTALLS += \
- target qm_file data_files
+ target qm_file data_files data_sounds data_theme sounds xml
#DISTFILES += \
# xatom/xatom.pri
--
2.33.0

46
0002-fix-ukui-volume-control-applet-qt-work-error.patch Normal file
View File

@ -0,0 +1,46 @@
From ce6b7033cd4d546040eeb3851f8e2d00fac87048 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 12 Jan 2023 15:09:23 +0800
Subject: [PATCH] fix ukui-volume-control-applet-qt work error
---
ukui-volume-control-applet-qt/ukmedia_main_widget.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp b/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
index a6dd72d..a57919a 100644
--- a/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
+++ b/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
@@ -3203,8 +3203,8 @@ void UkmediaMainWidget::switchModuleEchoCancel()
if ( strstr(m_pVolumeControl->defaultSourceName,"alsa_input") && !strstr(m_pVolumeControl->defaultSourceName,"input.usb")) {
sourceState = true;
}
- qDebug() << "switchModuleEchoCancel" << m_pVolumeControl->defaultSourceName << switchState << sourceState;
- if (switchState && sourceState && !isLoadEchoCancel && !strstr(m_pVolumeControl->defaultSourceName,"noiseReduceSource")) {
+ qDebug() << "switchModuleEchoCancel" << "loadechocancel"<< isLoadEchoCancel << m_pVolumeControl->defaultSourceName << switchState << sourceState;
+ if (switchState && sourceState) {
pa_operation *o;
qDebug() << "load module echo cancel";
isLoadEchoCancel = true;
@@ -3212,7 +3212,7 @@ void UkmediaMainWidget::switchModuleEchoCancel()
m_pVolumeControl->showError(QObject::tr("pa_context_load_module() failed").toUtf8().constData());
}
}
- else {
+ else if (strstr(m_pVolumeControl->defaultSourceName,"noiseReduceSource") && !switchState) {
isLoadEchoCancel = false;
m_pVolumeControl->getModuleIndexByName("module-echo-cancel");
@@ -3221,6 +3221,9 @@ void UkmediaMainWidget::switchModuleEchoCancel()
pa_context_unload_module(m_pVolumeControl->getContext(),m_pVolumeControl->findModuleIndex,nullptr,nullptr);
});
}
+ else {
+ isLoadEchoCancel = false;
+ }
}
UkmediaMainWidget::~UkmediaMainWidget()
--
2.33.0

74
0003-fix-coredump-of-ukui-volume-control-applet-qt.patch Normal file
View File

@ -0,0 +1,74 @@
From 31d9527ddb1f1e1c009378c867e862cb7aaa68c0 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 15 Feb 2023 16:26:38 +0800
Subject: [PATCH] fix coredump of ukui-volume-control-applet-qt
---
.../ukmedia_volume_control.cpp | 16 ++++++++++++++++
.../ukmedia_volume_control.h | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp b/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp
index b07294d..8edc83f 100644
--- a/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp
+++ b/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp
@@ -103,6 +103,10 @@ void UkmediaVolumeControl::setSinkMute(bool status)
*/
void UkmediaVolumeControl::setSinkVolume(int index,int value)
{
+ if(m_pDefaultSink == nullptr){
+ return;
+ }
+
pa_cvolume v = m_pDefaultSink->volume;
v.channels = channel;
for (int i=0;i<v.channels;i++)
@@ -141,6 +145,10 @@ void UkmediaVolumeControl::setSourceMute(bool status)
*/
void UkmediaVolumeControl::setSourceVolume(int index,int value)
{
+ if(m_pDefaultSink == nullptr){
+ return;
+ }
+
pa_cvolume v = m_pDefaultSink->volume;
v.channels = inputChannel;
for (int i=0;i<v.channels;i++)
@@ -231,6 +239,10 @@ int UkmediaVolumeControl::getModuleIndexByName(QString name)
*/
void UkmediaVolumeControl::setSinkInputVolume(int index, int value,int channel)
{
+ if(m_pDefaultSink == nullptr){
+ return;
+ }
+
pa_cvolume v = m_pDefaultSink->volume;
v.channels = channel;
@@ -267,6 +279,10 @@ void UkmediaVolumeControl::setSinkInputMuted(int index, bool status)
*/
void UkmediaVolumeControl::setSourceOutputVolume(int index, int value)
{
+ if(m_pDefaultSink == nullptr){
+ return;
+ }
+
pa_cvolume v = m_pDefaultSink->volume;
v.channels = sourceOutputChannel;
for (int i=0;i<v.channels;i++)
diff --git a/ukui-volume-control-applet-qt/ukmedia_volume_control.h b/ukui-volume-control-applet-qt/ukmedia_volume_control.h
index 555825f..b39b248 100644
--- a/ukui-volume-control-applet-qt/ukmedia_volume_control.h
+++ b/ukui-volume-control-applet-qt/ukmedia_volume_control.h
@@ -167,7 +167,7 @@ public:
bool firstRun = true;
pa_cvolume m_defaultSinkVolume;
- const pa_sink_info *m_pDefaultSink;
+ const pa_sink_info *m_pDefaultSink = nullptr;
pa_context* m_pPaContext;
std::map<uint32_t, char*> clientNames;
SinkInputType showSinkInputType;
--
2.33.0

BIN
ukui-media-3.0.4.tar.gz
View File

Binary file not shown.

BIN
ukui-media-3.1.0.tar.gz Normal file
View File

Binary file not shown.

140
ukui-media.spec
View File

@ -1,37 +1,38 @@
Name: ukui-media
Version: 3.0.4
Release: 9
Summary: UKUI media utilities
License: GPL-2.0-or-later and GPL-3.0-or-later and BSD-3-Clause
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-Fix-system-volume-slider-error.patch
Autoreq : yes
Name: ukui-media
Version: 3.1.0
Release: 4
Summary: UKUI media utilities
License: GPL-2.0-or-later and GPL-3.0-or-later and BSD-3-Clause
URL: http://www.ukui.org
Source0: https://gitee.com/openkylin/ukui-media/tags/%{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-ukui-media.patch
Patch02: 0002-fix-ukui-volume-control-applet-qt-work-error.patch
Patch03: 0003-fix-coredump-of-ukui-volume-control-applet-qt.patch
Autoreq: yes
BuildRequires: intltool
BuildRequires: qt5-qtbase-devel
BuildRequires: libcanberra-devel
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: mate-desktop-devel >= 1.18
BuildRequires: libmatemixer-devel >= 1.18
BuildRequires: libxml2-devel
BuildRequires: mate-common >= 1.18
BuildRequires: qt5-qtsvg-devel
BuildRequires: libqtxdg-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtmultimedia
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: ukui-interface
BuildRequires: qt5-qttools-devel
BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: dconf-devel
BuildRequires: libcanberra-devel
BuildRequires: libukcc-devel
BuildRequires: qt5-qtx11extras-devel
Requires: mate-desktop-libs >= 1.18
Requires: ukui-media-common = %{version}
Requires: ukui-control-center
Requires: glib2
Recommends: alsa-utils sound-theme-freedesktop
@ -51,58 +52,20 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains the common files.
%prep
%setup -q
%patch01 -p1
%autosetup -n %{name}-%{version} -p1
%build
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64
make
cd %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt
mkdir build && cd build
qmake-qt5 ..
make -j32
cd %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/ukui-media-control-led
mkdir build && cd build
qmake-qt5 ..
make
mkdir build && pushd build
%{qmake_qt5} ..
%{make_build}
popd
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
pushd build
%{make_install} INSTALL_ROOT=$RPM_BUILD_ROOT
popd
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/build/ukui-volume-control-applet-qt %{buildroot}/usr/bin/
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/ukui-media-control-led/build/ukui-media-control-led %{buildroot}/usr/bin/
mkdir -p %{buildroot}/usr/share/ukui-media/translations
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/translations/*.qm %{buildroot}/usr/share/ukui-media/translations/
mkdir -p %{buildroot}/usr/share/ukui-media/img
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/img/* %{buildroot}/usr/share/ukui-media/img/
mkdir -p %{buildroot}/usr/share/ukui-media/qss
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/qss/* %{buildroot}/usr/share/ukui-media/qss/
mkdir -p %{buildroot}/usr/share/ukui-media/sounds
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/ukui-sound.xml %{buildroot}/usr/share/ukui-media/sounds/
mkdir -p %{buildroot}/usr/share/sounds/ukui
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/index.theme %{buildroot}/usr/share/sounds/ukui/
mkdir -p %{buildroot}/usr/share/sounds
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/*.ogg %{buildroot}/usr/share/ukui-media/sounds/
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/*.ogg %{buildroot}/usr/share/sounds/
mkdir -p %{buildroot}/usr/share/ukui-media/scripts
cp -r %{_builddir}/%{name}-%{version}/scripts/detection_output_mode.sh %{buildroot}/usr/share/ukui-media/scripts/
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/org.ukui.audio.gschema.xml %{buildroot}/usr/share/glib-2.0/schemas/
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/org.ukui.sound.gschema.xml %{buildroot}/usr/share/glib-2.0/schemas/
cp -r %{_builddir}/%{name}-%{version}/data/org.ukui.media.sound.gschema.xml %{buildroot}/usr/share/glib-2.0/schemas/
%clean
rm -rf $RPM_BUILD_ROOT
@ -113,12 +76,8 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
%files
%doc debian/changelog debian/copyright
%{_bindir}/ukui-volume-control
%{_bindir}/ukui-volume-control-applet
%{_bindir}/ukui-volume-control-applet-qt
%{_bindir}/ukui-media-control-led
%{_datadir}/applications/ukui-volume-control.desktop
%{_datadir}/ukui-media/translations/
%{_datadir}/ukui-media/img/
%{_datadir}/ukui-media/qss/
@ -129,45 +88,44 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
%{_datadir}/sounds/*
%{_datadir}/ukui-media/sounds/*
/lib/systemd/system/ukui-media-control-mute-led.service
%{_libdir}/ukui-control-center/libaudio.so
%files common
%{_sysconfdir}/xdg/autostart/
%{_datadir}/locale/
%{_datadir}/man/*
%{_datadir}/ukui-media/icons
%{_datadir}/glib-2.0/schemas/org.ukui.media.gschema.xml
%changelog
* Wed Dec 28 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-9
- Fix system-volume slider error
* Fri Feb 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-4
- fix coredump of ukui-volume-control-applet-qt
* Tue Aug 2 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-8
- modify license error
* Tue Jan 3 2023 lvfei <lvfei@kylinos.cn> - 3.1.0-3
- update Source0 Url
* Tue Aug 2 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-7
- remove 0001-add-check-pulseaudio-process.patch
* Tue Jan 3 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-2
- fix ukui-volume-control-applet-qt work error
* Mon Jun 27 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-6
- add pulseaudio process log message
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.0-1
- update version to 3.1.0
* Fri Jun 24 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-5
- add check pulseaudio process
* Thu Jul 28 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.2-18
- Add compilation dependencies: libpulse
* Tue Apr 19 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-4
* Thu Jul 28 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.2-17
- modify and update desktop file
* Thu Apr 28 2022 wangyueliang <wangyueliang@kylinos.cn> - 3.0.2-16
- Improve the project according to the requirements of compliance improvement.
* Tue Apr 19 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.2-15
- modify ukui-media install error
* Mon Feb 28 2022 douyan<douyan@kylinos.cn> - 3.0.4-3
- add missing file
* Sat Apr 02 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.2-14
- add yaml file
* Mon Feb 28 2022 huayadong<huayadong@kylinos.cn> - 3.0.4-2
- 添加org.ukui.sound.gschema.xml
* Mon Mar 28 2022 huayadong <huayadong@kylinos.cn> - 3.0.2-13
- Add DBUS interface to send plug-in signal for Kirin recording
* Fri Feb 25 2022 huayadong<huayadong@kylinos.cn> - 3.0.4-1
- update to upstream version 3.0.4-1
* Sun Sep 26 2021 peijiankang<peijiankang@kylinos.cn> - 3.0.2-12
- repair the kylin recorder volume dispaly error in ky
* Mon Sep 27 2021 peijiankang<peijiankang@kylinos.cn> - 3.0.2-12
- repair the problem of adjusting animation freeze
* Sun Sep 26 2021 peijiankang<peijiankang@kylinos.cn> - 3.0.2-11
- return version to 3.0.2-2

5
ukui-media.yaml Normal file
View File

@ -0,0 +1,5 @@
version_control: github
src_repo: UKUI/ukui-media
tag_prefix: "^v"
separator: "."