CVS commit: pkgsrc/graphics/cal3d

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/cal3d
From: "Makoto Fujiwara" <mef%netbsd.org@localhost>
Date: Sat, 30 Jan 2021 08:57:02 +0000

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Jan 30 08:57:02 UTC 2021

Modified Files:
        pkgsrc/graphics/cal3d: Makefile Makefile.common PLIST distinfo
        pkgsrc/graphics/cal3d/patches: patch-aa patch-src_cal3d_submesh.cpp
Added Files:
        pkgsrc/graphics/cal3d/patches: patch-src_cal3d_converter.cpp
            patch-src_cal3d_hardwaremodel.cpp

Log Message:
(graphics/cal3d) Updated 0.9.1 to 0.11.0, build fix

o-----------------------------------------------------------------------------o
| Version 0.11.0 ( 29 june 2006)
o-----------------------------------------------------------------------------o

  - Make the list of the root bones a vector. So the root bones can be acceded
    in C wrapper.
  - Add some missing function to access to private variables.
  - Add cal3d_converter to the default distribution with manual page and file format
    description (tools subdirectory is therefore removed)
  - The destructor of CalModel is now virtual.
  - Made CalModel noncopyable to prevent shallow pointer copying bugs.
  - Use a RefCounted base class and RefPtr smart pointers to hold RefCounted objects.
  - Make CalModel destructor nonvirtual
  - Improve bounding boxes calculation performance.
  - Update the C wrapper.
  - Add some function to rotate around axis during the loading.
  - When a cycle animation is played, ensure that the last post equals the first pose.
  - Extended callback mechanism to pass user data directly instead of making
    the callback query for it.  This means the callback executable does not have
    to link with cal3d.lib and makes many things simpler in CS context.
    Also worked around a bug (feature?) in the mixer which thinks that
    m_AnimDuration is always 0 for AnimActions.  Now the callback uses the
    internal time counter of the animation, which is probably more consistent
    anyway.
  - VC6 and automake fixes. Removed old variables from src/cal3d/Makefile.am.
  - 64bit compatibility fixes.
  - Patch for reading correctly raw texture on a Big endian cpu (for Mac).
  - Fixed bug in updating current anim time when time factor is set to negative.
  - Correction in max exporters.
  - Update the glew (The OpenGL Extension Wrangler Library).
  - Made the refcounted classes derive from RefCounted, and manage
    their lifetimes with RefPtr smart pointers.
  - Put TinyXML into the cal3d namespace so it doesn't conflict with other
    libraries linking with their own TinyXML.
  - Fixed bug in updating current anim time when time factor is set to negative,
    which resuilted in anim times like -32 instead of between 0 and 2 seconds,
    for example.  This threw the bone extrapolations way off and made the model
    look like garbage until the anim time got back in the right zone. (Keith Fulton)
  - GNU/Linux compilation / packaging fixes (-DCAL_16BIT_INDICES is included if
    relevant in the .pc)
  - Upgraded the guide

o-----------------------------------------------------------------------------o
| Version 0.10.0 ( 12 january 2005)
o-----------------------------------------------------------------------------o

  - CalModel::setAbstractMixer and CalAbstractMixer to enable third
    party mixers.
  - Symbolic names for coreMaterial, coreMesh, coreAnimations loaded
    by coremodel.{h,cpp}
  - Add functions to control force of the spring system
  - CalHardwareModel : a object to store and to compute information
    needed to do hardware vertex skinning.
  - Add a time factor to allow reverse time of sync animation.
  - Most of the math functions are now inline.
  - Add an option to stop a action animation at the end.
  - Add functions to rescale a core model,
    but this can be done only before creating the CalModel.
  - Fix in the XML loader
  - Add a function to compute the global bounding box of the model.
  - Rename calculateBoundingBox to calculateBoundingBoxes.
  - Add reference counting. Core* objects can be
    now shared between several coremodel correctly.
  - Modify the XML file format to be XML valid
  - Added animation callbacks.
  - Added Maya exporter.
  - create/destroy functions removed.
  - Add a "stride" argument to getVertices(), getNormals() ...


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/cal3d/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/cal3d/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/cal3d/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/cal3d/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/cal3d/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/cal3d/patches/patch-src_cal3d_converter.cpp \
    pkgsrc/graphics/cal3d/patches/patch-src_cal3d_hardwaremodel.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp

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

