rpmfusion-commits
November 2008
rpmfusion-commits@lists.rpmfusion.org
- 21 participants
- 451 discussions
rpms/transcode/EL-5 transcode-1.0.7-dv.patch, NONE, 1.1 transcode-1.0.7-pvmbin.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 transcode.spec, 1.3, 1.4 transcode-1.0.2-lzo2.patch, 1.1, NONE transcode-1.0.4.external_dv.patch, 1.1, NONE transcode-1.0.5-ImageMagick.patch, 1.1, NONE transcode-1.0.5-dvdread.patch, 1.1, NONE
by Orion Poplawski
Author: orion
Update of /cvs/free/rpms/transcode/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30232
Modified Files:
.cvsignore sources transcode.spec
Added Files:
transcode-1.0.7-dv.patch transcode-1.0.7-pvmbin.patch
Removed Files:
transcode-1.0.2-lzo2.patch transcode-1.0.4.external_dv.patch
transcode-1.0.5-ImageMagick.patch
transcode-1.0.5-dvdread.patch
Log Message:
* Fri Nov 28 2008 Orion Poplawski <orion(a)cora.nwra.com> - 1.0.7-1
- upgrade to 1.0.7
- Rework patches to avoid autotools (because of older autotools on EL-5)
- Drop ImageMagick patch and BR version
- drop libdvdread patch
transcode-1.0.7-dv.patch:
--- NEW FILE transcode-1.0.7-dv.patch ---
--- transcode-1.0.7/filter/preview/Makefile.in.dv 2008-11-15 02:57:32.000000000 -0700
+++ transcode-1.0.7/filter/preview/Makefile.in 2008-11-28 21:44:20.000000000 -0700
@@ -361,7 +361,6 @@
EXTRA_DIST = \
display.h \
- dv_types.h \
filter_preview.h \
font_xpm.h \
pv.h
transcode-1.0.7-pvmbin.patch:
--- NEW FILE transcode-1.0.7-pvmbin.patch ---
--- transcode-1.0.7/pvm3/Makefile.in.pvmbind 2008-11-15 02:57:34.000000000 -0700
+++ transcode-1.0.7/pvm3/Makefile.in 2008-11-28 21:50:03.000000000 -0700
@@ -672,11 +672,6 @@
uninstall-am uninstall-binPROGRAMS uninstall-pkgLTLIBRARIES
-install-data-local:
- @$(NORMAL_INSTALL)
- if test ! -e $(bindir)/pvmgs; then \
- ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \
- fi;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/transcode/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Aug 2008 18:09:08 -0000 1.4
+++ .cvsignore 29 Nov 2008 17:41:26 -0000 1.5
@@ -1 +1 @@
-transcode-1.0.6.tar.bz2
+transcode-1.0.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 9 Aug 2008 18:09:08 -0000 1.4
+++ sources 29 Nov 2008 17:41:26 -0000 1.5
@@ -1 +1 @@
-7c3a341b0e4540e34ef50c66b0ab751d transcode-1.0.6.tar.bz2
+48a57f36861450dde78d6a1ad5edf99f transcode-1.0.7.tar.bz2
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/EL-5/transcode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transcode.spec 9 Aug 2008 17:42:05 -0000 1.3
+++ transcode.spec 29 Nov 2008 17:41:26 -0000 1.4
@@ -6,18 +6,16 @@
%define pvmdir %{_datadir}/pvm3
Name: transcode
-Version: 1.0.6
-Release: 2%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.transcoding.org/
Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2
-Patch0: %{name}-pvmbin.patch
-Patch3: transcode-1.0.4.external_dv.patch
-Patch8: transcode-1.0.5-dvdread.patch
-Patch9: transcode-1.0.5-ImageMagick.patch
+Patch0: transcode-1.0.7-pvmbin.patch
+Patch1: transcode-1.0.7-dv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +43,9 @@
%ifarch %{ix86}
BuildRequires: nasm
%endif
-BuildRequires: ImageMagick-devel >= 6.4.0.10
+BuildRequires: ImageMagick-devel
BuildRequires: libmpeg3-devel
-# libtool + autotools for patch2, autoreconf
-BuildRequires: libtool
-
Requires: xvidcore
@@ -68,13 +63,11 @@
%prep
%setup -q
%patch0 -p1 -b .pvmbin
-%patch3 -p1 -b .external_dv
+%patch1 -p1 -b .dv
rm filter/preview/dv_types.h
-%patch8 -p1 -b .libdvdread
-%patch9 -p1 -b .ImageMagick
+
%build
-autoreconf # for patch2, and fixes standard rpaths on lib64 archs
for file in docs/{man/*.1,export_mp2.txt,export_mpeg.txt,filter_dnr.txt} \
AUTHORS ChangeLog README docs/README.vcd ; do
iconv -f iso-8859-1 -t utf-8 $file > $file.utf8 && mv -f $file.utf8 $file
@@ -129,6 +122,12 @@
%changelog
+* Fri Nov 28 2008 Orion Poplawski <orion(a)cora.nwra.com> - 1.0.7-1
+- upgrade to 1.0.7
+- Rework patches to avoid autotools (because of older autotools on EL-5)
+- Drop ImageMagick patch and BR version
+- drop libdvdread patch
+
* Sat Aug 9 2008 David Juran <david(a)juran.se> - 1.0.6-2
- bump release for rpmfusion
--- transcode-1.0.2-lzo2.patch DELETED ---
--- transcode-1.0.4.external_dv.patch DELETED ---
--- transcode-1.0.5-ImageMagick.patch DELETED ---
--- transcode-1.0.5-dvdread.patch DELETED ---
15 years, 10 months
- 1
- 0
rpms/xorg-x11-drv-fglrx/EL-5 sources, 1.4, 1.5 xorg-x11-drv-fglrx.spec, 1.9, 1.10
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10511
Modified Files:
sources xorg-x11-drv-fglrx.spec
Log Message:
downgrade to working release
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Nov 2008 17:24:44 -0000 1.4
+++ sources 29 Nov 2008 11:23:25 -0000 1.5
@@ -1 +1 @@
-9774452430dae8fd8b27eb6379da2e16 ati-driver-installer-8-11-x86.x86_64.run
+4eed6f50089856a4c600a200914d5a55 ati-driver-installer-8-10-x86.x86_64.run
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/EL-5/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-fglrx.spec 17 Nov 2008 17:24:44 -0000 1.9
+++ xorg-x11-drv-fglrx.spec 29 Nov 2008 11:23:25 -0000 1.10
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.11
+%define ativersion 8.10
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.552
+Version: 8.542
Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -296,6 +296,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sat Nov 29 2008 Xavier Lamien <lxtnow[at]gmail.com> - 8.542-1.8.10
+- Downgrade to working release.
+
* Mon Nov 17 2008 Stewart Adam <s.adam at diffingo.com> - 8.552-1.8.11
- Update to 8.11
15 years, 10 months
- 1
- 0
rpms/mythtv/F-8 mythplugins-0.21-svnfixes.patch, 1.2, 1.3 mythtv-0.21-svnfixes.patch, 1.2, 1.3 mythtv.spec, 1.5, 1.6
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27749
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
- Update release-0-21-fixes patches (r19169)
- Should resolve 720p playback stutter, rpmfusion bz#186
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-8/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythplugins-0.21-svnfixes.patch 15 Oct 2008 20:25:08 -0000 1.2
+++ mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:37:20 -0000 1.3
@@ -1,3 +1,18 @@
+Index: mythplugins/mythweb/INSTALL
+===================================================================
+--- mythplugins/mythweb/INSTALL (revision 16468)
++++ mythplugins/mythweb/INSTALL (working copy)
+@@ -195,6 +195,10 @@
+ mod_deflate
+ mod_headers
+
++In Suse 10.3 and above, you'll need to add "rewrite" in the file
++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already
++there.
++
+ =================
+ 5.1 Apache Config
+ =================
Index: mythplugins/mythweb/modules/music/stream.php
===================================================================
--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
@@ -5114,10 +5129,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6009,14 +6020,6 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
-Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6549,10 +6552,6 @@
title = title[:32]
#Create the DVD ISO image
-Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6566,10 +6565,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -7963,14 +7958,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythweather/i18n/mythweather_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythweather/i18n/mythweather_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9286,10 +9273,28 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
-Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
++++ mythplugins/mythgallery/i18n/mythgallery_nb.ts (working copy)
+@@ -35,7 +35,7 @@
+ </message>
+ <message>
+ <source>Import pictures?</source>
+- <translation>Imporere bilder?</translation>
++ <translation>Importere bilder?</translation>
+ </message>
+ <message>
+ <source>No</source>
+@@ -83,7 +83,7 @@
+ </message>
+ <message>
+ <source>Return</source>
+- <translation>Enter</translation>
++ <translation>Tilbake</translation>
+ </message>
+ <message>
+ <source>Clear Marked</source>
Index: mythplugins/mythgallery/i18n/mythgallery_nl.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nl.ts (revision 16468)
@@ -9806,10 +9811,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10059,10 +10060,6 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
-Index: mythplugins/mythflix/i18n/mythflix_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10149,10 +10146,28 @@
</message>
</context>
<context>
-Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
++++ mythplugins/mythflix/mythflix/netflix-ui.xml (working copy)
+@@ -91,7 +91,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
+@@ -178,7 +178,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10441,10 +10456,6 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10581,14 +10592,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12139,10 +12142,6 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
-Index: mythplugins/mythphone/i18n/mythphone_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -12920,10 +12919,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythgame/i18n/mythgame_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13353,10 +13348,6 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
-Index: mythplugins/mythgame/i18n/mythgame_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14510,14 +14501,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythnews/i18n/mythnews_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythnews/i18n/mythnews_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
@@ -14679,3 +14662,131 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythnews/mythnews/news-sites.xml
+===================================================================
+--- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468)
++++ mythplugins/mythnews/mythnews/news-sites.xml (working copy)
+@@ -725,85 +725,75 @@
+ </item>
+
+ <item>
+- <title>Digital Spy - Broadcasting</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url>
++ <title>Digital Spy - News Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cable</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url>
++ <title>Digital Spy - Entertainment Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cult</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url>
++ <title>Digital Spy - Media Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Entertainment Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url>
++ <title>Digital Spy - Digital TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Gaydar</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url>
++ <title>Digital Spy - Broadcasting</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url>
++ <title>Digital Spy - Cult</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Media Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url>
++ <title>Digital Spy - Gay Spy</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url>
+ </item>
+
+ <item>
+ <title>Digital Spy - Movies</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Programming</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url>
++ <title>Digital Spy - Music</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Radio</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url>
++ <title>Digital Spy - Reality</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Reality TV</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url>
++ <title>Digital Spy - Showbiz</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Satellite</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url>
++ <title>Digital Spy - Soaps</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Showbiz</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url>
+- </item>
+-
+- <item>
+ <title>Digital Spy - Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Terrestrial</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url>
++ <title>Digital Spy - US TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url>
+ </item>
+
+- <item>
+- <title>Digital Spy - US Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url>
+- </item>
+-
+ </category>
+
+ <category name="MythTV">
+@@ -986,6 +976,11 @@
+ </item>
+
+ <item>
++ <title>Digital Spy - Odd Section</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url>
++ </item>
++
++ <item>
+ <title>Fark</title>
+ <url>http://feeds.feedburner.com/fark</url>
+ <ico>http://www.fark.com/favicon.ico</ico>
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-8/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.21-svnfixes.patch 15 Oct 2008 20:25:08 -0000 1.2
+++ mythtv-0.21-svnfixes.patch 29 Nov 2008 06:37:20 -0000 1.3
@@ -7332,15 +7332,19 @@
</message>
</context>
</TS>
-Index: mythtv/i18n/mythfrontend_nb.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythtv/i18n/mythfrontend_de.ts
===================================================================
--- mythtv/i18n/mythfrontend_de.ts (revision 16468)
+++ mythtv/i18n/mythfrontend_de.ts (working copy)
-@@ -66,19 +66,19 @@
+@@ -1,4 +1,6 @@
+-<!DOCTYPE TS><TS>
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE TS><TS version="1.1" language="de">
++<defaultcodec></defaultcodec>
+ <context>
+ <name>@default</name>
+ <message>
+@@ -66,19 +68,19 @@
<name>BackendSelect</name>
<message>
<source>Please select default Myth Backend Server</source>
@@ -7364,7 +7368,7 @@
</message>
</context>
<context>
-@@ -116,11 +116,11 @@
+@@ -116,11 +118,11 @@
</message>
<message>
<source>No, don't</source>
@@ -7378,7 +7382,7 @@
</message>
<message>
<source>Yes, delete capture cards</source>
-@@ -136,7 +136,7 @@
+@@ -136,7 +138,7 @@
</message>
<message>
<source>Unable to delete capturecards for %1</source>
@@ -7387,7 +7391,7 @@
</message>
</context>
<context>
-@@ -171,23 +171,23 @@
+@@ -171,23 +173,23 @@
</message>
<message>
<source>Create Input Group</source>
@@ -7416,7 +7420,7 @@
</message>
</context>
<context>
-@@ -201,7 +201,7 @@
+@@ -201,7 +203,7 @@
<name>ChannelEditor</name>
<message>
<source>Channels</source>
@@ -7425,7 +7429,7 @@
</message>
<message>
<source>Are you sure you would like to delete this channel?</source>
-@@ -245,36 +245,36 @@
+@@ -245,36 +247,36 @@
</message>
<message>
<source>Are you sure you would like to delete ALL channels?</source>
@@ -7473,7 +7477,7 @@
</context>
<context>
<name>ChannelRecPriority</name>
-@@ -435,7 +435,7 @@
+@@ -435,7 +437,7 @@
</message>
<message>
<source>Additional Tables</source>
@@ -7482,7 +7486,7 @@
</message>
<message>
<source>Test</source>
-@@ -447,7 +447,7 @@
+@@ -447,7 +449,7 @@
</message>
<message>
<source>Store</source>
@@ -7491,7 +7495,7 @@
</message>
<message>
<source>Cancel</source>
-@@ -467,35 +467,35 @@
+@@ -467,35 +469,35 @@
</message>
<message>
<source>First showing of each episode</source>
@@ -7526,7 +7530,7 @@
<message>
<source>Only shows marked as widescreen</source>
- <translation type="unfinished"></translation>
-+ <translation>Nur Sendungen in 'widescreen'</translation>
++ <translation>Nur Sendungen im Breitbildformat</translation>
</message>
<message>
<source>Exclude H.264 encoded streams (EIT only)</source>
@@ -7535,7 +7539,7 @@
</message>
</context>
<context>
-@@ -669,11 +669,11 @@
+@@ -669,11 +671,11 @@
<name>DTVSignalMonitor</name>
<message>
<source>Seen</source>
@@ -7549,7 +7553,7 @@
</message>
</context>
<context>
-@@ -712,19 +712,19 @@
+@@ -712,19 +714,19 @@
<name>DVBSignalMonitor</name>
<message>
<source>Signal To Noise</source>
@@ -7573,7 +7577,7 @@
</message>
</context>
<context>
-@@ -788,7 +788,7 @@
+@@ -788,7 +790,7 @@
<name>DeviceTree</name>
<message>
<source>The Cartesian latitude for your location.</source>
@@ -7582,7 +7586,7 @@
</message>
<message>
<source>Use negative numbers for southern and western coordinates.</source>
-@@ -828,8 +828,7 @@
+@@ -828,8 +830,7 @@
</message>
<message>
<source>Select the type of switch from the list.</source>
@@ -7592,7 +7596,7 @@
</message>
<message>
<source>Tone</source>
-@@ -845,15 +844,15 @@
+@@ -845,15 +846,15 @@
</message>
<message>
<source>Legacy SW21</source>
@@ -7611,7 +7615,7 @@
</message>
<message>
<source>Number of ports</source>
-@@ -861,7 +860,7 @@
+@@ -861,7 +862,7 @@
</message>
<message>
<source>The number of ports this switch has.</source>
@@ -7620,7 +7624,7 @@
</message>
<message>
<source>Switch Configuration</source>
-@@ -885,7 +884,7 @@
+@@ -885,7 +886,7 @@
</message>
<message>
<source>Rotor Low Speed (deg/sec)</source>
@@ -7629,7 +7633,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source>
-@@ -893,7 +892,7 @@
+@@ -893,7 +894,7 @@
</message>
<message>
<source>Rotor High Speed (deg/sec)</source>
@@ -7638,7 +7642,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source>
-@@ -907,7 +906,7 @@
+@@ -907,7 +908,7 @@
<message>
<source>W</source>
<comment>Western Hemisphere</comment>
@@ -7647,22 +7651,25 @@
</message>
<message>
<source>Position Index %1</source>
-@@ -1089,6 +1088,14 @@
[...4581 lines suppressed...]
+- return setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- }
+- else if (m_MediaType == MEDIATYPE_DVD)
+- {
+- // pretend we're NOTMOUNTED so setStatus emits
+- // a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- }
+- else
+- return setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- break;
+- case CDS_AUDIO:
+- VERBOSE(VB_MEDIA, "found an audio disk");
+- m_MediaType = MEDIATYPE_AUDIO;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- break;
+- case CDS_MIXED:
+- m_MediaType = MEDIATYPE_MIXED;
+- VERBOSE(VB_MEDIA, "found a mixed CD");
+- // Note: Mixed mode CDs require an explixit mount call
+- // since we'll usually want the audio portion.
+- // undefine ASSUME_WANT_AUDIO to change this behavior.
+- #ifdef ASSUME_WANT_AUDIO
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- #else
+- mount();
+- if (isMounted(true))
+- {
+- // pretend we're NOTMOUNTED so setStatus
+- // emits a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_MOUNTED,
+- OpenedHere);
+- }
+- else
+- {
+- return setStatus(MEDIASTAT_USEABLE,
+- OpenedHere);
+- }
+- #endif
+- break;
+- case CDS_NO_INFO:
+- case CDS_NO_DISC:
+- if (hasWritableMedia())
+- {
+- VERBOSE(VB_MEDIA, "found a blank or writable disk");
+- return setStatus(MEDIASTAT_UNFORMATTED, OpenedHere);
+- }
+-
+- VERBOSE(VB_MEDIA, "found no disk");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- break;
+- default:
+- VERBOSE(VB_MEDIA, "found unknown disk type: "
+- + QString().setNum(type));
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
+- }
+- else if (m_Status == MEDIASTAT_MOUNTED ||
+- m_Status == MEDIASTAT_NOTMOUNTED)
+- {
+- VERBOSE(VB_MEDIA, QString("Current status == ") +
+- MythMediaDevice::MediaStatusStrings[m_Status]);
+- VERBOSE(VB_MEDIA, "Setting status to not mounted?");
+- if (isMounted(true))
+- setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- else
+- setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- }
+-
+- if (m_AllowEject)
+- ioctl(m_DeviceHandle, CDROM_LOCKDOOR, 0);
+- }// mediaChanged()
+- } // isDeviceOpen();
++ if (m_AllowEject)
++ unlock();
+ else
+- {
+- VERBOSE(VB_MEDIA, "Device not open - returning UNKNOWN");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
++ lock();
+
+ if (OpenedHere)
+ closeDevice();
Index: mythtv/libs/libmythupnp/ssdp.cpp
===================================================================
--- mythtv/libs/libmythupnp/ssdp.cpp (revision 16468)
@@ -38327,6 +40279,28 @@
for (QFileInfoListIterator it(*List); it; ++it)
{
QFileInfo Info(*it.current());
+Index: mythtv/programs/mythbackend/backendutil.cpp
+===================================================================
+--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468)
++++ mythtv/programs/mythbackend/backendutil.cpp (working copy)
+@@ -207,7 +207,7 @@
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 &&
+ (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
+@@ -292,7 +292,7 @@
+ // Sometimes the space reported for an NFS mounted dir is slightly
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
Index: mythtv/programs/mythtv-setup/setup.xml
===================================================================
--- mythtv/programs/mythtv-setup/setup.xml (revision 16468)
@@ -38810,7 +40784,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 18567)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -39314,7 +41288,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 18567)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -39396,7 +41370,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -39458,7 +41432,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169)
@@ -0,0 +1,58 @@
+@Echo off
+::
@@ -39581,42 +41555,6 @@
# make
[ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
[ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
-Index: mythtv/contrib/OSX/osx-packager.pl
-===================================================================
---- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
-+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
-@@ -577,6 +577,7 @@
- 'mythtv'
- => [
- '--prefix=' . $PREFIX,
-+ '--runtime-prefix=../Resources',
- # To "cross compile" something for a lesser Mac:
- #'--tune=G3',
- #'--disable-altivec',
-@@ -1041,6 +1042,13 @@
- if ( $OPT{'verbose'} )
- { push @bundler, '--verbose' }
-
-+### Framework that has a screwed up link dependency path
-+my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
-+ 'Framework/AVCVideoServices.framework';
-+my @AVCfw = split / /, `ls -d $AVCfw`;
-+my $AVCfw = pop @AVCfw;
-+chop $AVCfw;
-+
- ### Create each package.
- ### Note that this is a bit of a waste of disk space,
- ### because there are now multiple copies of each library.
-@@ -1072,6 +1080,9 @@
- # Remove copy of binary
- unlink "$SCRIPTDIR/$target" or die;
-
-+ if ( $AVCfw )
-+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") }
-+
- if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
- {
- my $res = "$finalTarget/Contents/Resources";
Index: mythtv/contrib/channel_changers/6200ch.c
===================================================================
--- mythtv/contrib/channel_changers/6200ch.c (revision 16468)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-8/mythtv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mythtv.spec 15 Oct 2008 20:25:08 -0000 1.5
+++ mythtv.spec 29 Nov 2008 06:37:20 -0000 1.6
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r18567
+%define _svnver r19169
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 13%{?dist}
+Release: 14%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -45,7 +45,6 @@
Patch100: mythtv-0.21-svnfixes.patch
Patch101: mythtv-0.20-mythstreammenu.diff
#Patch102: mythtv-0.21-fedora-settings.patch
-Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
#
@@ -493,7 +492,6 @@
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
-%patch103 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -549,7 +547,7 @@
cd mythvideo
# Fix /mnt/store -> /var/lib/mythmusic
-perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp
+perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globals.cpp
cd ..
cd mythweb
@@ -1017,6 +1015,10 @@
%endif
%changelog
+* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
+- Update release-0-21-fixes patches (r19169)
+- Should resolve 720p playback stutter, rpmfusion bz#186
+
* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
- Enable fast cmov on x86_64
- Disable mythgame-emulators convenience meta-package, deps not
15 years, 10 months
- 1
- 0
rpms/mythtv/F-9 mythplugins-0.21-svnfixes.patch, 1.2, 1.3 mythtv-0.21-svnfixes.patch, 1.2, 1.3 mythtv.spec, 1.5, 1.6
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27362
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
- Update release-0-21-fixes patches (r19169)
- Should resolve 720p playback stutter, rpmfusion bz#186
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythplugins-0.21-svnfixes.patch 15 Oct 2008 20:24:36 -0000 1.2
+++ mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:32:20 -0000 1.3
@@ -1,3 +1,18 @@
+Index: mythplugins/mythweb/INSTALL
+===================================================================
+--- mythplugins/mythweb/INSTALL (revision 16468)
++++ mythplugins/mythweb/INSTALL (working copy)
+@@ -195,6 +195,10 @@
+ mod_deflate
+ mod_headers
+
++In Suse 10.3 and above, you'll need to add "rewrite" in the file
++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already
++there.
++
+ =================
+ 5.1 Apache Config
+ =================
Index: mythplugins/mythweb/modules/music/stream.php
===================================================================
--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
@@ -5114,10 +5129,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6009,14 +6020,6 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
-Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6549,10 +6552,6 @@
title = title[:32]
#Create the DVD ISO image
-Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6566,10 +6565,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -7963,14 +7958,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythweather/i18n/mythweather_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythweather/i18n/mythweather_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9286,10 +9273,28 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
-Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
++++ mythplugins/mythgallery/i18n/mythgallery_nb.ts (working copy)
+@@ -35,7 +35,7 @@
+ </message>
+ <message>
+ <source>Import pictures?</source>
+- <translation>Imporere bilder?</translation>
++ <translation>Importere bilder?</translation>
+ </message>
+ <message>
+ <source>No</source>
+@@ -83,7 +83,7 @@
+ </message>
+ <message>
+ <source>Return</source>
+- <translation>Enter</translation>
++ <translation>Tilbake</translation>
+ </message>
+ <message>
+ <source>Clear Marked</source>
Index: mythplugins/mythgallery/i18n/mythgallery_nl.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nl.ts (revision 16468)
@@ -9806,10 +9811,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10059,10 +10060,6 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
-Index: mythplugins/mythflix/i18n/mythflix_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10149,10 +10146,28 @@
</message>
</context>
<context>
-Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
++++ mythplugins/mythflix/mythflix/netflix-ui.xml (working copy)
+@@ -91,7 +91,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
+@@ -178,7 +178,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10441,10 +10456,6 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10581,14 +10592,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12139,10 +12142,6 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
-Index: mythplugins/mythphone/i18n/mythphone_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -12920,10 +12919,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythgame/i18n/mythgame_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13353,10 +13348,6 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
-Index: mythplugins/mythgame/i18n/mythgame_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14510,14 +14501,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythnews/i18n/mythnews_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythnews/i18n/mythnews_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
@@ -14679,3 +14662,131 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythnews/mythnews/news-sites.xml
+===================================================================
+--- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468)
++++ mythplugins/mythnews/mythnews/news-sites.xml (working copy)
+@@ -725,85 +725,75 @@
+ </item>
+
+ <item>
+- <title>Digital Spy - Broadcasting</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url>
++ <title>Digital Spy - News Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cable</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url>
++ <title>Digital Spy - Entertainment Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cult</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url>
++ <title>Digital Spy - Media Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Entertainment Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url>
++ <title>Digital Spy - Digital TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Gaydar</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url>
++ <title>Digital Spy - Broadcasting</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url>
++ <title>Digital Spy - Cult</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Media Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url>
++ <title>Digital Spy - Gay Spy</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url>
+ </item>
+
+ <item>
+ <title>Digital Spy - Movies</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Programming</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url>
++ <title>Digital Spy - Music</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Radio</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url>
++ <title>Digital Spy - Reality</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Reality TV</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url>
++ <title>Digital Spy - Showbiz</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Satellite</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url>
++ <title>Digital Spy - Soaps</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Showbiz</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url>
+- </item>
+-
+- <item>
+ <title>Digital Spy - Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Terrestrial</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url>
++ <title>Digital Spy - US TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url>
+ </item>
+
+- <item>
+- <title>Digital Spy - US Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url>
+- </item>
+-
+ </category>
+
+ <category name="MythTV">
+@@ -986,6 +976,11 @@
+ </item>
+
+ <item>
++ <title>Digital Spy - Odd Section</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url>
++ </item>
++
++ <item>
+ <title>Fark</title>
+ <url>http://feeds.feedburner.com/fark</url>
+ <ico>http://www.fark.com/favicon.ico</ico>
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.21-svnfixes.patch 15 Oct 2008 20:24:36 -0000 1.2
+++ mythtv-0.21-svnfixes.patch 29 Nov 2008 06:32:20 -0000 1.3
@@ -7332,15 +7332,19 @@
</message>
</context>
</TS>
-Index: mythtv/i18n/mythfrontend_nb.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythtv/i18n/mythfrontend_de.ts
===================================================================
--- mythtv/i18n/mythfrontend_de.ts (revision 16468)
+++ mythtv/i18n/mythfrontend_de.ts (working copy)
-@@ -66,19 +66,19 @@
+@@ -1,4 +1,6 @@
+-<!DOCTYPE TS><TS>
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE TS><TS version="1.1" language="de">
++<defaultcodec></defaultcodec>
+ <context>
+ <name>@default</name>
+ <message>
+@@ -66,19 +68,19 @@
<name>BackendSelect</name>
<message>
<source>Please select default Myth Backend Server</source>
@@ -7364,7 +7368,7 @@
</message>
</context>
<context>
-@@ -116,11 +116,11 @@
+@@ -116,11 +118,11 @@
</message>
<message>
<source>No, don't</source>
@@ -7378,7 +7382,7 @@
</message>
<message>
<source>Yes, delete capture cards</source>
-@@ -136,7 +136,7 @@
+@@ -136,7 +138,7 @@
</message>
<message>
<source>Unable to delete capturecards for %1</source>
@@ -7387,7 +7391,7 @@
</message>
</context>
<context>
-@@ -171,23 +171,23 @@
+@@ -171,23 +173,23 @@
</message>
<message>
<source>Create Input Group</source>
@@ -7416,7 +7420,7 @@
</message>
</context>
<context>
-@@ -201,7 +201,7 @@
+@@ -201,7 +203,7 @@
<name>ChannelEditor</name>
<message>
<source>Channels</source>
@@ -7425,7 +7429,7 @@
</message>
<message>
<source>Are you sure you would like to delete this channel?</source>
-@@ -245,36 +245,36 @@
+@@ -245,36 +247,36 @@
</message>
<message>
<source>Are you sure you would like to delete ALL channels?</source>
@@ -7473,7 +7477,7 @@
</context>
<context>
<name>ChannelRecPriority</name>
-@@ -435,7 +435,7 @@
+@@ -435,7 +437,7 @@
</message>
<message>
<source>Additional Tables</source>
@@ -7482,7 +7486,7 @@
</message>
<message>
<source>Test</source>
-@@ -447,7 +447,7 @@
+@@ -447,7 +449,7 @@
</message>
<message>
<source>Store</source>
@@ -7491,7 +7495,7 @@
</message>
<message>
<source>Cancel</source>
-@@ -467,35 +467,35 @@
+@@ -467,35 +469,35 @@
</message>
<message>
<source>First showing of each episode</source>
@@ -7526,7 +7530,7 @@
<message>
<source>Only shows marked as widescreen</source>
- <translation type="unfinished"></translation>
-+ <translation>Nur Sendungen in 'widescreen'</translation>
++ <translation>Nur Sendungen im Breitbildformat</translation>
</message>
<message>
<source>Exclude H.264 encoded streams (EIT only)</source>
@@ -7535,7 +7539,7 @@
</message>
</context>
<context>
-@@ -669,11 +669,11 @@
+@@ -669,11 +671,11 @@
<name>DTVSignalMonitor</name>
<message>
<source>Seen</source>
@@ -7549,7 +7553,7 @@
</message>
</context>
<context>
-@@ -712,19 +712,19 @@
+@@ -712,19 +714,19 @@
<name>DVBSignalMonitor</name>
<message>
<source>Signal To Noise</source>
@@ -7573,7 +7577,7 @@
</message>
</context>
<context>
-@@ -788,7 +788,7 @@
+@@ -788,7 +790,7 @@
<name>DeviceTree</name>
<message>
<source>The Cartesian latitude for your location.</source>
@@ -7582,7 +7586,7 @@
</message>
<message>
<source>Use negative numbers for southern and western coordinates.</source>
-@@ -828,8 +828,7 @@
+@@ -828,8 +830,7 @@
</message>
<message>
<source>Select the type of switch from the list.</source>
@@ -7592,7 +7596,7 @@
</message>
<message>
<source>Tone</source>
-@@ -845,15 +844,15 @@
+@@ -845,15 +846,15 @@
</message>
<message>
<source>Legacy SW21</source>
@@ -7611,7 +7615,7 @@
</message>
<message>
<source>Number of ports</source>
-@@ -861,7 +860,7 @@
+@@ -861,7 +862,7 @@
</message>
<message>
<source>The number of ports this switch has.</source>
@@ -7620,7 +7624,7 @@
</message>
<message>
<source>Switch Configuration</source>
-@@ -885,7 +884,7 @@
+@@ -885,7 +886,7 @@
</message>
<message>
<source>Rotor Low Speed (deg/sec)</source>
@@ -7629,7 +7633,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source>
-@@ -893,7 +892,7 @@
+@@ -893,7 +894,7 @@
</message>
<message>
<source>Rotor High Speed (deg/sec)</source>
@@ -7638,7 +7642,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source>
-@@ -907,7 +906,7 @@
+@@ -907,7 +908,7 @@
<message>
<source>W</source>
<comment>Western Hemisphere</comment>
@@ -7647,22 +7651,25 @@
</message>
<message>
<source>Position Index %1</source>
-@@ -1089,6 +1088,14 @@
[...4581 lines suppressed...]
+- return setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- }
+- else if (m_MediaType == MEDIATYPE_DVD)
+- {
+- // pretend we're NOTMOUNTED so setStatus emits
+- // a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- }
+- else
+- return setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- break;
+- case CDS_AUDIO:
+- VERBOSE(VB_MEDIA, "found an audio disk");
+- m_MediaType = MEDIATYPE_AUDIO;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- break;
+- case CDS_MIXED:
+- m_MediaType = MEDIATYPE_MIXED;
+- VERBOSE(VB_MEDIA, "found a mixed CD");
+- // Note: Mixed mode CDs require an explixit mount call
+- // since we'll usually want the audio portion.
+- // undefine ASSUME_WANT_AUDIO to change this behavior.
+- #ifdef ASSUME_WANT_AUDIO
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- #else
+- mount();
+- if (isMounted(true))
+- {
+- // pretend we're NOTMOUNTED so setStatus
+- // emits a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_MOUNTED,
+- OpenedHere);
+- }
+- else
+- {
+- return setStatus(MEDIASTAT_USEABLE,
+- OpenedHere);
+- }
+- #endif
+- break;
+- case CDS_NO_INFO:
+- case CDS_NO_DISC:
+- if (hasWritableMedia())
+- {
+- VERBOSE(VB_MEDIA, "found a blank or writable disk");
+- return setStatus(MEDIASTAT_UNFORMATTED, OpenedHere);
+- }
+-
+- VERBOSE(VB_MEDIA, "found no disk");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- break;
+- default:
+- VERBOSE(VB_MEDIA, "found unknown disk type: "
+- + QString().setNum(type));
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
+- }
+- else if (m_Status == MEDIASTAT_MOUNTED ||
+- m_Status == MEDIASTAT_NOTMOUNTED)
+- {
+- VERBOSE(VB_MEDIA, QString("Current status == ") +
+- MythMediaDevice::MediaStatusStrings[m_Status]);
+- VERBOSE(VB_MEDIA, "Setting status to not mounted?");
+- if (isMounted(true))
+- setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- else
+- setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- }
+-
+- if (m_AllowEject)
+- ioctl(m_DeviceHandle, CDROM_LOCKDOOR, 0);
+- }// mediaChanged()
+- } // isDeviceOpen();
++ if (m_AllowEject)
++ unlock();
+ else
+- {
+- VERBOSE(VB_MEDIA, "Device not open - returning UNKNOWN");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
++ lock();
+
+ if (OpenedHere)
+ closeDevice();
Index: mythtv/libs/libmythupnp/ssdp.cpp
===================================================================
--- mythtv/libs/libmythupnp/ssdp.cpp (revision 16468)
@@ -38327,6 +40279,28 @@
for (QFileInfoListIterator it(*List); it; ++it)
{
QFileInfo Info(*it.current());
+Index: mythtv/programs/mythbackend/backendutil.cpp
+===================================================================
+--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468)
++++ mythtv/programs/mythbackend/backendutil.cpp (working copy)
+@@ -207,7 +207,7 @@
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 &&
+ (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
+@@ -292,7 +292,7 @@
+ // Sometimes the space reported for an NFS mounted dir is slightly
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
Index: mythtv/programs/mythtv-setup/setup.xml
===================================================================
--- mythtv/programs/mythtv-setup/setup.xml (revision 16468)
@@ -38810,7 +40784,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 18567)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -39314,7 +41288,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 18567)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -39396,7 +41370,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -39458,7 +41432,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169)
@@ -0,0 +1,58 @@
+@Echo off
+::
@@ -39581,42 +41555,6 @@
# make
[ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
[ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
-Index: mythtv/contrib/OSX/osx-packager.pl
-===================================================================
---- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
-+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
-@@ -577,6 +577,7 @@
- 'mythtv'
- => [
- '--prefix=' . $PREFIX,
-+ '--runtime-prefix=../Resources',
- # To "cross compile" something for a lesser Mac:
- #'--tune=G3',
- #'--disable-altivec',
-@@ -1041,6 +1042,13 @@
- if ( $OPT{'verbose'} )
- { push @bundler, '--verbose' }
-
-+### Framework that has a screwed up link dependency path
-+my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
-+ 'Framework/AVCVideoServices.framework';
-+my @AVCfw = split / /, `ls -d $AVCfw`;
-+my $AVCfw = pop @AVCfw;
-+chop $AVCfw;
-+
- ### Create each package.
- ### Note that this is a bit of a waste of disk space,
- ### because there are now multiple copies of each library.
-@@ -1072,6 +1080,9 @@
- # Remove copy of binary
- unlink "$SCRIPTDIR/$target" or die;
-
-+ if ( $AVCfw )
-+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") }
-+
- if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
- {
- my $res = "$finalTarget/Contents/Resources";
Index: mythtv/contrib/channel_changers/6200ch.c
===================================================================
--- mythtv/contrib/channel_changers/6200ch.c (revision 16468)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mythtv.spec 15 Oct 2008 20:24:36 -0000 1.5
+++ mythtv.spec 29 Nov 2008 06:32:20 -0000 1.6
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r18567
+%define _svnver r19169
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 13%{?dist}
+Release: 14%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -45,7 +45,6 @@
Patch100: mythtv-0.21-svnfixes.patch
Patch101: mythtv-0.20-mythstreammenu.diff
#Patch102: mythtv-0.21-fedora-settings.patch
-Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
#
@@ -493,7 +492,6 @@
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
-%patch103 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -549,7 +547,7 @@
cd mythvideo
# Fix /mnt/store -> /var/lib/mythmusic
-perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp
+perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globals.cpp
cd ..
cd mythweb
@@ -1017,6 +1015,10 @@
%endif
%changelog
+* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
+- Update release-0-21-fixes patches (r19169)
+- Should resolve 720p playback stutter, rpmfusion bz#186
+
* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
- Enable fast cmov on x86_64
- Disable mythgame-emulators convenience meta-package, deps not
15 years, 10 months
- 1
- 0
rpms/mythtv/F-10 mythplugins-0.21-svnfixes.patch, 1.3, 1.4 mythtv-0.21-svnfixes.patch, 1.3, 1.4 mythtv.spec, 1.12, 1.13
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27253
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
- Update release-0-21-fixes patches (r19169)
- Should resolve 720p playback stutter, rpmfusion bz#186
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythplugins-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3
+++ mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4
@@ -1,3 +1,18 @@
+Index: mythplugins/mythweb/INSTALL
+===================================================================
+--- mythplugins/mythweb/INSTALL (revision 16468)
++++ mythplugins/mythweb/INSTALL (working copy)
+@@ -195,6 +195,10 @@
+ mod_deflate
+ mod_headers
+
++In Suse 10.3 and above, you'll need to add "rewrite" in the file
++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already
++there.
++
+ =================
+ 5.1 Apache Config
+ =================
Index: mythplugins/mythweb/modules/music/stream.php
===================================================================
--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
@@ -5114,10 +5129,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6009,14 +6020,6 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
-Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6549,10 +6552,6 @@
title = title[:32]
#Create the DVD ISO image
-Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6566,10 +6565,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -7963,14 +7958,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythweather/i18n/mythweather_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythweather/i18n/mythweather_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9286,10 +9273,28 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
-Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
++++ mythplugins/mythgallery/i18n/mythgallery_nb.ts (working copy)
+@@ -35,7 +35,7 @@
+ </message>
+ <message>
+ <source>Import pictures?</source>
+- <translation>Imporere bilder?</translation>
++ <translation>Importere bilder?</translation>
+ </message>
+ <message>
+ <source>No</source>
+@@ -83,7 +83,7 @@
+ </message>
+ <message>
+ <source>Return</source>
+- <translation>Enter</translation>
++ <translation>Tilbake</translation>
+ </message>
+ <message>
+ <source>Clear Marked</source>
Index: mythplugins/mythgallery/i18n/mythgallery_nl.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nl.ts (revision 16468)
@@ -9806,10 +9811,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10059,10 +10060,6 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
-Index: mythplugins/mythflix/i18n/mythflix_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10149,10 +10146,28 @@
</message>
</context>
<context>
-Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
++++ mythplugins/mythflix/mythflix/netflix-ui.xml (working copy)
+@@ -91,7 +91,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
+@@ -178,7 +178,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10441,10 +10456,6 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10581,14 +10592,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12139,10 +12142,6 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
-Index: mythplugins/mythphone/i18n/mythphone_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -12920,10 +12919,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythgame/i18n/mythgame_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13353,10 +13348,6 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
-Index: mythplugins/mythgame/i18n/mythgame_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14510,14 +14501,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythnews/i18n/mythnews_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythnews/i18n/mythnews_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
@@ -14679,3 +14662,131 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythnews/mythnews/news-sites.xml
+===================================================================
+--- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468)
++++ mythplugins/mythnews/mythnews/news-sites.xml (working copy)
+@@ -725,85 +725,75 @@
+ </item>
+
+ <item>
+- <title>Digital Spy - Broadcasting</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url>
++ <title>Digital Spy - News Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cable</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url>
++ <title>Digital Spy - Entertainment Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cult</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url>
++ <title>Digital Spy - Media Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Entertainment Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url>
++ <title>Digital Spy - Digital TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Gaydar</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url>
++ <title>Digital Spy - Broadcasting</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url>
++ <title>Digital Spy - Cult</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Media Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url>
++ <title>Digital Spy - Gay Spy</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url>
+ </item>
+
+ <item>
+ <title>Digital Spy - Movies</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Programming</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url>
++ <title>Digital Spy - Music</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Radio</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url>
++ <title>Digital Spy - Reality</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Reality TV</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url>
++ <title>Digital Spy - Showbiz</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Satellite</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url>
++ <title>Digital Spy - Soaps</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Showbiz</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url>
+- </item>
+-
+- <item>
+ <title>Digital Spy - Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Terrestrial</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url>
++ <title>Digital Spy - US TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url>
+ </item>
+
+- <item>
+- <title>Digital Spy - US Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url>
+- </item>
+-
+ </category>
+
+ <category name="MythTV">
+@@ -986,6 +976,11 @@
+ </item>
+
+ <item>
++ <title>Digital Spy - Odd Section</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url>
++ </item>
++
++ <item>
+ <title>Fark</title>
+ <url>http://feeds.feedburner.com/fark</url>
+ <ico>http://www.fark.com/favicon.ico</ico>
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3
+++ mythtv-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4
@@ -7332,15 +7332,19 @@
</message>
</context>
</TS>
-Index: mythtv/i18n/mythfrontend_nb.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythtv/i18n/mythfrontend_de.ts
===================================================================
--- mythtv/i18n/mythfrontend_de.ts (revision 16468)
+++ mythtv/i18n/mythfrontend_de.ts (working copy)
-@@ -66,19 +66,19 @@
+@@ -1,4 +1,6 @@
+-<!DOCTYPE TS><TS>
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE TS><TS version="1.1" language="de">
++<defaultcodec></defaultcodec>
+ <context>
+ <name>@default</name>
+ <message>
+@@ -66,19 +68,19 @@
<name>BackendSelect</name>
<message>
<source>Please select default Myth Backend Server</source>
@@ -7364,7 +7368,7 @@
</message>
</context>
<context>
-@@ -116,11 +116,11 @@
+@@ -116,11 +118,11 @@
</message>
<message>
<source>No, don't</source>
@@ -7378,7 +7382,7 @@
</message>
<message>
<source>Yes, delete capture cards</source>
-@@ -136,7 +136,7 @@
+@@ -136,7 +138,7 @@
</message>
<message>
<source>Unable to delete capturecards for %1</source>
@@ -7387,7 +7391,7 @@
</message>
</context>
<context>
-@@ -171,23 +171,23 @@
+@@ -171,23 +173,23 @@
</message>
<message>
<source>Create Input Group</source>
@@ -7416,7 +7420,7 @@
</message>
</context>
<context>
-@@ -201,7 +201,7 @@
+@@ -201,7 +203,7 @@
<name>ChannelEditor</name>
<message>
<source>Channels</source>
@@ -7425,7 +7429,7 @@
</message>
<message>
<source>Are you sure you would like to delete this channel?</source>
-@@ -245,36 +245,36 @@
+@@ -245,36 +247,36 @@
</message>
<message>
<source>Are you sure you would like to delete ALL channels?</source>
@@ -7473,7 +7477,7 @@
</context>
<context>
<name>ChannelRecPriority</name>
-@@ -435,7 +435,7 @@
+@@ -435,7 +437,7 @@
</message>
<message>
<source>Additional Tables</source>
@@ -7482,7 +7486,7 @@
</message>
<message>
<source>Test</source>
-@@ -447,7 +447,7 @@
+@@ -447,7 +449,7 @@
</message>
<message>
<source>Store</source>
@@ -7491,7 +7495,7 @@
</message>
<message>
<source>Cancel</source>
-@@ -467,35 +467,35 @@
+@@ -467,35 +469,35 @@
</message>
<message>
<source>First showing of each episode</source>
@@ -7526,7 +7530,7 @@
<message>
<source>Only shows marked as widescreen</source>
- <translation type="unfinished"></translation>
-+ <translation>Nur Sendungen in 'widescreen'</translation>
++ <translation>Nur Sendungen im Breitbildformat</translation>
</message>
<message>
<source>Exclude H.264 encoded streams (EIT only)</source>
@@ -7535,7 +7539,7 @@
</message>
</context>
<context>
-@@ -669,11 +669,11 @@
+@@ -669,11 +671,11 @@
<name>DTVSignalMonitor</name>
<message>
<source>Seen</source>
@@ -7549,7 +7553,7 @@
</message>
</context>
<context>
-@@ -712,19 +712,19 @@
+@@ -712,19 +714,19 @@
<name>DVBSignalMonitor</name>
<message>
<source>Signal To Noise</source>
@@ -7573,7 +7577,7 @@
</message>
</context>
<context>
-@@ -788,7 +788,7 @@
+@@ -788,7 +790,7 @@
<name>DeviceTree</name>
<message>
<source>The Cartesian latitude for your location.</source>
@@ -7582,7 +7586,7 @@
</message>
<message>
<source>Use negative numbers for southern and western coordinates.</source>
-@@ -828,8 +828,7 @@
+@@ -828,8 +830,7 @@
</message>
<message>
<source>Select the type of switch from the list.</source>
@@ -7592,7 +7596,7 @@
</message>
<message>
<source>Tone</source>
-@@ -845,15 +844,15 @@
+@@ -845,15 +846,15 @@
</message>
<message>
<source>Legacy SW21</source>
@@ -7611,7 +7615,7 @@
</message>
<message>
<source>Number of ports</source>
-@@ -861,7 +860,7 @@
+@@ -861,7 +862,7 @@
</message>
<message>
<source>The number of ports this switch has.</source>
@@ -7620,7 +7624,7 @@
</message>
<message>
<source>Switch Configuration</source>
-@@ -885,7 +884,7 @@
+@@ -885,7 +886,7 @@
</message>
<message>
<source>Rotor Low Speed (deg/sec)</source>
@@ -7629,7 +7633,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source>
-@@ -893,7 +892,7 @@
+@@ -893,7 +894,7 @@
</message>
<message>
<source>Rotor High Speed (deg/sec)</source>
@@ -7638,7 +7642,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source>
-@@ -907,7 +906,7 @@
+@@ -907,7 +908,7 @@
<message>
<source>W</source>
<comment>Western Hemisphere</comment>
@@ -7647,22 +7651,25 @@
</message>
<message>
<source>Position Index %1</source>
-@@ -1089,6 +1088,14 @@
[...4581 lines suppressed...]
+- return setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- }
+- else if (m_MediaType == MEDIATYPE_DVD)
+- {
+- // pretend we're NOTMOUNTED so setStatus emits
+- // a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- }
+- else
+- return setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- break;
+- case CDS_AUDIO:
+- VERBOSE(VB_MEDIA, "found an audio disk");
+- m_MediaType = MEDIATYPE_AUDIO;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- break;
+- case CDS_MIXED:
+- m_MediaType = MEDIATYPE_MIXED;
+- VERBOSE(VB_MEDIA, "found a mixed CD");
+- // Note: Mixed mode CDs require an explixit mount call
+- // since we'll usually want the audio portion.
+- // undefine ASSUME_WANT_AUDIO to change this behavior.
+- #ifdef ASSUME_WANT_AUDIO
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- #else
+- mount();
+- if (isMounted(true))
+- {
+- // pretend we're NOTMOUNTED so setStatus
+- // emits a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_MOUNTED,
+- OpenedHere);
+- }
+- else
+- {
+- return setStatus(MEDIASTAT_USEABLE,
+- OpenedHere);
+- }
+- #endif
+- break;
+- case CDS_NO_INFO:
+- case CDS_NO_DISC:
+- if (hasWritableMedia())
+- {
+- VERBOSE(VB_MEDIA, "found a blank or writable disk");
+- return setStatus(MEDIASTAT_UNFORMATTED, OpenedHere);
+- }
+-
+- VERBOSE(VB_MEDIA, "found no disk");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- break;
+- default:
+- VERBOSE(VB_MEDIA, "found unknown disk type: "
+- + QString().setNum(type));
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
+- }
+- else if (m_Status == MEDIASTAT_MOUNTED ||
+- m_Status == MEDIASTAT_NOTMOUNTED)
+- {
+- VERBOSE(VB_MEDIA, QString("Current status == ") +
+- MythMediaDevice::MediaStatusStrings[m_Status]);
+- VERBOSE(VB_MEDIA, "Setting status to not mounted?");
+- if (isMounted(true))
+- setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- else
+- setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- }
+-
+- if (m_AllowEject)
+- ioctl(m_DeviceHandle, CDROM_LOCKDOOR, 0);
+- }// mediaChanged()
+- } // isDeviceOpen();
++ if (m_AllowEject)
++ unlock();
+ else
+- {
+- VERBOSE(VB_MEDIA, "Device not open - returning UNKNOWN");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
++ lock();
+
+ if (OpenedHere)
+ closeDevice();
Index: mythtv/libs/libmythupnp/ssdp.cpp
===================================================================
--- mythtv/libs/libmythupnp/ssdp.cpp (revision 16468)
@@ -38327,6 +40279,28 @@
for (QFileInfoListIterator it(*List); it; ++it)
{
QFileInfo Info(*it.current());
+Index: mythtv/programs/mythbackend/backendutil.cpp
+===================================================================
+--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468)
++++ mythtv/programs/mythbackend/backendutil.cpp (working copy)
+@@ -207,7 +207,7 @@
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 &&
+ (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
+@@ -292,7 +292,7 @@
+ // Sometimes the space reported for an NFS mounted dir is slightly
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
Index: mythtv/programs/mythtv-setup/setup.xml
===================================================================
--- mythtv/programs/mythtv-setup/setup.xml (revision 16468)
@@ -38810,7 +40784,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 18567)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -39314,7 +41288,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 18567)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -39396,7 +41370,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -39458,7 +41432,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169)
@@ -0,0 +1,58 @@
+@Echo off
+::
@@ -39581,42 +41555,6 @@
# make
[ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
[ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
-Index: mythtv/contrib/OSX/osx-packager.pl
-===================================================================
---- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
-+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
-@@ -577,6 +577,7 @@
- 'mythtv'
- => [
- '--prefix=' . $PREFIX,
-+ '--runtime-prefix=../Resources',
- # To "cross compile" something for a lesser Mac:
- #'--tune=G3',
- #'--disable-altivec',
-@@ -1041,6 +1042,13 @@
- if ( $OPT{'verbose'} )
- { push @bundler, '--verbose' }
-
-+### Framework that has a screwed up link dependency path
-+my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
-+ 'Framework/AVCVideoServices.framework';
-+my @AVCfw = split / /, `ls -d $AVCfw`;
-+my $AVCfw = pop @AVCfw;
-+chop $AVCfw;
-+
- ### Create each package.
- ### Note that this is a bit of a waste of disk space,
- ### because there are now multiple copies of each library.
-@@ -1072,6 +1080,9 @@
- # Remove copy of binary
- unlink "$SCRIPTDIR/$target" or die;
-
-+ if ( $AVCfw )
-+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") }
-+
- if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
- {
- my $res = "$finalTarget/Contents/Resources";
Index: mythtv/contrib/channel_changers/6200ch.c
===================================================================
--- mythtv/contrib/channel_changers/6200ch.c (revision 16468)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mythtv.spec 15 Oct 2008 20:23:14 -0000 1.12
+++ mythtv.spec 29 Nov 2008 06:31:16 -0000 1.13
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r18567
+%define _svnver r19169
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 13%{?dist}
+Release: 14%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -45,7 +45,6 @@
Patch100: mythtv-0.21-svnfixes.patch
Patch101: mythtv-0.20-mythstreammenu.diff
#Patch102: mythtv-0.21-fedora-settings.patch
-Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
#
@@ -493,7 +492,6 @@
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
-%patch103 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -549,7 +547,7 @@
cd mythvideo
# Fix /mnt/store -> /var/lib/mythmusic
-perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp
+perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globals.cpp
cd ..
cd mythweb
@@ -1017,6 +1015,10 @@
%endif
%changelog
+* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
+- Update release-0-21-fixes patches (r19169)
+- Should resolve 720p playback stutter, rpmfusion bz#186
+
* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
- Enable fast cmov on x86_64
- Disable mythgame-emulators convenience meta-package, deps not
15 years, 10 months
- 1
- 0
rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.3, 1.4 mythtv-0.21-svnfixes.patch, 1.3, 1.4 mythtv.spec, 1.12, 1.13
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26861
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
- Update release-0-21-fixes patches (r19169)
- Should resolve 720p playback stutter, rpmfusion bz#186
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythplugins-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3
+++ mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:29:50 -0000 1.4
@@ -1,3 +1,18 @@
+Index: mythplugins/mythweb/INSTALL
+===================================================================
+--- mythplugins/mythweb/INSTALL (revision 16468)
++++ mythplugins/mythweb/INSTALL (working copy)
+@@ -195,6 +195,10 @@
+ mod_deflate
+ mod_headers
+
++In Suse 10.3 and above, you'll need to add "rewrite" in the file
++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already
++there.
++
+ =================
+ 5.1 Apache Config
+ =================
Index: mythplugins/mythweb/modules/music/stream.php
===================================================================
--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
@@ -5114,10 +5129,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6009,14 +6020,6 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
-Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6549,10 +6552,6 @@
title = title[:32]
#Create the DVD ISO image
-Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6566,10 +6565,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -7963,14 +7958,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythweather/i18n/mythweather_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythweather/i18n/mythweather_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9286,10 +9273,28 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
-Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
++++ mythplugins/mythgallery/i18n/mythgallery_nb.ts (working copy)
+@@ -35,7 +35,7 @@
+ </message>
+ <message>
+ <source>Import pictures?</source>
+- <translation>Imporere bilder?</translation>
++ <translation>Importere bilder?</translation>
+ </message>
+ <message>
+ <source>No</source>
+@@ -83,7 +83,7 @@
+ </message>
+ <message>
+ <source>Return</source>
+- <translation>Enter</translation>
++ <translation>Tilbake</translation>
+ </message>
+ <message>
+ <source>Clear Marked</source>
Index: mythplugins/mythgallery/i18n/mythgallery_nl.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nl.ts (revision 16468)
@@ -9806,10 +9811,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10059,10 +10060,6 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
-Index: mythplugins/mythflix/i18n/mythflix_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10149,10 +10146,28 @@
</message>
</context>
<context>
-Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
+--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
++++ mythplugins/mythflix/mythflix/netflix-ui.xml (working copy)
+@@ -91,7 +91,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
+@@ -178,7 +178,7 @@
+ </image>
+
+ <image name="background" draworder="0" fleximage="no">
+- <filename>news-info-bg.png</filename>
++ <filename>mythflix_background.png</filename>
+ <position>0,0</position>
+ </image>
+
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10441,10 +10456,6 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10581,14 +10592,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12139,10 +12142,6 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
-Index: mythplugins/mythphone/i18n/mythphone_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -12920,10 +12919,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythgame/i18n/mythgame_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13353,10 +13348,6 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
-Index: mythplugins/mythgame/i18n/mythgame_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14510,14 +14501,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythnews/i18n/mythnews_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythnews/i18n/mythnews_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
@@ -14679,3 +14662,131 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythnews/mythnews/news-sites.xml
+===================================================================
+--- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468)
++++ mythplugins/mythnews/mythnews/news-sites.xml (working copy)
+@@ -725,85 +725,75 @@
+ </item>
+
+ <item>
+- <title>Digital Spy - Broadcasting</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url>
++ <title>Digital Spy - News Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cable</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url>
++ <title>Digital Spy - Entertainment Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Cult</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url>
++ <title>Digital Spy - Media Headlines</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Entertainment Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url>
++ <title>Digital Spy - Digital TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Gaydar</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url>
++ <title>Digital Spy - Broadcasting</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url>
++ <title>Digital Spy - Cult</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Media Headlines</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url>
++ <title>Digital Spy - Gay Spy</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url>
+ </item>
+
+ <item>
+ <title>Digital Spy - Movies</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Programming</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url>
++ <title>Digital Spy - Music</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Radio</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url>
++ <title>Digital Spy - Reality</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Reality TV</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url>
++ <title>Digital Spy - Showbiz</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Satellite</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url>
++ <title>Digital Spy - Soaps</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Showbiz</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url>
+- </item>
+-
+- <item>
+ <title>Digital Spy - Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url>
+ </item>
+
+ <item>
+- <title>Digital Spy - Terrestrial</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url>
++ <title>Digital Spy - US TV</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url>
+ </item>
+
+- <item>
+- <title>Digital Spy - US Television</title>
+- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url>
+- </item>
+-
+ </category>
+
+ <category name="MythTV">
+@@ -986,6 +976,11 @@
+ </item>
+
+ <item>
++ <title>Digital Spy - Odd Section</title>
++ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url>
++ </item>
++
++ <item>
+ <title>Fark</title>
+ <url>http://feeds.feedburner.com/fark</url>
+ <ico>http://www.fark.com/favicon.ico</ico>
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3
+++ mythtv-0.21-svnfixes.patch 29 Nov 2008 06:29:50 -0000 1.4
@@ -7332,15 +7332,19 @@
</message>
</context>
</TS>
-Index: mythtv/i18n/mythfrontend_nb.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythtv/i18n/mythfrontend_de.ts
===================================================================
--- mythtv/i18n/mythfrontend_de.ts (revision 16468)
+++ mythtv/i18n/mythfrontend_de.ts (working copy)
-@@ -66,19 +66,19 @@
+@@ -1,4 +1,6 @@
+-<!DOCTYPE TS><TS>
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE TS><TS version="1.1" language="de">
++<defaultcodec></defaultcodec>
+ <context>
+ <name>@default</name>
+ <message>
+@@ -66,19 +68,19 @@
<name>BackendSelect</name>
<message>
<source>Please select default Myth Backend Server</source>
@@ -7364,7 +7368,7 @@
</message>
</context>
<context>
-@@ -116,11 +116,11 @@
+@@ -116,11 +118,11 @@
</message>
<message>
<source>No, don't</source>
@@ -7378,7 +7382,7 @@
</message>
<message>
<source>Yes, delete capture cards</source>
-@@ -136,7 +136,7 @@
+@@ -136,7 +138,7 @@
</message>
<message>
<source>Unable to delete capturecards for %1</source>
@@ -7387,7 +7391,7 @@
</message>
</context>
<context>
-@@ -171,23 +171,23 @@
+@@ -171,23 +173,23 @@
</message>
<message>
<source>Create Input Group</source>
@@ -7416,7 +7420,7 @@
</message>
</context>
<context>
-@@ -201,7 +201,7 @@
+@@ -201,7 +203,7 @@
<name>ChannelEditor</name>
<message>
<source>Channels</source>
@@ -7425,7 +7429,7 @@
</message>
<message>
<source>Are you sure you would like to delete this channel?</source>
-@@ -245,36 +245,36 @@
+@@ -245,36 +247,36 @@
</message>
<message>
<source>Are you sure you would like to delete ALL channels?</source>
@@ -7473,7 +7477,7 @@
</context>
<context>
<name>ChannelRecPriority</name>
-@@ -435,7 +435,7 @@
+@@ -435,7 +437,7 @@
</message>
<message>
<source>Additional Tables</source>
@@ -7482,7 +7486,7 @@
</message>
<message>
<source>Test</source>
-@@ -447,7 +447,7 @@
+@@ -447,7 +449,7 @@
</message>
<message>
<source>Store</source>
@@ -7491,7 +7495,7 @@
</message>
<message>
<source>Cancel</source>
-@@ -467,35 +467,35 @@
+@@ -467,35 +469,35 @@
</message>
<message>
<source>First showing of each episode</source>
@@ -7526,7 +7530,7 @@
<message>
<source>Only shows marked as widescreen</source>
- <translation type="unfinished"></translation>
-+ <translation>Nur Sendungen in 'widescreen'</translation>
++ <translation>Nur Sendungen im Breitbildformat</translation>
</message>
<message>
<source>Exclude H.264 encoded streams (EIT only)</source>
@@ -7535,7 +7539,7 @@
</message>
</context>
<context>
-@@ -669,11 +669,11 @@
+@@ -669,11 +671,11 @@
<name>DTVSignalMonitor</name>
<message>
<source>Seen</source>
@@ -7549,7 +7553,7 @@
</message>
</context>
<context>
-@@ -712,19 +712,19 @@
+@@ -712,19 +714,19 @@
<name>DVBSignalMonitor</name>
<message>
<source>Signal To Noise</source>
@@ -7573,7 +7577,7 @@
</message>
</context>
<context>
-@@ -788,7 +788,7 @@
+@@ -788,7 +790,7 @@
<name>DeviceTree</name>
<message>
<source>The Cartesian latitude for your location.</source>
@@ -7582,7 +7586,7 @@
</message>
<message>
<source>Use negative numbers for southern and western coordinates.</source>
-@@ -828,8 +828,7 @@
+@@ -828,8 +830,7 @@
</message>
<message>
<source>Select the type of switch from the list.</source>
@@ -7592,7 +7596,7 @@
</message>
<message>
<source>Tone</source>
-@@ -845,15 +844,15 @@
+@@ -845,15 +846,15 @@
</message>
<message>
<source>Legacy SW21</source>
@@ -7611,7 +7615,7 @@
</message>
<message>
<source>Number of ports</source>
-@@ -861,7 +860,7 @@
+@@ -861,7 +862,7 @@
</message>
<message>
<source>The number of ports this switch has.</source>
@@ -7620,7 +7624,7 @@
</message>
<message>
<source>Switch Configuration</source>
-@@ -885,7 +884,7 @@
+@@ -885,7 +886,7 @@
</message>
<message>
<source>Rotor Low Speed (deg/sec)</source>
@@ -7629,7 +7633,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source>
-@@ -893,7 +892,7 @@
+@@ -893,7 +894,7 @@
</message>
<message>
<source>Rotor High Speed (deg/sec)</source>
@@ -7638,7 +7642,7 @@
</message>
<message>
<source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source>
-@@ -907,7 +906,7 @@
+@@ -907,7 +908,7 @@
<message>
<source>W</source>
<comment>Western Hemisphere</comment>
@@ -7647,22 +7651,25 @@
</message>
<message>
<source>Position Index %1</source>
-@@ -1089,6 +1088,14 @@
[...4581 lines suppressed...]
+- return setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- }
+- else if (m_MediaType == MEDIATYPE_DVD)
+- {
+- // pretend we're NOTMOUNTED so setStatus emits
+- // a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- }
+- else
+- return setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- break;
+- case CDS_AUDIO:
+- VERBOSE(VB_MEDIA, "found an audio disk");
+- m_MediaType = MEDIATYPE_AUDIO;
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- break;
+- case CDS_MIXED:
+- m_MediaType = MEDIATYPE_MIXED;
+- VERBOSE(VB_MEDIA, "found a mixed CD");
+- // Note: Mixed mode CDs require an explixit mount call
+- // since we'll usually want the audio portion.
+- // undefine ASSUME_WANT_AUDIO to change this behavior.
+- #ifdef ASSUME_WANT_AUDIO
+- return setStatus(MEDIASTAT_USEABLE, OpenedHere);
+- #else
+- mount();
+- if (isMounted(true))
+- {
+- // pretend we're NOTMOUNTED so setStatus
+- // emits a signal
+- m_Status = MEDIASTAT_NOTMOUNTED;
+- return setStatus(MEDIASTAT_MOUNTED,
+- OpenedHere);
+- }
+- else
+- {
+- return setStatus(MEDIASTAT_USEABLE,
+- OpenedHere);
+- }
+- #endif
+- break;
+- case CDS_NO_INFO:
+- case CDS_NO_DISC:
+- if (hasWritableMedia())
+- {
+- VERBOSE(VB_MEDIA, "found a blank or writable disk");
+- return setStatus(MEDIASTAT_UNFORMATTED, OpenedHere);
+- }
+-
+- VERBOSE(VB_MEDIA, "found no disk");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- break;
+- default:
+- VERBOSE(VB_MEDIA, "found unknown disk type: "
+- + QString().setNum(type));
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
+- }
+- else if (m_Status == MEDIASTAT_MOUNTED ||
+- m_Status == MEDIASTAT_NOTMOUNTED)
+- {
+- VERBOSE(VB_MEDIA, QString("Current status == ") +
+- MythMediaDevice::MediaStatusStrings[m_Status]);
+- VERBOSE(VB_MEDIA, "Setting status to not mounted?");
+- if (isMounted(true))
+- setStatus(MEDIASTAT_MOUNTED, OpenedHere);
+- else
+- setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere);
+- }
+-
+- if (m_AllowEject)
+- ioctl(m_DeviceHandle, CDROM_LOCKDOOR, 0);
+- }// mediaChanged()
+- } // isDeviceOpen();
++ if (m_AllowEject)
++ unlock();
+ else
+- {
+- VERBOSE(VB_MEDIA, "Device not open - returning UNKNOWN");
+- m_MediaType = MEDIATYPE_UNKNOWN;
+- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere);
+- }
++ lock();
+
+ if (OpenedHere)
+ closeDevice();
Index: mythtv/libs/libmythupnp/ssdp.cpp
===================================================================
--- mythtv/libs/libmythupnp/ssdp.cpp (revision 16468)
@@ -38327,6 +40279,28 @@
for (QFileInfoListIterator it(*List); it; ++it)
{
QFileInfo Info(*it.current());
+Index: mythtv/programs/mythbackend/backendutil.cpp
+===================================================================
+--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468)
++++ mythtv/programs/mythbackend/backendutil.cpp (working copy)
+@@ -207,7 +207,7 @@
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 &&
+ (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
+@@ -292,7 +292,7 @@
+ // Sometimes the space reported for an NFS mounted dir is slightly
+ // different than when it is locally mounted because of block sizes
+ if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
+ ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
+ <= maxWriteFiveSec))
+ {
Index: mythtv/programs/mythtv-setup/setup.xml
===================================================================
--- mythtv/programs/mythtv-setup/setup.xml (revision 16468)
@@ -38810,7 +40784,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 18567)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -39314,7 +41288,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 18567)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -39396,7 +41370,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -39458,7 +41432,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18567)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169)
@@ -0,0 +1,58 @@
+@Echo off
+::
@@ -39581,42 +41555,6 @@
# make
[ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
[ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
-Index: mythtv/contrib/OSX/osx-packager.pl
-===================================================================
---- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
-+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
-@@ -577,6 +577,7 @@
- 'mythtv'
- => [
- '--prefix=' . $PREFIX,
-+ '--runtime-prefix=../Resources',
- # To "cross compile" something for a lesser Mac:
- #'--tune=G3',
- #'--disable-altivec',
-@@ -1041,6 +1042,13 @@
- if ( $OPT{'verbose'} )
- { push @bundler, '--verbose' }
-
-+### Framework that has a screwed up link dependency path
-+my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
-+ 'Framework/AVCVideoServices.framework';
-+my @AVCfw = split / /, `ls -d $AVCfw`;
-+my $AVCfw = pop @AVCfw;
-+chop $AVCfw;
-+
- ### Create each package.
- ### Note that this is a bit of a waste of disk space,
- ### because there are now multiple copies of each library.
-@@ -1072,6 +1080,9 @@
- # Remove copy of binary
- unlink "$SCRIPTDIR/$target" or die;
-
-+ if ( $AVCfw )
-+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") }
-+
- if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
- {
- my $res = "$finalTarget/Contents/Resources";
Index: mythtv/contrib/channel_changers/6200ch.c
===================================================================
--- mythtv/contrib/channel_changers/6200ch.c (revision 16468)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mythtv.spec 15 Oct 2008 20:23:14 -0000 1.12
+++ mythtv.spec 29 Nov 2008 06:29:50 -0000 1.13
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r18567
+%define _svnver r19169
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 13%{?dist}
+Release: 14%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -45,7 +45,6 @@
Patch100: mythtv-0.21-svnfixes.patch
Patch101: mythtv-0.20-mythstreammenu.diff
#Patch102: mythtv-0.21-fedora-settings.patch
-Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
#
@@ -493,7 +492,6 @@
%patch100 -p1 -b .svnfixes
#patch101 -p0 -b .mythstreammenu
#patch102 -p1 -b .settings
-%patch103 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -549,7 +547,7 @@
cd mythvideo
# Fix /mnt/store -> /var/lib/mythmusic
-perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp
+perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globals.cpp
cd ..
cd mythweb
@@ -1017,6 +1015,10 @@
%endif
%changelog
+* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
+- Update release-0-21-fixes patches (r19169)
+- Should resolve 720p playback stutter, rpmfusion bz#186
+
* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
- Enable fast cmov on x86_64
- Disable mythgame-emulators convenience meta-package, deps not
15 years, 10 months
- 1
- 0
rpms/vdr-mp3/devel vdr-mp3.spec,1.3,1.4
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/vdr-mp3/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5304
Modified Files:
vdr-mp3.spec
Log Message:
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-7
- fixed another tiny error :)
Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/devel/vdr-mp3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-mp3.spec 28 Nov 2008 12:01:12 -0000 1.3
+++ vdr-mp3.spec 28 Nov 2008 12:54:30 -0000 1.4
@@ -14,7 +14,7 @@
Name: vdr-mp3
Version: 0.10.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Sound playback plugin for VDR
Group: Applications/Multimedia
@@ -107,7 +107,7 @@
# MP3 files
install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{configdir}/plugins
+install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{configdir}/plugins/mp3sources.conf
install -pm 755 examples/image_convert.sh.example \
$RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
@@ -184,6 +184,9 @@
%changelog
+* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-7
+- fixed another tiny error :)
+
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-6
- fixed small error
15 years, 10 months
- 1
- 0
rpms/vdr-mp3/devel vdr-mp3.spec,1.2,1.3
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/vdr-mp3/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1912
Modified Files:
vdr-mp3.spec
Log Message:
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-6
- fixed small error
Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/devel/vdr-mp3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-mp3.spec 27 Nov 2008 23:21:47 -0000 1.2
+++ vdr-mp3.spec 28 Nov 2008 12:01:12 -0000 1.3
@@ -14,7 +14,7 @@
Name: vdr-mp3
Version: 0.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Sound playback plugin for VDR
Group: Applications/Multimedia
@@ -26,6 +26,7 @@
Source3: %{name}-mp3.conf
Source4: %{name}-mplayer.conf
Source5: %{name}-mplayer-minimal.sh
+Source6: %{name}-mp3sources.conf
Patch0: %{name}-mplayer.sh-0.8.7-lircrc.patch
Patch1: %{name}-mplayer.sh-framedrop.patch
Patch2: %{name}-mplayer.sh-identify.patch
@@ -106,7 +107,7 @@
# MP3 files
install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 vdr-mp3-mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
+install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 examples/image_convert.sh.example \
$RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
@@ -183,6 +184,9 @@
%changelog
+* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-6
+- fixed small error
+
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-5
- removed all references to audiodir since it's not used by vdr core
15 years, 10 months
- 1
- 0
rpms/vdr-mp3/devel vdr-mp3-mp3sources.conf, NONE, 1.1 vdr-mp3.spec, 1.1, 1.2
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/vdr-mp3/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27896
Modified Files:
vdr-mp3.spec
Added Files:
vdr-mp3-mp3sources.conf
Log Message:
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-5
- removed all references to audiodir since it's not used by vdr core
--- NEW FILE vdr-mp3-mp3sources.conf ---
#
# Syntax is: <path>;<name>;<mount>
#
# <path> = Path, where to finde mp3s or music directories
# <name> = descriptor displayed in VDR
# <mount> = 0 - if no mounting should be done
# 1 - if <path> needs to be mounted first.
# (Dont forget to setup fstab !!!)
# <filter> = filters, what files should be displayed.
# i.e. *.wav
#
# Sample: /mp3;Local mp3;0
Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/devel/vdr-mp3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-mp3.spec 4 Aug 2008 18:46:44 -0000 1.1
+++ vdr-mp3.spec 27 Nov 2008 23:21:47 -0000 1.2
@@ -6,7 +6,6 @@
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
-%define audiodir %(vdr-config --audiodir 2>/dev/null || echo ERROR)
%define datadir %(vdr-config --datadir 2>/dev/null || echo ERROR)
%define cachedir %(vdr-config --cachedir 2>/dev/null || echo ERROR)
%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR)
@@ -15,7 +14,7 @@
Name: vdr-mp3
Version: 0.10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Sound playback plugin for VDR
Group: Applications/Multimedia
@@ -88,7 +87,6 @@
%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \
libvdr-mp3.so libvdr-mplayer.so
-echo "%{audiodir};Local hard drive;0" > mp3sources.conf
echo "%{datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
@@ -108,7 +106,7 @@
# MP3 files
install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
+install -pm 644 vdr-mp3-mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 examples/image_convert.sh.example \
$RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
@@ -141,9 +139,6 @@
%{plugindir}/bin/mediasources.sh \
>> %{configdir}/plugins/mp3sources.conf || :
else
- if ! grep %{audiodir} %{configdir}/plugins/mp3sources.conf &>/dev/null ; then
- echo "%{audiodir}" >> %{configdir}/plugins/mp3sources.conf || :
- fi
r=global.mplayer.resume
if [ -f %{videodir}/$r -a ! -f %{vardir}/$r ] ; then
mv %{videodir}/$r %{vardir}/$r
@@ -188,6 +183,9 @@
%changelog
+* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-5
+- removed all references to audiodir since it's not used by vdr core
+
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.10.1-4
- rebuild
15 years, 10 months
- 1
- 0
rpms/vdrsync/devel vdrsync.spec,1.1,1.2
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/vdrsync/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26700
Modified Files:
vdrsync.spec
Log Message:
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.3-10.PRE1.050322
- renamed dvd-menu to vdrsync-dvd-menu due to conflict with dvd-slideshow
Index: vdrsync.spec
===================================================================
RCS file: /cvs/free/rpms/vdrsync/devel/vdrsync.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdrsync.spec 4 Aug 2008 18:55:50 -0000 1.1
+++ vdrsync.spec 27 Nov 2008 23:02:48 -0000 1.2
@@ -1,6 +1,6 @@
Name: vdrsync
Version: 0.1.3
-Release: 9.PRE1.050322%{?dist}
+Release: 10.PRE1.050322%{?dist}
Summary: Recording demultiplexer for VDR
Group: Applications/Multimedia
@@ -36,8 +36,10 @@
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
rename .pl "" *.pl
+mv dvd-menu vdrsync-dvd-menu
%{__perl} -pi -e "s/tcmplex_panteltje/'tcmplex-panteltje'/g" vdrsync
-%{__perl} -pi -e 's/(vdrsync(_buffer)?|dvd-menu)\.pl/$1/g' *
+%{__perl} -pi -e 's/(vdrsync(_buffer)?)\.pl/$1/g' *
+%{__perl} -pi -e 's/dvd-menu\.pl/vdrsync-dvd-menu/g' *
%{__perl} -pi -e 's|vdrsync_buffer|%{_datadir}/vdrsync/vdrsync_buffer|' \
vdrsync
%{__perl} -pi -e 's|/usr/X11R6/lib/X11/fonts/truetype/arial.ttf|%{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf| ; s/arial.ttf/DejaVuLGCSans.ttf/' *dvd-menu*
@@ -49,7 +51,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 vdrsync dvd-menu $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 vdrsync vdrsync-dvd-menu $RPM_BUILD_ROOT%{_bindir}
install -Dpm 755 vdrsync_buffer \
$RPM_BUILD_ROOT%{_datadir}/vdrsync/vdrsync_buffer
@@ -63,11 +65,14 @@
%doc BUGS CHANGES COPYING MANUAL README* TODO
%lang(de) %doc MANUAL-DE
%{_bindir}/vdrsync
-%{_bindir}/dvd-menu
+%{_bindir}/vdrsync-dvd-menu
%{_datadir}/vdrsync/
%changelog
+* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.3-10.PRE1.050322
+- renamed dvd-menu to vdrsync-dvd-menu due to conflict with dvd-slideshow
+
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.3-9.PRE1.050322
- rebuild
15 years, 10 months
- 1
- 0