diff --git a/common/shlibs b/common/shlibs index 8d5f49df2ec..c1ed4862ae9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3603,7 +3603,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1 libQuotient.so.0.6 libQuotient-0.6.11_1 libipset.so.13 libipset-7.9_1 libmp3splt.so.0 libmp3splt-0.9.2_1 -libliquid.so.1 liquid-dsp-1.3.1_1 +libliquid.so.1 liquid-dsp-1.4.0_1 libsnore-qt5.so.0.7 snorenotify-0.7.0_1 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1 libTECkit.so.0 libteckit-2.5.8_1 diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch index 425ea08ead0..5d7a293b51d 100644 --- a/srcpkgs/liquid-dsp/patches/define-soname.patch +++ b/srcpkgs/liquid-dsp/patches/define-soname.patch @@ -1,39 +1,33 @@ Description: Add versioned soname to library Upstream has no versioned soname yet, so this patch adds a Debian specific soname version until something is added upstream. -Author: Andreas Bombe -Last-Update: 2016-12-11 + --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: git/makefile.in -=================================================================== ---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200 -+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200 -@@ -1167,7 +1167,7 @@ - $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS) +--- a/makefile.in ++++ b/makefile.in +@@ -1221,7 +1221,7 @@ + ${AR} r $@ $^ + ${RANLIB} $@ - # linux, et al -libliquid.so: libliquid.a +$(SHARED_LIB): libliquid.a $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS) - all: libliquid.a $(SHARED_LIB) -@@ -1191,6 +1191,7 @@ - mkdir -p $(DESTDIR)$(exec_prefix)$(libdir) + # static archive and library objects +@@ -1247,6 +1247,7 @@ mkdir -p $(DESTDIR)$(prefix)/include/liquid - install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir) -+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so + mkdir -p $(DESTDIR)$(libdir) + install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir) ++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid @echo "" @echo "---------------------------------------------------------" -Index: git/configure.ac -=================================================================== ---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200 -+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200 -@@ -242,7 +242,7 @@ - REBIND="" - ;; - *) +--- a/configure.ac ++++ b/configure.ac +@@ -270,7 +270,7 @@ + AC_PROG_AR + + AR_LIB=libliquid.a - SH_LIB=libliquid.so + SH_LIB=libliquid.so.1 REBIND=ldconfig diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch index 61048e6fd9b..ec9aa6482b4 100644 --- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch +++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch @@ -2,33 +2,6 @@ Index: makefile.in =================================================================== --- a/makefile.in +++ b/makefile.in -@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@ - BUGREPORT := @PACKAGE_BUGREPORT@ - - # paths --srcdir := @srcdir@ --libdir := @libdir@ - prefix := @prefix@ - exec_prefix := @exec_prefix@ -+srcdir := @srcdir@ -+libdir := @libdir@ - include_dirs := . include - - # programs -@@ -1188,10 +1188,10 @@ help: - install: all - @echo "installing..." - @echo "" -- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir) -+ mkdir -p $(DESTDIR)$(libdir) - mkdir -p $(DESTDIR)$(prefix)/include/liquid -- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir) -- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so -+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir) -+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so - install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid - @echo "" - @echo "---------------------------------------------------------" @@ -1201,7 +1201,7 @@ install: all @echo " libraries by running 'ldconfig' to make the shared" @echo " object available. You might also need to modify your" @@ -38,14 +11,3 @@ Index: makefile.in @echo "" @echo " Please report bugs to $(BUGREPORT)" @echo "---------------------------------------------------------" -@@ -1214,8 +1214,8 @@ install: all - uninstall: - @echo "uninstalling..." - $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install)) -- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a -- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB) -+ $(RM) $(DESTDIR)$(libdir)/libliquid.a -+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB) - @echo "done." - - ## diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template index 432adac62cf..79b964a52d7 100644 --- a/srcpkgs/liquid-dsp/template +++ b/srcpkgs/liquid-dsp/template @@ -1,16 +1,16 @@ # Template file for 'liquid-dsp' pkgname=liquid-dsp -version=1.3.1 +version=1.4.0 revision=1 build_style=gnu-configure -hostmakedepends="automake" +hostmakedepends="automake libtool" makedepends="fftw-devel" short_desc="Signal processing library for software-defined radios (SDR)" -maintainer="bra1nwave " +maintainer="classabbyamp " license="MIT" homepage="http://liquidsdr.org/" distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz" -checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73 +checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 pre_configure() { autoreconf -fi