1
0
forked from ports/contrib

glm: 0.9.9.5 -> 0.9.9.7

This commit is contained in:
Tim Biermann 2020-01-06 13:11:23 +01:00
parent 1b798c3a9c
commit 34f10157d1
Signed by: tb
GPG Key ID: 42F8B4E30B673606
8 changed files with 207 additions and 17 deletions

View File

@ -136,6 +136,8 @@ drwxr-xr-x root/root usr/include/glm/ext/
-rw-r--r-- root/root usr/include/glm/ext/scalar_constants.hpp
-rw-r--r-- root/root usr/include/glm/ext/scalar_constants.inl
-rw-r--r-- root/root usr/include/glm/ext/scalar_int_sized.hpp
-rw-r--r-- root/root usr/include/glm/ext/scalar_integer.hpp
-rw-r--r-- root/root usr/include/glm/ext/scalar_integer.inl
-rw-r--r-- root/root usr/include/glm/ext/scalar_relational.hpp
-rw-r--r-- root/root usr/include/glm/ext/scalar_relational.inl
-rw-r--r-- root/root usr/include/glm/ext/scalar_uint_sized.hpp
@ -175,6 +177,8 @@ drwxr-xr-x root/root usr/include/glm/ext/
-rw-r--r-- root/root usr/include/glm/ext/vector_int3_precision.hpp
-rw-r--r-- root/root usr/include/glm/ext/vector_int4.hpp
-rw-r--r-- root/root usr/include/glm/ext/vector_int4_precision.hpp
-rw-r--r-- root/root usr/include/glm/ext/vector_integer.hpp
-rw-r--r-- root/root usr/include/glm/ext/vector_integer.inl
-rw-r--r-- root/root usr/include/glm/ext/vector_relational.hpp
-rw-r--r-- root/root usr/include/glm/ext/vector_relational.inl
-rw-r--r-- root/root usr/include/glm/ext/vector_uint1.hpp
@ -372,6 +376,7 @@ drwxr-xr-x root/root usr/include/glm/simd/
-rw-r--r-- root/root usr/include/glm/simd/geometric.h
-rw-r--r-- root/root usr/include/glm/simd/integer.h
-rw-r--r-- root/root usr/include/glm/simd/matrix.h
-rw-r--r-- root/root usr/include/glm/simd/neon.h
-rw-r--r-- root/root usr/include/glm/simd/packing.h
-rw-r--r-- root/root usr/include/glm/simd/platform.h
-rw-r--r-- root/root usr/include/glm/simd/trigonometric.h

View File

@ -1,5 +1,9 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF34I4arlQA+epcjTHJm8OUzeSspA7QXetZ8pqirXn08edGjBw+FkcOe7ABOFADQC/GALmJLjuwP2CuWgidfadAwg=
SHA256 (Pkgfile) = 90245b149f8d159b812ad0cbbcc8a13ce21892e79deb1b59a415ece3762b17ea
SHA256 (.footprint) = 0ce1b5295c135cb6130ecb061e3829c06090664992b4db2f0e0240a42d5a2b5d
SHA256 (glm-0.9.9.5.zip) = 4fe34860ce69156f63eea6c3d84c91cadfc330353cf275ff394aef4e163cafee
RWSagIOpLGJF30CyvLJf2Qu9Pp/yK7z52ZC/m1AfJeIwuVtYo42vYxMVoQ/g9PWuQW0Li/jJpDjMowhADng1qOBB7fYylMRXzQU=
SHA256 (Pkgfile) = 1a6989577d02434aa396d0fa041273ca79c696c1d8fc364dd7c2aa75f143d07d
SHA256 (.footprint) = a4401bbc724df2d13c21b42ce2e48e08518e17213f7d7553a59590fa74ee0a0a
SHA256 (glm-0.9.9.7.zip) = 53f9a11cb4f09839c4311acf9b0c0030b71501105b7c4c8f51283881b19ec8f4
SHA256 (glm.pc.in) = 2dde573981460aa9c516cd45db8c3fd4b3b86e89bbaecba22e34a1179d33d821
SHA256 (glmConfig.cmake.in) = 96cfaaade71da56ee7b0866dc1c702d23d3051a66a73936252d640e0e927fd59
SHA256 (glmConfigVersion.cmake.in) = faccd8476fa930e628153e9928eddcb647137d4bb339d3944c0145e950079723
SHA256 (glmTargets.cmake) = 8857079960df183cc70bf81e836dd971c671e6cc03d415565400ffff139b8f99

View File

