diff --git a/audio/zita-resampler/Makefile b/audio/zita-resampler/Makefile index f92afd242369..e28a3c343787 100644 --- a/audio/zita-resampler/Makefile +++ b/audio/zita-resampler/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= zita-resampler -PORTVERSION= 1.6.2 -PORTREVISION= 2 +PORTVERSION= 1.8.0 CATEGORIES= audio MASTER_SITES= http://kokkinizita.linuxaudio.org/linuxaudio/downloads/ diff --git a/audio/zita-resampler/distinfo b/audio/zita-resampler/distinfo index 2c57301b2405..6b6a098c1730 100644 --- a/audio/zita-resampler/distinfo +++ b/audio/zita-resampler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535358067 -SHA256 (zita-resampler-1.6.2.tar.bz2) = 233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7 -SIZE (zita-resampler-1.6.2.tar.bz2) = 125539 +TIMESTAMP = 1609871294 +SHA256 (zita-resampler-1.8.0.tar.bz2) = e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2 +SIZE (zita-resampler-1.8.0.tar.bz2) = 131161 diff --git a/audio/zita-resampler/files/patch-source_Makefile b/audio/zita-resampler/files/patch-Makefile similarity index 69% rename from audio/zita-resampler/files/patch-source_Makefile rename to audio/zita-resampler/files/patch-Makefile index ba35c0963bc0..ec2d9eaf2be5 100644 --- a/audio/zita-resampler/files/patch-source_Makefile +++ b/audio/zita-resampler/files/patch-Makefile @@ -1,14 +1,5 @@ ---- Makefile.orig 2018-08-24 18:41:47 UTC +--- Makefile.orig 2020-12-28 20:09:24 UTC +++ Makefile -@@ -1,7 +1,7 @@ - # ---------------------------------------------------------------------------- - # - # Copyright (C) 2006-2018 Fons Adriaensen --# -+# - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 3 of the License, or @@ -20,10 +20,9 @@ # Modify as required. @@ -20,17 +11,15 @@ +LIBDIR ?= $(PREFIX)/lib MAJVERS = 1 - MINVERS = 6.2 -@@ -33,8 +32,7 @@ DISTDIR = zita-resampler-$(VERSION) - + MINVERS = 8.0 +@@ -33,7 +32,6 @@ DISTDIR = zita-resampler-$(VERSION) CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + CPPFLAGS += -DENABLE_SSE2 CXXFLAGS += -Wall -fPIC -O2 -ffast-math -CXXFLAGS += -march=native --LDFLAGS += -+LDFLAGS += + LDFLAGS += LDLIBS += - @@ -46,6 +44,7 @@ ZITA-RESAMPLER_O = resampler.o vresampler.o resampler- ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \ zita-resampler/vresampler.h zita-resampler/cresampler.h @@ -39,7 +28,7 @@ $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O) $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) -@@ -56,9 +55,10 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) +@@ -56,9 +55,9 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) install: $(ZITA-RESAMPLER_MIN) install -d $(DESTDIR)$(INCDIR)/zita-resampler install -d $(DESTDIR)$(LIBDIR) @@ -48,7 +37,6 @@ - ldconfig + ${BSD_INSTALL_DATA} -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler + ${BSD_INSTALL_LIB} -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR) -+ # ldconfig + ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ) ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO) diff --git a/audio/zita-resampler/files/patch-apps_Makefile b/audio/zita-resampler/files/patch-apps_Makefile deleted file mode 100644 index 6fed4a528908..000000000000 --- a/audio/zita-resampler/files/patch-apps_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- ../apps/Makefile.orig 2018-10-31 16:04:18.214221199 +0000 -+++ ../apps/Makefile 2018-10-31 16:04:25.590905029 +0000 -@@ -25,7 +25,6 @@ - VERSION = 1.6.0 - CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" - CXXFLAGS += -O2 -ffast-math -Wall --CXXFLAGS += -march=native - - - all: zresample zretune zresample.1.gz zretune.1.gz diff --git a/audio/zita-resampler/pkg-plist b/audio/zita-resampler/pkg-plist index 9b3138495c0b..983facdd0276 100644 --- a/audio/zita-resampler/pkg-plist +++ b/audio/zita-resampler/pkg-plist @@ -4,4 +4,4 @@ include/zita-resampler/resampler.h include/zita-resampler/vresampler.h lib/libzita-resampler.so lib/libzita-resampler.so.1 -lib/libzita-resampler.so.1.6.2 +lib/libzita-resampler.so.1.8.0