[mythtv/el7: 13/13] Merge branch 'master' into el7
by Richard Shaw
commit d10964425d909a5aa3b2fe88b2ede210aa58320c
Merge: 9519ac4 b853d3b
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 12:19:26 2018 -0600
Merge branch 'master' into el7
.gitignore | 1 +
ChangeLog | 861 +-
mythtv-0.28-fixes.patch | 180 -
mythtv-fixes.patch | 22788 ++++++++++++++++++++++++++
mythtv-mariadb.patch | 12 +
mythtv-qmake.patch | 115 +
mythtv.spec | 120 +-
sources | 2 +-
ticket13049-bswap-guard.diff | 13 -
ticket13049-remove-ffmpeg-bswap-change.diff | 26 -
update_fixes.sh | 13 +
11 files changed, 23812 insertions(+), 319 deletions(-)
---
6 years, 10 months
[mythtv/el7] (13 commits) ...Merge branch 'master' into el7
by Richard Shaw
Summary of changes:
0faba59... Update to lates fixes/0.28, v0.28.1-38-geef6a48. (*)
23c9589... Add patch to deal with API regression in MariaDB 10.2.X. (*)
a05a739... Update to latest fixes/0/28, v0.28.1-41-g2c4c711b1f. (*)
7f35a71... Update build requirements due to change in ttvdb.py. (*)
cf63d20... Update to latest fixes/0/28, v0.28.1-45-g73cf7474ad. (*)
bba2c35... Bump release. (*)
58b3fce... Update to new release, 29.0. (*)
770f835... Update to v29.0-57-gd743ef49a8. (*)
affb8a3... Mass rebuild for x264 and x265 (*)
cbe3ef5... Update to v29.0-71-g339b08e467 from branch fixes/29 (*)
ce80210... Updates for EPEL 7. Disable mythnetvision temporarily and p (*)
b853d3b... Add patch for configure problems with QT 5.10.x (*)
d109644... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
6 years, 10 months
[mythtv] Add patch for configure problems with QT 5.10.x
by Richard Shaw
commit b853d3b8ca3610c5be2e65d74a05dbce76713d34
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 12:19:11 2018 -0600
Add patch for configure problems with QT 5.10.x
mythtv-qmake.patch | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 115 insertions(+)
---
diff --git a/mythtv-qmake.patch b/mythtv-qmake.patch
new file mode 100644
index 0000000..d0740e6
--- /dev/null
+++ b/mythtv-qmake.patch
@@ -0,0 +1,115 @@
+diff --git a/mythplugins/configure b/mythplugins/configure
+index 9ba22c8956..3b6cc3f914 100755
+--- a/mythplugins/configure
++++ b/mythplugins/configure
+@@ -527,14 +527,6 @@ EOF
+ die "Sanity test failed."
+ fi
+
+-is_qmake5(){
+- $1 --version 2>&1 | egrep -q -e "Qt version 5\.[0-9]\.[0-9]"
+-}
+-
+-is_qmake4(){
+- $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
+-}
+-
+ # bring in mythtv config
+ if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
+ rm mythconfig.mak 2> /dev/null
+@@ -570,30 +562,40 @@ OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
+ EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
+ EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
+
++version2string(){
++ # accepts version as in 1.10.4 and turns it into 0001.0010.0004.0000.0000 which can be compared as a string
++ echo $1 | awk -F. '{ printf("%04d.%04d.%04d.%04d.%04d", $1, $2, $3, $4, $5); };'
++}
++
++# Minimum supported Qt version
++qt_minimum_version="5.2"
++
+ # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+ if [ x"$qmake" = "xqmake" ]; then
+- CHECK_QMAKE="qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake $qmake qmake-qt4"
++ CHECK_QMAKE=`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which -a $qmake 2>/dev/null`"
+ else
+- CHECK_QMAKE="$qmake qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake qmake-qt4"
++ CHECK_QMAKE=`which -a $qmake 2>/dev/null`" "`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
+ fi
+ # try to find a qt5 qmake to use
+ found_qmake=''
+ for i in $CHECK_QMAKE; do
+- if is_qmake5 $i; then
+- found_qmake=$i
+- break;
+- elif is_qmake4 $i; then
+- found_qmake=$i
+- break;
++ if test -e $i ; then
++ qmake_version=`$i --version | sed -n "s/.*Qt version \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p"`
++ if ! [ $(version2string $qmake_version) \< $(version2string $qt_minimum_version) ]; then
++ found_qmake=$i
++ break;
++ else
++ echo "found qmake at $i but version failed"
++ echo "got version: " `$i --version`
++ fi
+ fi
+ done
+ if [ x"$found_qmake" = "x" ]; then
+- die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
++ die "qmake for Qt version $qt_minimum_version or newer not found. Please specify the correct qmake with --qmake="
+ else
+ qmake=$found_qmake
+ fi
+
+-
+ # rely on what was discover during MythTV configure
+ if enabled opengl && test "$OPENGLV" != "CONFIG_OPENGL_VIDEO=yes"; then
+ disable opengl
+diff --git a/mythtv/configure b/mythtv/configure
+index 8b7ba2ed6f..32fbe2bf60 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -6099,21 +6099,26 @@ enable_weak_pic() {
+
+ enabled pic && enable_weak_pic
+
+-is_qmake5(){
+- $1 --version 2>&1 | egrep -q -e "Qt version 5\.[2-9]\.[0-9]"
++version2string(){
++ # accepts version as in 1.10.4 and turns it into 0001.0010.0004.0000.0000 which can be compared as a string
++ echo $1 | awk -F. '{ printf("%04d.%04d.%04d.%04d.%04d", $1, $2, $3, $4, $5); };'
+ }
+
++# Minimum supported Qt version
++qt_minimum_version="5.2"
++
+ # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+ if [ x"$qmake" = "xqmake" ]; then
+- CHECK_QMAKE=`which qmake-qt5 2>&1`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which $qmake 2>&1`"
++ CHECK_QMAKE=`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which -a $qmake 2>/dev/null`"
+ else
+- CHECK_QMAKE=`which $qmake 2>&1`" "`which qmake-qt5 2>&1`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
++ CHECK_QMAKE=`which -a $qmake 2>/dev/null`" "`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
+ fi
+ # try to find a qt5 qmake to use
+ found_qmake=''
+ for i in $CHECK_QMAKE; do
+ if test -e $i ; then
+- if is_qmake5 $i; then
++ qmake_version=`$i --version | sed -n "s/.*Qt version \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p"`
++ if ! [ $(version2string $qmake_version) \< $(version2string $qt_minimum_version) ]; then
+ found_qmake=$i
+ check_cxxflags -DQT_DISABLE_DEPRECATED_BEFORE=0x050000
+ break;
+@@ -6124,7 +6129,7 @@ for i in $CHECK_QMAKE; do
+ fi
+ done
+ if [ x"$found_qmake" = "x" ]; then
+- die "qmake for Qt5.2 or newer not found.\nPlease specify the correct qmake with --qmake="
++ die "qmake for Qt version $qt_minimum_version or newer not found. Please specify the correct qmake with --qmake="
+ else
+ qmake=$found_qmake
+ fi
6 years, 10 months
[mythtv] Updates for EPEL 7. Disable mythnetvision temporarily and python package requirements for ttvdb.py a
by Richard Shaw
commit ce80210ccddc7a2de0b8c20d84172f0ee10c543b
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 12:18:16 2018 -0600
Updates for EPEL 7.
Disable mythnetvision temporarily and python package requirements for ttvdb.py as the dependecies aren't available on EPEL.
mythtv.spec | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index a48676f..e9d4410 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -121,7 +121,12 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or
%bcond_without mythnews
%bcond_without mythweather
%bcond_without mythzoneminder
+%if 0%{?fedora}
%bcond_without mythnetvision
+%else
+%bcond_with mythnetvision
+%endif
+
################################################################################
@@ -132,6 +137,7 @@ Source0: https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name}
# Also update ChangeLog with git log v0.28..HEAD > ChangeLog
# and update define vers_string to v0.28-52-ge6a60f7 with git describe
Patch0: mythtv-fixes.patch
+Patch1: mythtv-qmake.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -164,8 +170,11 @@ BuildRequires: qt5-qtbase-devel >= 5.2
BuildRequires: qt5-qtscript-devel >= 5.2
BuildRequires: qt5-qtwebkit-devel >= 5.2
BuildRequires: freetype-devel >= 2
+%if 0%{?fedora} >= 28
+BuildRequires: mariadb-connector-c-devel
+%else
BuildRequires: mariadb-devel >= 5
-#BuildRequires: mariadb-connector-c-devel
+%endif
%if 0%{?fedora}
BuildRequires: libcec-devel >= 1.7
%endif
@@ -233,10 +242,12 @@ BuildRequires: libavc1394-devel
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
-# For ttvdb.py
+%if 0%{?fedora}
+# For ttvdb.py, not available in EPEL
BuildRequires: python2-future
BuildRequires: python2-requests
BuildRequires: python-requests-cache
+%endif
%if %{with vdpau}
BuildRequires: libvdpau-devel
@@ -502,7 +513,11 @@ Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Requires: mariadb >= 5
Requires: python-MythTV
+%if 0%{?fedora}
Recommends: libaacs
+%else
+Requires: libaacs
+%endif
%{?fedora:Requires: google-droid-sans-mono-fonts}
%{?fedora:Recommends: mesa-vdpau-drivers}
Provides: mythtv-frontend-api = %{mythfeapiver}
@@ -1309,7 +1324,6 @@ exit 0
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
-#%{_datadir}/mythtv/mythmusic/
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
6 years, 10 months
[libopenshot] Build against correct libopenshot-audio.
by Richard Shaw
commit 63a66c613cf0669da0855d274859564eff4b57a1
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 08:59:39 2018 -0600
Build against correct libopenshot-audio.
libopenshot.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 4c250ae..490aff3 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,6 +1,6 @@
Name: libopenshot
Version: 0.1.9
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Library for creating and editing videos
License: LGPLv3+
@@ -79,6 +79,9 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
%changelog
+* Sat Jan 13 2018 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.9-1.1
+- Build against correct libopenshot-audio.
+
* Sat Jan 13 2018 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.9-1
- Update to latest upstream release.
6 years, 10 months
[openshot] Update libopenshot required version.
by Richard Shaw
commit 430187e68181ddd5217123f5cf083c484015d0de
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 08:12:39 2018 -0600
Update libopenshot required version.
openshot.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/openshot.spec b/openshot.spec
index 7509138..b56ad3f 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -20,8 +20,8 @@ BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-qt5-devel
BuildRequires: python3-setuptools
-BuildRequires: libopenshot >= 0.1.8
-BuildRequires: libopenshot-audio
+BuildRequires: libopenshot >= 0.1.9
+BuildRequires: libopenshot-audio >= 0.1.5
BuildRequires: desktop-file-utils
# To fix icon
BuildRequires: ImageMagick
6 years, 10 months
[openshot] Update to latest upstream release.
by Richard Shaw
commit e32e69176f05e86c867652d8272b3be6af59d143
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 07:41:35 2018 -0600
Update to latest upstream release.
.gitignore | 1 +
openshot.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7802f2f..f16839e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-2.3.3.tar.gz
/openshot-qt-2.3.4.tar.gz
/openshot-qt-2.4.0.tar.gz
+/openshot-qt-2.4.1.tar.gz
diff --git a/openshot.spec b/openshot.spec
index a5d2db4..7509138 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -2,8 +2,8 @@
%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot}
Name: openshot
-Version: 2.4.0
-Release: 3%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -128,6 +128,9 @@ fi
%changelog
+* Sat Jan 13 2018 Richard Shaw <hobbes1069(a)gmail.com> - 2.4.1-1
+- Update to latest upstream release.
+
* Wed Oct 25 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.4.0-3
- Add recommends for Vera Sans font, fixes RFBZ#5677.
diff --git a/sources b/sources
index 30a0155..3cf6c76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02710eb7698d0cd690b6c6e579ea8e7a openshot-qt-2.4.0.tar.gz
+5d30874074aa5a37c6f9def34d8bc90d openshot-qt-2.4.1.tar.gz
6 years, 10 months
[libopenshot] Update to latest upstream release.
by Richard Shaw
commit 2e0c6eee6414c1cc6a6b85dc0741fa1098f743af
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Jan 13 06:37:44 2018 -0600
Update to latest upstream release.
.gitignore | 1 +
libopenshot.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 783f715..9253366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.1.6.tar.gz
/libopenshot-0.1.7.tar.gz
/libopenshot-0.1.8.tar.gz
+/libopenshot-0.1.9.tar.gz
diff --git a/libopenshot.spec b/libopenshot.spec
index ff2ec46..4c250ae 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,6 +1,6 @@
Name: libopenshot
-Version: 0.1.8
-Release: 3%{?dist}
+Version: 0.1.9
+Release: 1%{?dist}
Summary: Library for creating and editing videos
License: LGPLv3+
@@ -79,6 +79,9 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
%changelog
+* Sat Jan 13 2018 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.9-1
+- Update to latest upstream release.
+
* Wed Nov 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.8-3
- Adjust python for el7
diff --git a/sources b/sources
index 94769b7..8e0c5aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70930d0c973dac2ab5468175224f142b libopenshot-0.1.8.tar.gz
+74012e7260c91c3413b45401c46bfcc0 libopenshot-0.1.9.tar.gz
6 years, 10 months
[nvidia-kmod/el7] Update to 384.111 release
by Leigh Scott
commit 489ed6c7129e277dd825a6970163646c2a36dadb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jan 13 11:48:05 2018 +0000
Update to 384.111 release
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 49b786f..80fc7c8 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 2
-Version: 384.98
+Version: 384.111
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -71,6 +71,9 @@ done
%changelog
+* Sat Jan 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.111-1
+- Update to 384.111 release
+
* Tue Nov 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.98-1
- Update to 384.98 release
6 years, 10 months
[buildsys-build-rpmfusion/el7] Rebuilt for multilibs
by Nicolas Chauvet
commit db903038795e445a91329072c3c038401ca149d0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jan 13 12:07:28 2018 +0100
Rebuilt for multilibs
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index a62c1f4..441d2f5 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 20
-Release: 103
+Release: 104
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 13 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 11:20-104
+- Rebuilt for multilibs
+
* Sat Sep 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 11:20-103
- rebuild for kernel 3.10.0-693.el7
6 years, 10 months
