CVS commit: pkgsrc/x11/qt5-qtwebengine

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Aug 31 13:16:39 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: Makefile

Log Message:
qt5-qtwebengine: Use internal libjpeg-turbo. Bump PKGREVISION

* JPEG_ACCEPTED=libjpeg-turbo conflicts with ordinary installation.
  Use internal libjpeg-turbo.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt5-qtwebengine/Makefile

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

Modified files:

Index: pkgsrc/x11/qt5-qtwebengine/Makefile
diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.2 pkgsrc/x11/qt5-qtwebengine/Makefile:1.3
--- pkgsrc/x11/qt5-qtwebengine/Makefile:1.2     Wed Aug  4 08:22:30 2021
+++ pkgsrc/x11/qt5-qtwebengine/Makefile Tue Aug 31 13:16:39 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2021/08/04 08:22:30 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/31 13:16:39 ryoon Exp $
 
 DISTNAME=      qtwebengine-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtwebengine-${QTVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Chromium-based web engine for Qt5
 
 MAKE_ENV+=             QTDIR=${QTDIR}
@@ -23,7 +23,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-expat-[0-9
 TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
 BUILD_DEPENDS+=        nodejs-[0-9]*:../../lang/nodejs
 
-JPEG_ACCEPTED= libjpeg-turbo
+#JPEG_ACCEPTED=        libjpeg-turbo
 
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-fgnu-inline-asm
 
@@ -81,7 +81,7 @@ post-install:
 #.include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/re2/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+#.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"