grass-dev: drop pdal support

jef-n · Mar 24, 2023 · d160d4e · d160d4e
1 parent a751318
commit d160d4e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/grass-dev/osgeo4w/package.sh b/src/grass-dev/osgeo4w/package.sh
@@ -2,7 +2,7 @@ export P=grass-dev
 export V=tbd
 export B=tbd
 export MAINTAINER=JuergenFischer
-export BUILDDEPENDS="gdal-devel proj-devel geos-devel netcdf-devel libjpeg-turbo-devel libpq-devel libtiff-devel sqlite3-devel zstd-devel python3-ply python3-core python3-six python3-pywin32 python3-wxpython liblas-devel cairo-devel pdal-devel freetype-devel"
+export BUILDDEPENDS="gdal-devel proj-devel geos-devel netcdf-devel libjpeg-turbo-devel libpq-devel libtiff-devel sqlite3-devel zstd-devel python3-ply python3-core python3-six python3-pywin32 python3-wxpython liblas-devel cairo-devel freetype-devel"
 
 REPO=https://github.com/OSGeo/grass.git
 p=$P
@@ -129,7 +129,7 @@ export OSGEO4W_ROOT_MSYS=$OSGEO4W_ROOT_MSYS
 export VCPATH="$VCPATH"
 export PATH=$MSYSPATH
 
-pacman --noconfirm -S --needed \
+pacman --noconfirm -Sy --needed \
 	diffutils \
 	flex \
 	bison \

diff --git a/src/grass-dev/osgeo4w/patch b/src/grass-dev/osgeo4w/patch
@@ -78,7 +78,7 @@ index ecb6e951f..4d6e04696 100644
      --with-opengl=windows \
      --with-bzlib \
 diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
-index c638c40ee..23529fff4 100755
+index c638c40ee..73333db24 100755
 --- a/mswindows/osgeo4w/package.sh
 +++ b/mswindows/osgeo4w/package.sh
 @@ -111,29 +111,19 @@ DLLS="
@@ -112,14 +112,14 @@ index c638c40ee..23529fff4 100755
  "
 
  if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
-@@ -148,19 +138,15 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
- 	mkdir -p dist.x86_64-w64-mingw32/bin
+@@ -149,18 +139,18 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
  	cp -uv $DLLS dist.x86_64-w64-mingw32/bin
 
--	mkdir -p mswindows/osgeo4w/lib
+ 	mkdir -p mswindows/osgeo4w/lib
 -	cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/pq.lib
--	cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
--
+ 	cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
+
++
  	log configure
  	./configure \
  		--host=x86_64-w64-mingw32 \
@@ -138,7 +138,7 @@ index c638c40ee..23529fff4 100755
  		--with-opengl=windows \
  		--without-x \
  		--with-cxx \
-@@ -168,13 +154,13 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
+@@ -168,13 +158,13 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
  		--enable-largefile \
  		--with-fftw \
  		--with-freetype \
@@ -158,7 +158,7 @@ index c638c40ee..23529fff4 100755
  		--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
  		--with-geos=$PWD/mswindows/osgeo4w/geos-config \
  		--with-sqlite \
-@@ -190,11 +176,11 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
+@@ -190,10 +180,11 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
  		--with-lapack-includes=/mingw64/include \
  		--with-openmp \
  		--with-cairo \
@@ -168,12 +168,11 @@ index c638c40ee..23529fff4 100755
 +		--with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo" \
  		--with-bzlib \
  		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
--		--without-pdal
-+		--with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config
++		--with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
+ 		--without-pdal
 
  	touch mswindows/osgeo4w/configure-stamp
- fi
-@@ -249,7 +235,6 @@ if [ -n "$PACKAGE_PATCH" ]; then
+@@ -249,7 +240,6 @@ if [ -n "$PACKAGE_PATCH" ]; then
 
      # copy dependencies (TODO: to be reduced)
      cp -uv $DLLS apps/grass/grass$POSTFIX/bin