pkgsrc-WIP-changes archive

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

Use the right buildlink for libjpeg to fix libjpeg-turbo support.



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Mon Jul 8 16:28:14 2019 +0100
Changeset:	b2580e12157a3f5b8ffc7c68091cb9c936ca18f0

Modified Files:
	openclonk/Makefile
	residualvm/options.mk
	warsow/Makefile

Log Message:
Use the right buildlink for libjpeg to fix libjpeg-turbo support.

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

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

diffstat:
 openclonk/Makefile    | 2 +-
 residualvm/options.mk | 2 +-
 warsow/Makefile       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/openclonk/Makefile b/openclonk/Makefile
index 327f5e0f02..3b8938a3a4 100644
--- a/openclonk/Makefile
+++ b/openclonk/Makefile
@@ -29,8 +29,8 @@ GCC_REQD+=	4.9
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/residualvm/options.mk b/residualvm/options.mk
index 94086a2bca..f783d13f56 100644
--- a/residualvm/options.mk
+++ b/residualvm/options.mk
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-png-prefix=${BUILDLINK_PREFIX.png}
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg}
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mtheora)
diff --git a/warsow/Makefile b/warsow/Makefile
index 05d1d1b8cd..9b780c2647 100644
--- a/warsow/Makefile
+++ b/warsow/Makefile
@@ -20,10 +20,10 @@ CMAKE_ARGS+=	-DUSE_SDL:BOOL=ON
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../wip/angelscript/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index