Skip to content

Commit

Permalink
harvid: Fix building on NetBSD current. Do not echo escape sequences.
Browse files Browse the repository at this point in the history
  • Loading branch information
alarixnia committed Aug 24, 2021
1 parent 1c84b24 commit af71c6b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
3 changes: 2 additions & 1 deletion multimedia/harvid/distinfo
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions multimedia/harvid/patches/patch-src_Makefile
Original file line number Diff line number Diff line change
@@ -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 <stdio.h>\n\#include <jpeglib.h>\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 <stdio.h>\n#include <jpeglib.h>\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

0 comments on commit af71c6b

Please sign in to comment.