Merge pull request #84449 from doronbehar/improve-guvcview

guvcview: fix gsettings filechooser errors
This commit is contained in:
worldofpeace 2020-04-28 13:32:13 -04:00 committed by GitHub
commit d85aabfb5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 112 additions and 25 deletions

View File

@ -1,6 +1,26 @@
{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
, qwt, extra-cmake-modules }:
{ stdenv
, mkDerivation
, fetchurl
, qtbase
, qtmultimedia
, qtquickcontrols
, qtimageformats
, qtxmlpatterns
, ffmpeg
, guvcview
, cmake
, ninja
, libxml2
, gettext
, pkgconfig
, libgphoto2
, gphoto2
, v4l-utils
, libv4l
, pcre
, qwt
, extra-cmake-modules
}:
mkDerivation rec {
pname = "qstopmotion";
@ -11,11 +31,31 @@ mkDerivation rec {
sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
};
buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
qwt qtquickcontrols qtimageformats qtxmlpatterns ];
buildInputs = [
qtbase
qtmultimedia
qtquickcontrols
qtimageformats
qtxmlpatterns
v4l-utils
libv4l
pcre
ffmpeg
guvcview
qwt
];
nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja
gettext libgphoto2 gphoto2 libxml2 libv4l ];
nativeBuildInputs = [
pkgconfig
cmake
extra-cmake-modules
ninja
gettext
libgphoto2
gphoto2
libxml2
libv4l
];
patchPhase = ''
substituteInPlace CMakeLists.txt \
@ -36,6 +76,7 @@ mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ maintainers.leenaars ];
broken = stdenv.isAarch64;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
};
}

View File

@ -1,6 +1,28 @@
{ config, stdenv, fetchurl, intltool, pkgconfig
, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }:
{ config
, stdenv
, fetchurl
, intltool
, pkgconfig
, portaudio
, SDL2
, ffmpeg
, udev
, libusb1
, libv4l
, alsaLib
, gsl
, libpng
, sfml
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio ? null
, useQt ? false
, qtbase ? null
, wrapQtAppsHook ? null
# can be turned off if used as a library
, useGtk ? true
, gtk3 ? null
, wrapGAppsHook ? null
}:
assert pulseaudioSupport -> libpulseaudio != null;
@ -13,19 +35,38 @@ stdenv.mkDerivation rec {
sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m";
};
buildInputs =
[ SDL2
alsaLib
ffmpeg
gtk3
intltool
libusb1
libv4l
pkgconfig
portaudio
udev
gsl
] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
nativeBuildInputs = [
intltool
pkgconfig
]
++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ]
++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ]
;
buildInputs = [
SDL2
alsaLib
ffmpeg
libusb1
libv4l
portaudio
udev
gsl
libpng
sfml
]
++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ]
++ stdenv.lib.optionals (useGtk) [ gtk3 ]
++ stdenv.lib.optionals (useQt) [
qtbase
]
;
configureFlags = [
"--enable-sfml"
]
++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ]
++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ]
;
meta = with stdenv.lib; {
description = "A simple interface for devices supported by the linux UVC driver";

View File

@ -19819,7 +19819,7 @@ in
gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
guvcview = callPackage ../os-specific/linux/guvcview { };
guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
gxmessage = callPackage ../applications/misc/gxmessage { };
@ -21473,7 +21473,12 @@ in
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { };
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion {
guvcview = guvcview.override {
useQt = true;
useGtk = false;
};
};
qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };