[Git][debian-gis-team/gdal][experimental] 2 commits: Add patch to restore CharLS support.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal


Commits:
4bba21ae by Bas Couwenberg at 2020-10-20T05:45:45+02:00
Add patch to restore CharLS support.

- - - - -
ce19a9bc by Bas Couwenberg at 2020-10-20T05:46:04+02:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/charls.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gdal (3.1.4~rc1+dfsg-1~exp2) experimental; urgency=medium
+
+  * Add patch to restore CharLS support.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 20 Oct 2020 05:45:50 +0200
+
 gdal (3.1.4~rc1+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/patches/charls.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Support CharLS 2.1 on Debian as well.
+ See: https://bugs.debian.org/971425
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/gdal/pull/3083
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2191,6 +2191,14 @@ if test "$with_charls" = "yes" -o "$with
+     if test "$HAVE_CHARLS" = "yes"; then
+         LIBS="-lcharls $LIBS"
+         CHARLS_INC="-DCHARLS_2_1"
++    else
++        AC_LANG_PUSH([C++])
++        AC_CHECK_LIB(CharLS,JpegLsDecode,HAVE_CHARLS=yes)
++        AC_LANG_POP([C++])
++        if test "$HAVE_CHARLS" = "yes"; then
++            LIBS="-lCharLS $LIBS"
++            CHARLS_INC="-DCHARLS_2_1"
++        fi
+     fi
+   else
+     dnl CharLS 1.x


=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ spatialite
 java.opt
 perl-vendor
 perl-doxyfile
+charls.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/c8a33d401df21196081c1a832eb7f455895c597d...ce19a9bc78ec61186c3a600a8595f7f54935899b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/c8a33d401df21196081c1a832eb7f455895c597d...ce19a9bc78ec61186c3a600a8595f7f54935899b
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/20201020/694870c0/attachment-0001.html>