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 #197930

Closed
wants to merge 2 commits into from
Closed

MythTV: 31.0 -> 32.0 #197930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0df309a
bumped mythtv version to 32.0
zero-one01 Oct 11, 2022
79cbb2d
Adds mythtv fix-qmake-var-syntax patch
acarrico Oct 19, 2022
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
8 changes: 4 additions & 4 deletions pkgs/applications/video/mythtv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{ lib, mkDerivation, fetchFromGitHub, 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
}:

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

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

patches = [
Expand All @@ -25,7 +25,7 @@ mkDerivation rec {
buildInputs = [
freetype qtbase qtwebkit 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
];
nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ];

Expand Down
42 changes: 13 additions & 29 deletions pkgs/applications/video/mythtv/disable-os-detection.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
--- a/configure 2020-07-21 20:50:58.653989766 +0200
+++ b/configure 2020-07-21 20:52:21.236610586 +0200
@@ -6537,17 +6537,17 @@
}
--- a/configure
+++ b/configure
@@ -5894,9 +5894,9 @@ else
die "ERROR: cannot find soundtouch 1.8.0 or later."
fi

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 [ $target_os = "linux" ] ; then
- . /etc/os-release
-fi
+# if [ $target_os = "linux" ] ; then
+# . /etc/os-release
+# fi

if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
enable qtwebkit
# libudfread
if enabled system_libudfread ; then
12 changes: 12 additions & 0 deletions pkgs/applications/video/mythtv/fix-qmake-var-syntax.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Naur b/configure c/configure
--- b/configure 2022-04-22 14:39:29.998895626 -0400
+++ c/configure 2022-04-22 14:38:36.688266601 -0400
@@ -6296,7 +6296,7 @@

# add some linker flags
check_ldflags -Wl,--warn-common
-check_ldflags '-Wl,-rpath-link,\${SRC_PATH_BARE}/external/FFmpeg/libpostproc:\${SRC_PATH_BARE}/external/FFmpeg/libswresample:\${SRC_PATH_BARE}/external/FFmpeg/libswscale:\${SRC_PATH_BARE}/external/FFmpeg/libavfilter:\${SRC_PATH_BARE}/external/FFmpeg/libavdevice:\${SRC_PATH_BARE}/external/FFmpeg/libavformat:\${SRC_PATH_BARE}/external/FFmpeg/libavcodec:\${SRC_PATH_BARE}/external/FFmpeg/libavutil:\${SRC_PATH_BARE}/external/FFmpeg/libavresample'
+check_ldflags '-Wl,-rpath-link,\$\${SRC_PATH_BARE}/external/FFmpeg/libpostproc:\$\${SRC_PATH_BARE}/external/FFmpeg/libswresample:\$\${SRC_PATH_BARE}/external/FFmpeg/libswscale:\$\${SRC_PATH_BARE}/external/FFmpeg/libavfilter:\$\${SRC_PATH_BARE}/external/FFmpeg/libavdevice:\$\${SRC_PATH_BARE}/external/FFmpeg/libavformat:\$\${SRC_PATH_BARE}/external/FFmpeg/libavcodec:\$\${SRC_PATH_BARE}/external/FFmpeg/libavutil:\$\${SRC_PATH_BARE}/external/FFmpeg/libavresample'
enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
enabled rpath && add_ldlibflags -Wl,-rpath,$libdir
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic