From nobody Sun Sep 24 09:25:14 2023 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 4RtgZz240zz4th2D; Sun, 24 Sep 2023 09:25: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 4RtgZz14hHz3gjS; Sun, 24 Sep 2023 09:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695547515; 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=k6cdlacybreZASp19f4huKPgQ4YRRBqZ4DxPS5JpxUs=; b=SsnWF5t7LSE8j/bXX+iEi5YtePl4F7yFVZPm3O/nGo5qveziUejek6JaACagDb5u3H1j+p V42eKU9sPSuAfCjkr1EifJ5jp+TkZtQqIHRdrbmmculyHpyVg/3Gxej1dHzxSI0YZxNT2k KEPfCqAaDyq+2pboLd4Ujp8byDsNOaGJ3eXZOwqZAXXyAnxSFF4PGanO/tWpTDM9TgMNhU u5RygQ5Xn2eKk/s1kI7Vv5ydP69vabuug28PDnll0lMIEYhzmS9eZiuQQqK4+xk6Nc6shq JOVlq2rAP8Denrma5Ba69EyhVV8hcWZNK+tKBGqnINBaIhA9W4IK2hB2b1Q0lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695547515; a=rsa-sha256; cv=none; b=Gr9B/VjsMr9kPfnCSqUEGtssve+PeqQlfKfG/UHLZseXEfVjBYbLllb13SDQ5yg5FbT0qE yGGYx2IsL6q1OkJV3VssKVL5ii0gTkbY2RCaukuTf94S5fBeJvc4G1LyqxMBgp5sgPFQYx bYR2MsEJsigYX4KfsPyxoK87ripFEz3xEaxrCiWMUiGUmM4H59Kge9Azm+JJp1qoRxbS+G eJIp98yWXByBBdxHsVKr3rrrMW5mmS6oR7hZRIf8+P/kBpR/T2k95vrHbTahMF70/o+vFW 7OsmhZAjaZVVornf5KYAT9bTJMOJZ9LtIYjldZgEOGTKrKNBuVxLMPl2RXOFRQ== 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=1695547515; 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=k6cdlacybreZASp19f4huKPgQ4YRRBqZ4DxPS5JpxUs=; b=leAe7ngkyIbMsYMXNmnv8K5jrfcLrI4d6huqPwbl/K1Kp/5GziykVEBgJgLACo1qNrcyu8 P7yhphkNSL3YA8BMrZumKZkWdXZOyZ564FaMbvPoT7Xb+1jt+Prexi6jgSR6gP83IqbgWL 0XjFiTqtOW5/zLXlVIIgne39vyXGjEGnjHCurFI3zME4UbW7JTulf+kOUSn0uIuqpGMmDv /Agc8CmgmnUAst1CymzFls0dme2VvnRvlDTFnfWBNVD5k6faoVRLKBEbeSqWcqxYPKf6oT u7f9C8y2eSirBERk3Vhl+SLeqvY0flvSt5JqtBkKvRQWZM8G7qNvtnTH5izADQ== 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 4RtgZz06nfzgxW; Sun, 24 Sep 2023 09:25:15 +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 38O9PEtd097013; Sun, 24 Sep 2023 09:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38O9PEnv097010; Sun, 24 Sep 2023 09:25:14 GMT (envelope-from git) Date: Sun, 24 Sep 2023 09:25:14 GMT Message-Id: <202309240925.38O9PEnv097010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 082c2a33647f - main - audio/p5-Ogg-Vorbis-Header: unbreak the port's build against Clang 16 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 082c2a33647f8921c7bf815a02c9bd62eeb91a08 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=082c2a33647f8921c7bf815a02c9bd62eeb91a08 commit 082c2a33647f8921c7bf815a02c9bd62eeb91a08 Author: Alexey Dokuchaev AuthorDate: 2023-09-24 09:24:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-09-24 09:24:30 +0000 audio/p5-Ogg-Vorbis-Header: unbreak the port's build against Clang 16 write_vorbis() must return an integer, but was returning &PL_sv_undef in several places vs. zero in other error paths. Follow the original* implementation and replace those with zeros as well. To make hunting potential compiler-related bugs easier in the future, respect ${CC} and mute one harmless but particularly annoying warning which clutters the build log way more than does any good. *) https://www.perlmonks.org/?node_id=200588 --- audio/p5-Ogg-Vorbis-Header/Makefile | 6 +- .../files/patch-lib_Ogg_Vorbis_Header.pm | 66 ++++++++++++++++++++++ audio/p5-Ogg-Vorbis-Header/pkg-descr | 2 +- 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile index c6f83ae36add..ea84faabfa46 100644 --- a/audio/p5-Ogg-Vorbis-Header/Makefile +++ b/audio/p5-Ogg-Vorbis-Header/Makefile @@ -5,18 +5,16 @@ MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org -COMMENT= Manipulate / fetch info from Ogg-Vorbis audio files +COMMENT= Fetch/manipulate information from Ogg-Vorbis audio files WWW= https://metacpan.org/release/Ogg-Vorbis-Header LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.GPL -BROKEN_FreeBSD_14= fails to compile: incompatible pointer to integer conversion returning 'SV *' (aka 'struct sv *') - BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis -RUN_DEPENDS= p5-Inline>=0:devel/p5-Inline \ +RUN_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \ p5-Inline-C>=0:devel/p5-Inline-C USES= perl5 diff --git a/audio/p5-Ogg-Vorbis-Header/files/patch-lib_Ogg_Vorbis_Header.pm b/audio/p5-Ogg-Vorbis-Header/files/patch-lib_Ogg_Vorbis_Header.pm new file mode 100644 index 000000000000..bb5a63851aaf --- /dev/null +++ b/audio/p5-Ogg-Vorbis-Header/files/patch-lib_Ogg_Vorbis_Header.pm @@ -0,0 +1,66 @@ +--- lib/Ogg/Vorbis/Header.pm.orig 2021-01-04 13:38:15 UTC ++++ lib/Ogg/Vorbis/Header.pm +@@ -7,8 +7,9 @@ use warnings; + our $VERSION = '0.11'; + + use Inline C => 'DATA', ++ CC => $ENV{CC}, ++ CCFLAGSEX => '-Wno-compound-token-split-by-macro', + LIBS => '-logg -lvorbis -lvorbisfile', +- INC => '-I/inc', + AUTO_INCLUDE => '#include "inc/vcedit.h"', + AUTO_INCLUDE => '#include "inc/vcedit.c"', + VERSION => '0.11', +@@ -476,14 +477,14 @@ int write_vorbis (SV *obj) + if ((fd = fopen(inpath, "rb")) == NULL) { + perror("Error opening file in Ogg::Vorbis::Header::write\n"); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + + if ((fd2 = fopen(outpath, "w+b")) == NULL) { + perror("Error opening temp file in Ogg::Vorbis::Header::write\n"); + fclose(fd); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + + /* Setup the state and comments structs */ +@@ -494,7 +495,7 @@ int write_vorbis (SV *obj) + fclose(fd2); + unlink(outpath); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + vc = vcedit_comments(state); + +@@ -526,7 +527,7 @@ int write_vorbis (SV *obj) + vcedit_clear(state); + unlink(outpath); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + + fclose(fd); +@@ -536,7 +537,7 @@ int write_vorbis (SV *obj) + perror("Error copying tempfile in Ogg::Vorbis::Header::add_comment\n"); + unlink(outpath); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + + if ((fd2 = fopen(inpath, "wb")) == NULL) { +@@ -544,7 +545,7 @@ int write_vorbis (SV *obj) + fclose(fd); + unlink(outpath); + free(outpath); +- return &PL_sv_undef; ++ return 0; + } + + while ((bytes = fread(buffer, 1, BUFFSIZE, fd)) > 0) diff --git a/audio/p5-Ogg-Vorbis-Header/pkg-descr b/audio/p5-Ogg-Vorbis-Header/pkg-descr index 7ff7e3f14f79..e34e57482d10 100644 --- a/audio/p5-Ogg-Vorbis-Header/pkg-descr +++ b/audio/p5-Ogg-Vorbis-Header/pkg-descr @@ -1 +1 @@ -Fetch/manipulate from Ogg-Vorbis audio files. +Perl module to fetch and manipulate information from Ogg-Vorbis audio files.