[mythtv/el7: 7/7] Merge branch 'master' into el7
by Nicolas Chauvet
commit 25203d6763970e029295db660b6f2d4bfbdaa1f3
Merge: bbd315f de1a2d5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 10:35:55 2018 +0100
Merge branch 'master' into el7
mythtv.spec | 77 ++++++++++++++++++++++++++++++---------------------------
update_fixes.sh | 6 +++--
2 files changed, 45 insertions(+), 38 deletions(-)
---
6 years, 3 months
[mythtv/el7: 6/7] Revert "Minor bump to rebuild."
by Nicolas Chauvet
commit bbd315f487060a21b63a19671e9a03116887bb43
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 10:35:01 2018 +0100
Revert "Minor bump to rebuild."
This reverts commit 6da9f0b0d54dfb740f598caa8b92e9e48bfe6b04.
mythtv.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 28e0f69..c194380 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -78,7 +78,7 @@
#
Name: mythtv
Version: 29.0
-Release: 9%{?rel_string}%{?dist}.1
+Release: 9%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1380,9 +1380,6 @@ exit 0
%changelog
-* Wed Jan 31 2018 Richard Shaw <hobbes1069(a)gmail.com> - 29.0-9.20180111.77.g771115f47d.1
-- rebuilt
-
* Sat Jan 20 2018 Sérgio Basto <sergio(a)serjux.com> - 29.0-9.20180111.77.g771115f47d
- fix rfbz #4684, Use mariadb-connector-c-devel instead of mysql-devel or
mariadb-devel
6 years, 3 months
[mythtv/el7] (7 commits) ...Merge branch 'master' into el7
by Nicolas Chauvet
Summary of changes:
b283f4e... fixes on update_fixes.sh and mythtv.spec cleanup (*)
86257c1... Rebuild for new libcdio and libvpx (*)
f8e4612... Remove , from Requires (*)
f286d7e... Fix conditionals for python-requests and python-requests-ca (*)
de1a2d5... Various fixed and clean-up (*)
bbd315f... Revert "Minor bump to rebuild."
25203d6... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[mythtv] Various fixed and clean-up
by Nicolas Chauvet
commit de1a2d59b8feb8935836e560fa102ef119f99138
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 10:25:16 2018 +0100
Various fixed and clean-up
mythtv.spec | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 24bb182..04a33c2 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -56,9 +56,6 @@
# A list of which applications we want to put into the desktop menu system
%define desktop_applications mythfrontend mythtv-setup
-# The vendor name we should attribute the aforementioned entries to
-%define desktop_vendor RPMFusion
-
# MythTV Version string -- preferably the output from git describe
%define vers_string v29.0-77-g771115f47d
%define rel_string .20180111.77.g771115f47d
@@ -75,7 +72,7 @@
#
Name: mythtv
Version: 29.0
-Release: 10%{?rel_string}%{?dist}
+Release: 11%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -116,7 +113,7 @@ Source0: https://github.com/MythTV/%{name}/archive/%{githash}/%{name}-%{v
%bcond_without mythnews
%bcond_without mythweather
%bcond_without mythzoneminder
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
%bcond_without mythnetvision
%else
%bcond_with mythnetvision
@@ -163,12 +160,12 @@ 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} > 24
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mariadb-devel >= 5
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libcec-devel >= 1.7
%endif
BuildRequires: libvpx-devel
@@ -237,11 +234,13 @@ BuildRequires: libavc1394-devel
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
-%if 0%{?fedora}
-# For ttvdb.py, not available in EPEL
BuildRequires: python2-future
+%if 0%{?fedora} || 0%{?rhel} > 7
+# For ttvdb.py, not available in EPEL
BuildRequires: python2-requests
BuildRequires: python-requests-cache
+%else
+BuildRequires: python-requests
%endif
%if %{with vdpau}
@@ -284,10 +283,10 @@ BuildRequires: perl(IO::Socket::INET6)
%if %{with python}
BuildRequires: python2-devel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: python2-mysql
%else
-BuildRequires: MySQL-python
+BuildRequires: MySQL-python
%endif
BuildRequires: python-urlgrabber
%endif
@@ -420,7 +419,7 @@ Summary: Development files for mythtv
Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
-%if 0%{?fedora} > 24
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mariadb-devel >= 5
@@ -514,7 +513,7 @@ Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Requires: mysql >= 5
Requires: python-MythTV
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Recommends: libaacs
%else
Requires: libaacs
@@ -540,9 +539,11 @@ Requires: lame
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-setup
Requires: python2-future
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Requires: python2-requests
Requires: python-requests-cache
+%else
+Requires: python-requests
%endif
Requires(pre): shadow-utils
@@ -579,9 +580,11 @@ mythtv backend.
Summary: Common components needed by multiple other MythTV components
# For ttvdb.py
Requires: python2-future
-%if 0%{?fedora}
-Requires: python2-requests
-Requires: python-requests-cache
+%if 0%{?fedora} || 0%{?rhel} > 7
+Requires: python2-requests
+Requires: python-requests-cache
+%else
+Requires: python-requests
%endif
%description common
@@ -893,14 +896,9 @@ pushd mythtv
%if !%{with python}
--without-bindings=python \
%endif
-%ifarch ppc
- --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \
- --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \
-%else
--extra-cflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
--extra-cxxflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
-%endif
- --extra-ldflags="%{optflags}" \
+ --extra-ldflags="%{__global_ldflags}" \
%ifarch %{ix86}
--cpu=i686 --tune=i686 --enable-mmx \
%endif
@@ -938,7 +936,6 @@ 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 "LIBS *= -L$temp%{_libdir}" >> settings.pro
echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro
@@ -994,8 +991,7 @@ pushd mythplugins
--disable-mythnetvision \
%endif
--enable-opengl \
- --enable-fftw \
-# --enable-sdl
+ --enable-fftw
make %{?_smp_mflags}
@@ -1045,9 +1041,8 @@ pushd mythtv
mkdir -p %{buildroot}%{_datadir}/applications
for file in %{desktop_applications}; do
install -p $file.png %{buildroot}%{_datadir}/pixmaps/$file.png
- desktop-file-install --vendor %{desktop_vendor} \
+ desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora-Extra \
--add-category Application \
--add-category AudioVideo \
$file.desktop
@@ -1382,6 +1377,11 @@ exit 0
%changelog
+* Fri Feb 02 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29.0-11.20180111.77.g771115f47d
+- Clean-up conditionals
+- Remove vendor entry for desktop files
+- Remove ppc conditional for cflags and use corrects ldflags
+
* Sat Jan 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 29.0-10.20180111.77.g771115f47d
- Rebuild for new libcdio and libvpx
6 years, 3 months
[mythtv] Fix conditionals for python-requests and python-requests-cache as they are not available (or of a hi
by Nicolas Chauvet
commit f286d7e0e8bac89ea23f3256bbf595d49bdfee87
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Jan 31 15:27:01 2018 -0600
Fix conditionals for python-requests and python-requests-cache as they are not available (or of a high enough version) in EPEL.
mythtv.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/mythtv.spec b/mythtv.spec
index ea77d2f..24bb182 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -540,8 +540,10 @@ Requires: lame
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-setup
Requires: python2-future
+%if 0%{?fedora}
Requires: python2-requests
Requires: python-requests-cache
+%endif
Requires(pre): shadow-utils
Conflicts: xmltv-grabbers < 0.5.37
@@ -577,8 +579,10 @@ mythtv backend.
Summary: Common components needed by multiple other MythTV components
# For ttvdb.py
Requires: python2-future
+%if 0%{?fedora}
Requires: python2-requests
Requires: python-requests-cache
+%endif
%description common
MythTV provides a unified graphical interface for recording and viewing
6 years, 3 months
[vidcutter/f26] (5 commits) ...Add OpenGL_fix.patch fixes (rfbz#4777).
by Martin Gansser
Summary of changes:
a74df3d... Add OpenGL_fix.patch (*)
ba93b80... Add OpenGL_fix.patch (*)
04421be... Add OpenGL_fix.patch (*)
af6aa31... Add OpenGL_fix.patch (*)
5f6d506... Add OpenGL_fix.patch fixes (rfbz#4777). (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[vidcutter/f27] (5 commits) ...Add OpenGL_fix.patch fixes (rfbz#4777).
by Martin Gansser
Summary of changes:
a74df3d... Add OpenGL_fix.patch (*)
ba93b80... Add OpenGL_fix.patch (*)
04421be... Add OpenGL_fix.patch (*)
af6aa31... Add OpenGL_fix.patch (*)
5f6d506... Add OpenGL_fix.patch fixes (rfbz#4777). (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[vidcutter] Add OpenGL_fix.patch fixes (rfbz#4777).
by Martin Gansser
commit 5f6d506f4ffb89bb4dafdb0914c464ea4d2aa449
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Thu Feb 1 21:23:28 2018 +0100
Add OpenGL_fix.patch fixes (rfbz#4777).
vidcutter.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/vidcutter.spec b/vidcutter.spec
index 39e1e30..503fe47 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -2,7 +2,7 @@
Name: vidcutter
Version: 5.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The simplest + fastest video cutter & joiner
License: GPLv3+
Url: http://vidcutter.ozmartians.com
@@ -14,11 +14,13 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: mpv-libs-devel
BuildRequires: desktop-file-utils
+
Requires: python3-qt5
Requires: ffmpeg
Requires: python3-pyopengl
Requires: mediainfo
Requires: hicolor-icon-theme
+Requires: mpv-libs
%description
The simplest & sexiest tool for cutting and joining your videos without the
@@ -76,8 +78,11 @@ fi
%{_datadir}/pixmaps/%{name}.svg
%changelog
-* Wed Jan 31 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-2
-- Add OpenGL_fix.patch
+* Thu Feb 01 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-3
+- Add OpenGL_fix.patch fixes (rfbz#4777).
+
+* Mon Jan 29 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-2
+- Add RR mpv-libs
* Sun Dec 03 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-1
- Update to 5.0.5
6 years, 3 months
[vidcutter] Add OpenGL_fix.patch
by Martin Gansser
commit af6aa31b14c9c72924ed2e1364efb809e908a124
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Thu Feb 1 12:53:16 2018 +0100
Add OpenGL_fix.patch
vidcutter.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/vidcutter.spec b/vidcutter.spec
index 24bad9d..39e1e30 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -76,7 +76,6 @@ fi
%{_datadir}/pixmaps/%{name}.svg
%changelog
-<<<<<<< HEAD
* Wed Jan 31 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-2
- Add OpenGL_fix.patch
6 years, 3 months
[vidcutter] Add OpenGL_fix.patch
by Martin Gansser
commit 04421be8d2f62166cd3a28237b4582918302c2c5
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Thu Feb 1 12:50:10 2018 +0100
Add OpenGL_fix.patch
vidcutter.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/vidcutter.spec b/vidcutter.spec
index 39e1e30..24bad9d 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -76,6 +76,7 @@ fi
%{_datadir}/pixmaps/%{name}.svg
%changelog
+<<<<<<< HEAD
* Wed Jan 31 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-2
- Add OpenGL_fix.patch
6 years, 3 months