Date: Sat, 30 Nov 2024 02:46:39 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 91bab7daad5f - main - audio/strawberry: Use upstream fix for CDIO option Message-ID: <202411300246.4AU2kdKi068744@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=91bab7daad5f3178a3b3018733c76bbd0d46bd33 commit 91bab7daad5f3178a3b3018733c76bbd0d46bd33 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-11-30 02:40:41 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-11-30 02:46:26 +0000 audio/strawberry: Use upstream fix for CDIO option Not bumping PORTREVISION since the CDIO option is off by default and it builds and runs fine with the former local patch. --- audio/strawberry/Makefile | 3 +++ audio/strawberry/distinfo | 4 +++- .../strawberry/files/patch-src_device_cddadevice.h | 25 ---------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index 4e3cefc16b2a..95696b809fdc 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -3,6 +3,9 @@ DISTVERSION= 1.2.2 CATEGORIES= audio MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ +PATCH_SITES= https://github.com/strawberrymusicplayer/strawberry/commit/ +PATCHFILES= d396cb515d5112be866c2510127a111dab5d313a.patch:-p1 # https://github.com/strawberrymusicplayer/strawberry/issues/1610 + MAINTAINER= jhale@FreeBSD.org COMMENT= Music player and collection organizer WWW= https://www.strawberrymusicplayer.org/ diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo index 49367cb568d0..9fa3829af1e6 100644 --- a/audio/strawberry/distinfo +++ b/audio/strawberry/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1732431674 +TIMESTAMP = 1732933915 SHA256 (strawberry-1.2.2.tar.xz) = 3543ca25f3b7fc913f3986a8cb5f5f6f323549a71c21cc0c1a3491fe4d135177 SIZE (strawberry-1.2.2.tar.xz) = 11460012 +SHA256 (d396cb515d5112be866c2510127a111dab5d313a.patch) = d3bf89ffae0721010c816855c1c7d849e1b56af44240051e8153400128659b66 +SIZE (d396cb515d5112be866c2510127a111dab5d313a.patch) = 2664 diff --git a/audio/strawberry/files/patch-src_device_cddadevice.h b/audio/strawberry/files/patch-src_device_cddadevice.h deleted file mode 100644 index 658e5191492f..000000000000 --- a/audio/strawberry/files/patch-src_device_cddadevice.h +++ /dev/null @@ -1,25 +0,0 @@ -Fix conflicting definitions of NULL beween glib and cdio when CDIO option -is enabled. - -https://github.com/strawberrymusicplayer/strawberry/issues/1610 - ---- src/device/cddadevice.h.orig 2024-11-23 16:55:49 UTC -+++ src/device/cddadevice.h -@@ -24,13 +24,14 @@ - - #include "config.h" - --#include <cdio/cdio.h> --#include <gst/audio/gstaudiocdsrc.h> -- - #include <QObject> - #include <QString> - #include <QStringList> - #include <QUrl> -+ -+// These must come after Qt includes -+#include <cdio/cdio.h> -+#include <gst/audio/gstaudiocdsrc.h> - - #include "includes/shared_ptr.h" - #include "core/song.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411300246.4AU2kdKi068744>