libnoise: mostly done

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libnoise: mostly done
From: Sijmen J. Mulder (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 17 Mar 2025 13:17:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By:	sjmulder
Date:		Wed Feb 5 11:50:09 2025 +0100
Changeset:	0e1d8a5401a6754d2827d556ebc5fce1fd52bab0

Modified Files:
	libnoise/Makefile
	libnoise/PLIST
	libnoise/distinfo
Added Files:
	libnoise/COMMIT_MSG
	libnoise/buildlink3.mk
	libnoise/patches/patch-Makefile
	libnoise/patches/patch-src_Makefile
Removed Files:
	libnoise/TODO

Log Message:
libnoise: mostly done

 - Patch Makefiles and add rpath in LDFLAGS to fix library build
 - Manual install target
 - Write COMMIT_MSG

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

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

diffstat:
 libnoise/COMMIT_MSG                 |  8 +++++++
 libnoise/Makefile                   | 14 +++++++++++
 libnoise/PLIST                      | 46 +++++++++++++++++++++++++++++++++++++
 libnoise/TODO                       |  1 -
 libnoise/buildlink3.mk              | 13 +++++++++++
 libnoise/distinfo                   |  2 ++
 libnoise/patches/patch-Makefile     | 15 ++++++++++++
 libnoise/patches/patch-src_Makefile | 24 +++++++++++++++++++
 8 files changed, 122 insertions(+), 1 deletion(-)

diffs:
diff --git a/libnoise/COMMIT_MSG b/libnoise/COMMIT_MSG
new file mode 100644
index 0000000000..f0365e3254
--- /dev/null
+++ b/libnoise/COMMIT_MSG
@@ -0,0 +1,8 @@
+devel/libnoise: import 1.0.0 from wip
+
+Portable C++ library that is used to generate coherent noise, a type
+of smoothly-changing noise. libnoise can generate Perlin noise, ridged
+multifractal noise, and other types of coherent-noise.
+
+Coherent noise is often used by graphics programmers to generate
+natural-looking textures, planetary terrain, and other things.
diff --git a/libnoise/Makefile b/libnoise/Makefile
index 3c6f670ddc..236a558335 100644
--- a/libnoise/Makefile
+++ b/libnoise/Makefile
@@ -17,4 +17,18 @@ USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 MAKE_JOBS_SAFE=	no
 
+# libtool silently skips building the .so without
+LDFLAGS+=	-rpath ${PREFIX}/lib
+
+INSTALLATION_DIRS=	lib
+INSTALLATION_DIRS+=	include/noise
+INSTALLATION_DIRS+=	include/noise/model
+INSTALLATION_DIRS+=	include/noise/module
+
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/libnoise.la ${DESTDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/include/*.h        ${DESTDIR}${PREFIX}/include/noise
+	${INSTALL_DATA} ${WRKSRC}/include/model/*.h  ${DESTDIR}${PREFIX}/include/noise/model/
+	${INSTALL_DATA} ${WRKSRC}/include/module/*.h ${DESTDIR}${PREFIX}/include/noise/module/
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/libnoise/PLIST b/libnoise/PLIST
index e69de29bb2..6d0c5ad022 100644
--- a/libnoise/PLIST
+++ b/libnoise/PLIST
@@ -0,0 +1,46 @@
+@comment $NetBSD$
+include/noise/basictypes.h
+include/noise/exception.h
+include/noise/interp.h
+include/noise/latlon.h
+include/noise/mathconsts.h
+include/noise/misc.h
+include/noise/model/cylinder.h
+include/noise/model/line.h
+include/noise/model/model.h
+include/noise/model/plane.h
+include/noise/model/sphere.h
+include/noise/module/abs.h
+include/noise/module/add.h
+include/noise/module/billow.h
+include/noise/module/blend.h
+include/noise/module/cache.h
+include/noise/module/checkerboard.h
+include/noise/module/clamp.h
+include/noise/module/const.h
+include/noise/module/curve.h
+include/noise/module/cylinders.h
+include/noise/module/displace.h
+include/noise/module/exponent.h
+include/noise/module/invert.h
+include/noise/module/max.h
+include/noise/module/min.h
+include/noise/module/module.h
+include/noise/module/modulebase.h
+include/noise/module/multiply.h
+include/noise/module/perlin.h
+include/noise/module/power.h
+include/noise/module/ridgedmulti.h
+include/noise/module/rotatepoint.h
+include/noise/module/scalebias.h
+include/noise/module/scalepoint.h
+include/noise/module/select.h
+include/noise/module/spheres.h
+include/noise/module/terrace.h
+include/noise/module/translatepoint.h
+include/noise/module/turbulence.h
+include/noise/module/voronoi.h
+include/noise/noise.h
+include/noise/noisegen.h
+include/noise/vectortable.h
+lib/libnoise.la
diff --git a/libnoise/TODO b/libnoise/TODO
deleted file mode 100644
index d9c60b5243..0000000000
--- a/libnoise/TODO
+++ /dev/null
@@ -1 +0,0 @@
- - Linking (with libtools) fails, looking for main()
diff --git a/libnoise/buildlink3.mk b/libnoise/buildlink3.mk
new file mode 100644
index 0000000000..f30f1e0c41
--- /dev/null
+++ b/libnoise/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	libnoise
+
+.if !defined(LIBNOISE_BUILDLINK3_MK)
+LIBNOISE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libnoise+=	libnoise>=1.0.0
+BUILDLINK_ABI_DEPENDS.libnoise+=	libnoise>=1.0.0
+BUILDLINK_PKGSRCDIR.libnoise?=		../../wip/libnoise
+.endif
+
+BUILDLINK_TREE+=	-libnoise
diff --git a/libnoise/distinfo b/libnoise/distinfo
index 6bbf32b2f9..61c2d39312 100644
--- a/libnoise/distinfo
+++ b/libnoise/distinfo
@@ -3,3 +3,5 @@ $NetBSD$
 BLAKE2s (libnoisesrc-1.0.0.zip) = 28438a38b960e9f395b374def93b289b2e63870e41c3099b0d896ff98d8cdfdc
 SHA512 (libnoisesrc-1.0.0.zip) = 02fd600ad60d668d230ecc9d2f34020c0e3b8d1365c9ec78ae795c7031224fc2624080764824a4f899571d848587578c80a70e879b22463774435f16c3d06529
 Size (libnoisesrc-1.0.0.zip) = 1667748 bytes
+SHA1 (patch-Makefile) = c887155252dbda2ceae433641ad851cf6b3ca1af
+SHA1 (patch-src_Makefile) = 4b6bde5ccd36e927078b964743c3f3d0c698a458
diff --git a/libnoise/patches/patch-Makefile b/libnoise/patches/patch-Makefile
new file mode 100644
index 0000000000..1a6b56a66d
--- /dev/null
+++ b/libnoise/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Exclude lib/Makefile, let libtool deal with that
+
+--- Makefile.orig	2025-02-05 10:16:36.598268887 +0000
++++ Makefile
+@@ -3,7 +3,7 @@ all: doc src include lib
+ clean: cleandoc cleansrc cleaninclude cleanlib
+ install: installinclude installlib
+ 
+-doc src include lib:
++doc src include:
+ 	$(MAKE) -C $@
+ 
+ lib: include
diff --git a/libnoise/patches/patch-src_Makefile b/libnoise/patches/patch-src_Makefile
new file mode 100644
index 0000000000..425a14d84c
--- /dev/null
+++ b/libnoise/patches/patch-src_Makefile
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Let libtool do its library things
+
+--- src/Makefile.orig	2004-10-24 19:21:12.000000000 +0000
++++ src/Makefile
+@@ -11,7 +11,7 @@ OBJECTS=$(SOURCES:.cpp=.o)
+ .PHONY: all clean cleandeps cleanobjs cleanlib libnoise libnoise.so libnoise.so.0
+ 
+ # hooks for future makefiles being able to make multiple SOs, or older SOs
+-libnoise: libnoise.so libnoise.a libnoise.la
++libnoise: libnoise.la
+ libnoise.so: libnoise.so.0
+ libnoise.so.0: libnoise.so.0.3
+ 
+@@ -21,7 +21,7 @@ libnoise.so.0.3: $(OBJECTS)
+ 
+ libnoise.a: $(OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
+-libnoise.la: $(OBJECTS)
++libnoise.la: $(OBJECTS:.o=.lo)
+ 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo)
+ 
+ clean:	cleandeps cleanobjs cleanlib
Prev by Date: Update to 3.16.2 Runs fine with python3.12 from pkgsrc-2024Q4
Next by Date: mofilereader: import 1.2.0
Previous by Thread: Update to 3.16.2 Runs fine with python3.12 from pkgsrc-2024Q4
Next by Thread: mofilereader: import 1.2.0
Indexes:
Home | Main Index | Thread Index | Old Index