Skip to content

Commit

Permalink
Update libtiff and avro library (#568)
Browse files Browse the repository at this point in the history
* Update avro to 1.9.1

Also, patch is not needed as the issue has been merged in:
avro PR 520

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update libtiff to 43b0c984f0a2c81565b05b6590bf9de7df612477

Since 4.0.10 was the latest release version, we have to bring
in a commit 43b0c984f0a2c81565b05b6590bf9de7df612477.

This PR fixes 557.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
  • Loading branch information
yongtang committed Oct 20, 2019
1 parent ea874bc commit 3dc1251
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 28 deletions.
24 changes: 8 additions & 16 deletions WORKSPACE
Expand Up @@ -2,7 +2,7 @@ workspace(name = "org_tensorflow_io")

load("//third_party/tf:tf_configure.bzl", "tf_configure")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")

tf_configure(
name = "local_config_tf",
Expand Down Expand Up @@ -190,15 +190,12 @@ http_archive(
],
)

http_archive(
# TODO: replace with release version
new_git_repository(
name = "libtiff",
build_file = "//third_party:libtiff.BUILD",
sha256 = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4",
strip_prefix = "tiff-4.0.10",
urls = [
"https://mirror.bazel.build/download.osgeo.org/libtiff/tiff-4.0.10.tar.gz",
"https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz",
],
commit = "43b0c984f0a2c81565b05b6590bf9de7df612477",
remote = "https://gitlab.com/libtiff/libtiff.git",
)

http_archive(
Expand Down Expand Up @@ -447,15 +444,10 @@ http_archive(
http_archive(
name = "avro",
build_file = "//third_party:avro.BUILD",
patch_args = ["-p1"],
patches = [
"//third_party:avro.patch",
],
sha256 = "42fbe407263ec174d448121cd0e20adcd75c43cb9f192b97476d9b99fa69faf3",
strip_prefix = "avro-release-1.9.0-rc4/lang/c++",
sha256 = "e382ac6685544ae9539084793ac0a4ffd377ba476ea756439625552e14d212b0",
strip_prefix = "avro-release-1.9.1/lang/c++",
urls = [
"https://mirror.bazel.build/github.com/apache/avro/archive/release-1.9.0-rc4.tar.gz",
"https://github.com/apache/avro/archive/release-1.9.0-rc4.tar.gz",
"https://github.com/apache/avro/archive/release-1.9.1.tar.gz",
],
)

Expand Down
12 changes: 0 additions & 12 deletions third_party/avro.patch

This file was deleted.

2 changes: 2 additions & 0 deletions third_party/libtiff.BUILD
Expand Up @@ -13,6 +13,8 @@ cc_library(
],
exclude = [
"libtiff/tif_win32.c",
"libtiff/tif_wince.c",
"libtiff/tif_vms.c",
],
) + [
"libtiff/tif_stream.cxx",
Expand Down

0 comments on commit 3dc1251

Please sign in to comment.