commit c9ff855950515bed03ab1263074fba21bd9700ce
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 26 20:31:44 2021 +0200
- updated to 0.3.2
makefile.patch | 78 +++++++++++++++++++++--------------------------------
zita-alsa-pcmi.spec | 42 ++++++++++++++++-------------
2 files changed, 54 insertions(+), 66 deletions(-)
---
diff --git a/zita-alsa-pcmi.spec b/zita-alsa-pcmi.spec
index 9661026..770a218 100644
--- a/zita-alsa-pcmi.spec
+++ b/zita-alsa-pcmi.spec
@@ -1,11 +1,12 @@
Summary: C++ library for easy access to ALSA PCM devices
+Summary(pl.UTF-8): Biblioteka C++ do łatwego dostępu do urządzeń ALSA PCM
Name: zita-alsa-pcmi
-Version: 0.2.0
-Release: 2
+Version: 0.3.2
+Release: 1
License: GPL v3+
Group: Libraries
Source0:
http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 0ba4d59abce231056e2628d081124114
+# Source0-md5: 1596e6b11af312e2d28ae92b10f73971
Patch0: makefile.patch
URL: http://kokkinizita.linuxaudio.org/linuxaudio/
BuildRequires: alsa-lib-devel
@@ -18,12 +19,19 @@ to ALSA PCM devices, taking care of the many functions
required to
open, initialise and use a hw: device in mmap mode, and providing
floating point audio data.
+%description -l pl.UTF-8
+Zita-alsa-pcmi to następca clalsadrv. Zapewnia łatwy dostęp do
+urządzeń ALSA PCM, biorąc na siebie wiele funkcji wymaganych do
+otwarcia, zainicjowania i użycia urządzeń hw: w trybie mmap, oraz
+obsługując zmiennoprzecinkowe dane dźwiękowe.
+
%package devel
Summary: Header files for %{name} library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name}
Group: Development/Libraries
-Requires: alsa-lib-devel
Requires: %{name} = %{version}-%{release}
+Requires: alsa-lib-devel
+Requires: libstdc++-devel
%description devel
Header files for %{name} library.
@@ -33,7 +41,7 @@ Pliki nagłówkowe biblioteki %{name}.
%package apps
Summary: Sample applications files for %{name} library
-Summary(pl.UTF-8): Przykładowe aplikacje biblioteki %{name}
+Summary(pl.UTF-8): Przykładowe aplikacje do biblioteki %{name}
Group: Applications/Sound
Requires: %{name} = %{version}-%{release}
@@ -41,14 +49,14 @@ Requires: %{name} = %{version}-%{release}
Sample applications files for %{name} library.
%description devel -l pl.UTF-8
-Przykładowe aplikacje biblioteki %{name}.
+Przykładowe aplikacje do biblioteki %{name}.
%prep
%setup -q
%patch0 -p1
%build
-cd libs
+cd source
CXX="%{__cxx}" \
CXXFLAGS="%{rpmcxxflags}" \
CPPFLAGS="%{rpmcppflags}" \
@@ -57,21 +65,19 @@ LDFLAGS="%{rpmldflags}" \
ln -sf libzita-alsa-pcmi.so.* libzita-alsa-pcmi.so
cd ..
-cd apps
CXX="%{__cxx}" \
CXXFLAGS="%{rpmcxxflags}" \
-CPPFLAGS="%{rpmcppflags} -I../libs" \
-LDFLAGS="%{rpmldflags} -L../libs" \
-%{__make}
-cd ..
+CPPFLAGS="%{rpmcppflags} -I../source" \
+LDFLAGS="%{rpmldflags} -L../source" \
+%{__make} -C apps
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C libs install \
+%{__make} -C source install \
DESTDIR=$RPM_BUILD_ROOT \
PREFIX=%{_prefix} \
- LIBDIR=%{_lib}
+ LIBDIR=%{_libdir}
%{__make} -C apps install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -86,13 +92,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS README
-%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.0
+%attr(755,root,root) %{_libdir}/libzita-alsa-pcmi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libzita-alsa-pcmi.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}.h
+%attr(755,root,root) %{_libdir}/libzita-alsa-pcmi.so
+%{_includedir}/zita-alsa-pcmi.h
%files apps
%defattr(644,root,root,755)
diff --git a/makefile.patch b/makefile.patch
index 5a2371e..2f2f60d 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,59 +1,41 @@
-diff -dur zita-alsa-pcmi-0.2.0.orig/apps/Makefile
zita-alsa-pcmi-0.2.0/apps/Makefile
---- zita-alsa-pcmi-0.2.0.orig/apps/Makefile 2012-03-20 21:23:07.000000000
+0100
-+++ zita-alsa-pcmi-0.2.0/apps/Makefile 2016-10-15 12:35:42.895883965 +0200
-@@ -25,7 +25,7 @@
- VERSION = "0.1.0"
- LDFLAGS += -L$(PREFIX)/$(LIBDIR)
- CPPFLAGS += -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O2 -Wall -MMD -MP
-+CXXFLAGS += -Wall -MMD -MP
+--- zita-alsa-pcmi-0.3.2/apps/Makefile.orig 2021-09-26 20:12:49.143936028
+0200
++++ zita-alsa-pcmi-0.3.2/apps/Makefile 2021-09-26 20:18:13.738844213 +0200
+@@ -25,7 +25,7 @@ BINDIR ?= $(PREFIX)/bin
+
+ VERSION = "0.3.2"
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2 -Wall
++CXXFLAGS += -Wall
all: alsa_loopback alsa_delay
-@@ -34,7 +34,7 @@
- ALSA_LOOPBACK_O = alsa_loopback.o pxthread.o
- alsa_loopback: LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_loopback: $(ALSA_LOOPBACK_O)
-- g++ $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
-+ $(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
- $(ALSA_LOOPBACK_O):
- -include $(_ALSA_LOOPBACK_O:%.o=%.d)
-
-@@ -42,7 +42,7 @@
- ALSA_DELAY_O = alsa_delay.o mtdm.o pxthread.o
- alsa_delay: LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_delay: $(ALSA_DELAY_O)
-- g++ $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
-+ $(CXX) $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
- $(ALSA_DELAY_O):
- -include $(ALSA_DELAY_O:%.o=%.d)
-
-diff -dur zita-alsa-pcmi-0.2.0.orig/libs/Makefile
zita-alsa-pcmi-0.2.0/libs/Makefile
---- zita-alsa-pcmi-0.2.0.orig/libs/Makefile 2012-03-20 21:23:07.000000000
+0100
-+++ zita-alsa-pcmi-0.2.0/libs/Makefile 2016-10-15 12:35:36.072491159 +0200
-@@ -31,7 +31,7 @@
-
-
- CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -O2 -Wall -I. -fPIC
-+CXXFLAGS += -Wall -I. -fPIC
- LDLFAGS +=
- LDLIBS +=
+@@ -48,7 +48,7 @@ $(ALSA_DELAY_O):
-@@ -45,14 +45,14 @@
+ install: all
+- install -d $(BINDIR)
++ install -d $(DESTDIR)$(BINDIR)
+ install -m 755 alsa_loopback $(DESTDIR)$(BINDIR)
+ install -m 755 alsa_delay $(DESTDIR)$(BINDIR)
- $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O)
-- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o
$(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
-+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o
$(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
+--- zita-alsa-pcmi-0.3.2/source/Makefile.orig 2018-08-24 20:41:30.000000000
+0200
++++ zita-alsa-pcmi-0.3.2/source/Makefile 2021-09-26 20:19:30.798426745
+0200
+@@ -30,8 +30,7 @@ MINVERS = 3.2
+ VERSION = $(MAJVERS).$(MINVERS)
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -O2 -Wall -fPIC
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC
+ LDLFAGS +=
+ LDLIBS +=
- install: $(ZITA-ALSA-PCMI_MIN)
- install -Dm 644 $(ZITA-ALSA-PCMI_H)
$(DESTDIR)$(PREFIX)/include/$(ZITA-ALSA-PCMI_H)
- install -Dm 644 $(ZITA-ALSA-PCMI_MIN)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
- ln -sf $(ZITA-ALSA-PCMI_MIN)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
+@@ -53,7 +52,7 @@ install: $(ZITA-ALSA-PCMI_MIN)
+ install -d $(DESTDIR)$(LIBDIR)
+ install -m 644 $(ZITA-ALSA-PCMI_H) $(DESTDIR)$(INCDIR)
+ install -m 755 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(LIBDIR)
- ldconfig
-+ /sbin/ldconfig -n -N $(DESTDIR)$(PREFIX)/$(LIBDIR)
++ -/sbin/ldconfig -n -N $(DESTDIR)$(LIBDIR)
+ ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
uninstall:
- rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zita-alsa-pcmi.git/commitdiff/c9ff855950515bed03ab1263074fba21bd9700ce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
