summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-18 15:54:49 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-11-18 15:55:52 (GMT)
commitf4e9dd7d95080d9d48a282df7b0c8aeb602a439d (patch)
tree04241256592acab115d4dfe9b49bee17bfab6895
parent80a67d67d497636c986c404a4d8d718632ffb8b7 (diff)
parentf316c0262cae709cbe58de1bf0cf6861fb69065a (diff)
downloaddefinitions-f4e9dd7d95080d9d48a282df7b0c8aeb602a439d.tar.gz
Merge branch 'baserock/jjardon/gstreamer14'
Reviewed-by: Paul Sherwood <paul.sherwood@codethink.co.uk> Reviewed-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/audio-bluetooth.morph9
-rw-r--r--strata/audio-bluetooth/alsa-lib.morph4
-rw-r--r--strata/multimedia.morph20
3 files changed, 14 insertions, 19 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 003d451..0c67ee5 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -10,16 +10,15 @@ chunks:
unpetrify-ref: baserock/morph
build-depends: []
- name: alsa-lib
- morph: strata/audio-bluetooth/alsa-lib.morph
repo: upstream:alsa-lib
- ref: ab715503853be8d8f365fd157c3cb97ef7a89f7b
- unpetrify-ref: baserock/morph
+ ref: 9cfd1faa27511edbb8bebbab85030125f33590ae
+ unpetrify-ref: v1.0.28
build-depends: []
- name: alsa-utils
morph: strata/audio-bluetooth/alsa-utils.morph
repo: upstream:alsa-utils
- ref: f12208425051a7abf5ffc87ac2b9d2bd9e096fe1
- unpetrify-ref: baserock/morph
+ ref: bbf137f66b2c8ce36db73f59ee69d5c443436524
+ unpetrify-ref: v1.0.28
build-depends:
- alsa-lib
- name: libical
diff --git a/strata/audio-bluetooth/alsa-lib.morph b/strata/audio-bluetooth/alsa-lib.morph
deleted file mode 100644
index 1e3015c..0000000
--- a/strata/audio-bluetooth/alsa-lib.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: alsa-lib
-kind: chunk
-description: ALSA library
-build-system: autotools
diff --git a/strata/multimedia.morph b/strata/multimedia.morph
index b0d8298..6acab0f 100644
--- a/strata/multimedia.morph
+++ b/strata/multimedia.morph
@@ -6,33 +6,33 @@ build-depends:
chunks:
- name: orc
repo: upstream:orc
- ref: ec132ae118bead13312f126a1f6e5709a2429ff6
- unpetrify-ref: orc-0.4.19
+ ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9
+ unpetrify-ref: orc-0.4.22
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: 0217fba607637860a475d0b5d48a3d4b249ca360
- unpetrify-ref: baserock/morph/1.2
+ ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558
+ unpetrify-ref: baserock/1.4
build-depends:
- orc
- name: gstreamer-plugins-base
repo: upstream:gstreamer-plugins-base
- ref: 1263caa96fcc1e3d2963bc27acbcf88b5b17d5dd
- unpetrify-ref: baserock/morph/1.2
+ ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- name: gstreamer-plugins-good
repo: upstream:gstreamer-plugins-good
- ref: b7e3af91197812e41028016d2e75ad2d6530b9b3
- unpetrify-ref: baserock/morph/1.2
+ ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- gstreamer-plugins-base
- orc
- name: gstreamer-plugins-bad
repo: upstream:gstreamer-plugins-bad
- ref: 343470e7fd1e7a6bb95b953d25b2caf5425d0185
- unpetrify-ref: baserock/morph/1.2
+ ref: bb2a4669ff57af90c8101c54744d3228aa060475
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- gstreamer-plugins-base