From nobody Sun Jul 21 14:52:07 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 4WRmbD0sGFz5Rdpr; Sun, 21 Jul 2024 14:52:08 +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 4WRmbD0GGrz4ghW; Sun, 21 Jul 2024 14:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721573528; 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=PY0Xo2MJI4+U31JboaY07eOUl9sn08DKCvDvERasEEY=; b=oebuYND6QPeHljkFCff14jfJ+9azzmKL+VRUTgXsAzjdfb+GNxbCvl8hIh8st51KBdrkAX tL4ikjRHT4gAuwgjQPdTvVQ5ro2Jn7Dco1MfEvF53j6MT1ZeWrgHwfb1Z+gZ6D6mZzfHys 7oAXOmY3pxldBMJJc3qj4hq4O+XEfu2WJROLrsmepykwyaIdjIQM4OJKHy9tA/cH754AjK q754R4nOifAZS7VB7zVeoLByArt0cyhyaklqLjTSUcz1zPC42Ff1uGWAPb2caGImPesOfK T8zfICGzjyM6NCaKulzYBG2313pNPF5Gj2+48d1vY0w7AGMcLM6BlgF2f652vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721573528; a=rsa-sha256; cv=none; b=qxDBaHHPpjqgPc+k3ZbAwaERm1Wv2Xbn+sXs3Z5PPCQjuZ3Ib1h4hDuQz2qgHvKS2dpUQK UOUBnm1CSsBzXnmvk8guXYeQwEiR7lFa+4N49KV7+K4EExoYLhleNTYCB3e+XhIHWMPHMW 1+lK7SSQMFoDrvoIcx6LKuctUpgXjPMQi1QQKSxelVMp2GRo6pdVUzgP+GCEuTMEbGTsrk krYoVZT0SAxX62ldeLir5E5PfdUh929eM4M9oo0aikS5YrstMLFX+QY5IJ8RkkXNHUy2Un OH2CFPyqr5k3mxYMwRvr5RT2KHjBedaFYIILyid8wk3rq0udypYZUGVvrZCtpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721573528; 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=PY0Xo2MJI4+U31JboaY07eOUl9sn08DKCvDvERasEEY=; b=QX/IHaCzD+eGytLGTFzyJEs+ujITUXGlV0JzIGiyxeSL4O+djPGH7e7ly5AKLe5+GkITQu x47souVfSOvax0mz2kVlFXpDbrGQ1ReRaAUG+1u1pWeXjYhTGecAjs9EsOcWv7CD9WOdbe F1G7KYajrsiwQMyQ6EIsEHiOwc7f/aYsS3LusesoYuGKiKu5A4TgK4k858hpNxx/y5DXO/ I0D1Ofwz1UXcnX0JaGOI/ympLX/L+RRgwgD/c4UQ/GxrIJmwqv9BOgiROU2znRgJ96Y+U2 FlBDeDalqdNHrspbBQvjs+khOmK3g/GA9deKIn+xDwDr/E08iYIrOB3RW4K7dw== 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 4WRmbC6zVXz14Qs; Sun, 21 Jul 2024 14:52:07 +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 46LEq7Os090248; Sun, 21 Jul 2024 14:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LEq7Gq090245; Sun, 21 Jul 2024 14:52:07 GMT (envelope-from git) Date: Sun, 21 Jul 2024 14:52:07 GMT Message-Id: <202407211452.46LEq7Gq090245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: efb313eda85c - main - audio/strawberry: Update to 1.1.0 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efb313eda85cf9e4d5a2b77121fd15add958d439 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=efb313eda85cf9e4d5a2b77121fd15add958d439 commit efb313eda85cf9e4d5a2b77121fd15add958d439 Author: Jason E. Hale AuthorDate: 2024-07-20 09:44:21 +0000 Commit: Jason E. Hale CommitDate: 2024-07-21 14:50:31 +0000 audio/strawberry: Update to 1.1.0 Unflavorize. With this new minor release of Strawberry, now seems to be the most appropriate time to drop local Qt5 support. Qt5 has enjoyed an incredibly good run, but it's well past time to start welcoming Qt6 into our lives. Iconv support has been dropped upstream, so the UNICODE options have been subsequently removed and a hard dependency on devel/icu has been added. ICU has been the default ever since the options were introduced, so hopefully no big surprises there. Remove bad URL from MASTER_SITES and update LICENSE (file headers indicate GPL 3.0 or higher). https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.1.0 --- MOVED | 2 ++ audio/strawberry/Makefile | 40 +++++++++------------------------------- audio/strawberry/distinfo | 6 +++--- 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/MOVED b/MOVED index ce6bbd8c03c0..f7564a104fd2 100644 --- a/MOVED +++ b/MOVED @@ -3399,3 +3399,5 @@ devel/dia2code+||2024-07-16|Has expired: Fails to build with libxml2 2.13.0 (PR devel/libiqxmlrpc||2024-07-16|Has expired: Fails to build with libxml2 2.13.0 (PR 279705) textproc/rubygem-nokogiri111|textproc/rubygem-nokogiri|2024-07-17|Obsolete, use textproc/rubygem-nokogiri instead devel/rubygem-google-gax||2024-07-21|Remove obsoleted port. This gem is officially end-of-life +audio/strawberry@qt5|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete +audio/strawberry@qt6|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index c3ba6ac5853f..78b65f0b7580 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -1,51 +1,37 @@ PORTNAME= strawberry -DISTVERSION= 1.0.23 -PORTREVISION= 2 +DISTVERSION= 1.1.0 CATEGORIES= audio -MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \ - https://files.jkvinge.net/packages/strawberry/ -PKGNAMESUFFIX= -${FLAVOR} +MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= jhale@FreeBSD.org COMMENT= Music player and collection organizer WWW= https://www.strawberrymusicplayer.org/ -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libicui18n.so:devel/icu \ libprotobuf.so:devel/protobuf \ libtag.so:audio/taglib -FLAVORS= qt6 qt5 -FLAVOR?= ${FLAVORS:[1]} -qt5_CONFLICTS_INSTALL= strawberry strawberry-qt6 -qt6_CONFLICTS_INSTALL= strawberry strawberry-qt5 - USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \ - gl gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg + gl gnome pkgconfig qt:6 sqlite tar:xz xorg USE_GNOME= glib20 -_USE_GL_qt5= # -_USE_GL_qt6= opengl -USE_GL= ${_USE_GL_${FLAVOR}} -_USE_QT_qt5= concurrent core dbus gui network sql sql-sqlite3:run widgets \ - x11extras buildtools:build linguisttools:build qmake:build -_USE_QT_qt6= base sqldriver-sqlite:run tools:build -USE_QT= ${_USE_QT_${FLAVOR}} +USE_GL= opengl +USE_QT= base sqldriver-sqlite:run tools:build USE_XORG= ice sm x11 xcb xext -CMAKE_ON= BUILD_WITH_${FLAVOR:tu} +CMAKE_ON= BUILD_WITH_QT6 CMAKE_OFF= ENABLE_UDISKS2 OPTIONS_MULTI= BACKEND SOUND OPTIONS_MULTI_BACKEND= GSTREAMER VLC OPTIONS_MULTI_SOUND= ALSA PULSEAUDIO -OPTIONS_SINGLE= UNICODE -OPTIONS_SINGLE_UNICODE= ICONV ICU OPTIONS_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS TEST -OPTIONS_DEFAULT= ALSA EBUR128 GSTREAMER ICU MOODBAR MUSICBRAINZ +OPTIONS_DEFAULT= ALSA EBUR128 GSTREAMER MOODBAR MUSICBRAINZ OPTIONS_SUB= yes BACKEND_DESC= Playback engine @@ -71,11 +57,6 @@ GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=faac,faad,flac,lame,libav,mpg123,opus,taglib,vorbis GSTREAMER_CMAKE_BOOL= ENABLE_GSTREAMER -ICONV_USES= iconv:translit - -ICU_LIB_DEPENDS= libicui18n.so:devel/icu -ICU_CMAKE_BOOL= USE_ICU - IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libimobiledevice-1.0.so:comms/libimobiledevice \ libplist-2.0.so:devel/libplist @@ -103,9 +84,6 @@ VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc VLC_CMAKE_BOOL= ENABLE_VLC TEST_BUILD_DEPENDS= googletest>=0:devel/googletest -.if ${FLAVOR:U} == qt5 -TEST_USE= QT=testlib:build -.endif TEST_TEST_TARGET= strawberry_tests .include diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo index e9b46b5c482e..4c7d1650bd70 100644 --- a/audio/strawberry/distinfo +++ b/audio/strawberry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705440541 -SHA256 (strawberry-1.0.23.tar.xz) = 24f63064caf62c72330e9fa0808a1ca938339831d0a4e8385986280601a54f10 -SIZE (strawberry-1.0.23.tar.xz) = 11297440 +TIMESTAMP = 1721456006 +SHA256 (strawberry-1.1.0.tar.xz) = 03ac6d9593e25694c32e42264e38dd90005d2dc5634d53f24f64bdfc706587a7 +SIZE (strawberry-1.1.0.tar.xz) = 11353132