From 3837dddedb64ae9456e0b07ae2915c828e92eb7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 03:19:25 +0200 Subject: firefox: remove GStreamer Apparently, it has been dropped: https://bugzilla.mozilla.org/show_bug.cgi?id=1234092 --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed6cf712ed9a..b619941820e6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -67,13 +67,12 @@ let ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -99,7 +98,6 @@ let }; buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' @@ -119,9 +117,7 @@ let --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' -- cgit 1.4.1 From db78fe50e6e6729b12f8c8b4414de1c71192c069 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 03:51:07 +0200 Subject: opencv: use GStreamer 1.0 --- pkgs/development/libraries/opencv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index cbac7210a10e..d2d106827169 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -8,7 +8,7 @@ , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg -, enableGStreamer ? false, gst_all +, enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , darwin }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) ; @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "GSTREAMER" enableGStreamer) ]; enableParallelBuilding = true; -- cgit 1.4.1 From 1c33dff43315303649f9189656a7b26f24f20218 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 15:30:54 +0200 Subject: libcanberra: fix GStreamer support --- pkgs/development/libraries/libcanberra/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 54f2273c2fcf..83f86c40c0d1 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }: +, alsaLib, libpulseaudio, gst_all_1, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - libtool alsaLib libpulseaudio libvorbis gtk libcap - /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? - ]; + alsaLib libpulseaudio libvorbis gtk libcap + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]); configureFlags = "--disable-oss"; -- cgit 1.4.1 From 5deb50c038a40d9331be0359c84b0e3ade78db9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 May 2018 23:22:09 +0200 Subject: firefox-bin: remove unneeded GStreamer dependency --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 97ce7d06c411..6b2bb541a3a7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -12,8 +12,6 @@ , gdk_pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -98,8 +96,6 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos -- cgit 1.4.1 From 0b2b174bbaf84e4065f05c8f4a9168ed1a62539a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 00:00:59 +0200 Subject: qstopmotion: remove unnecessary gstreamer dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to 2.3.1 release notes: “All gstreamer grabber are removed from the application. The reason is the end of the support for gstreamer 0.10 in many distributions.” --- pkgs/applications/video/qstopmotion/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 2454044bb48e..a689697e0a0f 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad -, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4 -, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils +{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4 +, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils , libv4l, pcre }: stdenv.mkDerivation rec { @@ -13,11 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; }; - buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good - gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre - ]; + buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; - nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; -- cgit 1.4.1 From 841a5553cb411577b5421701b41530e0981d5d82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 May 2018 00:29:01 +0200 Subject: baresip: switch to GStreamer 1.0 --- .../networking/instant-messengers/baresip/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 538e9a3786be..eff33643ebcf 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad -, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { @@ -11,11 +10,10 @@ stdenv.mkDerivation rec { sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [zlib openssl libre librem - cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good + buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx - ]; + ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { "CCACHE_DISABLE=1" "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" -- cgit 1.4.1