pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/zbar: Add more includes.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Sun Dec 1 17:12:06 2019 +0000
Changeset:	e608aebf0d3adde0c704ae034425c59b231b4a41

Modified Files:
	zbar/buildlink3.mk
	zbar/options.mk

Log Message:
wip/zbar: Add more includes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e608aebf0d3adde0c704ae034425c59b231b4a41

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zbar/buildlink3.mk | 5 +++++
 zbar/options.mk    | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs:
diff --git a/zbar/buildlink3.mk b/zbar/buildlink3.mk
index 3686ffb6f9..233cf36127 100644
--- a/zbar/buildlink3.mk
+++ b/zbar/buildlink3.mk
@@ -10,6 +10,11 @@ BUILDLINK_PKGSRCDIR.zbar?=	../../wip/zbar
 
 pkgbase:=	zbar
 .include "../../mk/pkg-build-options.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 
 .endif # ZBAR_BUILDLINK3_MK
 
diff --git a/zbar/options.mk b/zbar/options.mk
index 94526620a3..e09f5ebd34 100644
--- a/zbar/options.mk
+++ b/zbar/options.mk
@@ -25,9 +25,12 @@ CONFIGURE_ARGS+=	--without-imagemagick
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-xshm
 CONFIGURE_ARGS+=	--with-xv
-.  include "../../x11/libX11/buildlink3.mk"
-.  include "../../x11/libXext/buildlink3.mk"
-.  include "../../x11/libXv/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xshm


Home | Main Index | Thread Index | Old Index