JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4721 from rycee/gst-python

Browse Source 
Cleanups of legacy gst-python package
This commit is contained in:
Domen Kožar 2014-11-01 12:36:16 +02:00
commit 788a77d26a
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer
, gst_plugins_base, pygtk
, gst_plugins_base, pygobject
}:
stdenv.mkDerivation rec {
@ -13,12 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg";
};
# Need to disable the testFake test case due to bug in pygobject.
# See https://bugzilla.gnome.org/show_bug.cgi?id=692479
patches = [ ./disable-testFake.patch ];
buildInputs =
[ pkgconfig gst_plugins_base pygtk ]
[ pkgconfig gst_plugins_base pygobject ]
;
propagatedBuildInputs = [ gstreamer python ];
meta = {
homepage = http://gstreamer.freedesktop.org;

56
pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch Normal file
View File

@ -0,0 +1,56 @@
diff -Nurp gst-python-0.10.22.orig/testsuite/test_bin.py gst-python-0.10.22/testsuite/test_bin.py
--- gst-python-0.10.22.orig/testsuite/test_bin.py 2014-10-29 18:58:00.921827721 +0100
+++ gst-python-0.10.22/testsuite/test_bin.py 2014-10-29 19:00:32.019353092 +0100
@@ -131,52 +131,6 @@ class BinAddRemove(TestCase):
self.assertRaises(gst.AddError, self.bin.add, src, sink)
self.bin.remove(src, sink)
self.assertRaises(gst.RemoveError, self.bin.remove, src, sink)
-
-class Preroll(TestCase):
- def setUp(self):
- TestCase.setUp(self)
- self.bin = gst.Bin('bin')
-
- def tearDown(self):
- # FIXME: wait for state change thread to settle down
- while self.bin.__gstrefcount__ > 1:
- time.sleep(0.1)
- self.assertEquals(self.bin.__gstrefcount__, 1)
- del self.bin
- TestCase.tearDown(self)
-
- def testFake(self):
- src = gst.element_factory_make('fakesrc')
- sink = gst.element_factory_make('fakesink')
- self.bin.add(src)
-
- # bin will go to paused, src pad task will start and error out
- self.bin.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state()
- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_VOID_PENDING)
-
- # adding the sink will cause the bin to go in preroll mode
- gst.debug('adding sink and setting to PAUSED, should cause preroll')
- self.bin.add(sink)
- sink.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state(timeout=0)
- self.assertEquals(ret[0], gst.STATE_CHANGE_ASYNC)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_PAUSED)
-
- # to actually complete preroll, we need to link and re-enable fakesrc
- src.set_state(gst.STATE_READY)
- src.link(sink)
- src.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state()
- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_VOID_PENDING)
-
- self.bin.set_state(gst.STATE_NULL)
- self.bin.get_state()
class ConstructorTest(TestCase):
def testGood(self):