commit be9f4a22dd02e4c8728ab2bb6c26bc585ba808d0
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 22 14:04:25 2020 +0100
- new URLs, updated to 0.12[0]
- removed obsolete string patch
- added cpp patch (fix some null pointer returns)
- separated -apidocs
cal3d-fixtag.patch | 47 --------------------------------------------
cal3d-string.patch | 55 ----------------------------------------------------
cal3d.spec | 57 ++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 40 insertions(+), 119 deletions(-)
---
diff --git a/cal3d.spec b/cal3d.spec
index fa66aa1..2b54e62 100644
--- a/cal3d.spec
+++ b/cal3d.spec
@@ -1,16 +1,18 @@
+# TODO: what are the differences between cal3d and imvu-cal3d fork? (both
included in tarball)
Summary: 3d character animation library
Summary(hu.UTF-8): 3D karakter animáció könyvtára
Summary(pl.UTF-8): Biblioteka do trójwymiarowej animacji postaci
Name: cal3d
-Version: 0.11.0
+Version: 0.120
Release: 1
-License: LGPL
+License: LGPL v2.1+
Group: Libraries
-Source0: http://download.gna.org/cal3d/sources/%{name}-%{version}.tar.gz
-# Source0-md5: 82ad09c1c28e73bc9596aec47237bfba
+#Source0Download: https://github.com/mp3butcher/Cal3D/releases
+Source0:
https://github.com/mp3butcher/Cal3D/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 8d914c71119a0a988a582c4bc6a24b53
Patch0: %{name}-fixtag.patch
-Patch1: %{name}-string.patch
-URL: https://gna.org/projects/cal3d/
+Patch1: %{name}-cpp.patch
+URL: https://mp3butcher.github.io/Cal3D/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-dtd31-sgml
@@ -18,6 +20,7 @@ BuildRequires: docbook-utils
BuildRequires: doxygen
BuildRequires: libstdc++-devel
BuildRequires: libtool
+BuildRequires: sed >= 4.0
BuildRequires: scrollkeeper
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,15 +52,30 @@ Fejléc fájlok a cal3d könyvtárhoz.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki cal3d.
+%package apidocs
+Summary: API documentation and guide for cal3d library
+Summary(pl.UTF-8): Dokumentacja i wprowadzenie do biblioteki cal3d
+Group: Documentation
+
+%description apidocs
+API documentation and guide for cal3d library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja i wprowadzenie do biblioteki cal3d.
+
%prep
-%setup -q
+%setup -q -n Cal3D-%{version}
+cd cal3d
#%patch0 -p1
%patch1 -p1
+# obsolete macro, UnitTest++ 2 uses pkg-config instead
+%{__sed} -i -e '/^AM_USE_UNITTESTCPP/d' configure.in
+
%build
-rm -f acinclude.m4
-%{__aclocal}
+cd cal3d
%{__libtoolize}
+%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
@@ -73,9 +91,12 @@ cp -r docs/api/html api
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C cal3d install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcal3d.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,16 +105,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/cal3d*
-%attr(755,root,root) %{_libdir}/libcal3d.so.*.*
+%doc cal3d/{AUTHORS,ChangeLog,README,TODO}
+%attr(755,root,root) %{_bindir}/cal3d_converter
+%attr(755,root,root) %{_libdir}/libcal3d.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcal3d.so.12
%{_mandir}/man1/cal3d*
%files devel
%defattr(644,root,root,755)
-%doc api docs/guide
%attr(755,root,root) %{_libdir}/libcal3d.so
-%{_libdir}/lib*.la
-%{_includedir}/%{name}
-%{_pkgconfigdir}/*.pc
+%{_includedir}/cal3d
+%{_pkgconfigdir}/cal3d.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc cal3d/{api,docs/guide}
diff --git a/cal3d-fixtag.patch b/cal3d-fixtag.patch
index 185a1c9..1297a38 100644
--- a/cal3d-fixtag.patch
+++ b/cal3d-fixtag.patch
@@ -766,53 +766,6 @@ diff -urN cal3d-0.9.1.orig/docs/guide_architecture.sgml
cal3d-0.9.1/docs/guide_a
every part of the core model (every submesh to be more exact) has a
material
thread assigned. You can now very easily change the look of a model
instance,
by simply select a new current material set for its parts. The Cal3D
library is
-diff -urN cal3d-0.9.1.orig/docs/guide_introduction.sgml
cal3d-0.9.1/docs/guide_introduction.sgml
---- cal3d-0.9.1.orig/docs/guide_introduction.sgml 2004-05-31
19:07:22.346376024 +0200
-+++ cal3d-0.9.1/docs/guide_introduction.sgml 2004-05-31 20:19:00.786913736
+0200
-@@ -33,7 +33,7 @@
- </para>
-
- <formalpara>
-- <title><xref linkend="introduction"></title>
-+ <title><xref linkend="introduction"/></title>
- <para>
- This is the chapter you are currently reading. The most important
part is
- the one about the <link linkend="licenses">Licenses</link>.
-@@ -41,7 +41,7 @@
- </formalpara>
-
- <formalpara>
-- <title><xref linkend="decisions"></title>
-+ <title><xref linkend="decisions"/></title>
- <para>
- This chapter provides some background information about the
development of
- Cal3D. It does not contain any crucial facts you have to know in
order to use
-@@ -50,14 +50,14 @@
- </formalpara>
-
- <formalpara>
-- <title><xref linkend="setup"></title>
-+ <title><xref linkend="setup"/></title>
- <para>
- This chapter explains how you obtain, install and compile the Cal3D
library.
- </para>
- </formalpara>
-
- <formalpara>
-- <title><xref linkend="architecture"></title>
-+ <title><xref linkend="architecture"/></title>
- <para>
- This chapter illustrates the architecture of the Cal3D library. All
the components
- and terminologies are explaind in every detail.
-@@ -65,7 +65,7 @@
- </formalpara>
-
- <formalpara>
-- <title><xref linkend="usage"></title>
-+ <title><xref linkend="usage"/></title>
- <para>
- This chapter explains the usage of the Cal3D library step by step.
The topics
- cover creation, modification, animation and rendering of models.
diff -urN cal3d-0.9.1.orig/docs/guide.sgml cal3d-0.9.1/docs/guide.sgml
--- cal3d-0.9.1.orig/docs/guide.sgml 2004-05-31 19:07:22.346376024 +0200
+++ cal3d-0.9.1/docs/guide.sgml 2004-05-31 20:18:00.142133144 +0200
diff --git a/cal3d-string.patch b/cal3d-string.patch
deleted file mode 100644
index a1f872f..0000000
--- a/cal3d-string.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- cal3d-0.11.0/src/cal3d/hardwaremodel.cpp~ 2004-12-01 23:42:18.000000000
+0100
-+++ cal3d-0.11.0/src/cal3d/hardwaremodel.cpp 2008-11-25 10:39:33.000000000
+0100
-@@ -8,6 +8,8 @@
- // your option) any later version.
//
-
//****************************************************************************//
-
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
---- cal3d-0.11.0/src/cal3d/platform.cpp~ 2003-12-07 19:22:39.000000000
+0100
-+++ cal3d-0.11.0/src/cal3d/platform.cpp 2008-11-25 10:50:40.000000000
+0100
-@@ -8,6 +8,8 @@
- // your option) any later version.
//
-
//****************************************************************************//
-
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
---- cal3d-0.11.0/src/cal3d/renderer.cpp~ 2004-12-30 20:20:54.000000000
+0100
-+++ cal3d-0.11.0/src/cal3d/renderer.cpp 2008-11-25 10:51:06.000000000
+0100
-@@ -8,6 +8,8 @@
- // your option) any later version.
//
-
//****************************************************************************//
-
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
---- cal3d-0.11.0/src/cal3d/submesh.cpp~ 2004-12-01 23:42:18.000000000
+0100
-+++ cal3d-0.11.0/src/cal3d/submesh.cpp 2008-11-25 10:51:21.000000000 +0100
-@@ -8,6 +8,8 @@
- // your option) any later version.
//
-
//****************************************************************************//
-
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
---- cal3d-0.11.0/src/cal3d_converter.cpp~ 2006-05-28 19:35:09.000000000
+0200
-+++ cal3d-0.11.0/src/cal3d_converter.cpp 2008-11-25 10:58:13.000000000
+0100
-@@ -9,6 +9,8 @@
- // your option) any later version.
//
-
//****************************************************************************//
-
-+#include <string.h>
-+
- #include "cal3d/cal3d.h"
-
- #define SKELETON 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cal3d.git/commitdiff/be9f4a22dd02e4c8728ab2bb6c26bc585ba808d0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
