Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 69BE584CE8 for ; Tue, 26 Sep 2023 10:16:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id FFK4EjMbgGra for ; Tue, 26 Sep 2023 10:16:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DD28884CD7 for ; Tue, 26 Sep 2023 10:16:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D66A9FBDB; Tue, 26 Sep 2023 10:16:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1695723396143430" MIME-Version: 1.0 Date: Tue, 26 Sep 2023 10:16:36 +0000 From: "Paolo Vincenzo Olivo" Subject: CVS commit: pkgsrc/graphics/ximaging To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: vins@netbsd.org X-Mailer: log_accum Message-Id: <20230926101636.D66A9FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1695723396143430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: vins Date: Tue Sep 26 10:16:36 UTC 2023 Modified Files: pkgsrc/graphics/ximaging: Makefile Log Message: ximaging: fix regression. Starting with release 1.7, built-in support for any image format but xpm/xbm is only built if the corresponding macros are defined. Since, we're overwriting platform-specific CFLAGS, this resulted in a functionally broken package. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/ximaging/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1695723396143430 Content-Disposition: inline Content-Length: 1607 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/ximaging/Makefile diff -u pkgsrc/graphics/ximaging/Makefile:1.4 pkgsrc/graphics/ximaging/Makefile:1.5 --- pkgsrc/graphics/ximaging/Makefile:1.4 Thu Mar 2 09:31:52 2023 +++ pkgsrc/graphics/ximaging/Makefile Tue Sep 26 10:16:36 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2023/03/02 09:31:52 vins Exp $ +# $NetBSD: Makefile,v 1.5 2023/09/26 10:16:36 vins Exp $ DISTNAME= ximaging-src-1.7 PKGNAME= ${DISTNAME:S,-src,,} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://fastestcode.org/dl/ EXTRACT_SUFX= .tar.xz @@ -11,13 +12,20 @@ HOMEPAGE= https://fastestcode.org/emwm.h COMMENT= Image browser and viewer for Unix - X/Motif LICENSE= mit +# Enable support for OpenMP, Xinerama and various image formats. +CFLAGS+= -fopenmp -DENABLE_JPEG -DENABLE_PNG -DENABLE_OMP \ + -DENABLE_PNG -DENABLE_TIFF -DENABLE_XINERAMA +LDFLAGS+= -fopenmp + +PTHREAD_OPTS+= require +PTHREAD_AUTO_VARS= yes +BUILDLINK_TRANSFORM+= rm:-pthread + MAKE_FLAGS+= CC?=${CC:Q} MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} -MAKE_FLAGS+= CFLAGS+="-fopenmp -DENABLE_OMP" MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} -MAKE_FLAGS+= LDFLAGS+="-fopenmp -pthread" MAKE_FLAGS+= PNG_LIBS=-lpng16 -MAKE_FLAGS+= PREFIX=${PREFIX} +MAKE_FLAGS+= PREFIX=${PREFIX:Q} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} MAKE_FLAGS+= APPLRESDIR=${PREFIX}/lib/X11/app-defaults @@ -40,5 +48,4 @@ post-install: .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1695723396143430--