From nobody Mon Sep 25 03:48:38 2023 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 4Rv8470s9tz4ty1L; Mon, 25 Sep 2023 03:48:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rv8470KsBz3Yvq; Mon, 25 Sep 2023 03:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695613719; 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=wi6mzVQaabsuCyxBm1ctG84OJU6WHYI+RhA+0ylhnAo=; b=GcAZDkr6m6N2ckhBclkhX3pQQ0UvwLDqIx3sLOsZ2gDQPDEOwvoIxVRRq8GRIm9A+l6g3S nGsfcSDUFVTnaEAsFw9GpuidLZfYDHzL9NXihb3UX0Nyu5Pnwyiw7yFhBamUVUUwH0yLjV JtPSgc/CcfEmW9gVDUu9DoH21A5VxPn4KmB5kYN14YhJYo4fAJ/XlWqOJjMr+hsBg4lyDr ltzktp8+/tPHAfJeCoCmUKO8eYBiPlV6SE3DilU9GlH64lo8Nv4am6LAaVdCLxpFhb8cEV 5uGJZ3wXv9TZRGE4Zrf9bdMnyO+T0Ns/ouVhm/mvzC9790vELgviSegqXzPfPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695613719; a=rsa-sha256; cv=none; b=PR7b7dhMw0vu2ASoHGKYFX3J2VSWkKJT4IKjiJKGVt+F+n0NjMuPB7h81D+RH53/Wm2a1C 0OpNhBesBMcsjM59YyLkoID+myfO5SBt17EtcrXSsWGSji3dMZFlJkM6Tv4qCXR4/XT8ZW ZalLCUKk79/38jr7FEV+6PSWpHlLyjFbjv+Apu1yRa9Jd8/uLE1/RjY8Sn2oZimXmRRduC 8i0sZnypdZ7U1b9s24B5c5rWwE0ybdD1hp4Mqcfj33s08Q5V0fKGMKTVwVFhyp+DJT7EeE yd12UyrZVjyUSUfkDV89Nmz+bwelmfaqgLx/XbPVw+8kZMZErnP+PgSAHJJtgA== 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=1695613719; 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=wi6mzVQaabsuCyxBm1ctG84OJU6WHYI+RhA+0ylhnAo=; b=OZEsiyIveaxRDOZobtK5YkJrHPlLYM4bG1nkaM00b4x2io9KAAPAMcavKTHG3IEG8Op9zx L0CP1kakKgX0Jy8ow/kPfvn2Ix5UgVGki44n8c8k8F3QLfweOwdDC2HAa6OUmVfQHKaLyB Svkx1hETcuJ5w5J+ZkYi1Nn5AvYiUoB0h5NZJlV/6Bqsuo7Qt/RghsCTRQcuEXUn23YK8k jOzTz90y53TvSp1TT+KZXgzsl3ABAIH5XIhtxYfrpsy0MQV2c52X+YBJt/fhJGbzL8WnFl 7vVpLa2pmVbP44BP4GjlrlAwKetwXmcxwmFzhZ0t3m29pogIvCPPPEKZzO+WRQ== 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 4Rv8466VqVz1DFn; Mon, 25 Sep 2023 03:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38P3mct7028812; Mon, 25 Sep 2023 03:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38P3mcZT028809; Mon, 25 Sep 2023 03:48:38 GMT (envelope-from git) Date: Mon, 25 Sep 2023 03:48:38 GMT Message-Id: <202309250348.38P3mcZT028809@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: 384aeb3131a4 - main - audio/strawberry: Update to 1.0.20 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 384aeb3131a4c2ff05380120a916399f1aa68e57 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=384aeb3131a4c2ff05380120a916399f1aa68e57 commit 384aeb3131a4c2ff05380120a916399f1aa68e57 Author: Jason E. Hale AuthorDate: 2023-09-25 02:04:10 +0000 Commit: Jason E. Hale CommitDate: 2023-09-25 03:48:34 +0000 audio/strawberry: Update to 1.0.20 Version 1.0.20 is a hotfix release on top of 1.0.19. Add EBUR128 option for loudness normalization analysis. Switch default flavor to qt6. Upstream has recommended building against Qt6 whenever possible for 18 months. https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.0.20 https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.0.19 --- audio/strawberry/Makefile | 28 +++++++++++++++++----------- audio/strawberry/distinfo | 6 +++--- audio/strawberry/files/patch-CMakeLists.txt | 12 ++++++------ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index c76dcebc567f..90dc202932c6 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -1,6 +1,5 @@ PORTNAME= strawberry -DISTVERSION= 1.0.18 -PORTREVISION= 1 +DISTVERSION= 1.0.20 CATEGORIES= audio MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \ https://files.jkvinge.net/packages/strawberry/ @@ -14,23 +13,25 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libprotobuf.so:devel/protobuf \ +LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libtag.so:audio/taglib -FLAVORS= qt5 qt6 +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 \ - gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg + gl gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg USE_GNOME= glib20 -_USE_QT5= concurrent core dbus gui network sql sql-sqlite3:run widgets \ +_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_QT6= base sqldriver-sqlite:run tools:build -USE_QT= ${_USE_QT${FLAVOR:S/qt//}} +_USE_QT_qt6= base sqldriver-sqlite:run tools:build +USE_QT= ${_USE_QT_${FLAVOR}} USE_XORG= ice sm x11 xcb xext CMAKE_ON= BUILD_WITH_${FLAVOR:tu} @@ -43,8 +44,8 @@ OPTIONS_MULTI_BACKEND= GSTREAMER VLC OPTIONS_MULTI_SOUND= ALSA PULSEAUDIO OPTIONS_SINGLE= UNICODE OPTIONS_SINGLE_UNICODE= ICONV ICU -OPTIONS_DEFINE= CDIO IPOD MOODBAR MTP MUSICBRAINZ NLS TEST -OPTIONS_DEFAULT= ALSA GSTREAMER ICU MOODBAR MUSICBRAINZ +OPTIONS_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS TEST +OPTIONS_DEFAULT= ALSA EBUR128 GSTREAMER ICU MOODBAR MUSICBRAINZ OPTIONS_SUB= yes BACKEND_DESC= Playback engine @@ -60,6 +61,11 @@ CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio CDIO_CMAKE_BOOL= ENABLE_AUDIOCD CDIO_IMPLIES= GSTREAMER +EBUR128_DESC= EBU R 128 loudness normalization +EBUR128_USES= ebur128 +EBUR128_CMAKE_BOOL= ENABLE_EBUR128 +EBUR128_IMPLIES= GSTREAMER + GSTREAMER_USES= gstreamer GSTREAMER_CMAKE_BOOL= ENABLE_GSTREAMER diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo index cac0b25f1033..160396029633 100644 --- a/audio/strawberry/distinfo +++ b/audio/strawberry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688332466 -SHA256 (strawberry-1.0.18.tar.xz) = 8687463b3c5c6d4344ab295ed0946b56d279b7e45875eb4fcca521ca1218c860 -SIZE (strawberry-1.0.18.tar.xz) = 11241608 +TIMESTAMP = 1695601826 +SHA256 (strawberry-1.0.20.tar.xz) = e27afd4b70cdbb1c88af868cafc3abcb526c825c53e413df326f008322413194 +SIZE (strawberry-1.0.20.tar.xz) = 11234412 diff --git a/audio/strawberry/files/patch-CMakeLists.txt b/audio/strawberry/files/patch-CMakeLists.txt index 80e0cb6b7adf..5f7eb9f4cee6 100644 --- a/audio/strawberry/files/patch-CMakeLists.txt +++ b/audio/strawberry/files/patch-CMakeLists.txt @@ -2,15 +2,15 @@ Find OPTIONAL_COMPONENTS seperately. When the REQUIRED keyword is used, Qt5Config.cmake handles all components as required causing failure if optional components are missing. ---- CMakeLists.txt.orig 2022-09-18 23:50:52 UTC +--- CMakeLists.txt.orig 2023-09-19 20:48:15 UTC +++ CMakeLists.txt -@@ -207,7 +207,8 @@ endif() - list(APPEND QT_OPTIONAL_COMPONENTS X11Extras) +@@ -195,7 +195,8 @@ endif() + list(APPEND QT_COMPONENTS X11Extras) endif() --find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) +-find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS}) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) - set(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core) - set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent) + if(Qt${QT_VERSION_MAJOR}DBus_FOUND) + get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)