Date: Tue, 22 Mar 2022 13:41:14 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0b172d4f4cc2 - main - audio/ocp: Update to 0.2.95 Message-ID: <202203221341.22MDfE7p078376@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b172d4f4cc2bdc1e8854e1bf9af13b4295e5058 commit 0b172d4f4cc2bdc1e8854e1bf9af13b4295e5058 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2022-03-22 13:41:02 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> 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 <ehaupt@critical.ch> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203221341.22MDfE7p078376>