Modified files:

Index: pkgsrc/graphics/cal3d/Makefile
diff -u pkgsrc/graphics/cal3d/Makefile:1.12 pkgsrc/graphics/cal3d/Makefile:1.13
--- pkgsrc/graphics/cal3d/Makefile:1.12 Sat Nov  2 22:37:54 2019
+++ pkgsrc/graphics/cal3d/Makefile      Sat Jan 30 08:57:02 2021
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2019/11/02 22:37:54 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2021/01/30 08:57:02 mef Exp $
 #
 
 PKGNAME=       cal3d-${CAL3D_VERSION}
-PKGREVISION=   3
 
 .include "../../graphics/cal3d/Makefile.common"
 
-COMMENT=       Skeletal based 3d character animation library in C++
 LICENSE=       gnu-lgpl-v2.1
 
 USE_TOOLS+=            automake
 
-pre-configure:
-       cd ${WRKSRC} && ./autogen.sh
+#pre-configure:
+#      cd ${WRKSRC} && ./autogen.sh
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/cal3d/Makefile.common
diff -u pkgsrc/graphics/cal3d/Makefile.common:1.15 pkgsrc/graphics/cal3d/Makefile.common:1.16
--- pkgsrc/graphics/cal3d/Makefile.common:1.15  Fri Mar 20 11:57:46 2020
+++ pkgsrc/graphics/cal3d/Makefile.common       Sat Jan 30 08:57:02 2021
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile.common,v 1.15 2020/03/20 11:57:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.16 2021/01/30 08:57:02 mef Exp $
 #
 # used by graphics/cal3d/Makefile
 # used by graphics/cal3d-examples/Makefile
 
 DISTNAME=              cal3d-${CAL3D_VERSION}
 CATEGORIES=            graphics
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=cal3d/}
+MASTER_SITES=          https://mp3butcher.github.io/Cal3D/sources/
 
-CAL3D_VERSION=         0.9.1
+CAL3D_VERSION=         0.11.0
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://cal3d.sourceforge.net/
 COMMENT=       Skeletal based 3d character animation library in C++
 
-EXTRACT_SUFX=          .tar.bz2
 USE_LANGUAGES=         c c++03
 USE_LIBTOOL=           yes
 USE_TOOLS+=            automake

Index: pkgsrc/graphics/cal3d/PLIST
diff -u pkgsrc/graphics/cal3d/PLIST:1.4 pkgsrc/graphics/cal3d/PLIST:1.5
--- pkgsrc/graphics/cal3d/PLIST:1.4     Sun Jun 14 17:59:07 2009
+++ pkgsrc/graphics/cal3d/PLIST Sat Jan 30 08:57:02 2021
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/01/30 08:57:02 mef Exp $
+bin/cal3d_converter
 include/cal3d/animation.h
 include/cal3d/animation_action.h
 include/cal3d/animation_cycle.h
+include/cal3d/animcallback.h
 include/cal3d/bone.h
 include/cal3d/buffersource.h
 include/cal3d/cal3d.h
@@ -20,6 +22,7 @@ include/cal3d/coretrack.h
 include/cal3d/datasource.h
 include/cal3d/error.h
 include/cal3d/global.h
+include/cal3d/hardwaremodel.h
 include/cal3d/loader.h
 include/cal3d/matrix.h
 include/cal3d/mesh.h
@@ -29,6 +32,8 @@ include/cal3d/morphtargetmixer.h
 include/cal3d/physique.h
 include/cal3d/platform.h
 include/cal3d/quaternion.h
+include/cal3d/refcounted.h
+include/cal3d/refptr.h
 include/cal3d/renderer.h
 include/cal3d/resource.h
 include/cal3d/saver.h
@@ -36,8 +41,9 @@ include/cal3d/skeleton.h
 include/cal3d/springsystem.h
 include/cal3d/streamsource.h
 include/cal3d/submesh.h
