Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mythtv: 31.0 -> 32.0 #203145

Merged
merged 1 commit into from
Nov 27, 2022
Merged

mythtv: 31.0 -> 32.0 #203145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions pkgs/applications/video/mythtv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript, xlibsWrapper
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype
, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip
, withWebKit ? false
}:

mkDerivation rec {
pname = "mythtv";
version = "31.0";
version = "32.0";

src = fetchFromGitHub {
owner = "MythTV";
repo = "mythtv";
rev = "v${version}";
sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5";
sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1";
};

patches = [
# Disables OS detection used while checking if enforce_wshadow should be disabled.
./disable-os-detection.patch
# Disable sourcing /etc/os-release
./dont-source-os-release.patch

# Fix QMake variable substitution syntax - MythTV/mythtv#550
(fetchpatch {
name = "fix-qmake-var-syntax.patch";
url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch";
stripLen = 1;
hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM=";
})
];

setSourceRoot = "sourceRoot=$(echo */mythtv)";

buildInputs = [
freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
freetype qtbase qtscript lame zlib xlibsWrapper libGLU libGL
perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
];
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip
] ++ lib.optional withWebKit qtwebkit;
nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ];

configureFlags =
Expand Down
31 changes: 0 additions & 31 deletions pkgs/applications/video/mythtv/disable-os-detection.patch
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions pkgs/applications/video/mythtv/dont-source-os-release.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/configure
+++ b/configure
@@ -5894,9 +5894,9 @@ else
die "ERROR: cannot find soundtouch 1.8.0 or later."
fi

-if [ $target_os = "linux" ] ; then
- . /etc/os-release
-fi
+# if [ $target_os = "linux" ] ; then
+# . /etc/os-release
+# fi
Comment on lines +10 to +12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should just be removed instead of commented out


# libudfread
if enabled system_libudfread ; then
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30973,7 +30973,7 @@ with pkgs;

mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };

mythtv = libsForQt514.callPackage ../applications/video/mythtv { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv { };

micro = callPackage ../applications/editors/micro { };

Expand Down