head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.36
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.34
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.32
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.30
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.28
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.26
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.24
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.22
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.20
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.18
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.16
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.14
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.12
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.10
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.8
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.6
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.4
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.2
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.1.0.2
	pkgsrc-2021Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2021.12.27.04.18.59;	author dholland;	state Exp;
branches;
next	1.1;
commitid	eKf8ePAMfWbk5fmD;

1.1
date	2021.08.24.11.25.42;	author nia;	state Exp;
branches;
next	;
commitid	nMjRcNrSKaX5td6D;


desc
@@


1.2
log
@multimedia/harvid: patch out broken config tests

We don't need an extra set of config tests in the makefile to make
sure the right deps are installed, especially when they don't use the
right flags or the right syntax and don't work. Instead of trying to
fix them up, just remove them entirely.
@
text
@$NetBSD: patch-src_Makefile,v 1.1 2021/08/24 11:25:42 nia Exp $

We don't need an extra set of config tests in the makefile, especially
ones that don't use the right flags and therefore don't work.

--- src/Makefile.orig	2018-11-30 22:30:41.000000000 +0000
+++ src/Makefile
@@@@ -8,18 +8,6 @@@@ include ../common.mak
 
 CONFIGTEMP=conf.out
 
-ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists libavcodec libavformat libavutil libswscale || echo no), no)
-  $(error "http://ffmpeg.org is required - install libavcodec-dev, libswscale-dev, etc")
-endif
-
-ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists libpng || echo no), no)
-  $(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)
-  $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
-endif
-
 FLAGS=-I../libharvid/
 FLAGS+=$(ARCHINCLUDES) $(ARCHFLAGS)
 FLAGS+=`pkg-config --cflags libavcodec libavformat libavutil libpng libswscale`
@


1.1
log
@harvid: Fix building on NetBSD current. Do not echo escape sequences.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 3
echoing escapes considered harmful. Use printf instead.

Fixes build on NetBSD 9.99.x.
d8 3
a10 3
@@@@ -16,7 +16,7 @@@@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF
   $(error "libpng is required - install libpng-dev")
 endif
d12 8
d21 6
a26 4
+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
 
@