-include/cal3d/tinystr.h
 include/cal3d/tinyxml.h
+include/cal3d/transform.h
 include/cal3d/vector.h
 lib/libcal3d.la
 lib/pkgconfig/cal3d.pc
+man/man1/cal3d_converter.1

Index: pkgsrc/graphics/cal3d/distinfo
diff -u pkgsrc/graphics/cal3d/distinfo:1.8 pkgsrc/graphics/cal3d/distinfo:1.9
--- pkgsrc/graphics/cal3d/distinfo:1.8  Tue Nov  3 21:33:53 2015
+++ pkgsrc/graphics/cal3d/distinfo      Sat Jan 30 08:57:02 2021
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 21:33:53 agc Exp $
+$NetBSD: distinfo,v 1.9 2021/01/30 08:57:02 mef Exp $
 
-SHA1 (cal3d-0.9.1.tar.bz2) = 2e0765caddc972f05f70d3a255862ced1276e039
-RMD160 (cal3d-0.9.1.tar.bz2) = f77dcf34a46a9286020592df16f5b16264839d80
-SHA512 (cal3d-0.9.1.tar.bz2) = 98613a96febf749b9a0a4106c216c994b276977efce5de87e0e8186f2dc1873d591daedd176b2f5406381f5373c706d882af2ef04601cc816a585ff1d8ff1396
-Size (cal3d-0.9.1.tar.bz2) = 2871094 bytes
-SHA1 (patch-aa) = dc308a6e7d0322a354b502d3ca6e9a01e497fa78
-SHA1 (patch-ab) = f3fbda1c69c22f5165fe57a7e1bf05190e88a9c0
+SHA1 (cal3d-0.11.0.tar.gz) = 9579ef107a21091ce7e421d8779e9bf8bcd3333f
+RMD160 (cal3d-0.11.0.tar.gz) = 309ee70ff378f679f87934c29308284c435fba79
+SHA512 (cal3d-0.11.0.tar.gz) = 4dc4b36b8f18760bfe6f8c80cbd941c14e2ebe596d0cd514fdb1ae4175bf2706e125665272d67ff21d33bb4b34e7be22bad9c00d488c1da21f442550bf3f204f
+Size (cal3d-0.11.0.tar.gz) = 568532 bytes
+SHA1 (patch-aa) = f3b889454d71aafdff014b17d33681b8f17980cb
 SHA1 (patch-af) = 302a17aebb80a09b35395fc37d3254f0c5a00cb9
-SHA1 (patch-autogen.sh) = c434a05acefd71011e7519e943e5fea3f62deb9b
+SHA1 (patch-src_cal3d_converter.cpp) = b1030fe8f0ae6a9ec5b1219d33e72c55596eb319
+SHA1 (patch-src_cal3d_hardwaremodel.cpp) = 60b52cd2b4e50dc911fcd5d6b6f41ebfb54f821c
 SHA1 (patch-src_cal3d_platform.cpp) = 1d664fcc9b62124f089f202e98c74bc8ae99b8ee
 SHA1 (patch-src_cal3d_renderer.cpp) = 6c8ce2adbb1e58ed6ca22abbd0d3ed2672b11901
-SHA1 (patch-src_cal3d_submesh.cpp) = f336288724b501eeba67cb582424acfc0a583c74
+SHA1 (patch-src_cal3d_submesh.cpp) = 5b34f59784fa727cf7839c652b75f917567ca1c8

Index: pkgsrc/graphics/cal3d/patches/patch-aa
diff -u pkgsrc/graphics/cal3d/patches/patch-aa:1.1.1.1 pkgsrc/graphics/cal3d/patches/patch-aa:1.2
--- pkgsrc/graphics/cal3d/patches/patch-aa:1.1.1.1      Tue Feb 10 09:14:34 2004
+++ pkgsrc/graphics/cal3d/patches/patch-aa      Sat Jan 30 08:57:02 2021
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
---- src/cal3d/Makefile.am.orig Sat Nov 29 15:22:35 2003
-+++ src/cal3d/Makefile.am      Thu Feb  5 13:53:40 2004
-@@ -14,6 +14,7 @@
+$NetBSD: patch-aa,v 1.2 2021/01/30 08:57:02 mef Exp $
+
+
+--- src/cal3d/Makefile.am.orig 2006-06-23 01:18:08.000000000 +0900
++++ src/cal3d/Makefile.am      2021-01-30 17:30:26.080111365 +0900
+@@ -91,6 +91,7 @@ libcal3d_la_SOURCES = \
+       coremorphanimation.cpp
  
