From 35b3ba00da4a7bd02502b075c0426a8bf557858f Mon Sep 17 00:00:00 2001 From: salo Date: Sat, 24 May 2003 09:32:34 +0000 Subject: PKGREVISION++ - build and install shared libraries and example programs (patches mostly from FreeBSD) - better DESCR --- graphics/lib3ds/DESCR | 7 ++-- graphics/lib3ds/Makefile | 4 +- graphics/lib3ds/PLIST | 6 ++- graphics/lib3ds/buildlink2.mk | 4 +- graphics/lib3ds/distinfo | 5 ++- graphics/lib3ds/patches/patch-aa | 43 +++++++++++++++++++++ graphics/lib3ds/patches/patch-ab | 81 ++++++++++++++++++++++++++++++++++++++++ graphics/lib3ds/patches/patch-ac | 13 +++++++ 8 files changed, 154 insertions(+), 9 deletions(-) create mode 100644 graphics/lib3ds/patches/patch-aa create mode 100644 graphics/lib3ds/patches/patch-ab create mode 100644 graphics/lib3ds/patches/patch-ac diff --git a/graphics/lib3ds/DESCR b/graphics/lib3ds/DESCR index 9c41316537f..bee7249cb59 100644 --- a/graphics/lib3ds/DESCR +++ b/graphics/lib3ds/DESCR @@ -1,6 +1,7 @@ -Lib3ds is a free alternative to Autodesk's 3DS File Toolkit for handling 3DS -files. Its main goal is to simplify the creation of 3DS import and export -filters. +The 3D Studio File Format Library is an overall software library for managing +3D-Studio Release 3 and 4 .3DS files. It is a free alternative to Autodesk's +3DS File Toolkit for managing 3DS files. Its main goal is to simplify the +creation of 3DS import and export filters. This project is not related in any form to Autodesk. The library is based on unofficial information about the 3DS format found on the web. diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile index 5197691e6fe..1274c844124 100644 --- a/graphics/lib3ds/Makefile +++ b/graphics/lib3ds/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2003/05/24 08:08:57 salo Exp $ +# $NetBSD: Makefile,v 1.5 2003/05/24 09:32:34 salo Exp $ # DISTNAME= lib3ds-1.2.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lib3ds/} diff --git a/graphics/lib3ds/PLIST b/graphics/lib3ds/PLIST index df90bebfae4..fa415b6f02f 100644 --- a/graphics/lib3ds/PLIST +++ b/graphics/lib3ds/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/06 00:52:28 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/05/24 09:32:34 salo Exp $ bin/3ds2m +bin/3ds2rib bin/3dsdump +bin/3dsplayer bin/lib3ds-config include/lib3ds/atmosphere.h include/lib3ds/background.h @@ -23,6 +25,8 @@ include/lib3ds/types.h include/lib3ds/vector.h include/lib3ds/viewport.h lib/lib3ds.a +lib/lib3ds.so +lib/lib3ds.so.1 man/man1/3ds2m.1 man/man1/3dsdump.1 man/man1/lib3ds-config.1 diff --git a/graphics/lib3ds/buildlink2.mk b/graphics/lib3ds/buildlink2.mk index c98966c80ce..4b6bc1f2801 100644 --- a/graphics/lib3ds/buildlink2.mk +++ b/graphics/lib3ds/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/05/24 08:08:57 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/05/24 09:32:34 salo Exp $ # # This Makefile fragment is included by packages that use lib3ds. # @@ -9,7 +9,7 @@ LIB3DS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= lib3ds -BUILDLINK_DEPENDS.lib3ds?= lib3ds>=1.2.0 +BUILDLINK_DEPENDS.lib3ds?= lib3ds>=1.2.0nb2 BUILDLINK_PKGSRCDIR.lib3ds?= ../../graphics/lib3ds EVAL_PREFIX+= BUILDLINK_PREFIX.lib3ds=lib3ds diff --git a/graphics/lib3ds/distinfo b/graphics/lib3ds/distinfo index 69ed7ea584c..22eb64cdfc2 100644 --- a/graphics/lib3ds/distinfo +++ b/graphics/lib3ds/distinfo @@ -1,4 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/09/06 00:52:28 rh Exp $ +$NetBSD: distinfo,v 1.2 2003/05/24 09:32:34 salo Exp $ SHA1 (lib3ds-1.2.0.tar.gz) = 49614218c4c11572887beefaa34d23f72ef70a2c Size (lib3ds-1.2.0.tar.gz) = 136806 bytes +SHA1 (patch-aa) = 0f542d83bbb82e6b89c26288759b24d0dd14cffc +SHA1 (patch-ab) = 37229292682ea9bc35cddb2a1f089e46e8490139 +SHA1 (patch-ac) = ea31fbc277bb980d6d04ca867948f275be919793 diff --git a/graphics/lib3ds/patches/patch-aa b/graphics/lib3ds/patches/patch-aa new file mode 100644 index 00000000000..f040b22c2c1 --- /dev/null +++ b/graphics/lib3ds/patches/patch-aa @@ -0,0 +1,43 @@ +$NetBSD: patch-aa,v 1.1 2003/05/24 09:32:34 salo Exp $ + +--- examples/Makefile.in.orig 2002-01-14 15:24:34.000000000 +0100 ++++ examples/Makefile.in 2003-05-24 10:54:12.000000000 +0200 +@@ -88,26 +88,25 @@ + @GLUT_CHECK_TRUE@PLAYER = @GLUT_CHECK_TRUE@player + @GLUT_CHECK_FALSE@PLAYER = + +-noinst_PROGRAMS = \ ++PROGRAMS = \ + 3ds2rib \ + $(PLAYER) + + + LDADD = \ +- $(top_builddir)/lib3ds/lib3ds.a \ ++ -L$(top_builddir)/lib3ds -l3ds \ + @DMALLOC_LIBS@ -lm + + + player_SOURCES = player.c + player_LDADD = \ +- $(top_builddir)/lib3ds/lib3ds.a \ ++ -L$(top_builddir)/lib3ds -l3ds \ + @GLUT_LIBS@ \ + @DMALLOC_LIBS@ -lm + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = glstub.h +-PROGRAMS = $(noinst_PROGRAMS) + + + DEFS = @DEFS@ -I. -I$(srcdir) -I.. +@@ -239,6 +238,8 @@ + installcheck-am: + installcheck: installcheck-am + install-exec-am: ++ ${BSD_INSTALL_PROGRAM} 3ds2rib ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} player ${PREFIX}/bin/3dsplayer + install-exec: install-exec-am + + install-data-am: diff --git a/graphics/lib3ds/patches/patch-ab b/graphics/lib3ds/patches/patch-ab new file mode 100644 index 00000000000..c19833201fe --- /dev/null +++ b/graphics/lib3ds/patches/patch-ab @@ -0,0 +1,81 @@ +$NetBSD: patch-ab,v 1.1 2003/05/24 09:32:34 salo Exp $ + +--- lib3ds/Makefile.in.orig 2002-01-14 15:24:32.000000000 +0100 ++++ lib3ds/Makefile.in 2003-05-24 10:45:16.000000000 +0200 +@@ -85,6 +85,7 @@ + INCLUDES = -I$(top_srcdir) + + lib_LIBRARIES = lib3ds.a ++lib_SHLIBRARIES= lib3ds.so.1 + + lib3ds_a_SOURCES = \ + io.c \ +@@ -139,7 +140,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +-LIBRARIES = $(lib_LIBRARIES) ++LIBRARIES = $(lib_LIBRARIES) $(lib_SHLIBRARIES) + + + DEFS = @DEFS@ -I. -I$(srcdir) -I.. +@@ -150,6 +151,7 @@ + lib3ds_a_OBJECTS = io.o float.o vector.o matrix.o quat.o tcb.o ease.o \ + chunk.o file.o background.o atmosphere.o shadow.o viewport.o material.o \ + mesh.o camera.o light.o tracks.o node.o ++lib3ds_so_OBJECTS = $(lib3ds_a_OBJECTS:S/.o$/.so/) + AR = ar + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -169,7 +171,7 @@ + + all: all-redirect + .SUFFIXES: +-.SUFFIXES: .S .c .o .s ++.SUFFIXES: .S .c .o .s .so + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib3ds/Makefile + +@@ -187,10 +189,10 @@ + + maintainer-clean-libLIBRARIES: + +-install-libLIBRARIES: $(lib_LIBRARIES) ++install-libLIBRARIES: $(lib_LIBRARIES) $(lib_SHLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) +- @list='$(lib_LIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LIBRARIES) $(lib_SHLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ +@@ -203,6 +205,8 @@ + $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done ++ cd $(DESTDIR)$(libdir); \ ++ ln -sf $(lib_SHLIBRARIES) $(lib_SHLIBRARIES:S/.1$//) + + uninstall-libLIBRARIES: + @$(NORMAL_UNINSTALL) +@@ -219,6 +223,9 @@ + .S.o: + $(COMPILE) -c $< + ++.c.so: ++ $(COMPILE) -fpic -DPIC -c $< -o $(.TARGET) ++ + mostlyclean-compile: + -rm -f *.o core *.core + +@@ -234,6 +241,10 @@ + $(AR) cru lib3ds.a $(lib3ds_a_OBJECTS) $(lib3ds_a_LIBADD) + $(RANLIB) lib3ds.a + ++lib3ds.so.1: $(lib3ds_so_OBJECTS) $(lib3ds_a_DEPENDENCIES) ++ $(CC) -shared -o lib3ds.so.1 -Wl,-soname=lib3ds.so.1 $(lib3ds_so_OBJECTS) $(lib3ds_a_LIBADD) ++ ln -sf lib3ds.so.1 lib3ds.so ++ + install-lib3dsHEADERS: $(lib3ds_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(lib3dsdir) diff --git a/graphics/lib3ds/patches/patch-ac b/graphics/lib3ds/patches/patch-ac new file mode 100644 index 00000000000..fb978618f1e --- /dev/null +++ b/graphics/lib3ds/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2003/05/24 09:32:34 salo Exp $ + +--- tools/Makefile.in.orig 2002-01-14 15:24:33.000000000 +0100 ++++ tools/Makefile.in 2003-05-24 10:17:03.000000000 +0200 +@@ -91,7 +91,7 @@ + + + LDADD = \ +- $(top_builddir)/lib3ds/lib3ds.a \ ++ -L$(top_builddir)/lib3ds -l3ds \ + @DMALLOC_LIBS@ -lm + + -- cgit v1.2.3