Update to 1.9.1

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
epel9
Michel Alexandre Salim 4 years ago
parent e8bb4f7273
commit cd502e7454

2
.gitignore vendored

@ -1 +1 @@
/rubberband-1.9.0.tar.bz2
/rubberband-1.9.1.tar.bz2

@ -1,64 +0,0 @@
# HG changeset patch
# User 'Michel Alexandre Salim <salimma@fedoraproject.org>'
# Date 1605661509 28800
# Tue Nov 17 17:05:09 2020 -0800
# Node ID a5ac0c9466c59d232d77ac2f82be55a1fb76d1d5
# Parent 9df2a19b93a3c4076f2c87cae5022d2b6ae6580e
Make INSTALL_LIBDIR configurable
Some Linux distributions have INSTALL_LIBDIR set to $(PREFIX)/lib64 rather
than $(PREFIX)/lib. Allow overriding this; @libdir@ defaults to '${exec_prefix}/lib'
so this is a no-op unless overridden.
Also use `INSTALL_LIBDIR` to configure `INSTALL_VAMPDIR`, `INSTALL_LADSPADIR` and
`INSTALL_PKGDIR`
diff -r 9df2a19b93a3 -r a5ac0c9466c5 Makefile.in
--- a/Makefile.in Tue Nov 17 16:48:50 2020 -0800
+++ b/Makefile.in Tue Nov 17 17:05:09 2020 -0800
@@ -23,11 +23,11 @@
INSTALL_BINDIR := $(PREFIX)/bin
INSTALL_INCDIR := $(PREFIX)/include/rubberband
-INSTALL_LIBDIR := $(PREFIX)/lib
-INSTALL_VAMPDIR := $(PREFIX)/lib/vamp
-INSTALL_LADSPADIR := $(PREFIX)/lib/ladspa
+INSTALL_LIBDIR := @libdir@
+INSTALL_VAMPDIR := $(INSTALL_LIBDIR)/vamp
+INSTALL_LADSPADIR := $(INSTALL_LIBDIR)/ladspa
INSTALL_LRDFDIR := $(PREFIX)/share/ladspa/rdf
-INSTALL_PKGDIR := $(PREFIX)/lib/pkgconfig
+INSTALL_PKGDIR := $(INSTALL_LIBDIR)/pkgconfig
LIBNAME := librubberband
JNINAME := librubberband-jni
@@ -196,6 +196,7 @@
ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
test -f $(JNI_TARGET) && cp -fp $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) || true
sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
+ | sed "s,%LIBDIR%,$(INSTALL_LIBDIR)," \
> $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
ifeq ($(WITH_PROGRAMS), yes)
$(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
diff -r 9df2a19b93a3 -r a5ac0c9466c5 Makefile.osx
--- a/Makefile.osx Tue Nov 17 16:48:50 2020 -0800
+++ b/Makefile.osx Tue Nov 17 17:05:09 2020 -0800
@@ -177,6 +177,7 @@
cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
+ | sed "s,%LIBDIR%,$(INSTALL_LIBDIR)," \
> $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
clean:
diff -r 9df2a19b93a3 -r a5ac0c9466c5 rubberband.pc.in
--- a/rubberband.pc.in Tue Nov 17 16:48:50 2020 -0800
+++ b/rubberband.pc.in Tue Nov 17 17:05:09 2020 -0800
@@ -1,6 +1,6 @@
prefix=%PREFIX%
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=%LIBDIR%
includedir=${prefix}/include
Name: rubberband

@ -1,56 +0,0 @@
# HG changeset patch
# User 'Michel Alexandre Salim <salimma@fedoraproject.org>'
# Date 1605660530 28800
# Tue Nov 17 16:48:50 2020 -0800
# Node ID 9df2a19b93a3c4076f2c87cae5022d2b6ae6580e
# Parent 8f1295fa2ed4178ef84812b9909d2fc90cfa5bff
Preserve permissions when installing files
Use `cp -p` rather than `cp`
diff -r 8f1295fa2ed4 -r 9df2a19b93a3 Makefile.in
--- a/Makefile.in Thu Oct 08 11:20:52 2020 +0100
+++ b/Makefile.in Tue Nov 17 16:48:50 2020 -0800
@@ -186,32 +186,32 @@
$(MKDIR) -p $(DESTDIR)$(INSTALL_INCDIR)
$(MKDIR) -p $(DESTDIR)$(INSTALL_LIBDIR)
$(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
- cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
- cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+ cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
+ cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION)
- cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION)
+ cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION)
ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
- test -f $(JNI_TARGET) && cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) || true
+ test -f $(JNI_TARGET) && cp -fp $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) || true
sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
> $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
ifeq ($(WITH_PROGRAMS), yes)
$(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
- cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
+ cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
endif
ifeq ($(WITH_VAMP), yes)
$(MKDIR) -p $(DESTDIR)$(INSTALL_VAMPDIR)
- cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
- cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
+ cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
+ cp -p vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
endif
ifeq ($(WITH_LADSPA), yes)
$(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR)
$(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR)
- cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
- cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
- cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
+ cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
+ cp -p ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
+ cp -p ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
endif
clean:

@ -1,15 +1,13 @@
Name: rubberband
Version: 1.9.0
Release: 2%{?dist}
Version: 1.9.1
Release: 1%{?dist}
Summary: Audio time-stretching and pitch-shifting library
License: GPLv2+
URL: http://www.breakfastquay.com/rubberband/
Source0: https://breakfastquay.com/files/releases/%{name}-%{version}.tar.bz2
Patch0: %{name}-1.9.0-permissions.patch
Patch1: %{name}-1.9.0-libdir.patch
BuildRequires: make
BuildRequires: meson
BuildRequires: gcc-c++
BuildRequires: ladspa-devel
BuildRequires: pkgconfig(fftw3)
@ -39,16 +37,21 @@ developing applications that use %{name}.
%build
%configure --disable-static
%make_build
%meson
%meson_build
%install
%make_install
%meson_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
# no tests yet
# check
# meson_test
%files
%license COPYING
%doc README.md
@ -66,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
%changelog
* Wed Mar 17 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.9.1-1
- Update to 1.9.1
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

@ -1 +1 @@
SHA512 (rubberband-1.9.0.tar.bz2) = 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
SHA512 (rubberband-1.9.1.tar.bz2) = cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3

Loading…
Cancel
Save