Merge #306016: gst_all_1.*: follow-up for 1.22.9 -> 1.24.2 bump
...into staging-next
This commit is contained in:
commit
6cbdbb6230
|
@ -60,6 +60,6 @@ in stdenv.mkDerivation rec {
|
|||
# under the 3-clause BSD license. The rest is 2-clause BSD license.
|
||||
license = with licenses; [ bsd3 bsd2 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
, flite
|
||||
, gsm
|
||||
, json-glib
|
||||
, libajantv2
|
||||
, libaom
|
||||
, libdc1394
|
||||
, libde265
|
||||
|
@ -152,7 +153,7 @@ stdenv.mkDerivation rec {
|
|||
liblc3
|
||||
libass
|
||||
libkate
|
||||
webrtc-audio-processing_1 # required by isac
|
||||
webrtc-audio-processing_1
|
||||
libbs2b
|
||||
libmodplug
|
||||
openjpeg
|
||||
|
@ -220,6 +221,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
chromaprint
|
||||
flite
|
||||
libajantv2
|
||||
libdrm
|
||||
libgudev
|
||||
sbc
|
||||
|
@ -263,7 +265,7 @@ stdenv.mkDerivation rec {
|
|||
"-Damfcodec=disabled" # Windows-only
|
||||
"-Davtp=disabled"
|
||||
"-Ddirectshow=disabled" # Windows-only
|
||||
"-Dqt6d3d11=disabled"
|
||||
"-Dqt6d3d11=disabled" # Windows-only
|
||||
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
|
||||
"-Dzbar=${if enableZbar then "enabled" else "disabled"}"
|
||||
"-Dfaac=${if faacSupport then "enabled" else "disabled"}"
|
||||
|
@ -283,7 +285,6 @@ stdenv.mkDerivation rec {
|
|||
"-Dmusepack=disabled"
|
||||
"-Dopenni2=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dopensles=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dsvtav1=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
|
||||
"-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
|
||||
"-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
|
||||
|
@ -307,8 +308,8 @@ stdenv.mkDerivation rec {
|
|||
"-Dva=disabled" # see comment on `libva` in `buildInputs`
|
||||
] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [
|
||||
"-Ddirectfb=disabled"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-Daja=disabled"
|
||||
"-Dchromaprint=disabled"
|
||||
"-Dflite=disabled"
|
||||
"-Dkms=disabled" # renders to libdrm output
|
||||
|
@ -317,6 +318,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dspandsp=disabled"
|
||||
"-Ddvb=disabled"
|
||||
"-Dfbdev=disabled"
|
||||
"-Duvcgadget=disabled" # requires gudev
|
||||
"-Duvch264=disabled" # requires gudev
|
||||
"-Dv4l2codecs=disabled" # requires gudev
|
||||
"-Dladspa=disabled" # requires lrdf
|
||||
|
@ -324,7 +326,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dqsv=disabled" # Linux (and Windows) x86 only
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
"-Dgl=disabled"
|
||||
] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
|
||||
] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [
|
||||
"-Dgtk3=disabled" # Wayland-based GTK sink
|
||||
"-Dwayland=disabled"
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
|
|
|
@ -7,7 +7,7 @@ index 11718b8..d4144c1 100644
|
|||
|
||||
module = g_module_open (filename, G_MODULE_BIND_LAZY);
|
||||
+
|
||||
+ if (module == NULL) {
|
||||
+ if (module == nullptr) {
|
||||
+ module = g_module_open ("@driverLink@/lib/" CUDA_LIBNAME, G_MODULE_BIND_LAZY);
|
||||
+ }
|
||||
+
|
||||
|
|
|
@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optional (!enableAlsa) "-Dalsa=disabled"
|
||||
++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"-Ddrm=disabled"
|
||||
"-Dlibvisual=disabled"
|
||||
];
|
||||
|
||||
|
|
|
@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
|
|||
bzip2
|
||||
libdv
|
||||
libvpx
|
||||
libdrm
|
||||
speex
|
||||
opencore-amr
|
||||
flac
|
||||
|
@ -148,6 +147,7 @@ stdenv.mkDerivation rec {
|
|||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libdrm
|
||||
libGL
|
||||
libv4l
|
||||
libpulseaudio
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
, x264
|
||||
, libintl
|
||||
, lib
|
||||
, opencore-amr
|
||||
, IOKit
|
||||
, CoreFoundation
|
||||
, DiskArbitration
|
||||
|
@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
|
|||
gst-plugins-base
|
||||
orc
|
||||
libintl
|
||||
opencore-amr
|
||||
] ++ lib.optionals enableGplPlugins [
|
||||
a52dec
|
||||
libcdio
|
||||
|
|
|
@ -28,6 +28,21 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/lib/pkgconfig"
|
||||
cat >"$out/lib/pkgconfig/libajantv2.pc" <<EOF
|
||||
prefix=$out
|
||||
libdir=\''${prefix}/lib
|
||||
includedir=\''${prefix}/include/ajalibraries
|
||||
|
||||
Name: libajantv2
|
||||
Description: Library for controlling AJA NTV2 video devices
|
||||
Version: ${version}
|
||||
Libs: -L\''${libdir} -lajantv2
|
||||
Cflags: -I\''${includedir} -I\''${includedir}/ajantv2/includes
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
|
||||
homepage = "https://github.com/aja-video/ntv2";
|
||||
|
|
|
@ -27,11 +27,14 @@ stdenv.mkDerivation {
|
|||
ninja
|
||||
];
|
||||
|
||||
# LTO does not work on Darwin: https://github.com/NixOS/nixpkgs/issues/19098
|
||||
mesonFlags = lib.optionals stdenv.isDarwin [ "-Db_lto=false" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec";
|
||||
homepage = "https://github.com/google/liblc3";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jansol ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wheezy.template";
|
||||
version = "3.1.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4RAHysczaNzhKZjjS2bEdgFrtGFHH/weTVboQALslg8=";
|
||||
hash = "sha256-hknPXHGPPNjRAr0TYVosPaTntsjwQjOKZBCU+qFlIHw=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "wheezy.template" ];
|
||||
|
|
Loading…
Reference in New Issue
Block a user