From nobody Sat Nov 30 02:46:39 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 4Y0ZFC3c4nz5dtSB; Sat, 30 Nov 2024 02:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0ZFC2ssFz4X5h; Sat, 30 Nov 2024 02:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732934799; 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=IZMJ81cpj3cMcQzH0ym6Y1zKBLmH7y4yUI+RuNgA0Pk=; b=ftf8v3g9MFIKWs0uukMJeGgLzYcLWDOrZoU9k6nvi6cZdslg7drxX2lYJtCw/75ujIiXhU stMTzNU8rvKKtUmwhwYr1UE6Z7T7vwN+BiOwWlDnGMZeF9TU7hor3QU0Va9o+x5KhiT7gt p+BL6K5nB9E1qJMt+KOZsORa2o3W9ZIcHjqWiNzeIIGCujU5uOvS0521RuqgukkPf5Px+r vKBPCerXrb93sRuZ0QDS83K66bjARRL5RmZ3wGH6jAJUYtipvVnDy7ClPbt6cg3Yd9zaSf M5azwNpeXNnH3aH4S6HNvuLyHh3wVwPKZbCN1QAy/4++qaPgM/1T4/Cs9csqwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732934799; 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=IZMJ81cpj3cMcQzH0ym6Y1zKBLmH7y4yUI+RuNgA0Pk=; b=pBjwgaZ6oIy1a/LStrdjQc0KHcE88v6Fa7HLh3ym4RpucpdOD1jroTW/UIVyqjAr+3GTPR 0y4Bf5JGREfdmSguYNBl6I/NxBGUwyZXo2+m0SPpTK/TaxTliCjM86tSwwRh/WUjfnbaIt Ho0Tpbsc8ZQYghlSPNnyvqbGu5FmLxcULiMk1jhX9L/d9OMy/7/fbfyTQiTVchRumaosfT p40IGxXqNWkaxVgmI0/kE+YCpX7dd4eNvK6p9H5WUUSsTOESxJjd/w3jxh9jnK0CysFGXc gmCu6ei9BMdU5qda7gavCcS9EqUBeGmgdtMRcOe9FTQ+REMTF3cqbFcd0QiV+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732934799; a=rsa-sha256; cv=none; b=LNxDOp4wE9qNlRzDN1BVtil3lXIo/hcbyfq2HjZyjvTyVdwBw+CDHRmX+D8IUD15nizcIt R2qRIpIZtLI9wXAIjwpZdJq2+r1PzS/LMtUyrfSnd5r2atNxOA6Okqa4dxMbZRgBVH4ak7 w19ZI5fLtqbJBe2I4CDr74NIhrDspPwDl9Kl0D3aWh8wZCbhNH5NPFHeVGM6iMAcy/Pw1t k/b6odxTqLSGjy0f+3IjjgNuNc7SPtqXTHtH+SfFTaq3yhvTI6+sfskvr9OA/Bc0r/M8E+ buqQBtPpF+GC2CJxRnWhu3tmYTdCS2c4a87IqX++maHHZqxiozmKy4ogZh/5bg== 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 4Y0ZFC22rgzqRN; Sat, 30 Nov 2024 02:46:39 +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 4AU2kdrY068747; Sat, 30 Nov 2024 02:46:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AU2kdKi068744; Sat, 30 Nov 2024 02:46:39 GMT (envelope-from git) Date: Sat, 30 Nov 2024 02:46:39 GMT Message-Id: <202411300246.4AU2kdKi068744@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: 91bab7daad5f - main - audio/strawberry: Use upstream fix for CDIO option 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: 91bab7daad5f3178a3b3018733c76bbd0d46bd33 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=91bab7daad5f3178a3b3018733c76bbd0d46bd33 commit 91bab7daad5f3178a3b3018733c76bbd0d46bd33 Author: Jason E. Hale AuthorDate: 2024-11-30 02:40:41 +0000 Commit: Jason E. Hale 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 --#include -- - #include - #include - #include - #include -+ -+// These must come after Qt includes -+#include -+#include - - #include "includes/shared_ptr.h" - #include "core/song.h"