Compare commits
21 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1603b93575 | ||
|
|
0fbc29a576 | ||
|
|
d4142ddb03 | ||
|
|
c7dedb0da5 | ||
|
|
c84a41b8ad | ||
|
|
7479aec431 | ||
|
|
14b590bbfe | ||
|
|
7f6b4cc044 | ||
|
|
c35a1a9cbb | ||
|
|
03e815cd4f | ||
|
|
762d18bc79 | ||
|
|
45b1ae399f | ||
|
|
f87b06fd55 | ||
|
|
932e918fdd | ||
|
|
61d1f6303f | ||
|
|
1df0b628c5 | ||
|
|
c0c86e3397 |
||
|
|
696fc33367 | ||
|
|
d10637f241 | ||
|
|
13d4994c14 | ||
|
f1936708b5 |
5 changed files with 121 additions and 40 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1 @@
|
|||
vmmlib-*.tar.xz
|
||||
vmmlib_*.tgz
|
||||
/vmmlib-1.6.2-20140319git925a709b.tar.bz2
|
||||
/vmmlib-*.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
0587926760e48106a975270e0951a721 vmmlib-1.6.2-20140319git925a709b.tar.bz2
|
||||
SHA512 (vmmlib-1.8.0-20220222git364732e3.tar.gz) = 3d6a31739a183848b5a665eda71a34ac99e63047d62a308104a1c893de18ea76bb27434dc0dec9f57623217c56b90722c5515408a8bd1b88c0dd15906ce12dfe
|
||||
|
|
|
|||
26
vmmlib-1.8.0-cmake-4-fix.patch
Normal file
26
vmmlib-1.8.0-cmake-4-fix.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake
|
||||
index 833201e..4b103f0 100644
|
||||
--- a/CMake/common/Common.cmake
|
||||
+++ b/CMake/common/Common.cmake
|
||||
@@ -12,7 +12,7 @@ if(CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR)
|
||||
message(FATAL_ERROR "Cannot install into build directory")
|
||||
endif()
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
|
||||
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
||||
include(CMakeCompatibility)
|
||||
|
||||
if(EXISTS ${PROJECT_SOURCE_DIR}/CMake/${PROJECT_NAME}.cmake)
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f5498c8..eedffe0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# Copyright (c) 2011 Daniel Pfeifer <daniel@pfeifer-mail.de>
|
||||
# 2011-2014 Stefan.Eilemann@epfl.ch
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
|
||||
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
||||
project(vmmlib)
|
||||
|
||||
set(VERSION_MAJOR 1)
|
||||
12
vmmlib-1.8.0-gcc-13-fix.patch
Normal file
12
vmmlib-1.8.0-gcc-13-fix.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/vmmlib/vector.hpp b/vmmlib/vector.hpp
|
||||
index 4adc2de..dfbf9fb 100644
|
||||
--- a/vmmlib/vector.hpp
|
||||
+++ b/vmmlib/vector.hpp
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <cstring>
|
||||
#include <limits>
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
|
||||
namespace vmml
|
||||
{
|
||||
117
vmmlib.spec
117
vmmlib.spec
|
|
@ -1,26 +1,29 @@
|
|||
%global git_commit 925a709ba0c98d8c0beabd0e34477971946c10be
|
||||
%global git_date 20140319
|
||||
%global git_commit 364732e348679893686ae46e8747cb17b0656d86
|
||||
%global git_date 20220222
|
||||
|
||||
%global git_short_commit %(echo %{git_commit} | cut -c -8)
|
||||
%global git_suffix %{git_date}git%{git_short_commit}
|
||||
|
||||
# git clone https://github.com/VMML/vmmlib.git
|
||||
# cd %%{name}
|
||||
# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
|
||||
# bzip2 > ../%%{name}-%%{version}-%%{git_suffix}.tar.bz2
|
||||
|
||||
Name: vmmlib
|
||||
Version: 1.6.2
|
||||
Release: 12.%{git_suffix}%{?dist}
|
||||
Version: 1.8.0
|
||||
Release: 0.11.%{git_suffix}%{?dist}
|
||||
Summary: A vector and matrix math library implemented using C++ templates
|
||||
License: BSD
|
||||
# Automatically converted from old format: BSD - review is highly recommended.
|
||||
License: LicenseRef-Callaway-BSD
|
||||
#URL: http://vmmlib.sourceforge.net/
|
||||
URL: http://github.com/VMML/vmmlib/
|
||||
#Source0: http://github.com/VMML/vmmlib/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz
|
||||
Source0: %{name}-%{version}-%{git_suffix}.tar.bz2
|
||||
#Source0: http://github.com/VMML/vmmlib/archive/release-%%{version}.tar.gz#/%%{name}-release-%%{version}.tar.gz
|
||||
Source0: %{url}/archive/%{git_commit}/%{name}-%{version}-%{git_suffix}.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRequires: atlas-devel, lapack-devel, blas-devel, f2c, gcc-c++
|
||||
BuildRequires: doxygen, cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel
|
||||
# https://github.com/VMML/vmmlib/pull/101
|
||||
Patch: vmmlib-1.8.0-gcc-13-fix.patch
|
||||
# https://github.com/VMML/vmmlib/issues/103
|
||||
# https://github.com/Eyescale/CMake/pull/606
|
||||
Patch: vmmlib-1.8.0-cmake-4-fix.patch
|
||||
|
||||
%description
|
||||
vmmlib is a vector and matrix math library implemented using C++ templates.
|
||||
|
|
@ -41,39 +44,81 @@ More advanced functionality include solvers, frustum computations and frustum
|
|||
culling classes, and spatial data structures.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%autosetup -p1 -n %{name}-%{git_commit}
|
||||
|
||||
%build
|
||||
mkdir build
|
||||
cd build
|
||||
%cmake ..
|
||||
make %{?_smp_mflags}
|
||||
%cmake
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
pushd build
|
||||
make install DESTDIR=%{buildroot}
|
||||
popd
|
||||
|
||||
# move docs to right place
|
||||
mkdir _tmpdoc
|
||||
mv %{buildroot}%{_datadir}/%{name}/{AUTHORS,LICENSE.txt,ACKNOWLEDGEMENTS,README.md} _tmpdoc/
|
||||
|
||||
# move cmake files to right place
|
||||
mkdir -p %{buildroot}%{_datadir}/cmake/Modules/
|
||||
mv %{buildroot}%{_datadir}/%{name}/CMake/*.cmake %{buildroot}%{_datadir}/cmake/Modules/
|
||||
rmdir %{buildroot}%{_datadir}/%{name}/CMake
|
||||
%cmake_install
|
||||
rm -r %{buildroot}%{_datadir}/vmmlib/tests/*
|
||||
rmdir %{buildroot}%{_datadir}/vmmlib/tests
|
||||
mkdir -p %{buildroot}%{_includedir}
|
||||
cp -a vmmlib %{buildroot}%{_includedir}
|
||||
|
||||
%check
|
||||
cd build
|
||||
make test
|
||||
%ctest
|
||||
|
||||
%files devel
|
||||
%doc RELNOTES.md CHANGES _tmpdoc/*
|
||||
%license LICENSE.txt
|
||||
%doc doc/RELNOTES.md CHANGES README.md AUTHORS ACKNOWLEDGEMENTS
|
||||
%{_includedir}/vmmlib
|
||||
%{_libdir}/pkgconfig/vmmlib.pc
|
||||
%{_datadir}/cmake/Modules/vmmlib*.cmake
|
||||
%{_datadir}/vmmlib/CMake/*.cmake
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.11.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.10.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.9.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.8.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.8.0-0.7.20220222git364732e3
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.6.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.5.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.4.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.3.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.2.20220222git364732e3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-0.1.20220222git364732e3
|
||||
- New version
|
||||
Resolves: rhbz#2047102
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-18.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-17.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jul 13 2021 Björn Esser <besser82@fedoraproject.org> - 1.6.2-16.20140319git925a709b
|
||||
- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-15.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1.6.2-14.20140319git925a709b
|
||||
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-13.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-12.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue