From d852015eef51a09a89e760eaf79c409c025e7b8b Mon Sep 17 00:00:00 2001 From: Amir Mohammadi <183.amir@gmail.com> Date: Wed, 8 Feb 2017 11:00:15 +0100 Subject: [PATCH 1/2] [opencv] update to jpeg 9 --- opencv-3/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opencv-3/meta.yaml b/opencv-3/meta.yaml index ef95ca5..1189aeb 100644 --- a/opencv-3/meta.yaml +++ b/opencv-3/meta.yaml @@ -14,7 +14,7 @@ source: - cap_mpjpeg_decoder.patch [win] build: - number: 1 + number: 2 requirements: build: @@ -30,7 +30,7 @@ requirements: - hdf5 1.8.17 [unix] - eigen 3.* - zlib 1.2.* - - jpeg 8* + - jpeg 9* - libtiff 4.0.* - libpng >=1.6.21,<1.7 # - msinttypes [win and py<35] @@ -40,7 +40,7 @@ requirements: - numpy x.x - hdf5 1.8.17 [unix] - zlib 1.2.* - - jpeg 8* + - jpeg 9* - libtiff 4.0.* - libpng >=1.6.21,<1.7 From 89755a9caeebcf232876a14822cc2d567bb84bf1 Mon Sep 17 00:00:00 2001 From: Amir Mohammadi <183.amir@gmail.com> Date: Wed, 8 Feb 2017 11:03:34 +0100 Subject: [PATCH 2/2] Follow pinning style of other recipes --- opencv-3/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv-3/meta.yaml b/opencv-3/meta.yaml index 1189aeb..f6664c0 100644 --- a/opencv-3/meta.yaml +++ b/opencv-3/meta.yaml @@ -30,7 +30,7 @@ requirements: - hdf5 1.8.17 [unix] - eigen 3.* - zlib 1.2.* - - jpeg 9* + - jpeg 9b - libtiff 4.0.* - libpng >=1.6.21,<1.7 # - msinttypes [win and py<35]