Fix up features/version mess for each library

gstreamer-app-sys/Cargo.toml

@@ -14,14 +14,12 @@ path = "../gstreamer-sys"
 path = "../gstreamer-base-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_2 = []
+v1_4 = ["v1_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_app_sys"

gstreamer-app-sys/build.rs

@@ -20,8 +20,14 @@ fn find() -> Result<(), Error> {
         "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 if cfg!(feature = "v1_4") {
+        "1.4"
+    } else if cfg!(feature = "v1_2") {
+        "1.2"
     } else {
         "1.0"
     };

gstreamer-audio-sys/Cargo.toml

@@ -17,14 +17,12 @@ path = "../gstreamer-base-sys"
 path = "../gstreamer-tag-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_2 = []
+v1_4 = ["v1_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_audio_sys"

gstreamer-audio-sys/build.rs

@@ -24,6 +24,10 @@ fn find() -> Result<(), Error> {
         "1.8"
     } else if cfg!(feature = "v1_6") {
         "1.6"
+    } else if cfg!(feature = "v1_4") {
+        "1.4"
+    } else if cfg!(feature = "v1_2") {
+        "1.2"
     } else {
         "1.0"
     };

gstreamer-base-sys/Cargo.toml

@@ -11,14 +11,13 @@ gobject-sys = {  git = "https://github.com/gtk-rs/sys" }
 path = "../gstreamer-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_0_1 = []
+v1_2 = ["v1_0_1"]
+v1_4 = ["v1_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_base_sys"

gstreamer-base-sys/build.rs

@@ -20,12 +20,16 @@ fn find() -> Result<(), Error> {
         "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 if cfg!(feature = "v1_4") {
         "1.4"
     } else if cfg!(feature = "v1_2") {
         "1.2"
+    } else if cfg!(feature = "v1_0_1") {
+        "1.0.1"
     } else {
         "1.0"
     };

gstreamer-pbutils-sys/Cargo.toml

@@ -20,14 +20,12 @@ path = "../gstreamer-video-sys"
 path = "../gstreamer-tag-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_2 = []
+v1_4 = ["v1_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_pbutils_sys"

gstreamer-pbutils-sys/build.rs

@@ -16,10 +16,16 @@ fn main() {
 fn find() -> Result<(), Error> {
     let package_name = "gstreamer-pbutils-1.0";
     let shared_libs = ["gstpbutils-1.0"];
-    let version = if cfg!(feature = "v1_8") {
+    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 if cfg!(feature = "v1_4") {
+        "1.4"
+    } else if cfg!(feature = "v1_2") {
+        "1.2"
     } else {
         "1.0"
     };

gstreamer-sys/Cargo.toml

@@ -9,13 +9,13 @@ gobject-sys = { git = "https://github.com/gtk-rs/sys" }
 
 [features]
 v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
 v1_2 = ["v1_0_10"]
 v1_2_3 = ["v1_2"]
 v1_4 = ["v1_2_3"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_sys"

gstreamer-sys/build.rs

@@ -30,6 +30,8 @@ fn find() -> Result<(), Error> {
         "1.2.3"
     } else if cfg!(feature = "v1_2") {
         "1.2"
+    } else if cfg!(feature = "v1_0_10") {
+        "1.0.10"
     } else {
         "1.0"
     };

gstreamer-tag-sys/Cargo.toml

@@ -14,14 +14,12 @@ path = "../gstreamer-sys"
 path = "../gstreamer-base-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_2 = []
+v1_4 = ["v1_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_tag_sys"

gstreamer-tag-sys/build.rs

@@ -16,8 +16,18 @@ fn main() {
 fn find() -> Result<(), Error> {
     let package_name = "gstreamer-tag-1.0";
     let shared_libs = ["gsttag-1.0"];
-    let version = if cfg!(feature = "v1_10") {
+    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 if cfg!(feature = "v1_4") {
+        "1.4"
+    } else if cfg!(feature = "v1_2") {
+        "1.2"
     } else {
         "1.0"
     };

gstreamer-video-sys/Cargo.toml

@@ -14,14 +14,14 @@ path = "../gstreamer-sys"
 path = "../gstreamer-base-sys"
 
 [features]
-v1_0_10 = []
-v1_10 = ["v1_8"]
-v1_12 = ["v1_10"]
-v1_2 = ["v1_0_10"]
-v1_2_3 = ["v1_2"]
-v1_4 = ["v1_2_3"]
+v1_0_3 = []
+v1_2 = ["v1_0_3"]
+v1_2_2 = ["v1_2"]
+v1_4 = ["v1_2_2"]
 v1_6 = ["v1_4"]
 v1_8 = ["v1_6"]
+v1_10 = ["v1_8"]
+v1_12 = ["v1_10"]
 
 [lib]
 name = "gstreamer_video_sys"

gstreamer-video-sys/build.rs

@@ -30,6 +30,8 @@ fn find() -> Result<(), Error> {
         "1.2.2"
     } else if cfg!(feature = "v1_2") {
         "1.2"
+    } else if cfg!(feature = "v1_0_3") {
+        "1.0.3"
     } else {
         "1.0"
     };