2:47 p.m.
commit d2372371b055100c4f248736b3f69df986891056
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Tue Jun 21 09:47:47 2016 -0500
Upgrade to 0.28 release.
.gitignore | 1 +
ChangeLog | 347 ++-
mythdb-optimize.service | 5 +-
mythtv-0.26.0-types_h.patch | 22 -
mythtv-0.27-fixes.patch | 102 -
mythtv-0.27-libcec2.patch | 6961 -------------------------------------------
mythtv.spec | 131 +-
sources | 2 +-
8 files changed, 369 insertions(+), 7202 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04e8c59..c4ae02e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mythtv-0.27.5.tar.gz
+/mythtv-0.28.tar.gz
diff --git a/ChangeLog b/ChangeLog
index 014ec8e..a29de4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,65 +1,334 @@
-commit 332aa34b1dda5dbfe7db548aa8c12818aa8f78de
-Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Fri Feb 12 23:17:31 2016 +0100
+commit 812ec085711266220817426443fd899faac16363
+Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com>
+Date: Wed Jun 8 20:17:13 2016 +0100
- Add special case for specials / season 0 to Perl bindings
-
- Based on patch by Michael <mythtv(a)blandford.net>
- Refs #11919
- Fixes #12649
+ Fixes #12764 - compilation of abs function with latest gcc/libstdc++
- (cherry picked from commit 4517c1284c273f779b6e378dcd2df219645a9f09)
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org>
+ (cherry picked from commit e4f6e011b6748d1ba3ee5d09c1ffe2a382f2fe8b)
-commit a8a37608e02f0434727166439552a3f058078238
-Author: Walter Cheuk <wwycheuk(a)gmail.com>
-Date: Mon Feb 8 21:39:33 2016 -0500
+commit 22d3a1c3d75461393a9eb867b642dc4bdffb920a
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Fri Jun 3 13:51:44 2016 +0100
- Updated Chinese (HK) locale file from Walter Cheuk
+ Revert "Refs #12784. Properly url encode channel icon search requests, part
2"
- Thank you Walter!
+ This reverts commit 23eba051c66de40375528718f8eb74ff72f625ca.
- Close #12645
+ This didn't actually do what it was meant to do.
+
+commit 23eba051c66de40375528718f8eb74ff72f625ca
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Thu Jun 2 08:52:23 2016 +0100
+
+ Refs #12784. Properly url encode channel icon search requests, part 2
- Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org>
-commit 5071dae6a5157c862ecd007950d1955c7fa790cc
+commit 28e95d81fc8a923e54b690ea93e0eea548ac5b51
Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
-Date: Mon Feb 8 23:17:51 2016 +0000
+Date: Wed May 25 23:24:58 2016 +0100
- Correctly handle title 'The X-Files'
+ Refs #12784. Properly url encode channel icon search requests
- (cherry picked from commit 17dcf2c2379692ce74c62a7f2a8028cd833aedcd)
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org>
-commit 0216edd1238d351926f2a5fb83920c60b7d2eca1
-Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
-Date: Fri Feb 5 15:01:30 2016 +0000
+commit 36280c53140007666b45219faec4e807d83e5265
+Author: Peter Bennett <pbennett(a)mythtv.org>
+Date: Thu May 26 14:35:54 2016 -0400
+
+ Prevent "VBox: Found possible VBox at Ceton InfiniTV Ethernet" and similar
messages by changing them from Info to Debug level.
+
+ (cherry picked from commit 90249b42ac2695a162024cfe962982d7017e21a0)
+
+commit 104b104fa5db7604d5e525c04d9a65d650dc6e33
+Author: Peter Bennett <pgbennett(a)comcast.net>
+Date: Sun May 8 18:55:09 2016 -0400
+
+ configure - fix so that build for raspberry pi does not need a bunch of overrides to
get openmax enabled
+
+ Fixes #12762
+
+ (cherry picked from commit 92b1f3981df7b65f3f05207e180216eccc20dfec)
+
+commit a40a63be116126034fc245f9713d1e84035f4f2d
+Author: Peter Bennett <pbennett(a)mythtv.org>
+Date: Thu May 26 13:52:29 2016 -0400
+
+ Fix CEC bugs and add raspberry pi support for CEC
+
+ Fixes #12746
+
+ (cherry picked from commit c5e27122bd5cd1b1c673e38cc78af0e9d8e63521)
+
+commit 282f0e08a65bbd39a381317b477c3ee033085f05
+Author: Peter Bennett <pgbennett(a)comcast.net>
+Date: Thu Mar 24 19:45:13 2016 -0400
+
+ Change OpenMAX Normal profile to allow 4 CPUs for decoding, to allow for fallback to
ffmpeg.
+
+ Fixes #12697
+
+ (cherry picked from commit 77359a03b9109b32e5b684e6a8e95e740f97c7c5)
+
+commit 2008b9756a17e80008e28606c4dde253e10754f5
+Author: Peter Bennett <pbennett(a)mythtv.org>
+Date: Wed May 25 12:59:35 2016 -0400
+
+ Fix intermittent pixelation caused by timeout waiting for input buffers
+
+ Fixes #12730
+
+ (cherry picked from commit 1691a428f43b8a22e78873518e1271cba4d7bb9d)
+
+commit f58b100dedc4335cca399e8ae78e3129211c206c
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sun May 15 11:52:41 2016 +0200
+
+ fix automatic detection of systemd on Arch
+
+ Patch by Gary Buhrmaster
+
+ Fixes #12704
+
+ (cherry picked from commit d120ae8f995b2a0852f1c2261308572560a2040a)
+
+commit 194e0bc1ee2ce019cca11de981420a49ee8e1cd0
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sun May 15 11:49:44 2016 +0200
- Fixes #12639 Fix check for python3
+ use 4 space indenting
- (cherry picked from commit daef5cd6d0e1c0af7062170cc3f9f51fb053fcfc)
+ (cherry picked from commit 34013d351c9b4da451e54cafc3f0fcbd1a7368a2)
-commit f4eddfa3000649ede1398c61d00cd4a4644a759b
+commit 2fbd9638aa878bc3c0f3bcf80330ff5049fb8a21
Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Fri Feb 5 14:23:36 2016 +0100
+Date: Fri May 13 21:48:33 2016 +0200
- Add "Law & Order: UK" to the exceptions
+ fix libcec include path detection issue
- Refs #12633
+ Fixes #12769
- (cherry picked from commit 4651f99e8edb177359aadec6d6b74733276697ce)
+ (cherry picked from commit c11433676b6cf3dd0dee55b87d5b0d3eb26cbdd3)
-commit 1a93f3dfc464bae9f6e07696c38d327839c245ef
+commit 370dd71fa4a6affb09f989c6000c9dea7097bb15
Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Fri Feb 5 14:07:27 2016 +0100
+Date: Wed May 11 15:51:12 2016 +0200
+
+ fix parsing of version numbers in theme updater
+
+ the separator between the parts of the version number is a literal
+ period (\\.), not any character (.)
+
+ Refs #12763
+
+ (cherry picked from commit f4a8cf1673dcbaa649e3879b8716d3942474f2dd)
+
+commit 6386f31c93103dc9e5093cc5a7aae876bce0a7f2
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Sun May 8 13:58:31 2016 +0100
+
+ VBOX: don't ignore channels using T2/S2 if the tuner can handle them
+
+ Refs #12759.
+
+ (cherry picked from commit 0bfcd20950f093fbcd2647021d9c53aa421a5d7f)
+
+commit c9d119a657a07064990ab18176368aa5bf9b0a43
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Sun May 8 13:47:53 2016 +0100
+
+ VBOX: bump the minimum firmware version to 2.50
+
+ Refs #12759.
+
+ (cherry picked from commit bb5daa92807096c4f6fef8b6e55a296c7e9b8bc7)
+
+commit 0b08cb422fc0a85faaa846689e5ca3cd68e88696
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Thu May 5 09:52:25 2016 +0100
+
+ Move failure to connect to dbus screensaver services down to debug
+
+ (cherry picked from commit ad7be506fd4726f88a93b73ed79371767126b536)
+
+commit db9eea65dcd82cec9235a61c3a67b803961c0f86
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Tue May 3 13:20:08 2016 +0100
+
+ Gallery: Reset theme widgets correctly
+
+ Some theme widgets aren't being reset correctly leading to theme issues (Steppes
& Blue Abstract)
+
+ (cherry picked from commit ed7473fd79d4abd333415daea103fa809aefe5dc)
+
+commit fa0789d56d3f3fa9955a268f849ad989a0166423
+Author: Bill Meek <bmeek(a)mythtv.org>
+Date: Sun May 1 10:10:59 2016 -0500
- special case for Law & Order in UK Fixups
+ Coverity: Fixes CID 1358509, solution from Roger Siddons
- based on a patch by lomion
+ (cherry picked from commit 11a7be62c7f7afe73e5c45a07dedbfb0334ee9d1)
+
+commit 4f6f75df4d4290cb82aae9ae01c3426db4d4f74b
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Mon Apr 11 12:27:42 2016 +0100
+
+ Revert 20b621e5733 MediaMon: UI to select preferred media handler
- Fixes #12633
+ The pop-ups don't cater for multiple media, nor respect the autoplay settings
- (cherry picked from commit df43327e55367d8d50413a4ac8a3b3e66ef2a493)
+ Fixes #12689
+
+ (cherry picked from commit 24c5575980e5342e50d1354b7c11e6272463e93f)
+
+commit e4b5e87426afde209ac46cbca27f4113fdf140ce
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Wed Feb 3 13:45:27 2016 +0000
+
+ Gallery: Add slideshow jump forward/back
+
+ Up/Down jumps forward/back 10 slides in slideshow view
+
+ (cherry picked from commit c41c6e715e481111fa05ff771bd4f5d8bfe1514d)
+
+commit cedb1be5548e87df80c2642f81b6ba17f8dd5d16
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Wed Feb 3 11:13:12 2016 +0000
+
+ Gallery: Add status delay
+
+ When images are slow to load the "Loading" status can be irritating.
+ This patch adds a user setting to delay the "Loading" &
"Playing" status.
+
+ (cherry picked from commit 75a698e0bf4027c1d2cb9816ee85a4d3e7da4e9b)
+
+commit 9508acdf01ac86a4dadbc21ae074152fbc325807
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Wed Feb 3 13:58:11 2016 +0000
+
+ Gallery: Add keybinding to set covers
+
+ Keybinding Images:"COVER" (default 'C') will set the parent dir
cover of the selected image.
+ Or clear the the cover when the parent dir is selected.
+
+ (cherry picked from commit 4e70774d4ad5abf158ce3060b0adc26a9008aabf)
+
+commit 42a76f551f69b942ba10a8c83a13ab62ae35e7d1
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Wed Feb 3 11:24:55 2016 +0000
+
+ Gallery: Change crumb separator
+
+ Feedback suggests "Dir1 > Dir2 > Image" is preferable to "Dir1 :
Dir2 : Image"
+
+ (cherry picked from commit 336193d0f824bfd692958741d69204ebe96d6edc)
+
+commit 6693f33b23acbc60c52c35e37887ac044e1565de
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Wed Feb 3 11:24:17 2016 +0000
+
+ Gallery: Add European caption date formats
+
+ (cherry picked from commit e7b50cdb55b552e925c08fe4aca37698f6d55cfa)
+
+commit 2ead1a6c9ebc7c39d868c6baeb5f209cd937c087
+Author: Roger Siddons <rsiddons(a)mythtv.org>
+Date: Fri Apr 29 12:56:05 2016 +0100
+
+ Python: Restore chanId/startTime API for recordings
+
+ Exisiting python scripts depend on the Recorded class taking the chanid/starttime
instead of the recordedid as the primary key.
+ This patch updates the Recorded class to continue using the chanid/starttime pair.
+ A future patch can add recordedid as a second option so as not to break backwards
compatibility.
+
+ Fixes: #12260
+ (cherry picked from commit ce1935b0ebc0918391f05893be82cd275cbd3969)
+
+commit 57c1afbf7c498ac3b09d782ce3f3b76382b64fd7
+Author: Mitch Capper <mitch.capper(a)gmail.com>
+Date: Sun Apr 10 20:30:25 2016 -0700
+
+ Added dvr services call for setting and getting bookmark position
+
+ changed version
+
+ (cherry picked from commit c4831026eb157c3ede860a12e7c86fd0bd14b9ee)
+
+commit 1bec90bcf03e9dfd60514c95e1e3872d4ee643bf
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Wed Apr 27 22:46:46 2016 +0200
+
+ MythNews: Fix the menu handling when no sites have been added
+
+ (cherry picked from commit 14b636ee60ad14f574dda2c971ce920d97942289)
+
+commit 6956ff00feb1e8a1ce137ccbbf6d32354714018b
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Apr 24 09:08:22 2016 +0100
+
+ Fix backend status page
+
+ (cherry picked from commit f11f32c642ca35610565c25322862b7373ff4c06)
+
+commit f3632b4c16f2e25184c3c6871807e5ddfb83e5ee
+Merge: c9dd335 eeac182
+Author: Nicolas Riendeau <nriendeau(a)mythtv.org>
+Date: Sun Apr 24 20:35:17 2016 -0400
+
+ Merge branch 'fixes/0.28' of code.mythtv.org:mythtv into fixes/0.28
+
+commit c9dd335513b3369381bdcab40f5a1ea50e56883e
+Author: Petr Srsen <srsen75(a)seznam.cz>
+Date: Sun Apr 24 20:33:33 2016 -0400
+
+ Updated Czech MythFrontend translation
+ from Petr Srsen
+
+ Thank you Petr!
+
+ Closes #12726
+
+commit eeac18224b60a52cc9045e92d3f50d140b337955
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Fri Apr 22 15:09:53 2016 +0100
+
+ Update some urls for email list signup
+
+ (cherry picked from commit 5fb019c69e40d368b94ec104af584038702fee71)
+
+commit b4e03c8d87c18f499f573ec7af5ee5b59ef653f6
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Sun Apr 17 11:47:59 2016 +0100
+
+ mythzmserver: prevent a segfault if we fail to find a monitors shared memory
+
+ (cherry picked from commit d78749316250400b376640d8a3536558ab7b0212)
+
+commit 91de44c42d02068682074e76eb569391e8b6d87f
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sat Apr 16 23:34:29 2016 +0200
+
+ Rewrite of the EIT Fixup for Sky Germany
+
+ Patch by lomion
+
+ Fixes #12702
+
+ (cherry picked from commit 6569cff98d77e315414780ed71f8ad5d11fc6e00)
+
+commit 15cf421af9d86bffc3b34aa1d9e45adaa5065a29
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Wed Apr 13 00:25:53 2016 +0200
+
+ fix typo in german translation
+
+ (cherry picked from commit 00af0f533d1d076c526863c1b0d9731179e11c9b)
+
+commit 4260de4eef72583c261caa66352187e1bdfa6cf4
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Apr 12 15:59:44 2016 +0100
+
+ EIT: Refs #12548. Add several more multiplexes
- Conflicts:
- mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp
- mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.h
+ (cherry picked from commit 6865940761d0b6058720ce1d02b5fa684a6c159e)
diff --git a/mythdb-optimize.service b/mythdb-optimize.service
index ffd04f3..1c2da80 100644
--- a/mythdb-optimize.service
+++ b/mythdb-optimize.service
@@ -26,8 +26,7 @@ Environment=MYTHCONFDIR=/etc/mythtv
# systemd changes execution from the calling user (possibly root) to this user
# if you have permissions problems or obscure errors try logging in as mythtv
User=mythtv
-ExecStart=/bin/optimizie_mythdb
-
+ExecStart=/bin/optimize_mythdb
[Install]
-WantedBy=multi-user.target
+WantedBy=basic.target
diff --git a/mythtv.spec b/mythtv.spec
index 831a904..c16667c 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -61,8 +61,8 @@
%define desktop_vendor RPMFusion
# MythTV Version string -- preferably the output from git describe
-%define vers_string v0.27.6-6-g332aa34
-%define branch fixes/0.27
+%define vers_string v28.0-35-g812ec08
+%define branch fixes/0.28
# Git revision and branch ID
%define _gitrev g5b917e8
@@ -78,7 +78,7 @@ Summary: A digital video recorder (DVR) application
URL: http://www.mythtv.org/
# Version/Release info
-Version: 0.27.6
+Version: 0.28
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
%else
@@ -100,14 +100,12 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and
(GPLv2+ or
# Set "--with debug" to enable MythTV debug compile mode
%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
-
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
%define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1}
-
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
%define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1}
-
+%define with_sdnotify %{?_without_sdnotify: 0} %{?!_without_sdnotify: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
%define with_php %{?_without_php: 0} %{!?_without_php: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
@@ -130,16 +128,11 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and
(GPLv2+ or
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.26
Source0:
https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v...
# From the mythtv git repository with the appropriate branch checked out:
-# git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch
-Patch0: mythtv-0.27-fixes.patch
-Patch1: mythtv-0.26.0-types_h.patch
-# http://code.mythtv.org/trac/ticket/11338
-# Offset required for 0.27, patch was for 0.26.1
-Patch2: mythtv-0.27-libcec2.patch
+# Example: git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch
+Patch0: mythtv-0.28-fixes.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -173,20 +166,17 @@ Requires(preun): initscripts
Requires(postun): initscripts
%endif
+BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
+BuildRequires: qt5-qtbase-devel >= 5.2
+BuildRequires: qt5-qtscript-devel >= 5.2
+BuildRequires: qt5-qtwebkit-devel >= 5.2
BuildRequires: freetype-devel >= 2
-BuildRequires: libpng-devel
-BuildRequires: gcc-c++
BuildRequires: mariadb-devel >= 5
-BuildRequires: qt-webkit-devel
-BuildRequires: qt-devel >= 4.6
-BuildRequires: phonon-devel phonon-backend-gstreamer
-BuildRequires: libuuid-devel
%if 0%{?fedora}
-BuildRequires: libcec-devel
+BuildRequires: libcec-devel >= 1.7
%endif
BuildRequires: libvpx-devel
-
BuildRequires: lm_sensors-devel
BuildRequires: lirc-devel
BuildRequires: nasm, yasm-devel
@@ -196,6 +186,8 @@ BuildRequires: libXmu-devel
BuildRequires: libXv-devel
BuildRequires: libXvMC-devel
BuildRequires: libXxf86vm-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
BuildRequires: mesa-libGLU-devel
%ifarch %arm
BuildRequires: mesa-libGLES-devel
@@ -215,18 +207,15 @@ BuildRequires: faac-devel
%endif
BuildRequires: fftw-devel >= 3
BuildRequires: flac-devel >= 1.0.4
-BuildRequires: gsm-devel
BuildRequires: lame-devel
-BuildRequires: libdca-devel
BuildRequires: libcdio-devel libcdio-paranoia-devel
-# nb: libdvdcss will be dynamically loaded if installed
-#BuildRequires: libfame-devel >= 0.9.0
BuildRequires: libogg-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel >= 1.0
-BuildRequires: taglib-devel >= 1.6
+BuildRequires: taglib-devel >= 1.7
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
+BuildRequires: exiv2-devel
# Audio framework support
BuildRequires: sox-devel
@@ -245,7 +234,7 @@ BuildRequires: libxml2-devel
BuildRequires: libass-devel
# Need dvb headers to build in dvb support
-BuildRequires: kernel-headers
+BuildRequires: kernel-headers
# FireWire cable box support
BuildRequires: libavc1394-devel
@@ -253,15 +242,19 @@ BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
%if %{with_vdpau}
-BuildRequires: libvdpau-devel
+BuildRequires: libvdpau-devel
%endif
%if %{with_vaapi}
-BuildRequires: libva-devel
+BuildRequires: libva-devel
%endif
%if %{with_crystalhd}
-BuildRequires: libcrystalhd-devel
+BuildRequires: libcrystalhd-devel
+%endif
+
+%if %{with_sdnotify}
+BuildRequires: systemd-devel
%endif
# API Build Requirements
@@ -287,8 +280,8 @@ BuildRequires: perl(IO::Socket::INET6)
%endif
%if %{with_python}
-BuildRequires: python-devel
-BuildRequires: MySQL-python
+BuildRequires: python2-devel
+BuildRequires: python2-mysql
BuildRequires: python-urlgrabber
%endif
@@ -403,8 +396,7 @@ Summary: Library providing mythtv support
Requires: freetype >= 2
Requires: lame
-Requires: qt4 >= 4.6
-Requires: qt4-MySQL
+Requires: qt5-qtbase-mysql
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 22
Requires: udisks2
%else
@@ -424,12 +416,10 @@ Summary: Development files for mythtv
Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
-%if 0%{?fedora} >= 19
Requires: mariadb-devel >= 5
-%else
-Requires: mysql-devel >= 5
-%endif
-Requires: qt4-devel >= 4.6
+Requires: qt5-qtbase-devel >= 5.2
+Requires: qt5-qtscript-devel >= 5.2
+Requires: qt5-qtwebkit-devel >= 5.2
Requires: lm_sensors-devel
Requires: lirc-devel
@@ -461,7 +451,6 @@ Requires: libtheora-devel
Requires: libvorbis-devel >= 1.0
Requires: mjpegtools-devel >= 1.6.1
Requires: taglib-devel >= 1.5
-#Requires: transcode >= 0.6.8
Requires: x264-devel
Requires: xvidcore-devel >= 0.9.1
@@ -670,7 +659,6 @@ Requires: mjpegtools >= 1.6.2
Requires: mkisofs >= 2.01
Requires: python >= 2.3.5
Requires: python-imaging
-#Requires: transcode >= 1.0.2
Requires: pmount
%description -n mytharchive
@@ -795,25 +783,16 @@ on demand content.
%prep
%setup -q -n %{name}-%{version}
-# Replace static lib paths with %%{_lib} so we build properly on x86_64
-# systems, where the libs are actually in lib64.
- if [ "%{_lib}" != "lib" ]; then
- find \( -name 'configure' -o -name '*pro' -o -name
'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
- fi
-
# Remove compiled python file
-find -name *.pyc -exec rm -f {} \;
+#find -name *.pyc -exec rm -f {} \;
%patch0 -p1
-%patch1 -p1 -b .types_h
-%patch2 -p1 -b .libcec2
# Install ChangeLog
install -m 0644 %{SOURCE11} .
pushd mythtv
-
# Set the mythtv --version string
cat > EXPORTED_VERSION <<EOF
SOURCE_VERSION=%{vers_string}
@@ -839,11 +818,6 @@ EOF
# Make sure we use -O2 and not -O3
sed -i '/speed_cflags=/d' configure
-# Prevent all of those nasty installs to ../../../../../bin/whatever
-# echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro
-# echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
-# chmod 644 settings.pro
-
popd
@@ -859,29 +833,28 @@ pushd mythtv
# {_exec_prefix} etc... MythTV no longer accepts the parameters that the
# configure macro passes, so we do this manually.
./configure \
+ --qmake=%{_bindir}/qmake-qt5 \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--libdir-name=%{_lib} \
--mandir=%{_mandir} \
- --x11-path=%{_includedir} \
- --disable-mythlogserver \
+%if ! %{with_vdpau}
+ --disable-vdpau \
+%endif
+%if ! %{with_crystalhd}
+ --disable-crystalhd \
+%endif
+%if ! %{with_vaapi}
+ --disable-vaapi \
+%endif
--enable-libmp3lame \
+%if %{with_faac}
+ --enable-libfaac \
+%endif
--enable-libtheora --enable-libvorbis \
--enable-libx264 \
--enable-libxvid \
-%if %{with_faac}
- --enable-libfaac --enable-nonfree \
-%endif
--enable-libvpx \
-%if %{with_vdpau}
- --enable-vdpau \
-%endif
-%if %{with_vaapi}
- --enable-vaapi \
-%endif
-%if !%{with_crystalhd}
- --disable-crystalhd \
-%endif
%if !%{with_perl}
--without-bindings=perl \
%endif
@@ -935,7 +908,7 @@ pushd mythplugins
echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >>
settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
- echo "INCLUDEPATH += %{_includedir}" >> settings.pro
+ #echo "INCLUDEPATH += %{_includedir}" >> settings.pro
echo "LIBS *= -L$temp%{_libdir}" >> settings.pro
echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro
@@ -1212,6 +1185,7 @@ fi
%files backend
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
+%{_bindir}/mythfilerecorder
%{_bindir}/mythjobqueue
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
@@ -1366,7 +1340,7 @@ fi
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
-%{_datadir}/mythtv/mythmusic/
+#%{_datadir}/mythtv/mythmusic/
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
@@ -1420,8 +1394,17 @@ fi
%changelog
-* Fri Mar 11 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 0.27.6-3
-- Bump for rebuild
+* Mon Jun 13 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.28-3
+- Update to lastest fixes/0.28 from git.
+
+* Mon May 23 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.28-2
+- Update to lastest fixes/0.28 from git.
+
+* Tue Apr 12 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.28-1
+- Update to latst upstream release.
+
+* Mon Apr 4 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.6-3
+- Update to latst upstream release.
* Fri Feb 19 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.6-2
- Update to latst upstream release.
diff --git a/sources b/sources
index 7e62e05..ad47402 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-345e5e1c1a653e6fc40db670d7a7e2b7 mythtv-0.27.5.tar.gz
+3e565a1badcd9365905c0d0344da76b5 mythtv-0.28.tar.gz