diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch deleted file mode 100644 index 5d7a293b51d..00000000000 --- a/srcpkgs/liquid-dsp/patches/define-soname.patch +++ /dev/null @@ -1,35 +0,0 @@ -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. - ---- ---- a/makefile.in -+++ b/makefile.in -@@ -1221,7 +1221,7 @@ - ${AR} r $@ $^ - ${RANLIB} $@ - --libliquid.so: libliquid.a -+$(SHARED_LIB): libliquid.a - $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS) - - # static archive and library objects -@@ -1247,6 +1247,7 @@ - mkdir -p $(DESTDIR)$(prefix)/include/liquid - 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 "---------------------------------------------------------" ---- 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 - ;; - esac diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch index ec9aa6482b4..6029886906c 100644 --- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch +++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch @@ -2,7 +2,16 @@ Index: makefile.in =================================================================== --- a/makefile.in +++ b/makefile.in -@@ -1201,7 +1201,7 @@ install: all +@@ -1287,7 +1287,7 @@ + @echo "" + mkdir -p $(DESTDIR)$(prefix)/include/liquid + mkdir -p $(DESTDIR)$(libdir) +- install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB}.${VERSION} ++ install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB} + install -m 644 -p libliquid.${SH_LIB} $(DESTDIR)$(libdir)/libliquid.${SH_LIB}.${VERSION} + install -m 644 -p include/liquid.h $(DESTDIR)$(prefix)/include/liquid/liquid.h + ln -sf libliquid.${SH_LIB}.${VERSION} $(DESTDIR)$(libdir)/libliquid.${SH_LIB} +@@ -1300,7 +1300,7 @@ install: all @echo " libraries by running 'ldconfig' to make the shared" @echo " object available. You might also need to modify your" @echo " LD_LIBRARY_PATH environment variable to include the" diff --git a/srcpkgs/liquid-dsp/patches/fix-soname.patch b/srcpkgs/liquid-dsp/patches/fix-soname.patch new file mode 100644 index 00000000000..01fffaf0a5a --- /dev/null +++ b/srcpkgs/liquid-dsp/patches/fix-soname.patch @@ -0,0 +1,11 @@ +--- a/makefile.in ++++ b/makefile.in +@@ -1264,7 +1264,7 @@ + ${RANLIB} $@ + + libliquid.so : libliquid.a +- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@.1 -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS) + + # static archive and library objects + all: ${ARCHIVE_LIB} ${SHARED_LIB} diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template index 79b964a52d7..0276e85aa0a 100644 --- a/srcpkgs/liquid-dsp/template +++ b/srcpkgs/liquid-dsp/template @@ -1,8 +1,9 @@ # Template file for 'liquid-dsp' pkgname=liquid-dsp -version=1.4.0 +version=1.5.0 revision=1 build_style=gnu-configure +configure_args="--enable-simdoverride" hostmakedepends="automake libtool" makedepends="fftw-devel" short_desc="Signal processing library for software-defined radios (SDR)" @@ -10,7 +11,7 @@ maintainer="classabbyamp " license="MIT" homepage="http://liquidsdr.org/" distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz" -checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 +checksum=93003edb6e74090b41009b1fae6f273a3e711dc4c8c56a0cca3e89167b765953 pre_configure() { autoreconf -fi