diff options
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
14 files changed, 153 insertions, 34 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a02af7f0cd7..96a094ca9cc 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -5,12 +5,13 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls +, mesa }: assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.1"; + name = "gst-plugins-bad-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae"; + sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm"; }; nativeBuildInputs = [ pkgconfig python ]; @@ -36,9 +37,9 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc faad2 libass libkate libmms - libmodplug mpeg2dec mpg123 + libmodplug mpeg2dec mpg123 openjpeg libopus librsvg wildmidi fluidsynth libvdpau wayland - libwebp xvidcore gnutls + libwebp xvidcore gnutls mesa ] ++ stdenv.lib.optional faacSupport faac; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 3b9e94f4c65..61e0762826a 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.4.1"; + name = "gst-plugins-base-1.4.5"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499"; + sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 8e9a2b87a01..5e306f5500f 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection -, glib +, glib, makeWrapper }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.1"; + name = "gstreamer-1.4.5"; meta = { description = "Open source multimedia framework"; @@ -15,14 +15,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e"; + sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"; }; nativeBuildInputs = [ - pkgconfig perl bison flex python gobjectIntrospection + pkgconfig perl bison flex python gobjectIntrospection makeWrapper ]; propagatedBuildInputs = [ glib ]; + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + done + ''; + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index daf2ba59a40..df7078a1365 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.2.1"; + name = "gstreamer-editing-services-1.4.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "1c20zg272wgzqw4f93f1prkv9a9gdqxmf3kal29l0r2wmwhqnxpy"; + sha256 = "1cwbh244an6zsxsscvg6xjnb34ylci34g9zx59xjbv5wnw7vj86c"; }; nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 44bb1c48c81..05113973a9d 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gnonlin-1.2.1"; + name = "gnonlin-1.4.0"; meta = with stdenv.lib; { description = "Gstreamer Non-Linear Multimedia Editing Plugins"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; - sha256 = "14zb3bz3xn40a2kns719amrr77cp6wyxddml621kyxc424ihcw3q"; + sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 176814c5ecd..a06747ddc90 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-1.4.1"; + name = "gst-plugins-good-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637"; + sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a0cd0a4c646..d4db4fa8de5 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,10 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2 +, glib, gstreamer, bzip2, libsoup +, # Whether to build no plugins that have external dependencies + # (except the PulseAudio plugin). + minimalDeps ? false }: stdenv.mkDerivation rec { @@ -15,15 +18,15 @@ stdenv.mkDerivation rec { sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; }; - patches = [ ./v4l.patch ]; + patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; - configureFlags = "--disable-oss"; + configureFlags = "--enable-experimental --disable-oss"; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 - aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex - taglib bzip2 libvpx gdk_pixbuf orc - ]; + [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ] + ++ stdenv.lib.optionals (!minimalDeps) + [ aalib libcaca cairo libdv flac libjpeg libpng speex + taglib bzip2 libvpx gdk_pixbuf orc libsoup ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch new file mode 100644 index 00000000000..f13d3a16671 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch @@ -0,0 +1,27 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch + +From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 18 Mar 2013 14:59:35 +0000 +Subject: v4l2: fix compilation against newer kernel headers as on FC19 + +--- +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 07d390a..4c10f4f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifndef V4L2_CID_PAN_RESET + case V4L2_CID_HCENTER: ++#endif ++#ifndef V4L2_CID_TILT_RESET + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index d01961f5cde..889f55e5000 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -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; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch b/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch new file mode 100644 index 00000000000..d0c9960e5d2 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch @@ -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): diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index e25492c1d13..bcc05e44103 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -6,7 +6,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.4.1"; + name = "gst-libav-1.4.5"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d"; + sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index fad8308703b..a91b5d81bb3 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-1.2.1"; + name = "gst-python-1.4.0"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-python/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1m7gh017f70i5pg6k9sx54ihwaizvi2dlli687gi44n5zylya8w8"; + sha256 = "0gixsp46mv7fvhk669q60wfk9w2lc02sdb1qipq066xlrqlhrr5i"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix new file mode 100644 index 00000000000..b306e737df1 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake +, automoc4, flex, bison, pkgconfig }: + +stdenv.mkDerivation rec { + name = "${pname}-1.2.0"; + pname = "qt-gstreamer"; + + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; + sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; + }; + + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; + propagatedBuildInputs = [ boost ]; + nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; + + cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 6a80514e8a1..4e3d7eee78b 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.4.1"; + name = "gst-plugins-ugly-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071"; + sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"; }; nativeBuildInputs = [ pkgconfig python ]; |