Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Mar 2024 13:47:50 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: db819a9ae212 - main - audio/lingot: Update to 1.1.1
Message-ID:  <202403021347.422Dlov4029260@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db819a9ae2128015020ab60ffe0e9c0f59e1a8f1

commit db819a9ae2128015020ab60ffe0e9c0f59e1a8f1
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-03-02 13:43:30 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-03-02 13:47:37 +0000

    audio/lingot: Update to 1.1.1
    
    - Switch to DISTVERSION
    - Define LICENSE_FILE
    - Take maintainership
    
    ChangeLog:      https://github.com/ibancg/lingot/releases/tag/v1.1.1
                    https://github.com/ibancg/lingot/releases/tag/v1.1.0
---
 audio/lingot/Makefile                | 48 ++++++++++++++++++++----------------
 audio/lingot/distinfo                |  6 ++---
 audio/lingot/files/patch-Makefile.in | 18 --------------
 audio/lingot/pkg-plist               | 21 ++++++++++++----
 4 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index 6930b998ca04..8d35b8e7bb4a 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -1,44 +1,50 @@
 PORTNAME=	lingot
-PORTVERSION=	1.0.1
-PORTREVISION=	6
+DISTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Musical instrument tuner
 WWW=		https://www.nongnu.org/lingot/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake gnome pkgconfig
-USE_GNOME=	gtk30 gdkpixbuf2 cairo intltool
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	libjson-c.so:devel/json-c
+
+USES=				gettext-tools gmake gnome libtool pkgconfig
+USE_GNOME=			cairo gtk30 intltool
+GNU_CONFIGURE=			yes
+CONFIGURE_ENV=			DATADIRNAME="share"
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+INSTALL_TARGET=			install-strip
+
+# fix: "ld: error: undefined reference due to --no-allow-shlib-undefined: environ"
+# by adding "-Wl,--allow-shlib-undefined" (not needed on 1500014 as I tested)
+LDFLAGS+=	-Wl,--allow-shlib-undefined -L${LOCALBASE}/lib -lintl
 
-CONFIGURE_ENV=	DATADIRNAME="share"
-LDFLAGS+=	-L${LOCALBASE}/lib
+PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS NLS FFTW
+OPTIONS_DEFINE=		DOCS FFTW NLS
+OPTIONS_DEFAULT=	FFTW JACK
 OPTIONS_GROUP=		SOUND
 OPTIONS_GROUP_SOUND=	ALSA JACK PULSEAUDIO
-OPTIONS_DEFAULT=	JACK NLS FFTW
-OPTIONS_SUB=		YES
+OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-ALSA_CONFIGURE_ENABLE=	alsa
+ALSA_CONFIGURE_WITH=	alsa
 
-JACK_LIB_DEPENDS=	libjack.so:audio/jack \
-			libsamplerate.so:audio/libsamplerate
-JACK_CONFIGURE_ENABLE=	jack
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+			libfftw3f.so:math/fftw3-float
+FFTW_CONFIGURE_WITH=	fftw
 
-FFTW_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
-FFTW_CONFIGURE_ENABLE=	libfftw
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_CONFIGURE_WITH=	jack
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
-
-NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
+
 .include <bsd.port.mk>
diff --git a/audio/lingot/distinfo b/audio/lingot/distinfo
index b8debf243f20..95394cf571a5 100644
--- a/audio/lingot/distinfo
+++ b/audio/lingot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572589592
-SHA256 (lingot-1.0.1.tar.gz) = 71b8c77bb988e8384a0ecbf4c861d838f7b985284a8e18f75532ab9816c6a00f
-SIZE (lingot-1.0.1.tar.gz) = 510112
+TIMESTAMP = 1709377221
+SHA256 (lingot-1.1.1.tar.gz) = c4f97e496a3666c70786d136e6f2ccc5e8a3813eb08cda35cacd7eb0d16f4d56
+SIZE (lingot-1.1.1.tar.gz) = 727028
diff --git a/audio/lingot/files/patch-Makefile.in b/audio/lingot/files/patch-Makefile.in
deleted file mode 100644
index bbe0e028966d..000000000000
--- a/audio/lingot/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	2019-11-01 06:36:02 UTC
-+++ Makefile.in
-@@ -423,7 +423,6 @@ ACLOCAL_AMFLAGS = -I m4
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README \
--	COPYING \
- 	AUTHORS \
- 	ChangeLog \
- 	NEWS \
-@@ -446,6 +445,7 @@ appdatadir = $(datadir)/metainfo
- appdata_DATA = org.nongnu.lingot.appdata.xml
- dist_man_MANS = lingot.1
- EXTRA_DIST = \
-+	COPYING \
- 	$(lingotdoc_DATA) \
- 	$(appdata_DATA) \
- 	build-aux/gitlog-to-changelog \
diff --git a/audio/lingot/pkg-plist b/audio/lingot/pkg-plist
index a1ec6f8f1bea..37da9e9e2009 100644
--- a/audio/lingot/pkg-plist
+++ b/audio/lingot/pkg-plist
@@ -1,10 +1,21 @@
 bin/lingot
+include/lingot/lingot-audio-alsa.h
+include/lingot/lingot-audio-jack.h
+include/lingot/lingot-audio-oss.h
+include/lingot/lingot-audio-pulseaudio.h
+include/lingot/lingot-audio.h
+include/lingot/lingot-config-scale.h
+include/lingot/lingot-config.h
+include/lingot/lingot-core.h
+include/lingot/lingot-defs.h
+include/lingot/lingot-filter.h
+include/lingot/lingot-msg.h
+lib/liblingot.a
+lib/liblingot.so
+lib/liblingot.so.0
+lib/liblingot.so.0.0.0
+libdata/pkgconfig/lingot.pc
 share/applications/org.nongnu.lingot.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
 share/icons/hicolor/scalable/apps/org.nongnu.lingot.svg
 %%NLS%%share/locale/ca/LC_MESSAGES/lingot.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/lingot.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403021347.422Dlov4029260>