[jhbuild/wip/ptomato/macos: 8/12] modules: Require libv4l only on Linux
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/wip/ptomato/macos: 8/12] modules: Require libv4l only on Linux
- Date: Tue, 15 Nov 2016 06:30:51 +0000 (UTC)
commit 0e357ed958e4c598ae9eb56e817ef6eca22acd2c
Author: Philip Chimento <philip chimento gmail com>
Date: Sat Nov 12 22:32:36 2016 -0800
modules: Require libv4l only on Linux
The name Video4Linux says it all, it's not available on BSD or macOS.
https://bugzilla.gnome.org/show_bug.cgi?id=774453
modulesets/gnome-apps-3.6.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.10.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.12.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.14.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.16.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.18.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.20.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.22.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.24.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.6.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.8.modules | 4 +++-
modulesets/gnome-world.modules | 4 +++-
12 files changed, 36 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index dcb5071..60f0c69 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -196,10 +196,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 871391b..9098446 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -625,10 +625,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 9fd8628..bbb9bc7 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -695,10 +695,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index aec1da4..a45f2c5 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -762,10 +762,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 259fe80..33f8d3c 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -777,10 +777,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index 5b14cd5..fa37c25 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -838,10 +838,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 411ba1a..75bb823 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -598,10 +598,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index accf326..f760dc5 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -699,10 +699,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 4ddd3e1..4f5e33d 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -703,10 +703,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 4ac9f59..6d226b4 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -484,10 +484,12 @@
<dep package="gstreamer-master"/>
<dep package="gst-plugins-base-master"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index c4761eb..b0fedfd 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -577,10 +577,12 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 2d47810..595cf31 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -2645,10 +2645,12 @@
<dep package="gstreamer-0.10"/>
<dep package="gst-plugins-base-0.10"/>
<dep package="flac"/>
- <dep package="libv4l"/>
<dep package="libvpx"/>
<dep package="taglib"/>
<dep package="wavpack"/>
+ <if condition-set="linux">
+ <dep package="libv4l"/>
+ </if>
</dependencies>
<suggests>
<dep package="pulseaudio"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]