globjects: build from git

mingw-w64-globjects/001-fix-linking-to-glm.patch

@@ -0,0 +1,11 @@
+--- a/source/globjects/CMakeLists.txt
++++ b/source/globjects/CMakeLists.txt
+@@ -373,7 +373,7 @@
+
+     PUBLIC
+     ${DEFAULT_LIBRARIES}
+-    glm::glm
++    glm
+     glbinding::glbinding
+     glbinding::glbinding-aux
+

mingw-w64-globjects/PKGBUILD

@@ -3,65 +3,75 @@
 _realname=globjects
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.1.0
+pkgver=1.1.0.r178.g4363356a
 pkgrel=1
+_commit=4363356ae2ef5c936ab078fba48d1ea507c295c4
 arch=('any')
-mingw_arch=('mingw32' 'mingw64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url='https://github.com/cginternals/globjects'
 pkgdesc="Cross-platform C++ wrapper for OpenGL API objects. (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-glbinding"
          "${MINGW_PACKAGE_PREFIX}-glm")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-doxygen")
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-doxygen"
+             "git")
 license=('MIT')
 options=('strip' 'staticlibs' 'docs')
-
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/cginternals/globjects/archive/v${pkgver}.tar.gz"
+source=(${_realname}::"git+https://github.com/cginternals/globjects.git#commit=$_commit"
         'mingw-unix-layout.patch'
-        'config-export-location.patch')
-sha256sums=('68fa218c1478c09b555e44f2209a066b28be025312e0bab6e3a0b142a01ebbc6'
+        'config-export-location.patch'
+        '001-fix-linking-to-glm.patch'
+        'globjects.patch')
+sha256sums=('SKIP'
             '193434a6351f71926998813afa1830812f666eff6f749e6e640fa3f4ce0d6d28'
-            'b1d176d7788d973fe19a13f1d6524b75058fa8cdd66b4a65c4811feef5978ac9')
+            'b1d176d7788d973fe19a13f1d6524b75058fa8cdd66b4a65c4811feef5978ac9'
+            'ee24969a0b74dedc7995d8e8ae417bc142a6df7edf8841413a0f46ace940e863'
+            'a87527ed097239d3fa0a7e533b63a4b642a39d6434fe977d2ed8f1cbafc14bb8')
+
+pkgver() {
+  cd "${srcdir}/${_realname}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
+}
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}"
   # sed -i 's/$/\r/' "${srcdir}/mingw-unix-layout.patch"
   patch -p1 -i "${srcdir}/mingw-unix-layout.patch"
   patch -p1 -i "${srcdir}/config-export-location.patch"
+  patch -p1 -i "${srcdir}/001-fix-linking-to-glm.patch"
+  # https://aur.archlinux.org/cgit/aur.git/plain/globjects.patch?h=globjects-git
+  patch -p1 -i "${srcdir}/globjects.patch"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
-  local BUILD_TYPE="Release"
-  if check_option "debug" "y"; then
-    BUILD_TYPE="Debug"
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  # Build shared libs
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
-    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_C_COMPILER=${MINGW_CHOST}-gcc \
-    -DCMAKE_CXX_COMPILER=${MINGW_CHOST}-g++ \
+    ${_extra_config[@]} \
     -DOPTION_BUILD_EXAMPLES=OFF \
-    -DOPTION_BUILD_TESTS=OFF \
     -DSYSTEM_DIR_INSTALL=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DOPTION_BUILD_DOCS=ON \
-    ../${_realname}-${pkgver}
-  make
+    ../${_realname}
+
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package () {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 }

mingw-w64-globjects/globjects.patch

@@ -0,0 +1,33 @@
+diff --color --unified --recursive --text globjects.orig/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp globjects.new/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp
+--- globjects.orig/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp	2021-08-26 01:43:35.844032899 +0200
++++ globjects.new/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp	2021-08-26 01:45:32.803402681 +0200
+@@ -36,7 +36,7 @@
+
+ void * BufferImplementation_DirectStateAccessARB::mapRange(const Buffer * buffer, GLintptr offset, GLsizeiptr length, MapBufferAccessMask access) const
+ {
+-    return glMapNamedBufferRange(buffer->id(), offset, static_cast<GLsizei>(length), access);
++    return glMapNamedBufferRange(buffer->id(), offset, static_cast<GLsizei>(length), static_cast<BufferAccessMask>(access));
+ }
+
+ bool BufferImplementation_DirectStateAccessARB::unmap(const Buffer * buffer) const
+diff --color --unified --recursive --text globjects.orig/source/globjects/source/Sync.cpp globjects.new/source/globjects/source/Sync.cpp
+--- globjects.orig/source/globjects/source/Sync.cpp	2021-08-26 01:43:35.837366269 +0200
++++ globjects.new/source/globjects/source/Sync.cpp	2021-08-26 01:47:11.639537596 +0200
+@@ -51,7 +51,7 @@
+
+ GLsync Sync::fenceSync(const GLenum condition, const UnusedMask flags)
+ {
+-    return glFenceSync(condition, static_cast<gl::GLbitfield>(flags));
++    return glFenceSync(condition, flags);
+ }
+
+ GLsync Sync::sync() const
+@@ -71,7 +71,7 @@
+
+ void Sync::wait(const UnusedMask flags, const GLuint64 timeout)
+ {
+-    glWaitSync(m_sync, static_cast<gl::GLbitfield>(flags), timeout);
++   glWaitSync(m_sync, flags, timeout); 
+ }
+
+ void Sync::get(const GLenum pname, const GLsizei bufsize, GLsizei * length, GLint * values)