[niepce] Added rexiv2 to the build
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Added rexiv2 to the build
- Date: Fri, 21 Dec 2018 16:48:20 +0000 (UTC)
commit 4c734fecbd94175e14e3db275252717dd34fe138
Author: Hubert Figuière <hub figuiere net>
Date: Sat Nov 17 15:29:39 2018 -0500
Added rexiv2 to the build
Cargo.lock | 32 ++++++++++++++++++++++++++++++++
Cargo.toml | 1 +
configure.ac | 4 ++++
src/lib.rs | 1 +
src/niepce/Makefile.am | 1 +
5 files changed, 39 insertions(+)
---
diff --git a/Cargo.lock b/Cargo.lock
index abf4f92..08314d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -275,6 +275,15 @@ name = "gettext-rs"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "gexiv2-sys"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "gio"
version = "0.5.0"
@@ -490,6 +499,7 @@ dependencies = [
"gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rexiv2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"try_opt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -529,6 +539,15 @@ dependencies = [
"num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "num-rational"
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "num-traits"
version = "0.2.1"
@@ -675,6 +694,16 @@ dependencies = [
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "rexiv2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gexiv2-sys 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "rusqlite"
version = "0.14.0"
@@ -954,6 +983,7 @@ dependencies = [
"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
"checksum gettext-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"823d7e5d0e615f937c7629991bc9f4c090ad582303214c38744e1a16d6ffbe5e"
+"checksum gexiv2-sys 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"d8db1138205533eab9af7a94fb083170844c89b93f86bb4a46e0251ad04a62e8"
"checksum gio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"7aeedbcb85cc6a53f1928dbe6c015dc9a9b64a7e2fb7484d6f5d0d1d400e1db0"
"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
"checksum glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"740f7fda8dde5f5e3944dabdb4a73ac6094a8a7fdf0af377468e98ca93733e61"
@@ -979,6 +1009,7 @@ dependencies = [
"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" =
"4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" =
"f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" =
"4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
+"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" =
"ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
"checksum num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" =
"0b3c2bd9b9d21e48e956b763c9f37134dc62d9e95da6edb3f672cacb6caf3cd3"
"checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
@@ -997,6 +1028,7 @@ dependencies = [
"checksum regex-syntax 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" =
"b2550876c31dc914696a6c2e01cbce8afba79a93c8ae979d2fe051c0230b3756"
"checksum regex-syntax 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"8f1ac0f60d675cc6cf13a20ec076568254472551051ad5dd050364d70671bf6b"
"checksum remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5"
+"checksum rexiv2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"332fd4a021cbdf3f2df0ee82e6354bde1643a510a4dec769210a69d3b7f51284"
"checksum rusqlite 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" =
"c9d9118f1ce84d8d0b67f9779936432fb42bb620cef2122409d786892cce9a3c"
"checksum serde 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" =
"c73f63e08b33f6e59dfb3365b009897ebc3a3edc4af6e4f3ce8e483cf3d80ce7"
"checksum serde_derive 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)" =
"652bc323d694dc925829725ec6c890156d8e70ae5202919869cb00fe2eff3788"
diff --git a/Cargo.toml b/Cargo.toml
index f4f4838..5870b21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ gio = "0.5.0"
gtk-sys = { version = "0.7.0", features = ["v3_16"] }
gtk = "0.5.0"
libc = "0.2.39"
+rexiv2 = "^0.6.0"
rusqlite = { version = "0.14.0", features = ["functions"] }
try_opt = "0.1.1"
#gphoto = "0.1.1"
diff --git a/configure.ac b/configure.ac
index 1ce2cda..59743f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,10 @@ PKG_CHECK_MODULES(GEGL, gegl-0.3 >= $GEGL_VERSION)
AC_SUBST(GEGL_CFLAGS)
AC_SUBST(GEGL_LIBS)
+dnl gexiv2 is needed in the Rust code
+PKG_CHECK_MODULES(GEXIV2, gexiv2)
+AC_SUBST(GEXIV2_LIBS)
+
AX_BOOST_BASE([$BOOST_VERSION])
dnl Relative googletest dir from top srcdir.
diff --git a/src/lib.rs b/src/lib.rs
index 8a2ee94..b614f06 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,6 +27,7 @@ extern crate glib_sys;
extern crate gtk;
extern crate gtk_sys;
extern crate libc;
+extern crate rexiv2;
extern crate rusqlite;
#[macro_use]
extern crate try_opt;
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index 5c80f5a..ea5f7c3 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -27,6 +27,7 @@ niepce_LDADD = \
@GPHOTO_LIBS@ \
@BABL_LIBS@ \
@GEGL_LIBS@ @OPENRAW_LIBS@ \
+ @GEXIV2_LIBS@ \
-ldl \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]