[arch-commits] Commit in gdal/trunk (3 files)
Date: Saturday, October 21, 2017 @ 12:41:15
Author: jlichtblau
Revision: 263823
upgpkg: gdal 2.2.2-1
Modified:
gdal/trunk/PKGBUILD
gdal/trunk/gdal.changelog
Deleted:
gdal/trunk/gdal-2.2-poppler-0.58.patch
-+
PKGBUILD| 14
gdal-2.2-poppler-0.58.patch | 625 --
gdal.changelog |3
3 files changed, 9 insertions(+), 633 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-21 12:16:33 UTC (rev 263822)
+++ PKGBUILD2017-10-21 12:41:15 UTC (rev 263823)
@@ -4,8 +4,8 @@
# Contributor: William Rea
pkgname=gdal
-pkgver=2.2.1
-pkgrel=7
+pkgver=2.2.2
+pkgrel=1
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/";
@@ -19,11 +19,9 @@
options=('!emptydirs')
changelog=$pkgname.changelog
source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
-gdal-perl-vendor.patch
-gdal-2.2-poppler-0.58.patch)
-sha256sums=('927098d54083ac919a497f787b835b099e9a194f2e5444dbff901f7426b86066'
-'20989e5fa499206b42c92280ce084fdf7b2f661a4233fc349611cc57102fe114'
-'17bbcfed72cdc346f1b5bb83247eb51e93ddcf0b00c8bf5e246338a2fb8a567d')
+gdal-perl-vendor.patch)
+sha256sums=('eb25d6ee85f4f5ac1d5581958f8c6eed9b1d50746f82866fe92e507541def35b'
+'20989e5fa499206b42c92280ce084fdf7b2f661a4233fc349611cc57102fe114')
prepare() {
cd "${srcdir}"/$pkgname-$pkgver
@@ -42,7 +40,7 @@
# poppler 0.58.x API change
# https://trac.osgeo.org/gdal/changeset/40036
- patch -Np4 -i ../gdal-2.2-poppler-0.58.patch
+# patch -Np4 -i ../gdal-2.2-poppler-0.58.patch
}
build() {
Deleted: gdal-2.2-poppler-0.58.patch
===
--- gdal-2.2-poppler-0.58.patch 2017-10-21 12:16:33 UTC (rev 263822)
+++ gdal-2.2-poppler-0.58.patch 2017-10-21 12:41:15 UTC (rev 263823)
@@ -1,625 +0,0 @@
-Index: /branches/2.2/gdal/GDALmake.opt.in
-===
/branches/2.2/gdal/GDALmake.opt.in (revision 40035)
-+++ /branches/2.2/gdal/GDALmake.opt.in (revision 40036)
-@@ -473,4 +473,5 @@
- POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
- POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
-+POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
- POPPLER_INC = @POPPLER_INC@
- POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
-Index: /branches/2.2/gdal/configure
-===
/branches/2.2/gdal/configure (revision 40035)
-+++ /branches/2.2/gdal/configure (revision 40036)
-@@ -663,4 +663,5 @@
- POPPLER_PLUGIN_LIB
- POPPLER_INC
-+POPPLER_0_58_OR_LATER
- POPPLER_0_23_OR_LATER
- POPPLER_0_20_OR_LATER
-@@ -32272,4 +32273,6 @@
- POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
- POPPLER_0_20_OR_LATER=no
-+POPPLER_0_23_OR_LATER=no
-+POPPLER_0_58_OR_LATER=no
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
-@@ -32312,15 +32315,19 @@
- POPPLER_PLUGIN_LIB="${TEST_POPPLER_LIB}"
-
--# And now try another dirty thing, but this one is
--# optional.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if
Catalog::optContent exists" >&5
--$as_echo_n "checking if Catalog::optContent exists... " >&6; }
-+CHECK_OTHER_POPPLER_VERSION=yes
-+
-+# And now we check if we have Poppler >= 0.58.0
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have
new API (>= 0.58.0)" >&5
-+$as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
- rm -f testpoppler.*
--echo '#define private public' > testpoppler.cpp
--echo '#include ' >> testpoppler.cpp
--echo '#include ' >> testpoppler.cpp
--echo 'int main(int argc, char** argv) { return
&(((Catalog*)0x8000)->optContent) == 0; }' >> testpoppler.cpp
-+echo '#include ' > testpoppler.cpp
-+echo 'int main(int argc, char** argv) { Object o(objNull); return 0;
}' >> testpoppler.cpp
- if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+POPPLER_0_58_OR_LATER=yes
-+POPPLER_0_23_OR_LATER=yes
-+POPPLER_0_20_OR_LATER=yes
-+POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
- POPPLER_HAS_OPTCONTENT=yes
-+CHECK_OTHER_POPPLER_VERSION=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -32330,48 +32337,73 @@
- fi
-
--# And now we check if we have Poppler >= 0.16.0
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if BaseStream
constructor needs 2 arguments" >&5
--$as_echo_n "checking if BaseStream constructor needs 2 arguments... " >&6; }
--rm -f testpoppler.*
--echo '#include ' > testpoppler.cpp
--echo '#include ' >> testpoppler.cpp
--
[arch-commits] Commit in gdal/trunk (3 files)
Date: Tuesday, August 2, 2016 @ 17:21:05
Author: jlichtblau
Revision: 184871
upgpkg: gdal 2.1.1-1 - new upstream release
glew 2.0.0 / poppler 0.46.0 rebuild
Modified:
gdal/trunk/PKGBUILD
gdal/trunk/gdal.changelog
Deleted:
gdal/trunk/gdal-python-install.patch
---+
PKGBUILD |8 +++-
gdal-python-install.patch | 10 --
gdal.changelog|3 +++
3 files changed, 6 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-02 17:19:19 UTC (rev 184870)
+++ PKGBUILD2016-08-02 17:21:05 UTC (rev 184871)
@@ -3,11 +3,9 @@
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: William Rea
-#delete obsolete .patch file from svn
-
pkgname=gdal
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/";
@@ -21,7 +19,7 @@
options=('!emptydirs')
changelog=$pkgname.changelog
source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03')
+sha256sums=('87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92')
prepare() {
cd "${srcdir}"/$pkgname-$pkgver
Deleted: gdal-python-install.patch
===
--- gdal-python-install.patch 2016-08-02 17:19:19 UTC (rev 184870)
+++ gdal-python-install.patch 2016-08-02 17:21:05 UTC (rev 184871)
@@ -1,10 +0,0 @@
swig/python/GNUmakefile.orig 2015-06-14 21:06:33.0 +0200
-+++ swig/python/GNUmakefile2015-06-27 22:02:07.805035411 +0200
-@@ -70,5 +70,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
-- $(PYTHON) setup.py install
-+ $(PYTHON) setup.py install --root=$(DESTDIR)
- else
-- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
Modified: gdal.changelog
===
--- gdal.changelog 2016-08-02 17:19:19 UTC (rev 184870)
+++ gdal.changelog 2016-08-02 17:21:05 UTC (rev 184871)
@@ -1,3 +1,6 @@
+2016-08-02 Jaroslav Lichtblau
+ * gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
+
2016-06-05 Jaroslav Lichtblau
* gdal 2.1.0-2 cfitsio 3.390 rebuild
[arch-commits] Commit in gdal/trunk (3 files)
Date: Saturday, May 18, 2013 @ 18:43:31 Author: jlichtblau Revision: 91068 upgpkg: gdal 1.10.0-1 Added: gdal/trunk/gdal-1.5.1-python-install.patch Modified: gdal/trunk/gdal.changelog Deleted: gdal/trunk/gdal-1.5.1-python-install.patch -+ gdal-1.5.1-python-install.patch | 20 ++-- gdal.changelog |3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) Deleted: gdal-1.5.1-python-install.patch === --- gdal-1.5.1-python-install.patch 2013-05-18 16:29:28 UTC (rev 91067) +++ gdal-1.5.1-python-install.patch 2013-05-18 16:43:31 UTC (rev 91068) @@ -1,10 +0,0 @@ swig/python/GNUmakefile.orig 2010-04-24 01:22:07.0 +0200 -+++ swig/python/GNUmakefile2010-05-05 19:14:58.0 +0200 -@@ -72,5 +72,5 @@ - ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install -+ $(PYTHON) setup.py install --root=$(DESTDIR) - else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - endif Added: gdal-1.5.1-python-install.patch === --- gdal-1.5.1-python-install.patch (rev 0) +++ gdal-1.5.1-python-install.patch 2013-05-18 16:43:31 UTC (rev 91068) @@ -0,0 +1,10 @@ +--- swig/python/GNUmakefile.orig 2010-04-24 01:22:07.0 +0200 swig/python/GNUmakefile2010-05-05 19:14:58.0 +0200 +@@ -72,5 +72,5 @@ + ifeq ($(PY_HAVE_SETUPTOOLS),1) +- $(PYTHON) setup.py install ++ $(PYTHON) setup.py install --root=$(DESTDIR) + else +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) ++ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) + endif Modified: gdal.changelog === --- gdal.changelog 2013-05-18 16:29:28 UTC (rev 91067) +++ gdal.changelog 2013-05-18 16:43:31 UTC (rev 91068) @@ -1,3 +1,6 @@ +2013-05-18 Jaroslav Lichtblau + * gdal 1.10.0-1 + 2011-02-19 Jaroslav Lichtblau * gdal 1.8.0-1
[arch-commits] Commit in gdal/trunk (3 files)
Date: Saturday, May 18, 2013 @ 18:29:17
Author: jlichtblau
Revision: 91066
upgpkg: gdal 1.10.0-1
Added:
gdal/trunk/gdal-1.5.1-python-install.patch
Modified:
gdal/trunk/PKGBUILD
Deleted:
gdal/trunk/gdal-1.5.1-python-install.patch
-+
PKGBUILD| 14 +++---
gdal-1.5.1-python-install.patch | 20 ++--
2 files changed, 17 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-18 16:04:20 UTC (rev 91065)
+++ PKGBUILD2013-05-18 16:29:17 UTC (rev 91066)
@@ -4,8 +4,8 @@
# Contributor: William Rea
pkgname=gdal
-pkgver=1.9.2
-pkgrel=3
+pkgver=1.10.0
+pkgrel=1
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/";
@@ -18,15 +18,15 @@
'swig: perl binding support')
options=('!libtool')
changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
gdal-1.5.1-python-install.patch)
-md5sums=('3f39db89f4710269b3a8bf94178e07aa'
- '81afc1c26d29cee84aadb6924fe33861')
+sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487'
+'55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
build() {
export CFLAGS="$CFLAGS -fno-strict-aliasing"
- # bug 23654
+# bug 23654
export LDFLAGS="$LDFLAGS -Wl,--as-needed"
cd "${srcdir}/$pkgname-$pkgver"
@@ -60,7 +60,7 @@
#FS15477 clean up junks
rm -f "${pkgdir}"/usr/bin/*.dox
- # Remove RPATH
+# Remove RPATH
chrpath --delete
"${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
chrpath --delete
"${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
chrpath --delete
"${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
Deleted: gdal-1.5.1-python-install.patch
===
--- gdal-1.5.1-python-install.patch 2013-05-18 16:04:20 UTC (rev 91065)
+++ gdal-1.5.1-python-install.patch 2013-05-18 16:29:17 UTC (rev 91066)
@@ -1,10 +0,0 @@
swig/python/GNUmakefile.orig 2010-04-24 01:22:07.0 +0200
-+++ swig/python/GNUmakefile2010-05-05 19:14:58.0 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
-- $(PYTHON) setup.py install
-+ $(PYTHON) setup.py install --root=$(DESTDIR)
- else
-- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
Added: gdal-1.5.1-python-install.patch
===
--- gdal-1.5.1-python-install.patch (rev 0)
+++ gdal-1.5.1-python-install.patch 2013-05-18 16:29:17 UTC (rev 91066)
@@ -0,0 +1,10 @@
+--- swig/python/GNUmakefile.orig 2010-04-24 01:22:07.0 +0200
swig/python/GNUmakefile2010-05-05 19:14:58.0 +0200
+@@ -72,5 +72,5 @@
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+- $(PYTHON) setup.py install
++ $(PYTHON) setup.py install --root=$(DESTDIR)
+ else
+- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+ endif
