Merge pull request #98846 from ttuegel/libvlc

Build standalone libvlc
This commit is contained in:
Thomas Tuegel 2020-09-26 08:23:08 -05:00 committed by GitHub
commit 6882716623
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 32 additions and 27 deletions

View file

@ -16,7 +16,7 @@
, withDevices ? true, udisks2
, withDynamic ? true
, withHttpServer ? true
, withLibVlc ? false, vlc
, withLibVlc ? false, libvlc
, withStreams ? true
}:
@ -71,7 +71,7 @@ in mkDerivation {
++ lib.optional withMtp libmtp
++ lib.optional withMusicbrainz libmusicbrainz5
++ lib.optional withUdisks udisks2
++ lib.optional withLibVlc vlc;
++ lib.optional withLibVlc libvlc;
nativeBuildInputs = [ cmake pkgconfig qttools ];

View file

@ -30,7 +30,7 @@
, withGstreamer ? true
, gst_all_1 ? null
, withVlc ? true
, vlc ? null
, libvlc ? null
}:
mkDerivation rec {
@ -75,7 +75,7 @@ mkDerivation rec {
gst-plugins-good
gst-plugins-ugly
])
++ lib.optional withVlc vlc;
++ lib.optional withVlc libvlc;
nativeBuildInputs = [ cmake ninja pkgconfig qttools ];

View file

@ -14,13 +14,13 @@
, kinit
, kirigami2
, baloo
, vlc
, libvlc
}:
mkDerivation rec {
name = "elisa";
buildInputs = [ vlc ];
buildInputs = [ libvlc ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper
, enablePlayer ? true, vlc ? null, qt5, lib }:
, enablePlayer ? true, libvlc ? null, qt5, lib }:
stdenv.mkDerivation rec {
pname = "tribler";
@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
postPatch = ''
${stdenv.lib.optionalString enablePlayer ''
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')"
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'"
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
''}
'';
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
--run 'cd $_TRIBLERPATH' \
--add-flags "-O $out/run_tribler.py" \
${stdenv.lib.optionalString enablePlayer ''
--prefix LD_LIBRARY_PATH : ${vlc}/lib
--prefix LD_LIBRARY_PATH : ${libvlc}/lib
''}
mkdir -p $out/share/applications $out/share/icons $out/share/man/man1

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libhdhomerun, vlc, gcc, gnumake, pkg-config, gtk2 }:
{ stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }:
stdenv.mkDerivation rec {
pname = "hdhomerun-config-gui";

View file

@ -20,7 +20,7 @@
, xorg
, makeWrapper
, pkgconfig
, vlc
, libvlc
, mbedtls
, scriptingSupport ? true
@ -65,7 +65,7 @@ in mkDerivation rec {
qtsvg
speex
x264
vlc
libvlc
makeWrapper
mbedtls
]
@ -84,7 +84,7 @@ in mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/obs \
--prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib"
--prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib"
'';
postFixup = stdenv.lib.optionalString stdenv.isLinux ''

View file

@ -99,6 +99,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.videolan.org/vlc/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
broken = versionAtLeast qtbase.version "5.15";
broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc
, extra-cmake-modules, qttools, qtbase, qtx11extras
, debug ? false
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [
phonon
vlc
libvlc
qtbase
qtx11extras
];

View file

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, setuptools
, vlc
, libvlc
, substituteAll
}:
@ -22,7 +22,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./vlc-paths.patch;
libvlcPath="${vlc}/lib/libvlc.so.5";
libvlcPath="${libvlc}/lib/libvlc.so.5";
})
];

View file

@ -1,4 +1,4 @@
{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc
{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib
, fetchFromGitHub
@ -29,7 +29,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK
buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ];
configurePhase = ''

View file

@ -2637,9 +2637,7 @@ in
davix = callPackage ../tools/networking/davix { };
cantata = libsForQt5.callPackage ../applications/audio/cantata {
inherit vlc;
};
cantata = libsForQt5.callPackage ../applications/audio/cantata { };
can-utils = callPackage ../os-specific/linux/can-utils { };
@ -15147,8 +15145,6 @@ in
telepathy = callPackage ../development/libraries/telepathy/qt { };
vlc = callPackage ../applications/video/vlc {};
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
};
@ -23932,10 +23928,19 @@ in
vkeybd = callPackage ../applications/audio/vkeybd {};
vlc = libsForQt514.vlc;
vlc = libsForQt514.callPackage ../applications/video/vlc {};
vlc_qt5 = vlc;
libvlc = vlc.override {
withQt5 = false;
qtbase = null;
qtsvg = null;
qtx11extras = null;
wrapQtAppsHook = null;
onlyLibVLC = true;
};
vmpk = callPackage ../applications/audio/vmpk { };
vocproc = callPackage ../applications/audio/vocproc { };