git: 645d57fe5e85 - main - audio/ncmpcpp: Update to 0.10

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 28 Sep 2024 19:29:34 UTC
The branch main has been updated by diizzy:

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

commit 645d57fe5e853ff988996bfd50ecced9dc4be316
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-09-28 19:27:25 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-09-28 19:29:15 +0000

    audio/ncmpcpp: Update to 0.10
    
    * Backport upstream commit 72d990fe250da1e583677474b3462b9e9894130b
    * Change WWW to GitHub location
    * Remove glib(20) dependency
    * Remove GNU_CONFIGURE_MANPREFIX
    * Add LTO OPTIMIZED_CFLAGS options to confirm with packaging standards
      https://docs.freebsd.org/en/books/porters-handbook/book/#dads-cflags
    * Some minor rearragements with port Makefile
    
    References:
    https://github.com/ncmpcpp/ncmpcpp/commit/72d990fe250da1e583677474b3462b9e9894130b
    
    PR:             281505
    Approved by:    portmgr (maintainer timeout, 2+ weeks)
---
 audio/ncmpcpp/Makefile                    | 48 ++++++++++++--------
 audio/ncmpcpp/distinfo                    | 10 ++---
 audio/ncmpcpp/files/patch-configure.ac    | 73 +++++++++++++++++++++++++++++++
 audio/ncmpcpp/files/patch-extras_Makefile | 10 +++++
 4 files changed, 118 insertions(+), 23 deletions(-)

diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 5e4e48ea96ff..52f058531f66 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -1,15 +1,13 @@
 PORTNAME=	ncmpcpp
-DISTVERSION=	0.9.2
-PORTREVISION=	14
+DISTVERSION=	0.10
 CATEGORIES=	audio
-MASTER_SITES=	https://ncmpcpp.rybczak.net/stable/
 
 PATCH_SITES=	https://github.com/ncmpcpp/ncmpcpp/commit/
-PATCHFILES=	d7f487c648e05172aeb2c2d0899d2086160edaf1.patch:-p1
+PATCHFILES=	72d990fe250da1e583677474b3462b9e9894130b.patch:-p1
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Ncurses mpd client, clone of ncmpc with some new features
-WWW=		https://rybczak.net/ncmpcpp/
+WWW=		https://github.com/ncmpcpp/ncmpcpp
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,33 +17,47 @@ LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
 		libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl
 
-USES=		compiler:c++14-lang gnome iconv libtool localbase ncurses \
-		pkgconfig readline tar:bzip2
-USE_GNOME=	glib20
+USES=		autoreconf compiler:c++14-lang iconv libtool ncurses \
+		pkgconfig readline
+
+USE_GITHUB=	yes
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ENV=	ncursesw_CFLAGS="-L${NCURSESLIB}" ncursesw_LIBS="-lncursesw"
 
 PLIST_FILES=	bin/ncmpcpp \
 		share/man/man1/ncmpcpp.1.gz
 PORTDOCS=	AUTHORS CHANGELOG.md COPYING bindings config
 
-OPTIONS_DEFINE=	CLOCK DOCS OUTPUTS TAGLIB VISUALIZER
-OPTIONS_DEFAULT=	CLOCK OUTPUTS TAGLIB VISUALIZER
+OPTIONS_DEFINE=		CLOCK DOCS LTO OPTIMIZED_CFLAGS OUTPUTS TAGLIB \
+			VISUALIZER
+OPTIONS_DEFAULT=	CLOCK LTO OPTIMIZED_CFLAGS OUTPUTS TAGLIB VISUALIZER
 
-CLOCK_DESC=	clock-screen support
-OUTPUTS_DESC=	Enable outputs screen
-TAGLIB_DESC=	taglib support
+CLOCK_DESC=		clock-screen support
+OUTPUTS_DESC=		Enable outputs screen
+TAGLIB_DESC=		taglib support
 VISUALIZER_DESC=	Enable music visualizer screen
 
-CLOCK_CONFIGURE_ENABLE=	clock
+CLOCK_CONFIGURE_ENABLE=		clock
+
+LTO_CONFIGURE_WITH=		lto
+
+OPTIMIZED_CFLAGS_CXXFLAGS=	-ftree-vectorize -ffast-math
+
 OUTPUTS_CONFIGURE_ENABLE=	outputs
-TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
-TAGLIB_CONFIGURE_WITH=	taglib
+
+TAGLIB_LIB_DEPENDS=		libtag.so:audio/taglib
+TAGLIB_CONFIGURE_WITH=		taglib
+
 VISUALIZER_LIB_DEPENDS=		libfftw3.so:math/fftw3
 VISUALIZER_CONFIGURE_ENABLE=	visualizer
 VISUALIZER_CONFIGURE_WITH=	fftw
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS}_${OSREL:R} == FreeBSD_13
+CONFIGURE_ENV=	ncursesw_CFLAGS="-L${NCURSESLIB}" ncursesw_LIBS="-lncursesw"
+.endif
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/
 
