Compare commits
No commits in common. "rawhide" and "f18" have entirely different histories.
6 changed files with 52 additions and 171 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/vmmlib-*.tar.gz
|
||||
vmmlib-*.tar.xz
|
||||
vmmlib_*.tgz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vmmlib-1.8.0-20220222git364732e3.tar.gz) = 3d6a31739a183848b5a665eda71a34ac99e63047d62a308104a1c893de18ea76bb27434dc0dec9f57623217c56b90722c5515408a8bd1b88c0dd15906ce12dfe
|
||||
486e7a9003d41e7de79c6d599f2fb6d1 vmmlib_1.0_rc1.tgz
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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
|
||||
{
|
||||
29
vmmlib-test-fix.patch
Normal file
29
vmmlib-test-fix.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff -up vmmlib-20111122svn540/Makefile.orig vmmlib-20111122svn540/Makefile
|
||||
--- vmmlib-20111122svn540/Makefile.orig 2011-10-13 20:01:19.000000000 +0200
|
||||
+++ vmmlib-20111122svn540/Makefile 2011-11-22 18:03:24.732308940 +0100
|
||||
@@ -27,7 +27,15 @@ VMMLIB_UNIT_TESTS =\
|
||||
|
||||
VMMLIB_UNIT_TESTS_OBJECTS = ${VMMLIB_UNIT_TESTS:%.cpp=%.o}
|
||||
|
||||
-CXXFLAGS += -I. -Iinclude -Itests -include stdint.h
|
||||
+CXXFLAGS += -I. -Iinclude -Itests -include stdint.h -include f2c.h -include f2c_fix.h
|
||||
+
|
||||
+LBITS := $(shell getconf LONG_BIT)
|
||||
+ifeq ($(LBITS),64)
|
||||
+ LIBDIR=$(DESTDIR)/usr/lib64
|
||||
+else
|
||||
+ LIBDIR=$(DESTDIR)/usr/lib
|
||||
+endif
|
||||
+LDFLAGS += -L$(LIBDIR)/atlas -u MAIN__
|
||||
|
||||
# Mac OS X specific stuff
|
||||
# on mac we want to use the frameworks, not the unix style libs
|
||||
diff --git a/tests/f2c_fix.h b/tests/f2c_fix.h
|
||||
index 0e25758..6356519 100644
|
||||
--- a/tests/f2c_fix.h
|
||||
+++ b/tests/f2c_fix.h
|
||||
@@ -0,0 +1,4 @@
|
||||
+#define integer f2c_fix_integer
|
||||
+#define uinteger f2c_fix_uinteger
|
||||
+typedef int f2c_fix_integer;
|
||||
+typedef unsigned int f2c_fix_uinteger;
|
||||
151
vmmlib.spec
151
vmmlib.spec
|
|
@ -1,29 +1,16 @@
|
|||
%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}
|
||||
|
||||
Name: vmmlib
|
||||
Version: 1.8.0
|
||||
Release: 0.11.%{git_suffix}%{?dist}
|
||||
Version: 1.0
|
||||
Release: 0.4.rc1%{?dist}
|
||||
Summary: A vector and matrix math library implemented using C++ templates
|
||||
# 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: %{url}/archive/%{git_commit}/%{name}-%{version}-%{git_suffix}.tar.gz
|
||||
Group: Development/Libraries
|
||||
License: BSD
|
||||
URL: http://vmmlib.sourceforge.net/
|
||||
Source0: %{name}_%{version}_rc1.tgz
|
||||
# Fix for broken test-suite, tests that still fail have been disabled until
|
||||
# there will be better fix
|
||||
Patch0: vmmlib-test-fix.patch
|
||||
BuildArch: noarch
|
||||
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
|
||||
BuildRequires: atlas-devel lapack-devel blas-devel f2c glibc-headers
|
||||
|
||||
%description
|
||||
vmmlib is a vector and matrix math library implemented using C++ templates.
|
||||
|
|
@ -34,7 +21,7 @@ culling classes, and spatial data structures.
|
|||
|
||||
%package devel
|
||||
Summary: A vector and matrix math library implemented using C++ templates
|
||||
Requires: pkgconfig, cmake
|
||||
Group: Development/Libraries
|
||||
|
||||
%description devel
|
||||
vmmlib is a vector and matrix math library implemented using C++ templates.
|
||||
|
|
@ -44,124 +31,26 @@ More advanced functionality include solvers, frustum computations and frustum
|
|||
culling classes, and spatial data structures.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{git_commit}
|
||||
%setup -c
|
||||
%patch0 -p1 -b .test-fix
|
||||
|
||||
%build
|
||||
%cmake
|
||||
%cmake_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
rm -r %{buildroot}%{_datadir}/vmmlib/tests/*
|
||||
rmdir %{buildroot}%{_datadir}/vmmlib/tests
|
||||
mkdir -p %{buildroot}%{_includedir}
|
||||
cp -a vmmlib %{buildroot}%{_includedir}
|
||||
install -m 755 -d %{buildroot}%{_includedir}/vmmlib
|
||||
install -p -m 644 -t %{buildroot}%{_includedir}/vmmlib include/vmmlib/*.hpp
|
||||
mkdir _tmpdoc
|
||||
mv include/vmmlib/{LICENSE,ACKNOWLEDGEMENTS} _tmpdoc/
|
||||
|
||||
%check
|
||||
%ctest
|
||||
./vmmlib_unit_tests
|
||||
|
||||
%files devel
|
||||
%license LICENSE.txt
|
||||
%doc doc/RELNOTES.md CHANGES README.md AUTHORS ACKNOWLEDGEMENTS
|
||||
%doc README _tmpdoc/*
|
||||
%{_includedir}/vmmlib
|
||||
%{_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
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-11.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-10.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-9.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-8.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-7.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-6.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jun 8 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 1.6.2-5.20140319git925a709b
|
||||
- Fixed build requirements to require gcc-c++
|
||||
Resolves: rhbz#1230504
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-4.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-3.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2.20140319git925a709b
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Mar 19 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.6.2-1.20140319git925a709b
|
||||
- New version
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.6.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.5.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.4.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue