From 1436145cb5f6b09056680f2313778d517c079db2 Mon Sep 17 00:00:00 2001 From: Nathan Fiedler Date: Fri, 7 Jul 2017 20:38:01 -0700 Subject: [PATCH] Tag new release with small API addition Also, update bindgen version and format some of the comments and documentation. cargo test passes --- CHANGELOG.md | 5 +++++ Cargo.toml | 4 ++-- README.md | 6 ++++-- build.rs | 5 ++--- docs/Development_Setup.md | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5940af..d2550ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [0.6.5] - 2017-07-07 +### Changed +- Add `compare_images()` method to `MagickWand` type. +- Update to latest release of `bindgen` library. + ## [0.6.4] - 2017-04-08 ### Changed - Actually set the version this time. diff --git a/Cargo.toml b/Cargo.toml index eb2922c..fe1a553 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "magick_rust" -version = "0.6.4" +version = "0.6.5" authors = ["Nathan Fiedler "] description = "Selection of Rust bindings for the ImageMagick library." homepage = "https://github.com/nlfiedler/magick-rust" @@ -14,5 +14,5 @@ build = "build.rs" libc = ">=0.2" [build-dependencies] -bindgen = "0.22.1" +bindgen = "0.26.2" pkg-config = "0.3.9" diff --git a/README.md b/README.md index c8b7fb6..78bbb63 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,10 @@ A somewhat safe Rust interface to the [ImageMagick](http://www.imagemagick.org/) * Rust (~latest release) * Cargo (~latest release) * ImageMagick (version 6.9) - - [Homebrew](http://brew.sh) and [FreeBSD](https://www.freebsd.org) provide this version - - Homebrew: `brew install imagemagick@6` followed by `brew link --force imagemagick@6` + - [FreeBSD](https://www.freebsd.org) provides this version + - [Homebrew](http://brew.sh) requires special steps: + + `brew install imagemagick@6` + + `brew link --force imagemagick@6` - Linux may require building ImageMagick from source * Clang (version 3.5 or higher) - Or whatever version is dictated by [rust-bindgen](https://github.com/servo/rust-bindgen) diff --git a/build.rs b/build.rs index 85e2734..715fe5a 100644 --- a/build.rs +++ b/build.rs @@ -34,8 +34,8 @@ fn main() { .arg(format!("--max-version={}", MAX_VERSION)) .probe("MagickWand") .unwrap(); - // We have to split the version check and the cflags/libs check because you can't do both at - // the same time on RHEL (apparently). + // We have to split the version check and the cflags/libs check because + // you can't do both at the same time on RHEL (apparently). let library = pkg_config::Config::new().probe("MagickWand").unwrap(); // If the generated bindings are missing, generate them now. @@ -50,7 +50,6 @@ fn main() { // Geneate the bindings. let mut builder = bindgen::Builder::default() - .no_unstable_rust() .emit_builtins() .ctypes_prefix("libc") .raw_line("extern crate libc;") diff --git a/docs/Development_Setup.md b/docs/Development_Setup.md index 01c9f34..33afa76 100644 --- a/docs/Development_Setup.md +++ b/docs/Development_Setup.md @@ -14,6 +14,7 @@ $ xcode-select --install $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" $ brew install rust $ brew install imagemagick@6 +$ brew link --force imagemagick@6 $ brew install pkg-config ```