git.iko.soy/typeable/nixpkgs
on master help sign in
mythtv: 29.1 -> 30.0 (#71002)
commit2896f00181b6dd11c3075bfc5706f02beec1e9e3 authorLouis Tim Larsen <louisdk1@users.noreply.github.com> dateSat 12 Oct 2019, 00:59 (7 years ago) parent32c47ab
4 files changed+88−16
pkgs/applications/video/mythtv/default.nix+15−15 pkgs/applications/video/mythtv/disable-os-detection.patch+51 pkgs/applications/video/mythtv/exiv2.patch+19 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/video/mythtv/default.nix+15−15
@@ -1,40 +1,40 @@
1−{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
1+{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
22, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
3−, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
4−, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
5−, linuxHeaders, fetchpatch
3+, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
4+, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
5+, libXNVCtrl, enableXnvctrl ? false
66}:
77
8−stdenv.mkDerivation rec {
8+mkDerivation rec {
99 pname = "mythtv";
10− version = "29.1";
10+ version = "30.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "MythTV";
1414 repo = "mythtv";
1515 rev = "v${version}";
16− sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
16+ sha256 = "1pfzjb07xwd3mfgmbr4kkiyfyvwy9fkl13ik7bvqds86m0ws5bw4";
1717 };
1818
1919 patches = [
2020 # Fixes build with exiv2 0.27.1.
21− (fetchpatch {
22− name = "004-exiv2.patch";
23− url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";
24− sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";
25− })
21+ ./exiv2.patch
22+ # Disables OS detection used while checking for xnvctrl support.
23+ ./disable-os-detection.patch
2624 ];
2725
2826 setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
2927
3028 buildInputs = [
3129 freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined
32− perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
30+ perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
3331 libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
34− ];
32+ ] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl;
3533 nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
3634
37− configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
35+ configureFlags =
36+ [ "--dvb-path=${linuxHeaders}/include" ]
37+ ++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ];
3838
3939 meta = with stdenv.lib; {
4040 homepage = https://www.mythtv.org/;
pkgs/applications/video/mythtv/disable-os-detection.patchnew file+51
@@ -0,0 +1,51 @@
1+--- a/configure 1970-01-01 01:00:01.000000000 +0100
2++++ b/configure 2019-10-26 11:54:01.920776490 +0200
3+@@ -6642,29 +6642,29 @@
4+ require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama
5+ require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext
6+ if enabled xnvctrl; then
7+- case $target_os in
8+- linux)
9++# case $target_os in
10++# linux)
11+ # Bah. Suse linux doesn't have xnvctrl.
12+- . /etc/os-release
13+- case $ID in
14+- *suse*)
15++# . /etc/os-release
16++# case $ID in
17++# *suse*)
18+ # This is hopefully temporary.
19+- disable xnvctrl_external
20+- ;;
21+- *)
22+- require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
23+- ;;
24+- esac
25+- ;;
26+- freebsd)
27++# disable xnvctrl_external
28++# ;;
29++# *)
30++ require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
31++# ;;
32++# esac
33++# ;;
34++# freebsd)
35+ # This is hopefully temporary, and will eventually
36+ # check for a system library too.
37+- disable xnvctrl_external
38+- ;;
39+- *)
40+- disable xnvctrl
41+- ;;
42+- esac
43++# disable xnvctrl_external
44++# ;;
45++# *)
46++# disable xnvctrl
47++# ;;
48++# esac
49+ fi
50+ fi
51+
pkgs/applications/video/mythtv/exiv2.patchnew file+19
@@ -0,0 +1,19 @@
1+Patch source: https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946
2+--- a/libs/libmythmetadata/imagemetadata.cpp
3++++ b/libs/libmythmetadata/imagemetadata.cpp
4+@@ -7,14 +7,7 @@
5+ #include "exitcodes.h" // for ffprobe
6+
7+ // libexiv2 for Exif metadata
8+-//#include <exiv2/exiv2.hpp>
9+-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
10+-// file. Using image.hpp instead seems to work.
11+-#ifdef _MSC_VER
12+-#include <exiv2/src/image.hpp>
13+-#else
14+-#include <exiv2/image.hpp>
15+-#endif
16++#include <exiv2/exiv2.hpp>
17+
18+ // To read FFMPEG Metadata
19+ extern "C" {
pkgs/top-level/all-packages.nix+3−1
@@ -20025,7 +20025,9 @@ in
2002520025
2002620026 mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
2002720027
20028− mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
20028+ mythtv = libsForQt5.callPackage ../applications/video/mythtv {
20029+ libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
20030+ };
2002920031
2003020032 micro = callPackage ../applications/editors/micro { };
2003120033