Louis Tim Larsen
Robert Helgesson
parent
dea0d7e517
commit
6eadc11005
@ -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 ];
|
||||
};
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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" {
|
||||
@ -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 { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user