jgrulich pushed to qt5-qtmultimedia (master). "Missing bracket in gstreamer patch"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 3 15:02:32 UTC 2015
From 26040f25075b47899e939932241a0ebb377fbb31 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Wed, 3 Jun 2015 17:02:21 +0200
Subject: Missing bracket in gstreamer patch
diff --git a/0006-GStreamer-port-to-1.0.patch b/0006-GStreamer-port-to-1.0.patch
index 749ab6f..239ff50 100644
--- a/0006-GStreamer-port-to-1.0.patch
+++ b/0006-GStreamer-port-to-1.0.patch
@@ -100,10 +100,10 @@ index 751b38d..251df34 100644
}
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index cf97e64..48a71ce 100644
+index cf97e64..cf58d63 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
-@@ -17,12 +17,27 @@ win32 {
+@@ -17,11 +17,27 @@ win32 {
} else {
contains(QT_CONFIG, alsa):qtCompileTest(alsa)
contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
@@ -112,7 +112,6 @@ index cf97e64..48a71ce 100644
- qtCompileTest(gstreamer_encodingprofiles)
- qtCompileTest(gstreamer_appsrc)
- qtCompileTest(linux_v4l)
-- }
+ !done_config_gstreamer {
+ gstver=0.10
+ !isEmpty(GST_VERSION): gstver=$$GST_VERSION
@@ -134,9 +133,9 @@ index cf97e64..48a71ce 100644
+ qtCompileTest(linux_v4l)
+ }
+ }
+ }
qtCompileTest(resourcepolicy)
qtCompileTest(gpu_vivante)
- }
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index 7c809a7..7c41f1a 100644
--- a/src/gsttools/gsttools.pro
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtmultimedia.git/commit/?h=master&id=26040f25075b47899e939932241a0ebb377fbb31
More information about the scm-commits
mailing list