Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jun 2023 07:59:24 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: d2a7ba9f8178 - main - audio/audiowmark: Fix build with llvm15
Message-ID:  <202306120759.35C7xOBv003749@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=d2a7ba9f81781b1f0d0820c0c2c0c57f7248628b

commit d2a7ba9f81781b1f0d0820c0c2c0c57f7248628b
Author:     Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2023-06-12 07:59:07 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2023-06-12 07:59:19 +0000

    audio/audiowmark: Fix build with llvm15
    
    Upstream issue: https://github.com/swesterfeld/audiowmark/issues/36
---
 audio/audiowmark/Makefile | 14 +++++---------
 audio/audiowmark/distinfo |  4 +++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/audio/audiowmark/Makefile b/audio/audiowmark/Makefile
index 41a233b17440..972cb421f24c 100644
--- a/audio/audiowmark/Makefile
+++ b/audio/audiowmark/Makefile
@@ -1,7 +1,11 @@
 PORTNAME=	audiowmark
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	audio
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	99ffa6b4a4f311c88b6b38b31e579b2102453f3a.patch:-p1 # https://github.com/swesterfeld/audiowmark/issues/36
+
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Audio and video watermarking tool
 WWW=		https://github.com/swesterfeld/audiowmark
@@ -36,16 +40,8 @@ OPTIONS_DEFAULT=	FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg
 
-.include <bsd.port.pre.mk>
-
-# Fails to compile with llvm15
-# https://github.com/swesterfeld/audiowmark/issues/36
-.if ${OSVERSION} >= 1400000
-USE_GCC=	yes
-.endif
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.adoc ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/audiowmark/distinfo b/audio/audiowmark/distinfo
index b60df4e2bd33..916980cf60e0 100644
--- a/audio/audiowmark/distinfo
+++ b/audio/audiowmark/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1686217029
+TIMESTAMP = 1686551226
 SHA256 (swesterfeld-audiowmark-0.6.1_GH0.tar.gz) = 033500755f333db228c0192c80782fa4ad947e7604a5f34689a3ce4eef72afcc
 SIZE (swesterfeld-audiowmark-0.6.1_GH0.tar.gz) = 102875
+SHA256 (99ffa6b4a4f311c88b6b38b31e579b2102453f3a.patch) = a706906a72cfd9cd6b569901a5e00ba5a14e0a6634aa6c7231381831d252f5b5
+SIZE (99ffa6b4a4f311c88b6b38b31e579b2102453f3a.patch) = 1056



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306120759.35C7xOBv003749>