@ -4,21 +4,29 @@
# Depends on: cmake
name=glm
version=0.9.9.5
version=0.9.9.7
release=1
source=(https://github.com/g-truc/glm/releases/download/$version/glm-$version.zip)
source=(https://github.com/g-truc/glm/releases/download/$version/glm-$version.zip
glm.pc.in
glmConfig.cmake.in
glmConfigVersion.cmake.in
glmTargets.cmake)
build() {
cd $name
mkdir build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
make DESTDIR=$PKG install
find $PKG -type f -exec chmod 644 {} \;
find $PKG -type d -exec chmod 755 {} \;
sed -i \
"s/PACKAGE_VERSION_UNSUITABLE TRUE/PACKAGE_VERSION_UNSUITABLE FALSE/g" \
$PKG/usr/lib/cmake/glm/glmConfigVersion.cmake
sed -i "s/(__GNUC__ == 7) && (__GNUC_MINOR__ == 2)/(__GNUC__ == 7) \&\& (__GNUC_MINOR__ >= 2)/" $PKG/usr/include/glm/simd/platform.h
mkdir -p $PKG/usr/include/
cp -r glm $PKG/usr/include/
mkdir -p $PKG/usr/share/doc
cp -r doc $PKG/usr/share/doc/glm
mkdir -p $PKG/usr/lib/pkgconfig/
sed s/@VERSION@/$version/ $SRC/glm.pc.in > $PKG/usr/lib/pkgconfig/glm.pc
mkdir -p $PKG/usr/lib/cmake/glm/
sed s/@VERSION@/$version/ $SRC/glmConfigVersion.cmake.in > $PKG/usr/lib/cmake/glm/glmConfigVersion.cmake
sed s/@VERSION@/$version/ $SRC/glmConfig.cmake.in > $PKG/usr/lib/cmake/glm/glmConfig.cmake
install -Dm644 $SRC/glmTargets.cmake $PKG/usr/lib/cmake/glm/glmTargets.cmake
rm -r $PKG/usr/share/
}

8
glm/README Normal file
View File

@ -0,0 +1,8 @@
Upstream decided to remove the cmake scripts for whatever reason.. you can
have a look at the discussion here:
https://github.com/g-truc/glm/issues/947
And check on the status for a new one here:
https://github.com/g-truc/glm/issues/961
This port uses the method the Arch Linux maintainer for glm decided to go.
Big thanks to Sven-Hendrik Haase from my side (see the first link for more details).

7
glm/glm.pc.in Normal file
View File

@ -0,0 +1,7 @@
prefix=/usr
includedir=${prefix}/include
Name: GLM
Description: OpenGL Mathematics
Version: @VERSION@
Cflags: -I${includedir}

20
glm/glmConfig.cmake.in Normal file
View File

@ -0,0 +1,20 @@
set(GLM_VERSION "@VERSION@")
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
macro(set_and_check _var _file)
set(${_var} "${_file}")
if(NOT EXISTS "${_file}")
message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
endif()
endmacro()
####################################################################################
set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
endif()

View File

@ -0,0 +1,31 @@
# This is a basic version file for the Config-mode of find_package().
# It is used by write_basic_package_version_file() as input file for configure_file()
# to create a version-file which can be installed along a config.cmake file.
#
# The created file sets PACKAGE_VERSION_EXACT if the current version string and
# the requested version string are exactly the same and it sets
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
# The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "@VERSION@")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
set(PACKAGE_VERSION_COMPATIBLE TRUE)
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
return()
endif()
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
math(EXPR installedBits "8 * 8")
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
set(PACKAGE_VERSION_UNSUITABLE FALSE)
endif()

107
glm/glmTargets.cmake Normal file
View File

@ -0,0 +1,107 @@
# Generated by CMake
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
message(FATAL_ERROR "CMake >= 2.6.0 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.6)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------
# Commands may need to know the format version.
set(CMAKE_IMPORT_FILE_VERSION 1)
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
set(_targetsDefined)
set(_targetsNotDefined)
set(_expectedTargets)
foreach(_expectedTarget glm)
list(APPEND _expectedTargets ${_expectedTarget})
if(NOT TARGET ${_expectedTarget})
list(APPEND _targetsNotDefined ${_expectedTarget})
endif()
if(TARGET ${_expectedTarget})
list(APPEND _targetsDefined ${_expectedTarget})
endif()
endforeach()
if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
unset(_targetsDefined)
unset(_targetsNotDefined)
unset(_expectedTargets)
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)
return()
endif()
if(NOT "${_targetsDefined}" STREQUAL "")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
endif()
unset(_targetsDefined)
unset(_targetsNotDefined)
unset(_expectedTargets)
# Compute the installation prefix relative to this file.
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
# Use original install prefix when loaded through a
# cross-prefix symbolic link such as /lib -> /usr/lib.
get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH)
if(_realCurr STREQUAL _realOrig)
set(_IMPORT_PREFIX "/usr/lib/cmake/glm")
endif()
unset(_realOrig)
unset(_realCurr)
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" 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()
# Create imported target glm
add_library(glm INTERFACE IMPORTED)
set_target_properties(glm PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
)
if(CMAKE_VERSION VERSION_LESS 3.0.0)
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
endif()
# Load information for each installed configuration.
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake")
foreach(f ${CONFIG_FILES})
include(${f})
endforeach()
# Cleanup temporary variables.
set(_IMPORT_PREFIX)
# Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} )
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
if(NOT EXISTS "${file}" )
message(FATAL_ERROR "The imported target \"${target}\" references the file
\"${file}\"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
* The installation package was faulty and contained
\"${CMAKE_CURRENT_LIST_FILE}\"
but not all the files it references.
")
endif()
endforeach()
unset(_IMPORT_CHECK_FILES_FOR_${target})
endforeach()
unset(_IMPORT_CHECK_TARGETS)
# This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set.
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)