sfcgal: Update to 2.2.0 (#25104)
Remove the patch which has been applied upstream.
This commit is contained in:
parent
185252b9a4
commit
6f5628327e
@ -3,7 +3,7 @@
|
||||
_realname=pysfcgal
|
||||
pkgbase=mingw-w64-python-${_realname}
|
||||
pkgname=${MINGW_PACKAGE_PREFIX}-python-${_realname}
|
||||
pkgver=2.1.0
|
||||
pkgver=2.2.0
|
||||
pkgrel=1
|
||||
pkgdesc='Python SFCGAL binding (mingw-w64)'
|
||||
arch=('any')
|
||||
@ -25,7 +25,7 @@ makedepends=(
|
||||
${MINGW_PACKAGE_PREFIX}-python-setuptools
|
||||
)
|
||||
source=(https://gitlab.com/SFCGAL/pysfcgal/-/archive/v${pkgver}/pysfcgal-v${pkgver}.tar.gz)
|
||||
sha256sums=('1c28e105bdb809a7a8c9b6d30b06f145e0239a715f1973bc9513c50508edb03f')
|
||||
sha256sums=('b6bc1ec00d4b946fcf78c85bce111595a0a7ae6b5e463b973c20d566d747ea83')
|
||||
|
||||
build() {
|
||||
cp -r "${_realname}-v${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 225ad79eb9c37ed658b505d2f6afb8a65d59de65 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= <loic.bartoletti@oslandia.com>
|
||||
Date: Tue, 3 Jun 2025 10:01:04 +0200
|
||||
Subject: [PATCH 1/4] fix(CMake): Define CMAKE_INSTALL_FULL_LIBDIR if not
|
||||
defined before
|
||||
|
||||
Fix issue for MSYS2/MinGW
|
||||
---
|
||||
CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ff22a016..14fc262b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -225,6 +225,10 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
|
||||
endif()
|
||||
|
||||
+if(NOT DEFINED CMAKE_INSTALL_FULL_LIBDIR)
|
||||
+ set(CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
+endif()
|
||||
+
|
||||
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
#SET(CMAKE_MACOSX_RPATH ON)
|
||||
--
|
||||
GitLab
|
||||
@ -3,8 +3,8 @@
|
||||
_realname=sfcgal
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.1.0
|
||||
pkgrel=2
|
||||
pkgver=2.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Wrapper around CGAL that intents to implement 2D and 3D operations on OGC standards models (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
@ -21,17 +21,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
|
||||
"${MINGW_PACKAGE_PREFIX}-gmp"
|
||||
"${MINGW_PACKAGE_PREFIX}-mpfr"
|
||||
"${MINGW_PACKAGE_PREFIX}-cgal")
|
||||
source=(https://gitlab.com/SFCGAL/SFCGAL/-/archive/v${pkgver}/SFCGAL-v${pkgver}.tar.gz
|
||||
0001-fix-pc-missing-libdir.patch)
|
||||
sha256sums=('cb73a0496c61a5c7bf0ccc68c42e4378bfc441b242e9dee894067e24d2e21d0f'
|
||||
'9170fa039e7f2afc7ab5b42631cc916ddec407dc0c0aa7b3d7d1759f6d0f4a71')
|
||||
|
||||
prepare() {
|
||||
cd "SFCGAL-v${pkgver}"
|
||||
|
||||
# https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/515
|
||||
patch -p1 -i "${srcdir}"/0001-fix-pc-missing-libdir.patch
|
||||
}
|
||||
source=(https://gitlab.com/SFCGAL/SFCGAL/-/archive/v${pkgver}/SFCGAL-v${pkgver}.tar.gz)
|
||||
sha256sums=('bb6bb77ddb58523d8c229764de23699f99c1a7011d873419afd2a67df85602a2')
|
||||
|
||||
build() {
|
||||
mkdir "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user