Attachment #240882 for bug #270256

View | Details | Raw Unified | Return to bug 270256
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/multimedia/harvid/Makefile (-2 / +1 lines)
1	PORTNAME= harvid	1	PORTNAME= harvid
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.8.2	3	DISTVERSION= 0.9.1
4	PORTREVISION= 3
5	CATEGORIES= multimedia	4	CATEGORIES= multimedia
6		5
7	MAINTAINER= marcelbonnet@gmail.com	6	MAINTAINER= marcelbonnet@gmail.com

Lines 1-3 Link Here

(-)b/multimedia/harvid/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519465247	1	TIMESTAMP = 1678872633
2	SHA256 (x42-harvid-v0.8.2_GH0.tar.gz) = 3e3e22f554c7c8f0efe3ca400200e95c9fd5c0495cc76c4ae08991bc2abbc358	2	SHA256 (x42-harvid-v0.9.1_GH0.tar.gz) = 6a3c881644b4c044d01ebd06bc8388b2f85764d7f1efac4a3cdeac9858f156a5
3	SIZE (x42-harvid-v0.8.2_GH0.tar.gz) = 116541	3	SIZE (x42-harvid-v0.9.1_GH0.tar.gz) = 117187




--- src/Makefile.orig	2023-03-15 09:34:19 UTC
+++ src/Makefile
@@ -16,9 +16,9 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-c
   $(error "libpng is required - install libpng-dev")
 endif
 
-ifeq ($(shell $(CC) ../misc/jpeg-test.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
+#ifeq ($(shell $(CC) ../misc/jpeg-test.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
 

Return to bug 270256

Lines 1-13 Link Here

(-)b/multimedia/harvid/files/patch-src_Makefile (-4 / +4 lines)
1	--- src/Makefile.orig 2018-02-24 09:51:55 UTC	1	--- src/Makefile.orig 2023-03-15 09:34:19 UTC
2	+++ src/Makefile	2	+++ src/Makefile
3	@@ -16,9 +16,9 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF	3	@@ -16,9 +16,9 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-c
4	$(error "libpng is required - install libpng-dev")	4	$(error "libpng is required - install libpng-dev")
5	endif	5	endif
6		6
7	-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)	7	-ifeq ($(shell $(CC) ../misc/jpeg-test.c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) -ljpeg 2>/dev/null \|\| echo no; $(RM) -f $(CONFIGTEMP)), no)
8	- $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")	8	- $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
9	-endif	9	-endif
10	+#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)	10	+#ifeq ($(shell $(CC) ../misc/jpeg-test.c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) -ljpeg 2>/dev/null \|\| echo no; $(RM) -f $(CONFIGTEMP)), no)
11	+# $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")	11	+# $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
12	+#endif	12	+#endif
13		13