rpms/xine-ui/F-20 sources,1.2,1.3 xine-ui.spec,1.2,1.3
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/xine-ui/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv353
Modified Files:
sources xine-ui.spec
Log Message:
0.99.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-ui/F-20/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 17 Oct 2013 18:51:45 -0000 1.2
+++ sources 13 Mar 2014 17:39:39 -0000 1.3
@@ -27,5 +27,5 @@
841924c042ca70700a9d201bc7686e59 mp2k.tar.gz
3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz
7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz
-2af6fcc2ad6af6ba2e471497c5d140dc xine-ui-0.99.7.tar.xz
+8dc079baeab56c99e33268a973bc288e xine-ui-0.99.8.tar.xz
9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz
Index: xine-ui.spec
===================================================================
RCS file: /cvs/free/rpms/xine-ui/F-20/xine-ui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xine-ui.spec 23 Oct 2013 20:58:43 -0000 1.2
+++ xine-ui.spec 13 Mar 2014 17:39:39 -0000 1.3
@@ -5,8 +5,8 @@
Summary: A skinned xlib-based gui for xine-lib
Name: xine-ui
-Version: 0.99.7
-Release: 9%{?dist}
+Version: 0.99.8
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.xine-project.org/
@@ -19,16 +19,16 @@
# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
-# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
-BuildRequires: autoconf
-BuildRequires: automake
+# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
+BuildRequires: autoconf
+BuildRequires: automake
# Patch to use UTF-8 documentation, BZ #512598
Patch1: xine-ui-0.99.5-utf8doc.patch
#o Sources for -skins. Ugh.
-Source1: http://xine-project.org/skins/Antares.tar.gz
+Source1: http://xine-project.org/skins/Antares.tar.gz
Source2: http://xine-project.org/skins/Bambino-Black.tar.gz
Source3: http://xine-project.org/skins/Bambino-Blue.tar.gz
Source4: http://xine-project.org/skins/Bambino-Green.tar.gz
@@ -59,7 +59,7 @@
Source29: http://xine-project.org/skins/Sunset.tar.gz
Source30: http://xine-project.org/skins/xinium.tar.gz
-Source31: default.ogv
+Source31: default.ogv
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Package was named xine in rpmfusion
@@ -83,7 +83,7 @@
BuildRequires: readline-devel
BuildRequires: xine-lib-devel >= 1.1.0
BuildRequires: xorg-x11-proto-devel
-BuildRequires: libjpeg-turbo-devel
+BuildRequires: libjpeg-turbo-devel
# Lirc-devel is not available on EPEL-5
%if 0%{?rhel} == 0
@@ -115,10 +115,10 @@
This package contains extra skins for xine-ui.
%package aaxine
-Summary: ASCII art player for terminals
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: xine-lib-extras
+Summary: ASCII art player for terminals
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: xine-lib-extras
%description aaxine
This package contains the ASCII art player for terminals like the vt100
@@ -263,6 +263,10 @@
%{_bindir}/aaxine
%changelog
+* Wed Mar 12 2014 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.8-1
+- Update to 0.99.8.
+- Remove spurious tabs in specfile.
+
* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.7-9
- Rebuild for xine-lib 1.2.
10 years, 8 months
rpms/avidemux/F-19 avidemux.spec, 1.82, 1.83 sources, 1.14, 1.15 avidemux-2.5.6-ffmpeg_parallel_build.patch, 1.3, NONE avidemux-2.6.4-gtk_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32637
Modified Files:
avidemux.spec sources
Removed Files:
avidemux-2.5.6-ffmpeg_parallel_build.patch
avidemux-2.6.4-gtk_fix.patch
Log Message:
* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
- Update to latest upstream release.
- Obsolete unneeded devel subpackage.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-19/avidemux.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- avidemux.spec 30 Jun 2013 11:45:59 -0000 1.82
+++ avidemux.spec 13 Mar 2014 17:34:39 -0000 1.83
@@ -1,8 +1,8 @@
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.6.4
-Release: 5%{?dist}
+Version: 2.6.7
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -11,11 +11,9 @@
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
-#Patch0: avidemux-2.5.6-ffmpeg_parallel_build.patch
-Patch1: avidemux-2.6-bundled_libs.patch
-Patch2: avidemux3-libass.patch
-Patch3: avidemux3-bundled_libs.patch
-Patch4: avidemux-2.6.4-gtk_fix.patch
+Patch0: avidemux-2.6-bundled_libs.patch
+Patch1: avidemux3-libass.patch
+Patch2: avidemux3-bundled_libs.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -68,7 +66,8 @@
BuildRequires: ffmpeg-devel
# Main package is a metapackage, bring in something useful.
-Requires: avidemux-gui = %{version}-%{release}
+Requires: %{name}-gui = %{version}-%{release}
+Requires: %{name}-help = %{version}-%{release}
%description
@@ -92,6 +91,7 @@
Summary: Libraries for %{name}
Group: System Environment/Libraries
#Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: avidemux-devel < 2.6.4-9
%description libs
This package contains the runtime libraries for %{name}.
@@ -103,7 +103,6 @@
BuildRequires: cairo-devel
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: %{name}-help = %{version}-%{release}
%description gtk
This package provides the GTK graphical interface for %{name}.
@@ -116,7 +115,6 @@
BuildRequires: qt4-devel >= 4.5.0-9
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: %{name}-help = %{version}-%{release}
%description qt
This package contains the Qt graphical interface for %{name}.
@@ -130,13 +128,6 @@
%description help
This package contains the help files for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
%package i18n
Summary: Translations for %{name}
@@ -150,11 +141,9 @@
%prep
%setup -q -n %{name}_%{version}
-#patch0 -p1 -b .ffmpeg_build
-%patch1 -p1 -b .bund_libs
-%patch2 -p1 -b .libass
-%patch3 -p1 -b .bund_libs2
-%patch4 -p1 -b .gtk_fix
+%patch0 -p1 -b .bund_libs
+%patch1 -p1 -b .libass
+%patch2 -p1 -b .bund_libs2
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -165,7 +154,7 @@
%build
# Build avidemux_core
-LDFLAGS="-Wl,--as-needed";export LDFLAGS
+LDFLAGS="-lc -Wl,--as-needed";export LDFLAGS
rm -rf build_core && mkdir build_core && pushd build_core
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
../avidemux_core
@@ -275,6 +264,9 @@
make -C build_plugins_qt4 install DESTDIR=%{buildroot}
make -C build_plugins_gtk install DESTDIR=%{buildroot}
+# Remove useless devel files
+rm -rf %{buildroot}%{_includedir}/%{name}
+
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -306,7 +298,6 @@
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
-
%postun gtk
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -330,13 +321,13 @@
%files
%doc AUTHORS COPYING README
-%dir %{_datadir}/avidemux6
%files libs -f build_plugins_common/install_manifest.txt
+%dir %{_datadir}/avidemux6
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_render*
-%exclude %{_datadir}/avidemux6
+%exclude %{_libdir}/libADM_UI*
# Catch the stuff missed using install_manifest.txt
%{_libdir}/ADM_plugins6/autoScripts/*.pyc
%{_libdir}/ADM_plugins6/autoScripts/*.pyo
@@ -345,10 +336,12 @@
%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
+%{_libdir}/libADM_UI_Cli*.so
%{_libdir}/libADM_render6_cli.so
%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
+%{_libdir}/libADM_UIGtk*.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
@@ -356,24 +349,35 @@
%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
+%{_libdir}/libADM_UIQT*.so
%{_libdir}/libADM_render6_qt4.so
%{_datadir}/applications/rpmfusion-avidemux-qt.desktop
%files help
%{_datadir}/avidemux6/help/
-%files devel
-%{_includedir}/avidemux/
-
%files i18n
%{_datadir}/avidemux6/i18n/
%changelog
+* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
+- Update to latest upstream release.
+- Obsolete unneeded devel subpackage.
+
+* Tue Nov 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.4-8
+- Rebuilt for x264/FFmpeg
+
+* Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.4-7
+- Rebuilt for x264
+
+* Sat Jul 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.4-6
+- Rebuilt for x264
+
* Mon Jun 24 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-5
- Can't have arch requirement on noarch package, fixes BZ#2840.
-* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-3.1
+* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-3
- Move translations to their own subpackage to make use optional, fixes BZ#2825.
* Mon Jun 3 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-19/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 27 May 2013 13:43:38 -0000 1.14
+++ sources 13 Mar 2014 17:34:40 -0000 1.15
@@ -1 +1 @@
-adb9110ab230fe13a8e9799f547f2f57 avidemux_2.6.4.tar.gz
+830a5115b7007e754cb0afe77469bfa0 avidemux_2.6.7.tar.gz
--- avidemux-2.5.6-ffmpeg_parallel_build.patch DELETED ---
--- avidemux-2.6.4-gtk_fix.patch DELETED ---
10 years, 8 months
rpms/avidemux/F-20 avidemux.spec, 1.86, 1.87 sources, 1.14, 1.15 avidemux-2.5.6-ffmpeg_parallel_build.patch, 1.3, NONE avidemux-2.6.4-gtk_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32418
Modified Files:
avidemux.spec sources
Removed Files:
avidemux-2.5.6-ffmpeg_parallel_build.patch
avidemux-2.6.4-gtk_fix.patch
Log Message:
* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
- Update to latest upstream release.
- Obsolete unneeded devel subpackage.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-20/avidemux.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- avidemux.spec 5 Nov 2013 20:09:16 -0000 1.86
+++ avidemux.spec 13 Mar 2014 17:30:39 -0000 1.87
@@ -1,8 +1,8 @@
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.6.4
-Release: 8%{?dist}
+Version: 2.6.7
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -15,7 +15,6 @@
Patch1: avidemux-2.6-bundled_libs.patch
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
-Patch4: avidemux-2.6.4-gtk_fix.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -68,7 +67,8 @@
BuildRequires: ffmpeg-devel
# Main package is a metapackage, bring in something useful.
-Requires: avidemux-gui = %{version}-%{release}
+Requires: %{name}-gui = %{version}-%{release}
+Requires: %{name}-help = %{version}-%{release}
%description
@@ -92,6 +92,7 @@
Summary: Libraries for %{name}
Group: System Environment/Libraries
#Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: avidemux-devel < 2.6.4-9
%description libs
This package contains the runtime libraries for %{name}.
@@ -103,7 +104,6 @@
BuildRequires: cairo-devel
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: %{name}-help = %{version}-%{release}
%description gtk
This package provides the GTK graphical interface for %{name}.
@@ -116,7 +116,6 @@
BuildRequires: qt4-devel >= 4.5.0-9
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: %{name}-help = %{version}-%{release}
%description qt
This package contains the Qt graphical interface for %{name}.
@@ -130,13 +129,6 @@
%description help
This package contains the help files for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
%package i18n
Summary: Translations for %{name}
@@ -154,7 +146,6 @@
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
%patch3 -p1 -b .bund_libs2
-%patch4 -p1 -b .gtk_fix
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -165,7 +156,7 @@
%build
# Build avidemux_core
-LDFLAGS="-Wl,--as-needed";export LDFLAGS
+LDFLAGS="-lc -Wl,--as-needed";export LDFLAGS
rm -rf build_core && mkdir build_core && pushd build_core
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
../avidemux_core
@@ -275,6 +266,9 @@
make -C build_plugins_qt4 install DESTDIR=%{buildroot}
make -C build_plugins_gtk install DESTDIR=%{buildroot}
+# Remove useless devel files
+rm -rf %{buildroot}%{_includedir}/%{name}
+
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -306,7 +300,6 @@
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
-
%postun gtk
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -330,13 +323,13 @@
%files
%doc AUTHORS COPYING README
-%dir %{_datadir}/avidemux6
%files libs -f build_plugins_common/install_manifest.txt
+%dir %{_datadir}/avidemux6
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_render*
-%exclude %{_datadir}/avidemux6
+%exclude %{_libdir}/libADM_UI*
# Catch the stuff missed using install_manifest.txt
%{_libdir}/ADM_plugins6/autoScripts/*.pyc
%{_libdir}/ADM_plugins6/autoScripts/*.pyo
@@ -345,10 +338,12 @@
%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
+%{_libdir}/libADM_UI_Cli*.so
%{_libdir}/libADM_render6_cli.so
%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
+%{_libdir}/libADM_UIGtk*.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
@@ -356,20 +351,22 @@
%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
+%{_libdir}/libADM_UIQT*.so
%{_libdir}/libADM_render6_qt4.so
%{_datadir}/applications/rpmfusion-avidemux-qt.desktop
%files help
%{_datadir}/avidemux6/help/
-%files devel
-%{_includedir}/avidemux/
-
%files i18n
%{_datadir}/avidemux6/i18n/
%changelog
+* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
+- Update to latest upstream release.
+- Obsolete unneeded devel subpackage.
+
* Tue Nov 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.4-8
- Rebuilt for x264/FFmpeg
@@ -382,7 +379,7 @@
* Mon Jun 24 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-5
- Can't have arch requirement on noarch package, fixes BZ#2840.
-* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-3.1
+* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-3
- Move translations to their own subpackage to make use optional, fixes BZ#2825.
* Mon Jun 3 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-20/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 26 May 2013 19:27:03 -0000 1.14
+++ sources 13 Mar 2014 17:30:39 -0000 1.15
@@ -1 +1 @@
-adb9110ab230fe13a8e9799f547f2f57 avidemux_2.6.4.tar.gz
+830a5115b7007e754cb0afe77469bfa0 avidemux_2.6.7.tar.gz
--- avidemux-2.5.6-ffmpeg_parallel_build.patch DELETED ---
--- avidemux-2.6.4-gtk_fix.patch DELETED ---
10 years, 8 months
rpms/moc/F-20 .cvsignore, 1.2, 1.3 moc.spec, 1.1, 1.2 sources, 1.2, 1.3 moc+warnings.patch, 1.1, NONE moc-r2506+fsf_addr.patch, 1.1, NONE moc-r2506:2526-samplesize.patch, 1.1, NONE
by Antonio
Author: sagitter
Update of /cvs/free/rpms/moc/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32324/F-20
Modified Files:
.cvsignore moc.spec sources
Removed Files:
moc+warnings.patch moc-r2506+fsf_addr.patch
moc-r2506:2526-samplesize.patch
Log Message:
Release update to moc-2.5.0-beta2.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Oct 2013 10:33:19 -0000 1.2
+++ .cvsignore 13 Mar 2014 17:30:02 -0000 1.3
@@ -1 +1 @@
-moc-2.5.0-beta1.tar.bz2
+moc-2.5.0-beta2.tar.bz2
Index: moc.spec
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/moc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moc.spec 19 Oct 2013 10:33:19 -0000 1.1
+++ moc.spec 13 Mar 2014 17:30:02 -0000 1.2
@@ -4,21 +4,10 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.5.0
-Release: 0.10.beta1%{?dist}
+Release: 0.1.beta2%{?dist}
License: GPLv2+ and GPLv3+
URL: http://www.moc.daper.net
-Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta1.tar.bz2
-
-## This patch corrects all outdated FSF address
-Patch0: %{name}-r2506+fsf_addr.patch
-
-## This patchset corrects "Unsupported sample size!" error
-## See http://moc.daper.net/node/862
-Patch1: %{name}-r2506:2526-samplesize.patch
-
-## This patch corrects 'sizeof' argument bug;
-## directly provided from upstream
-Patch2: %{name}+warnings.patch
+Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta2.tar.bz2
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
@@ -43,12 +32,11 @@
BuildRequires: pkgconfig(opus)
BuildRequires: libtool
BuildRequires: librcc-devel
-
-## Source code configuring tools
-BuildRequires: autoconf, automake >= 1.13
+BuildRequires: libquvi-devel, popt-devel
Requires: ffmpeg
Requires: opus
+Requires: libquvi, libquvi-scripts, popt
%description
MOC (music on console) is a console audio player for LINUX/UNIX designed to be
@@ -57,25 +45,15 @@
files in this directory beginning from the chosen file.
%prep
-%setup -q -n %{name}-%{version}-beta1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-## This renaming is requested by Automake-1.13
-mv configure.in configure.ac
+%setup -q -n %{name}-%{version}-beta2
%build
-
-## Latest patchset changes ffmpeg.m4 file
-## Autoreconf is temporarily necessary
-autoreconf -i --force
-
-%configure --disable-static --with-rcc \
+%configure --disable-static --disable-silent-rules \
+ --disable-rpath --with-rcc \
--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
--with-musepack --with-vorbis --with-flac --with-wavpack \
--with-sndfile --with-modplug --with-ffmpeg --with-speex \
- --with-samplerate --with-curl
+ --with-samplerate --with-curl --disable-debug --without-magic
make %{?_smp_mflags}
%install
@@ -97,6 +75,10 @@
%{_libdir}/%{name}/decoder_plugins
%changelog
+* Wed Feb 05 2014 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.1.beta2
+- Update to 2.5.0-beta2
+- Removed previous patches
+
* Tue Jun 18 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.10.beta1
- Added patchset to fix "Unsupported sample size!" error
See http://moc.daper.net/node/862 for more details
Index: sources
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Oct 2013 10:33:19 -0000 1.2
+++ sources 13 Mar 2014 17:30:02 -0000 1.3
@@ -1 +1 @@
-795ecba86847e082aa2f21937cc04804 moc-2.5.0-beta1.tar.bz2
+da87b90b57934234589b63e347921458 moc-2.5.0-beta2.tar.bz2
--- moc+warnings.patch DELETED ---
--- moc-r2506+fsf_addr.patch DELETED ---
--- moc-r2506:2526-samplesize.patch DELETED ---
10 years, 8 months
rpms/xine-ui/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xine-ui.spec, 1.2, 1.3
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/xine-ui/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23496
Modified Files:
.cvsignore sources xine-ui.spec
Log Message:
0.99.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-ui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Oct 2013 18:51:45 -0000 1.2
+++ .cvsignore 13 Mar 2014 14:31:24 -0000 1.3
@@ -1,31 +1 @@
-Antares.tar.gz
-Bambino-Black.tar.gz
-Bambino-Blue.tar.gz
-Bambino-Green.tar.gz
-Bambino-Orange.tar.gz
-Bambino-Pink.tar.gz
-Bambino-Purple.tar.gz
-Bambino-White.tar.gz
-Bluton.tar.gz
-CelomaChrome.tar.gz
-CelomaGold.tar.gz
-CelomaMdk.tar.gz
-Centori.tar.gz
-Crystal.tar.gz
-Galaxy.tar.gz
-Keramic.tar.gz
-KeramicRH8.tar.gz
-OMS_legacy.tar.gz
-Polaris.tar.gz
-Sunset.tar.gz
-blackslim2.tar.gz
-caramel.tar.gz
-cloudy.tar.gz
-concept.tar.gz
-gudgreen.tar.gz
-lcd.tar.gz
-mp2k.tar.gz
-mplayer.tar.gz
-pitt.tar.gz
-xine-ui-0.99.7.tar.xz
-xinium.tar.gz
+xine-ui-0.99.8.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-ui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 17 Oct 2013 18:51:45 -0000 1.2
+++ sources 13 Mar 2014 14:31:24 -0000 1.3
@@ -27,5 +27,5 @@
841924c042ca70700a9d201bc7686e59 mp2k.tar.gz
3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz
7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz
-2af6fcc2ad6af6ba2e471497c5d140dc xine-ui-0.99.7.tar.xz
+8dc079baeab56c99e33268a973bc288e xine-ui-0.99.8.tar.xz
9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz
Index: xine-ui.spec
===================================================================
RCS file: /cvs/free/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xine-ui.spec 23 Oct 2013 20:58:43 -0000 1.2
+++ xine-ui.spec 13 Mar 2014 14:31:24 -0000 1.3
@@ -5,8 +5,8 @@
Summary: A skinned xlib-based gui for xine-lib
Name: xine-ui
-Version: 0.99.7
-Release: 9%{?dist}
+Version: 0.99.8
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.xine-project.org/
@@ -19,16 +19,16 @@
# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
-# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
-BuildRequires: autoconf
-BuildRequires: automake
+# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
+BuildRequires: autoconf
+BuildRequires: automake
# Patch to use UTF-8 documentation, BZ #512598
Patch1: xine-ui-0.99.5-utf8doc.patch
#o Sources for -skins. Ugh.
-Source1: http://xine-project.org/skins/Antares.tar.gz
+Source1: http://xine-project.org/skins/Antares.tar.gz
Source2: http://xine-project.org/skins/Bambino-Black.tar.gz
Source3: http://xine-project.org/skins/Bambino-Blue.tar.gz
Source4: http://xine-project.org/skins/Bambino-Green.tar.gz
@@ -59,7 +59,7 @@
Source29: http://xine-project.org/skins/Sunset.tar.gz
Source30: http://xine-project.org/skins/xinium.tar.gz
-Source31: default.ogv
+Source31: default.ogv
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Package was named xine in rpmfusion
@@ -83,7 +83,7 @@
BuildRequires: readline-devel
BuildRequires: xine-lib-devel >= 1.1.0
BuildRequires: xorg-x11-proto-devel
-BuildRequires: libjpeg-turbo-devel
+BuildRequires: libjpeg-turbo-devel
# Lirc-devel is not available on EPEL-5
%if 0%{?rhel} == 0
@@ -115,10 +115,10 @@
This package contains extra skins for xine-ui.
%package aaxine
-Summary: ASCII art player for terminals
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: xine-lib-extras
+Summary: ASCII art player for terminals
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: xine-lib-extras
%description aaxine
This package contains the ASCII art player for terminals like the vt100
@@ -263,6 +263,10 @@
%{_bindir}/aaxine
%changelog
+* Wed Mar 12 2014 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.8-1
+- Update to 0.99.8.
+- Remove spurious tabs in specfile.
+
* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.7-9
- Rebuild for xine-lib 1.2.
10 years, 8 months
rpms/VirtualBox/devel 39-fix-wrong-vboxvideo_drv-source.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 VirtualBox-4.3.0-VBoxGuestLib.patch, 1.1, 1.2 VirtualBox-4.3.0-libcxx.patch, 1.2, 1.3 VirtualBox-4.3.6-mesa.patch, 1.1, 1.2 VirtualBox.spec, 1.57, 1.58 sources, 1.52, 1.53
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4776
Modified Files:
.cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch
VirtualBox-4.3.0-libcxx.patch VirtualBox-4.3.6-mesa.patch
VirtualBox.spec sources
Added Files:
39-fix-wrong-vboxvideo_drv-source.patch
Log Message:
* Thu Mar 13 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.8-1
- Update to 4.3.8, need an upstream patch
39-fix-wrong-vboxvideo_drv-source.patch
- No need patch Config.kmk in VirtualBox-4.3.6-mesa.patch
- small adjustments in others patches.
39-fix-wrong-vboxvideo_drv-source.patch:
Makefile.kmk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 39-fix-wrong-vboxvideo_drv-source.patch ---
Description: Fixed wrong vboxvideo_drv_system_SOURCES reference.
Even the comment says we need at least 17
"Build using local X.Org headers. We assume X.Org Server 1.7 or later."
Author: Felix Geyer <fgeyer(a)debian.org>
---
Origin: debian
Forwarded: <>
Last-Update: <2014-03-10>
--- virtualbox-4.3.8-dfsg.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ virtualbox-4.3.8-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -376,7 +376,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
/usr/include/libdrm \
/usr/include/xorg \
/usr/include/pixman-1
- vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 18 Dec 2013 22:52:17 -0000 1.52
+++ .cvsignore 12 Mar 2014 21:16:22 -0000 1.53
@@ -1 +1 @@
-VirtualBox-4.3.6.tar.bz2
+VirtualBox-4.3.8.tar.bz2
VirtualBox-4.3.0-VBoxGuestLib.patch:
Makefile.kmk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: VirtualBox-4.3.0-VBoxGuestLib.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-VBoxGuestLib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.3.0-VBoxGuestLib.patch 28 Oct 2013 06:29:38 -0000 1.1
+++ VirtualBox-4.3.0-VBoxGuestLib.patch 12 Mar 2014 21:16:22 -0000 1.2
@@ -1,5 +1,5 @@
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2013-10-27 20:50:38.091380572 +0000
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-10-27 20:53:54.380791350 +0000
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2014-03-01 03:57:34.446124468 +0000
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-03-01 04:00:47.863997911 +0000
@@ -38,7 +38,7 @@ endif
LIBRARIES += \
VBoxGuestR3Lib \
@@ -8,4 +8,4 @@
+ifndef VBOX_USE_SYSTEM_XORG_HEADERS
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
LIBRARIES += \
- VBoxGuestR3LibXFree86
+ VBoxGuestR3LibXFree86
VirtualBox-4.3.0-libcxx.patch:
./src/VBox/Runtime/Makefile.kmk | 2 +-
./src/VBox/Storage/testcase/Makefile.kmk | 4 ++--
./src/libs/kStuff/Makefile.kmk | 2 +-
Config.kmk | 4 ++--
b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
configure | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
14 files changed, 21 insertions(+), 23 deletions(-)
Index: VirtualBox-4.3.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-libcxx.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.3.0-libcxx.patch 2 Nov 2013 11:32:26 -0000 1.2
+++ VirtualBox-4.3.0-libcxx.patch 12 Mar 2014 21:16:22 -0000 1.3
@@ -196,7 +196,7 @@
- vbox-img_LIBS += crypt
+ vbox-img_LIBS += crypto
ifdef SDK_VBOX_LIBXML2_LIBS
- vbox-img_LIBS += xml2 lzma
+ vbox-img_LIBS += xml2
endif
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
VirtualBox-4.3.6-mesa.patch:
Makefile.kmk | 35 +++++++++++++++--------------
fakedri_drv.c | 70 ++++------------------------------------------------------
fakedri_drv.h | 7 -----
3 files changed, 25 insertions(+), 87 deletions(-)
Index: VirtualBox-4.3.6-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.6-mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.3.6-mesa.patch 25 Dec 2013 06:03:17 -0000 1.1
+++ VirtualBox-4.3.6-mesa.patch 12 Mar 2014 21:16:22 -0000 1.2
@@ -1,25 +1,6 @@
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
---- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
-+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
-@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
- endif
-
- if1of ($(KBUILD_TARGET), freebsd linux solaris)
-- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
-- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
-- VBOX_MESA_INCS = \
-- $(VBOX_PATH_MESA_SOURCE) \
-- $(VBOX_PATH_MESA_SOURCE)/include \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
-+ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
- endif
-
- VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- VirtualBox.spec 25 Dec 2013 06:03:17 -0000 1.57
+++ VirtualBox.spec 12 Mar 2014 21:16:22 -0000 1.58
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.3.6
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.8
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -53,6 +53,7 @@
Patch23: VirtualBox-4.3.6-mesa.patch
Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
+Patch27: 39-fix-wrong-vboxvideo_drv-source.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -230,6 +231,7 @@
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
%patch26 -p1 -b .nobundles
+%patch27 -p1 -b .fix_vboxvideo
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -622,6 +624,12 @@
%changelog
+* Thu Mar 13 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.8-1
+- Update to 4.3.8, need an upstream patch
+ 39-fix-wrong-vboxvideo_drv-source.patch
+- No need patch Config.kmk in VirtualBox-4.3.6-mesa.patch
+- small adjustments in others patches.
+
* Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-4
- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source.
Also add to VBoxOGL_LIBS libXcomposite, libXdamage etc of the system.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 18 Dec 2013 22:52:17 -0000 1.52
+++ sources 12 Mar 2014 21:16:22 -0000 1.53
@@ -1 +1 @@
-4bc874039f169215152fb40ca5062784 VirtualBox-4.3.6.tar.bz2
+422ab09b7eb9c0564b55a6a0a6e6678f VirtualBox-4.3.8.tar.bz2
10 years, 8 months
rpms/freetype-freeworld/F-20 freetype-2.5.0-CVE-2014-2240.patch, NONE, 1.1 freetype-2.5.0-CVE-2014-2241.patch, NONE, 1.1 freetype-freeworld.spec, 1.31, 1.32
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9520/F-20
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.5.0-CVE-2014-2240.patch
freetype-2.5.0-CVE-2014-2241.patch
Log Message:
* Tue Mar 11 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-4
- Add freetype-2.5.0-CVE-2014-2240.patch from Fedora freetype (rh#1074647)
(Return when `hintMask' is invalid.)
- Add freetype-2.5.0-CVE-2014-2241.patch from Fedora freetype (rh#1074647)
(Don't call non-existing subroutines.)
freetype-2.5.0-CVE-2014-2240.patch:
cf2hints.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE freetype-2.5.0-CVE-2014-2240.patch ---
>From 0eae6eb0645264c98812f0095e0f5df4541830e6 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Fri, 28 Feb 2014 06:40:01 +0000
Subject: Fix Savannah bug #41697, part 1.
* src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is
invalid. In this case, it is not safe to use the length of
`hStemHintArray'; the exception has already been recorded in
`hintMask'.
---
diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c
index 5f44161..79f84fc 100644
--- a/src/cff/cf2hints.c
+++ b/src/cff/cf2hints.c
@@ -781,6 +781,8 @@
cf2_hintmask_setAll( hintMask,
cf2_arrstack_size( hStemHintArray ) +
cf2_arrstack_size( vStemHintArray ) );
+ if ( !cf2_hintmask_isValid( hintMask ) )
+ return; /* too many stem hints */
}
/* begin by clearing the map */
--
cgit v0.9.0.2
freetype-2.5.0-CVE-2014-2241.patch:
cf2ft.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE freetype-2.5.0-CVE-2014-2241.patch ---
>From 135c3faebb96f8f550bd4f318716f2e1e095a969 Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold(a)adobe.com>
Date: Fri, 28 Feb 2014 06:42:42 +0000
Subject: Fix Savannah bug #41697, part 2.
* src/cff/cf2ft.c (cf2_initLocalRegionBuffer,
cf2_initGlobalRegionBuffer): It is possible for a charstring to call
a subroutine if no subroutines exist. This is an error but should
not trigger an assert. Split the assert to account for this.
---
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index df5f8fb..82bac75 100644
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -521,7 +521,7 @@
CF2_UInt idx,
CF2_Buffer buf )
{
- FT_ASSERT( decoder && decoder->globals );
+ FT_ASSERT( decoder );
FT_ZERO( buf );
@@ -529,6 +529,8 @@
if ( idx >= decoder->num_globals )
return TRUE; /* error */
+ FT_ASSERT( decoder->globals );
+
buf->start =
buf->ptr = decoder->globals[idx];
buf->end = decoder->globals[idx + 1];
@@ -594,7 +596,7 @@
CF2_UInt idx,
CF2_Buffer buf )
{
- FT_ASSERT( decoder && decoder->locals );
+ FT_ASSERT( decoder );
FT_ZERO( buf );
@@ -602,6 +604,8 @@
if ( idx >= decoder->num_locals )
return TRUE; /* error */
+ FT_ASSERT( decoder->locals );
+
buf->start =
buf->ptr = decoder->locals[idx];
buf->end = decoder->locals[idx + 1];
--
cgit v0.9.0.2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-20/freetype-freeworld.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- freetype-freeworld.spec 30 Sep 2013 08:38:43 -0000 1.31
+++ freetype-freeworld.spec 11 Mar 2014 11:31:07 -0000 1.32
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.5.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -15,6 +15,11 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=686709
Patch92: 0001-Fix-vertical-size-of-emboldened-glyphs.patch
+## Security fixes:
+# https://bugzilla.gnome.org/show_bug.cgi?id=1074647
+Patch93: freetype-2.5.0-CVE-2014-2240.patch
+Patch94: freetype-2.5.0-CVE-2014-2241.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
Provides: freetype-bytecode
@@ -45,6 +50,9 @@
%patch92 -p1 -b .emboldened-glyphs
+%patch93 -p1 -b .CVE-2014-2240
+%patch94 -p1 -b .CVE-2014-2241
+
%build
@@ -89,7 +97,13 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
-* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.0.1-3
+* Tue Mar 11 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-4
+- Add freetype-2.5.0-CVE-2014-2240.patch from Fedora freetype (rh#1074647)
+ (Return when `hintMask' is invalid.)
+- Add freetype-2.5.0-CVE-2014-2241.patch from Fedora freetype (rh#1074647)
+ (Don't call non-existing subroutines.)
+
+* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> 2.5.0.1-3
- Rebuilt
* Sat Sep 21 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.0.1-2
10 years, 8 months
rpms/freetype-freeworld/devel .cvsignore, 1.18, 1.19 freetype-freeworld.spec, 1.34, 1.35 sources, 1.18, 1.19
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7599/devel
Modified Files:
.cvsignore freetype-freeworld.spec sources
Log Message:
* Tue Mar 11 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.3-1
- Update to 2.5.3 (matches Fedora freetype, rh#1073923)
- Also delete the new manpages (-devel material)
- Specfile cleanups (remove obsolete specfile idioms)
- Enable support for bzip2 compressed fonts
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 17 Jan 2014 17:59:15 -0000 1.18
+++ .cvsignore 11 Mar 2014 11:24:17 -0000 1.19
@@ -1 +1 @@
-freetype-2.5.2.tar.bz2
+freetype-2.5.3.tar.bz2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- freetype-freeworld.spec 17 Jan 2014 18:20:26 -0000 1.34
+++ freetype-freeworld.spec 11 Mar 2014 11:24:17 -0000 1.35
@@ -1,9 +1,8 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
-Version: 2.5.2
+Version: 2.5.3
Release: 1%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
-Group: System Environment/Libraries
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -12,14 +11,14 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-
Provides: freetype-bytecode
Provides: freetype-subpixel
Requires: /etc/ld.so.conf.d
BuildRequires: libX11-devel
BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
%description
The FreeType engine is a free and portable font rendering
@@ -42,48 +41,48 @@
%build
-
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
umask 0022
-%makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
+%make_install
# Don't package static a or .la files nor devel files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la,so} \
- $RPM_BUILD_ROOT%{_libdir}/pkgconfig $RPM_BUILD_ROOT%{_bindir} \
- $RPM_BUILD_ROOT%{_datadir}/aclocal $RPM_BUILD_ROOT%{_includedir}
+rm -rf %{buildroot}%{_libdir}/*.{a,la,so} \
+ %{buildroot}%{_libdir}/pkgconfig %{buildroot}%{_bindir} \
+ %{buildroot}%{_datadir}/aclocal %{buildroot}%{_includedir} \
+ %{buildroot}%{_mandir}
# Move library to avoid conflict with official FreeType package
-mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libfreetype.so.* \
- $RPM_BUILD_ROOT%{_libdir}/%{name}
+mkdir %{buildroot}%{_libdir}/%{name}
+mv -f %{buildroot}%{_libdir}/libfreetype.so.* \
+ %{buildroot}%{_libdir}/%{name}
# Register the library directory in /etc/ld.so.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{name}" \
- >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+ >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%{_libdir}/%{name}
%doc ChangeLog README docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Tue Mar 11 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.3-1
+- Update to 2.5.3 (matches Fedora freetype, rh#1073923)
+- Also delete the new manpages (-devel material)
+- Specfile cleanups (remove obsolete specfile idioms)
+- Enable support for bzip2 compressed fonts
+
* Fri Jan 17 2014 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.5.2-1
- Update to 2.5.2 (matches Fedora freetype, rh#1034065)
- Fix incorrect weekdays in the changelog
Index: sources
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 17 Jan 2014 17:59:15 -0000 1.18
+++ sources 11 Mar 2014 11:24:17 -0000 1.19
@@ -1 +1 @@
-10e8f4d6a019b124088d18bc26123a25 freetype-2.5.2.tar.bz2
+d6b60f06bfc046e43ab2a6cbfd171d65 freetype-2.5.3.tar.bz2
10 years, 8 months
rpms/mythtv/F-19 ChangeLog, 1.13, 1.14 mythtv-0.27-fixes.patch, 1.3, 1.4 mythtv.spec, 1.127, 1.128
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7416
Modified Files:
ChangeLog mythtv-0.27-fixes.patch mythtv.spec
Log Message:
* Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-5
- Update to latest fixes v0.27-178-g6b14852.
- Rebuild for x264.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-19/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 6 Jan 2014 16:15:42 -0000 1.13
+++ ChangeLog 11 Mar 2014 11:19:30 -0000 1.14
@@ -1,3 +1,443 @@
+commit 6b14852a6a3750e1d5c1bf7d461a5338ef535cbb
+Author: David Engel <dengel(a)mythtv.org>
+Date: Thu Mar 6 15:50:52 2014 -0600
+
+ Apply preroll on virtual tuners when the same multiplex is in use.
+
+ Previously, if any tuner in the same input group was already busy,
+ preroll would not be applied. Now, if the recording on the other
+ input is on the same multiplex as the new recording, preroll will be
+ applied.
+
+ Refs #12023
+
+ (cherry picked from commit 11e65dfd38ca419b2157f0dbaa19f965647f648c)
+
+commit cb3b784dbaa5142a38d24b68be6de7fc13bf0585
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Mon Mar 3 21:35:33 2014 +1100
+
+ Change verbosity for some network messages
+ (cherry picked from commit e6245ca330bc7dcc4d358819a299b28f02f5b5a5)
+
+commit 384858c5f78c199a5ec87ed0191feb8b6049cf6c
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Mon Mar 3 11:32:25 2014 +1100
+
+ Bump API binary number following round of changes in ringbuffers
+
+commit 57c32eacfa87783b75412184cc98c6a46dea99c0
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 27 20:48:28 2014 +1100
+
+ Never attempt to read more than in 512kB blocks
+
+ Recalculate the threshold and read block size when we've encountered EOF several times in a row.
+ 512kB ought to be enough to read a file smoothly (famous last words)
+
+ This reduces the amount of unnecessary verbosity. When watching a SD 3Mbit/s DVB stream, it will take over a second to get 1MB of data, leading to a warning entry in the log for every single read.
+
+ Refs #10428
+
+ (cherry picked from commit 1cfdfa3f56876eb20170f33e9592b5c7ffd05064)
+
+commit 366ba7dd96c03a20d83a78f9875177d25e57189c
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 27 12:51:25 2014 +1100
+
+ Allow seeking within the entire liveTV chain of recordings.
+
+ Seeking across liveTV was fundamentally broken. You could only seek within the current recordings or go to the beginning of the next one or 15s to the end of the previous one.
+ This changes correct this behaviour. It is now possible to seek across the entire live TV session. We ensure however that we do not seek further than 15s from the end of a recordings (3s if reaching end of live program).
+
+ Fixes #12076
+
+ (cherry picked from commit 11daeaadc52214605e204cdfe6f7c001c9c1cc9b)
+
+commit d35650578d8bea28e4c2ccabbd3e299d5c402004
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Tue Feb 25 10:19:17 2014 +1100
+
+ Fix typo
+
+ CR got deleted for some reason
+
+ (cherry picked from commit 534394068373c52fd712d653e5fea725c564a673)
+
+commit ca275af14f60f3cc78e48ac2ad7c55e377e72774
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Sun Feb 23 20:24:28 2014 +1100
+
+ Prevent playback to exit early should backend's writes be delayed
+
+ Typical scenario is when watching on-going recordings and being very close to real time TV: should the backend take more than 360ms between two writes, the reader would treat it as an EOF and abort the read.
+
+ When encountering EOF, we now check if the file is being written to in parallel and if so wait.
+
+ We can also remove all EOF retries in FileRingBuffer::safe_read() as we definitely know now if we did reach EOF (as we check against the file size).
+ This allows for almost instantaneous program transition in live TV.
+
+ (cherry picked from commit 443b624ebcc8ea56026cb49ca833edc7d73832c1)
+
+commit 22936ebd383a96d99602781137d9ce5dec76ab8e
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Sun Feb 23 20:19:50 2014 +1100
+
+ Have backend advertise which files are currently being written to
+
+ It is necessary in some playback scenarios to know if a file being read is currently being written to. This is useful in determining when encountering EOF if we should wait for more data or abort the read.
+
+ MythCoreContext will now keep track of files as they are being opened for writing
+ Connected frontends will receive the information via the event socket in the form of a BACKEND_MESSAGE event.
+
+ The myth protocol is extended with two new BACKEND_MESSAGE events:
+ FILE_WRITTEN: Sent when a file is opened in write mode, and when the file is being written to (at most every 10s)
+ FILE_CLOSED: Sent when the file opened in write mode is closed.
+
+ The myth protocol version doesn’t have to be increased as frontends will make use of it only if available and the changes are backward compatible with exiting myth protocol.
+
+ (cherry picked from commit fafc658597b547e2f0173032515e9790170ebcbe)
+
+ Conflicts:
+ mythtv/libs/libmythbase/threadedfilewriter.cpp
+
+commit 0b9470c87fe4d727e173cddf715270da7d18311e
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 20 16:48:44 2014 +1100
+
+ Fix fileringbuffer locking up on read()
+
+ From time to time, most often seen during LiveTV, FileRingBuffer::safe_read() would lock and not return for a long time (on my system, it would block in excess of 20s).
+ Upon investigation, the issue occurs while reading a file currently being written to, if a call to read() encountered EOF, returned early and a following call to read() was made, before another write. Under those conditions, read() wouldn't return for a long time, causing the backend to abort the read and dropping the frontend connection.
+
+ So instead we now check the size of the current file via a call to POSIX fstat and never try to read beyond the EOF position.
+ If the file being read isn't a regular, or fstat returned an error, the old behaviour is used: read until we get as much data as we asked.
+
+ Surprisingly, this has fixed most of the issues I've been having for years with liveTV:
+ - Stuttering or temporary free when close to the live
+ - Freeze at program transition.
+
+ Add debugging information while in file mode
+
+ Fixes #12045
+
+ (cherry picked from commit 20f7cd2858e79385ceec07b2c19c7e4f84714e18)
+
+commit 28b768a4b9e2fa3b76835057378512cb41a3838c
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 11:30:29 2014 +0000
+
+ Enable compilation of a couple of files that were disabled on Qt5 because they are apparently not compatible. They build, so let them.
+
+commit 784c236ed0ea5cc69f829ac71833a2ede5107882
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 11:11:37 2014 +0000
+
+ Fix mythnetvision.pro for Qt5
+
+commit 4fd068eb3f34eb5e8f35e4035fcb33d106ed0171
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 12:16:22 2014 +0000
+
+ Remove check_cxxflags which doesn't work
+
+commit 83ddcc8dda52365c38e5c767cc2479e59c576442
+Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com>
+Date: Wed Feb 19 17:00:15 2014 +0000
+
+ Resolve X11/Xlib.h define of Bool and Qt5 (5.2)
+
+ Xlib.h has a "#define Bool int", which causes compilation issues with other uses of
+ Bool, specifically in qsonvalue.h in Qt5. This patch rearranges the MythTV source file
+ includes to bypass the issue.
+
+ Fixes #12065
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org>
+
+commit 0a8ffeb2da6bea0ac4005147ea80aa4f9203ed4d
+Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+Date: Mon Feb 24 23:47:10 2014 +0000
+
+ Rewrite qmake detection to better support Qt5 - plugins
+
+commit 0a8d441988d432c60d544b22c842eaacb5dec91e
+Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+Date: Mon Feb 24 20:50:39 2014 +0000
+
+ Rewrite qmake detection to better support Qt5
+
+commit e77d5977c1ee8a74beceafb2d3886ba7e59e9f63
+Author: John Poet <jpoet(a)mythtv.org>
+Date: Sun Feb 9 15:20:04 2014 -0700
+
+ Some HLS tweaks to make recording more robust when faced with unreliable
+ feeds.
+
+ (cherry picked from commit 7f8dd24816a251d51b3cb42173d7dd19a4ba1a52)
+
+commit 65668cd6b98f36532fd478f4b6c491a8273c467e
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sun Feb 23 10:22:01 2014 -0500
+
+ Allow tmdb3.py to use $MYTHCONFDIR as a cache location.
+
+ This makes tmdb3.py follow the standard behavior of using MYTHCONFDIR,
+ falling back to HOME, for its selection of scratch space. This also adds
+ explicit error reporting to stdout when something goes wrong.
+
+ Refs #11876
+
+ (cherry picked from commit 2c50a824be1f3083ca966ff0309ea39854452b29)
+
+commit ab18cb1166d53a0bf14bc4f49c568be8f2240fd8
+Author: angelaschmid <angela.schmid(a)wolke7.net>
+Date: Sun Jan 5 20:19:56 2014 +0100
+
+ detect cropped HD (720p) content
+
+ Fixes #12048
+ (cherry picked from commit 2a026c45758a495fee0b4a4e7557901c6f701797)
+
+commit 147dec5cd8b82f310277043fcb4f33ecc50c4bf0
+Author: Angela Schmid <angela.schmid(a)wolke7.net>
+Date: Tue Feb 18 10:58:02 2014 -0600
+
+ Always show programs that are still recording in ViewScheduled.
+
+ Includes a minor change by David Engel.
+
+ Backport to fixes/0.27.
+
+ Refs #12060
+
+commit 9bf1070d86ab4ca515830f4d330f7b720830463c
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Tue Feb 11 13:16:43 2014 +0000
+
+ MythMusic: fix the goom visualizer
+
+ * use the correct image format to convert the Goom buffer to a QImage
+ * re-enable the scale factors so you can reduce the cpu utililization
+ Increasing the scale factors will reduce the amount of data to be processed
+ by Goom but that will also make the image more blocky.
+ * increase the maximum scale factor to 4 (MythGoom allows 1, 2 or 4 to be used)
+
+ Fixes #11023.
+
+ (cherry picked from commit 8e0c6c505cf727dd00404ede6afb6c76e06101a5)
+
+commit 75e71d3dad4ac873531005ea27ae9529c4494459
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Mon Feb 10 18:48:52 2014 -0500
+
+ Add housekeeper startup delay.
+
+ This delays creation of the first HouseKeepingThread until the first
+ cycle, which is one minute after creation. This will allow time for
+ other potentially necessary subsystems to come up on init, should the
+ HouseKeeperTasks need them. Tasks tagged as kHKRunImmediateOnStartup
+ will still be run in-thread immediately as the housekeeper is started.
+
+ Fixes #12042
+ (cherry picked from commit 3d14864fe8ef06147ec8cc0d6af39d89fb29b2f9)
+
+commit d48bbd891921d33f5fb34ccc46044ad8987183fb
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Mon Feb 10 00:16:37 2014 +0100
+
+ Only force a refresh of the metadata rather than invalidating the cache as that causes a crash if file system browsing is enabled.
+
+ Refs #12052
+ (cherry picked from commit d7bee2a3cca4a76feade96a29094a3eb3affb23b)
+
+commit f5e61804d7a8ad6afc4aa4484e2c05f24ddb396b
+Author: Amar Takhar <verm(a)darkbeer.org>
+Date: Wed Jan 15 21:44:48 2014 +0000
+
+ Fixes for FreeBSD 10.0 + clang
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit 366b73bc672d45be94b981a944f9f415b44ea13c)
+
+commit de615b3360219838e446ae75328730c2ff49d64f
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Sun Feb 9 20:57:25 2014 +0100
+
+ Invalidate the cache after deleting a video file to ensure the free'd entry is removed.
+
+ Fixes #12052
+ (cherry picked from commit ffd38d1bba28aea710ad095c4e0844fe63381b38)
+
+commit 6b37da2534321ef9132d1fac29ca9efa48def326
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sun Jan 26 00:41:49 2014 +0100
+
+ let Smolt search for the country as global and local setting
+
+ Country became a global setting in [bf6fc7cd39]. This allows me to upload my
+ profile instead of getting error 500 from the server. It might be just
+ correlation though.
+ (cherry picked from commit 6c1f811d61de5aeaa8b4355c3b7b8dca18899aed)
+
+commit b4858000bdb375be898ee824fbbebbb14fc127ec
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sat Jan 25 23:15:34 2014 +0100
+
+ let Smolt search for the langauge as global and local setting
+
+ Language became a global setting in [bf6fc7cd39].
+ (cherry picked from commit de17fc4ab4f830d2d317c7522f0e584c9ed86a93)
+
+commit 5c1cdb0e96367b56258d99cdbb56a0727bf6793c
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Thu Feb 6 00:06:10 2014 +0100
+
+ Explicitly set the audio capabilities of the DVD VM to indicate all audio types are supported. This makes DVDs that check this VM register play properly.
+ (cherry picked from commit 501de627233cdffc1032932fd0611fd2e32abca4)
+
+commit 1b7404d64080a69373f3b37fc174a5b62f9143ba
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Mon Feb 3 07:33:18 2014 -0500
+
+ Use proper string conversion for DailyArtworkUpdates setting.
+
+ Refs #12033
+ (cherry picked from commit e45e1ca7bf329e8ecea218f0e47cc080ad736b7e)
+
+commit eaafcb4a917c1b6055e5fb908a3bc6b747aba1c4
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sun Feb 2 02:25:26 2014 -0500
+
+ Make "DailyArtworkUpdates" a global option
+
+ This makes the DailyArtworkUpdates setting a global setting so it can be
+ properly configured on any frontend. This patch does not include any
+ code to fix an existing improperly configured setting, which could cause
+ problems in the future, as the per-host option will override the global
+ one and will be uneditable without direct database modification.
+
+ Refs #12033
+ (cherry picked from commit ffa364019e7d5bc0b88f4c83d21511090735b45d)
+
+commit 4ee21a4ca0c6f85e6c6b5f55cb3bbc5b623a5e14
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Feb 1 18:09:41 2014 +0000
+
+ Fix segfault in MythUIButtonList::GetItemCurrent(). Fixes #12040
+ (cherry picked from commit 4211abf7d62b9e15a61731bd1ae19400302c92ff)
+
+commit 6b353625177a4dd6483b9b8c9e0d1051d4549e8d
+Merge: b249ad4 1d9d46b
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Jan 30 09:14:06 2014 -0500
+
+ Merge commit '1d9d46beff7a7591ebbfa6e13c080617e660e52d' into fixes/0.27
+
+ Conflicts:
+ mythtv/bindings/python/tmdb3/tmdb3/pager.py
+
+commit b249ad4d241b8a3adf7b3cde8a26b03e736febd2
+Author: Stefan Becker <chemobejk(a)gmail.com>
+Date: Fri Dec 13 22:12:04 2013 +0200
+
+ Bind to multicast address instead of ANY
+
+ If multiple servers multicast content on the same port we can't receive
+ it on multiple recorders if bind to QHostAddress::Any. If we bind to the
+ multicast address we don't have this problem. Problem discovered and
+ patched by Niels Ole Kirkeby.
+
+ Note: This also adds error handling for when a bind fails.
+
+ Fixes #11979
+ Fixes #12036
+
+ The tickets contain multiple reports of success.
+ (cherry picked from commit f2defe87d63fbe544c7333af0ca5b04aa078ebf4)
+
+commit 1d9d46beff7a7591ebbfa6e13c080617e660e52d
+Author: Amar Takhar <verm(a)darkbeer.org>
+Date: Tue Jan 28 19:00:44 2014 +0000
+
+ Correct mispelling in cache_file.py
+
+ This corrects a misspelling in error handling code that would cause an
+ irrelevant error to be thrown when unable to access an existing cache
+ file. This misspelling issue would only appear after a fatal error had
+ occurred, so there is no change in behavior.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+
+commit f1e620c6fcaead237ee01c9aa7d0bd5380571189
+Author: pjokinen <pjokinen(a)gmail.com>
+Date: Mon Jan 27 12:26:34 2014 -0600
+
+ Add mplexid to dummy entries when scheduling around live TV.
+
+ This was missed when the mplexid optimization was done. Thanks to
+ pjokinen for spotting it and submitting the patch.
+
+ Refs #12032
+
+ Signed-off-by: David Engel <dengel(a)mythtv.org>
+
+ (cherry picked from commit 2ebd924706b97015e15f3075f93e03bfc1616fef)
+
+commit 5a5e1cd52906e10a1aa15c207764b8bdcab8caa6
+Author: David Engel <dengel(a)mythtv.org>
+Date: Tue Jan 21 14:29:39 2014 -0600
+
+ Update record.last_record/deleted to UTC.
+
+ Backport to fixes/0.27.
+
+ These were missed in the upgrade to schema version 1303. Note that
+ this change only works for those who haven't yet upgraded. It's too
+ difficult to impossible to fix this for those who have already
+ upgraded.
+
+ Fixes #12024
+
+ (cherry picked from commit e523eedc7fb884eaa147b77091aa30ff52c54929)
+
+commit 99f546453ada182e40f1ee27c294e17611b5dfed
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Mon Jan 13 23:23:33 2014 +0100
+
+ missed variable rename in Smolt data collection in ba8a1608cf
+
+ (cherry picked from commit 211989bea523f6a41b2e88c8e63cb37b56949955)
+
+commit 8307dd4990189d65e3b99039d77d84f6a8c81a96
+Author: John Poet <jpoet(a)mythtv.org>
+Date: Sun Jan 12 14:42:59 2014 -0700
+
+ In [50e5f4501] I failed to account for a possible path through
+ TuningFrequency(), and removed a necessary call to SetChannelByString().
+
+ I big thank you to warpme for identifying the problem and solution.
+
+ Fixes #11989
+
+ (cherry picked from commit 5208a3a5512a4059b3cb59f4da65503003f3348f)
+
+commit 4c12503a741c5e2fa199eac414e4bafe53d51c12
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Fri Jan 10 19:42:39 2014 +0000
+
+ MythMusic: Fix detection of compilations using special MusicBrainz Artist ID
+
+ Look at all the fields in the 'TXXX=MusicBrainz Album Artist Id' frame for the special
+ various artists ID not just the first one which in current version of the taglib
+ contains the tags description.
+
+ Refs #10235.
+ Fixes #12000.
+
+ (cherry picked from commit 6530ac633300a32c76db0d10cf8d107aa712a62c)
+
commit fac84fab9c8c6e43f51d3090e13e05e68db0ef6e
Author: Paul Harrison <pharrison(a)mythtv.org>
Date: Sat Jan 4 10:12:23 2014 +0000
@@ -193,6 +633,24 @@
Correct issue where TMDB returns less results than claimed.
(cherry picked from commit 24bcf67da973e4eee738eca68fb5cea36e7c1306)
+commit 29922d1a16ed2d818f7ec7602207029cb372f53f
+Merge: e3d4c07 e3802e5
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Nov 29 14:05:17 2013 -0500
+
+ Merge branch 'master' of github.com:wagnerrp/pytmdb3
+
+commit e3d4c07ee59886e92e995addf0ad226f629adcf4
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Nov 29 14:02:55 2013 -0500
+
+ Updates for television data.
+
+ This updates the version number and readme for the new Television series
+ support on TheMovieDb.org. I still want to do some tweeking on the names
+ and general presentation, but this has been sitting around for long
+ enough and should get pushed upstream.
+
commit e5acf0cdd90f839aff2820e52daedeef42a509a9
Author: Paul Harrison <pharrison(a)mythtv.org>
Date: Fri Nov 22 23:55:54 2013 +0000
@@ -347,6 +805,15 @@
(cherry picked from commit ee5de540587a55f8b749da5ece22a15b163619c8)
+commit e3802e53b7fe556ee98639c57f7a83e84b3c2468
+Merge: 4965933 70a9dc8
+Author: wagnerrp <rwagner(a)mythtv.org>
+Date: Sun Nov 17 09:14:09 2013 -0800
+
+ Merge pull request #32 from Toilal/master
+
+ Registered and uploaded on PyPI.
+
commit fa94c154c79d0752eb0eb59e579e1985ccf26532
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sun Nov 17 11:22:58 2013 +0000
@@ -642,6 +1109,12 @@
(cherry picked from commit 1e3d70b1b0ef74615c7f7f59e1bfef3621842a3e)
+commit 6a5050f86ad3eab90bfbec174edaaf9eb711bca4
+Author: Fabian Möller <fabianm88(a)gmail.com>
+Date: Thu Oct 31 17:52:11 2013 +0100
+
+ Add support for the new tv api
+
commit 8845997d30dd093ea35426dca80222f7ab0c4a8f
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Tue Oct 29 19:51:58 2013 -0400
@@ -709,6 +1182,27 @@
Fix marking of 1080/720 videos.
(cherry picked from commit 7ed0e5fb3dd90eca4eb9cdf8371be11e80a41fa6)
+commit 70a9dc84046c2081b89e2a81f34e94a25fa14f72
+Author: Toilal <toilal.dev(a)gmail.com>
+Date: Fri Oct 25 10:36:23 2013 +0200
+
+ Registered and uploaded on PyPI. Fix #31
+
+commit 4965933adc5e309406ad931c1f6666d22ae845f8
+Merge: 053778c e47fd39
+Author: wagnerrp <rwagner(a)mythtv.org>
+Date: Wed Oct 23 17:00:47 2013 -0700
+
+ Merge pull request #30 from Toilal/master
+
+ Fixed version in setup.py
+
+commit e47fd39eb06bc33e221b7bef25cb18ed99a9bad7
+Author: Rémi Alvergnat <remi.alvergnat(a)gmail.com>
+Date: Wed Oct 23 23:00:19 2013 +0200
+
+ Fixed version in setup.py
+
commit 29eab516202aa76aeb769ed636c183ba3ed0efcf
Author: John Poet <jpoet(a)mythtv.org>
Date: Wed Oct 23 12:20:57 2013 -0600
@@ -1020,6 +1514,16 @@
Refs #11891
+commit 053778ce07c6080cb1343c8187d346179fccd34f
+Author: Richard O'Dwyer <richard(a)richard.do>
+Date: Thu Aug 29 00:41:00 2013 +0000
+
+ PEP8 code style updates.
+
+ Modified from original commit.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+
commit 77db95785de9b80f87b96a46220124a1fcc50bf8
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Sat Oct 5 21:30:45 2013 +0100
@@ -1270,3 +1774,23 @@
by me and Roger Mårtensson (thank you!).
(cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c)
+
+commit abae25afb73f967421eb7797a868a9bdb187c18c
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 12 21:40:14 2013 -0400
+
+ Enable --debug flag in test application.
+
+commit 0d91e6fc4184c17c5a9d39e1b2a264602a47747d
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 12 21:35:05 2013 -0400
+
+ Have pager return Nones if the server returns null.
+
+ This temporarily resolves an issue where the TheMovieDb server returns
+ nulls in searches when a movie has been deleted but not yet flushed out
+ of the cache. This prevents the error internally, but does not attempt
+ to re-order to remove the nulls, so is merely passing the issue onto the
+ application using this library.
+
+ Refs #29
mythtv-0.27-fixes.patch:
b/mythplugins/configure | 18
b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary
b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197
b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4
b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4
b/mythplugins/mytharchive/mythburn/scripts/mythburn.py | 19
b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary
b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126
b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary
b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965
b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary
b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136
b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary
b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902
b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9
b/mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34
b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33
b/mythplugins/mythmusic/mythmusic/importmusic.cpp | 4
b/mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102
b/mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94
b/mythplugins/mythmusic/mythmusic/musicplayer.h | 3
b/mythplugins/mythmusic/mythmusic/playlist.cpp | 2
b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp | 16
b/mythplugins/mythmusic/mythmusic/searchview.cpp | 15
b/mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4
b/mythplugins/mythmusic/mythmusic/streamview.cpp | 7
b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp | 4
b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary
b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279
b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro | 5
b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary
b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76
b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary
b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62
b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary
b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183
b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 13
b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 655
b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101
b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 25
b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp | 8
b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.h | 2
b/mythplugins/mythzoneminder/mythzoneminder/zmdefines.h | 11
b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp | 64
b/mythplugins/mythzoneminder/mythzoneminder/zmevents.h | 1
b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64
b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp | 21
b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.h | 3
b/mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml | 244
b/mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml | 203
b/mythtv/bindings/python/MythTV/dataheap.py | 1
b/mythtv/bindings/python/MythTV/system.py | 11
b/mythtv/bindings/python/scripts/mythpython | 4
b/mythtv/bindings/python/setup.py | 6
b/mythtv/bindings/python/tmdb3/README | 86
b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py | 5
b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1
b/mythtv/bindings/python/tmdb3/setup.py | 15
b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3
b/mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40
b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30
b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54
b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18
b/mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24
b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26
b/mythtv/bindings/python/tmdb3/tmdb3/request.py | 59
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90
b/mythtv/bindings/python/tmdb3/tmdb3/util.py | 201
b/mythtv/configure | 18
b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8
b/mythtv/external/FFmpeg/libavformat/mpeg.c | 10
b/mythtv/i18n/mythfrontend_sv.qm |binary
b/mythtv/i18n/mythfrontend_sv.ts |28897 +++++-----
b/mythtv/libs/libmyth/libmyth.pro | 6
b/mythtv/libs/libmyth/programinfo.cpp | 283
b/mythtv/libs/libmyth/programinfo.h | 17
b/mythtv/libs/libmyth/programtypes.h | 2
b/mythtv/libs/libmyth/remoteutil.h | 2
b/mythtv/libs/libmythbase/housekeeper.cpp | 22
b/mythtv/libs/libmythbase/housekeeper.h | 2
b/mythtv/libs/libmythbase/libmythbase.pro | 6
b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3
b/mythtv/libs/libmythbase/mythcorecontext.cpp | 138
b/mythtv/libs/libmythbase/mythcorecontext.h | 4
b/mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1
b/mythtv/libs/libmythbase/mythmiscutil.h | 1
b/mythtv/libs/libmythbase/mythsingledownload.cpp | 86
b/mythtv/libs/libmythbase/mythsingledownload.h | 49
b/mythtv/libs/libmythbase/mythsocket.cpp | 12
b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8
b/mythtv/libs/libmythbase/mythsystemlegacy.h | 1
b/mythtv/libs/libmythbase/mythtimer.cpp | 2
b/mythtv/libs/libmythbase/mythtimezone.cpp | 1
b/mythtv/libs/libmythbase/mythversion.h | 2
b/mythtv/libs/libmythbase/threadedfilewriter.cpp | 72
b/mythtv/libs/libmythbase/threadedfilewriter.h | 1
b/mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1
b/mythtv/libs/libmythmetadata/metadatacommon.cpp | 23
b/mythtv/libs/libmythmetadata/metadatafactory.cpp | 6
b/mythtv/libs/libmythmetadata/metaio.cpp | 8
b/mythtv/libs/libmythmetadata/metaio.h | 2
b/mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2
b/mythtv/libs/libmythmetadata/metaioid3.cpp | 15
b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 14
b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3
b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5
b/mythtv/libs/libmythtv/cardutil.cpp | 22
b/mythtv/libs/libmythtv/cardutil.h | 8
b/mythtv/libs/libmythtv/dbcheck.cpp | 6
b/mythtv/libs/libmythtv/fileringbuffer.cpp | 53
b/mythtv/libs/libmythtv/libmythtv.pro | 14
b/mythtv/libs/libmythtv/livetvchain.cpp | 230
b/mythtv/libs/libmythtv/livetvchain.h | 9
b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2
b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2
b/mythtv/libs/libmythtv/mythplayer.cpp | 97
b/mythtv/libs/libmythtv/mythplayer.h | 4
b/mythtv/libs/libmythtv/previewgenerator.cpp | 6
b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2
b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140
b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32
b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392
b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162
b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70
b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55
b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193
b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103
b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103
b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38
b/mythtv/libs/libmythtv/recorders/channelbase.cpp | 4
b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12
b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6
b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.cpp | 96
b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5
b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2
b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105
b/mythtv/libs/libmythtv/recorders/iptvchannel.h | 20
b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17
b/mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1
b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46
b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h | 3
b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp | 28
b/mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4
b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3
b/mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2
b/mythtv/libs/libmythtv/recorders/streamhandler.h | 1
b/mythtv/libs/libmythtv/recordinginfo.cpp | 143
b/mythtv/libs/libmythtv/ringbuffer.cpp | 82
b/mythtv/libs/libmythtv/tv_play.cpp | 84
b/mythtv/libs/libmythtv/tv_play.h | 1
b/mythtv/libs/libmythtv/tv_rec.cpp | 69
b/mythtv/libs/libmythtv/tv_rec.h | 1
b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2
b/mythtv/libs/libmythtv/videooutbase.cpp | 2
b/mythtv/libs/libmythtv/videosource.cpp | 2
b/mythtv/libs/libmythtv/vsync.cpp | 8
b/mythtv/libs/libmythui/mythgesture.cpp | 1
b/mythtv/libs/libmythui/mythpainter.cpp | 1
b/mythtv/libs/libmythui/mythuibuttonlist.cpp | 8
b/mythtv/libs/libmythupnp/httprequest.cpp | 3
b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4
b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 52
b/mythtv/programs/mythbackend/backendhousekeeper.h | 1
b/mythtv/programs/mythbackend/mainserver.cpp | 47
b/mythtv/programs/mythbackend/mainserver.h | 2
b/mythtv/programs/mythbackend/playbacksock.cpp | 6
b/mythtv/programs/mythbackend/playbacksock.h | 3
b/mythtv/programs/mythbackend/scheduler.cpp | 79
b/mythtv/programs/mythbackend/services/dvr.cpp | 2
b/mythtv/programs/mythbackend/services/guide.cpp | 61
b/mythtv/programs/mythbackend/services/serviceUtil.cpp | 6
b/mythtv/programs/mythcommflag/main.cpp | 6
b/mythtv/programs/mythfilldatabase/filldata.cpp | 81
b/mythtv/programs/mythfilldatabase/filldata.h | 7
b/mythtv/programs/mythfilldatabase/main.cpp | 12
b/mythtv/programs/mythfrontend/grabbersettings.cpp | 3
b/mythtv/programs/mythfrontend/guidegrid.cpp | 450
b/mythtv/programs/mythfrontend/guidegrid.h | 50
b/mythtv/programs/mythfrontend/scheduleeditor.cpp | 18
b/mythtv/programs/mythfrontend/videolist.cpp | 7
b/mythtv/programs/mythfrontend/viewscheduled.cpp | 4
b/mythtv/programs/mythtranscode/main.cpp | 3
b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 2
b/mythtv/programs/mythtranscode/transcode.cpp | 7
b/mythtv/programs/mythtv-setup/importicons.cpp | 107
b/mythtv/programs/mythtv-setup/importicons.h | 1
b/mythtv/programs/mythutil/commandlineparser.cpp | 35
b/mythtv/programs/mythutil/markuputils.cpp | 157
b/mythtv/programs/mythutil/mythutil.cpp | 6
b/mythtv/programs/mythwelcome/welcomedialog.cpp | 30
b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 15
b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33
b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2
b/mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242
b/mythtv/themes/MythCenter/notification-ui.xml | 2
mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99
mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157
mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317
mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45
mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266
mythtv/programs/scripts/metadata/Movie/tmdb.py | 647
203 files changed, 25919 insertions(+), 19472 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.27-fixes.patch
Index: mythtv-0.27-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-19/mythtv-0.27-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.27-fixes.patch 6 Jan 2014 16:15:42 -0000 1.3
+++ mythtv-0.27-fixes.patch 11 Mar 2014 11:19:30 -0000 1.4
@@ -1,3 +1,4 @@
+ mythplugins/configure | 18 +-
mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes
mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +-
.../mytharchive/mytharchive/archiveutil.cpp | 4 +-
@@ -13,6 +14,7 @@
mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +-
mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 +-
mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 +-
+ mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +-
mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +-
mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +-
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94 +-
@@ -22,8 +24,10 @@
mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +-
mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +-
mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +-
+ .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +-
mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes
mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +-
+ .../mythnetvision/mythnetvision/mythnetvision.pro | 5 +-
mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes
mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +-
mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes
@@ -54,54 +58,87 @@
mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 -
mythtv/bindings/python/scripts/mythpython | 4 +-
mythtv/bindings/python/setup.py | 6 +-
+ mythtv/bindings/python/tmdb3/README | 86 +-
+ .../python/tmdb3/scripts/populate_locale.py | 5 +-
+ mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 -
+ mythtv/bindings/python/tmdb3/setup.py | 15 +-
+ mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 +-
+ mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 +-
+ mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 +-
+ mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 +-
+ mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 +-
+ mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 +-
+ .../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 +-
+ mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 +-
+ mythtv/configure | 18 +-
mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +-
mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +-
mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes
mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++---------
+ mythtv/libs/libmyth/libmyth.pro | 6 +-
mythtv/libs/libmyth/programinfo.cpp | 283 +-
mythtv/libs/libmyth/programinfo.h | 17 +
mythtv/libs/libmyth/programtypes.h | 2 +-
- mythtv/libs/libmythbase/housekeeper.cpp | 19 +-
+ mythtv/libs/libmyth/remoteutil.h | 2 +
+ mythtv/libs/libmythbase/housekeeper.cpp | 22 +-
mythtv/libs/libmythbase/housekeeper.h | 2 +
mythtv/libs/libmythbase/libmythbase.pro | 6 +-
mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +-
- mythtv/libs/libmythbase/mythcorecontext.cpp | 36 +-
+ mythtv/libs/libmythbase/mythcorecontext.cpp | 138 +-
+ mythtv/libs/libmythbase/mythcorecontext.h | 4 +
mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 -
- mythtv/libs/libmythbase/mythsingledownload.cpp | 82 +
- mythtv/libs/libmythbase/mythsingledownload.h | 44 +
+ mythtv/libs/libmythbase/mythmiscutil.h | 1 +
+ mythtv/libs/libmythbase/mythsingledownload.cpp | 86 +
+ mythtv/libs/libmythbase/mythsingledownload.h | 49 +
mythtv/libs/libmythbase/mythsocket.cpp | 12 +
mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +-
+ mythtv/libs/libmythbase/mythsystemlegacy.h | 1 +
+ mythtv/libs/libmythbase/mythtimer.cpp | 2 +
+ mythtv/libs/libmythbase/mythtimezone.cpp | 1 +
mythtv/libs/libmythbase/mythversion.h | 2 +-
+ mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +-
+ mythtv/libs/libmythbase/threadedfilewriter.h | 1 +
+ mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 +
mythtv/libs/libmythmetadata/metadatacommon.cpp | 23 +-
mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +-
mythtv/libs/libmythmetadata/metaio.cpp | 8 +
mythtv/libs/libmythmetadata/metaio.h | 2 +
mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 -
+ mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +-
.../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +-
mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +-
mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +-
mythtv/libs/libmythtv/cardutil.cpp | 22 +
mythtv/libs/libmythtv/cardutil.h | 8 +
+ mythtv/libs/libmythtv/dbcheck.cpp | 6 +-
+ mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +-
mythtv/libs/libmythtv/libmythtv.pro | 14 +
+ mythtv/libs/libmythtv/livetvchain.cpp | 230 +-
+ mythtv/libs/libmythtv/livetvchain.h | 9 +-
mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 +-
mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +-
- mythtv/libs/libmythtv/mythplayer.cpp | 19 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 97 +-
mythtv/libs/libmythtv/mythplayer.h | 4 +
mythtv/libs/libmythtv/previewgenerator.cpp | 6 +-
mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +-
- .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 125 +
+ .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 +
.../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 +
- mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1328 +
- mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 148 +
- mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 64 +
- mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 53 +
- mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 191 +
- mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 98 +
- .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 75 +
- .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 37 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 +
+ .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 +
+ .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 +
mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +-
.../libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 +
- .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 91 +-
+ mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +-
+ .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 +-
mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +-
mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +-
mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +-
@@ -110,25 +147,33 @@
mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 -
.../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +-
.../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +-
+ .../libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 +-
mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 +-
mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +-
mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 +
mythtv/libs/libmythtv/recorders/streamhandler.h | 1 +
mythtv/libs/libmythtv/recordinginfo.cpp | 143 +-
+ mythtv/libs/libmythtv/ringbuffer.cpp | 82 +-
mythtv/libs/libmythtv/tv_play.cpp | 84 +-
mythtv/libs/libmythtv/tv_play.h | 1 +
mythtv/libs/libmythtv/tv_rec.cpp | 69 +-
mythtv/libs/libmythtv/tv_rec.h | 1 +
mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 2 +-
mythtv/libs/libmythtv/videosource.cpp | 2 +-
+ mythtv/libs/libmythtv/vsync.cpp | 8 +-
+ mythtv/libs/libmythui/mythgesture.cpp | 1 +
+ mythtv/libs/libmythui/mythpainter.cpp | 1 +
+ mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +-
mythtv/libs/libmythupnp/httprequest.cpp | 3 +-
+ mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 +
mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +-
mythtv/programs/mythbackend/backendhousekeeper.h | 1 +
mythtv/programs/mythbackend/mainserver.cpp | 47 +-
mythtv/programs/mythbackend/mainserver.h | 2 +-
mythtv/programs/mythbackend/playbacksock.cpp | 6 +-
mythtv/programs/mythbackend/playbacksock.h | 3 -
- mythtv/programs/mythbackend/scheduler.cpp | 75 +-
+ mythtv/programs/mythbackend/scheduler.cpp | 79 +-
mythtv/programs/mythbackend/services/dvr.cpp | 2 +-
mythtv/programs/mythbackend/services/guide.cpp | 61 +-
.../programs/mythbackend/services/serviceUtil.cpp | 6 +
@@ -136,9 +181,12 @@
mythtv/programs/mythfilldatabase/filldata.cpp | 81 +-
mythtv/programs/mythfilldatabase/filldata.h | 7 +-
mythtv/programs/mythfilldatabase/main.cpp | 12 +-
+ mythtv/programs/mythfrontend/grabbersettings.cpp | 3 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 450 +-
mythtv/programs/mythfrontend/guidegrid.h | 50 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 +-
+ mythtv/programs/mythfrontend/videolist.cpp | 7 +-
+ mythtv/programs/mythfrontend/viewscheduled.cpp | 4 +-
mythtv/programs/mythtranscode/main.cpp | 3 +-
mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 +
mythtv/programs/mythtranscode/transcode.cpp | 7 +-
@@ -148,13 +196,45 @@
mythtv/programs/mythutil/markuputils.cpp | 157 +-
mythtv/programs/mythutil/mythutil.cpp | 6 +
mythtv/programs/mythwelcome/welcomedialog.cpp | 30 +-
+ .../distros/mythtv_data/data_mythtv.py | 15 +-
mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 -
- mythtv/programs/scripts/metadata/Movie/tmdb3.py | 19 +-
+ mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33 +-
mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +-
mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 +-
mythtv/themes/MythCenter/notification-ui.xml | 2 +-
- 155 files changed, 24207 insertions(+), 18842 deletions(-)
+ 204 files changed, 25919 insertions(+), 19472 deletions(-)
+diff --git a/mythplugins/configure b/mythplugins/configure
+index bda1fbc..b9086ba 100755
+--- a/mythplugins/configure
[...5699 lines suppressed...]
-@@ -2665,8 +2667,16 @@ void Scheduler::HandleIdleShutdown(
+@@ -2665,8 +2670,16 @@ void Scheduler::HandleIdleShutdown(
return;
// we release the block when a client connects
@@ -59940,7 +64217,7 @@
else
{
QDateTime curtime = MythDate::current();
-@@ -2681,7 +2691,8 @@ void Scheduler::HandleIdleShutdown(
+@@ -2681,7 +2694,8 @@ void Scheduler::HandleIdleShutdown(
recording = true;
}
@@ -59950,7 +64227,7 @@
{
// have we received a RESET_IDLETIME message?
resetIdleTime_lock.lock();
-@@ -2712,6 +2723,28 @@ void Scheduler::HandleIdleShutdown(
+@@ -2712,6 +2726,28 @@ void Scheduler::HandleIdleShutdown(
(idleWaitForRecordingTime * 60) +
idleTimeoutSecs)
{
@@ -59979,7 +64256,7 @@
idleSince = QDateTime();
}
}
-@@ -2858,6 +2891,16 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
+@@ -2858,6 +2894,16 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
QDateTime restarttime = nextRecording->GetRecordingStartTime()
.addSecs((-1) * prerollseconds);
@@ -59996,7 +64273,7 @@
int add = gCoreContext->GetNumSetting("StartupSecsBeforeRecording", 240);
if (add)
restarttime = restarttime.addSecs((-1) * add);
-@@ -2900,6 +2943,10 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
+@@ -2900,6 +2946,10 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
m_isShuttingDown = false;
return;
}
@@ -60007,7 +64284,15 @@
}
// tell anyone who is listening the master server is going down now
-@@ -5078,17 +5125,29 @@ bool Scheduler::WasStartedAutomatically()
+@@ -5047,6 +5097,7 @@ void Scheduler::SchedLiveTV(void)
+ dummy->SetRecordingEndTime(schedTime.addSecs(1800));
+ dummy->SetCardID(enc->GetCardID());
+ dummy->SetInputID(in.inputid);
++ dummy->mplexid = dummy->QueryMplexID();
+ dummy->SetRecordingStatus(rsUnknown);
+
+ retrylist.push_front(dummy);
+@@ -5078,17 +5129,29 @@ bool Scheduler::WasStartedAutomatically()
// if we don't have a valid startup time assume we were started manually
if (startupTime.isValid())
{
@@ -60453,6 +64738,20 @@
if (sourceid != -1)
{
+diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp
+index 1d526cc..146c32f 100644
+--- a/mythtv/programs/mythfrontend/grabbersettings.cpp
++++ b/mythtv/programs/mythfrontend/grabbersettings.cpp
+@@ -250,7 +250,8 @@ void GrabberSettings::slotSave(void)
+ int dailyupdatestate = 0;
+ if (m_dailyUpdatesCheck->GetCheckState() == MythUIStateType::Full)
+ dailyupdatestate = 1;
+- gCoreContext->SaveSetting("DailyArtworkUpdates", dailyupdatestate);
++ gCoreContext->SaveSettingOnHost("DailyArtworkUpdates",
++ QString::number(dailyupdatestate), "");
+
+ Close();
+ }
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 5a5f52c..2b76928 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -61262,6 +65561,41 @@
lookup->SetAllowGeneric(true);
lookup->SetData(qVariantFromValue<VideoArtworkType>(type));
lookup->SetHost(gCoreContext->GetMasterHostName());
+diff --git a/mythtv/programs/mythfrontend/videolist.cpp b/mythtv/programs/mythfrontend/videolist.cpp
+index 9172903..9e3fad8 100644
+--- a/mythtv/programs/mythfrontend/videolist.cpp
++++ b/mythtv/programs/mythfrontend/videolist.cpp
+@@ -412,7 +412,12 @@ class VideoListImp
+ if (mp)
+ {
+ ret = mp->DeleteFile();
+- if (ret) ret = m_metadata.purgeByID(video_id);
++ if (ret)
++ {
++ ret = m_metadata.purgeByID(video_id);
++ // Force refresh
++ m_metadata_list_type = VideoListImp::ltNone;
++ }
+ }
+
+ return ret;
+diff --git a/mythtv/programs/mythfrontend/viewscheduled.cpp b/mythtv/programs/mythfrontend/viewscheduled.cpp
+old mode 100644
+new mode 100755
+index ff1e236..43ad43e
+--- a/mythtv/programs/mythfrontend/viewscheduled.cpp
++++ b/mythtv/programs/mythfrontend/viewscheduled.cpp
+@@ -282,7 +282,9 @@ void ViewScheduled::LoadList(bool useExistingData)
+ ProgramInfo *pginfo = *pit;
+ const RecStatusType recstatus = pginfo->GetRecordingStatus();
+ if ((pginfo->GetRecordingEndTime() >= now ||
+- pginfo->GetScheduledEndTime() >= now) &&
++ pginfo->GetScheduledEndTime() >= now ||
++ recstatus == rsRecording ||
++ recstatus == rsTuning) &&
+ (m_showAll ||
+ recstatus <= rsWillRecord ||
+ recstatus == rsDontRecord ||
diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp
index 8993042..de5c2e9 100644
--- a/mythtv/programs/mythtranscode/main.cpp
@@ -61971,6 +66305,40 @@
+ myth_system(command, kMSDontBlockInputDevs);
}
+diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+index 36662cd..4c73567 100755
+--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
++++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+@@ -55,7 +55,7 @@ class _Mythtv_data:
+ 'bin', executable)
+ try:
+ cmd = MythTV.System(execpath)
+- res = mbe.command('--version')
++ res = cmd.command('--version')
+ break
+ except:
+ continue
+@@ -496,9 +496,18 @@ class _Mythtv_data:
+ pass
+
+ self._data.theme = _SETTINGS.Theme
+- self._data.country = _SETTINGS.Country
++ if _DB.settings.NULL.country is not None:
++ self._data.country = _DB.settings.NULL.country
++ else:
++ self._data.country = _SETTINGS.Country
+ self._data.channel_count = len([c for c in MythTV.Channel.getAllEntries() if c.visible])
+- self._data.language = _SETTINGS.Language.lower()
++ if _DB.settings.NULL.Language is not None:
++ self._data.language = _DB.settings.NULL.Language.lower()
++ elif _SETTINGS.Language is not None:
++ self._data.language = _SETTINGS.Language.lower()
++ else:
++ # something is wrong when you have no language set at all
++ self._data.language = 'not set'
+ self._data.mythtype, self._data.remote = self.ProcessSmoltInfo()
+
+ if _DB.settings.NULL.SystemUUID is None:
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb.py b/mythtv/programs/scripts/metadata/Movie/tmdb.py
deleted file mode 100755
index 9ad4fbc..0000000
@@ -62625,7 +66993,7 @@
-if __name__ == '__main__':
- main()
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
-index 9e4edcb..c9ca4de 100755
+index 9e4edcb..5374ab1 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,7 +11,7 @@
@@ -62676,6 +67044,27 @@
continue
m = VideoMetadata()
+@@ -254,7 +267,19 @@ def main():
+ MythTV.tmdb3.request.DEBUG = True
+ set_cache(engine='null')
+ else:
+- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
++ import os
++ confdir = os.environ.get('MYTHCONFDIR', '')
++ if (not confdir) or (confdir == '/'):
++ confdir = os.environ.get('HOME', '')
++ if (not confdir) or (confdir == '/'):
++ print "Unable to find MythTV directory for metadata cache."
++ sys.exit(1)
++ confdir = os.path.join(confdir, '.mythtv')
++ confpath = os.path.join(confdir, 'pytmdb3.cache')
++ if not os.access(confpath, os.F_OK|os.W_OK|os.R_OK):
++ print "Unable to access cache file: "+confpath
++ sys.exit(1)
++ set_cache(engine='file', filename=confpath)
+
+ if opts.language:
+ set_locale(language=opts.language, fallthrough=True)
diff --git a/mythtv/themes/MythCenter-wide/notification-ui.xml b/mythtv/themes/MythCenter-wide/notification-ui.xml
index 5afeab6..49b60af 100644
--- a/mythtv/themes/MythCenter-wide/notification-ui.xml
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-19/mythtv.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mythtv.spec 6 Jan 2014 16:15:42 -0000 1.127
+++ mythtv.spec 11 Mar 2014 11:19:30 -0000 1.128
@@ -60,7 +60,7 @@
%define desktop_vendor RPMFusion
# MythTV Version string -- preferably the output from git --describe
-%define vers_string v0.27-130-gfac84fa
+%define vers_string v0.27-178-g6b14852
%define branch fixes/0.27
# Git revision and branch ID
@@ -79,7 +79,7 @@
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -175,6 +175,7 @@
BuildRequires: desktop-file-utils
BuildRequires: freetype-devel >= 2
+BuildRequires: libpng-devel
BuildRequires: gcc-c++
%if 0%{?fedora} >= 19
BuildRequires: mariadb-devel >= 5
@@ -1471,6 +1472,10 @@
%changelog
+* Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-5
+- Update to latest fixes v0.27-178-g6b14852.
+- Rebuild for x264.
+
* Mon Jan 6 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-4
- Update to latest fixes v0.27-130-gfac84fa.
- Add libcdio-paranoia to build requirements for CD audio.
10 years, 8 months
rpms/mythtv/F-20 ChangeLog, 1.14, 1.15 mythtv-0.27-fixes.patch, 1.3, 1.4 mythtv.spec, 1.135, 1.136
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7310
Modified Files:
ChangeLog mythtv-0.27-fixes.patch mythtv.spec
Log Message:
* Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-5
- Update to latest fixes v0.27-178-g6b14852.
- Rebuild for x264.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-20/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 7 Jan 2014 20:01:40 -0000 1.14
+++ ChangeLog 11 Mar 2014 11:18:54 -0000 1.15
@@ -1,3 +1,443 @@
+commit 6b14852a6a3750e1d5c1bf7d461a5338ef535cbb
+Author: David Engel <dengel(a)mythtv.org>
+Date: Thu Mar 6 15:50:52 2014 -0600
+
+ Apply preroll on virtual tuners when the same multiplex is in use.
+
+ Previously, if any tuner in the same input group was already busy,
+ preroll would not be applied. Now, if the recording on the other
+ input is on the same multiplex as the new recording, preroll will be
+ applied.
+
+ Refs #12023
+
+ (cherry picked from commit 11e65dfd38ca419b2157f0dbaa19f965647f648c)
+
+commit cb3b784dbaa5142a38d24b68be6de7fc13bf0585
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Mon Mar 3 21:35:33 2014 +1100
+
+ Change verbosity for some network messages
+ (cherry picked from commit e6245ca330bc7dcc4d358819a299b28f02f5b5a5)
+
+commit 384858c5f78c199a5ec87ed0191feb8b6049cf6c
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Mon Mar 3 11:32:25 2014 +1100
+
+ Bump API binary number following round of changes in ringbuffers
+
+commit 57c32eacfa87783b75412184cc98c6a46dea99c0
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 27 20:48:28 2014 +1100
+
+ Never attempt to read more than in 512kB blocks
+
+ Recalculate the threshold and read block size when we've encountered EOF several times in a row.
+ 512kB ought to be enough to read a file smoothly (famous last words)
+
+ This reduces the amount of unnecessary verbosity. When watching a SD 3Mbit/s DVB stream, it will take over a second to get 1MB of data, leading to a warning entry in the log for every single read.
+
+ Refs #10428
+
+ (cherry picked from commit 1cfdfa3f56876eb20170f33e9592b5c7ffd05064)
+
+commit 366ba7dd96c03a20d83a78f9875177d25e57189c
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 27 12:51:25 2014 +1100
+
+ Allow seeking within the entire liveTV chain of recordings.
+
+ Seeking across liveTV was fundamentally broken. You could only seek within the current recordings or go to the beginning of the next one or 15s to the end of the previous one.
+ This changes correct this behaviour. It is now possible to seek across the entire live TV session. We ensure however that we do not seek further than 15s from the end of a recordings (3s if reaching end of live program).
+
+ Fixes #12076
+
+ (cherry picked from commit 11daeaadc52214605e204cdfe6f7c001c9c1cc9b)
+
+commit d35650578d8bea28e4c2ccabbd3e299d5c402004
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Tue Feb 25 10:19:17 2014 +1100
+
+ Fix typo
+
+ CR got deleted for some reason
+
+ (cherry picked from commit 534394068373c52fd712d653e5fea725c564a673)
+
+commit ca275af14f60f3cc78e48ac2ad7c55e377e72774
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Sun Feb 23 20:24:28 2014 +1100
+
+ Prevent playback to exit early should backend's writes be delayed
+
+ Typical scenario is when watching on-going recordings and being very close to real time TV: should the backend take more than 360ms between two writes, the reader would treat it as an EOF and abort the read.
+
+ When encountering EOF, we now check if the file is being written to in parallel and if so wait.
+
+ We can also remove all EOF retries in FileRingBuffer::safe_read() as we definitely know now if we did reach EOF (as we check against the file size).
+ This allows for almost instantaneous program transition in live TV.
+
+ (cherry picked from commit 443b624ebcc8ea56026cb49ca833edc7d73832c1)
+
+commit 22936ebd383a96d99602781137d9ce5dec76ab8e
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Sun Feb 23 20:19:50 2014 +1100
+
+ Have backend advertise which files are currently being written to
+
+ It is necessary in some playback scenarios to know if a file being read is currently being written to. This is useful in determining when encountering EOF if we should wait for more data or abort the read.
+
+ MythCoreContext will now keep track of files as they are being opened for writing
+ Connected frontends will receive the information via the event socket in the form of a BACKEND_MESSAGE event.
+
+ The myth protocol is extended with two new BACKEND_MESSAGE events:
+ FILE_WRITTEN: Sent when a file is opened in write mode, and when the file is being written to (at most every 10s)
+ FILE_CLOSED: Sent when the file opened in write mode is closed.
+
+ The myth protocol version doesn’t have to be increased as frontends will make use of it only if available and the changes are backward compatible with exiting myth protocol.
+
+ (cherry picked from commit fafc658597b547e2f0173032515e9790170ebcbe)
+
+ Conflicts:
+ mythtv/libs/libmythbase/threadedfilewriter.cpp
+
+commit 0b9470c87fe4d727e173cddf715270da7d18311e
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Thu Feb 20 16:48:44 2014 +1100
+
+ Fix fileringbuffer locking up on read()
+
+ From time to time, most often seen during LiveTV, FileRingBuffer::safe_read() would lock and not return for a long time (on my system, it would block in excess of 20s).
+ Upon investigation, the issue occurs while reading a file currently being written to, if a call to read() encountered EOF, returned early and a following call to read() was made, before another write. Under those conditions, read() wouldn't return for a long time, causing the backend to abort the read and dropping the frontend connection.
+
+ So instead we now check the size of the current file via a call to POSIX fstat and never try to read beyond the EOF position.
+ If the file being read isn't a regular, or fstat returned an error, the old behaviour is used: read until we get as much data as we asked.
+
+ Surprisingly, this has fixed most of the issues I've been having for years with liveTV:
+ - Stuttering or temporary free when close to the live
+ - Freeze at program transition.
+
+ Add debugging information while in file mode
+
+ Fixes #12045
+
+ (cherry picked from commit 20f7cd2858e79385ceec07b2c19c7e4f84714e18)
+
+commit 28b768a4b9e2fa3b76835057378512cb41a3838c
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 11:30:29 2014 +0000
+
+ Enable compilation of a couple of files that were disabled on Qt5 because they are apparently not compatible. They build, so let them.
+
+commit 784c236ed0ea5cc69f829ac71833a2ede5107882
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 11:11:37 2014 +0000
+
+ Fix mythnetvision.pro for Qt5
+
+commit 4fd068eb3f34eb5e8f35e4035fcb33d106ed0171
+Author: Stuart Auchterlonie <stuarta(a)mythtv.org>
+Date: Tue Feb 25 12:16:22 2014 +0000
+
+ Remove check_cxxflags which doesn't work
+
+commit 83ddcc8dda52365c38e5c767cc2479e59c576442
+Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com>
+Date: Wed Feb 19 17:00:15 2014 +0000
+
+ Resolve X11/Xlib.h define of Bool and Qt5 (5.2)
+
+ Xlib.h has a "#define Bool int", which causes compilation issues with other uses of
+ Bool, specifically in qsonvalue.h in Qt5. This patch rearranges the MythTV source file
+ includes to bypass the issue.
+
+ Fixes #12065
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+
+ Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org>
+
+commit 0a8ffeb2da6bea0ac4005147ea80aa4f9203ed4d
+Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+Date: Mon Feb 24 23:47:10 2014 +0000
+
+ Rewrite qmake detection to better support Qt5 - plugins
+
+commit 0a8d441988d432c60d544b22c842eaacb5dec91e
+Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net>
+Date: Mon Feb 24 20:50:39 2014 +0000
+
+ Rewrite qmake detection to better support Qt5
+
+commit e77d5977c1ee8a74beceafb2d3886ba7e59e9f63
+Author: John Poet <jpoet(a)mythtv.org>
+Date: Sun Feb 9 15:20:04 2014 -0700
+
+ Some HLS tweaks to make recording more robust when faced with unreliable
+ feeds.
+
+ (cherry picked from commit 7f8dd24816a251d51b3cb42173d7dd19a4ba1a52)
+
+commit 65668cd6b98f36532fd478f4b6c491a8273c467e
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sun Feb 23 10:22:01 2014 -0500
+
+ Allow tmdb3.py to use $MYTHCONFDIR as a cache location.
+
+ This makes tmdb3.py follow the standard behavior of using MYTHCONFDIR,
+ falling back to HOME, for its selection of scratch space. This also adds
+ explicit error reporting to stdout when something goes wrong.
+
+ Refs #11876
+
+ (cherry picked from commit 2c50a824be1f3083ca966ff0309ea39854452b29)
+
+commit ab18cb1166d53a0bf14bc4f49c568be8f2240fd8
+Author: angelaschmid <angela.schmid(a)wolke7.net>
+Date: Sun Jan 5 20:19:56 2014 +0100
+
+ detect cropped HD (720p) content
+
+ Fixes #12048
+ (cherry picked from commit 2a026c45758a495fee0b4a4e7557901c6f701797)
+
+commit 147dec5cd8b82f310277043fcb4f33ecc50c4bf0
+Author: Angela Schmid <angela.schmid(a)wolke7.net>
+Date: Tue Feb 18 10:58:02 2014 -0600
+
+ Always show programs that are still recording in ViewScheduled.
+
+ Includes a minor change by David Engel.
+
+ Backport to fixes/0.27.
+
+ Refs #12060
+
+commit 9bf1070d86ab4ca515830f4d330f7b720830463c
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Tue Feb 11 13:16:43 2014 +0000
+
+ MythMusic: fix the goom visualizer
+
+ * use the correct image format to convert the Goom buffer to a QImage
+ * re-enable the scale factors so you can reduce the cpu utililization
+ Increasing the scale factors will reduce the amount of data to be processed
+ by Goom but that will also make the image more blocky.
+ * increase the maximum scale factor to 4 (MythGoom allows 1, 2 or 4 to be used)
+
+ Fixes #11023.
+
+ (cherry picked from commit 8e0c6c505cf727dd00404ede6afb6c76e06101a5)
+
+commit 75e71d3dad4ac873531005ea27ae9529c4494459
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Mon Feb 10 18:48:52 2014 -0500
+
+ Add housekeeper startup delay.
+
+ This delays creation of the first HouseKeepingThread until the first
+ cycle, which is one minute after creation. This will allow time for
+ other potentially necessary subsystems to come up on init, should the
+ HouseKeeperTasks need them. Tasks tagged as kHKRunImmediateOnStartup
+ will still be run in-thread immediately as the housekeeper is started.
+
+ Fixes #12042
+ (cherry picked from commit 3d14864fe8ef06147ec8cc0d6af39d89fb29b2f9)
+
+commit d48bbd891921d33f5fb34ccc46044ad8987183fb
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Mon Feb 10 00:16:37 2014 +0100
+
+ Only force a refresh of the metadata rather than invalidating the cache as that causes a crash if file system browsing is enabled.
+
+ Refs #12052
+ (cherry picked from commit d7bee2a3cca4a76feade96a29094a3eb3affb23b)
+
+commit f5e61804d7a8ad6afc4aa4484e2c05f24ddb396b
+Author: Amar Takhar <verm(a)darkbeer.org>
+Date: Wed Jan 15 21:44:48 2014 +0000
+
+ Fixes for FreeBSD 10.0 + clang
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit 366b73bc672d45be94b981a944f9f415b44ea13c)
+
+commit de615b3360219838e446ae75328730c2ff49d64f
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Sun Feb 9 20:57:25 2014 +0100
+
+ Invalidate the cache after deleting a video file to ensure the free'd entry is removed.
+
+ Fixes #12052
+ (cherry picked from commit ffd38d1bba28aea710ad095c4e0844fe63381b38)
+
+commit 6b37da2534321ef9132d1fac29ca9efa48def326
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sun Jan 26 00:41:49 2014 +0100
+
+ let Smolt search for the country as global and local setting
+
+ Country became a global setting in [bf6fc7cd39]. This allows me to upload my
+ profile instead of getting error 500 from the server. It might be just
+ correlation though.
+ (cherry picked from commit 6c1f811d61de5aeaa8b4355c3b7b8dca18899aed)
+
+commit b4858000bdb375be898ee824fbbebbb14fc127ec
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Sat Jan 25 23:15:34 2014 +0100
+
+ let Smolt search for the langauge as global and local setting
+
+ Language became a global setting in [bf6fc7cd39].
+ (cherry picked from commit de17fc4ab4f830d2d317c7522f0e584c9ed86a93)
+
+commit 5c1cdb0e96367b56258d99cdbb56a0727bf6793c
+Author: Richard Hulme <peper03(a)mythtv.org>
+Date: Thu Feb 6 00:06:10 2014 +0100
+
+ Explicitly set the audio capabilities of the DVD VM to indicate all audio types are supported. This makes DVDs that check this VM register play properly.
+ (cherry picked from commit 501de627233cdffc1032932fd0611fd2e32abca4)
+
+commit 1b7404d64080a69373f3b37fc174a5b62f9143ba
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Mon Feb 3 07:33:18 2014 -0500
+
+ Use proper string conversion for DailyArtworkUpdates setting.
+
+ Refs #12033
+ (cherry picked from commit e45e1ca7bf329e8ecea218f0e47cc080ad736b7e)
+
+commit eaafcb4a917c1b6055e5fb908a3bc6b747aba1c4
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sun Feb 2 02:25:26 2014 -0500
+
+ Make "DailyArtworkUpdates" a global option
+
+ This makes the DailyArtworkUpdates setting a global setting so it can be
+ properly configured on any frontend. This patch does not include any
+ code to fix an existing improperly configured setting, which could cause
+ problems in the future, as the per-host option will override the global
+ one and will be uneditable without direct database modification.
+
+ Refs #12033
+ (cherry picked from commit ffa364019e7d5bc0b88f4c83d21511090735b45d)
+
+commit 4ee21a4ca0c6f85e6c6b5f55cb3bbc5b623a5e14
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Feb 1 18:09:41 2014 +0000
+
+ Fix segfault in MythUIButtonList::GetItemCurrent(). Fixes #12040
+ (cherry picked from commit 4211abf7d62b9e15a61731bd1ae19400302c92ff)
+
+commit 6b353625177a4dd6483b9b8c9e0d1051d4549e8d
+Merge: b249ad4 1d9d46b
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Jan 30 09:14:06 2014 -0500
+
+ Merge commit '1d9d46beff7a7591ebbfa6e13c080617e660e52d' into fixes/0.27
+
+ Conflicts:
+ mythtv/bindings/python/tmdb3/tmdb3/pager.py
+
+commit b249ad4d241b8a3adf7b3cde8a26b03e736febd2
+Author: Stefan Becker <chemobejk(a)gmail.com>
+Date: Fri Dec 13 22:12:04 2013 +0200
+
+ Bind to multicast address instead of ANY
+
+ If multiple servers multicast content on the same port we can't receive
+ it on multiple recorders if bind to QHostAddress::Any. If we bind to the
+ multicast address we don't have this problem. Problem discovered and
+ patched by Niels Ole Kirkeby.
+
+ Note: This also adds error handling for when a bind fails.
+
+ Fixes #11979
+ Fixes #12036
+
+ The tickets contain multiple reports of success.
+ (cherry picked from commit f2defe87d63fbe544c7333af0ca5b04aa078ebf4)
+
+commit 1d9d46beff7a7591ebbfa6e13c080617e660e52d
+Author: Amar Takhar <verm(a)darkbeer.org>
+Date: Tue Jan 28 19:00:44 2014 +0000
+
+ Correct mispelling in cache_file.py
+
+ This corrects a misspelling in error handling code that would cause an
+ irrelevant error to be thrown when unable to access an existing cache
+ file. This misspelling issue would only appear after a fatal error had
+ occurred, so there is no change in behavior.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+
+commit f1e620c6fcaead237ee01c9aa7d0bd5380571189
+Author: pjokinen <pjokinen(a)gmail.com>
+Date: Mon Jan 27 12:26:34 2014 -0600
+
+ Add mplexid to dummy entries when scheduling around live TV.
+
+ This was missed when the mplexid optimization was done. Thanks to
+ pjokinen for spotting it and submitting the patch.
+
+ Refs #12032
+
+ Signed-off-by: David Engel <dengel(a)mythtv.org>
+
+ (cherry picked from commit 2ebd924706b97015e15f3075f93e03bfc1616fef)
+
+commit 5a5e1cd52906e10a1aa15c207764b8bdcab8caa6
+Author: David Engel <dengel(a)mythtv.org>
+Date: Tue Jan 21 14:29:39 2014 -0600
+
+ Update record.last_record/deleted to UTC.
+
+ Backport to fixes/0.27.
+
+ These were missed in the upgrade to schema version 1303. Note that
+ this change only works for those who haven't yet upgraded. It's too
+ difficult to impossible to fix this for those who have already
+ upgraded.
+
+ Fixes #12024
+
+ (cherry picked from commit e523eedc7fb884eaa147b77091aa30ff52c54929)
+
+commit 99f546453ada182e40f1ee27c294e17611b5dfed
+Author: Karl Dietz <dekarl(a)mythtv.org>
+Date: Mon Jan 13 23:23:33 2014 +0100
+
+ missed variable rename in Smolt data collection in ba8a1608cf
+
+ (cherry picked from commit 211989bea523f6a41b2e88c8e63cb37b56949955)
+
+commit 8307dd4990189d65e3b99039d77d84f6a8c81a96
+Author: John Poet <jpoet(a)mythtv.org>
+Date: Sun Jan 12 14:42:59 2014 -0700
+
+ In [50e5f4501] I failed to account for a possible path through
+ TuningFrequency(), and removed a necessary call to SetChannelByString().
+
+ I big thank you to warpme for identifying the problem and solution.
+
+ Fixes #11989
+
+ (cherry picked from commit 5208a3a5512a4059b3cb59f4da65503003f3348f)
+
+commit 4c12503a741c5e2fa199eac414e4bafe53d51c12
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Fri Jan 10 19:42:39 2014 +0000
+
+ MythMusic: Fix detection of compilations using special MusicBrainz Artist ID
+
+ Look at all the fields in the 'TXXX=MusicBrainz Album Artist Id' frame for the special
+ various artists ID not just the first one which in current version of the taglib
+ contains the tags description.
+
+ Refs #10235.
+ Fixes #12000.
+
+ (cherry picked from commit 6530ac633300a32c76db0d10cf8d107aa712a62c)
+
commit fac84fab9c8c6e43f51d3090e13e05e68db0ef6e
Author: Paul Harrison <pharrison(a)mythtv.org>
Date: Sat Jan 4 10:12:23 2014 +0000
@@ -193,6 +633,24 @@
Correct issue where TMDB returns less results than claimed.
(cherry picked from commit 24bcf67da973e4eee738eca68fb5cea36e7c1306)
+commit 29922d1a16ed2d818f7ec7602207029cb372f53f
+Merge: e3d4c07 e3802e5
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Nov 29 14:05:17 2013 -0500
+
+ Merge branch 'master' of github.com:wagnerrp/pytmdb3
+
+commit e3d4c07ee59886e92e995addf0ad226f629adcf4
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Nov 29 14:02:55 2013 -0500
+
+ Updates for television data.
+
+ This updates the version number and readme for the new Television series
+ support on TheMovieDb.org. I still want to do some tweeking on the names
+ and general presentation, but this has been sitting around for long
+ enough and should get pushed upstream.
+
commit e5acf0cdd90f839aff2820e52daedeef42a509a9
Author: Paul Harrison <pharrison(a)mythtv.org>
Date: Fri Nov 22 23:55:54 2013 +0000
@@ -347,6 +805,15 @@
(cherry picked from commit ee5de540587a55f8b749da5ece22a15b163619c8)
+commit e3802e53b7fe556ee98639c57f7a83e84b3c2468
+Merge: 4965933 70a9dc8
+Author: wagnerrp <rwagner(a)mythtv.org>
+Date: Sun Nov 17 09:14:09 2013 -0800
+
+ Merge pull request #32 from Toilal/master
+
+ Registered and uploaded on PyPI.
+
commit fa94c154c79d0752eb0eb59e579e1985ccf26532
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sun Nov 17 11:22:58 2013 +0000
@@ -642,6 +1109,12 @@
(cherry picked from commit 1e3d70b1b0ef74615c7f7f59e1bfef3621842a3e)
+commit 6a5050f86ad3eab90bfbec174edaaf9eb711bca4
+Author: Fabian Möller <fabianm88(a)gmail.com>
+Date: Thu Oct 31 17:52:11 2013 +0100
+
+ Add support for the new tv api
+
commit 8845997d30dd093ea35426dca80222f7ab0c4a8f
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Tue Oct 29 19:51:58 2013 -0400
@@ -709,6 +1182,27 @@
Fix marking of 1080/720 videos.
(cherry picked from commit 7ed0e5fb3dd90eca4eb9cdf8371be11e80a41fa6)
+commit 70a9dc84046c2081b89e2a81f34e94a25fa14f72
+Author: Toilal <toilal.dev(a)gmail.com>
+Date: Fri Oct 25 10:36:23 2013 +0200
+
+ Registered and uploaded on PyPI. Fix #31
+
+commit 4965933adc5e309406ad931c1f6666d22ae845f8
+Merge: 053778c e47fd39
+Author: wagnerrp <rwagner(a)mythtv.org>
+Date: Wed Oct 23 17:00:47 2013 -0700
+
+ Merge pull request #30 from Toilal/master
+
+ Fixed version in setup.py
+
+commit e47fd39eb06bc33e221b7bef25cb18ed99a9bad7
+Author: Rémi Alvergnat <remi.alvergnat(a)gmail.com>
+Date: Wed Oct 23 23:00:19 2013 +0200
+
+ Fixed version in setup.py
+
commit 29eab516202aa76aeb769ed636c183ba3ed0efcf
Author: John Poet <jpoet(a)mythtv.org>
Date: Wed Oct 23 12:20:57 2013 -0600
@@ -1020,6 +1514,16 @@
Refs #11891
+commit 053778ce07c6080cb1343c8187d346179fccd34f
+Author: Richard O'Dwyer <richard(a)richard.do>
+Date: Thu Aug 29 00:41:00 2013 +0000
+
+ PEP8 code style updates.
+
+ Modified from original commit.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+
commit 77db95785de9b80f87b96a46220124a1fcc50bf8
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Sat Oct 5 21:30:45 2013 +0100
@@ -1270,3 +1774,23 @@
by me and Roger Mårtensson (thank you!).
(cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c)
+
+commit abae25afb73f967421eb7797a868a9bdb187c18c
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 12 21:40:14 2013 -0400
+
+ Enable --debug flag in test application.
+
+commit 0d91e6fc4184c17c5a9d39e1b2a264602a47747d
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 12 21:35:05 2013 -0400
+
+ Have pager return Nones if the server returns null.
+
+ This temporarily resolves an issue where the TheMovieDb server returns
+ nulls in searches when a movie has been deleted but not yet flushed out
+ of the cache. This prevents the error internally, but does not attempt
+ to re-order to remove the nulls, so is merely passing the issue onto the
+ application using this library.
+
+ Refs #29
mythtv-0.27-fixes.patch:
b/mythplugins/configure | 18
b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary
b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197
b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4
b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4
b/mythplugins/mytharchive/mythburn/scripts/mythburn.py | 19
b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary
b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126
b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary
b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965
b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary
b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136
b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary
b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902
b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9
b/mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34
b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33
b/mythplugins/mythmusic/mythmusic/importmusic.cpp | 4
b/mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102
b/mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94
b/mythplugins/mythmusic/mythmusic/musicplayer.h | 3
b/mythplugins/mythmusic/mythmusic/playlist.cpp | 2
b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp | 16
b/mythplugins/mythmusic/mythmusic/searchview.cpp | 15
b/mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4
b/mythplugins/mythmusic/mythmusic/streamview.cpp | 7
b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp | 4
b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary
b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279
b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro | 5
b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary
b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76
b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary
b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62
b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary
b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183
b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 13
b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 655
b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101
b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 25
b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp | 8
b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.h | 2
b/mythplugins/mythzoneminder/mythzoneminder/zmdefines.h | 11
b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp | 64
b/mythplugins/mythzoneminder/mythzoneminder/zmevents.h | 1
b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64
b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp | 21
b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.h | 3
b/mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml | 244
b/mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml | 203
b/mythtv/bindings/python/MythTV/dataheap.py | 1
b/mythtv/bindings/python/MythTV/system.py | 11
b/mythtv/bindings/python/scripts/mythpython | 4
b/mythtv/bindings/python/setup.py | 6
b/mythtv/bindings/python/tmdb3/README | 86
b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py | 5
b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1
b/mythtv/bindings/python/tmdb3/setup.py | 15
b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3
b/mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40
b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30
b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54
b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18
b/mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24
b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26
b/mythtv/bindings/python/tmdb3/tmdb3/request.py | 59
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35
b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90
b/mythtv/bindings/python/tmdb3/tmdb3/util.py | 201
b/mythtv/configure | 18
b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8
b/mythtv/external/FFmpeg/libavformat/mpeg.c | 10
b/mythtv/i18n/mythfrontend_sv.qm |binary
b/mythtv/i18n/mythfrontend_sv.ts |28897 +++++-----
b/mythtv/libs/libmyth/libmyth.pro | 6
b/mythtv/libs/libmyth/programinfo.cpp | 283
b/mythtv/libs/libmyth/programinfo.h | 17
b/mythtv/libs/libmyth/programtypes.h | 2
b/mythtv/libs/libmyth/remoteutil.h | 2
b/mythtv/libs/libmythbase/housekeeper.cpp | 22
b/mythtv/libs/libmythbase/housekeeper.h | 2
b/mythtv/libs/libmythbase/libmythbase.pro | 6
b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3
b/mythtv/libs/libmythbase/mythcorecontext.cpp | 138
b/mythtv/libs/libmythbase/mythcorecontext.h | 4
b/mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1
b/mythtv/libs/libmythbase/mythmiscutil.h | 1
b/mythtv/libs/libmythbase/mythsingledownload.cpp | 86
b/mythtv/libs/libmythbase/mythsingledownload.h | 49
b/mythtv/libs/libmythbase/mythsocket.cpp | 12
b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8
b/mythtv/libs/libmythbase/mythsystemlegacy.h | 1
b/mythtv/libs/libmythbase/mythtimer.cpp | 2
b/mythtv/libs/libmythbase/mythtimezone.cpp | 1
b/mythtv/libs/libmythbase/mythversion.h | 2
b/mythtv/libs/libmythbase/threadedfilewriter.cpp | 72
b/mythtv/libs/libmythbase/threadedfilewriter.h | 1
b/mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1
b/mythtv/libs/libmythmetadata/metadatacommon.cpp | 23
b/mythtv/libs/libmythmetadata/metadatafactory.cpp | 6
b/mythtv/libs/libmythmetadata/metaio.cpp | 8
b/mythtv/libs/libmythmetadata/metaio.h | 2
b/mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2
b/mythtv/libs/libmythmetadata/metaioid3.cpp | 15
b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 14
b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3
b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5
b/mythtv/libs/libmythtv/cardutil.cpp | 22
b/mythtv/libs/libmythtv/cardutil.h | 8
b/mythtv/libs/libmythtv/dbcheck.cpp | 6
b/mythtv/libs/libmythtv/fileringbuffer.cpp | 53
b/mythtv/libs/libmythtv/libmythtv.pro | 14
b/mythtv/libs/libmythtv/livetvchain.cpp | 230
b/mythtv/libs/libmythtv/livetvchain.h | 9
b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2
b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2
b/mythtv/libs/libmythtv/mythplayer.cpp | 97
b/mythtv/libs/libmythtv/mythplayer.h | 4
b/mythtv/libs/libmythtv/previewgenerator.cpp | 6
b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2
b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140
b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32
b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392
b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162
b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70
b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55
b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193
b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103
b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103
b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38
b/mythtv/libs/libmythtv/recorders/channelbase.cpp | 4
b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12
b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6
b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.cpp | 96
b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5
b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2
b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105
b/mythtv/libs/libmythtv/recorders/iptvchannel.h | 20
b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17
b/mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1
b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46
b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h | 3
b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp | 28
b/mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4
b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3
b/mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2
b/mythtv/libs/libmythtv/recorders/streamhandler.h | 1
b/mythtv/libs/libmythtv/recordinginfo.cpp | 143
b/mythtv/libs/libmythtv/ringbuffer.cpp | 82
b/mythtv/libs/libmythtv/tv_play.cpp | 84
b/mythtv/libs/libmythtv/tv_play.h | 1
b/mythtv/libs/libmythtv/tv_rec.cpp | 69
b/mythtv/libs/libmythtv/tv_rec.h | 1
b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2
b/mythtv/libs/libmythtv/videooutbase.cpp | 2
b/mythtv/libs/libmythtv/videosource.cpp | 2
b/mythtv/libs/libmythtv/vsync.cpp | 8
b/mythtv/libs/libmythui/mythgesture.cpp | 1
b/mythtv/libs/libmythui/mythpainter.cpp | 1
b/mythtv/libs/libmythui/mythuibuttonlist.cpp | 8
b/mythtv/libs/libmythupnp/httprequest.cpp | 3
b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4
b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 52
b/mythtv/programs/mythbackend/backendhousekeeper.h | 1
b/mythtv/programs/mythbackend/mainserver.cpp | 47
b/mythtv/programs/mythbackend/mainserver.h | 2
b/mythtv/programs/mythbackend/playbacksock.cpp | 6
b/mythtv/programs/mythbackend/playbacksock.h | 3
b/mythtv/programs/mythbackend/scheduler.cpp | 79
b/mythtv/programs/mythbackend/services/dvr.cpp | 2
b/mythtv/programs/mythbackend/services/guide.cpp | 61
b/mythtv/programs/mythbackend/services/serviceUtil.cpp | 6
b/mythtv/programs/mythcommflag/main.cpp | 6
b/mythtv/programs/mythfilldatabase/filldata.cpp | 81
b/mythtv/programs/mythfilldatabase/filldata.h | 7
b/mythtv/programs/mythfilldatabase/main.cpp | 12
b/mythtv/programs/mythfrontend/grabbersettings.cpp | 3
b/mythtv/programs/mythfrontend/guidegrid.cpp | 450
b/mythtv/programs/mythfrontend/guidegrid.h | 50
b/mythtv/programs/mythfrontend/scheduleeditor.cpp | 18
b/mythtv/programs/mythfrontend/videolist.cpp | 7
b/mythtv/programs/mythfrontend/viewscheduled.cpp | 4
b/mythtv/programs/mythtranscode/main.cpp | 3
b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 2
b/mythtv/programs/mythtranscode/transcode.cpp | 7
b/mythtv/programs/mythtv-setup/importicons.cpp | 107
b/mythtv/programs/mythtv-setup/importicons.h | 1
b/mythtv/programs/mythutil/commandlineparser.cpp | 35
b/mythtv/programs/mythutil/markuputils.cpp | 157
b/mythtv/programs/mythutil/mythutil.cpp | 6
b/mythtv/programs/mythwelcome/welcomedialog.cpp | 30
b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 15
b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33
b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2
b/mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242
b/mythtv/themes/MythCenter/notification-ui.xml | 2
mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99
mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157
mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317
mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45
mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266
mythtv/programs/scripts/metadata/Movie/tmdb.py | 647
203 files changed, 25919 insertions(+), 19472 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.27-fixes.patch
Index: mythtv-0.27-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-20/mythtv-0.27-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.27-fixes.patch 7 Jan 2014 20:01:40 -0000 1.3
+++ mythtv-0.27-fixes.patch 11 Mar 2014 11:18:54 -0000 1.4
@@ -1,3 +1,4 @@
+ mythplugins/configure | 18 +-
mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes
mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +-
.../mytharchive/mytharchive/archiveutil.cpp | 4 +-
@@ -13,6 +14,7 @@
mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +-
mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 +-
mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 +-
+ mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +-
mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +-
mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +-
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94 +-
@@ -22,8 +24,10 @@
mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +-
mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +-
mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +-
+ .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +-
mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes
mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +-
+ .../mythnetvision/mythnetvision/mythnetvision.pro | 5 +-
mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes
mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +-
mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes
@@ -54,54 +58,87 @@
mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 -
mythtv/bindings/python/scripts/mythpython | 4 +-
mythtv/bindings/python/setup.py | 6 +-
+ mythtv/bindings/python/tmdb3/README | 86 +-
+ .../python/tmdb3/scripts/populate_locale.py | 5 +-
+ mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 -
+ mythtv/bindings/python/tmdb3/setup.py | 15 +-
+ mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 +-
+ mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 +-
+ mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 +-
+ mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 +-
+ mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 +-
+ mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 +-
+ mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 +-
+ .../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 +-
+ mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 +-
+ mythtv/configure | 18 +-
mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +-
mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +-
mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes
mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++---------
+ mythtv/libs/libmyth/libmyth.pro | 6 +-
mythtv/libs/libmyth/programinfo.cpp | 283 +-
mythtv/libs/libmyth/programinfo.h | 17 +
mythtv/libs/libmyth/programtypes.h | 2 +-
- mythtv/libs/libmythbase/housekeeper.cpp | 19 +-
+ mythtv/libs/libmyth/remoteutil.h | 2 +
+ mythtv/libs/libmythbase/housekeeper.cpp | 22 +-
mythtv/libs/libmythbase/housekeeper.h | 2 +
mythtv/libs/libmythbase/libmythbase.pro | 6 +-
mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +-
- mythtv/libs/libmythbase/mythcorecontext.cpp | 36 +-
+ mythtv/libs/libmythbase/mythcorecontext.cpp | 138 +-
+ mythtv/libs/libmythbase/mythcorecontext.h | 4 +
mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 -
- mythtv/libs/libmythbase/mythsingledownload.cpp | 82 +
- mythtv/libs/libmythbase/mythsingledownload.h | 44 +
+ mythtv/libs/libmythbase/mythmiscutil.h | 1 +
+ mythtv/libs/libmythbase/mythsingledownload.cpp | 86 +
+ mythtv/libs/libmythbase/mythsingledownload.h | 49 +
mythtv/libs/libmythbase/mythsocket.cpp | 12 +
mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +-
+ mythtv/libs/libmythbase/mythsystemlegacy.h | 1 +
+ mythtv/libs/libmythbase/mythtimer.cpp | 2 +
+ mythtv/libs/libmythbase/mythtimezone.cpp | 1 +
mythtv/libs/libmythbase/mythversion.h | 2 +-
+ mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +-
+ mythtv/libs/libmythbase/threadedfilewriter.h | 1 +
+ mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 +
mythtv/libs/libmythmetadata/metadatacommon.cpp | 23 +-
mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +-
mythtv/libs/libmythmetadata/metaio.cpp | 8 +
mythtv/libs/libmythmetadata/metaio.h | 2 +
mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 -
+ mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +-
.../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +-
mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +-
mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +-
mythtv/libs/libmythtv/cardutil.cpp | 22 +
mythtv/libs/libmythtv/cardutil.h | 8 +
+ mythtv/libs/libmythtv/dbcheck.cpp | 6 +-
+ mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +-
mythtv/libs/libmythtv/libmythtv.pro | 14 +
+ mythtv/libs/libmythtv/livetvchain.cpp | 230 +-
+ mythtv/libs/libmythtv/livetvchain.h | 9 +-
mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 +-
mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +-
- mythtv/libs/libmythtv/mythplayer.cpp | 19 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 97 +-
mythtv/libs/libmythtv/mythplayer.h | 4 +
mythtv/libs/libmythtv/previewgenerator.cpp | 6 +-
mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +-
- .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 125 +
+ .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 +
.../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 +
- mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1328 +
- mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 148 +
- mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 64 +
- mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 53 +
- mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 191 +
- mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 98 +
- .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 75 +
- .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 37 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 +
+ mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 +
+ .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 +
+ .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 +
mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +-
.../libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 +
- .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 91 +-
+ mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +-
+ .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 +-
mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +-
mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +-
mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +-
@@ -110,25 +147,33 @@
mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 -
.../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +-
.../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +-
+ .../libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 +-
mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 +-
mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +-
mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 +
mythtv/libs/libmythtv/recorders/streamhandler.h | 1 +
mythtv/libs/libmythtv/recordinginfo.cpp | 143 +-
+ mythtv/libs/libmythtv/ringbuffer.cpp | 82 +-
mythtv/libs/libmythtv/tv_play.cpp | 84 +-
mythtv/libs/libmythtv/tv_play.h | 1 +
mythtv/libs/libmythtv/tv_rec.cpp | 69 +-
mythtv/libs/libmythtv/tv_rec.h | 1 +
mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 2 +-
mythtv/libs/libmythtv/videosource.cpp | 2 +-
+ mythtv/libs/libmythtv/vsync.cpp | 8 +-
+ mythtv/libs/libmythui/mythgesture.cpp | 1 +
+ mythtv/libs/libmythui/mythpainter.cpp | 1 +
+ mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +-
mythtv/libs/libmythupnp/httprequest.cpp | 3 +-
+ mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 +
mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +-
mythtv/programs/mythbackend/backendhousekeeper.h | 1 +
mythtv/programs/mythbackend/mainserver.cpp | 47 +-
mythtv/programs/mythbackend/mainserver.h | 2 +-
mythtv/programs/mythbackend/playbacksock.cpp | 6 +-
mythtv/programs/mythbackend/playbacksock.h | 3 -
- mythtv/programs/mythbackend/scheduler.cpp | 75 +-
+ mythtv/programs/mythbackend/scheduler.cpp | 79 +-
mythtv/programs/mythbackend/services/dvr.cpp | 2 +-
mythtv/programs/mythbackend/services/guide.cpp | 61 +-
.../programs/mythbackend/services/serviceUtil.cpp | 6 +
@@ -136,9 +181,12 @@
mythtv/programs/mythfilldatabase/filldata.cpp | 81 +-
mythtv/programs/mythfilldatabase/filldata.h | 7 +-
mythtv/programs/mythfilldatabase/main.cpp | 12 +-
+ mythtv/programs/mythfrontend/grabbersettings.cpp | 3 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 450 +-
mythtv/programs/mythfrontend/guidegrid.h | 50 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 +-
+ mythtv/programs/mythfrontend/videolist.cpp | 7 +-
+ mythtv/programs/mythfrontend/viewscheduled.cpp | 4 +-
mythtv/programs/mythtranscode/main.cpp | 3 +-
mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 +
mythtv/programs/mythtranscode/transcode.cpp | 7 +-
@@ -148,13 +196,45 @@
mythtv/programs/mythutil/markuputils.cpp | 157 +-
mythtv/programs/mythutil/mythutil.cpp | 6 +
mythtv/programs/mythwelcome/welcomedialog.cpp | 30 +-
+ .../distros/mythtv_data/data_mythtv.py | 15 +-
mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 -
- mythtv/programs/scripts/metadata/Movie/tmdb3.py | 19 +-
+ mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33 +-
mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +-
mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 +-
mythtv/themes/MythCenter/notification-ui.xml | 2 +-
- 155 files changed, 24207 insertions(+), 18842 deletions(-)
+ 204 files changed, 25919 insertions(+), 19472 deletions(-)
+diff --git a/mythplugins/configure b/mythplugins/configure
+index bda1fbc..b9086ba 100755
+--- a/mythplugins/configure
[...5699 lines suppressed...]
-@@ -2665,8 +2667,16 @@ void Scheduler::HandleIdleShutdown(
+@@ -2665,8 +2670,16 @@ void Scheduler::HandleIdleShutdown(
return;
// we release the block when a client connects
@@ -59940,7 +64217,7 @@
else
{
QDateTime curtime = MythDate::current();
-@@ -2681,7 +2691,8 @@ void Scheduler::HandleIdleShutdown(
+@@ -2681,7 +2694,8 @@ void Scheduler::HandleIdleShutdown(
recording = true;
}
@@ -59950,7 +64227,7 @@
{
// have we received a RESET_IDLETIME message?
resetIdleTime_lock.lock();
-@@ -2712,6 +2723,28 @@ void Scheduler::HandleIdleShutdown(
+@@ -2712,6 +2726,28 @@ void Scheduler::HandleIdleShutdown(
(idleWaitForRecordingTime * 60) +
idleTimeoutSecs)
{
@@ -59979,7 +64256,7 @@
idleSince = QDateTime();
}
}
-@@ -2858,6 +2891,16 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
+@@ -2858,6 +2894,16 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
QDateTime restarttime = nextRecording->GetRecordingStartTime()
.addSecs((-1) * prerollseconds);
@@ -59996,7 +64273,7 @@
int add = gCoreContext->GetNumSetting("StartupSecsBeforeRecording", 240);
if (add)
restarttime = restarttime.addSecs((-1) * add);
-@@ -2900,6 +2943,10 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
+@@ -2900,6 +2946,10 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
m_isShuttingDown = false;
return;
}
@@ -60007,7 +64284,15 @@
}
// tell anyone who is listening the master server is going down now
-@@ -5078,17 +5125,29 @@ bool Scheduler::WasStartedAutomatically()
+@@ -5047,6 +5097,7 @@ void Scheduler::SchedLiveTV(void)
+ dummy->SetRecordingEndTime(schedTime.addSecs(1800));
+ dummy->SetCardID(enc->GetCardID());
+ dummy->SetInputID(in.inputid);
++ dummy->mplexid = dummy->QueryMplexID();
+ dummy->SetRecordingStatus(rsUnknown);
+
+ retrylist.push_front(dummy);
+@@ -5078,17 +5129,29 @@ bool Scheduler::WasStartedAutomatically()
// if we don't have a valid startup time assume we were started manually
if (startupTime.isValid())
{
@@ -60453,6 +64738,20 @@
if (sourceid != -1)
{
+diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp
+index 1d526cc..146c32f 100644
+--- a/mythtv/programs/mythfrontend/grabbersettings.cpp
++++ b/mythtv/programs/mythfrontend/grabbersettings.cpp
+@@ -250,7 +250,8 @@ void GrabberSettings::slotSave(void)
+ int dailyupdatestate = 0;
+ if (m_dailyUpdatesCheck->GetCheckState() == MythUIStateType::Full)
+ dailyupdatestate = 1;
+- gCoreContext->SaveSetting("DailyArtworkUpdates", dailyupdatestate);
++ gCoreContext->SaveSettingOnHost("DailyArtworkUpdates",
++ QString::number(dailyupdatestate), "");
+
+ Close();
+ }
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 5a5f52c..2b76928 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -61262,6 +65561,41 @@
lookup->SetAllowGeneric(true);
lookup->SetData(qVariantFromValue<VideoArtworkType>(type));
lookup->SetHost(gCoreContext->GetMasterHostName());
+diff --git a/mythtv/programs/mythfrontend/videolist.cpp b/mythtv/programs/mythfrontend/videolist.cpp
+index 9172903..9e3fad8 100644
+--- a/mythtv/programs/mythfrontend/videolist.cpp
++++ b/mythtv/programs/mythfrontend/videolist.cpp
+@@ -412,7 +412,12 @@ class VideoListImp
+ if (mp)
+ {
+ ret = mp->DeleteFile();
+- if (ret) ret = m_metadata.purgeByID(video_id);
++ if (ret)
++ {
++ ret = m_metadata.purgeByID(video_id);
++ // Force refresh
++ m_metadata_list_type = VideoListImp::ltNone;
++ }
+ }
+
+ return ret;
+diff --git a/mythtv/programs/mythfrontend/viewscheduled.cpp b/mythtv/programs/mythfrontend/viewscheduled.cpp
+old mode 100644
+new mode 100755
+index ff1e236..43ad43e
+--- a/mythtv/programs/mythfrontend/viewscheduled.cpp
++++ b/mythtv/programs/mythfrontend/viewscheduled.cpp
+@@ -282,7 +282,9 @@ void ViewScheduled::LoadList(bool useExistingData)
+ ProgramInfo *pginfo = *pit;
+ const RecStatusType recstatus = pginfo->GetRecordingStatus();
+ if ((pginfo->GetRecordingEndTime() >= now ||
+- pginfo->GetScheduledEndTime() >= now) &&
++ pginfo->GetScheduledEndTime() >= now ||
++ recstatus == rsRecording ||
++ recstatus == rsTuning) &&
+ (m_showAll ||
+ recstatus <= rsWillRecord ||
+ recstatus == rsDontRecord ||
diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp
index 8993042..de5c2e9 100644
--- a/mythtv/programs/mythtranscode/main.cpp
@@ -61971,6 +66305,40 @@
+ myth_system(command, kMSDontBlockInputDevs);
}
+diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+index 36662cd..4c73567 100755
+--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
++++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+@@ -55,7 +55,7 @@ class _Mythtv_data:
+ 'bin', executable)
+ try:
+ cmd = MythTV.System(execpath)
+- res = mbe.command('--version')
++ res = cmd.command('--version')
+ break
+ except:
+ continue
+@@ -496,9 +496,18 @@ class _Mythtv_data:
+ pass
+
+ self._data.theme = _SETTINGS.Theme
+- self._data.country = _SETTINGS.Country
++ if _DB.settings.NULL.country is not None:
++ self._data.country = _DB.settings.NULL.country
++ else:
++ self._data.country = _SETTINGS.Country
+ self._data.channel_count = len([c for c in MythTV.Channel.getAllEntries() if c.visible])
+- self._data.language = _SETTINGS.Language.lower()
++ if _DB.settings.NULL.Language is not None:
++ self._data.language = _DB.settings.NULL.Language.lower()
++ elif _SETTINGS.Language is not None:
++ self._data.language = _SETTINGS.Language.lower()
++ else:
++ # something is wrong when you have no language set at all
++ self._data.language = 'not set'
+ self._data.mythtype, self._data.remote = self.ProcessSmoltInfo()
+
+ if _DB.settings.NULL.SystemUUID is None:
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb.py b/mythtv/programs/scripts/metadata/Movie/tmdb.py
deleted file mode 100755
index 9ad4fbc..0000000
@@ -62625,7 +66993,7 @@
-if __name__ == '__main__':
- main()
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
-index 9e4edcb..c9ca4de 100755
+index 9e4edcb..5374ab1 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,7 +11,7 @@
@@ -62676,6 +67044,27 @@
continue
m = VideoMetadata()
+@@ -254,7 +267,19 @@ def main():
+ MythTV.tmdb3.request.DEBUG = True
+ set_cache(engine='null')
+ else:
+- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
++ import os
++ confdir = os.environ.get('MYTHCONFDIR', '')
++ if (not confdir) or (confdir == '/'):
++ confdir = os.environ.get('HOME', '')
++ if (not confdir) or (confdir == '/'):
++ print "Unable to find MythTV directory for metadata cache."
++ sys.exit(1)
++ confdir = os.path.join(confdir, '.mythtv')
++ confpath = os.path.join(confdir, 'pytmdb3.cache')
++ if not os.access(confpath, os.F_OK|os.W_OK|os.R_OK):
++ print "Unable to access cache file: "+confpath
++ sys.exit(1)
++ set_cache(engine='file', filename=confpath)
+
+ if opts.language:
+ set_locale(language=opts.language, fallthrough=True)
diff --git a/mythtv/themes/MythCenter-wide/notification-ui.xml b/mythtv/themes/MythCenter-wide/notification-ui.xml
index 5afeab6..49b60af 100644
--- a/mythtv/themes/MythCenter-wide/notification-ui.xml
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-20/mythtv.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mythtv.spec 7 Jan 2014 20:01:40 -0000 1.135
+++ mythtv.spec 11 Mar 2014 11:18:54 -0000 1.136
@@ -60,7 +60,7 @@
%define desktop_vendor RPMFusion
# MythTV Version string -- preferably the output from git --describe
-%define vers_string v0.27-130-gfac84fa
+%define vers_string v0.27-178-g6b14852
%define branch fixes/0.27
# Git revision and branch ID
@@ -79,7 +79,7 @@
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -175,6 +175,7 @@
BuildRequires: desktop-file-utils
BuildRequires: freetype-devel >= 2
+BuildRequires: libpng-devel
BuildRequires: gcc-c++
%if 0%{?fedora} >= 19
BuildRequires: mariadb-devel >= 5
@@ -1471,6 +1472,10 @@
%changelog
+* Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-5
+- Update to latest fixes v0.27-178-g6b14852.
+- Rebuild for x264.
+
* Mon Jan 6 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-4
- Update to latest fixes v0.27-130-gfac84fa.
- Add libcdio-paranoia to build requirements for CD audio.
10 years, 8 months