From 4294d8cea93b6709f34e721fbe9b0317070e1df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Mon, 17 Sep 2018 19:51:57 +0200
Subject: [PATCH] gl: fix metadata, name and version handling

---
 gstreamer-gl-sys/Cargo.toml   | 30 ++++++++++++++----------------
 gstreamer-gl-sys/build.rs     | 12 +-----------
 gstreamer-gl-sys/tests/abi.rs |  4 ++--
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/gstreamer-gl-sys/Cargo.toml b/gstreamer-gl-sys/Cargo.toml
index ba5ae09ed..e5f2b773a 100644
--- a/gstreamer-gl-sys/Cargo.toml
+++ b/gstreamer-gl-sys/Cargo.toml
@@ -5,24 +5,19 @@ pkg-config = "0.3.7"
 libc = "0.2"
 
 [dependencies.glib-sys]
-path = "../glib-sys"
-version = "0.2.0"
+git = "https://github.com/gtk-rs/sys"
 
 [dependencies.gobject-sys]
-path = "../gobject-sys"
-version = "0.2.0"
+git = "https://github.com/gtk-rs/sys"
 
 [dependencies.gstreamer-base-sys]
 path = "../gstreamer-base-sys"
-version = "0.2.0"
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
-version = "0.2.0"
 
 [dependencies.gstreamer-video-sys]
 path = "../gstreamer-video-sys"
-version = "0.2.0"
 
 [dev-dependencies]
 shell-words = "0.1.0"
@@ -30,17 +25,20 @@ tempdir = "0.3"
 
 [features]
 dox = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_4 = []
-v1_6 = ["v1_4"]
-v1_8 = ["v1_6"]
 
 [lib]
-name = "gst_gl_sys"
+name = "gstreamer_gl_sys"
 
 [package]
+authors = ["Sebastian Dröge <sebastian@centricular.com>",
+           "Víctor Manuel Jáquez Leal <vjaquez@igalia.com>"]
 build = "build.rs"
-links = "gst_gl"
-name = "gst-gl-sys"
-version = "0.2.0"
+description = "FFI bindings to libgstgl-1.0"
+homepage = "https://gstreamer.freedesktop.org"
+keywords = ["ffi", "gstreamer", "gnome", "multimedia"]
+license = "MIT"
+links = "gstgl-1.0"
+name = "gstreamer-gl-sys"
+readme = "README.md"
+repository = "https://github.com/sdroege/gstreamer-sys"
+version = "0.7.0"
diff --git a/gstreamer-gl-sys/build.rs b/gstreamer-gl-sys/build.rs
index 0d2be71d9..910db94e6 100644
--- a/gstreamer-gl-sys/build.rs
+++ b/gstreamer-gl-sys/build.rs
@@ -16,17 +16,7 @@ fn main() {
 fn find() -> Result<(), Error> {
     let package_name = "gstreamer-gl-1.0";
     let shared_libs = ["gstgl-1.0"];
-    let version = if cfg!(feature = "v1_12") {
-        "1.12"
-    } else if cfg!(feature = "v1_10") {
-        "1.10"
-    } else if cfg!(feature = "v1_8") {
-        "1.8"
-    } else if cfg!(feature = "v1_6") {
-        "1.6"
-    } else {
-        "1.0"
-    };
+    let version = "1.14";
 
     if let Ok(lib_dir) = env::var("GTK_LIB_DIR") {
         for lib_ in shared_libs.iter() {
diff --git a/gstreamer-gl-sys/tests/abi.rs b/gstreamer-gl-sys/tests/abi.rs
index c6206e0fd..6e92f2c0e 100644
--- a/gstreamer-gl-sys/tests/abi.rs
+++ b/gstreamer-gl-sys/tests/abi.rs
@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
-extern crate gst_gl_sys;
+extern crate gstreamer_gl_sys;
 extern crate shell_words;
 extern crate tempdir;
 use std::env;
@@ -11,7 +11,7 @@ use std::path::Path;
 use std::mem::{align_of, size_of};
 use std::process::Command;
 use std::str;
-use gst_gl_sys::*;
+use gstreamer_gl_sys::*;
 
 static PACKAGES: &[&str] = &["gstreamer-gl-1.0"];