rpms/mythweb/F-16 mythweb-php54.patch,NONE,1.1 mythweb.spec,1.1,1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23533
Modified Files:
mythweb.spec
Added Files:
mythweb-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
- Patch for PHP 5.4 warnings.
mythweb-php54.patch:
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE mythweb-php54.patch ---
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/includes/sorting.php b/includes/sorting.php
index f89fab8..4720610 100644
--- a/includes/sorting.php
+++ b/includes/sorting.php
@@ -119,7 +119,7 @@
function by_user_choice(&$a, &$b) {
foreach ($GLOBALS['user_sort_choice'] as $sort) {
$function = 'by_'.$sort['field'];
- $response = $function(&$a, &$b);
+ $response = $function($a, $b);
// Identical response, go on to the next sort choice
if (!$response)
continue;
diff --git a/modules/tv/schedules.php b/modules/tv/schedules.php
index d09095f..c3c0f13 100644
--- a/modules/tv/schedules.php
+++ b/modules/tv/schedules.php
@@ -36,6 +36,10 @@
$schedule->profile = '';
$schedule->recgroup = '';
}
+ // Add a blank channel, to suppress warnings
+ if (!$schedule->channel) {
+ $schedule->channel = Channel::find(null);
+ }
// Add this show
$the_schedules[] = &$schedule;
}
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/mythweb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythweb.spec 6 Jul 2012 18:02:12 -0000 1.1
+++ mythweb.spec 7 Jul 2012 03:01:24 -0000 1.2
@@ -10,7 +10,7 @@
Group: Applications/Multimedia
Version: 0.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -21,7 +21,10 @@
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch1: mythweb-fixes.patch
+Patch0: mythweb-fixes.patch
+
+# Needed for PHP 5.4
+Patch1: mythweb-php54.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -43,7 +46,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .mythweb
+%patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -71,10 +74,14 @@
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%defattr(-,apache,apache,0755)
%{_datadir}/mythweb/
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
+- Patch for PHP 5.4 warnings.
+
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
12 years, 4 months
- 1
- 0
rpms/mythweb/F-17 mythweb-php54.patch,NONE,1.1 mythweb.spec,1.1,1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23386
Modified Files:
mythweb.spec
Added Files:
mythweb-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
- Patch for PHP 5.4 warnings.
mythweb-php54.patch:
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE mythweb-php54.patch ---
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/includes/sorting.php b/includes/sorting.php
index f89fab8..4720610 100644
--- a/includes/sorting.php
+++ b/includes/sorting.php
@@ -119,7 +119,7 @@
function by_user_choice(&$a, &$b) {
foreach ($GLOBALS['user_sort_choice'] as $sort) {
$function = 'by_'.$sort['field'];
- $response = $function(&$a, &$b);
+ $response = $function($a, $b);
// Identical response, go on to the next sort choice
if (!$response)
continue;
diff --git a/modules/tv/schedules.php b/modules/tv/schedules.php
index d09095f..c3c0f13 100644
--- a/modules/tv/schedules.php
+++ b/modules/tv/schedules.php
@@ -36,6 +36,10 @@
$schedule->profile = '';
$schedule->recgroup = '';
}
+ // Add a blank channel, to suppress warnings
+ if (!$schedule->channel) {
+ $schedule->channel = Channel::find(null);
+ }
// Add this show
$the_schedules[] = &$schedule;
}
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-17/mythweb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythweb.spec 6 Jul 2012 18:01:06 -0000 1.1
+++ mythweb.spec 7 Jul 2012 03:00:32 -0000 1.2
@@ -10,7 +10,7 @@
Group: Applications/Multimedia
Version: 0.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -21,7 +21,10 @@
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch1: mythweb-fixes.patch
+Patch0: mythweb-fixes.patch
+
+# Needed for PHP 5.4
+Patch1: mythweb-php54.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -43,7 +46,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .mythweb
+%patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -71,10 +74,14 @@
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%defattr(-,apache,apache,0755)
%{_datadir}/mythweb/
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
+- Patch for PHP 5.4 warnings.
+
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
12 years, 4 months
- 1
- 0
rpms/mythweb/devel mythweb-php54.patch,NONE,1.1 mythweb.spec,1.1,1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23131
Modified Files:
mythweb.spec
Added Files:
mythweb-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
- Patch for PHP 5.4 warnings.
mythweb-php54.patch:
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE mythweb-php54.patch ---
includes/sorting.php | 2 +-
modules/tv/schedules.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/includes/sorting.php b/includes/sorting.php
index f89fab8..4720610 100644
--- a/includes/sorting.php
+++ b/includes/sorting.php
@@ -119,7 +119,7 @@
function by_user_choice(&$a, &$b) {
foreach ($GLOBALS['user_sort_choice'] as $sort) {
$function = 'by_'.$sort['field'];
- $response = $function(&$a, &$b);
+ $response = $function($a, $b);
// Identical response, go on to the next sort choice
if (!$response)
continue;
diff --git a/modules/tv/schedules.php b/modules/tv/schedules.php
index d09095f..c3c0f13 100644
--- a/modules/tv/schedules.php
+++ b/modules/tv/schedules.php
@@ -36,6 +36,10 @@
$schedule->profile = '';
$schedule->recgroup = '';
}
+ // Add a blank channel, to suppress warnings
+ if (!$schedule->channel) {
+ $schedule->channel = Channel::find(null);
+ }
// Add this show
$the_schedules[] = &$schedule;
}
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythweb.spec 5 Jul 2012 16:19:07 -0000 1.1
+++ mythweb.spec 7 Jul 2012 02:56:49 -0000 1.2
@@ -10,7 +10,7 @@
Group: Applications/Multimedia
Version: 0.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -21,7 +21,10 @@
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch1: mythweb-fixes.patch
+Patch0: mythweb-fixes.patch
+
+# Needed for PHP 5.4
+Patch1: mythweb-php54.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -43,7 +46,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .mythweb
+%patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -71,10 +74,14 @@
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%defattr(-,apache,apache,0755)
%{_datadir}/mythweb/
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
+- Patch for PHP 5.4 warnings.
+
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
12 years, 4 months
- 1
- 0
rpms/gmameui/F-16 gmameui-0.2.12-fix.patch,NONE,1.1
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25631
Added Files:
gmameui-0.2.12-fix.patch
Log Message:
add gmameui-0.2.12-fix.patch
gmameui-0.2.12-fix.patch:
gmameui.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE gmameui-0.2.12-fix.patch ---
diff -up gmameui-0.2.12/src/gmameui.c.fix gmameui-0.2.12/src/gmameui.c
--- gmameui-0.2.12/src/gmameui.c.fix 2009-09-05 13:14:33.000000000 +0200
+++ gmameui-0.2.12/src/gmameui.c 2012-05-13 23:23:40.298904121 +0200
@@ -31,9 +31,7 @@
#include <locale.h>
#include <unistd.h>
#include <signal.h>
-#include <glib/gprintf.h>
-#include <glib/gutils.h>
-#include <glib/gstdio.h> /* For g_mkdir */
+#include <glib.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkfilesel.h>
12 years, 4 months
- 1
- 0
rpms/gmameui/F-16 gmameui-fix3.patch, NONE, 1.1 gmameui-fix4.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gmameui.spec, 1.3, 1.4 sources, 1.3, 1.4
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22830
Modified Files:
.cvsignore gmameui.spec sources
Added Files:
gmameui-fix3.patch gmameui-fix4.patch
Log Message:
* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec :
- Updated the license tag to GPLv3+
- Added vte-devel to BuildRequires, removed explicit gtk2-devel
- Dropped empty README and TODO from %doc
- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
libarchive12
- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.
gmameui-fix3.patch:
gmameui-zip-utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gmameui-fix3.patch ---
* Fix FTBFS with libarchive12
* Build-depend on libarchive-dev (>= 3.0.0)
--- src/gmameui-zip-utils.c.orig 2012-07-02 05:51:55.114101799 +0100
+++ src/gmameui-zip-utils.c 2012-07-02 05:53:00.638847033 +0100
@@ -96,7 +96,7 @@ read_pixbuf_from_zip_file (gchar *zipfil
buffer_data = (gchar *) g_malloc0 (filesize);
/* Read the zipped pixbuf into memory */
- archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ archive_read_data (zipfile, buffer_data, filesize);
pixbuf = load_pixbuf_data (buffer_data, filesize);
@@ -266,7 +266,7 @@ GList *get_zip_contents_OLD (gchar *zipf
buffer_data = (guchar *) g_malloc0 (filesize);
/* Read the zipped ROM into memory */
- i = archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ i = archive_read_data (zipfile, buffer_data, filesize);
if ((i == ARCHIVE_FATAL) || (i == ARCHIVE_WARN)) {
GMAMEUI_DEBUG ("Error/warning from zip file %s - %s", filename, archive_error_string (zipfile));
gmameui-fix4.patch:
setup-gettext | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gmameui-fix4.patch ---
--- setup-gettext.orig 2012-07-02 06:24:01.754301270 +0100
+++ setup-gettext 2012-07-02 06:28:56.355849439 +0100
@@ -181,7 +181,7 @@ if test $NUMVAR -gt 0; then
fi
# Okay, run the main stuff
-if test "$GETTEXT_TOOL" = "autopoint"; then
+if [ 1 == 1 ]; then
backup_m4
[ $VERBOSE -eq 1 ] && echo " autopoint --force"
echo n | autopoint --force || abort
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Jul 2009 12:31:52 -0000 1.3
+++ .cvsignore 6 Jul 2012 23:06:52 -0000 1.4
@@ -1 +1 @@
-gmameui-0.2.10.tar.gz
+gmameui-gmameui20120704cvs.tar.gz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/gmameui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmameui.spec 5 Jul 2009 12:31:52 -0000 1.3
+++ gmameui.spec 6 Jul 2012 23:06:53 -0000 1.4
@@ -1,20 +1,29 @@
Summary: Frontend for MAME
Name: gmameui
-Version: 0.2.10
-Release: 1%{?dist}
-License: GPLv2+
+Version: 0.2.13
+Release: 0.1.20120704cvs%{?dist}
+License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
-Source: http://downloads.sf.net/gmameui/gmameui-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel
+#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
+Source0: gmameui-gmameui20120704cvs.tar.gz
+Patch0: gmameui-0.2.12-fix.patch
+Patch2: gmameui-fix3.patch
+Patch3: gmameui-fix4.patch
+#BuildRequires: gtk2-devel
BuildRequires: libgnome-devel
BuildRequires: expat-devel
BuildRequires: libglade2-devel
BuildRequires: gettext, bison
BuildRequires: intltool, perl(XML::Parser)
BuildRequires: libarchive-devel
+BuildRequires: libvtemm-devel
BuildRequires: gnome-doc-utils
+BuildRequires: rarian-compat
+BuildRequires: libzip-devel
+BuildRequires: gtkimageview-devel
+BuildRequires: vte-devel
+
%description
GMAMEUI is a front-end program that helps you run MAME (either xmame or
@@ -22,10 +31,14 @@
%prep
-%setup -q
+%setup -q -n gmameui
+%patch0 -p1 -b .fix
+%patch2 -p0 -b .fix3
+%patch3 -p0 -b .fix4
%build
+./autogen.sh
%configure
%{__make} %{?_smp_mflags}
@@ -37,13 +50,10 @@
# Put the docs back into place
%{__mkdir} _docs
+%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
-%clean
-%{__rm} -rf %{buildroot}
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc _docs/*
@@ -57,6 +67,23 @@
%changelog
+* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
+- from Julian Sikorski patch for gmameui.spec :
+ - Updated the license tag to GPLv3+
+ - Added vte-devel to BuildRequires, removed explicit gtk2-devel
+ - Dropped empty README and TODO from %%doc
+- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
+ libarchive12
+- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
+ smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.
+
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.12-1
+- Update to 0.2.12
+- Fix build
+
+* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sun Jul 5 2009 Matthias Saou <http://freshrpms.net/> 0.2.10-1
- Update to 0.2.10.
- Add new libgnome-devel and libarchive-devel build requirements.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Jul 2009 12:31:52 -0000 1.3
+++ sources 6 Jul 2012 23:06:53 -0000 1.4
@@ -1 +1 @@
-3a198f6b066eb81b62ed72924447c46f gmameui-0.2.10.tar.gz
+10ecddacd3239b395f84bd034bc5531e gmameui-gmameui20120704cvs.tar.gz
12 years, 4 months
- 1
- 0
rpms/gmameui/F-17 gmameui-fix3.patch, NONE, 1.1 gmameui-fix4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gmameui.spec, 1.6, 1.7 sources, 1.4, 1.5 gmameui-0.2.12-fix2.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22337
Modified Files:
.cvsignore gmameui.spec sources
Added Files:
gmameui-fix3.patch gmameui-fix4.patch
Removed Files:
gmameui-0.2.12-fix2.patch
Log Message:
* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec :
- Updated the license tag to GPLv3+
- Added vte-devel to BuildRequires, removed explicit gtk2-devel
- Dropped empty README and TODO from %doc
- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
libarchive12
- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.
gmameui-fix3.patch:
gmameui-zip-utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gmameui-fix3.patch ---
* Fix FTBFS with libarchive12
* Build-depend on libarchive-dev (>= 3.0.0)
--- src/gmameui-zip-utils.c.orig 2012-07-02 05:51:55.114101799 +0100
+++ src/gmameui-zip-utils.c 2012-07-02 05:53:00.638847033 +0100
@@ -96,7 +96,7 @@ read_pixbuf_from_zip_file (gchar *zipfil
buffer_data = (gchar *) g_malloc0 (filesize);
/* Read the zipped pixbuf into memory */
- archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ archive_read_data (zipfile, buffer_data, filesize);
pixbuf = load_pixbuf_data (buffer_data, filesize);
@@ -266,7 +266,7 @@ GList *get_zip_contents_OLD (gchar *zipf
buffer_data = (guchar *) g_malloc0 (filesize);
/* Read the zipped ROM into memory */
- i = archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ i = archive_read_data (zipfile, buffer_data, filesize);
if ((i == ARCHIVE_FATAL) || (i == ARCHIVE_WARN)) {
GMAMEUI_DEBUG ("Error/warning from zip file %s - %s", filename, archive_error_string (zipfile));
gmameui-fix4.patch:
setup-gettext | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gmameui-fix4.patch ---
--- setup-gettext.orig 2012-07-02 06:24:01.754301270 +0100
+++ setup-gettext 2012-07-02 06:28:56.355849439 +0100
@@ -181,7 +181,7 @@ if test $NUMVAR -gt 0; then
fi
# Okay, run the main stuff
-if test "$GETTEXT_TOOL" = "autopoint"; then
+if [ 1 == 1 ]; then
backup_m4
[ $VERBOSE -eq 1 ] && echo " autopoint --force"
echo n | autopoint --force || abort
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 May 2012 21:44:38 -0000 1.4
+++ .cvsignore 6 Jul 2012 23:03:29 -0000 1.5
@@ -1 +1 @@
-gmameui-0.2.12.tar.gz
+gmameui-gmameui20120704cvs.tar.gz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/gmameui.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gmameui.spec 13 May 2012 22:32:24 -0000 1.6
+++ gmameui.spec 6 Jul 2012 23:03:29 -0000 1.7
@@ -1,15 +1,16 @@
Summary: Frontend for MAME
Name: gmameui
-Version: 0.2.12
-Release: 1%{?dist}
-License: GPLv2+
+Version: 0.2.13
+Release: 0.1.20120704cvs%{?dist}
+License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
-Source0: http://downloads.sf.net/gmameui/gmameui-%{version}.tar.gz
+#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
+Source0: gmameui-gmameui20120704cvs.tar.gz
Patch0: gmameui-0.2.12-fix.patch
-Patch1: gmameui-0.2.12-fix2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel
+Patch2: gmameui-fix3.patch
+Patch3: gmameui-fix4.patch
+#BuildRequires: gtk2-devel
BuildRequires: libgnome-devel
BuildRequires: expat-devel
BuildRequires: libglade2-devel
@@ -19,6 +20,10 @@
BuildRequires: libvtemm-devel
BuildRequires: gnome-doc-utils
BuildRequires: rarian-compat
+BuildRequires: libzip-devel
+BuildRequires: gtkimageview-devel
+BuildRequires: vte-devel
+
%description
GMAMEUI is a front-end program that helps you run MAME (either xmame or
@@ -26,12 +31,14 @@
%prep
-%setup -q
+%setup -q -n gmameui
%patch0 -p1 -b .fix
-%patch1 -p1 -b .fix2
+%patch2 -p0 -b .fix3
+%patch3 -p0 -b .fix4
%build
+./autogen.sh
%configure
%{__make} %{?_smp_mflags}
@@ -43,13 +50,10 @@
# Put the docs back into place
%{__mkdir} _docs
+%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
-%clean
-%{__rm} -rf %{buildroot}
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc _docs/*
@@ -63,6 +67,16 @@
%changelog
+* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
+- from Julian Sikorski patch for gmameui.spec :
+ - Updated the license tag to GPLv3+
+ - Added vte-devel to BuildRequires, removed explicit gtk2-devel
+ - Dropped empty README and TODO from %%doc
+- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
+ libarchive12
+- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
+ smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.
+
* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.12-1
- Update to 0.2.12
- Fix build
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 May 2012 21:44:38 -0000 1.4
+++ sources 6 Jul 2012 23:03:29 -0000 1.5
@@ -1 +1 @@
-e1f36731b0007501cf4c169aaee2ccc8 gmameui-0.2.12.tar.gz
+10ecddacd3239b395f84bd034bc5531e gmameui-gmameui20120704cvs.tar.gz
--- gmameui-0.2.12-fix2.patch DELETED ---
12 years, 4 months
- 1
- 0
rpms/mythtv/EL-6 99-mythbackend.rules,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20564
Added Files:
99-mythbackend.rules
Log Message:
Add udev rules file.
--- NEW FILE 99-mythbackend.rules ---
# Do not edit this file, it will be overwritten on update
# If you need to make changes to this file create a copy in
# /etc/udev/rules.d first.
# This file is part of the packaging of MythTV
#
# MythTV is free software; view http://www.mythtv.org
# for more information.
#
# The purpose of this set of rules is to ensure that
# systemd will create device units that the backend
# startup can (optionally) wait on.
#
#
# Insure that systemd creates device units for capture devices
#
SUBSYSTEM=="video4linux", TAG+="systemd"
SUBSYSTEM=="dvb", TAG+="systemd"
SUBSYSTEM=="firewire", TAG+="systemd"
12 years, 4 months
- 1
- 0
rpms/mythtv/EL-6 ChangeLog, NONE, 1.1 mythbackend.service, NONE, 1.1 mythtv-0.25.1-fixes.patch, NONE, 1.1 mythtv.logrotate.sysd, NONE, 1.1 mythtv.logrotate.sysv, NONE, 1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20369
Added Files:
ChangeLog mythbackend.service mythtv-0.25.1-fixes.patch
mythtv.logrotate.sysd mythtv.logrotate.sysv
Log Message:
Forgot to cvs add a few files.
--- NEW FILE ChangeLog ---
commit 1d41f74720f0c89ef73e25fe7586e33caf946802
Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
Date: Fri Jun 22 16:32:27 2012 -0700
Allow visualizations to be turned on during playback.
In particular, allow the Audio>Visualizations submenu to appear in the
Playback OSD menu.
(cherry picked from commit 85e3a38349713330d30628dfeb33059b8d9c60bf)
commit 6ae8bec70b17027f858793da48f1227adabd2d38
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Thu Jul 5 00:02:08 2012 +0100
Fix a bug resulting in multiple copies of the same track being inserted into the database
commit 11d7795503b869aeb09b66d55f0430fcf504f924
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Wed Jul 4 20:03:11 2012 +0100
Protect the reschedule queue with a seperate lock to fix a backend deadlock.
Fixes a deadlock in mythbackend caused when a reschedule request occurs
immedately prior to a recording starting.
The recorder thread locks the scheduler when starting a recording. The pending
reschedule request handled in the event loop waits for the scheduler lock to be
released blocking the event loop. The backend is now stopped from handling any
further events or protocol requests, meanwhile the recorder is waiting on
events to be processed before it will release the lock resulting in an
irrecoverable deadlock (or hang) and the failure of the recording.
This deadlock was more likely to be triggered for users of EIT because it will
ask for a reschedule every 5 minutes in addition to any reschedules triggered
through other means.
Refs #10771
commit 48ac7cfb51e82c3ddbaab489810b560fb8271531
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Wed Jul 4 19:42:15 2012 +0100
Revert "Protect the reschedule queue with a seperate lock to fix a backend deadlock."
This reverts commit 5eb97790f3c36f9d2524275e545189cafda9d48a.
While this seems to work well in master, it appears to make the
situation worse in 0.25 and I really don't have the time to figure out
why. Anyone experiencing the pre-existing deadlock will need to
upgrade to 0.26 when it's released. Refs #10771
commit 67522d8a9ddfef6512a9d1f0a75f0f1cfef72e0e
Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
Date: Tue Jul 3 23:50:23 2012 -0700
Reworked all of the NOAA/NWS Weather Scripts
Seems weather.gov has moved the urls for nearly all their data services. On
top of that, the SOAP response is gzip encoded by default, and SOAP::Lite is
stupid and can't handle it. Also, we were missing the Units parameter which
is now required.
Fixes #10821
(cherry picked from commit b8a78aeb35167a676a7e25c342a1869e8016d76a)
commit 1282eb3fa007911f34aee70f1f0b8dadbd8918c6
Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
Date: Sun Jul 1 22:50:07 2012 -0700
Minor formatting, plus add back the bufferMutex
commit 0969941c7706067560d94002712be9b2fbc076f8
Merge: 65913e7 199342e
Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
Date: Sun Jul 1 22:45:31 2012 -0700
Merge remote branch 'glidos/fixes/0.25' into fixes/0.25
commit 65913e707c404abbba89274a78feefa24c4d658c
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Fri Jun 29 23:37:28 2012 +0100
Fix incorrect cast causing loss of integer precision in RingBuffer
(cherry picked from commit 7aea3131a8801c09617012d3e892ec4fa68f626a)
commit 5eb97790f3c36f9d2524275e545189cafda9d48a
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Fri Jun 29 13:28:45 2012 +0100
Protect the reschedule queue with a seperate lock to fix a backend deadlock.
Fixes a deadlock in mythbackend caused when a reschedule request occurs
immedately prior to a recording starting.
The recorder thread locks the scheduler when starting a recording. The pending
reschedule request handled in the event loop waits for the scheduler lock to be
released blocking the event loop. The backend is now stopped from handling any
further events or protocol requests, meanwhile the recorder is waiting on
events to be processed before it will release the lock resulting in an
irrecoverable deadlock (or hang) and the failure of the recording.
This deadlock was more likely to be triggered for users of EIT because it will
ask for a reschedule every 5 minutes in addition to any reschedules triggered
through other means.
Refs #10771
Backported from master 788bc510ede427e43e77e8aaf53d8cf047d89b46
commit 5b843c1287e546a7d49f59b3ae911c17279c43f5
Author: David Engel <dengel(a)mythtv.org>
Date: Wed Jun 27 17:06:49 2012 -0500
Don't create a watch list for the "Deleted" recording group.
Fixes #10854.
(cherry picked from commit 22ed71e4d9eeddccae0e1b4f40321e3f624e7b4e)
commit a3f400ebeb43dcaf31ba11ba742e4731e6dae20b
Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
Date: Tue Jun 26 13:23:41 2012 -0400
Clean up deferred deletes MThreadPool.
In case someone uses QObject::deleteLater() within a QRunnable
passed to MThreadPool, this adds a cleanup of those when done
with the QRunnable.
commit 25dd4ce330e7b36d1c8e5e14d94a4dcdcd4cd021
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Mon Jun 25 11:43:28 2012 +0100
Move QUERY_FILETRANSFER handling to improve backend performance.
This significantly reduces the backend CPU usage for me when streaming a
recording or other file to the frontend.
Each time we send a command to the backend we perform a number of string
comparisons to find the correct handler. In the cases where that same command
is sent regularly, maybe several times a second those comparisons can stack up
to result in a high CPU load. This can be avoided by moving the most frequently
used commands to the top of the list thereby avoiding a couple of dozen or more
comparisons each time.
There may be other commands that should be moved to the top with similar
benefit.
(cherry picked from commit 529853d11587ebee0b77753272d6dcc1a5404a11)
commit ce8f9e25a627d4b164361a5328c3e013dd68476e
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Sun Jun 24 10:36:28 2012 +0100
Following Freesats switch from Astra 2D to Astra 1G update the transport ids associated with Freesat EIT fixups
(cherry picked from commit 0312ff912a743178f2ef54967866b42c894d7c4b)
commit 73bc45e0e3d4bf5c137bd57b091bd4a23d0bce8d
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Jun 21 01:39:44 2012 -0400
Add Genre list and associated Movie search
(cherry picked from commit 6e7725de7d8507c3675aa89b17a49da06abc7cc2)
commit 97f8819df59cba6b7b522ac71bfc46aa09b17527
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Jun 21 01:11:56 2012 -0400
Add Studio search method.
(cherry picked from commit c2bb6aee239e1e53ba95da232ed84ee5da21685b)
commit 42b63d3ae53d8bd31fff7331a54b3cae093825b2
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Jun 21 01:43:59 2012 -0400
Add TMDBv3 file missed during previous backports.
commit 6aa7fbe106dbf88c2c067a0184a52d814cef1978
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Wed Jun 20 04:18:37 2012 -0400
Changes seconds to milliseconds in poller loop.
This corrects the timeout duration in the poller loop used to read data
from external programs. Code was written assuming timeouts in floating
point seconds, while poll() API takes milliseconds. Ahh.. consistency..
Fixes #10837
(cherry picked from commit 76433930fed60342a4b2929c6ff94a8413673e5b)
commit effb32be550172b9341e17b493d209e468c5be17
Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
Date: Sat Jun 16 14:22:48 2012 -0400
Match Lock with Unlock in OutboundRequestHandler::DoConnectToMaster() socket error handling code.
This was fixed in [f2a0d748] in trunk.
commit 67883dde998c45ad587a3f687c8e86507ffe324a
Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
Date: Wed Jun 6 13:24:29 2012 -0400
Fixes #10685. Handle job queue properly for back-to-back recordings.
commit 35c3c97b70c987dc77dff06b16862abac3aa51b1
Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
Date: Sat Jun 16 14:15:57 2012 -0400
Fix use of deleted socket in MythCoreContext::ConnectEventSocket()
This was fixed in [f2a0d748] in trunk.
commit 3a9dea901cd46ac240c022bbeee79841f738042d
Author: Daniel Kristjansson <danielk(a)cuymedia.net>
Date: Mon May 28 12:02:16 2012 -0400
Refs #10712. Add error checking, proper formatting, and improve debugging of previous commit.
commit 18e0f2fd2d6b5b7724e8df0ee893817e192a4903
Author: Simon Sinister <simon.sinister(a)sbcglobal.net>
Date: Mon May 28 11:50:53 2012 -0400
Fixes #10712. Add support for HDHR Prime without CableCard.
commit 05839fa0dd4c521affb811282d640e628230b40b
Author: Daniel Kristjansson <danielk(a)cuymedia.net>
Date: Mon May 28 11:46:59 2012 -0400
Use correct RecordingInfo* in FinishedRecording()'s SendMythSystemRecEvent().
commit 1555f0381252a7231e655efa351c3931d3caa595
Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
Date: Sat Jun 9 13:46:32 2012 -0400
Define USING_MINGW when building programs with MinGW
commit 6a9af0260bf4d7c80e77a7889e999c4f0bb91867
Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
Date: Fri Jun 15 11:18:23 2012 -0700
Subtitles: Be less aggressive about auto-selecting a forced track.
1. Don't favor a forced subtitle track if DefaultCCMode=1 (i.e., the
user already wants subtitles or captions which are likely to also
contain the force subtitles).
2. Don't favor a forced subtitle track if AllowForcedSubtitles=0
(i.e., the user doesn't want to be inflicted with forced subtitles).
3. Only favor a forced track if it is a subtitle track. (Do any other
track types ever have the forced flag set?)
Note that this still may not be perfect, e.g. a user may end up
auto-displaying cc608 captions where a forced subtitle track is still
needed for the complete experience.
Refs #10808
(cherry picked from commit 689a7b5d526099c2ec533701625ae62ddbba6d44)
commit 3b41cb7ae550bf0cf58cad8fe814d6bd7c03df0f
Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
Date: Fri Jun 15 07:07:04 2012 -0700
Subtitles: Favor forced tracks for auto-track selection. Refs #10808
For first-time auto-track selection, we put highest priority on forced
tracks, second priority on user language preference, and third
priority on track order.
This changes the previous behavior only by adding the forced flag to
the criteria.
(cherry picked from commit ea554c9cbe5fc86c4a4e301eb9f97fd90abbe7a4)
commit 56fd9e2cd63c4700f90f6e0b9326d36bc38cff92
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon May 21 02:32:30 2012 -0400
Move interactive access to separate script.
This removes the interactive behavior of tmdb_api.py and places it in a
new script. The script can be run from the source directory, but does
not get installed with the library.
(cherry picked from commit 76c8c518ff8dcc1206a984d2a5c12503f194870a)
commit cdc03f4b09fd6a77893aa1df5948f128dd86b391
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu May 3 02:56:30 2012 -0400
Add method to search for movies similar to current.
(cherry picked from commit 30a0d398cc5f40487a69ddcc3beff77b09052def)
commit 1c03ae068b8acb9bbde6dd439af482498e3b89ff
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu May 3 02:43:07 2012 -0400
Clean up __repr__ methods, and impose soft 80-character line limit.
(cherry picked from commit 676cbb1aaf9c8d19d207ec9575ffaa9665d8e710)
commit c9be5e2eec12cdbfbf5556aefadb1ee63cba1160
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu May 3 01:12:28 2012 -0400
Improve handling of invalid responses from TMDB
When an HTML error is received from the TMDB API, this will now attempt
to process a specific error type from the returned JSON. If no error
type is given, or the resposnse was not JSON, it will raise the previous
TMDBHTTPError.
(cherry picked from commit 7425634d7b92f8bbe9abdc8b50c4148c96c87f40)
commit f7f76e55b0ff198d19b3dce2474f98f934717a48
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Tue May 1 15:50:44 2012 -0400
Use `date` rather than `datetime` for storing dates.
(cherry picked from commit c2ef5d143f1bfc9931ef9f7487fda3b93780fe8f)
commit e900fa37b2680d79cf26096a89555a31121b00f2
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 30 20:07:29 2012 -0400
Correct file cache error handling to ignore rather than raise errors.
(cherry picked from commit 27dff377fe6612b870a4cf28b9c058567be1a3bb)
commit d590289d80ffffc792b4e386f1f2bbbcea3478dc
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 30 16:50:20 2012 -0400
Use `date` type rather than `datetime` for 'releasedate attribute'.
(cherry picked from commit 5b86d8bb95c69205d8669bb23c30ccd6b8514c4b)
commit 5f5ca21fbd51ec0771034abc45e1b607c0b8db50
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 30 16:49:57 2012 -0400
Bypass aborts resulting from attempting to process empty strings.
(cherry picked from commit aa0e26f1abc7370d8840abdfd8ced2fdf2ef76f7)
commit 7563f810ae017226023b476b7a5d0f9d863aa3f3
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 30 02:12:12 2012 -0400
Correct missed changes in __init__.py
(cherry picked from commit 361e06851f02f5a70f554fcee0890a7a37e6ad95)
commit b277cc3bd8a723c2621e80d0d9506a46c7f5ca9a
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 30 01:59:11 2012 -0400
Add adult filter for people searches
(cherry picked from commit b28c566ef2b6a6379821bcc9023f84cba04b4e05)
commit 81dabbc40b0b3fdc1b542a9d7fe9da74f0fbbefd
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Apr 14 18:26:59 2012 -0400
Add assorted authenticated methods.
This adds methods for setting ratings and favorite status against
movies, as well as pulling lists of movies for which those have been
set. This adds a bypass in the cache to not operate on anything with a
lifetime of '0'.
(cherry picked from commit fb7c7cd3dfd4692e6c5acc61f0d2fd927b04d50e)
commit 9439a827f3c1178ad33a81a326d5e0ed87cdca31
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Apr 14 17:31:20 2012 -0400
Add basic session handling and passthrough.
(cherry picked from commit 3debcd531d8ed454b8ed9f4b61da6e03690ce13c)
commit 1493687d26482b777d07eb02f5fda77d0b501cef
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Apr 14 15:30:26 2012 -0400
Corrects handling of '0' for cast ordering.
(cherry picked from commit 500454560030795a7c914cb985c30711e302d65a)
commit 59cc85156d402eb2bdd91c088d44407fb8e6df3a
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Wed Apr 11 01:28:27 2012 -0400
Improve file cache performance.
This reworks the cache framework, and alters the file cache engine to
support incremental writes. This allows the results from 256 queries to
be stored before having to rewrite the file. Previously, having to
rewrite the entire cache file on each step would take longer than
actually querying TMDB once the cache stored more than ~100 entries.
May be a bit fragile.
(cherry picked from commit 23fa543ceb2690340e74d257a6bc86f817c02be6)
commit 2fd53643f8911e92c01fb49ca3cd2710d735831b
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Wed Apr 11 01:24:21 2012 -0400
Fix Cache exceptions.
(cherry picked from commit 642de961e034072eaf6342c01451b040f0b9ab3b)
commit b0e61cffcced4170c1fe8821155a830f9f38056a
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Wed Apr 11 01:23:18 2012 -0400
Remove empty space.
(cherry picked from commit c35f455ee4bf2dbaac87f6ce2fca2f489cd2d209)
commit ac4a15845876f5802ce78152543e1cb19ec9e04e
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Mon Apr 2 13:28:11 2012 -0400
Adds proper encoding to strings being passed to a request.
(cherry picked from commit e0d604111ba9f09e4f161d4280ea132e0e4a1990)
commit 802d86c668bacd3e6089ad9c5c9b2cd092d344bf
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sun Apr 1 03:14:49 2012 -0400
Add slice support to search result pager.
(cherry picked from commit 86b54a14992a24c3f727efd5247842ee2d2393c3)
commit 9c3fb94c1136f270d4a02a4ff294e6484b3b7d83
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Mar 31 20:14:52 2012 -0400
Update Logo() class with proper image sizes from Configuration().
(cherry picked from commit 2198d9ef21d5aaf47550084b8904e3da73137956)
commit 47b77a6bd2b17ea5962d1c78751e33305cdd1aa2
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Mar 31 20:03:41 2012 -0400
Correct Studio.logo processing.
(cherry picked from commit 2e4bc644b0d2b0277a18ffa0b0e66aa18c17dfc6)
commit 8ec550daa5a9a75c65b57fd5d3b62692bcb1e93b
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Mar 31 19:52:53 2012 -0400
Allow locale fallthrough for movie images and alternate titles.
When fallthrough is enabled, queries for backdrops, posters, and
alternate titles will not filter for the selected locale, but will
instead sort the results to place those matching the specified locale at
the top of the list.
Also resolves an issue where Request() was incorrectly passing 'None' as
an argument when no locale was set.
(cherry picked from commit ddc0cb0550b8de72e4ddad874ad05865b3b50c3f)
commit e0462f253faf920793bb76a84869cb98b4b4a218
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Sat Mar 31 19:15:39 2012 -0400
Allow Datalists to be sorted natively without supplying a key.
(cherry picked from commit 61045e47bca155fb40ec2de47d01cd86bd28992b)
commit afc068223b062e6579586d10be2f7d0d1441524d
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Fri Mar 30 00:49:19 2012 -0400
Correct cache file selection logic inverted by 4663490f8fa.
(cherry picked from commit 75a14b7da282f15fc84819418ec845e86559eaf2)
commit d750957b9b841d15d2c208e13df57e39419a1eb5
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Fri Mar 30 00:48:04 2012 -0400
Update README for additional options.
(cherry picked from commit 166655c70bb4ac340c6e559b167114f3e08bbdc0)
commit a2cb6df059542bf62f627f79310e9a891d4e891d
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Fri Mar 30 00:41:31 2012 -0400
Add support for additional Studio information.
(cherry picked from commit e99630e023a6ae8033bba27528e9a3ca45e72c1e)
commit ea43a7777f68d4b317138904b6e53616c10a9d52
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Mar 29 23:43:12 2012 -0400
Add 'adult' and 'alias' to Person class.
(cherry picked from commit 38922793f5732d10c4dfbcf6d421d40667812675)
commit 4e2e129393ecef050134d605888bfec2c565599c
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Mar 29 14:15:19 2012 -0400
Improves cache file selection for Windows.
(cherry picked from commit 263d8680de3566f2109b76b4b1d4d2779b967d10)
commit 631ae1075c35107d759c83fa1faa519841949397
Author: Raymond Wagner <rwagner(a)mythtv.org>
Date: Thu Mar 29 13:36:54 2012 -0400
Add __contains__ for proper lookup in cache Engines class.
(cherry picked from commit 08bffa5f6df497f28fe3481fe80b517628b0f1a3)
commit 648f0aec326c03b39091fda8ac64450d0f0e76e3
Author: Michael T. Dean <mdean(a)mythtv.org>
Date: Thu Jun 7 00:17:48 2012 -0400
Fix exists check in mythcommflag
for files that aren't visible to the master backend. Thanks to fedora a
ready2think for the patch. Fixes #10810.
(cherry picked from commit c5803f1dc6b1da7d77222c43ce074bb04d9bc983)
commit 016db04aff2bc8c2de1d4af9d920366ed568910b
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Wed Jun 6 22:05:19 2012 +0100
Give more space for the channel number in the Terra OSD
(cherry picked from commit f842d1b1f68a6b7a0933bbd7dac1e8d381fc9fee)
commit 199342ef7a3fe6230a11de547b2a8df6d07dff34
Author: Paul Gardiner <paul(a)glidos.site>
Date: Sun May 27 11:44:30 2012 +0100
Calculate timecodes more accurately (suggeseted by JYA)
Also add comments explaining the algorithm.
commit 34711d84919ea49221461d41566669de1500a0d8
Author: Paul Gardiner <paul(a)glidos.site>
Date: Fri May 4 17:09:57 2012 +0100
Fix passthrough case of mythtrancode running in fifo mode
Also simplify AudiReencodeBuffer::AddData()
--- NEW FILE mythbackend.service ---
# Do not edit this file, it will be replaced on update
# If you need to make modifications to this unit file first make a copy in
# /etc/systemd/system
# This file is part of the packaging of MythTV
#
# MythTV is free software; view http://www.mythtv.org
# for more information.
#
# It is sometimes necessary to wait for a capture
# device to finish (hot)plug initialization before
# the backend starts. If this is necessary,
# create a Wants and After entry for all the capture
# devices that one wishes to wait to be created
# before the backend starts using the systemd
# device name mangling names (/dev/some/thing turns
# into dev-some-thing.device). These normally should
# be udev persistent filename rules to avoid confusion.
# See the MythTV wiki for udev persistent filename
# discussions found at:
# http://www.mythtv.org/wiki/Device_Filenames_and_udev
#
# In order to insure that systemd will create a
# device unit for the capture device, one must
# insure that udev will have the tag "systemd"
# (i.e. add TAG+="systemd" to the udev rule).
#
# The MythTV package ships with a default udev
# rule file located in: /lib/udev/rules.d/99-mythbackend.rules
[Unit]
Description=MythTV backend service
After=network.target mysqld.service
# uncomment the following line if you will be using the mythweb plugin.
#Wants=httpd.service
[Service]
Type=simple
Environment=MYTHCONFDIR=/etc/mythtv
Environment=HOME=/usr/share/mythtv
User=mythtv
ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
[Install]
WantedBy=multi-user.target
mythtv-0.25.1-fixes.patch:
mythplugins/mythmusic/mythmusic/metadata.cpp | 6
mythplugins/mythweather/mythweather/scripts/us_nws/NDFDParser.pm | 3
mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl | 17
mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl | 13
mythplugins/mythweather/mythweather/scripts/us_nws/ndfdXML.pm | 24
mythplugins/mythweather/mythweather/scripts/us_nws/nws-alert.pl | 8
mythplugins/mythweather/mythweather/scripts/us_nws/nwsxml.pl | 12
mythtv/bindings/python/MythTV/utility.py | 2
mythtv/bindings/python/tmdb3/README | 51 +
mythtv/bindings/python/tmdb3/setup.py | 2
mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 7
mythtv/bindings/python/tmdb3/tmdb3/cache.py | 35 -
mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 31
mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 342 +++++++---
mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 4
mythtv/bindings/python/tmdb3/tmdb3/locales.py | 72 +-
mythtv/bindings/python/tmdb3/tmdb3/pager.py | 2
mythtv/bindings/python/tmdb3/tmdb3/request.py | 49 +
mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 339 ++++++---
mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 131 +++
mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 17
mythtv/bindings/python/tmdb3/tmdb3/util.py | 44 +
mythtv/libs/libmythbase/mthreadpool.cpp | 1
mythtv/libs/libmythbase/mythcorecontext.cpp | 2
mythtv/libs/libmythprotoserver/requesthandler/outboundhandler.cpp | 2
mythtv/libs/libmythtv/decoderbase.cpp | 46 -
mythtv/libs/libmythtv/dtvmultiplex.cpp | 4
mythtv/libs/libmythtv/eithelper.cpp | 19
mythtv/libs/libmythtv/hdhrstreamhandler.cpp | 28
mythtv/libs/libmythtv/mythplayer.cpp | 3
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/ringbuffer.cpp | 2
mythtv/libs/libmythtv/tv_rec.cpp | 74 +-
mythtv/libs/libmythtv/tv_rec.h | 5
mythtv/programs/mythbackend/mainserver.cpp | 16
mythtv/programs/mythbackend/scheduler.cpp | 43 +
mythtv/programs/mythbackend/scheduler.h | 6
mythtv/programs/mythcommflag/main.cpp | 7
mythtv/programs/mythfrontend/playbackbox.cpp | 3
mythtv/programs/mythtranscode/transcode.cpp | 147 +---
mythtv/programs/programs-libs.pro | 1
mythtv/themes/Terra/osd.xml | 4
scripts/pytmdb3.py | 53 +
tmdb3/tmdb_auth.py | 131 +++
44 files changed, 1367 insertions(+), 444 deletions(-)
--- NEW FILE mythtv-0.25.1-fixes.patch ---
mythplugins/mythmusic/mythmusic/metadata.cpp | 6 +
.../mythweather/scripts/us_nws/NDFDParser.pm | 3 +-
.../mythweather/mythweather/scripts/us_nws/ndfd.pl | 17 +-
.../mythweather/scripts/us_nws/ndfd18.pl | 13 +-
.../mythweather/scripts/us_nws/ndfdXML.pm | 24 +-
.../mythweather/scripts/us_nws/nws-alert.pl | 8 +-
.../mythweather/scripts/us_nws/nwsxml.pl | 12 +-
mythtv/bindings/python/MythTV/utility.py | 2 +-
mythtv/bindings/python/tmdb3/README | 51 +++-
mythtv/bindings/python/tmdb3/setup.py | 2 +-
mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 7 +-
mythtv/bindings/python/tmdb3/tmdb3/cache.py | 35 ++-
mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 31 ++-
mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 342 ++++++++++++++++----
mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 4 +-
mythtv/bindings/python/tmdb3/tmdb3/locales.py | 72 ++++-
mythtv/bindings/python/tmdb3/tmdb3/pager.py | 2 +
mythtv/bindings/python/tmdb3/tmdb3/request.py | 49 +++-
mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 339 ++++++++++++++------
mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 131 ++++++++
.../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 17 +-
mythtv/bindings/python/tmdb3/tmdb3/util.py | 44 ++-
mythtv/libs/libmythbase/mthreadpool.cpp | 1 +
mythtv/libs/libmythbase/mythcorecontext.cpp | 2 +-
.../requesthandler/outboundhandler.cpp | 2 +
mythtv/libs/libmythtv/decoderbase.cpp | 46 ++-
mythtv/libs/libmythtv/dtvmultiplex.cpp | 4 +-
mythtv/libs/libmythtv/eithelper.cpp | 19 ++
mythtv/libs/libmythtv/hdhrstreamhandler.cpp | 28 ++-
mythtv/libs/libmythtv/mythplayer.cpp | 3 +-
mythtv/libs/libmythtv/mythplayer.h | 3 +
mythtv/libs/libmythtv/ringbuffer.cpp | 2 +-
mythtv/libs/libmythtv/tv_rec.cpp | 74 +++--
mythtv/libs/libmythtv/tv_rec.h | 5 +-
mythtv/programs/mythbackend/mainserver.cpp | 16 +-
mythtv/programs/mythbackend/scheduler.cpp | 43 ++-
mythtv/programs/mythbackend/scheduler.h | 6 +
mythtv/programs/mythcommflag/main.cpp | 7 +-
mythtv/programs/mythfrontend/playbackbox.cpp | 3 +-
mythtv/programs/mythtranscode/transcode.cpp | 147 +++------
mythtv/programs/programs-libs.pro | 1 +
mythtv/themes/Terra/osd.xml | 4 +-
scripts/pytmdb3.py | 53 +++
tmdb3/tmdb_auth.py | 131 ++++++++
44 files changed, 1367 insertions(+), 444 deletions(-)
diff --git a/mythplugins/mythmusic/mythmusic/metadata.cpp b/mythplugins/mythmusic/mythmusic/metadata.cpp
index 18ac7e3..4e167b0 100644
--- a/mythplugins/mythmusic/mythmusic/metadata.cpp
+++ b/mythplugins/mythmusic/mythmusic/metadata.cpp
@@ -171,6 +171,12 @@ bool Metadata::isInDatabase()
bool retval = false;
QString sqldir = m_filename.section('/', 0, -2);
+
+ // Filename is the absolute path, we want the relative path
+ QString musicdir = gCoreContext->GetSetting("MusicLocation");
+ if (sqldir.startsWith(musicdir))
+ sqldir.remove(0, musicdir.length());
+
QString sqlfilename = m_filename.section('/', -1);
MSqlQuery query(MSqlQuery::InitCon());
diff --git a/mythplugins/mythweather/mythweather/scripts/us_nws/NDFDParser.pm b/mythplugins/mythweather/mythweather/scripts/us_nws/NDFDParser.pm
index 2be6748..4ede85d 100644
--- a/mythplugins/mythweather/mythweather/scripts/us_nws/NDFDParser.pm
+++ b/mythplugins/mythweather/mythweather/scripts/us_nws/NDFDParser.pm
@@ -177,7 +177,7 @@ sub timeChar {
########## Exported method to do parsing #################
sub doParse {
- my ($lat, $lon, $start, $end, $params) = @_;
+ my ($lat, $lon, $start, $end, $units, $params) = @_;
my $product = "time-series";
my $NDFD_XML = ndfdXML->NDFDgen(SOAP::Data->name("latitude" => $lat),
@@ -185,6 +185,7 @@ sub doParse {
SOAP::Data->name("product" => $product),
SOAP::Data->name("startTime" => $start),
SOAP::Data->name("endTime" => $end),
+ SOAP::Data->name("Unit" => $units),
SOAP::Data->name("weatherParameters" =>
\SOAP::Data->value(
SOAP::Data->type('boolean')->name("maxt" => $params->{maxt}),
diff --git a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl
index 081bb12..c16fb55 100755
--- a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl
+++ b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl
@@ -22,9 +22,9 @@ use Getopt::Std;
our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
my $name = 'NDFD-6_day';
-my $version = 0.3;
-my $author = 'Lucien Dunning';
-my $email = 'ldunning(a)gmail.com';
+my $version = 0.4;
+my $author = 'Gavin Hurlbut & Lucien Dunning';
+my $email = 'gjhurlbu(a)gmail.com';
my $updateTimeout = 15*60;
my $retrieveTimeout = 30;
my @types = ('3dlocation', '6dlocation', 'updatetime',
@@ -119,7 +119,8 @@ if (open (CACHE, "$dir/ndfd_cache_${latitude}_${longitude}")) {
}
if ($getData) {
- ($result, $creationdate) = NDFDParser::doParse($latitude, $longitude, $d1, $d2, $param);
+ my $unit = ($units eq "SI" ? "m" : "e");
+ ($result, $creationdate) = NDFDParser::doParse($latitude, $longitude, $d1, $d2, $unit, $param);
# output cache
open(CACHE, ">$dir/ndfd_cache_${latitude}_${longitude}") or
die "cannot open cache ($dir/ndfd_cache_${latitude}_${longitude}) for writing";
@@ -171,17 +172,9 @@ foreach $time (sort(keys(%$result))) {
}
my $geticon = 0;
if ($lowindex <= 5 && $result->{$time}->{temperature_minimum}) {
- if ($units eq 'SI') {
- $result->{$time}->{temperature_minimum} =
- int ( (5/9) * ($result->{$time}->{temperature_minimum}-32));
- }
print "low-${lowindex}::$result->{$time}->{temperature_minimum}\n";
$lowindex++;
} elsif ($hiindex <= 5 && $result->{$time}->{temperature_maximum}) {
- if ($units eq 'SI') {
- $result->{$time}->{temperature_maximum} =
- int ( (5/9) * ($result->{$time}->{temperature_maximum}-32));
- }
print "high-${hiindex}::$result->{$time}->{temperature_maximum}\n";
$hiindex++;
$geticon = 1;
diff --git a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl
index ae99c99..f4b8049 100755
--- a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl
+++ b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl
@@ -18,9 +18,9 @@ use Date::Manip;
our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d);
my $name = 'NDFD-18_Hour';
-my $version = 0.2;
-my $author = 'Lucien Dunning';
-my $email = 'ldunning(a)gmail.com';
+my $version = 0.3;
+my $author = 'Gavin Hurlbut & Lucien Dunning';
+my $email = 'gjhurlbu(a)gmail.com';
my $updateTimeout = 15*60;
my $retrieveTimeout = 30;
my @types = ('18hrlocation', 'updatetime',
@@ -116,7 +116,8 @@ if (open (CACHE, "$dir/ndfd18_cache_${latitude}_${longitude}")) {
}
if ($getData) {
- ($result, $creationdate) = NDFDParser::doParse($latitude, $longitude, $d1, $d2, $param);
+ my $unit = ($units eq "SI" ? "m" : "e");
+ ($result, $creationdate) = NDFDParser::doParse($latitude, $longitude, $d1, $d2, $unit, $param);
# output cache
open(CACHE, ">$dir/ndfd18_cache_${latitude}_${longitude}") or
die "cannot open cache ($dir/ndfd18_cache_${latitude}_${longitude}) for writing";
@@ -149,10 +150,6 @@ foreach my $time (sort keys %$result) {
}
print "time-${index}::" . UnixDate($time, "%i %p\n");
- if ($units eq 'SI') {
- $result->{$time}->{temperature_hourly} =
- int( (5/9) * ($result->{$time}->{temperature_hourly}-32));
- }
print "temp-${index}::$result->{$time}->{temperature_hourly}\n";
print "pop-${index}::$pop12 %\n";
$icon = $result->{$time}->{'conditions-icon_forecast-NWS'};
diff --git a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfdXML.pm b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfdXML.pm
index 873ff8e..4cef7fb 100644
--- a/mythplugins/mythweather/mythweather/scripts/us_nws/ndfdXML.pm
+++ b/mythplugins/mythweather/mythweather/scripts/us_nws/ndfdXML.pm
@@ -5,9 +5,9 @@ package ndfdXML;
my %methods = (
NDFDgenByDay => {
- endpoint => 'http://www.weather.gov/forecasts/xml/SOAP_server/ndfdXMLserver.php',
- soapaction => 'http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl#NDFDgenByDay',
- uri => 'http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl',
+ endpoint => 'http://graphical.weather.gov/xml/SOAP_server/ndfdXMLserver.php',
+ soapaction => 'http://graphical.weather.gov/xml/DWMLgen/wsdl/ndfdXML.wsdl#NDFDgenByDay',
+ uri => 'http://graphical.weather.gov/xml/DWMLgen/wsdl/ndfdXML.wsdl',
parameters => [
SOAP::Data->new(name => 'latitude', type => 'xsd:decimal', attr => {}),
SOAP::Data->new(name => 'longitude', type => 'xsd:decimal', attr => {}),
@@ -17,15 +17,16 @@ my %methods = (
],
},
NDFDgen => {
- endpoint => 'http://www.weather.gov/forecasts/xml/SOAP_server/ndfdXMLserver.php',
- soapaction => 'http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl#NDFDgen',
- uri => 'http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML.wsdl',
+ endpoint => 'http://graphical.weather.gov/xml/SOAP_server/ndfdXMLserver.php',
+ soapaction => 'http://graphical.weather.gov/xml/DWMLgen/wsdl/ndfdXML.wsdl#NDFDgen',
+ uri => 'http://graphical.weather.gov/xml/DWMLgen/wsdl/ndfdXML.wsdl',
parameters => [
SOAP::Data->new(name => 'latitude', type => 'xsd:decimal', attr => {}),
SOAP::Data->new(name => 'longitude', type => 'xsd:decimal', attr => {}),
- SOAP::Data->new(name => 'product', type => 'typens:productType', attr => {}),
+ SOAP::Data->new(name => 'product', type => 'xsd:string', attr => {}),
[...2814 lines suppressed...]
+ <area>20,95,110,30</area>
<font>baseextralarge</font>
<align>hcenter</align>
<template>%CHANNUM%</template>
diff --git a/scripts/pytmdb3.py b/scripts/pytmdb3.py
new file mode 100755
index 0000000..f6a3e64
--- /dev/null
+++ b/scripts/pytmdb3.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+from optparse import OptionParser
+from tmdb3 import *
+
+import sys
+
+if __name__ == '__main__':
+ # this key is registered to this library for testing purposes.
+ # please register for your own key if you wish to use this
+ # library in your own application.
+ # http://help.themoviedb.org/kb/api/authentication-basics
+ set_key('1acd79ff610c77f3040073d004f7f5b0')
+
+ parser = OptionParser()
+ parser.add_option('-v', "--version", action="store_true", default=False,
+ dest="version", help="Display version.")
+ parser.add_option('-d', "--debug", action="store_true", default=False,
+ dest="debug", help="Enables verbose debugging.")
+ parser.add_option('-c', "--no-cache", action="store_true", default=False,
+ dest="nocache", help="Disables request cache.")
+ opts, args = parser.parse_args()
+
+ if opts.version:
+ from tmdb3.tmdb_api import __title__, __purpose__, __version__, __author__
+ print __title__
+ print ""
+ print __purpose__
+ print "Version: "+__version__
+ sys.exit(0)
+
+# TODO: make this actually do something
+# if opts.debug:
+# DEBUG = True
+
+ if opts.nocache:
+ set_cache(engine='null')
+ else:
+ set_cache(engine='file', filename='/tmp/pytmdb3.cache')
+
+ banner = 'PyTMDB3 Interactive Shell.'
+ import code
+ try:
+ import readline, rlcompleter
+ except ImportError:
+ pass
+ else:
+ readline.parse_and_bind("tab: complete")
+ banner += ' TAB completion available.'
+ namespace = globals().copy()
+ namespace.update(locals())
+ code.InteractiveConsole(namespace).interact(banner)
+
diff --git a/tmdb3/tmdb_auth.py b/tmdb3/tmdb_auth.py
new file mode 100644
index 0000000..8583b99
--- /dev/null
+++ b/tmdb3/tmdb_auth.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#-----------------------
+# Name: tmdb_auth.py
+# Python Library
+# Author: Raymond Wagner
+# Purpose: Provide authentication and session services for
+# calls against the TMDB v3 API
+#-----------------------
+
+from datetime import datetime as _pydatetime, \
+ tzinfo as _pytzinfo
+import re
+class datetime( _pydatetime ):
+ """Customized datetime class with ISO format parsing."""
+ _reiso = re.compile('(?P<year>[0-9]{4})'
+ '-(?P<month>[0-9]{1,2})'
+ '-(?P<day>[0-9]{1,2})'
+ '.'
+ '(?P<hour>[0-9]{2})'
+ ':(?P<min>[0-9]{2})'
+ '(:(?P<sec>[0-9]{2}))?'
+ '(?P<tz>Z|'
+ '(?P<tzdirec>[-+])'
+ '(?P<tzhour>[0-9]{1,2})'
+ '(:)?'
+ '(?P<tzmin>[0-9]{2})?'
+ ')?')
+
+ class _tzinfo( _pytzinfo):
+ def __init__(self, direc='+', hr=0, min=0):
+ if direc == '-':
+ hr = -1*int(hr)
+ self._offset = timedelta(hours=int(hr), minutes=int(min))
+ def utcoffset(self, dt): return self._offset
+ def tzname(self, dt): return ''
+ def dst(self, dt): return timedelta(0)
+
+ @classmethod
+ def fromIso(cls, isotime, sep='T'):
+ match = cls._reiso.match(isotime)
+ if match is None:
+ raise TypeError("time data '%s' does not match ISO 8601 format" \
+ % isotime)
+
+ dt = [int(a) for a in match.groups()[:5]]
+ if match.group('sec') is not None:
+ dt.append(int(match.group('sec')))
+ else:
+ dt.append(0)
+ if match.group('tz'):
+ if match.group('tz') == 'Z':
+ tz = cls._tzinfo()
+ elif match.group('tzmin'):
+ tz = cls._tzinfo(*match.group('tzdirec','tzhour','tzmin'))
+ else:
+ tz = cls._tzinfo(*match.group('tzdirec','tzhour'))
+ dt.append(0)
+ dt.append(tz)
+ return cls(*dt)
+
+from request import Request
+from tmdb_exceptions import *
+
+syssession = None
+
+def set_session(sessionid):
+ global syssession
+ syssession = Session(sessionid)
+
+def get_session(sessionid=None):
+ global syssession
+ if sessionid:
+ return Session(sessionid)
+ elif syssession is not None:
+ return syssession
+ else:
+ return Session.new()
+
+class Session( object ):
+
+ @classmethod
+ def new(cls):
+ return cls(None)
+
+ def __init__(self, sessionid):
+ self.sessionid = sessionid
+
+ @property
+ def sessionid(self):
+ if self._sessionid is None:
+ if self._authtoken is None:
+ raise TMDBError("No Auth Token to produce Session for")
+ # TODO: check authtokenexpiration against current time
+ req = Request('authentication/session/new', \
+ request_token=self._authtoken)
+ req.lifetime = 0
+ dat = req.readJSON()
+ if not dat['success']:
+ raise TMDBError("Session generation failed")
+ self._sessionid = dat['session_id']
+ return self._sessionid
+
+ @sessionid.setter
+ def sessionid(self, value):
+ self._sessionid = value
+ self._authtoken = None
+ self._authtokenexpiration = None
+ if value is None:
+ self.authenticated = False
+ else:
+ self.authenticated = True
+
+ @property
+ def authtoken(self):
+ if self.authenticated:
+ raise TMDBError("Session is already authenticated")
+ if self._authtoken is None:
+ req = Request('authentication/token/new')
+ req.lifetime = 0
+ dat = req.readJSON()
+ if not dat['success']:
+ raise TMDBError("Auth Token request failed")
+ self._authtoken = dat['request_token']
+ self._authtokenexpiration = datetime.fromIso(dat['expires_at'])
+ return self._authtoken
+
+ @property
+ def callbackurl(self):
+ return "http://www.themoviedb.org/authenticate/"+self._authtoken
+
--- NEW FILE mythtv.logrotate.sysd ---
/var/log/mythtv/mythbackend.log /var/log/mythtv/myth*.*.*.log {
notifempty
missingok
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
weekly
rotate 4
size 10M
postrotate
/bin/systemctl kill mythbackend.service --signal=HUP --kill-who=main 2>/dev/null || true
endscript
}
--- NEW FILE mythtv.logrotate.sysv ---
/var/log/mythtv/myth*.log {
notifempty
missingok
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
weekly
rotate 4
size 10M
postrotate
/bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
endscript
}
12 years, 4 months
- 1
- 0
rpms/mythtv/EL-6 mythbackend.init, 1.1, 1.2 mythfrontend.desktop, 1.1, 1.2 mythtv-setup.desktop, 1.1, 1.2 mythtv.spec, 1.86, 1.87 sources, 1.52, 1.53 mythbackend.logrotate, 1.1, NONE mythtv-0.25-fixes.patch, 1.1, NONE mythtv_0.25_gcc_4.7.patch, 1.1, NONE mythweb.conf, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20130
Modified Files:
mythbackend.init mythfrontend.desktop mythtv-setup.desktop
mythtv.spec sources
Removed Files:
mythbackend.logrotate mythtv-0.25-fixes.patch
mythtv_0.25_gcc_4.7.patch mythweb.conf
Log Message:
* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
- Update to latest fixes/0.25.
- Move mythweb to a stand alone package.
Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythbackend.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.init 3 Mar 2011 02:45:10 -0000 1.1
+++ mythbackend.init 6 Jul 2012 18:11:28 -0000 1.2
@@ -22,7 +22,7 @@
binary=/usr/bin/mythbackend
prog=mythbackend
RETVAL=0
-OPTIONS="$OPTIONS --daemon --user ${MYTHBACKEND_USER} --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
+OPTIONS="$OPTIONS --daemon --user ${MYTHBACKEND_USER} --logpath /var/log/mythtv --pidfile /var/run/$prog.pid"
start() {
echo -n $"Starting $prog: "
Index: mythfrontend.desktop
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythfrontend.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythfrontend.desktop 3 Aug 2008 15:20:03 -0000 1.1
+++ mythfrontend.desktop 6 Jul 2012 18:11:28 -0000 1.2
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=mythTV frontend
Comment=Record, playback and watch TV.
-Icon=mythfrontend.png
+Icon=mythfrontend
Exec=mythfrontend
Terminal=false
Type=Application
Index: mythtv-setup.desktop
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv-setup.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-setup.desktop 3 Aug 2008 15:20:03 -0000 1.1
+++ mythtv-setup.desktop 6 Jul 2012 18:11:28 -0000 1.2
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=mythTV setup
Comment=Setup for mythTV.
-Icon=mythtv-setup.png
+Icon=mythtv-setup
Exec=mythtv-setup
Terminal=false
Type=Application
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mythtv.spec 9 Jun 2012 02:25:42 -0000 1.86
+++ mythtv.spec 6 Jul 2012 18:11:28 -0000 1.87
@@ -48,7 +48,6 @@
# --without mythnews
# --without mythweather
# --without mythzoneminder
-# --without mythweb
#
################################################################################
@@ -60,15 +59,12 @@
%define desktop_vendor RPMFusion
# Git revision and branch ID
-# 0.24 release: git tag v0.24.1
-%define _gitrev 1a671d0
+# 0.25 release: git tag v0.25.1
+%define _gitrev c2c276d
# Mythtv and plugins from github.com
-%global githash1 g1f5962a
-%global githash2 9615da9
-# Mythweb from github.com
-%global githash3 g1d056f7
-%global githash4 0fc49a5
+%global githash1 gc2c276d
+%global githash2 4c30a85
%define branch fixes/0.25
@@ -81,12 +77,12 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25
+Version: 0.25.1
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 6%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,7 +127,6 @@
%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1}
%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1}
%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1}
-%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1}
%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1}
%define with_mythnetvision %{?_without_mythnetvision: 0} %{!?_without_mythnetvision: 1}
@@ -139,23 +134,22 @@
# https://github.com/MythTV/mythtv/tarball/v0.25
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-# https://github.com/MythTV/mythweb/tarball/v0.25
-Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
-Patch0: mythtv-0.25-fixes.patch
-#Patch1: mythweb-%{version}-fixes.patch
-Patch2: mythtv_0.25_gcc_4.7.patch
+Patch0: mythtv-0.25.1-fixes.patch
Source10: PACKAGE-LICENSING
+Source11: ChangeLog
Source101: mythbackend.sysconfig
Source102: mythbackend.init
-Source103: mythbackend.logrotate
+Source103: mythtv.logrotate.sysv
+Source104: mythtv.logrotate.sysd
+Source105: mythbackend.service
Source106: mythfrontend.png
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
Source110: mysql.txt
-Source401: mythweb.conf
+Source111: 99-mythbackend.rules
# Global MythTV and Shared Build Requirements
@@ -220,7 +214,6 @@
BuildRequires: libogg-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel >= 1.0
-BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.6
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
@@ -352,6 +345,7 @@
Requires: php-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
+Requires: mythweb
Requires: mysql-server >= 5, mysql >= 5
Requires: xmltv
@@ -385,8 +379,9 @@
################################################################################
%package docs
-Summary: MythTV documentation
-Group: Documentation
+Summary: MythTV documentation
+Group: Documentation
+BuildArch: noarch
%description docs
The MythTV documentation, database initialization file
@@ -514,9 +509,8 @@
Requires: perl(XML::Simple)
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
+Requires: python-MythTV python-lxml
Provides: mythtv-frontend-api = %{mythfeapiver}
-Obsoletes: mythcontrols < %{version}-%{release}
-Provides: mythcontrols = %{version}-%{release}
Obsoletes: mythvideo < %{version}-%{release}
Provides: mythvideo = %{version}-%{release}
@@ -569,13 +563,7 @@
%package common
Summary: Common components needed by multiple other MythTV components
Group: Applications/Multimedia
-# mythphone is now DOA, but we need this for upgrade path preservation.
-Provides: mythphone = %{version}-%{release}
-Obsoletes: mythphone < %{version}-%{release}
-# same deal for mythflix
-Provides: mythflix = %{version}-%{release}
-Obsoletes: mythflix < %{version}-%{release}
-# and now mythmovies
+# mythpmovies is now DOA, but we need this for upgrade path preservation.
Provides: mythmovies = %{version}-%{release}
Obsoletes: mythmovies < %{version}-%{release}
@@ -592,8 +580,7 @@
%package -n perl-MythTV
Summary: Perl bindings for MythTV
Group: Development/Languages
-# Wish we could do this:
-#BuildArch: noarch
+BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBD::mysql)
@@ -612,8 +599,7 @@
%package -n php-MythTV
Summary: PHP bindings for MythTV
Group: Development/Languages
-# Wish we could do this:
-#BuildArch: noarch
+BuildArch: noarch
%description -n php-MythTV
Provides a PHP-based interface to interacting with MythTV.
@@ -627,8 +613,7 @@
%package -n python-MythTV
Summary: Python bindings for MythTV
Group: Development/Languages
-# Wish we could do this:
-#BuildArch: noarch
+BuildArch: noarch
Requires: MySQL-python
Requires: PyXML
@@ -656,7 +641,6 @@
Requires: mythbrowser = %{version}-%{release}
Requires: mytharchive = %{version}-%{release}
Requires: mythzoneminder = %{version}-%{release}
-Requires: mythweb = %{version}-%{release}
Requires: mythnetvision = %{version}-%{release}
%description -n mythplugins
@@ -681,7 +665,6 @@
Requires: python >= 2.3.5
Requires: python-imaging
Requires: transcode >= 1.0.2
-Requires: m2vrequantiser
Requires: pmount
%description -n mytharchive
@@ -770,22 +753,6 @@
%endif
################################################################################
-%if %{with_mythweb}
-
-%package -n mythweb
-Summary: The web interface to MythTV
-Group: Applications/Multimedia
-Requires: httpd >= 1.3.26
-Requires: php >= 5.1
-Requires: php-mysql
-Requires: php-process
-Requires: php-MythTV
-
-%description -n mythweb
-The web interface to MythTV.
-
-%endif
-################################################################################
%if %{with_mythzoneminder}
%package -n mythzoneminder
@@ -811,6 +778,7 @@
Requires: python-MythTV = %{version}-%{release}
Requires: python-pycurl
Requires: python >= 2.5
+Requires: python-lxml
# This is packaged in adobe's yum repo
#Requires: flash-plugin
@@ -827,19 +795,6 @@
################################################################################
%prep
-#### MythWeb
-# Provided as a separate download so we deal with it here.
-%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
-
-# Fix up permissions for MythWeb
-chmod -R g-w ./*
-
-# Remove execute bits from some php mythweb files
-# chmod -x mythweb/classes/*.php
-
-
-#### MythTV
-#setup -q -c -a 1
%setup -q -n MythTV-%{name}-%{githash2}
# Replace static lib paths with %{_lib} so we build properly on x86_64
@@ -851,8 +806,9 @@
fi
%patch0 -p1 -b .mythtv
-#patch1 -p1 -b .mythplug
-%patch2 -p1 -b .gcc47
+
+# Install ChangeLog
+install -m 0644 %{SOURCE11} .
pushd mythtv
@@ -1080,17 +1036,22 @@
# mysql.txt and other config/init files
install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
+
+ ### SystemD based setup. ###
%if 0%{?fedora} >= 16
- install -p -m 0644 %{SOURCE104} %{buildroot}%{_unitdir}/
+ install -p -m 0644 %{SOURCE105} %{buildroot}%{_unitdir}/
+ install -p -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/logrotate.d/mythtv
# Install udev rules for devices that may initialize late in the boot
# process so they are available for mythbackend.
mkdir -p %{buildroot}/lib/udev/rules.d/
install -p -m 0644 %{SOURCE111} %{buildroot}/lib/udev/rules.d/
+
+ ### SysV based setup. ###
%else
install -p -m 0755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend
install -p -m 0644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
+ install -p -m 0644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythtv
%endif
- install -p -m 0644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
# Desktop entries
mkdir -p %{buildroot}%{_datadir}/pixmaps
@@ -1140,19 +1101,6 @@
%endif
popd
-%if %{with_mythweb}
- pushd ../MythTV-mythweb-%{githash4}
- mkdir -p %{buildroot}%{_datadir}/mythweb
- cp -a * %{buildroot}%{_datadir}/mythweb/
- mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
-
- mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
- cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
- # drop .htaccess file, settings handled in the above
- rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
- popd
-%endif
-
# And back to the build/install root
%endif
@@ -1250,6 +1198,7 @@
################################################################################
%files
+%doc ChangeLog mythtv/PACKAGE-LICENSING
%files docs
%doc mythtv/README*
@@ -1261,7 +1210,6 @@
# Do we really need the API documentation?
#%doc mythtv/docs/*.html mythtv/docs/*.png
#%doc mythtv/docs/*.txt
-%doc mythtv/PACKAGE-LICENSING
%doc mythtv/contrib
%files common
@@ -1300,7 +1248,7 @@
%{_sysconfdir}/init.d/mythbackend
%config(noreplace) %{_sysconfdir}/sysconfig/mythbackend
%endif
-%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
+%config(noreplace) %{_sysconfdir}/logrotate.d/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
%{_datadir}/mythtv/internetcontent/
%{_datadir}/mythtv/html/
@@ -1459,15 +1407,6 @@
%{_datadir}/mythtv/mythweather/*
%endif
-%if %{with_mythweb}
-%files -n mythweb
-%doc ../MythTV-mythweb-%{githash4}/README
-%doc ../MythTV-mythweb-%{githash4}/LICENSE
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
-%defattr(-,apache,apache,0775)
-%{_datadir}/mythweb/
-%endif
-
%if %{with_mythzoneminder}
%files -n mythzoneminder
%{_libdir}/mythtv/plugins/libmythzoneminder.so
@@ -1492,15 +1431,15 @@
################################################################################
-%clean
-rm -rf %{buildroot}
-%if %{with_mythweb}
-rm -rf ../MythTV-mythweb-%{githash4}
-%endif
-
-################################################################################
%changelog
+* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
+- Update to latest fixes/0.25.
+- Move mythweb to a stand alone package.
+
+* Fri May 11 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-7
+- Update to latest 0.25/fixes.
+
* Fri May 04 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-6
- Add Bonjour (Airplay) support.
- Fix user creation for packages that create directories owned by mythtv user.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 9 Jun 2012 02:17:35 -0000 1.52
+++ sources 6 Jul 2012 18:11:28 -0000 1.53
@@ -1,2 +1 @@
-68928bcd22857d4905cc6141e3b7f7dc MythTV-mythtv-v0.25-0-g1f5962a.tar.gz
-370bf39a67c1d405d455e4ff74180cba MythTV-mythweb-v0.25-0-g1d056f7.tar.gz
+fb9dd6b59786e579237fa579d49f104c MythTV-mythtv-v0.25.1-0-gc2c276d.tar.gz
--- mythbackend.logrotate DELETED ---
--- mythtv-0.25-fixes.patch DELETED ---
--- mythtv_0.25_gcc_4.7.patch DELETED ---
--- mythweb.conf DELETED ---
12 years, 4 months
- 1
- 0
rpms/mythweb/EL-6 ChangeLog, NONE, 1.1 mythweb-fixes.patch, NONE, 1.1 mythweb.conf, NONE, 1.1 mythweb.spec, NONE, 1.1 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19724
Modified Files:
sources
Added Files:
ChangeLog mythweb-fixes.patch mythweb.conf mythweb.spec
Log Message:
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
--- NEW FILE ChangeLog ---
commit 89a347c85284c5cf3ca3ad7250f21c7e698af858
Author: Michael T. Dean <mdean(a)mythtv.org>
Date: Wed May 30 17:19:55 2012 -0400
Fix MythWeb Upcoming Recordings programinfo usage.
The programinfo refactor in #8406 changed the order of fields returned
in a programinfo string list, and a reference was missed in the MythWeb
Schedule class. The result is that any recording rule with recordid of
6 was skipped/didn't show in Upcoming Recordings.
The original intent of the code was to skip recordings with recstatus of
rsNotListed (as shown in commits e728aea5 and 508103511 , committed for
which has since been modified, again, by a41e9657. (Therefore, the
index in this commit is correct for 0.25-fixes and above, but should be
18 for 0.24-fixes.)
Thanks to JK on the -users list for finding the issue.
(cherry picked from commit 39a5dcd101ce7a6b97474f7b824b358f6e05c0cd)
commit 8c43d8da31d738c75ec6abc9daff2772b16310c8
Author: David Engel <david(a)istwok.net>
Date: Mon Apr 30 17:01:44 2012 -0500
Clear the search type when creating an override or don't record for
non-manual rules. Based on a patch from david.osguthorpe.
Fixes #10580 and fixes #10650 .
commit 1833030d2ce0b5f2ec4f507031e6628458ca46b9
Author: Kenni Lund <kenni(a)mythtv.org>
Date: Wed Apr 11 21:06:29 2012 +0200
Convert the Spanish (es_es) translation files to UTF8.
Refs. #10575.
commit 4d6e6219083446c024e8467cbff64ab42521b05c
Author: Antonio Marcos López Alonso <amlopezalonso(a)gmail.com>
Date: Wed Apr 11 20:55:18 2012 +0200
Update the Spanish translation.
Refs. #10575.
Signed-off-by: Kenni Lund <kenni(a)mythtv.org>
commit ed863708c02dd3620a7f4c0e37b118d00e712daa
Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
Date: Tue Apr 10 00:18:10 2012 -0700
Force a commit
mythweb-fixes.patch:
README | 2
modules/_shared/lang/Spanish_ES.cat | 28 -
modules/_shared/lang/Spanish_ES.lang | 725 +++++++++++++++--------------------
modules/tv/classes/Schedule.php | 7
4 files changed, 337 insertions(+), 425 deletions(-)
--- NEW FILE mythweb-fixes.patch ---
README | 2 +-
modules/_shared/lang/Spanish_ES.cat | 28 +-
modules/_shared/lang/Spanish_ES.lang | 725 +++++++++++++++-------------------
modules/tv/classes/Schedule.php | 7 +-
4 files changed, 337 insertions(+), 425 deletions(-)
diff --git a/README b/README
index 38bfd08..c9eaf45 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
This is the README file for the MythWeb package.
February 16, 2008
-Version: .24-svn
+Version: .25
(c) 2002-2010 Chris Petersen <cpetersen(a)mythtv.org>
Rob Smith <rsmith(a)mythtv.org>
Isaac Richards <isaacr(a)mythtv.org>
diff --git a/modules/_shared/lang/Spanish_ES.cat b/modules/_shared/lang/Spanish_ES.cat
index 2bd19b7..1eff436 100644
--- a/modules/_shared/lang/Spanish_ES.cat
+++ b/modules/_shared/lang/Spanish_ES.cat
@@ -1,21 +1,21 @@
"Action"
- Acción
- \b(?:action|adven|acci[óo]n|avent)
+ Acción
+ \b(?:action|adven|acci[óo]n|avent)
"Adult"
Adultos
- \b(?:adult|er[oó]t)
+ \b(?:adult|er[oó]t)
"Animals"
Animales
\b(?:animal|tiere)
"Art_Music"
- Arte/Música
- \b(?:art|dan[cz][ae]|m[uú]si[ck]|kunst|[ck]ultur)
+ Arte/Música
+ \b(?:art|dan[cz][ae]|m[uú]si[ck]|kunst|[ck]ultur)
"Business"
Negocios
\b(?:biz|busine|negoc|econ)
"Children"
Infantil
- \b(?:child|kin?d|infan|anima[ct]ion|niñ)
+ \b(?:child|kin?d|infan|anima[ct]ion|niñ)
"Comedy"
Comedia
\b(?:comed|entertain|sitcom|humor)
@@ -32,7 +32,7 @@
Educativo
\b(?:edu|interests)
"Food"
- Alimentación
+ Alimentación
\b(?:food|cook|comida|cocin|aliment)
"Game"
Juegos
@@ -48,21 +48,21 @@
\b(?:horror|terror)
"HowTo"
Bricolaje
- \b(?:how|home|house|garden|como|casa|jard[ií]n|brico|hogar)
+ \b(?:how|home|house|garden|como|casa|jard[iÃ]n|brico|hogar)
"Misc"
Varios
\b(?:[e]special|variedad|info|collect|colecci)
"News"
Noticias
- \b(?:news|noticias|informa[ct]i[óov])
+ \b(?:news|noticias|informa[ct]i[óov])
"Reality"
Telerrealidad
\b(?:reali[dt][iy])
"Romance"
- Romántico
+ Romántico
\b(?:romance|lieb|romant)
"SciFi_Fantasy"
- Ciencia Ficción/Fantasía
+ Ciencia Ficción/FantasÃa
\b(?:fantasy|sci\w*\W*fi|fantas|ficci)
"Science_Nature"
Ciencia/Naturaleza
@@ -88,11 +88,11 @@
"Unknown"
Desconocido
"War"
- Bélico
- \b(?:war|guerr|b[eé]lic)
+ Bélico
+ \b(?:war|guerr|b[eé]lic)
"Western"
Oeste
\b(?:west|oeste|vaquer)
"movie"
- Película
+ PelÃcula
diff --git a/modules/_shared/lang/Spanish_ES.lang b/modules/_shared/lang/Spanish_ES.lang
index 23d530a..356766f 100644
--- a/modules/_shared/lang/Spanish_ES.lang
+++ b/modules/_shared/lang/Spanish_ES.lang
@@ -6,9 +6,9 @@
"$1 B"
$1 B
"$1 day"
- $1 día
+ $1 dÃa
"$1 days"
- $1 días
+ $1 dÃas
"$1 episode"
$1 episodio
"$1 episodes"
@@ -36,13 +36,13 @@
"$1 programs, using $2 ($3) out of $4 ($5 free)."
$1 programas, que usan $2 ($3) de $4 ($5 libres))
"$1 recording"
- $1 grabación
+ $1 grabación
"$1 recordings"
$1 grabaciones
"$1 requests pending."
$1 solicitudes pendientes.
"$1 Search"
- Búsqueda $1
+ Búsqueda $1
"$1 TB"
$1 TB
"$1 to $2"
@@ -50,17 +50,17 @@
"$1 wasted"
$1 desperdiciado
"$1 year"
- $1 año
+ $1 año
"$1 years"
- $1 años
+ $1 años
"%s Song (%s)"
- %s Canción (%s)
+ %s Canción (%s)
"%s Songs"
%s Canciones
"%s Songs (%s)"
%s Canciones (%s)
"(height is calculated automatically from the recording aspect ratio)"
- (la altura se calcula automáticamente a partir de la relación de aspecto de la grabación)
+ (la altura se calcula automáticamente a partir de la relación de aspecto de la grabación)
"1 - Lowest"
1 - La Menor
"4 - Highest"
@@ -70,57 +70,57 @@
"Aborting"
Abortando
"Action"
- Acción
+ Acción
"Activate"
Activar
"Add"
- Añadir
+ Añadir
"Add Album to Current Playlist"
- Añadir Álbum a Lista de Reproducción Actual
+ Añadir Ãlbum a Lista de Reproducción Actual
"Add Mix"
- Añadir Mezcla
+ Añadir Mezcla
"Add Song to Current Playlist"
- Añadir Canción a Lista de Reproducción Actual
+ Añadir Canción a Lista de Reproducción Actual
"add string"
- añadir cadena
+ añadir cadena
"Add this Playlist as a Subplaylist"
- Añadir esta Lista de Reproducción como Sublista
+ Añadir esta Lista de Reproducción como Sublista
"Additional Tables"
Tablas Adicionales
"Additional tables:"
Tablas adicionales:
"Admin Key"
- Clave de Administración
+ Clave de Administración
"Advanced"
Avanzado
"Advanced Options"
Opciones Avanzadas
"Advanced Search"
- Búsqueda Avanzada
+ Búsqueda Avanzada
"airdate"
- emisión
+ emisión
"Airdate"
- Emisión
+ Emisión
"Airtime"
Horario
"Album Listing"
- Listado de Álbumes
+ Listado de Ãlbumes
"Album Tracks"
- Pistas del Álbum
+ Pistas del Ãlbum
"Albums"
- Álbumes
+ Ãlbumes
"Albums with songs by %s"
- Álbumes con canciones de %s
+ Ãlbumes con canciones de %s
"All"
Todos
"All Albums"
- Todos los Álbumes
+ Todos los Ãlbumes
"All Categories"
- Todas las Categorías
+ Todas las CategorÃÂas
"All Fields"
Todos los Campos
"All Genres"
- Todos los Géneros
+ Todos los Géneros
"All groups"
Todos los grupos
"All HDTV"
@@ -136,29 +136,29 @@
"Allows you to match any string of any length (including zero length)"
Le permite buscar cadenas de cualquier longitud (cero inclusive)
"Allows you to match on a single character"
- Le permite buscar un único carácter
+ Le permite buscar un único carácter
"Allows you to search through other database tables when using a power search"
- Le permite buscar en otras tablas de la base de datos al usar la búsqueda avanzada
+ Le permite buscar en otras tablas de la base de datos al usar la búsqueda avanzada
"An error occurred while adding your playlist."
- Ocurrió un error al añadir su lista de reproducción.
+ Ocurrió un error al añadir su lista de reproducción.
"and"
y
"Any"
Cualquiera
"Any Category"
- Cualquier Categoría
+ Cualquier CategorÃa
"Any Channel"
Cualquier Canal
"Any Program Type"
Cualquier Tipo de Programa
"Append"
- Añadir
+ Añadir
"Append to Current Playlist"
- Añadir a la Lista de Reproducción Actual
+ Añadir a la Lista de Reproducción Actual
"Are you sure you want to delete the following show?"
- ¿Seguro que desea eliminar el siguiente programa?
+ ¿Seguro que desea eliminar el siguiente programa?
"Are you sure you want to DELETE THIS SAVED PLAYLIST?"
- ¿Seguro que desea ELIMINAR ESTA LISTA DE REPRODUCCIÓN GUARDADA?
+ ¿Seguro que desea ELIMINAR ESTA LISTA DE REPRODUCCIÃN GUARDADA?
"Artist Listing"
Lista de Artistas
"Artists"
@@ -184,11 +184,11 @@
"AVC/H.264"
AVC/H.264
"Avoid poor signal quality"
- Evitar baja calidad de señal
+ Evitar baja calidad de señal
"Back"
- Atrás
+ Atrás
"Back Tab"
- Tabulador Atrás
+ Tabulador Atrás
"Back to the program listing"
Volver a la lista de programas
"Back to the recorded programs"
@@ -202,7 +202,7 @@
"Backspace"
Retroceso
"Begin a New Search"
- Comenzar una Nueva Búsqueda
+ Comenzar una Nueva Búsqueda
"brightness"
brillo
"Browsable"
@@ -212,52 +212,49 @@
"Browse = no"
Explorar = no
"Browse = yes"
- Explorar = sí
+ Explorar = sÃ
"Browse all"
Explorar todos
"Browse All Albums"
- Explorar todos los Álbumes
+ Explorar todos los Ãlbumes
"Browse Music"
- Explorar Música
+ Explorar Música
"Browse the Music Database"
- Explorar la Base de Datos de Música
+ Explorar la Base de Datos de Música
"By Artist Beginning With"
Por Artistas Que Comiencen Por
"By Genre"
- Por Género
+ Por Género
"Cache_APC"
- Temporal_APC
"cache_engine"
"Cache_Memcache"
"Cache_Memcached"
"Cache_Null"
"Cache_SHM"
"callsign"
- ID de emisora
"Cancel"
Cancelar
"Cancel this schedule."
- Cancelar esta programación
+ Cancelar esta programación
"Cancelled"
Cancelada
"Caps Lock"
- Bloqueo de Mayúsculas
+ Bloqueo de Mayúsculas
"Cast"
Reparto
"category"
- categoría
+ categorÃa
"Category"
- Categoría
+ CategorÃÂa
"Category Legend"
- Leyenda de Categoría
+ Leyenda de CategorÃÂa
"CC"
- SUB
"Chan. Callsign"
ID de Emisora del Canal
"Chan. Name"
Nombre del Canal
"Chan. Number"
- Número del Canal
+ Número del Canal
"Channel"
Canal
"channel"
@@ -267,43 +264,40 @@
"Channel Detail"
Detalles del Canal
"Channel Info"
- Información del Canal
+ Información del Canal
"Channels"
Canales
"channum"
- número del canal
"Check for duplicates in"
Buscar duplicados en
"Children's Movies"
- Películas Infantiles
+ PelÃculas Infantiles
"Choose Genre.."
- Elegir Género..
+ Elegir Género..
"Choose Type"
Elegir Tipo
"Clear the current default session"
- Eliminar la sesión predeterminada actual
+ Eliminar la sesión predeterminada actual
"Click to disable Auto Expire"
- Pulsar para desactivar la Autoexpiración
+ Pulsar para desactivar la Autoexpiración
"Click to enable Auto Expire"
- Pulsar para activar la Autoexpiración
+ Pulsar para activar la Autoexpiración
"Click to View Playlist"
- Pulsar para Ver la Lista de Reproducción
+ Pulsar para Ver la Lista de Reproducción
"Close Captioned priority"
- Prioridad de subtítulos
+ Prioridad de subtÃtulos
"Closed Captioning"
- Subtítulos
+ SubtÃtulos
"color"
- color
"Commands"
- Órdenes
+ Ãrdenes
"Commands:"
- Órdenes:
+ Ãrdenes:
"Commercial free"
Sin anuncios
"Commercials Flagged"
Anuncios Marcados
"commfree"
- sin anuncios
"Conflict"
Conflicto
"Conflicts"
@@ -311,21 +305,20 @@
"Context"
Contexto
"contrast"
- contraste
"Count"
Cuenta
"Cover Image"
- Imagen de Carátula
+ Imagen de Carátula
"Create a New Playlist"
- Crear una Nueva Lista de Reproducción
+ Crear una Nueva Lista de Reproducción
"Create a Random Mix"
Crear una Mezcla Aleatoria
"Create Schedule"
- Crear Programación
+ Crear Programación
"Current MythWeb Template"
Plantilla Predeterminada de MythWeb
"Current Recording"
- Grabación Actual
+ Grabación Actual
"Current recordings"
Grabaciones actuales
"Currently Browsing: $1"
@@ -335,9 +328,9 @@
"Custom"
Personalizada
"Custom Schedule"
- Programación Personalizada
+ Programación Personalizada
"Custom Search"
- Búsqueda Personalizada
+ Búsqueda Personalizada
"Customize Screens"
Personalizar Pantallas
"Data"
@@ -363,7 +356,6 @@
"Delete"
Eliminar
"delete"
- eliminar
"Delete $1"
Eliminar $1
"Delete + Rerecord"
@@ -375,15 +367,13 @@
"Delete Forever"
Eliminar Para Siempre
"DELETE this Saved Playlist"
- ELIMINAR esta Lista de Reproducción Guardada
+ ELIMINAR esta Lista de Reproducción Guardada
"DeleteKey"
- TeclaDeEliminación
"Depending on the Search type this is where you enter actual main search commands"
- Dependiendo del tipo de Búsqueda, aquí es donde usted introduce las órdenes de búsqueda principales
+ Dependiendo del tipo de Búsqueda, aquà es donde usted introduce las órdenes de búsqueda principales
"description"
- descripción
"Description"
- Descripción
+ Descripción
"Destination"
Destino
"Details for: $1"
@@ -411,13 +401,13 @@
"Down"
Abajo
"Download URL override"
- Descargar excepción de URL
+ Descargar excepción de URL
"Dup Method"
- Método de Duplicadas
+ Método de Duplicadas
"Duplicate"
Duplicada
"Duplicate Check method"
- Método de Comprobación de Duplicadas
+ Método de Comprobación de Duplicadas
"Duplicates/Ignored"
Duplicadas/Ignoradas
"Earlier"
@@ -429,39 +419,39 @@
"Edit existing group"
Editar el grupo existente
"Edit MythWeb and some MythTV settings."
- Editar la configuración de MythWeb y parte de MythTV
+ Editar la configuración de MythWeb y parte de MythTV
"Edit settings for: $1"
- Editar la configuración de: $1
+ Editar la configuración de: $1
"Editing "
Editando
"Embed HTTP basic auth user name/password into stream urls"
- Insertar nombre/contraseña de la autenticación básica de usuarios HTTP en los URL de flujos
+ Insertar nombre/contraseña de la autenticación básica de usuarios HTTP en los URL de flujos
"Enable Flash Video player for recordings."
- Activar el reproductor de vídeo Flash en las grabaciones
+ Activar el reproductor de vÃdeo Flash en las grabaciones
"Enable Video Playback"
- Activar la Reproducción de Vídeos
+ Activar la Reproducción de VÃdeos
"End"
Finalizar
"End Late"
- Finalizar Más Tarde
+ Finalizar Más Tarde
"Enter"
Introducir
"Enter a new name for your playlist"
- Introduzca un nombre nuevo para su lista de reproducción
+ Introduzca un nombre nuevo para su lista de reproducción
"Enter your search terms"
- Introducir sus términos de búsqueda
+ Introducir sus términos de búsqueda
"enter your search terms"
- introduzca sus términos de búsqueda
+ introduzca sus términos de búsqueda
"Episode"
Episodio
"Episode Number"
- Número de Episodio
+ Número de Episodio
"Error"
Error
"Error contacting server to retrieve metadata."
Error al contactar con el servidor para recuperar los metadatos.
"error: playgroup $1 exists"
- error: el grupo de reproducción $1 existe
+ error: el grupo de reproducción $1 existe
"Errored"
Con Errores
"Erroring"
@@ -473,19 +463,19 @@
"Exec. Producer"
Productor Ejec.
"Extended Check"
- Comprobación Extendida
+ Comprobación Extendida
"ffmpeg with MP3 support not detected"
- No fue detectado ffmpeg con admisión de MP3
+ No se detectó ffmpeg que admita MP3
"File Size"
- Tamaño de Archivo
+ Tamaño de Archivo
"film"
- película
+ pelÃcula
"Filters"
Filtros
"Find Date & Time Options"
Buscar Opciones de Fecha y Hora
"Find Day"
- Buscar Día
+ Buscar DÃa
"Find other showings of this program"
Buscar otras emisiones de este programa
"Find showings of this program"
@@ -495,23 +485,22 @@
"Find Time must be of the format: HH:MM:SS"
Buscar Hora debe tener el formato: HH:MM:SS
"finetune"
- sintonía fina
"Finished"
Finalizada
"First recording"
- Primera grabación
+ Primera grabación
"First showing"
- Primera emisión
+ Primera emisión
"First showing of each episode"
- Primera emisión de cada episodio
+ Primera emisión de cada episodio
"Flag Commercials"
Marcar Anuncios
"FLV Width"
Ancho de FLV
"For daily recordings, 5 weekdays if a weekday, or 7 days per week if a weekend day."
- Para grabaciones diarias, 5 días si no es en fin de semana, o 7 días si es en fin de semana.
+ Para grabaciones diarias, 5 dÃas si no es en fin de semana, o 7 dÃas si es en fin de semana.
"For more information on the Power Search please go to:"
- Para más información sobre la Búsqueda Avanzada, por favor, vaya a:
+ Para más información sobre la Búsqueda Avanzada, por favor, vaya a:
"Force HTTP for streams"
Forzar HTTP para los flujos
"Force HTTP/HTTPS port for streams"
@@ -525,7 +514,6 @@
"Found %s results for '%s'"
Encontrados %s resultados para '%s'
"freqid"
- id de frecuencia
"Friday"
Viernes
"Frontends"
@@ -535,11 +523,10 @@
"generic_time"
%I:%M %p
"Genre"
- Género
+ Género
"genre_colors"
- genre_colors
"Genres"
- Géneros
+ Géneros
"Go"
Ir
"Google"
@@ -549,13 +536,13 @@
"Guest Starring"
Estrellas Invitadas
"Guide rating"
- Puntuación de Guía
+ Puntuación de GuÃa
"Guide Settings"
- Configuración de la Guía
+ Configuración de la GuÃÂa
"Handy Predefined Searches"
- Búsquedas Predefinidas Útiles
+ Búsquedas Predefinidas Ãtiles
"handy: overview"
- útiles: resumen
+ útiles: resumen
"has Bookmark"
tiene un Marcador
"Has Cutlist"
@@ -569,6 +556,7 @@
"Hide"
Ocultar
"High definition"
+ Alta definición
"Home"
Inicio
"Hosted by"
@@ -578,45 +566,42 @@
"Hour Format"
Formato de Hora
"hue"
- matiz
"Identifiable episode"
Episodio identificable
"Ignore generic shows"
- Ignorar programas genéricos
+ Ignorar programas genéricos
"Ignore scheduled shows"
Ignorar programados
"IMDB"
- IMDB
"IMDBTYPE"
- IMDBTYPE
"Inactive"
Inactivo
"info: activate recording"
- info: activar grabación
+ info: activar grabación
"info: default recording"
- info: grabación predeterminada
+ info: grabación predeterminada
"info: dont record"
info: no grabar
"info: flvplayer"
<p>
- La reproducción Flash es sólo una prueba de concepto y debe
- considerarse <b>EXTREMADAMENTE</b> experimental, por lo que está desactivada
+ La reproducción Flash es sólo una prueba de concepto y debe
+ considerarse <b>EXTREMADAMENTE</b> experimental, por lo que está desactivada
por defecto.
</p>
<p>
- Necesita que ffmpeg esté instalado y compilado para reproducir MP3,
+ Necesita que ffmpeg esté instalado y compilado para reproducir MP3,
y que los archivos de las grabaciones sean accesibles para el usuario que ejecuta su servidor web.
- Probablemente no funcionará con archivos Nupplevideo y, finalmente, podría no funcionar en absoluto
+ Probablemente no funcionará con archivos Nupplevideo o, incluso, podrÃa no funcionar en absoluto
(o algo peor).
</p>
<p>
- Active esta característica bajo su responsabilidad y no espere demasiada
- ayuda oficial hasta que abandone la fase experimental.
+ Active esta caracterÃstica bajo su responsabilidad y no espere demasiada
+ ayuda oficial hasta que el reproductor abandone la fase experimental.
</p>
"info: hidden advanced schedule"
- info: ocultar programación avanzada
+ info: ocultar programación avanzada
"info: record this"
- info: grabar éste
+ info: grabar éste
"info:forget old"
info:olvidar antiguas
"info:jumppoints"
@@ -648,35 +633,33 @@
"Keyword"
Palabra Clave
"Keyword Search"
- Búsqueda de Palabras Clave
+ Búsqueda de Palabras Clave
"Keyword Search:"
- Búsqueda de Palabras Clave:
+ Búsqueda de Palabras Clave:
"Keywords"
Palabras Clave
"Language"
Idioma
"Last Recorded"
- Último Grabado
+ Ãltimo Grabado
"Last recording"
- Última Grabación
+ Ãltima Grabación
"Last showing of each episode"
- Última emisión de cada episodio
+ Ãltima emisión de cada episodio
"Later"
- Más Tarde
+ Más Tarde
"left"
- quedan
"Left"
Quedan
"leftl"
- leftl
"length"
- duración
+ duración
"Length"
- Duración
+ Duración
"Length (min)"
- Duración (min)
+ Duración (min)
"Length in minutes"
- Duración en minutos
+ Duración en minutos
"Listing "Jump to""
Lista "Saltar a"
"Listing Time Key"
@@ -686,21 +669,19 @@
"Load"
Cargar
"Load a Saved Playlist"
- Cargar una Lista de Reproducción Guardada
+ Cargar una Lista de Reproducción Guardada
"Load Playlist"
- Cargar Lista de Reproducción
+ Cargar Lista de Reproducción
"Load Saved Playlists"
- Cargar Listas de Reproducción Guardadas
+ Cargar Listas de Reproducción Guardadas
"Load this Saved Playlist"
- Cargar esta Lista de Reproducción Guardada
+ Cargar esta Lista de Reproducción Guardada
"LOADING"
CARGANDO
"Local Server Statistics"
- Estadísticas del Servidor Local
+ EstadÃsticas del Servidor Local
"LOCKDOWN_NOTICE"
- LOCKDOWN_NOTICE
"LOCKDOWN_NOTICE_2"
- LOCKDOWN_NOTICE_2
"Logs"
Registros
"Look up Metadata"
@@ -714,21 +695,21 @@
"matches"
coincidencias
"Max star rating for movies"
- Máx. puntuación para las películas
+ Máx. puntuación para las pelÃculas
"Metadata Home Page"
- Página de Inicio de los Metadatos
+ Página de Inicio de los Metadatos
"Metadata Lookup"
- Búsqueda de Metadatos
+ Búsqueda de Metadatos
"Metadata Lookup Error"
- Error en la Búsqueda de Metadatos
+ Error en la Búsqueda de Metadatos
"minutes"
minutos
"Missing Cover"
- Carátula Faltante
+ Carátula Faltante
"Modify priority by star rating (0.0 to 1.0 for movies only)"
- Modificar la prioridad mediante puntuación de estrellas (de 0.0 a 1.0 sólo para películas)
+ Modificar la prioridad mediante puntuación de estrellas (de 0.0 a 1.0 sólo para pelÃculas)
"Modify priority for a station on an input"
- Modificar la prioridad de una estación en una entrada
+ Modificar la prioridad de una estación en una entrada
"Modify priority for all inputs on a card"
Modificar la prioridad de todas las entradas de una tarjeta
"Modify priority for an input (Input priority)"
@@ -742,27 +723,27 @@
"Mono"
Mono
"More"
- Más
+ Más
"more"
- más
+ más
"Move Item Down in Playlist"
- Mover Elemento Hacia Abajo en la Lista de Reproducción
+ Mover Elemento Hacia Abajo en la Lista de Reproducción
"Move Item Up in Playlist"
- Mover Elemento Hacia Arriba en la Lista de Reproducción
+ Mover Elemento Hacia Arriba en la Lista de Reproducción
"movie"
- película
+ pelÃcula
"Movies"
- Películas
+ PelÃÂculas
"Movies, 3½ Stars or more"
- Películas, 3½ Estrellas o más
+ PelÃculas, 3½ Estrellas o más
"Movies, Stinkers (2 Stars or less)"
- Películas, Bodrios (2 Estrellas o menos)
+ PelÃculas, Bodrios (2 Estrellas o menos)
"Music"
- Música
+ Música
"Music Specials"
- Especiales de Música
+ Especiales de Música
"My Session"
- Mi Sesión
+ Mi Sesión
"MythMusic on the web."
MythMusic en la web.
"MythMusic_Prefixes_To_Ignore"
@@ -778,11 +759,8 @@
"MythVideo on the web."
MythVideo en la web.
"mythvideo.db_folder_view"
- mythvideo.db_folder_view
"mythvideo.ImageCacheSize"
- mythvideo.ImageCacheSize
"mythvideo.sort_ignores_case"
- mythvideo.sort_ignores_case
"MythWeb"
MythWeb
"MythWeb Defaults"
@@ -792,7 +770,7 @@
"MythWeb Locked"
MythWeb Bloqueado
"MythWeb Session"
- Sesión de MythWeb
+ Sesión de MythWeb
"MythWeb Skin"
Piel de MythWeb
"MythWeb Template"
@@ -804,7 +782,7 @@
"name"
nombre
"Narrow Your Search"
- Refinar Su Búsqueda
+ Refinar Su Búsqueda
"Never Record"
Nunca Grabar
"New"
@@ -812,21 +790,21 @@
"New episode"
Nuevo episodio
"New episodes only"
- Sólo nuevos episodios
+ Sólo nuevos episodios
"New Group"
Nuevo Grupo
"New Search"
- Nueva Búsqueda
+ Nueva Búsqueda
"New Titles, Premieres"
- Títulos Nuevos, Estrenos
+ TÃÂtulos Nuevos, Estrenos
"No"
No
"NO DATA"
SIN DATOS
"No Frontends allow remote control."
- Ningún Cliente permite control remoto.
+ Ningún Cliente permite control remoto.
"No Genre"
- Sin Género
+ Sin Género
"No matches found"
No se encontraron coincidencias
"No matching programs found."
@@ -834,11 +812,11 @@
"No metadata results found."
No se encontraron resultados de metadatos
"No Public Playlists"
- No Hay Listas de Reproducción Públicas
+ No Hay Listas de Reproducción Públicas
"No recording schedules have been defined."
No se han definido grabaciones programadas
"No. of recordings to keep"
- Nº de grabaciones a guardar
+ Nº de grabaciones a guardar
"Non-Music Specials"
Especiales No Musicales
"Non-Series HDTV"
@@ -850,55 +828,55 @@
"Notes"
Notas
"Number of episodes"
- Número de episodios
+ Número de episodios
"Number of shows"
- Número de programas
+ Número de programas
"Number of Songs"
- Número de Canciones
+ Número de Canciones
"Number of timeslots"
- Número de franjas horarias
+ Número de franjas horarias
"Off"
Desactivado
"OK"
Aceptar
"Only a certain channel number"
- Sólo un número concreto de canal
+ Sólo un número concreto de canal
"Only channels marked as commercial free"
- Sólo canales marcados como libres de anuncios
+ Sólo canales marcados como libres de anuncios
"Only channels that carry a specific station"
- Sólo canales que porten una estación específica
+ Sólo canales que porten una estación especÃfica
"Only display favorite channels"
- Sólo mostrar canales favoritos
+ Sólo mostrar canales favoritos
"Only match commercial-free channels"
- Sólo canales libres de anuncios
+ Sólo canales libres de anuncios
"Only match HD programs"
- Sólo programas en HD
+ Sólo programas en HD
"Only match non-recorded shows"
- Sólo programas no grabados
+ Sólo programas no grabados
"Only New Episodes"
- Sólo Nuevos Episodios
+ Sólo Nuevos Episodios
"Only one specific channel ID (Channel priority)"
- Sólo un ID de canal específico (Prioridad de canal)
+ Sólo un ID de canal especÃfico (Prioridad de canal)
"Only show distinct shows"
- Sólo mostrar programas distintos
+ Sólo mostrar programas distintos
"Only shows marked as HDTV"
- Sólo programas marcados como HDTV
+ Sólo programas marcados como HDTV
"Optimize Tables"
Optimizar Tablas
"or"
o
"Original Airdate"
- Primera Emisión
+ Primera Emisión
"Originally aired between"
Emitidos por primera vez entre
"Override"
Ignorar
"Page Down"
- Página Siguiente
+ Página Siguiente
"Page recorded programs"
Pasar a programas grabados
"Page Up"
- Página Anterior
+ Página Anterior
"Parental Level"
Nivel Parental
"Part $1 of $2"
@@ -908,7 +886,7 @@
"Past Week"
La Semana Pasada
"Past Year"
- El Año Pasado
+ El Año Pasado
"Paused"
En Pausa
"Pending"
@@ -916,55 +894,55 @@
"People"
Personas
"People Search"
- Búsqueda de Personas
+ Búsqueda de Personas
"People Search:"
- Búsqueda de Personas:
+ Búsqueda de Personas:
"Percent of time spent recording"
Porcentaje de tiempo dedicado a grabar
"Play"
Reproducir
"Play Recording on Frontend"
- Reproducir Grabación en el Cliente
+ Reproducir Grabación en el Cliente
"Play this Album Now"
- Reproducir este Álbum Ahora
+ Reproducir este Ãlbum Ahora
"Play This Playlist Now"
Reproducir Esta Lista Ahora
"Play this Playlist Now"
Reproducir esta Lista Ahora
"Play this Song Now"
- Reproducir esta Canción Ahora
+ Reproducir esta Canción Ahora
"Play Time"
- Tiempo de Reproducción
+ Tiempo de Reproducción
"Playback Group"
- Grupo de Reproducción
+ Grupo de Reproducción
"Playback Groups"
- Grupos de Reproducción
+ Grupos de Reproducción
"Played %s times"
Reproducida %s veces
"Played once"
Reproducida una sola vez
"Playlist"
- Lista de Reproducción
+ Lista de Reproducción
"Playlist Info"
- Información de la Lista de Reproducción
+ Información de la Lista de Reproducción
"Playlist is empty"
- La Lista de Reproducción está vacía
+ La Lista de Reproducción está vacÃa
"Playlist Items"
- Elementos de la Lista de Reproducción
+ Elementos de la Lista de Reproducción
"Playlist Name"
- Nombre de la Lista de Reproducción
+ Nombre de la Lista de Reproducción
"Playlist renamed successfully"
- Nombre de la Lista de Reproducción cambiado con éxito
+ Nombre de la Lista de Reproducción cambiado con éxito
"Playlist saved successfully"
- Lista de Reproducción guardada con éxito
+ Lista de Reproducción guardada con éxito
"Playlist: %s"
- Lista de Reproducción: %s
+ Lista de Reproducción: %s
"Playlists"
- Listas de Reproducción
+ Listas de Reproducción
"Please enter an IMDB number or a title to do another search"
- Por favor, introduzca un número o título de IMDB para efectuar otra búsqueda
+ Por favor, introduzca un número o tÃtulo de IMDB para efectuar otra búsqueda
"Please wait for the pending AJAX request"
- Por favor, espere a la petición AJAX pendiente
+ Por favor, espere a la petición AJAX pendiente
"Plot"
Trama
"Plot:"
@@ -980,17 +958,17 @@
"Power"
Avanzada
"Power Search"
- Búsqueda Avanzada
+ Búsqueda Avanzada
"Power Search:"
- Búsqueda Avanzada:
+ Búsqueda Avanzada:
"Prefer a host for a storage group"
Preferir un nodo para grupo de almacenamiento
"Prefer a host for live sports with overtime"
- Preferir un nodo para deportes en directo con prórroga
+ Preferir un nodo para deportes en directo con prórroga
"Prefer Channum"
- Nº de Canal Preferido
+ Nº de Canal Preferido
"Prefer movies when shown at night"
- Preferir películas de emisión nocturna
+ Preferir pelÃculas de emisión nocturna
"prefer_channum"
prefer_channum
"Preferred Input"
@@ -998,23 +976,23 @@
"Presented by"
Presentado por
"Previous Recording"
- Grabación Anterior
+ Grabación Anterior
"Previous recordings"
Grabaciones anteriores
"Prime time"
- Horario de máxima audiencia
+ Horario de máxima audiencia
"Priority for a category"
- Prioridad de una categoría
+ Prioridad de una categorÃa
"Priority for a category type"
- Prioridad de un tipo de categoría
+ Prioridad de un tipo de categorÃa
"Priority for all matching titles"
- Prioridad para todos los títulos coincidentes
+ Prioridad para todos los tÃtulos coincidentes
"Priority for any show with End Late time"
- Prioridad para cualquier programa que finalice Más Tarde
+ Prioridad para cualquier programa que finalice Más Tarde
"Priority for HD shows under two hours"
Prioridad para programas en HD de menos de dos horas
"Priority for movies by the year of release"
- Prioridad para películas por año de estreno
+ Prioridad para pelÃculas por año de estreno
"Priority when shown once"
Prioridad al emitirse una sola vez
"Produced by"
@@ -1022,9 +1000,8 @@
"Profile"
Perfil
"profile"
- perfil
"Program Categories"
- Categorías de Programas
+ CategorÃas de Programas
"Program Detail"
Detalles del Programa
"Program ID"
@@ -1050,135 +1027,92 @@
"Random Type"
Tipo Aleatorio
"Rating"
- Puntuación
+ Puntuación
"Rating:"
- Puntuación:
+ Puntuación:
"Recently Added Albums"
- Álbumes Recientemente Añadidos
+ Ãlbumes Recientemente Añadidos
"Recently completed jobs"
Tareas recientemente completadas
"Recently Played Songs"
Canciones Recientemente Reproducidas
"recgroup"
- grupograb
"Record Date"
- Fecha de Grabación
+ Fecha de Grabación
"Record Length"
- Duración de la Grabación
+ Duración de la Grabación
"Record new and expire old"
Grabar nuevos y expirar antiguos
"Record This"
- Grabar Éste
+ Grabar Ãste
"Recorded"
Grabado
"Recorded Programs"
Programas Grabados
"Recording Details"
- Detalles de Grabación
+ Detalles de Grabación
"Recording Group"
- Grupo de Grabación
+ Grupo de Grabación
"Recording Options"
- Opciones de Grabación
+ Opciones de Grabación
"Recording Options Help"
- Ayuda de las Opciones de Grabación
+ Ayuda de las Opciones de Grabación
"Recording Priority"
- Prioridad de Grabación
+ Prioridad de Grabación
"Recording Profile"
- Perfil de Grabación
+ Perfil de Grabación
"Recording Schedules"
Grabaciones Programadas
"Recording Statistics"
- Estadísticas de la Grabaciones
+ EstadÃsticas de la Grabaciones
"recpriority"
- prioridadgrab
"recstatus: cancelled"
- estadograb: cancelada
"recstatus: conflict"
- estadograb: conflicto
"recstatus: currentrecording"
- estadograb: grabando
"recstatus: deleted"
- estadograb: eliminada
"recstatus: earliershowing"
- estadograb: pase anterior
"recstatus: force_record"
- estadograb: forzar_grabación
"recstatus: inactive"
- estadograb: inactivo
"recstatus: latershowing"
- estadograb: pase posterior
"recstatus: lowdiskspace"
- estadograb: pocoespaciodisco
"recstatus: manualoverride"
- estadograb: excepciónmanual
"recstatus: neverrecord"
- estadograb: nuncagrabar
"recstatus: notlisted"
- estadograb: nolistado
"recstatus: previousrecording"
- estadograb: grabaciónanterior
"recstatus: recorded"
- estadograb: grabado
"recstatus: recording"
- estadograb: grabando
"recstatus: repeat"
- estadograb: repetir
"recstatus: stopped"
- estadograb: detenida
"recstatus: toomanyrecordings"
- estadograb: demasiadasgrabaciones
"recstatus: tunerbusy"
- estadograb: sintonizadorocupado
"recstatus: unknown"
- estadograb: desconocido
"recstatus: willrecord"
- estadograb: segrabará
"rectype-long: always"
- tipograb-largo: siempre
"rectype-long: channel"
- tipograb-largo: canal
"rectype-long: daily"
- tipograb-largo: diario
"rectype-long: dontrec"
- tipograb-largo: nograbar
"rectype-long: finddaily"
- tipograb-largo: buscardiario
"rectype-long: findone"
- tipograb-largo: buscaruno
"rectype-long: findweekly"
- tipograb-largo: buscarsemanal
"rectype-long: once"
- tipograb-largo: unavez
"rectype-long: override"
- tipograb-largo: ignorar
"rectype-long: weekly"
- tipograb-largo: semanal
"rectype: always"
- tipograb: siempre
"rectype: channel"
- tipograb: canal
"rectype: daily"
- tipograb: diariamente
"rectype: dontrec"
- tipograb: nograbar
"rectype: finddaily"
- tipograb: buscardiario
"rectype: findone"
- tipograb: buscaruno
"rectype: findweekly"
- tipograb: buscarsemanal
"rectype: once"
- tipograb: unavez
"rectype: override"
- tipograb: ignorar
"rectype: weekly"
- tipograb: semanal
"regex: articles"
El|L(?:as?|os)
"Remote"
Remoto
"Remove Item from Playlist"
- Eliminar Elemento de la Lista de Reproducción
+ Eliminar Elemento de la Lista de Reproducción
"Repair Tables"
Reparar Tablas
"Repeat"
@@ -1190,35 +1124,35 @@
"Retry"
Reintentar
"Return to Statistics Page"
- Regresar a la Página de Estadísticas
+ Regresar a la Página de EstadÃsticas
"right"
derecha
"Right"
Derecha
"Root Directory"
- Directorio Raíz
+ Directorio RaÃz
"Rows to show between timeslot info"
- Filas a mostrar entre información de franjas
+ Filas a mostrar entre información de franjas
"Running"
- Ejecutándose
+ Ejecutándose
"Saturday"
- Sábado
+ Sábado
"Save"
Guardar
"Save or Rename the Current Playlist"
- Guardar o Cambiar Nombre de la Lista de Reproducción Actual
+ Guardar o Cambiar Nombre de la Lista de Reproducción Actual
"Save Schedule"
- Guardar Programación
+ Guardar Programación
"Save/Rename"
Guardar/Cambiar el Nombre
"Save/Rename Playlist"
- Guardar/Cambiar el Nombre de la Lista de Reproducción
+ Guardar/Cambiar el Nombre de la Lista de Reproducción
"Saved Playlist Successfully Deleted"
- Lista de Reproducción Guardada: Eliminada con Éxito
+ Lista de Reproducción Guardada: Eliminada con Ãxito
"Saved Playlists"
- Listas de Reproducción Guardadas
+ Listas de Reproducción Guardadas
"Scan Collection"
- Explorar Colección
+ Explorar Colección
"Schedule"
Programar
"Schedule Manually"
@@ -1226,49 +1160,49 @@
"Schedule normally."
Programar Normalmente
"Schedule Options"
- Opciones de Programación
+ Opciones de Programación
"Schedule Override"
- Excepciones de Programación
+ Excepciones de Programación
"Schedule via $1."
- Programar vía $1
+ Programar vÃa $1
"Scheduled"
Programado
"Scheduled Popup"
Emergente Programado
"Science Fiction Movies"
- Películas de Ciencia Ficción
+ PelÃculas de Ciencia Ficción
"Search"
Buscar
"Search $1"
Buscar $1
"Search all program keywords for a match against search phrase below"
- Buscar todas las palabras clave de programas que coincidan con la siguiente frase de búsqueda
+ Buscar todas las palabras clave de programas que coincidan con la siguiente frase de búsqueda
"Search all program titles containing the Title text below"
- Buscar todos los títulos de programas que contengan el siguiente texto
+ Buscar todos los tÃtulos de programas que contengan el siguiente texto
"Search for all actors contained in a recording for a match against search phrase below"
- Buscar todos los actores contenidos en una grabación que coincidan con la siguiente frase de búsqueda
+ Buscar todos los actores contenidos en una grabación que coincidan con la siguiente frase de búsqueda
"Search for: $1"
Buscar: $1
"Search Music"
- Buscar Música
+ Buscar Música
"Search Phrase"
Buscar Frase
"Search Phrase:"
Buscar Frase:
"Search Results"
- Resultados de la Búsqueda
+ Resultados de la Búsqueda
"Search the Music Database"
- Buscar en la Base de Datos de Búsqueda
+ Buscar en la Base de Datos de Búsqueda
"Search Type"
Buscar Tipo
"Search Type Help"
- Ayuda de la Búsqueda por Tipo
+ Ayuda de la Búsqueda por Tipo
"Search will perform complex SQL queries against the database as per the search phrase below"
- Buscar ejecutará consultas SQL complejas en la base de datos como la siguiente frase de búsqueda
+ Buscar ejecutará consultas SQL complejas en la base de datos como la siguiente frase de búsqueda
"Searches"
- Búsquedas
+ Búsquedas
"Searches will be performed against the title of all TV shows"
- Se ejecutarán búsquedas en el título de todos los programas de TV
+ Se ejecutarán búsquedas en el tÃtulo de todos los programas de TV
"Seas/Ep"
Temp/Ep
"Season"
@@ -1276,19 +1210,19 @@
"Select the correct show"
Seleccione el programa correcto
"Server returned invalid data when attempting to retrieve metadata."
- El servidor devolvió datos inválidos al tratar de recuperar los metadatos.
+ El servidor devolvió datos inválidos al tratar de recuperar los metadatos.
"Server Statistics"
- Estadísticas del Servidor
+ EstadÃsticas del Servidor
"Set Host"
Configurar Nodo
"Settings"
- Configuración
+ Configuración
"settings"
- configuración
+ configuración
"Settings Table"
- Tabla de Configuración
+ Tabla de Configuración
"settings/stream: protocol"
- configuración/flujo: protocolo
+ configuración/flujo: protocolo
"settings: notice"
Tenga cuidado al alterar esta tabla sin saber lo que hace, puede estropear el funcionamiento de MythTV
"Shift"
@@ -1298,15 +1232,12 @@
"Show group"
Mostrar grupo
"Show pixmaps"
- Mostrar gráficos
+ Mostrar gráficos
"Show recordings"
Mostrar grabaciones
"show_channel_icons"
- mostrar_iconos_canales
"show_popup_info"
- mostrar_info_emergente
"show_video_covers"
- mostrar_portadas_vídeos
"Showing all programs from the $1 group."
Mostrando todos los programas del grupo $1
"Showing all programs."
@@ -1318,25 +1249,23 @@
"Skip Ahead"
Saltar Adelante
"Skip Back"
- Saltar Atrás
+ Saltar Atrás
"Songs"
Canciones
"Songs for Genre"
- Canciones por Género
+ Canciones por Género
"Songs Played"
Canciones Reproducidas
"Songs Rated"
Canciones Puntuadas
"Sorry, but you cannot add this playlist as it would create a circular dependency."
- Lo siento, pero no puede añadir esta lista de reproducción puesto que crearía una dependencia circular.
+ Lo siento, pero no puede añadir esta lista de reproducción puesto que crearÃa una dependencia circular.
"sortby_channum"
- ordenarpor_númcanal
"sourceid"
- idfuente
"Space"
Espacio
"Special Searches"
- Búsquedas Especiales
+ Búsquedas Especiales
"Star character"
Personaje estrella
"Start Date"
@@ -1348,7 +1277,7 @@
"Starting"
Iniciando
"Statistics"
- Estadísticas
+ EstadÃsticas
"Stats"
Estad
"Status"
@@ -1356,15 +1285,15 @@
"Status Bar"
Barra de Estado
"Stereo"
- Estéreo
+ Estéreo
"Still Recording: Edit"
- Grabando Aún: Editar
+ Grabando Aún: Editar
"Stopping"
- Deteniéndose
+ Deteniéndose
"Storage Group"
Grupo de Almacenamiento
"Store the current session as the default"
- Guardar la sesión actual como predeterminada
+ Guardar la sesión actual como predeterminada
"Streaming"
Emitiendo Flujo
"Sub and Desc (Empty matches)"
@@ -1372,17 +1301,17 @@
"Submit"
Enviar
"Submit Search"
- Enviar Búsqueda
+ Enviar Búsqueda
"Subtitle"
- Subtítulo
+ SubtÃtulo
"Subtitle and Description"
- Subtítulo y Descripción
+ SubtÃÂtulo y Descripción
"Subtitle then Description"
- Subtítulo, luego Descripción
+ SubtÃtulo, luego Descripción
"Subtitled"
Subtitulado
"Subtitles Available"
- Subtítulos Disponibles
+ SubtÃtulos Disponibles
"Sunday"
Domingo
"Surround Sound"
@@ -1390,25 +1319,25 @@
"Tab"
Tab
"Television"
- Televisión
+ Televisión
"The requested recording schedule has been deleted."
- La programación solicitada ha sido eliminada.
+ La programación solicitada ha sido eliminada.
"themoviedb"
themoviedb
"There are no items in this Playlist!"
- ¡No hay elementos en esta Lista de Reproducción!
+ ¡No hay elementos en esta Lista de Reproducción!
"There was a problem saving your playlist"
- Hubo un problema al guardar su lista de reproducción
+ Hubo un problema al guardar su lista de reproducción
"TheTVDB"
TheTVDB
"This episode"
Este episodio
"This playlist is already loaded!"
- ¡Esta lista de reproducción ya está cargada!
+ ¡Esta lista de reproducción ya está cargada!
"This series"
Esta serie
"This will overwrite your current, unsaved playlist. Are you sure you want to continue?"
- Se sobreescribirá su actual lista de reproducción no guardada. ¿Seguro que desea continuar?
+ Se sobreescribirá su actual lista de reproducción no guardada. ¿Seguro que desea continuar?
"Thursday"
Jueves
"Time"
@@ -1416,23 +1345,23 @@
"Time Span"
Franja Horaria
"Time Stretch"
- Ralentización Temporal
+ Ralentización Temporal
"Timeslot size"
- Tamaño de la franja horaria
+ Tamaño de la franja horaria
"title"
- título
+ tÃtulo
"Title"
- Título
+ TÃtulo
"Title Match"
- Coindidencia en Título
+ Coindidencia en TÃtulo
"Title search"
- Búsqueda de títulos
+ Búsqueda de tÃtulos
"Title Search"
- Búsqueda de Títulos
+ Búsqueda de TÃÂtulos
"Title Search:"
- Búsqueda de Títulos:
+ Búsqueda de TÃtulos:
"Title:"
- Título:
+ TÃtulo:
"Toggle Interactive Mode"
Conmutar Modo Interactivo
"Too Many"
@@ -1440,21 +1369,21 @@
"Top $1"
Los primeros $1
"Top Played Songs"
- Canciones Más Reproducidas
+ Canciones Más Reproducidas
"Top Rated Songs"
- Canciones Más Puntuadas
+ Canciones Más Puntuadas
"Total Length"
- Duración Total
+ Duración Total
"Total Recorded"
Total Grabados
"Total Running Time"
- Duración Total
+ Duración Total
"Total Time"
Tiempo Total
"Total Time: %s"
Tiempo Total: %s
"Track #%s from the album '%s'"
- Pista #%s del álbum '%s'
+ Pista #%s del álbum '%s'
"Transcode"
Transcodificador
"transcoder"
@@ -1476,7 +1405,7 @@
"Type"
Tipo
"Uncategorized"
- Sin Categoría
+ Sin CategorÃa
"Undelete"
Recuperar
"Undelete: $1"
@@ -1484,97 +1413,80 @@
"Unknown"
Desconocido
"Unknown action"
- Acción desconocida
+ Acción desconocida
"Unknown frontend"
Cliente desconocido
"Unknown Program."
Programa Desconocido.
"Unknown Recording Schedule."
- Programación Desconocida
+ Programación Desconocida
"Up"
Arriba
"Upcoming Recordings"
- Próximas Grabaciones
+ Próximas Grabaciones
"Update"
Actualizar
"Update Recording Settings"
- Actualizar Configuración de Grabación
+ Actualizar Configuración de Grabación
"Use callsign"
Usar ID de canal
"Use date/time"
Usar fecha/hora
"useonairguide"
- usarguíaemitida
"User Rating"
- Puntuación del Usuario
+ Puntuación del Usuario
"Value"
Valor
"Video"
- Vídeo
+ VÃdeo
"Video Bitrate"
- Tasa de Bits del Vídeo
+ Tasa de Bits del VÃdeo
"Video Playback"
- Reproducción de Vídeo
+ Reproducción de VÃdeo
"Video: Error: IMDB"
- Vídeo: Error: IMDB
+ VÃdeo: Error: IMDB
"Video: Error: IMDB: Not Found"
- Vídeo: Error: IMDB: No Encontrado
+ VÃdeo: Error: IMDB: No Encontrado
"Video: Error: Missing ID"
- Vídeo: Error: IMDB: ID Faltante
+ VÃdeo: Error: IMDB: ID Faltante
"Video: IMDB: No Matches"
- Vídeo: IMDB: No Hay Coincidencias
+ VÃdeo: IMDB: No Hay Coincidencias
"Video: IMDB: Window Title"
- Vídeo: IMDB: Título de Ventana
+ VÃdeo: IMDB: TÃtulo de Ventana
"Video: Warning: Artwork"
- Vídeo: Aviso: Grafismos
+ VÃdeo: Aviso: Grafismos
"Video: Warning: Artwork: Download"
- Vídeo: Aviso: Grafismo: Descarga
+ VÃdeo: Aviso: Grafismo: Descarga
"Video: Warning: fopen"
- Vídeo: Aviso: fopen
+ VÃdeo: Aviso: fopen
"VideoAggressivePC"
- VídeoPCAgresivo
"VideoArtworkDir"
- DirGrafismosVídeo
"VideoBrowserNoDB"
- SinBDExploradorVídeos
"VideoDefaultParentalLevel"
- NivelParentalPredeterminadoVídeo
"VideoDefaultPlayer"
- ReproductorPredeterminadoVídeo
"videofilters"
- filtrosvídeo
"VideoGalleryAspectRatio"
- RelaciónAspectoGaleríaVídeos
"VideoGalleryColsPerPage"
- ColsPorPáginaGaleríaVídeos
"VideoGalleryNoDB"
- SinBDGaleríaVídeos
"VideoGalleryRowsPerPage"
- FilasPorPáginaGaleríaVídeos
"VideoGallerySubtitle"
- SubtítuloGaleríaVídeos
"VideoListUnknownFiletypes"
- TiposArchivoDesconocidosListaVídeos
"VideoNewBrowsable"
- NuevoNavegableVídeos
"Videos"
- Vídeos
+ VÃdeos
"VideoStartupDir"
- DirInicioVídeos
"VideoTreeLoadMetaData"
- CargaMetaDatosÁrbolVídeos
"VideoTreeNoDB"
- SinDBÁrbolVídeos
"View"
Ver
"View Albums by %s"
- Ver Álbumes por %s
+ Ver Ãlbumes por %s
"View Details of %s"
Ver Detalles de %s
"View Saved Playlist"
- Ver Lista de Repoducción Guardada
+ Ver Lista de Repoducción Guardada
"View Server Statistics"
- Ver Estadísticas del Servidor
+ Ver EstadÃsticas del Servidor
"visible"
visible
"Visit $1"
@@ -1584,35 +1496,31 @@
"Weather"
El Tiempo
"web_video_imdb_path"
- ruta_imdb_vídeo_web
"web_video_imdb_type"
- tipo_imdb_vídeo_web
"web_video_thumbnail_height"
- alto_miniatura_vídeo_web
"web_video_thumbnail_width"
- ancho_miniatura_vídeo_web
"Wednesday"
- Miércoles
+ Miércoles
"welcome: backend_log"
bienvenidos: registro_servidor
"welcome: music"
- bienvenidos: música
+ bienvenidos: música
"welcome: remote"
bienvenidos: remoto
"welcome: settings"
- bienvenidos: configuración
+ bienvenidos: configuración
"welcome: stats"
- bienvenidos: estadísticas
+ bienvenidos: estadÃsticas
"welcome: status"
bienvenidos: estado
"welcome: tv"
bienvenidos: tv
"welcome: video"
- bienvenidos: vídeo
+ bienvenidos: vÃdeo
"What else is on at this time?"
- ¿Qué más hay a esta hora?
+ ¿Qué más hay a esta hora?
"Widescreen"
- Panorámico
+ Panorámico
"Width"
Ancho
"Will Record"
@@ -1620,16 +1528,15 @@
"Written by"
Escrito por
"xmltvid"
- xmltvid
"Year"
- Año
+ Año
"Year:"
- Año:
+ Año:
"Yes"
- Sí
+ SÃ
"Yesterday"
Ayer
"You are missing a php extension for mysql interaction. Please install php-mysqli or similar"
- Le falta una extensión php para interactuar con mysql. Por favor, instale php-mysqli o similar
+ Le falta una extensión php para interactuar con mysql. Por favor, instale php-mysqli o similar
"You must be running at least php 5.3 to use this program."
Debe ejecutar php 5.3 al menos para usar este programa.
diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php
index 1e696eb..3d9400f 100644
--- a/modules/tv/classes/Schedule.php
+++ b/modules/tv/classes/Schedule.php
@@ -151,7 +151,7 @@ class Schedule extends MythBase {
foreach (MythBackend::find()->queryProgramRows('QUERY_GETALLPENDING', 2) as $key => $program) {
if ($key === 'offset')
continue;
- if ($program[21] == 6)
+ if ($program[20] == 6)
continue;
// Normal entry: $scheduledRecordings[callsign][starttime][]
self::$scheduledRecordings[$program[8]][$program[12]][] =& new Program($program);
@@ -275,6 +275,11 @@ class Schedule extends MythBase {
}
// Update the type, in case it changed
$this->type = $new_type;
+ // Clear the the search column for non-manual overrides.
+ if (($this->type == rectype_override || $this->type == rectype_dontrec)
+ && $this->search != searchtype_manual) {
+ $this->search = 0;
+ }
// Update the record
$sh = $db->query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,
title,subtitle,description,profile,recpriority,category,
--- NEW FILE mythweb.conf ---
#
# Apache configuration directives for MythWeb. Please read INSTALL for setup
# requirements and troubleshooting, along with the comments in this file.
#
#
# CHANGE THIS PATH TO MATCH YOUR MYTHWEB INSTALLATION DIRECTORY! e.g.
#
# /var/www
# /home/www/htdocs
# /var/www/html/mythweb
# /srv/www/htdocs/mythweb
#
Alias /mythweb "/usr/share/mythweb"
<Directory "/usr/share/mythweb">
############################################################################
# I *strongly* urge you to turn on authentication for MythWeb. It is disabled
# by default because it requires you to set up your own password file. Please
# see the man page for htdigest and then configure the folowing four directives
# to suit your authentication needs.
#
# AuthType Digest
# AuthName "MythWeb"
# AuthUserFile /etc/httpd/conf.d/mythweb-htdigest
# Require valid-user
# BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
# Order allow,deny
# Satisfy any
#
# * If you're running Apache earlier than 2.2, you will need to use
# the AuthDigestFile command instead of AuthUserFile (3rd line above).
#
############################################################################
# Some special instructions for the MythWeb controller files
#
<Files mythweb.*>
#
# Use the following environment settings to tell MythWeb where you want it to
# look to connect to the database, the name of the database to connect to, and
# the authentication info to use to connect. The defaults will usually work
# fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on
# a different server from your main backend. Make sure you have mod_env enabled.
#
setenv db_server "localhost"
setenv db_name "mythconverg"
setenv db_login "mythtv"
setenv db_password "mythtv"
#
# By default, MythWeb uses the hostname program to look up the hostname of the
# machine it runs on. If this reports incorrect data, or you run MythWeb on a
# machine without the hostname program, set this to your current hostname.
#
# setenv hostname "my_mythbox"
#
# By default, php will always search the current directory for include files,
# but if you wish to install these directories outside of the current path
# (eg. for security reasons), set this variable to the directory that
# contains the directories like languages and templates. eg.
#
# setenv include_path "/usr/share/mythweb"
# If you want MythWeb to email php/database errors (and a backtrace) to you,
# uncomment and set the email address below.
#
# setenv error_email "mythweb_errors(a)example.com"
#
# If your local file system is something other than UTF-8, set this variable
# so that the music and video portions of MythWeb can provide proper links
# to your downloadable files.
#
# setenv fs_encoding "ISO-8859-1"
</Files>
############################################################################
# The following settings relate to PHP config.
#
<Files *.php>
# These settings are intended for apache 2.x. If your version of apache
# doesn't support php_value, or things like memory_limit aren't working
# as expected, then use these settings as examples for your own php.ini
# files.
php_value safe_mode 0
php_value memory_limit 32M
php_value register_globals 0
php_value magic_quotes_gpc 0
php_value file_uploads 0
php_value allow_url_fopen On
php_value zlib.output_handler Off
php_value output_handler NULL
# Note: php_flag does not work in older versions of php
php_flag output_handler "NULL"
</Files>
############################################################################
# The settings below relate specifically to mod_rewrite and the rewrite
# engine used to make the MythWeb user experience a little easier to deal
# with by simplifying the URLs needed to access the various sections. Do
# not touch these settings unless you really know what you're doing..
#
# Turn on the rewrite engine
RewriteEngine on
# If MythWeb is installed outside of the document root (eg. using Alias) then
# you will need to set this directive to the base URL that MythWeb is visible
# from externally. If you do not, the web server will return 'not found'.
RewriteBase /mythweb
# Skip out early if we've already been through rewrites,
# or if this is a /css/, /js/ or /cache/ directory request.
RewriteRule ^(css|data|images|js|themes|skins|[a-z_]+\.(php|pl))(/|$) - [L]
# Redirect /pl/ requests to the perl cgi handler.
RewriteRule ^(pl(/.*)?)$ mythweb.pl/$1 [QSA,L]
# Redirect most of the remaining URL requests to the main mythweb script.
# It will then handle any requests given to it.
RewriteRule ^(.+)$ mythweb.php/$1 [QSA,L]
# If you're experiencing trouble with the previous two lines in your copy of
# apache, you could instead use something like:
# RewriteRule ^(pl(/.*)?)$ mythweb.pl?PATH_INFO=/$1 [L,QSA]
# RewriteRule ^(.+)$ mythweb.php?PATH_INFO=/$1 [L,QSA]
# Catch anything else that comes through and send it to mythweb.php with no parameters.
RewriteRule ^(.*)$ mythweb.php [QSA,L]
############################################################################
# You really shouldn't need to edit anything below this line, so please
# don't unless you know what you're doing.
#
# Allow .htaccess to override whatever it wants from the server config.
AllowOverride All
# Allow browsers to follow symlinks that point outside of the web document
# tree. This is how we access music, videos, etc.
Options FollowSymLinks
# MythTV now uses the correct file suffix for mpeg files, so all .nuv files
# should actually be NuppleVideo. However, apache probably doesn't know what
# those are, so we should tell it.
AddType video/nuppelvideo .nuv
# Specify the MIME type for favicon.ico in case the server configuration
# doesn't or in case the server configuration uses the IANA-approved MIME type
# (image/vnd.microsoft.icon)--which most browsers won't recognize.
AddType image/x-icon .ico
# Enable mod_deflate. This works MUCH more reliably than PHP's built-in
# gzip/Zlib compressors. It is disabled here because many distros seem not
# to enable mod_deflate by default, but I strongly recommend that you
# enable this section.
#
BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4\.0[678] no-gzip
BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
#
AddOutputFilterByType DEFLATE text/html
AddOutputFilterByType DEFLATE text/css
AddOutputFilterByType DEFLATE application/x-javascript
# This is helpful for mod_deflate -- it prevents proxies from changing
# the user agent to/from this server, which can prevent compression from
# being enabled. It is disabled here because many distros seem not to
# enable mod_headers by default, but I recommend that you enable it.
#
Header append Vary User-Agent env=!dont-vary
# Set up the perl handler so we can stream properly.
#
# IMPORTANT!! Please see the note in INSTALL section 5.1 that explains why
# this may not always properly detect mod_perl.
#
<Files *.pl>
<IfModule mod_perl.c>
SetHandler perl-script
PerlResponseHandler ModPerl::Registry
PerlOptions +ParseHeaders
</IfModule>
<IfModule !mod_perl.c>
SetHandler cgi-script
</IfModule>
Options +ExecCGI
</Files>
</Directory>
<Directory "/usr/share/mythweb/data">
Options -All +FollowSymLinks +IncludesNoExec
</Directory>
# You will probably also want to uncomment the following rules, which
# disable authentication for MythWeb's download URLs so you can properly
# stream to media players that don't work with authenticated servers.
#
<LocationMatch .*/pl/stream/[0-9]+/[0-9]+>
Allow from all
</LocationMatch>
<LocationMatch .*/music/stream.php>
Allow from all
</LocationMatch>
--- NEW FILE mythweb.spec ---
# Mythweb from github.com
# git hash for archive
%global githash1 g89a347c
# git hash for root source directory
%global githash2 ae20c88
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
Version: 0.25.1
Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
# https://github.com/MythTV/mythweb/tarball/v0.25
Source0: MythTV-mythweb-v%{version}-0-%{githash1}.tar.gz
Source1: mythweb.conf
Source2: ChangeLog
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
Patch1: mythweb-fixes.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
#Requires: mythtv-backend >= %{version}-%{release}
#Requires: mysql-server >= 5, mysql >= 5
Requires: httpd
Requires: php >= 5.1
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
BuildArch: noarch
%description
The web interface to MythTV.
%prep
%setup -q -n MythTV-mythweb-%{githash2}
#patch1 -p1 -b .mythweb
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
# Non-executable scripts don't need shebangs
sed -i modules/coverart/handler.pl -e '/\/usr\/bin\/perl/d'
# Install ChangeLog
install -m 0644 %{SOURCE2} .
%build
# Nothing to build
%install
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
# drop .htaccess file, settings handled in the above
rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%{_datadir}/mythweb/
%changelog
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
- Initial package split of mythweb from mythtv.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/EL-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Jul 2012 20:54:38 -0000 1.1
+++ sources 6 Jul 2012 18:07:34 -0000 1.2
@@ -0,0 +1 @@
+70d2ee6ffe336f609a955df002ae0cbd MythTV-mythweb-v0.25.1-0-g89a347c.tar.gz
12 years, 4 months
- 1
- 0