From dbc9cb3f81549642972e7e5bb1215251f81569ee Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 04 2021 05:12:21 +0000 Subject: import glm-0.9.9.8-3.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..31c8691 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/0.9.9.8.tar.gz diff --git a/.glm.metadata b/.glm.metadata new file mode 100644 index 0000000..191dd39 --- /dev/null +++ b/.glm.metadata @@ -0,0 +1 @@ +505e96fedffdb6e8e725ea353e5893576185f0fd SOURCES/0.9.9.8.tar.gz diff --git a/SOURCES/glm-0.9.9.8-install.patch b/SOURCES/glm-0.9.9.8-install.patch new file mode 100644 index 0000000..ce30e95 --- /dev/null +++ b/SOURCES/glm-0.9.9.8-install.patch @@ -0,0 +1,150 @@ +From 02f26a88537b0b02dd0df77fc858e9449c7e3847 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kurek +Date: Sat, 30 Jan 2021 21:08:48 +0100 +Subject: [PATCH] Add installation support from PR #1054 + +This is based on commit 887827b762111a8e6b4765513b4be212fa6a5426, +discovered from https://github.com/g-truc/glm/pull/1054 +--- + CMakeLists.txt | 16 ++++++++++++++-- + cmake/glm/glmConfig-version.cmake | 11 ----------- + cmake/glm/glmConfig.cmake | 22 ---------------------- + glm/CMakeLists.txt | 10 +++++++++- + manual.md | 21 ++++++++++++++++++++- + 5 files changed, 43 insertions(+), 37 deletions(-) + delete mode 100644 cmake/glm/glmConfig-version.cmake + delete mode 100644 cmake/glm/glmConfig.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 843e7546..642a5fde 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,13 +3,25 @@ cmake_policy(VERSION 3.2) + + set(GLM_VERSION "0.9.9") + project(glm VERSION ${GLM_VERSION} LANGUAGES CXX) +-enable_testing() ++message(STATUS "GLM: Version " ${GLM_VERSION}) + + add_subdirectory(glm) + add_library(glm::glm ALIAS glm) + + if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + +-add_subdirectory(test) ++ include(CPack) ++ install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "CMakeLists.txt" EXCLUDE) ++ install(EXPORT glm FILE glmConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm NAMESPACE glm::) ++ include(CMakePackageConfigHelpers) ++ write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm) ++ ++ include(CTest) ++ if(BUILD_TESTING) ++ add_subdirectory(test) ++ endif() + + endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++ +diff --git a/cmake/glm/glmConfig-version.cmake b/cmake/glm/glmConfig-version.cmake +deleted file mode 100644 +index 6e63a4a3..00000000 +--- a/cmake/glm/glmConfig-version.cmake ++++ /dev/null +@@ -1,11 +0,0 @@ +-if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL 0) +- if (${PACKAGE_FIND_VERSION} VERSION_LESS ${GLM_VERSION}) +- set(PACKAGE_VERSION_COMPATIBLE 1) +- endif() +- if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${GLM_VERSION}) +- set(PACKAGE_VERSION_EXACT 1) +- endif() +-else() +- set(PACKAGE_VERSION_UNSUITABLE 1) +-endif() +- +diff --git a/cmake/glm/glmConfig.cmake b/cmake/glm/glmConfig.cmake +deleted file mode 100644 +index 4fba5116..00000000 +--- a/cmake/glm/glmConfig.cmake ++++ /dev/null +@@ -1,22 +0,0 @@ +-cmake_minimum_required(VERSION 3.2 FATAL_ERROR) +-cmake_policy(VERSION 3.2) +- +-set(GLM_VERSION 0.9.9) +- +-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-if (_IMPORT_PREFIX STREQUAL "/") +- set(_IMPORT_PREFIX "") +-endif() +- +-# Set the old GLM_INCLUDE_DIRS variable for backwards compatibility +-set(GLM_INCLUDE_DIRS ${_IMPORT_PREFIX}) +- +-add_library(glm::glm INTERFACE IMPORTED) +-set_target_properties(glm::glm PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES ${GLM_INCLUDE_DIRS}) +- +-mark_as_advanced(glm_DIR) +-set(_IMPORT_PREFIX) +- +diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt +index 4ff51c81..cee0d2e7 100644 +--- a/glm/CMakeLists.txt ++++ b/glm/CMakeLists.txt +@@ -43,7 +43,15 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) + source_group("SIMD Files" FILES ${SIMD_HEADER}) + + add_library(glm INTERFACE) +-target_include_directories(glm INTERFACE ../) ++ ++include(GNUInstallDirs) ++ ++target_include_directories(glm INTERFACE ++ $ ++ $ ++) ++ ++install(TARGETS glm EXPORT glm) + + if(BUILD_STATIC_LIBS) + add_library(glm_static STATIC ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT} +diff --git a/manual.md b/manual.md +index a7f6956f..d53df3d7 100644 +--- a/manual.md ++++ b/manual.md +@@ -277,7 +277,26 @@ GLM does not depend on external libraries or headers such as ``, [` 1.5. Finding GLM with CMake + +-GLM packages a `glmConfig.cmake` and `glmConfig-version.cmake` in the root of the repository and the release archives. To find GLM with CMake you can pass `-Dglm_DIR=/cmake/glm/` when running CMake. You can then either add `${GLM_INCLUDE_DIRS}` to your target's include directories, or link against the imported `glm::glm` target. ++When installed, GLM provides the CMake package configuration files `glmConfig.cmake` and `glmConfigVersion.cmake`. ++ ++To use these configurations files, you may need to set the `glm_DIR` variable to the directory containing the configuration files `/lib/cmake/glm/`. ++ ++Use the `find_package` CMake command to load the configurations into your project. Lastly, either link your executable against the `glm::glm` target or add `${GLM_INCLUDE_DIRS}` to your target's include directories: ++ ++```cmake ++set(glm_DIR /lib/cmake/glm) # if necessary ++find_package(glm REQUIRED) ++target_link_libraries( glm::glm) ++``` ++ ++To use GLM as a submodule in a project instead, use `add_subdirectory` to expose the same target, or add the directory to your target's ++ ++```cmake ++add_subdirectory(glm) ++target_link_libraries( glm::glm) ++# or ++target_include_directories( glm) ++``` + + --- +
+-- +2.29.2 + diff --git a/SOURCES/glm-0.9.9.8-noarch.patch b/SOURCES/glm-0.9.9.8-noarch.patch new file mode 100644 index 0000000..fb6fc21 --- /dev/null +++ b/SOURCES/glm-0.9.9.8-noarch.patch @@ -0,0 +1,25 @@ +From e0c728eca35d6d9c34d239c56bdcfb460b378676 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= +Date: Sun, 7 Feb 2021 19:34:40 +0200 +Subject: [PATCH] Use built-in mechanism for marking arch-independent + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 642a5fde..a7b80449 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "CMakeLists.txt" EXCLUDE) + install(EXPORT glm FILE glmConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm NAMESPACE glm::) + include(CMakePackageConfigHelpers) +- write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion) ++ write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm) + + include(CTest) +-- +2.29.2 + diff --git a/SPECS/glm.spec b/SPECS/glm.spec new file mode 100644 index 0000000..d61e7c4 --- /dev/null +++ b/SPECS/glm.spec @@ -0,0 +1,319 @@ +# The library consists of headers only +%global debug_package %{nil} + +Name: glm +Version: 0.9.9.8 +Release: 3%{?dist} +Summary: C++ mathematics library for graphics programming + +License: MIT +URL: http://glm.g-truc.net/ +Source0: https://github.com/g-truc/glm/archive/%{version}.tar.gz +Patch0: glm-0.9.9.8-install.patch +Patch1: glm-0.9.9.8-noarch.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.14 +BuildRequires: make + +%description +GLM is a C++ library for doing mathematics operations +required in many OpenGL based applications. Its interface +has been designed to resemble the built-in matrix and vector +types of the OpenGL shading language. + +%package devel +Summary: C++ mathematics library for graphics programming +BuildArch: noarch + +# As required in +# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries_2 +Provides: %{name}-static = %{version}-%{release} + +%description devel +GLM is a C++ library for doing mathematics operations +required in many OpenGL based applications. Its interface +has been designed to resemble the built-in matrix and vector +types of the OpenGL shading language. + +%{name}-devel is only required for building software that uses +the GLM library. Because GLM currently is a header-only library, +there is no matching run time package. + +%package doc +Summary: Documentation for %{name}-devel +BuildArch: noarch + +%description doc +The %{name}-doc package contains reference documentation and +a programming manual for the %{name}-devel package. + +%prep +# Some glm releases, like version 0.9.3.1, place contents of +# the source archive directly into the archive root. Others, +# like glm 0.9.3.2, place them into a single subdirectory. +# The former case is inconvenient, but it can be be +# compensated for with the -c option of the setup macro. +# +# When updating this package, take care to check if -c is +# needed for the particular version. +# +# Also it looks like some versions get shipped with a common +# directory in archive root, but with an unusual name for the +# directory. In this case, use the -n option of the setup macro. +%setup -q + +# A couple of files had CRLF line-ends in them. +# Check with rpmlint after updating the package that we are not +# forgetting to convert line endings in some files. +# +# This release of glm seems to have shipped with no CRLF file +# endings at all, so these are commented out. +sed -i 's/\r//' readme.md +sed -i 's/\r//' CMakeLists.txt +sed -i 's/\r//' doc/api/doxygen.css +sed -i 's/\r//' doc/api/dynsections.js +sed -i 's/\r//' doc/api/jquery.js +sed -i 's/\r//' doc/api/tabs.css + +# These are just for being able to apply the patch that +# was exported from git. +sed -i 's/\r//' glm/detail/setup.hpp +sed -i 's/\r//' glm/simd/platform.h +sed -i 's/\r//' test/core/core_setup_message.cpp + +%patch0 -p1 +%patch1 -p1 + +%build +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%{cmake} -DGLM_TEST_ENABLE=ON +%cmake_build + +%check +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +cd %{_vpath_builddir} + +# Some tests are disabled due to failing tests (to be reported) +# - test-core_func_common fails on aarch64 +# - test-gtc_packing fails on s390x +ctest --output-on-failure -E '(test-core_func_common|test-gtc_packing)' + +%install +cd %{_vpath_builddir} + +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';' + +# The cmake config files seem architecture independent and since +# also glm-devel is otherwise noarch, it is desired to ship the +# cmake configuration files under /usr/share. +mkdir -pv $RPM_BUILD_ROOT%{_datadir} +mv $RPM_BUILD_ROOT%{_libdir}/cmake $RPM_BUILD_ROOT%{_datadir}/cmake +rmdir $RPM_BUILD_ROOT%{_libdir} + +# Here it seems to be acceptable to own the cmake and pkgconfig directories +# as an alternative to having glm-devel depending on cmake and pkg-config +# https://fedoraproject.org/wiki/Packaging:Guidelines#The_directory_is_owned_by_a_package_which_is_not_required_for_your_package_to_function +%files devel +%doc readme.md +%{_includedir}/%{name} +%{_datadir}/cmake + +%files doc +%doc doc/manual.pdf +%doc doc/api/ + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 0.9.9.8-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 0.9.9.8-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Sun Feb 07 2021 Joonas Sarajärvi - 0.9.9.8-1 +- New upstream release (#1823615) +- pkgconfig support is no longer supported in upstream and not shipped + +* Tue Feb 02 2021 Jeff Law - 0.9.9.6-8 +- Disable strict aliasing due to bugs in testsuite (#1923456) + +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.9.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 26 2020 Joonas Sarajärvi - 0.9.9.6-6 +- Fix #1863634 - FTBFS in Fedora rawhide/f33 + +* Sat Aug 01 2020 Fedora Release Engineering - 0.9.9.6-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.9.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 02 2020 Joonas Sarajärvi - 0.9.9.6-3 +- Remove arch check from glmConfigVersion.cmake, fix #1758009 + +* Tue Jan 28 2020 Fedora Release Engineering - 0.9.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 23 2019 Joonas Sarajärvi - 0.9.9.6-1 +- New upstream release + +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.9.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Oct 11 2018 Joonas Sarajärvi - 0.9.9.2-1 +- Update to upstream GLM version 0.9.9.2 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Feb 04 2018 Joonas Sarajärvi - 0.9.8.5-1 +- Update to upstream GLM version 0.9.8.5 + +* Mon Jan 29 2018 Joonas Sarajärvi - 0.9.8.4-5 +- Fix compatibility with GCC 7.3.1 #1539568 + +* Sat Aug 12 2017 Joonas Sarajärvi - 0.9.8.4-4 +- Update the workaround for known-broken tests + +* Wed Aug 02 2017 Fedora Release Engineering - 0.9.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Mar 02 2017 Joonas Sarajärvi - 0.9.8.4-1 +- Update to upstream GLM version 0.9.8.4 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.9.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Nov 12 2016 Joonas Sarajärvi - 0.9.8.3-1 +- Update to upstream GLM version 0.9.8.3 + +* Mon Nov 07 2016 Joonas Sarajärvi - 0.9.8.2-1 +- Update to upstream GLM version 0.9.8.2 + +* Tue Sep 06 2016 Joonas Sarajärvi - 0.9.7.6-1 +- Update to upstream GLM version 0.9.7.6 + +* Thu Mar 03 2016 Joonas Sarajärvi - 0.9.7.3-1 +- Update to upstream GLM version 0.9.7.3 + +* Thu Feb 04 2016 Joonas Sarajärvi - 0.9.7.2-3 +- Fix tests with GCC 6.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.9.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 15 2016 Joonas Sarajärvi - 0.9.7.2-1 +- Update to upstream GLM version 0.9.7.2 + +* Wed Aug 05 2015 Joonas Sarajärvi - 0.9.7.0-1 +- Update to upstream GLM version 0.9.7.0 +- CMake config files are added + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Apr 26 2015 Joonas Sarajärvi - 0.9.6.3-1 +- Update to upstream GLM version 0.9.6.3 + +* Mon Apr 20 2015 David Tardon - 0.9.6.1-3 +- make -devel noarch +- install license file in -doc, as required by packaging guidelines + +* Wed Jan 28 2015 Dan Horák - 0.9.6.1-2 +- fix build on big endian arches, patch by Jakub Cajka from #1185298 + +* Tue Jan 06 2015 Joonas Sarajärvi - 0.9.6.1-1 +- Update to upstream GLM version 0.9.6.1 + +* Sat Aug 16 2014 Fedora Release Engineering - 0.9.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jun 23 2014 Joonas Sarajärvi - 0.9.5.2-3 +- Reduce test array size to avoid memory allocation failure in tests +- Resolve a number of aliasing warnings +- Disable the packing test + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Mar 29 2014 Joonas Sarajärvi - 0.9.5.2-1 +- Update to upstream GLM version 0.9.5.2 + +* Tue Sep 24 2013 Joonas Sarajärvi - 0.9.4.6-2 +- Fix building on ARM + +* Tue Sep 24 2013 Joonas Sarajärvi - 0.9.4.6-1 +- Update to upstream GLM version 0.9.4.6 +- Bug fixes + +* Tue Aug 20 2013 Joonas Sarajärvi - 0.9.4.5-1 +- Update to upstream GLM version 0.9.4.5 +- Bug fixes + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Jul 06 2013 Joonas Sarajärvi - 0.9.4.4-1 +- Update to upstream GLM version 0.9.4.4 +- Bug fixes + +* Mon Apr 15 2013 Joonas Sarajärvi - 0.9.4.3-1 +- Update to upstream GLM version 0.9.4.3 +- This version introduces just minor bug fixes + +* Fri Mar 08 2013 Joonas Sarajärvi - 0.9.4.2-1 +- Update to upstream GLM version 0.9.4.2 + +* Wed Feb 13 2013 Fedora Release Engineering - 0.9.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Sep 04 2012 Dan Horák - 0.9.3.4-2 +- fix build on non-x86 arches + +* Sun Sep 02 2012 Joonas Sarajärvi - 0.9.3.4-1 +- Update to a new upstream version +- Work around problems in glm::log2 for integers + +* Sat Sep 01 2012 Joonas Sarajärvi - 0.9.3.2-3 +- Skip gtx_integer test that is known as broken + +* Sat Sep 01 2012 Joonas Sarajärvi - 0.9.3.2-2 +- Remove prebuilt binaries shipped in upstream source archive + +* Fri May 04 2012 Joonas Sarajärvi - 0.9.3.2-1 +- Update to upstream version 0.9.3.2 + +* Mon Feb 13 2012 Joonas Sarajärvi - 0.9.3.1-5 +- Use global instead of define +- Clarify the comment about GLM zip archives +- Remove the unnecessary rm command from install section +- Remove misleading reference to non-existing glm package + +* Mon Feb 06 2012 Joonas Sarajärvi - 0.9.3.1-4 +- Add virtual Provides: that is required for static-only libraries +- Make descriptions in devel and doc packages more accurate + +* Mon Feb 06 2012 Joonas Sarajärvi - 0.9.3.1-3 +- Fix items pointed out in Comment 2 of #787510 + +* Mon Feb 06 2012 Joonas Sarajärvi - 0.9.3.1-2 +- Build and run the self-test suite shipped with glm +- Add subpackage for manual and reference docs + +* Sun Feb 05 2012 Joonas Sarajärvi - 0.9.3.1-1 +- Initial RPM packaging