Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Renaming proj4 to proj.4 #116

Merged
merged 1 commit into from
Nov 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cartopy/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ source:

build:
number: 2
number: 2

requirements:
build:
Expand All @@ -20,7 +19,7 @@ requirements:
- six
- numpy x.x
- cython
- proj4
- proj.4
- geos
# On OSX We need to effectively pin the geos version to the
# one used by the specific shapely being targetted (we're letting
Expand Down
7 changes: 7 additions & 0 deletions proj.4/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nmake /f makefile.vc

nmake INSTDIR=%LIBRARY_PREFIX% /f makefile.vc install-all
if errorlevel 1 exit 1

move %LIBRARY_PREFIX%\bin\*.* %PREFIX%
if errorlevel 1 exit 1
2 changes: 2 additions & 0 deletions proj4/build.sh → proj.4/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

./configure --prefix=$PREFIX --without-jni

make
make check
make install
11 changes: 11 additions & 0 deletions proj.4/make_check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- src/rtodms.c 2015-02-25 00:38:48.000000000 -0300
+++ src/rtodms.c 2015-10-14 18:47:05.298010308 -0300
@@ -63,7 +63,7 @@
if (*p != '.')
++p;
if (++q != p)
- (void)strcpy(p, q);
+ (void)memmove(p, q, (sign ? 3 : 2));
} else if (min)
(void)sprintf(ss,"%dd%d'%c",deg,min,sign);
else
28 changes: 28 additions & 0 deletions proj.4/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package:
name: proj.4
version: "4.9.1"

source:
fn: proj-4.9.1.tar.gz
url: http://download.osgeo.org/proj/proj-4.9.1.tar.gz
md5: 3cbb2a964fd19a496f5f4265a717d31c
patches:
- make_check.patch # [osx]

build:
number: 1

requirements:
run:
# The VS version is important. See # https://github.com/SciTools/conda-recipes-scitools/issues/94.
- python # [win]

test:
commands:
- echo -105 40 | proj +proj=utm +zone=13 +ellps=WGS84
- echo -117 30 | cs2cs +proj=latlong +datum=NAD27 +to +proj=latlong +datum=NAD83

about:
home: http://trac.osgeo.org/proj/
license: MIT
summary: 'Cartographic projection software'
3 changes: 0 additions & 3 deletions proj4/bld.bat

This file was deleted.

21 changes: 0 additions & 21 deletions proj4/meta.yaml

This file was deleted.