[packages/patchage] - updated to 1.0.10
qboosh
qboosh at pld-linux.org
Mon Apr 3 20:28:29 CEST 2023
commit c988411c64d0427815e7295fb3a01d8e3a4ce5bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Apr 3 20:30:53 2023 +0200
- updated to 1.0.10
patchage-fmt.patch | 137 -----------------------------------------------------
patchage.spec | 16 +++----
2 files changed, 8 insertions(+), 145 deletions(-)
---
diff --git a/patchage.spec b/patchage.spec
index 582641d..ec24739 100644
--- a/patchage.spec
+++ b/patchage.spec
@@ -1,16 +1,14 @@
Summary: Modular patch bay for audio and MIDI systems based on JACK and ALSA
Summary(pl.UTF-8): Modularny panel połączeniowy dla systemów dźwiękowych i MIDI opartych na JACK-u i ALSA-ie
Name: patchage
-Version: 1.0.8
+Version: 1.0.10
Release: 1
License: GPL v3+
Group: X11/Applications/Sound
Source0: http://download.drobilla.net/%{name}-%{version}.tar.xz
-# Source0-md5: 05e444dbb0a81a72c2bc09d09881f575
-Patch0: %{name}-fmt.patch
+# Source0-md5: cd686e3a4a01fce08f27096e080c720b
URL: http://drobilla.net/software/patchage/
BuildRequires: alsa-lib-devel >= 1.0
-BuildRequires: boost-devel
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
BuildRequires: ganv-devel >= 1.5.2
@@ -18,7 +16,7 @@ BuildRequires: glib2-devel >= 1:2.14.0
BuildRequires: glibmm-devel >= 2.14.0
BuildRequires: gtkmm-devel >= 2.12.0
BuildRequires: jack-audio-connection-kit-devel >= 0.120.0
-BuildRequires: libfmt-devel >= 7.1.3
+BuildRequires: libfmt-devel >= 9
BuildRequires: libstdc++-devel >= 6:7
BuildRequires: meson >= 0.56.0
BuildRequires: ninja >= 1.5
@@ -31,7 +29,7 @@ Requires: glib2 >= 1:2.14.0
Requires: glibmm >= 2.14.0
Requires: gtkmm >= 2.12.0
Requires: jack-audio-connection-kit-libs >= 0.120.0
-Requires: libfmt >= 7.1.3
+Requires: libfmt >= 9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -44,7 +42,6 @@ MIDI opartych na JACK-u i ALSA-ie.
%prep
%setup -q
-%patch0 -p1
%build
%meson build
@@ -56,18 +53,21 @@ rm -rf $RPM_BUILD_ROOT
%ninja_install -C build
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS NEWS README.md
%attr(755,root,root) %{_bindir}/patchage
%{_datadir}/patchage
%{_desktopdir}/patchage.desktop
%{_iconsdir}/hicolor/*x*/apps/patchage.png
+%{_iconsdir}/hicolor/*x*/apps/patchage.svg
%{_iconsdir}/hicolor/scalable/apps/patchage.svg
%{_mandir}/man1/patchage.1*
diff --git a/patchage-fmt.patch b/patchage-fmt.patch
deleted file mode 100644
index 5ffdfcb..0000000
--- a/patchage-fmt.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- patchage-1.0.8/src/Canvas.cpp.orig 2022-08-14 00:15:32.000000000 +0200
-+++ patchage-1.0.8/src/Canvas.cpp 2022-09-01 21:47:16.557079433 +0200
-@@ -76,7 +76,7 @@ Canvas::create_port(Configuration& conf
- const auto client_info = metadata.client(client_id);
- if (!client_info) {
- _log.error(fmt::format(
-- R"(Unable to add port "{}", client "{}" is unknown)", id, client_id));
-+ R"(Unable to add port "{}", client "{}" is unknown)", fmt::streamed(id), fmt::streamed(client_id)));
-
- return nullptr;
- }
---- patchage-1.0.8/src/event_to_string.cpp.orig 2022-08-14 00:15:32.000000000 +0200
-+++ patchage-1.0.8/src/event_to_string.cpp 2022-09-01 21:52:35.848683015 +0200
-@@ -57,12 +57,12 @@ struct EventPrinter {
-
- std::string operator()(const event::ClientCreated& event)
- {
-- return fmt::format(R"(Add client "{}" ("{}"))", event.id, event.info.label);
-+ return fmt::format(R"(Add client "{}" ("{}"))", fmt::streamed(event.id), event.info.label);
- }
-
- std::string operator()(const event::ClientDestroyed& event)
- {
-- return fmt::format(R"(Remove client "{}")", event.id);
-+ return fmt::format(R"(Remove client "{}")", fmt::streamed(event.id));
- }
-
- std::string operator()(const PortType port_type)
-@@ -103,7 +103,7 @@ struct EventPrinter {
- event.info.is_terminal ? " terminal" : "",
- (*this)(event.info.type),
- (*this)(event.info.direction),
-- event.id,
-+ fmt::streamed(event.id),
- event.info.label);
-
- if (event.info.order) {
-@@ -115,17 +115,17 @@ struct EventPrinter {
-
- std::string operator()(const event::PortDestroyed& event)
- {
-- return fmt::format(R"("Remove port "{}")", event.id);
-+ return fmt::format(R"("Remove port "{}")", fmt::streamed(event.id));
- }
-
- std::string operator()(const event::PortsConnected& event)
- {
-- return fmt::format(R"(Connect "{}" to "{}")", event.tail, event.head);
-+ return fmt::format(R"(Connect "{}" to "{}")", fmt::streamed(event.tail), fmt::streamed(event.head));
- }
-
- std::string operator()(const event::PortsDisconnected& event)
- {
-- return fmt::format(R"(Disconnect "{}" from "{}")", event.tail, event.head);
-+ return fmt::format(R"(Disconnect "{}" from "{}")", fmt::streamed(event.tail), fmt::streamed(event.head));
- }
- };
-
---- patchage-1.0.8/src/AlsaDriver.cpp.orig 2022-08-14 00:15:32.000000000 +0200
-+++ patchage-1.0.8/src/AlsaDriver.cpp 2022-09-01 21:54:12.138161370 +0200
-@@ -350,7 +350,7 @@ AlsaDriver::connect(const PortID& tail_i
-
- if (!result) {
- _log.error(
-- fmt::format("[ALSA] Failed to connect {} => {}", tail_id, head_id));
-+ fmt::format("[ALSA] Failed to connect {} => {}", fmt::streamed(tail_id), fmt::streamed(head_id)));
- }
-
- return (!result);
-@@ -385,8 +385,8 @@ AlsaDriver::disconnect(const PortID& tai
- int ret = snd_seq_unsubscribe_port(_seq, subs);
- if (ret < 0) {
- _log.error(fmt::format("[ALSA] Failed to disconnect {} => {} ({})",
-- tail_id,
-- head_id,
-+ fmt::streamed(tail_id),
-+ fmt::streamed(head_id),
- snd_strerror(ret)));
- return false;
- }
---- patchage-1.0.8/src/handle_event.cpp.orig 2022-08-14 00:15:32.000000000 +0200
-+++ patchage-1.0.8/src/handle_event.cpp 2022-09-01 21:58:32.040086694 +0200
-@@ -87,7 +87,7 @@ public:
-
- if (!port) {
- _log.error(
-- fmt::format("Unable to create view for port \"{}\"", event.id));
-+ fmt::format("Unable to create view for port \"{}\"", fmt::streamed(event.id)));
- }
- }
-
-@@ -104,10 +104,10 @@ public:
-
- if (!port_1) {
- _log.error(
-- fmt::format("Unable to find port \"{}\" to connect", event.tail));
-+ fmt::format("Unable to find port \"{}\" to connect", fmt::streamed(event.tail)));
- } else if (!port_2) {
- _log.error(
-- fmt::format("Unable to find port \"{}\" to connect", event.head));
-+ fmt::format("Unable to find port \"{}\" to connect", fmt::streamed(event.head)));
- } else {
- _canvas.make_connection(port_1, port_2);
- }
-@@ -120,10 +120,10 @@ public:
-
- if (!port_1) {
- _log.error(
-- fmt::format("Unable to find port \"{}\" to disconnect", event.tail));
-+ fmt::format("Unable to find port \"{}\" to disconnect", fmt::streamed(event.tail)));
- } else if (!port_2) {
- _log.error(
-- fmt::format("Unable to find port \"{}\" to disconnect", event.head));
-+ fmt::format("Unable to find port \"{}\" to disconnect", fmt::streamed(event.head)));
- } else {
- _canvas.remove_edge_between(port_1, port_2);
- }
---- patchage-1.0.8/src/Reactor.cpp.orig 2022-08-14 00:15:32.000000000 +0200
-+++ patchage-1.0.8/src/Reactor.cpp 2022-09-01 21:59:27.069788573 +0200
-@@ -87,7 +87,7 @@ Reactor::operator()(const action::Connec
- if (auto* d = _drivers.driver(action.tail.type())) {
- d->connect(action.tail, action.head);
- } else {
-- _log.error(fmt::format("No driver for {}", action.tail.type()));
-+ _log.error(fmt::format("No driver for {}", fmt::streamed(action.tail.type())));
- }
- } else {
- _log.warning("Unable to connect incompatible port");
-@@ -127,7 +127,7 @@ Reactor::operator()(const action::Discon
- if (auto* d = _drivers.driver(action.tail.type())) {
- d->disconnect(action.tail, action.head);
- } else {
-- _log.error(fmt::format("No driver for {}", action.tail.type()));
-+ _log.error(fmt::format("No driver for {}", fmt::streamed(action.tail.type())));
- }
- } else {
- _log.error("Unable to disconnect incompatible ports");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/patchage.git/commitdiff/c988411c64d0427815e7295fb3a01d8e3a4ce5bf
More information about the pld-cvs-commit
mailing list