diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-16 21:57:53 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-16 22:06:07 +0100 |
commit | bbe66af667f540c766d7cf77b19f24497488c823 (patch) | |
tree | 00471941885d0289049a1389962c2bdb57647dfa /sci-libs/gdal/files | |
parent | app-arch/brotli: add ~arm, bug #643182 (diff) | |
download | gentoo-bbe66af667f540c766d7cf77b19f24497488c823.tar.gz gentoo-bbe66af667f540c766d7cf77b19f24497488c823.tar.bz2 gentoo-bbe66af667f540c766d7cf77b19f24497488c823.zip |
sci-libs/gdal: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r-- | sci-libs/gdal/files/gdal-1.5.0-install_name.patch | 45 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-1.5.0-soname.patch | 13 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-2.0.2-jasper.patch | 13 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-2.0.2-jasper2.patch | 62 |
4 files changed, 0 insertions, 133 deletions
diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch deleted file mode 100644 index e17575267d6e..000000000000 --- a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800 -+++ GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 -@@ -97,6 +97,10 @@ - GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) - GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal - -+# for building without libtool -+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION) -+GDAL_SLIB_SONAME = -install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT) -+ - # Mac OS X Framework definition - MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ - ---- GNUmakefile.orig 2010-03-09 14:03:08 +0100 -+++ GNUmakefile 2010-03-09 14:05:29 +0100 -@@ -218,7 +218,7 @@ - - ifeq ($(HAVE_LD_SHARED),yes) - --GDAL_SLIB_B = $(notdir $(GDAL_SLIB)) -+GDAL_SLIB_B = libgdal - - install-lib: - -@@ -226,14 +226,14 @@ - ifeq ($(MACOSX_FRAMEWORK),yes) - $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL - else -- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B) -- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) -- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) -- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) -+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib -+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib -+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib -+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib - (cd $(DESTDIR)$(INST_LIB) ; \ -- ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)) -+ ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib) - (cd $(DESTDIR)$(INST_LIB) ; \ -- ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B)) -+ ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib) - endif - - else diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch deleted file mode 100644 index f784536316c2..000000000000 --- a/sci-libs/gdal/files/gdal-1.5.0-soname.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800 -+++ GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 -@@ -97,6 +97,10 @@ - GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) - GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal - -+# for building without libtool -+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION) -+GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR) -+ - # Mac OS X Framework definition - MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ - diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch deleted file mode 100644 index 00cf5c16fa4d..000000000000 --- a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urpN gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h ---- gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-01-26 07:21:48.000000000 -0800 -+++ gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-10-31 23:45:28.939407322 -0700 -@@ -29,7 +29,8 @@ -
- #ifndef JPEG2000_VSIL_IO_H
- #define JPEG2000_VSIL_IO_H
--
-+
-+#include <sys/types.h>
- #include <jasper/jasper.h>
-
- jas_stream_t *JPEG2000_VSIL_fopen(const char *filename, const char *mode);
diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch deleted file mode 100644 index a418e4159c0a..000000000000 --- a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -urN orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp ---- orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-01-26 16:21:48.000000000 +0100 -+++ dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-11-16 21:53:15.280302723 +0100 -@@ -179,40 +179,25 @@ - * Buffer initialization code.
- \******************************************************************************/
-
--static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
-- int bufsize)
-+static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode)
- {
- /* If this function is being called, the buffer should not have been
- initialized yet. */
- assert(!stream->bufbase_);
-
- if (bufmode != JAS_STREAM_UNBUF) {
-- /* The full- or line-buffered mode is being employed. */
-- if (!buf) {
-- /* The caller has not specified a buffer to employ, so allocate
-- one. */
-- if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +
-- JAS_STREAM_MAXPUTBACK))) {
-- stream->bufmode_ |= JAS_STREAM_FREEBUF;
-- stream->bufsize_ = JAS_STREAM_BUFSIZE;
-- } else {
-- /* The buffer allocation has failed. Resort to unbuffered
-- operation. */
-- stream->bufbase_ = stream->tinybuf_;
-- stream->bufsize_ = 1;
-- }
-+ if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +
-+ JAS_STREAM_MAXPUTBACK))) {
-+ stream->bufmode_ |= JAS_STREAM_FREEBUF;
-+ stream->bufsize_ = JAS_STREAM_BUFSIZE;
- } else {
-- /* The caller has specified a buffer to employ. */
-- /* The buffer must be large enough to accommodate maximum
-- putback. */
-- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
-+ /* The buffer allocation has failed. Resort to unbuffered
-+ operation. */
-+ stream->bufbase_ = stream->tinybuf_;
-+ stream->bufsize_ = 1;
- }
- } else {
- /* The unbuffered mode is being employed. */
-- /* A buffer should not have been supplied by the caller. */
-- assert(!buf);
- /* Use a trivial one-character buffer. */
- stream->bufbase_ = stream->tinybuf_;
- stream->bufsize_ = 1;
-@@ -282,7 +267,7 @@ - }
-
- /* By default, use full buffering for this type of stream. */
-- JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-+ JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
-
- return stream;
- }
|