From nobody Tue Mar 22 13:41:14 2022 X-Original-To: dev-commits-ports-all@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 440451A11BB2; Tue, 22 Mar 2022 13:41:15 +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 4KNCLg1V7Bz4Tqs; Tue, 22 Mar 2022 13:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647956475; 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=AdpDOenDAyLef7nXKqxFzQcImCjDLC0NfX/kg5WvI1A=; b=lHNwg0A0KNX7c89y2jsXBBjEe/y9dh3/DXyx92U3d+OC9ZcZMkHkIenUKsnhTSLs4y6kId bvGVDVEJpZb4QL1EPX0FCJOEWg8I+cLapFrDmCgbWc5JGNNWSKqfztOEMM/AnpBOGIB4ZD ln9Gd8gH8ujvG+cB3JRy5vWvuJIyqH6k9yNqrxQFOOqK+ZFI6/S8gVbIM1Q3a3Sgq6OtP8 zn2rqyJxPtBGsccGQ49UcpN2TYZwtsihAjC1QuxfexucCjXVlt5cU5d2vTFPZb2YW7NK7j ahJ0BBItaWC4MA8ZqS8TMIq2Bp6Tc4UNDt0dZcdzJu9NvzbYMNMV5mYRDDXNtA== 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 13C231055D; Tue, 22 Mar 2022 13:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22MDfEkl078377; Tue, 22 Mar 2022 13:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MDfE7p078376; Tue, 22 Mar 2022 13:41:14 GMT (envelope-from git) Date: Tue, 22 Mar 2022 13:41:14 GMT Message-Id: <202203221341.22MDfE7p078376@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 0b172d4f4cc2 - main - audio/ocp: Update to 0.2.95 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b172d4f4cc2bdc1e8854e1bf9af13b4295e5058 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647956475; 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=AdpDOenDAyLef7nXKqxFzQcImCjDLC0NfX/kg5WvI1A=; b=Eu4c/jSZoxLJe8sCN677sYYIB7m1DyH7qK3WpX/PgFeg+2xexwhtEdqmXE33X7jRgf3ikz QesLWEooTvBSQHYfStjq0DqOGrcRP7ve3pX7b1v1VX/TJ+JkqbwUs3eh/1h3L4HNaFNTfA qnM06T1RBPLk24hef2s93Fkj9OH9uxQEztZoqusPh2uonl5KyoTZHdavcMZauJkvCxfMvx l2J95BhtZK2iSrl9TuXgfYpqeEaQxF+hDAqZMH80Lr9SedqJ87ZneVO9EKHDr1c8ToTOTr fng5TkayuMNAk1khe61af8+JTasmu4hvrHoibhDh4yvZFmwitSbpttKjctj7og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647956475; a=rsa-sha256; cv=none; b=BPh++ygPBPXYU7FQGr4t062BnrnwOAZiuCDXF38qZm7WdJ4bBJAvSCAuxVErkS3vqj1QxD irdy4EoaPO2GSzwy10ItGmuuFdZRa5mfdIku9wdacLD0rjzTmSWieJFTnnaJz3PdbY1of/ JTyBxbPozLXPYVr62tA8QuIHQBG6DVZ4WkWpjWgd/f4mnvllicZmgKiPkN7e7Wo+WYUgRH F+TOUlueXjs+XwJbEdIfDvEPz7x+2LJWIZDd4stK0Y1PHsMc0zVeF7bcCRnQx8FQ5dlYV+ 4Vwf201YaYVbRuFWr/mg+/FVbRJAKRWlY6kqzjD2f7+HDsYPYiv2Ze+hPLpeXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b172d4f4cc2bdc1e8854e1bf9af13b4295e5058 commit 0b172d4f4cc2bdc1e8854e1bf9af13b4295e5058 Author: Emanuel Haupt AuthorDate: 2022-03-22 13:41:02 +0000 Commit: Emanuel Haupt CommitDate: 2022-03-22 13:41:11 +0000 audio/ocp: Update to 0.2.95 --- audio/ocp/Makefile | 5 ++++- audio/ocp/distinfo | 12 +++++------ audio/ocp/files/patch-filesel_cdfs_audio.c | 13 ------------ audio/ocp/files/patch-filesel_cdfs_iso9660.c | 31 ---------------------------- audio/ocp/pkg-plist | 4 +--- 5 files changed, 10 insertions(+), 55 deletions(-) diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index d125c2c59888..3f27129ae72f 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,11 +1,14 @@ # Created by: Emanuel Haupt PORTNAME= ocp -PORTVERSION= 0.2.94 +PORTVERSION= 0.2.95 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= https://github.com/mywave82/opencubicplayer/releases/download/v${PORTVERSION}/ +PATCH_SITES= https://github.com/mywave82/opencubicplayer/commit/ +PATCHFILES+= 445fcd072a4ef6330ba9ce6780f5a3ac11b29254.patch:-p1 + MAINTAINER= ehaupt@FreeBSD.org COMMENT= Legendary Open Cubic Player diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo index 8dc27e7a6a14..548f29918246 100644 --- a/audio/ocp/distinfo +++ b/audio/ocp/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1646068115 -SHA256 (ocp-0.2.94.tar.bz2) = 307c3bb057b03514ed018ca2cca57e1b669f7b1cc95cd5f37e315ef2e9cda6e7 -SIZE (ocp-0.2.94.tar.bz2) = 3059881 -SHA256 (becedb6186234b6fb3baf9db0f25b62055e65cdd.patch) = e0c2affdc1c265c3d0b7763141915d7052ef72a4a2692b965b59c50fa2e1a585 -SIZE (becedb6186234b6fb3baf9db0f25b62055e65cdd.patch) = 1637 -SHA256 (ad24360fe92475a18c0ba1d44da6e5d060319176.patch) = 21d8407187042cefb4ff53fbe75e40e58897e1dc5a7bb670f1bb6dd13dadceb0 -SIZE (ad24360fe92475a18c0ba1d44da6e5d060319176.patch) = 731 +TIMESTAMP = 1647955199 +SHA256 (ocp-0.2.95.tar.bz2) = 6d25dae9f86be06a45f56576bbd760e70245450ae65beedd1b7e3847e0de8c37 +SIZE (ocp-0.2.95.tar.bz2) = 3057074 +SHA256 (445fcd072a4ef6330ba9ce6780f5a3ac11b29254.patch) = f3b97b84f820a86ed1176f4d417b50c147cead2e3d4a1ff97f484f15a8e676cf +SIZE (445fcd072a4ef6330ba9ce6780f5a3ac11b29254.patch) = 885 diff --git a/audio/ocp/files/patch-filesel_cdfs_audio.c b/audio/ocp/files/patch-filesel_cdfs_audio.c deleted file mode 100644 index c62382950fbb..000000000000 --- a/audio/ocp/files/patch-filesel_cdfs_audio.c +++ /dev/null @@ -1,13 +0,0 @@ ---- filesel/cdfs/audio.c.orig 2022-02-28 13:08:06 UTC -+++ filesel/cdfs/audio.c -@@ -131,9 +131,8 @@ void __attribute__ ((visibility ("internal"))) Check_A - } - failout: - discid_free (did); --postfailout: - } -- -+postfailout: - AudioDir = CDFS_Directory_add (disc, 0, "AUDIO"); - - { diff --git a/audio/ocp/files/patch-filesel_cdfs_iso9660.c b/audio/ocp/files/patch-filesel_cdfs_iso9660.c deleted file mode 100644 index ba99de52d163..000000000000 --- a/audio/ocp/files/patch-filesel_cdfs_iso9660.c +++ /dev/null @@ -1,31 +0,0 @@ ---- filesel/cdfs/iso9660.c.orig 2022-02-28 13:33:37 UTC -+++ filesel/cdfs/iso9660.c -@@ -1140,8 +1140,7 @@ static void CDFS_Render_RockRidge_directory (struct cd - } - - if ((directory->dirents_data[i]->Flags & ISO9660_DIRENT_FLAGS_DIR) || directory->dirents_data[i]->RockRidge_IsAugmentedDirectory) -- { --dir: -+ {dir:;{ /* clang is stricter than gcc, no labels before variables */ - uint32_t Location = directory->dirents_data[i]->Absolute_Location; - uint32_t this_directory_handle = CDFS_Directory_add (disc, parent_directory, temp); - if (directory->dirents_data[i]->RockRidge_IsAugmentedDirectory) -@@ -1156,8 +1155,7 @@ dir: - break; - } - } -- } else { --file: -+ }} else {file:;{ /* clang is stricter than gcc, no labels before variables */ - int handle = CDFS_File_add (disc, parent_directory, temp); - struct iso_dirent_t *iter; - uint32_t Length = directory->dirents_data[i]->Length; -@@ -1170,7 +1168,7 @@ file: - } - CDFS_File_extent (disc, handle, iter->Absolute_Location, RunLength, 0); - } -- } -+ }} - next: - free (temp); - } diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist index 94ac4a6fa95d..4f7f61bb5ea5 100644 --- a/audio/ocp/pkg-plist +++ b/audio/ocp/pkg-plist @@ -10,13 +10,13 @@ lib/ocp/autoload/12-poutput.so lib/ocp/autoload/20-cphelper.so lib/ocp/autoload/25-pfilesel.so lib/ocp/autoload/30-aytype.so +lib/ocp/autoload/30-sidconfig.so %%FLAC%%lib/ocp/autoload/30-flacptype.so lib/ocp/autoload/30-fstypes.so lib/ocp/autoload/30-mcpbase.so %%ADPLUG%%lib/ocp/autoload/30-opltype.so lib/ocp/autoload/30-playsid.so lib/ocp/autoload/30-plrbase.so -lib/ocp/autoload/30-smpbase.so lib/ocp/autoload/30-ymtype.so lib/ocp/autoload/35-cpiface.so lib/ocp/autoload/40-cphlpif.so @@ -26,8 +26,6 @@ lib/ocp/devpdisk.so lib/ocp/devpnone.so %%OSS%%lib/ocp/devposs.so %%SDL%%lib/ocp/devpsdl2.so -lib/ocp/devsnone.so -%%OSS%%lib/ocp/devsoss.so lib/ocp/devwmix.so lib/ocp/devwmixf.so lib/ocp/devwnone.so