diff options
author | Louis Tim Larsen <louis@louis.dk> | 2020-07-30 00:14:13 +0200 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2020-07-30 13:00:09 +0200 |
commit | 6eadc11005318fc4eef7da19898cff51689fb723 (patch) | |
tree | e23b9d63d6bfcced579bc3a69fba533dff0fe708 /pkgs | |
parent | dea0d7e517d0f45844b27f145c2c57ba8b1d9f35 (diff) |
mythtv: 30.0 -> 31.0
PR #93486
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/mythtv/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/video/mythtv/disable-os-detection.patch | 80 | ||||
-rw-r--r-- | pkgs/applications/video/mythtv/exiv2.patch | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 37 insertions, 82 deletions
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 2f1d3a3a1c91..db8d192b7587 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -2,24 +2,21 @@ , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype , perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders -, libXNVCtrl, enableXnvctrl ? false }: mkDerivation rec { pname = "mythtv"; - version = "30.0"; + version = "31.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "1pfzjb07xwd3mfgmbr4kkiyfyvwy9fkl13ik7bvqds86m0ws5bw4"; + sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5"; }; patches = [ - # Fixes build with exiv2 0.27.1. - ./exiv2.patch - # Disables OS detection used while checking for xnvctrl support. + # Disables OS detection used while checking if enforce_wshadow should be disabled. ./disable-os-detection.patch ]; @@ -29,17 +26,16 @@ mkDerivation rec { freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 - ] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl; + ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; configureFlags = - [ "--dvb-path=${linuxHeaders}/include" ] - ++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ]; + [ "--dvb-path=${linuxHeaders}/include" ]; meta = with stdenv.lib; { homepage = "https://www.mythtv.org/"; description = "Open Source DVR"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch index 5a35dc2d1ddf..09ce6f6ca4f8 100644 --- a/pkgs/applications/video/mythtv/disable-os-detection.patch +++ b/pkgs/applications/video/mythtv/disable-os-detection.patch @@ -1,51 +1,31 @@ ---- a/configure 1970-01-01 01:00:01.000000000 +0100 -+++ b/configure 2019-10-26 11:54:01.920776490 +0200 -@@ -6642,29 +6642,29 @@ - require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama - require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext - if enabled xnvctrl; then -- case $target_os in -- linux) -+# case $target_os in -+# linux) - # Bah. Suse linux doesn't have xnvctrl. -- . /etc/os-release -- case $ID in -- *suse*) -+# . /etc/os-release -+# case $ID in -+# *suse*) - # This is hopefully temporary. -- disable xnvctrl_external -- ;; -- *) -- require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl -- ;; -- esac -- ;; -- freebsd) -+# disable xnvctrl_external -+# ;; -+# *) -+ require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl -+# ;; -+# esac -+# ;; -+# freebsd) - # This is hopefully temporary, and will eventually - # check for a system library too. -- disable xnvctrl_external -- ;; -- *) -- disable xnvctrl -- ;; -- esac -+# disable xnvctrl_external -+# ;; -+# *) -+# disable xnvctrl -+# ;; -+# esac - fi - fi +--- a/configure 2020-07-21 20:50:58.653989766 +0200 ++++ b/configure 2020-07-21 20:52:21.236610586 +0200 +@@ -6537,17 +6537,17 @@ + } + enable enforce_wshadow +-case $target_os in +- android) +- disable enforce_wshadow +- ;; +- linux) +- . /etc/os-release +- if test $ID = "centos"; then +- disable enforce_wshadow +- fi +- ;; +-esac ++#case $target_os in ++# android) ++# disable enforce_wshadow ++# ;; ++# linux) ++# . /etc/os-release ++# if test $ID = "centos"; then ++# disable enforce_wshadow ++# fi ++# ;; ++#esac + + if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then + enable qtwebkit diff --git a/pkgs/applications/video/mythtv/exiv2.patch b/pkgs/applications/video/mythtv/exiv2.patch deleted file mode 100644 index 29bf1f5967bb..000000000000 --- a/pkgs/applications/video/mythtv/exiv2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch source: https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946 ---- a/libs/libmythmetadata/imagemetadata.cpp -+++ b/libs/libmythmetadata/imagemetadata.cpp -@@ -7,14 +7,7 @@ - #include "exitcodes.h" // for ffprobe - - // libexiv2 for Exif metadata --//#include <exiv2/exiv2.hpp> --// Note: Older versions of Exiv2 don't have the exiv2.hpp include --// file. Using image.hpp instead seems to work. --#ifdef _MSC_VER --#include <exiv2/src/image.hpp> --#else --#include <exiv2/image.hpp> --#endif -+#include <exiv2/exiv2.hpp> - - // To read FFMPEG Metadata - extern "C" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8344ae403194..556e6f8424ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21663,9 +21663,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; |