Merge pull request #11117 from podsvirov/cglm-update

cglm: Update to 0.8.5

mingw-w64-cglm/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=cglm
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="OpenGL Mathematics (glm) for C (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,16 +16,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme")
 options=('!strip' 'staticlibs' '!buildflags')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/recp/cglm/archive/v${pkgver}.tar.gz"
-        'cglm-0.8.4-fix-win32-shared.patch')
-sha256sums=('42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e'
-            '9d7c75109fb734059e26d1fe70d2dc4d71c2df6e63fa9411bdb8a4009b11aea4')
-
-prepare() {
-    cd "${srcdir}/${_realname}-${pkgver}"
-
-    patch -p1 -i "${srcdir}/cglm-0.8.4-fix-win32-shared.patch"
-}
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/recp/cglm/archive/v${pkgver}.tar.gz")
+sha256sums=('baefa21342d228a83c90708459a745d5aa9b0ebb381555eea42db1f37fdf7a5a')
 
 build() {
   [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"

mingw-w64-cglm/cglm-0.8.4-fix-win32-shared.patch

@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41a1a54..827e07c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,6 +97,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
-                               VERSION ${PROJECT_VERSION} 
-                             SOVERSION ${PROJECT_VERSION_MAJOR})
- 
-+if(WIN32)
-+  # Because SOVERSION has no effect to file naming on Windows
-+  set_target_properties(${PROJECT_NAME} PROPERTIES
-+    RUNTIME_OUTPUT_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR})
-+endif()
-+
- target_include_directories(${PROJECT_NAME}
-     PUBLIC 
-         $<INSTALL_INTERFACE:include>    
-@@ -122,7 +128,7 @@ install(TARGETS ${PROJECT_NAME}
-         EXPORT  ${PROJECT_NAME}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
- install(DIRECTORY include/${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-         PATTERN ".*" EXCLUDE)