[Git][debian-gis-team/gdal][master] 4 commits: Revert "Add patch to use pkg-config for libdap when dap-config is not available."
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Sep 30 05:51:56 BST 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal
Commits:
a23e6b9f by Bas Couwenberg at 2021-09-29T22:14:40+02:00
Revert "Add patch to use pkg-config for libdap when dap-config is not available."
This reverts commit a38749b8d5f8eb5fcfbe37cbd58e31116c4c36d1.
- - - - -
d24a6c0f by Bas Couwenberg at 2021-09-29T22:15:28+02:00
Disable DODS support, libdap causes FTBFS.
- - - - -
3a30dc51 by Bas Couwenberg at 2021-09-30T05:47:54+02:00
Add pkg-config to build dependencies.
- - - - -
433059bf by Bas Couwenberg at 2021-09-30T05:47:54+02:00
Set distribution to unstable.
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/libgdal29.symbols.common
- − debian/patches/libdap.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,14 @@
-gdal (3.3.2+dfsg-2) UNRELEASED; urgency=medium
+gdal (3.3.2+dfsg-2) unstable; urgency=medium
* Bump Standards-Version to 4.6.0, no changes.
* Bump debhelper compat to 12, changes:
- Drop --list-missing from dh_install
* Remove executable bit from examples.
* Drop --autodest from dh_install.
- * Add patch to use pkg-config for libdap when dap-config is not available.
+ * Disable DODS support, libdap causes FTBFS.
+ * Add pkg-config to build dependencies.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:23:23 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 29 Sep 2021 22:16:07 +0200
gdal (3.3.2+dfsg-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -14,7 +14,6 @@ Build-Depends: debhelper-compat (= 12),
libcfitsio-dev,
libcharls-dev,
libcurl4-gnutls-dev | libcurl-ssl-dev,
- libdap-dev,
libdeflate-dev,
libdoxygen-filter-perl,
libexpat1-dev,
@@ -52,6 +51,7 @@ Build-Depends: debhelper-compat (= 12),
lsb-release,
netcdf-bin,
patch,
+ pkg-config,
python3-all-dev,
python3-numpy,
python3-distutils,
@@ -99,7 +99,6 @@ Depends: libgdal29 (= ${binary:Version}),
libcfitsio-dev,
libcharls-dev,
libcurl4-gnutls-dev | libcurl-ssl-dev,
- libdap-dev,
libdeflate-dev,
libexpat1-dev,
libfreexl-dev,
=====================================
debian/libgdal29.symbols.common
=====================================
@@ -852,7 +852,6 @@
GDALRegister_DAAS at Base 3.0.0
GDALRegister_DIMAP at Base 1.8.0
GDALRegister_DIPEx at Base 1.8.0
- GDALRegister_DODS at Base 1.8.0
GDALRegister_DOQ1 at Base 1.8.0
GDALRegister_DOQ2 at Base 1.8.0
GDALRegister_DTED at Base 1.8.0
@@ -1795,7 +1794,6 @@
RegisterOGRCloudant at Base 2.0.1
RegisterOGRCouchDB at Base 1.9.0
RegisterOGRDGN at Base 1.8.0
- RegisterOGRDODS at Base 1.8.0
RegisterOGRDXF at Base 1.8.0
RegisterOGREDIGEO at Base 1.9.0
RegisterOGRESRIJSON at Base 2.3.0
=====================================
debian/patches/libdap.patch deleted
=====================================
@@ -1,90 +0,0 @@
-Description: Use pkg-config for libdap when dap-config is not available.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/OSGeo/gdal/pull/4567
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4202,39 +4202,47 @@ else
- dnl libs from dap-config gets added further down
- AC_MSG_RESULT([libdap $LIBDAP_VER])
- else
-- dnl Check the version by compiling test programs
-+ PKG_PROG_PKG_CONFIG([0.21])
-+ PKG_CHECK_MODULES(LIBDAP,[libdap], [HAVE_LIBDAP=yes], [HAVE_LIBDAP=no])
-
-- dnl Test if we have libdap >= 3.10
-- dnl From libdap 3.10, AISConnect.h has been renamed as Connect.h
-- rm -f islibdappost310.*
-- echo '#include "Connect.h"' > islibdappost310.cpp
-- echo 'int main(int argc, char** argv) { return 0; } ' >> islibdappost310.cpp
-- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappost310.cpp -c ${DODS_INC} ${CPPFLAGS} 2>&1`" ; then
-- dnl yes, libdap >= 3.10
-- DODS_INC="$DODS_INC -DLIBDAP_310 -DLIBDAP_39"
-- AC_MSG_RESULT([libdap >= 3.10])
-+ if test "${HAVE_LIBDAP}" = "yes"; then
-+ dnl The dods driver needs LIBDAP_320 and LIBDAP_39 defined to include the right headers
-+ DODS_INC="$DODS_INC $LIBDAP_CFLAGS -DLIBDAP_310 -DLIBDAP_39"
- else
-- AC_MSG_RESULT([libdap < 3.10])
-+ dnl Check the version by compiling test programs
-
-- dnl Test if we have libdap < 3.9
-- dnl Before libdap < 3.9, DAS derived from AttrTable class
-- dnl I wish they had defines with version numbers instead of this test !
-- rm -f islibdappre39.*
-- echo '#include "DAS.h"' > islibdappre39.cpp
-- echo '#include "AttrTable.h"' >> islibdappre39.cpp
-- echo 'using namespace libdap;' >> islibdappre39.cpp
-- echo 'int main(int argc, char** argv) { DAS oDAS; AttrTable& oAttrTable = oDAS; } ' >> islibdappre39.cpp
-- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappre39.cpp -c ${DODS_INC} 2>&1`" ; then
-- dnl yes, libdap < 3.9
-- AC_MSG_RESULT([libdap < 3.9])
-+ dnl Test if we have libdap >= 3.10
-+ dnl From libdap 3.10, AISConnect.h has been renamed as Connect.h
-+ rm -f islibdappost310.*
-+ echo '#include "Connect.h"' > islibdappost310.cpp
-+ echo 'int main(int argc, char** argv) { return 0; } ' >> islibdappost310.cpp
-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappost310.cpp -c ${DODS_INC} ${CPPFLAGS} 2>&1`" ; then
-+ dnl yes, libdap >= 3.10
-+ DODS_INC="$DODS_INC -DLIBDAP_310 -DLIBDAP_39"
-+ AC_MSG_RESULT([libdap >= 3.10])
- else
-- DODS_INC="$DODS_INC -DLIBDAP_39"
-- AC_MSG_RESULT([libdap >= 3.9])
-- fi
-- rm -f islibdappre39.*
-+ AC_MSG_RESULT([libdap < 3.10])
-+
-+ dnl Test if we have libdap < 3.9
-+ dnl Before libdap < 3.9, DAS derived from AttrTable class
-+ dnl I wish they had defines with version numbers instead of this test !
-+ rm -f islibdappre39.*
-+ echo '#include "DAS.h"' > islibdappre39.cpp
-+ echo '#include "AttrTable.h"' >> islibdappre39.cpp
-+ echo 'using namespace libdap;' >> islibdappre39.cpp
-+ echo 'int main(int argc, char** argv) { DAS oDAS; AttrTable& oAttrTable = oDAS; } ' >> islibdappre39.cpp
-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappre39.cpp -c ${DODS_INC} 2>&1`" ; then
-+ dnl yes, libdap < 3.9
-+ AC_MSG_RESULT([libdap < 3.9])
-+ else
-+ DODS_INC="$DODS_INC -DLIBDAP_39"
-+ AC_MSG_RESULT([libdap >= 3.9])
-+ fi
-+ rm -f islibdappre39.*
-
-+ fi
-+ rm -f islibdappost310.*
- fi
-- rm -f islibdappost310.*
- fi
-
-
-@@ -4245,6 +4253,8 @@ else
- elif test -x $DODS_BIN/dap-config ; then
- dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
- LIBS="$LIBS `$DODS_BIN/dap-config --libs`"
-+ elif test "${HAVE_LIBDAP}" = "yes"; then
-+ LIBS="$LIBS $LIBDAP_LIBS"
- else
- dnl Otherwise try to put things together in a more primitive way.
- LIBS="$LIBS -L$DODS_LIB -ldap++ -lpthread -lrx"
=====================================
debian/patches/series
=====================================
@@ -7,4 +7,3 @@ java.opt
perl-vendor
perl-doxyfile
spelling-errors.patch
-libdap.patch
=====================================
debian/rules
=====================================
@@ -164,7 +164,6 @@ override_dh_auto_configure:
--with-webp \
--with-xerces \
--with-zstd \
- --with-dods-root=/usr \
--with-perl \
--with-python; \
mv GDALmake.opt GDALmake.opt-$$V; \
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/a38749b8d5f8eb5fcfbe37cbd58e31116c4c36d1...433059bf7e3e3c476cf894137fede0cf0aa2b472
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/a38749b8d5f8eb5fcfbe37cbd58e31116c4c36d1...433059bf7e3e3c476cf894137fede0cf0aa2b472
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210930/56e0d287/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list