- all_libraries = @all_libraries@
- LDFLAGS = @LDFLAGS@
+ libcal3d_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO) 
 +AM_LDFLAGS = @AM_LDFLAGS@
  
- EXTRA_DIST = cal3d.rc cal3d.dsp SConscript
- 
+ pkginclude_HEADERS = \
+       animation.h \

Index: pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp
diff -u pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp:1.1 pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp:1.2
--- pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp:1.1       Fri Nov 25 21:56:18 2011
+++ pkgsrc/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp   Sat Jan 30 08:57:02 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_cal3d_submesh.cpp,v 1.1 2011/11/25 21:56:18 joerg Exp $
+$NetBSD: patch-src_cal3d_submesh.cpp,v 1.2 2021/01/30 08:57:02 mef Exp $
 
---- src/cal3d/submesh.cpp.orig 2011-11-25 16:04:52.000000000 +0000
-+++ src/cal3d/submesh.cpp
-@@ -19,6 +19,7 @@
+--- src/cal3d/submesh.cpp.orig 2004-12-02 07:42:18.000000000 +0900
++++ src/cal3d/submesh.cpp      2021-01-30 17:34:34.617413157 +0900
+@@ -15,6 +15,7 @@
  #include "cal3d/submesh.h"
  #include "cal3d/error.h"
  #include "cal3d/coresubmesh.h"
 +#include <cstring>
  
-  /*****************************************************************************/
- /** Constructs the submesh instance.
+ 
+ CalSubmesh::CalSubmesh(CalCoreSubmesh* coreSubmesh)

Added files:

Index: pkgsrc/graphics/cal3d/patches/patch-src_cal3d_converter.cpp
diff -u /dev/null pkgsrc/graphics/cal3d/patches/patch-src_cal3d_converter.cpp:1.1
--- /dev/null   Sat Jan 30 08:57:02 2021
+++ pkgsrc/graphics/cal3d/patches/patch-src_cal3d_converter.cpp Sat Jan 30 08:57:02 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cal3d_converter.cpp,v 1.1 2021/01/30 08:57:02 mef Exp $
+
+strcasecmp is not defined
+
+
+--- src/cal3d_converter.cpp.orig       2006-05-29 02:35:09.000000000 +0900
++++ src/cal3d_converter.cpp    2021-01-30 17:44:09.947198360 +0900
+@@ -10,6 +10,7 @@
+ //****************************************************************************//
+ 
+ #include "cal3d/cal3d.h"
++#include <cstring>
+ 
+ #define SKELETON 0
+ #define MESH 1
Index: pkgsrc/graphics/cal3d/patches/patch-src_cal3d_hardwaremodel.cpp
diff -u /dev/null pkgsrc/graphics/cal3d/patches/patch-src_cal3d_hardwaremodel.cpp:1.1
--- /dev/null   Sat Jan 30 08:57:02 2021
+++ pkgsrc/graphics/cal3d/patches/patch-src_cal3d_hardwaremodel.cpp     Sat Jan 30 08:57:02 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_cal3d_hardwaremodel.cpp,v 1.1 2021/01/30 08:57:02 mef Exp $
+
+
+--- src/cal3d/hardwaremodel.cpp.orig   2021-01-30 17:39:48.235293991 +0900
++++ src/cal3d/hardwaremodel.cpp        2021-01-30 17:40:17.028509062 +0900
+@@ -23,6 +23,7 @@
+ #include "cal3d/coresubmesh.h"
+ #include "cal3d/coreskeleton.h"
+ #include "cal3d/skeleton.h"
++#include <cstring>
+ 
+ 
+  /*****************************************************************************/

Prev by Date: CVS commit: pkgsrc/net/arping
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/arping
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index