From nobody Sat Sep 28 19:29:34 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XGHTV5jL7z5XlCn; Sat, 28 Sep 2024 19:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XGHTV3c5Vz53wX; Sat, 28 Sep 2024 19:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727551774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81iP0ahlQ6Lw8ZC2EZ3pTmx0t13aDssvlbaSNjPK/dw=; b=samRYl53l3ovAhZ4N1LDGT/QwDLr7iCPJDxsm6ysaH7FE4iE7z2kLktC86Cr9Lof3YfYo9 5NORxpRcckLjwVjgoC/3o9vD4iKnAb/qGLtqd7f0wn75URSVICJtajxzlgLzoDngWstmD5 ZcekBnmpoosPV8xKH1Oy87HrYqmziTfl2lsRQTp2VfGSWRhk1jcZz8acH2koRd7xVpkzeJ 9EW/x9os1XXkCKSnpibhFVwuil94Q2IPqWZuQb2KJw6zsEPIa8Rjx1Ut/4dSJLaKXH1Shu n3OPrLmHktcYdjUFpNH+nQh53c7hPkt5KqrVwsCtn9ajLrmo0WabGTA6Nf8vPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727551774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81iP0ahlQ6Lw8ZC2EZ3pTmx0t13aDssvlbaSNjPK/dw=; b=yiTetEBKdbGB44npj6N753V/JsV+j2B45DhTSnFh9dpiOFSX/cUNEprdL3A7X5CVFVbUWz LCnhZoMh+zU/16tSUAKD98kvmstUJ89dHbXfCKy8vEt9EhCOBGq0x62FQpDi5vF3WENS2Y drCeYh8SzsFV7UU8ENS63RwBWN2/sjIPpbuCcKIcepNvC2xhds/mteUGh4C5EkBauWAHU8 a3LAXJxOJBbn1NK1/UVqNBm0/4uwgk859wdn8PmKdkMoHBkxTi/fvJBIkfwvkYolAbmfk4 R+g0P3ijEanSSTLbkoirS2aiOpF6XY+gD7Cua+uSgwNPyp3ulgH1a9tROIm8XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727551774; a=rsa-sha256; cv=none; b=VItTs1iJA7+FzBJ/sNZPxTmbkd2PIFCWHlL8qzqiTJLmlvuOPGBgAyb/7aPlGw+NM0gDYK F5fbtG917jemGUaZ+TfBFLB1Zv1jmioTnYcdS4LWyXiUEI4xbBPZc9qpVJWFdFsUrDMhOD 7czaMurk/PJnHNWgzsN1wUcJjNQsEFEOmEQMax2TgbAS6drLML6Kb98/Bqme5N6rwlk+GA lJnHsc1cerN7zsw7aM72aJyHxCXtcL6TtX8yC+ekeO9VwL3QEUKA7G3sPO9hRzqOPuSNvu /VeEOc87bQnJUQDjhfF0a0C03BSFddoMzglcy5skhIuSsIoBHqP4C2s2Wirb6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XGHTV3Cwhzcb5; Sat, 28 Sep 2024 19:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48SJTYKL097717; Sat, 28 Sep 2024 19:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SJTY1l097714; Sat, 28 Sep 2024 19:29:34 GMT (envelope-from git) Date: Sat, 28 Sep 2024 19:29:34 GMT Message-Id: <202409281929.48SJTY1l097714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 645d57fe5e85 - main - audio/ncmpcpp: Update to 0.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 645d57fe5e853ff988996bfd50ecced9dc4be316 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=645d57fe5e853ff988996bfd50ecced9dc4be316 commit 645d57fe5e853ff988996bfd50ecced9dc4be316 Author: Daniel Engberg AuthorDate: 2024-09-28 19:27:25 +0000 Commit: Daniel Engberg 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 + +.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` +