Received: by mail.netbsd.org (Postfix, from userid 605) id 62CBD84D61; Tue, 24 Aug 2021 11:25:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9645A84D61 for ; Tue, 24 Aug 2021 11:25:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gWTi6bPX-fWK for ; Tue, 24 Aug 2021 11:25:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0F69D84C13 for ; Tue, 24 Aug 2021 11:25:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 07E11FA97; Tue, 24 Aug 2021 11:25:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162980434318800" MIME-Version: 1.0 Date: Tue, 24 Aug 2021 11:25:43 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/multimedia/harvid To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210824112543.07E11FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162980434318800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Aug 24 11:25:42 UTC 2021 Modified Files: pkgsrc/multimedia/harvid: distinfo Added Files: pkgsrc/multimedia/harvid/patches: patch-src_Makefile Log Message: harvid: Fix building on NetBSD current. Do not echo escape sequences. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/harvid/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/harvid/patches/patch-src_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162980434318800 Content-Disposition: inline Content-Length: 2178 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/harvid/distinfo diff -u pkgsrc/multimedia/harvid/distinfo:1.2 pkgsrc/multimedia/harvid/distinfo:1.3 --- pkgsrc/multimedia/harvid/distinfo:1.2 Mon Dec 2 13:42:00 2019 +++ pkgsrc/multimedia/harvid/distinfo Tue Aug 24 11:25:42 2021 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2019/12/02 13:42:00 nia Exp $ +$NetBSD: distinfo,v 1.3 2021/08/24 11:25:42 nia Exp $ SHA1 (harvid-0.8.3.tar.gz) = 4016446ba58609911b30ecc6cc4f345733cdc22d RMD160 (harvid-0.8.3.tar.gz) = ed77788cd4c219c16f94a10327085a9a3db7ceff SHA512 (harvid-0.8.3.tar.gz) = 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac Size (harvid-0.8.3.tar.gz) = 116446 bytes SHA1 (patch-libharvid_timecode.h) = dca6192ad3bb7ea2bad3ae69d82fd0e12ec1efd3 +SHA1 (patch-src_Makefile) = 84df56465b2f51ff9cd3f368cddb08c1ea7499af Added files: Index: pkgsrc/multimedia/harvid/patches/patch-src_Makefile diff -u /dev/null pkgsrc/multimedia/harvid/patches/patch-src_Makefile:1.1 --- /dev/null Tue Aug 24 11:25:42 2021 +++ pkgsrc/multimedia/harvid/patches/patch-src_Makefile Tue Aug 24 11:25:42 2021 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_Makefile,v 1.1 2021/08/24 11:25:42 nia Exp $ + +echoing escapes considered harmful. Use printf instead. + +Fixes build on NetBSD 9.99.x. + +--- src/Makefile.orig 2018-11-30 22:30:41.000000000 +0000 ++++ src/Makefile +@@ -16,7 +16,7 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF + $(error "libpng is required - install libpng-dev") + endif + +-ifeq ($(shell $(ECHO) "\#include \n\#include \nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no) ++ifeq ($(shell printf "#include \n#include \nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }\n" | $(CC) -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no) + $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev") + endif + --_----------=_162980434318800--