[pitivi] bin: Actually check that Gst master is present
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] bin: Actually check that Gst master is present
- Date: Mon, 14 Jan 2013 12:38:09 +0000 (UTC)
commit bca7419442c1ff98000918afb53663d4092b0592
Author: Thibault Saunier <thibault saunier collabora com>
Date: Fri Dec 21 18:33:46 2012 -0300
bin: Actually check that Gst master is present
bin/pitivi-git-environment.sh | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 589d6bb..1cb7d82 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -27,6 +27,7 @@ BUILD_DOCS=false
GLIB_RELEASE_TAG="2.34.0" # "gobject-introspection" needs glib > 2.32
PYGOBJECT_RELEASE_TAG="3.4.0"
GOBJECT_INTROSPECTION_RELEASE_TAG="GOBJECT_INTROSPECTION_1_34_0"
+
#
# Everything below this line shouldn't be edited!
#
@@ -44,7 +45,7 @@ MODULES_MINIMAL="gnonlin gst-editing-services gst-python"
# The following decision has to be made before we've set any env variables,
# otherwise the script will detect our "gst uninstalled" and think it's the
# system-wide install.
-if pkg-config --list-all |grep gstreamer-1.0 &>/dev/null; then
+if pkg-config --exists --print-errors 'gstreamer-1.0 >= 1.1.0.1'; then
MODULES=$MODULES_MINIMAL
else
MODULES=$MODULES_ALL
@@ -72,7 +73,7 @@ GI_TYPELIB_PATH=$PITIVI_PREFIX/share/gir-1.0:${GI_TYPELIB_PATH:+:$GI_TYPELIB_PAT
export PKG_CONFIG_PATH="$PITIVI_PREFIX/lib/pkgconfig:$PITIVI/pygobject:$PKG_CONFIG_PATH"
-if pkg-config --list-all |grep gstreamer-1.0 &>/dev/null; then
+if pkg-config --exists --print-errors 'gstreamer-1.0 >= 1.1.0.1'; then
echo "Using system-wide GStreamer 1.0"
else
echo "Using a local build of GStreamer 1.0"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]