[packages/jaaa] - updated to 0.9.2 - updated makefile patch

[qboosh]

commit 99937abeeba09b78f40a64b236f207a47444a0ed
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 27 20:32:05 2021 +0200

    - updated to 0.9.2
    - updated makefile patch

 jaaa.spec      | 29 ++++++++++++++++-------------
 makefile.patch | 31 ++++++++++++-------------------
 2 files changed, 28 insertions(+), 32 deletions(-)
---
diff --git a/jaaa.spec b/jaaa.spec
index 418cf9a..69c61b1 100644
--- a/jaaa.spec
+++ b/jaaa.spec
@@ -1,29 +1,32 @@
-#
-# Conditional build:
-%bcond_with	tests		# build with tests
-%bcond_without	tests		# build without tests
-#
 Summary:	JACK and ALSA Audio Analyser
+Summary(pl.UTF-8):	Analizator dźwięku JACK i ALSA
 Name:		jaaa
-Version:	0.8.4
+Version:	0.9.2
 Release:	1
 License:	GPL v2
-Group:		Applications
+Group:		Applications/Sound
 Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	2eed043d641788541c15929183ef277f
+# Source0-md5:	02ceeda017e57635c64302e6271ad094
 Patch0:		makefile.patch
 URL:		http://kokkinizita.linuxaudio.org/linuxaudio/index.html
-BuildRequires:	clthreads-devel
-BuildRequires:	clxclient-devel
+BuildRequires:	clthreads-devel >= 2.4.0
+BuildRequires:	clxclient-devel >= 3.9.0
 BuildRequires:	fftw3-single-devel
 BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	zita-alsa-pcmi-devel
+BuildRequires:	zita-alsa-pcmi-devel >= 0.3.0
+Requires:	clthreads >= 2.4.0
+Requires:	clxclient >= 3.9.0
+Requires:	zita-alsa-pcmi >= 0.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Jaaa (JACK and ALSA Audio Analyser, is an audio signal generator and
+Jaaa (JACK and ALSA Audio Analyser), is an audio signal generator and
 spectrum analyser designed to make accurate measurements.
 
+%description -l pl.UTF-8
+Jaaa (JACK and ALSA Audio Analyser) to generator i analizator widma
+sygnałów dźwiękowych, zaprojektowany z myślą o dokładnych pomiarach.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -48,4 +51,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README
-%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/jaaa
diff --git a/makefile.patch b/makefile.patch
index 0affbf8..dadba16 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,21 +1,14 @@
-diff -dur jaaa-0.8.4.orig/source/Makefile jaaa-0.8.4/source/Makefile
---- jaaa-0.8.4.orig/source/Makefile	2013-07-01 12:07:41.000000000 +0200
-+++ jaaa-0.8.4/source/Makefile	2016-10-15 12:26:24.284245116 +0200
-@@ -24,15 +24,14 @@
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.8.4
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CXXFLAGS += -O2 -Wall -MMD -MP
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -MMD -MP
- LDFLAGS += -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
- 
+--- jaaa-0.9.2/source/Makefile.orig	2021-09-27 20:01:46.032792774 +0200
++++ jaaa-0.9.2/source/Makefile	2021-09-27 20:28:35.964071029 +0200
+@@ -23,9 +23,8 @@ BINDIR ?= $(PREFIX)/bin
  
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
+ VERSION = 0.9.2
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I.
+-CPPFLAGS += $(shell pkgconf --cflags freetype2)
+-CXXFLAGS += -O2 -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += $(shell pkg-config --cflags xft)
++CXXFLAGS += -Wall
+ LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lasound -lpthread \
+ 	-lfftw3f -ljack -lXft -lX11 -lrt
  
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jaaa.git/commitdiff/99937abeeba09b78f40a64b236f207a47444a0ed