pkgsrc-WIP-changes archive

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

CuraEngine: Use "stb/stb_image.h" file downloaded by pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Mon Aug 26 23:45:32 2024 +0900
Changeset:	b65336093b3139f869e35464d393fb21a8cbfd8a

Modified Files:
	CuraEngine/Makefile
	CuraEngine/distinfo
Added Files:
	CuraEngine/patches/patch-CMakeLists.txt

Log Message:
CuraEngine: Use "stb/stb_image.h" file downloaded by pkgsrc

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

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

diffstat:
 CuraEngine/Makefile                     |  8 ++++++++
 CuraEngine/distinfo                     |  4 ++++
 CuraEngine/patches/patch-CMakeLists.txt | 17 +++++++++++++++++
 3 files changed, 29 insertions(+)

diffs:
diff --git a/CuraEngine/Makefile b/CuraEngine/Makefile
index 303e300459..2c558789ad 100644
--- a/CuraEngine/Makefile
+++ b/CuraEngine/Makefile
@@ -7,6 +7,10 @@ PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Ultimaker/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
+STB_IMAGE_H=	stb_image.h
+DISTFILES=	${DEFAULT_DISTFILES} ${STB_IMAGE_H}
+
+SITES.${STB_IMAGE_H}	= https://raw.githubusercontent.com/nothings/stb/d5d052c806eee2ca1f858cb58b2f062d9fa25b90/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/Ultimaker/CuraEngine/
@@ -16,6 +20,10 @@ LICENSE=	gnu-agpl-v3
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
+pre-configure:
+	${MKDIR} ${BUILDLINK_DIR}/include/stb
+	${LN} -sf ${WRKDIR}/${STB_IMAGE_H} ${BUILDLINK_DIR}/include/stb/
+
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../wip/libArcus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/CuraEngine/distinfo b/CuraEngine/distinfo
index dbe396db21..a1e5e53a1b 100644
--- a/CuraEngine/distinfo
+++ b/CuraEngine/distinfo
@@ -3,3 +3,7 @@ $NetBSD$
 BLAKE2s (CuraEngine/4.13.1.tar.gz) = 20943978a74c3c9ef9cc16d5ec6a14554963af4a980f9e96667cc5ba8b595621
 SHA512 (CuraEngine/4.13.1.tar.gz) = 224379a40e26ae0026a3849d582353e49edf99520401e1fef56c9504638c68c62cfe394dab0eb40e4a447bfe0bfa506a880512e84fd6057a839b6384087c46d0
 Size (CuraEngine/4.13.1.tar.gz) = 1727935 bytes
+BLAKE2s (CuraEngine/stb_image.h) = 9c5c94ede77601a0f9f6a5a1e87f720d85479cd10947b031d011c59c733b0556
+SHA512 (CuraEngine/stb_image.h) = 1569df5cdea3645ee1119592cd0a9df10e43aea075199cc2ba9e33204ec33900c2b3213f5e0246898d6d7771950333bbae1d537470eb01c05a117f1298016d69
+Size (CuraEngine/stb_image.h) = 263611 bytes
+SHA1 (patch-CMakeLists.txt) = 438db12f58d7307389926cf4d15ecf046c1f9bc8
diff --git a/CuraEngine/patches/patch-CMakeLists.txt b/CuraEngine/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..697346838c
--- /dev/null
+++ b/CuraEngine/patches/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Use "stb/stb_image.h" file downloaded by pkgsrc.
+
+--- CMakeLists.txt.orig	2022-01-24 15:11:50.000000000 +0000
++++ CMakeLists.txt
+@@ -28,10 +28,6 @@ if(ENABLE_ARCUS)
+     endif()
+ endif()
+ 
+-#For reading image files.
+-find_package(Stb REQUIRED)
+-include_directories(${Stb_INCLUDE_DIRS})
+-
+ option(USE_SYSTEM_LIBS "Use the system libraries if available" OFF)
+ if(USE_SYSTEM_LIBS)
+     find_package(RapidJSON CONFIG REQUIRED)


Home | Main Index | Thread Index | Old Index