diff --git a/audio/ncmpcpp/distinfo b/audio/ncmpcpp/distinfo
index b7b0d0324da3..82f3cbd73153 100644
--- a/audio/ncmpcpp/distinfo
+++ b/audio/ncmpcpp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1706563450
-SHA256 (ncmpcpp-0.9.2.tar.bz2) = faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
-SIZE (ncmpcpp-0.9.2.tar.bz2) = 486266
-SHA256 (d7f487c648e05172aeb2c2d0899d2086160edaf1.patch) = 035dc81b8c5ab94eae3085815ff9245845d3cff64414210e6a15ae4ef299da0f
-SIZE (d7f487c648e05172aeb2c2d0899d2086160edaf1.patch) = 1937
+TIMESTAMP = 1726342098
+SHA256 (ncmpcpp-ncmpcpp-0.10_GH0.tar.gz) = d1baaeea6c79b4595447947102b2d866fe1b793be9b3bf9d26eef2c02d42108f
+SIZE (ncmpcpp-ncmpcpp-0.10_GH0.tar.gz) = 231321
+SHA256 (72d990fe250da1e583677474b3462b9e9894130b.patch) = 9e17aa75007e0a8ecebbdfe500f5f410f6ea9faa28809f6b104b3d093cfc8d4f
+SIZE (72d990fe250da1e583677474b3462b9e9894130b.patch) = 676
diff --git a/audio/ncmpcpp/files/patch-configure.ac b/audio/ncmpcpp/files/patch-configure.ac
new file mode 100644
index 000000000000..40c8b37fcdf2
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-configure.ac
@@ -0,0 +1,73 @@
+--- configure.ac.orig	2024-09-14 20:01:39 UTC
++++ configure.ac
+@@ -47,40 +47,40 @@ fi
+ fi
+ 
+ # -ftree-vectorize
+-AC_MSG_CHECKING([whether compiler supports -ftree-vectorize])
+-old_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="-ftree-vectorize"
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
+-  AC_MSG_RESULT([yes])
+-    tree_vectorize="-ftree-vectorize",
+-  AC_MSG_RESULT([no])
+-    tree_vectorize=""
+-)
+-CXXFLAGS="$old_CXXFLAGS $tree_vectorize"
++#AC_MSG_CHECKING([whether compiler supports -ftree-vectorize])
++#old_CXXFLAGS="$CXXFLAGS"
++#CXXFLAGS="-ftree-vectorize"
++#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
++#  AC_MSG_RESULT([yes])
++#    tree_vectorize="-ftree-vectorize",
++#  AC_MSG_RESULT([no])
++#    tree_vectorize=""
++#)
++#CXXFLAGS="$old_CXXFLAGS $tree_vectorize"
+ 
+ # -ffast-math
+-AC_MSG_CHECKING([whether compiler supports -ffast-math])
+-old_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="-ffast-math"
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
+-  AC_MSG_RESULT([yes])
+-    fast_math="-ffast-math",
+-  AC_MSG_RESULT([no])
+-    fast_math=""
+-)
+-CXXFLAGS="$old_CXXFLAGS $fast_math"
++#AC_MSG_CHECKING([whether compiler supports -ffast-math])
++#old_CXXFLAGS="$CXXFLAGS"
++#CXXFLAGS="-ffast-math"
++#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
++#  AC_MSG_RESULT([yes])
++#    fast_math="-ffast-math",
++#  AC_MSG_RESULT([no])
++#    fast_math=""
++#)
++#CXXFLAGS="$old_CXXFLAGS $fast_math"
+ 
+ # -std=c++20
+-AC_MSG_CHECKING([whether compiler supports -std=c++20])
+-old_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="-std=c++20"
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
+-	AC_MSG_RESULT([yes])
+-		std_cpp14="-std=c++20",
+-	AC_MSG_RESULT([no])
+-		AC_MSG_ERROR([[Your compiler doesn't seem to support C++20, please upgrade]])
+-)
+-CXXFLAGS="$old_CXXFLAGS $std_cpp14"
++#AC_MSG_CHECKING([whether compiler supports -std=c++20])
++#old_CXXFLAGS="$CXXFLAGS"
++#CXXFLAGS="-std=c++20"
++#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
++#	AC_MSG_RESULT([yes])
++#		std_cpp14="-std=c++20",
++#	AC_MSG_RESULT([no])
++#		AC_MSG_ERROR([[Your compiler doesn't seem to support C++20, please upgrade]])
++#)
++CXXFLAGS="$old_CXXFLAGS -std=c++14"
+ 
+ # generic lambda expressions support
+ AC_MSG_CHECKING([whether compiler supports generic lambda expressions])
diff --git a/audio/ncmpcpp/files/patch-extras_Makefile b/audio/ncmpcpp/files/patch-extras_Makefile
new file mode 100644
index 000000000000..4827e2b686b7
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-extras_Makefile
@@ -0,0 +1,10 @@
+--- extras/Makefile.orig	2024-09-14 20:03:33 UTC
++++ extras/Makefile
+@@ -1,5 +1,5 @@
+-CXX=g++
+-CXXFLAGS=-O2 -march=native -pipe -std=c++0x -Wall -Wextra -Wshadow -Werror
++CXX?=g++
++CXXFLAGS+= -Wall -Wextra -Wshadow -Werror
+ CPPFLAGS=`taglib-config --cflags`
+ LDFLAGS=`taglib-config --libs`
+