Merge lp:~seb128/sessioninstaller/current-gstreamer-tweaks into lp:sessioninstaller

[Sebastien Bacher]

Tweaks to work with the current gstreamer version

Tweaks to work with the current gstreamer version

The issue there is that Gstreamer-Version=1.2 but struct.version=1.0, one easy way to filter 0.10or1.0 is to split(".")[0]. There might be a better way but that works for the current issue.

Once that fixed the code hit another issue where "pkg_caps.intersect(struct.caps)" returns a caps even when there is no intersect, the api has a is_empty() api, using it fixes the issue

[Iain Lane (laney)]

Ok, I think a Gstreamer-Interface-Version field or whatever would be ideal, but major is what they use anyway so fine.

review: Approve

[Sebastien Bacher (seb128)]

Thanks, I've uploaded that to trusty (not sure who handle trunk but there is no debian dir there so I guess it's not one project where upstream=packaging vcs)

[Iain Lane (laney)]

Probably not, seems barry mvo or pitti could commit to trunk for you though if necessary

[Martin Pitt (pitti)]

Committed upstream, thanks!

review: Approve

=== modified file 'sessioninstaller/core.py'
--- sessioninstaller/core.py	2013-06-13 09:37:08 +0000
+++ sessioninstaller/core.py	2014-03-27 22:37:33 +0000
@@ -1341,14 +1341,14 @@
                 score -= 10
             provides = []
             for struct in structures:
-                if pkg.candidate.record["Gstreamer-Version"] != struct.version:
+                if pkg.candidate.record["Gstreamer-Version"].split(".")[0] != struct.version.split(".")[0]:
                     continue
                 if struct.caps:
                     try:
                         pkg_caps = Gst.Caps.from_string(pkg.candidate.record[struct.record])
                     except KeyError:
                         continue
-                    if not pkg_caps.intersect(struct.caps):
+                    if pkg_caps.intersect(struct.caps).is_empty():
                         continue
                 else:
                     try: