From 4cc2cdfb83ca11b652be912110e3d872468745ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:33:18 -0500 Subject: [PATCH 01/12] libvlc: init at 3.0.11.1 --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1d6353b04f..068ddee1f883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23930,6 +23930,15 @@ in 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 { }; From 9eb4c70c74e6cc22bf59a1157eb23e4e9d7bfb84 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:34:24 -0500 Subject: [PATCH 02/12] vlc: do not build with every Qt version It is no longer necessary to build vlc with every Qt version now that we have a Qt-less libvlc. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 068ddee1f883..4d1bd25da338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = callPackage ../applications/video/vlc {}; - qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; }; @@ -23926,7 +23924,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.vlc; + vlc = libsForQt514.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; From fff4504bc9b4d4a9e487b56c8f73b77eb98ae519 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:35:52 -0500 Subject: [PATCH 03/12] phonon-backend-vlc: use libvlc --- pkgs/development/libraries/phonon/backends/vlc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index d152afd45340..d54ee6e56304 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -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 ]; From c3d08d652df1b5adc71f91a56065a709b089974e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:36:03 -0500 Subject: [PATCH 04/12] elisa: use libvlc --- pkgs/applications/kde/elisa.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index a2bfa88f8127..bd2cd529473e 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -14,13 +14,13 @@ , kinit , kirigami2 , baloo -, vlc +, libvlc }: mkDerivation rec { name = "elisa"; - buildInputs = [ vlc ]; + buildInputs = [ libvlc ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From d752cc4d7165acb9f3ae536baeb9d701d60d9c59 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:37:12 -0500 Subject: [PATCH 05/12] python-vlc: use libvlc --- pkgs/development/python-modules/python-vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index a66b4cc522f5..6f83f587f588 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -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"; }) ]; From e1b7af630fb864311f8e21d517179780b3bb0ccb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:38:03 -0500 Subject: [PATCH 06/12] cantata: use libvlc --- pkgs/applications/audio/cantata/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 95b7dd18425b..df19ac942288 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1bd25da338..2fc82e4c12be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2634,9 +2634,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 { }; From ebe4cc8870c460c1fc7f34c7a74d1fb308278c0a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:49:40 -0500 Subject: [PATCH 07/12] megaglest: use libvlc --- pkgs/games/megaglest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index d5129818cb23..c34ca5dee957 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -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 = '' From 270d8a04099018055c669fa87b8e1292e924ed68 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:50:44 -0500 Subject: [PATCH 08/12] obs-studio: use libvlc --- pkgs/applications/video/obs-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 8a2cd1728227..5fe10b39a79b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -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 '' From b5a5ed37359d067f3277811e021707888976854c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:51:04 -0500 Subject: [PATCH 09/12] hdhomerun-config-gui: remove unused argument: vlc --- pkgs/applications/video/hdhomerun-config-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index a147de52da82..91feb178ca05 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -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"; From b3ab15a05793515f3b50205204c74082b98254df Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:53:28 -0500 Subject: [PATCH 10/12] strawberry: use libvlc --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index f278b68b9223..d6428e40312b 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -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 ]; From c70831a9fb5f686e36c40664da03b5e10f7e7167 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:53:34 -0500 Subject: [PATCH 11/12] tribler: use libvlc --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index ed1129b238ac..5cab23ecd710 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -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 From 06697c7e29b98e8d65565182fb9b112d0e2ed044 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 26 Sep 2020 06:32:35 -0500 Subject: [PATCH 12/12] vlc: fix meta.broken --- pkgs/applications/video/vlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 365eb8cd991d..965a5ff32530 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -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; }; }