March 2011 - rpmfusion-commits

rpms/mame/devel .cvsignore, 1.22, 1.23 mame.spec, 1.27, 1.28 sources, 1.22, 1.23

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28680 Modified Files: .cvsignore mame.spec sources Log Message: * Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1 - Updated to 0.141u4 - Re-enabled ldplayer - Added support for hash files - Sorted the %install section alphabetically Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 28 Feb 2011 21:32:37 -0000 1.22 +++ .cvsignore 26 Mar 2011 09:10:34 -0000 1.23 @@ -2,3 +2,4 @@ 0141u1_diff.zip 0141u2_diff.zip 0141u3_diff.zip +0141u4_diff.zip Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mame.spec 28 Feb 2011 21:54:04 -0000 1.27 +++ mame.spec 26 Mar 2011 09:10:34 -0000 1.28 @@ -1,11 +1,11 @@ # ldplayer can be disabled by --without ldplayer or by changing to %bcond_with # if it does not build. The debug build is disabled by default, please use # --with debug to override -%bcond_with ldplayer +%bcond_without ldplayer %bcond_with debug %global baseversion 141 -%global sourceupdate 3 +%global sourceupdate 4 Name: mame %if 0%{?sourceupdate} @@ -26,7 +26,7 @@ Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip -#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip +Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip %endif Patch0: %{name}-fortify.patch Patch2: %{name}-verbosebuild.patch @@ -104,11 +104,12 @@ cat > %{name}.ini << EOF # Define multi-user paths artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects +cheatpath %{_datadir}/%{name}/cheats ctrlrpath %{_datadir}/%{name}/ctrlr fontpath %{_datadir}/%{name}/fonts +hashpath %{_datadir}/%{name}/hash rompath %{_datadir}/%{name}/roms;%{_datadir}/%{name}/chds samplepath %{_datadir}/%{name}/samples -cheatpath %{_datadir}/%{name}/cheats # Allow user to override ini settings inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name} @@ -150,17 +151,6 @@ rm -rf $RPM_BUILD_ROOT # create directories -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats -install -d $RPM_BUILD_ROOT%{_mandir}/man1 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments @@ -171,10 +161,21 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta +install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples +install -d $RPM_BUILD_ROOT%{_mandir}/man1 -# install binaries and config files +# install files install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps %if %{with ldplayer} install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir} %endif @@ -190,6 +191,8 @@ do install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool done +install -pm 644 megatech.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps pushd src/osd/sdl/man %if %{with ldplayer} install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1 @@ -208,6 +211,7 @@ %doc docs/* whatsnew*.txt %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini %dir %{_sysconfdir}/%{name} +%{_sysconfdir}/skel/.%{name} %if %{with debug} %{_bindir}/%{name}d %else @@ -215,7 +219,6 @@ %endif %{_datadir}/%{name} %{_mandir}/man1/mame.1* -%{_sysconfdir}/skel/.%{name} %files tools %defattr(-,root,root,-) @@ -246,6 +249,12 @@ %changelog +* Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1 +- Updated to 0.141u4 +- Re-enabled ldplayer +- Added support for hash files +- Sorted the %%install section alphabetically + * Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 - Updated to 0.141u3 - Filtered out redundant $RPM_OPT_FLAGS Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 28 Feb 2011 21:32:37 -0000 1.22 +++ sources 26 Mar 2011 09:10:34 -0000 1.23 @@ -2,3 +2,4 @@ b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip 66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip 84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip +420c905816e962c8294f03bd7cd02eae 0141u4_diff.zip

13 years

1
0
0 / 0

rpms/mythtv-themes/devel myththemes-0.24-fixes.patch, 1.1, 1.2 mythtv-themes.spec, 1.29, 1.30

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12634 Modified Files: myththemes-0.24-fixes.patch mythtv-themes.spec Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 - Update to 0.24 fixes, git revision 931028f491 myththemes-0.24-fixes.patch: .gitignore | 5 +++++ Arclight/status-ui.xml | 2 +- Mythbuntu/base.xml | 41 +++++++++++++++++++++-------------------- Mythbuntu/config-ui.xml | 6 +++--- metallurgy/menu-ui.xml | 25 +++++++++++++++++++++++++ metallurgy/osd.xml | 14 +++++++------- metallurgy/themeinfo.xml | 2 +- 7 files changed, 63 insertions(+), 32 deletions(-) Index: myththemes-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/devel/myththemes-0.24-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- myththemes-0.24-fixes.patch 21 Mar 2011 00:10:38 -0000 1.1 +++ myththemes-0.24-fixes.patch 25 Mar 2011 14:18:46 -0000 1.2 @@ -1,6 +1,27 @@ +diff -Naurp myththemes-0.24.orig/Arclight/status-ui.xml myththemes-0.24.fixes/Arclight/status-ui.xml +--- myththemes-0.24.orig/Arclight/status-ui.xml 2010-09-23 05:47:16.000000000 -0400 ++++ myththemes-0.24.fixes/Arclight/status-ui.xml 2011-03-01 23:53:44.000000000 -0500 +@@ -65,7 +65,7 @@ + </textarea> + + <buttonlist name="category" from="baseshapebuttonlist"> +- <area>0,669,100%,360</area> ++ <position>0,669</position> + <spacing>0</spacing> + <scrollstyle>free</scrollstyle> + <wrapstyle>items</wrapstyle> +diff -Naurp myththemes-0.24.orig/.gitignore myththemes-0.24.fixes/.gitignore +--- myththemes-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500 ++++ myththemes-0.24.fixes/.gitignore 2011-03-01 23:53:44.000000000 -0500 +@@ -0,0 +1,5 @@ ++Makefile ++dummy.o ++mythconfig.mak ++myththemes ++ diff -Naurp myththemes-0.24.orig/metallurgy/menu-ui.xml myththemes-0.24.fixes/metallurgy/menu-ui.xml --- myththemes-0.24.orig/metallurgy/menu-ui.xml 2010-10-12 15:44:18.000000000 -0400 -+++ myththemes-0.24.fixes/metallurgy/menu-ui.xml 2010-12-01 09:23:53.000000000 -0500 ++++ myththemes-0.24.fixes/metallurgy/menu-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -135,6 +135,31 @@ <value>Search Lists</value> </textarea> @@ -35,7 +56,7 @@ <buttonlist name="menu"> diff -Naurp myththemes-0.24.orig/metallurgy/osd.xml myththemes-0.24.fixes/metallurgy/osd.xml --- myththemes-0.24.orig/metallurgy/osd.xml 2010-11-04 09:54:31.000000000 -0400 -+++ myththemes-0.24.fixes/metallurgy/osd.xml 2010-12-01 09:23:53.000000000 -0500 ++++ myththemes-0.24.fixes/metallurgy/osd.xml 2011-03-01 23:53:44.000000000 -0500 @@ -65,40 +65,40 @@ <area>0,480,1280,240</area> @@ -86,7 +107,7 @@ </textarea> diff -Naurp myththemes-0.24.orig/metallurgy/themeinfo.xml myththemes-0.24.fixes/metallurgy/themeinfo.xml --- myththemes-0.24.orig/metallurgy/themeinfo.xml 2010-08-28 16:16:22.000000000 -0400 -+++ myththemes-0.24.fixes/metallurgy/themeinfo.xml 2010-12-01 09:23:53.000000000 -0500 ++++ myththemes-0.24.fixes/metallurgy/themeinfo.xml 2011-03-01 23:53:44.000000000 -0500 @@ -17,7 +17,7 @@ <version> @@ -96,3 +117,101 @@ </version> <detail> +diff -Naurp myththemes-0.24.orig/Mythbuntu/base.xml myththemes-0.24.fixes/Mythbuntu/base.xml +--- myththemes-0.24.orig/Mythbuntu/base.xml 2010-10-06 21:34:10.000000000 -0400 ++++ myththemes-0.24.fixes/Mythbuntu/base.xml 2011-03-01 23:53:44.000000000 -0500 +@@ -123,22 +123,23 @@ + <spacing>5</spacing> + <buttonarea>0,0,100%,97%</buttonarea> + <statetype name="buttonitem"> ++ <area>0,0,100%,30</area> + <state name="active"> + <area>0,0,100%,30</area> +- <shape name="buttonbackground"> +- <type>roundbox</type> +- <area>0,0,99%,30</area> +- <fill color="#666666" alpha="50" /> +- <cornerradius>15</cornerradius> +- </shape> ++ <shape name="buttonbackground"> ++ <type>roundbox</type> ++ <area>0,0,100%,30</area> ++ <fill color="#666666" alpha="50" /> ++ <cornerradius>15</cornerradius> ++ </shape> + <textarea name="buttontext"> +- <area>16,0,85%,31</area> ++ <area>16,0,94%,31</area> + <font>basesmallgrey</font> + <cutdown>yes</cutdown> + <align>left,vcenter</align> + </textarea> + <statetype name="buttoncheck"> +- <position>91%,5</position> ++ <position>94%,5</position> + <state type="off"> + <imagetype name="checkoff"> + <filename>shared/lb-check-empty.png</filename> +@@ -161,23 +162,23 @@ + </imagetype> + </state> + <state name="selectedactive" from="active"> +- <shape name="buttonbackground"> +- <type>roundbox</type> +- <area>0,0,99%,30</area> +- <fill color="#ffffff" alpha="50" /> +- <cornerradius>15</cornerradius> +- </shape> ++ <shape name="buttonbackground"> ++ <type>roundbox</type> ++ <area>0,0,100%,30</area> ++ <fill color="#ffffff" alpha="50" /> ++ <cornerradius>15</cornerradius> ++ </shape> + <textarea name="buttontext"> + <font>basesmall</font> + </textarea> + </state> + <state name="selectedinactive" from="active"> +- <shape name="buttonbackground"> +- <type>roundbox</type> +- <area>0,0,99%,30</area> +- <fill color="#ffffff" alpha="50" /> +- <cornerradius>15</cornerradius> +- </shape> ++ <shape name="buttonbackground"> ++ <type>roundbox</type> ++ <area>0,0,100%,30</area> ++ <fill color="#ffffff" alpha="50" /> ++ <cornerradius>15</cornerradius> ++ </shape> + <textarea name="buttontext"> + <font>basesmallgrey</font> + </textarea> +diff -Naurp myththemes-0.24.orig/Mythbuntu/config-ui.xml myththemes-0.24.fixes/Mythbuntu/config-ui.xml +--- myththemes-0.24.orig/Mythbuntu/config-ui.xml 2010-08-28 16:16:22.000000000 -0400 ++++ myththemes-0.24.fixes/Mythbuntu/config-ui.xml 2011-03-01 23:53:44.000000000 -0500 +@@ -70,7 +70,7 @@ + </buttonlist> + + <button name="delete" from="basebutton"> +- <position>620,472</position> ++ <position>750,472</position> + <value>Delete</value> + </button> + +@@ -89,12 +89,12 @@ + </button> + + <button name="importicons" from="basewidebutton"> +- <position>325,585</position> ++ <position>375,585</position> + <value>Icon Download</value> + </button> + + <button name="edittransport" from="basewidebutton"> +- <position>585,585</position> ++ <position>700,585</position> + <value>Edit Transports</value> + </button> + Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mythtv-themes.spec 21 Mar 2011 00:10:39 -0000 1.29 +++ mythtv-themes.spec 25 Mar 2011 14:18:46 -0000 1.30 @@ -18,7 +18,7 @@ # Git revision and branch ID # 0.24 release: git tag b0.24 -%define _gitrev 945c67317 +%define _gitrev 931028f491 %define branch fixes/0.24 # @@ -36,7 +36,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif ################################################################################ @@ -123,6 +123,9 @@ %{_datadir}/fonts/%{name}/*.otf %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 +- Update to 0.24 fixes, git revision 931028f491 + * Sun Jan 16 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-2 - Update to 0.24 fixes, git revision 945c67317

13 years

1
0
0 / 0

rpms/mythtv-themes/F-14 myththemes-0.24-fixes.patch, NONE, 1.1 mythtv-themes.spec, 1.30, 1.31 myththemes-0.24-svnfixes.patch, 1.1, NONE

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv22112 Modified Files: mythtv-themes.spec Added Files: myththemes-0.24-fixes.patch Removed Files: myththemes-0.24-svnfixes.patch Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 - Update to 0.24 fixes, git revision 931028f491 myththemes-0.24-fixes.patch: .gitignore | 5 +++++ Arclight/status-ui.xml | 2 +- Mythbuntu/base.xml | 41 +++++++++++++++++++++-------------------- Mythbuntu/config-ui.xml | 6 +++--- metallurgy/menu-ui.xml | 25 +++++++++++++++++++++++++ metallurgy/osd.xml | 14 +++++++------- metallurgy/themeinfo.xml | 2 +- 7 files changed, 63 insertions(+), 32 deletions(-) --- NEW FILE myththemes-0.24-fixes.patch --- diff -Naurp myththemes-0.24.orig/Arclight/status-ui.xml myththemes-0.24.fixes/Arclight/status-ui.xml --- myththemes-0.24.orig/Arclight/status-ui.xml 2010-09-23 05:47:16.000000000 -0400 +++ myththemes-0.24.fixes/Arclight/status-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -65,7 +65,7 @@ </textarea> <buttonlist name="category" from="baseshapebuttonlist"> - <area>0,669,100%,360</area> + <position>0,669</position> <spacing>0</spacing> <scrollstyle>free</scrollstyle> <wrapstyle>items</wrapstyle> diff -Naurp myththemes-0.24.orig/.gitignore myththemes-0.24.fixes/.gitignore --- myththemes-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500 +++ myththemes-0.24.fixes/.gitignore 2011-03-01 23:53:44.000000000 -0500 @@ -0,0 +1,5 @@ +Makefile +dummy.o +mythconfig.mak +myththemes + diff -Naurp myththemes-0.24.orig/metallurgy/menu-ui.xml myththemes-0.24.fixes/metallurgy/menu-ui.xml --- myththemes-0.24.orig/metallurgy/menu-ui.xml 2010-10-12 15:44:18.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/menu-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -135,6 +135,31 @@ <value>Search Lists</value> </textarea> </state> + <state name="TV"> + <textarea name="title" from="baseheading"> + <value>TV</value> + </textarea> + </state> + <state name="VIDEO"> + <textarea name="title" from="baseheading"> + <value>Videos</value> + </textarea> + </state> + <state name="NETVISION"> + <textarea name="title" from="baseheading"> + <value>Internet Video</value> + </textarea> + </state> + <state name="ARCHIVEUTILS"> + <textarea name="title" from="baseheading"> + <value>Archive Utilities</value> + </textarea> + </state> + <state name="SETUP_TVRECPRIORITIES"> + <textarea name="title" from="baseheading"> + <value>Recording Priorities</value> + </textarea> + </state> </statetype> <buttonlist name="menu"> diff -Naurp myththemes-0.24.orig/metallurgy/osd.xml myththemes-0.24.fixes/metallurgy/osd.xml --- myththemes-0.24.orig/metallurgy/osd.xml 2010-11-04 09:54:31.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/osd.xml 2011-03-01 23:53:44.000000000 -0500 @@ -65,40 +65,40 @@ <area>0,480,1280,240</area> <imagetype name="background"> - <area>0,480,1280,240</area> + <area>0,0,1280,240</area> <filename>osd/background.png</filename> </imagetype> <textarea name="title"> - <area>185,510,830,38</area> + <area>185,30,830,38</area> <font>extralarge</font> </textarea> <textarea name="description"> <multiline>yes</multiline> - <area>185,585,1054,130</area> + <area>185,105,1054,130</area> <font>medium</font> <template>%"|SUBTITLE|" %%DESCRIPTION%</template> </textarea> <textarea name="starttime"> - <area>185,551,880,25</area> + <area>185,71,880,25</area> <font>smallgrey</font> <template>(%STARTTIME% - %ENDTIME%) %LENMINS%</template> </textarea> <imagetype name="channelicon"> - <area>46,520,120,90</area> + <area>46,40,120,90</area> </imagetype> <textarea name="time"> - <area>1034,510,200,40</area> + <area>1034,30,200,40</area> <font>medium</font> <align>right</align> </textarea> <textarea name="channum"> - <area>46,635,120,30</area> + <area>46,155,120,30</area> <font>extralarge</font> <align>hcenter</align> </textarea> diff -Naurp myththemes-0.24.orig/metallurgy/themeinfo.xml myththemes-0.24.fixes/metallurgy/themeinfo.xml --- myththemes-0.24.orig/metallurgy/themeinfo.xml 2010-08-28 16:16:22.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/themeinfo.xml 2011-03-01 23:53:44.000000000 -0500 @@ -17,7 +17,7 @@ <version> <major>1</major> - <minor>1</minor> + <minor>2</minor> </version> <detail> diff -Naurp myththemes-0.24.orig/Mythbuntu/base.xml myththemes-0.24.fixes/Mythbuntu/base.xml --- myththemes-0.24.orig/Mythbuntu/base.xml 2010-10-06 21:34:10.000000000 -0400 +++ myththemes-0.24.fixes/Mythbuntu/base.xml 2011-03-01 23:53:44.000000000 -0500 @@ -123,22 +123,23 @@ <spacing>5</spacing> <buttonarea>0,0,100%,97%</buttonarea> <statetype name="buttonitem"> + <area>0,0,100%,30</area> <state name="active"> <area>0,0,100%,30</area> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#666666" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#666666" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> - <area>16,0,85%,31</area> + <area>16,0,94%,31</area> <font>basesmallgrey</font> <cutdown>yes</cutdown> <align>left,vcenter</align> </textarea> <statetype name="buttoncheck"> - <position>91%,5</position> + <position>94%,5</position> <state type="off"> <imagetype name="checkoff"> <filename>shared/lb-check-empty.png</filename> @@ -161,23 +162,23 @@ </imagetype> </state> <state name="selectedactive" from="active"> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#ffffff" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#ffffff" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> <font>basesmall</font> </textarea> </state> <state name="selectedinactive" from="active"> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#ffffff" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#ffffff" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> <font>basesmallgrey</font> </textarea> diff -Naurp myththemes-0.24.orig/Mythbuntu/config-ui.xml myththemes-0.24.fixes/Mythbuntu/config-ui.xml --- myththemes-0.24.orig/Mythbuntu/config-ui.xml 2010-08-28 16:16:22.000000000 -0400 +++ myththemes-0.24.fixes/Mythbuntu/config-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -70,7 +70,7 @@ </buttonlist> <button name="delete" from="basebutton"> - <position>620,472</position> + <position>750,472</position> <value>Delete</value> </button> @@ -89,12 +89,12 @@ </button> <button name="importicons" from="basewidebutton"> - <position>325,585</position> + <position>375,585</position> <value>Icon Download</value> </button> <button name="edittransport" from="basewidebutton"> - <position>585,585</position> + <position>700,585</position> <value>Edit Transports</value> </button> Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-14/mythtv-themes.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mythtv-themes.spec 19 Nov 2010 01:45:28 -0000 1.30 +++ mythtv-themes.spec 25 Mar 2011 03:58:34 -0000 1.31 @@ -16,10 +16,10 @@ # The vendor name we should attribute the aforementioned entries to %define desktop_vendor RPMFusion -# SVN Revision number and branch ID -# 0.24 release: r27163 -%define _svnrev r27286 -%define branch release-0-24-fixes +# Git revision and branch ID +# 0.24 release: git tag b0.24 +%define _gitrev 931028f491 +%define branch fixes/0.24 # # Basic descriptive tags for this package: @@ -32,11 +32,11 @@ # Version/Release info Version: 0.24 -%if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.2.rc1%{?dist} +%if "%{branch}" == "master" +Release: 0.1.git.%{_gitrev}%{?dist} +#Release: 0.1.rc1%{?dist} %else -Release: 1%{?dist} +Release: 3%{?dist} %endif ################################################################################ @@ -47,8 +47,8 @@ Source0: ftp://ftp.osuosl.org/pub/mythtv/myththemes-%{version}.tar.bz2 # Robert Siebert's user-contributed theme, included at his (and users') request Source1: ftp://miroku.no-ip.com/blue-abstract-wide.2010.07.15.tar.bz2 -# svnfixes branch patch -Patch0: myththemes-0.24-svnfixes.patch +# fixes/0.24 branch patch +Patch0: myththemes-0.24-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -123,6 +123,12 @@ %{_datadir}/fonts/%{name}/*.otf %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 +- Update to 0.24 fixes, git revision 931028f491 + +* Sun Jan 16 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-2 +- Update to 0.24 fixes, git revision 945c67317 + * Thu Nov 18 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-1 - Update to release 0.24 + svn fixes branch up to revision 27286 --- myththemes-0.24-svnfixes.patch DELETED ---

13 years

1
0
0 / 0

rpms/mythtv-themes/F-13 myththemes-0.24-fixes.patch, NONE, 1.1 mythtv-themes.spec, 1.38, 1.39 myththemes-0.24-svnfixes.patch, 1.1, NONE

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21902 Modified Files: mythtv-themes.spec Added Files: myththemes-0.24-fixes.patch Removed Files: myththemes-0.24-svnfixes.patch Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 - Update to 0.24 fixes, git revision 931028f491 myththemes-0.24-fixes.patch: .gitignore | 5 +++++ Arclight/status-ui.xml | 2 +- Mythbuntu/base.xml | 41 +++++++++++++++++++++-------------------- Mythbuntu/config-ui.xml | 6 +++--- metallurgy/menu-ui.xml | 25 +++++++++++++++++++++++++ metallurgy/osd.xml | 14 +++++++------- metallurgy/themeinfo.xml | 2 +- 7 files changed, 63 insertions(+), 32 deletions(-) --- NEW FILE myththemes-0.24-fixes.patch --- diff -Naurp myththemes-0.24.orig/Arclight/status-ui.xml myththemes-0.24.fixes/Arclight/status-ui.xml --- myththemes-0.24.orig/Arclight/status-ui.xml 2010-09-23 05:47:16.000000000 -0400 +++ myththemes-0.24.fixes/Arclight/status-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -65,7 +65,7 @@ </textarea> <buttonlist name="category" from="baseshapebuttonlist"> - <area>0,669,100%,360</area> + <position>0,669</position> <spacing>0</spacing> <scrollstyle>free</scrollstyle> <wrapstyle>items</wrapstyle> diff -Naurp myththemes-0.24.orig/.gitignore myththemes-0.24.fixes/.gitignore --- myththemes-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500 +++ myththemes-0.24.fixes/.gitignore 2011-03-01 23:53:44.000000000 -0500 @@ -0,0 +1,5 @@ +Makefile +dummy.o +mythconfig.mak +myththemes + diff -Naurp myththemes-0.24.orig/metallurgy/menu-ui.xml myththemes-0.24.fixes/metallurgy/menu-ui.xml --- myththemes-0.24.orig/metallurgy/menu-ui.xml 2010-10-12 15:44:18.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/menu-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -135,6 +135,31 @@ <value>Search Lists</value> </textarea> </state> + <state name="TV"> + <textarea name="title" from="baseheading"> + <value>TV</value> + </textarea> + </state> + <state name="VIDEO"> + <textarea name="title" from="baseheading"> + <value>Videos</value> + </textarea> + </state> + <state name="NETVISION"> + <textarea name="title" from="baseheading"> + <value>Internet Video</value> + </textarea> + </state> + <state name="ARCHIVEUTILS"> + <textarea name="title" from="baseheading"> + <value>Archive Utilities</value> + </textarea> + </state> + <state name="SETUP_TVRECPRIORITIES"> + <textarea name="title" from="baseheading"> + <value>Recording Priorities</value> + </textarea> + </state> </statetype> <buttonlist name="menu"> diff -Naurp myththemes-0.24.orig/metallurgy/osd.xml myththemes-0.24.fixes/metallurgy/osd.xml --- myththemes-0.24.orig/metallurgy/osd.xml 2010-11-04 09:54:31.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/osd.xml 2011-03-01 23:53:44.000000000 -0500 @@ -65,40 +65,40 @@ <area>0,480,1280,240</area> <imagetype name="background"> - <area>0,480,1280,240</area> + <area>0,0,1280,240</area> <filename>osd/background.png</filename> </imagetype> <textarea name="title"> - <area>185,510,830,38</area> + <area>185,30,830,38</area> <font>extralarge</font> </textarea> <textarea name="description"> <multiline>yes</multiline> - <area>185,585,1054,130</area> + <area>185,105,1054,130</area> <font>medium</font> <template>%"|SUBTITLE|" %%DESCRIPTION%</template> </textarea> <textarea name="starttime"> - <area>185,551,880,25</area> + <area>185,71,880,25</area> <font>smallgrey</font> <template>(%STARTTIME% - %ENDTIME%) %LENMINS%</template> </textarea> <imagetype name="channelicon"> - <area>46,520,120,90</area> + <area>46,40,120,90</area> </imagetype> <textarea name="time"> - <area>1034,510,200,40</area> + <area>1034,30,200,40</area> <font>medium</font> <align>right</align> </textarea> <textarea name="channum"> - <area>46,635,120,30</area> + <area>46,155,120,30</area> <font>extralarge</font> <align>hcenter</align> </textarea> diff -Naurp myththemes-0.24.orig/metallurgy/themeinfo.xml myththemes-0.24.fixes/metallurgy/themeinfo.xml --- myththemes-0.24.orig/metallurgy/themeinfo.xml 2010-08-28 16:16:22.000000000 -0400 +++ myththemes-0.24.fixes/metallurgy/themeinfo.xml 2011-03-01 23:53:44.000000000 -0500 @@ -17,7 +17,7 @@ <version> <major>1</major> - <minor>1</minor> + <minor>2</minor> </version> <detail> diff -Naurp myththemes-0.24.orig/Mythbuntu/base.xml myththemes-0.24.fixes/Mythbuntu/base.xml --- myththemes-0.24.orig/Mythbuntu/base.xml 2010-10-06 21:34:10.000000000 -0400 +++ myththemes-0.24.fixes/Mythbuntu/base.xml 2011-03-01 23:53:44.000000000 -0500 @@ -123,22 +123,23 @@ <spacing>5</spacing> <buttonarea>0,0,100%,97%</buttonarea> <statetype name="buttonitem"> + <area>0,0,100%,30</area> <state name="active"> <area>0,0,100%,30</area> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#666666" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#666666" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> - <area>16,0,85%,31</area> + <area>16,0,94%,31</area> <font>basesmallgrey</font> <cutdown>yes</cutdown> <align>left,vcenter</align> </textarea> <statetype name="buttoncheck"> - <position>91%,5</position> + <position>94%,5</position> <state type="off"> <imagetype name="checkoff"> <filename>shared/lb-check-empty.png</filename> @@ -161,23 +162,23 @@ </imagetype> </state> <state name="selectedactive" from="active"> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#ffffff" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#ffffff" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> <font>basesmall</font> </textarea> </state> <state name="selectedinactive" from="active"> - <shape name="buttonbackground"> - <type>roundbox</type> - <area>0,0,99%,30</area> - <fill color="#ffffff" alpha="50" /> - <cornerradius>15</cornerradius> - </shape> + <shape name="buttonbackground"> + <type>roundbox</type> + <area>0,0,100%,30</area> + <fill color="#ffffff" alpha="50" /> + <cornerradius>15</cornerradius> + </shape> <textarea name="buttontext"> <font>basesmallgrey</font> </textarea> diff -Naurp myththemes-0.24.orig/Mythbuntu/config-ui.xml myththemes-0.24.fixes/Mythbuntu/config-ui.xml --- myththemes-0.24.orig/Mythbuntu/config-ui.xml 2010-08-28 16:16:22.000000000 -0400 +++ myththemes-0.24.fixes/Mythbuntu/config-ui.xml 2011-03-01 23:53:44.000000000 -0500 @@ -70,7 +70,7 @@ </buttonlist> <button name="delete" from="basebutton"> - <position>620,472</position> + <position>750,472</position> <value>Delete</value> </button> @@ -89,12 +89,12 @@ </button> <button name="importicons" from="basewidebutton"> - <position>325,585</position> + <position>375,585</position> <value>Icon Download</value> </button> <button name="edittransport" from="basewidebutton"> - <position>585,585</position> + <position>700,585</position> <value>Edit Transports</value> </button> Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-13/mythtv-themes.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- mythtv-themes.spec 19 Nov 2010 01:46:42 -0000 1.38 +++ mythtv-themes.spec 25 Mar 2011 03:57:12 -0000 1.39 @@ -16,10 +16,10 @@ # The vendor name we should attribute the aforementioned entries to %define desktop_vendor RPMFusion -# SVN Revision number and branch ID -# 0.24 release: r27163 -%define _svnrev r27286 -%define branch release-0-24-fixes +# Git revision and branch ID +# 0.24 release: git tag b0.24 +%define _gitrev 931028f491 +%define branch fixes/0.24 # # Basic descriptive tags for this package: @@ -32,11 +32,11 @@ # Version/Release info Version: 0.24 -%if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.2.rc1%{?dist} +%if "%{branch}" == "master" +Release: 0.1.git.%{_gitrev}%{?dist} +#Release: 0.1.rc1%{?dist} %else -Release: 1%{?dist} +Release: 3%{?dist} %endif ################################################################################ @@ -47,8 +47,8 @@ Source0: ftp://ftp.osuosl.org/pub/mythtv/myththemes-%{version}.tar.bz2 # Robert Siebert's user-contributed theme, included at his (and users') request Source1: ftp://miroku.no-ip.com/blue-abstract-wide.2010.07.15.tar.bz2 -# svnfixes branch patch -Patch0: myththemes-0.24-svnfixes.patch +# fixes/0.24 branch patch +Patch0: myththemes-0.24-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -123,6 +123,12 @@ %{_datadir}/fonts/%{name}/*.otf %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-3 +- Update to 0.24 fixes, git revision 931028f491 + +* Sun Jan 16 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-2 +- Update to 0.24 fixes, git revision 945c67317 + * Thu Nov 18 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-1 - Update to release 0.24 + svn fixes branch up to revision 27286 --- myththemes-0.24-svnfixes.patch DELETED ---

13 years

1
0
0 / 0

rpms/mythtv/F-13 mythplugins-0.24-fixes.patch, 1.1, 1.2 mythtv-0.24-fixes.patch, 1.1, 1.2 mythtv.spec, 1.95, 1.96

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21364 Modified Files: mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch mythtv.spec Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 - Update to 0.24 fixes, git revision 464fa28373 - Remove i810 and openchrome detritus mythplugins-0.24-fixes.patch: .gitignore | 6 configure | 17 mytharchive/i18n/.gitignore | 1 mytharchive/i18n/mytharchive_fi.qm | 6 mytharchive/i18n/mytharchive_fi.ts | 8 mytharchive/mytharchive/recordingselector.cpp | 2 mytharchive/mytharchivehelper/.gitignore | 1 mytharchive/mytharchivehelper/pxsup2dast.c | 2 mytharchive/mythburn/scripts/mythburn.py | 13 mytharchive/theme/default-wide/mytharchive-ui.xml | 12 mytharchive/theme/default-wide/mythburn-ui.xml | 7 mytharchive/theme/default/mytharchive-ui.xml | 12 mytharchive/theme/default/mythburn-ui.xml | 7 mythbrowser/i18n/.gitignore | 1 mythbrowser/theme/default-wide/browser-ui.xml | 15 mythbrowser/theme/default/browser-ui.xml | 15 mythgallery/dcrawplugin/.gitignore | 1 mythgallery/i18n/.gitignore | 1 mythgallery/i18n/mythgallery_fi.qm | 19 - mythgallery/i18n/mythgallery_fi.ts | 8 mythgallery/mythgallery/.gitignore | 1 mythgallery/mythgallery/gallerysettings.cpp | 10 mythgallery/mythgallery/galleryutil.cpp | 4 mythgallery/mythgallery/main.cpp | 3 mythgame/i18n/.gitignore | 1 mythgame/mythgame/.gitignore | 1 mythmusic/i18n/.gitignore | 1 mythmusic/mythmusic/.gitignore | 1 mythmusic/mythmusic/cddecoder.h | 1 mythmusic/mythmusic/cdrip.cpp | 2 mythmusic/mythmusic/filescanner.cpp | 40 +- mythmusic/mythmusic/musicplayer.cpp | 5 mythmusic/mythmusic/visualize.cpp | 19 - mythmusic/mythmusic/visualize.h | 11 mythmusic/theme/default-wide/music-ui.xml | 42 +- mythmusic/theme/default/music-ui.xml | 173 +++++++++- mythnetvision/i18n/.gitignore | 1 mythnetvision/mythfillnetvision/.gitignore | 1 mythnews/i18n/.gitignore | 1 mythnews/mythnews/main.cpp | 2 mythvideo/i18n/.gitignore | 1 mythvideo/mtd/.gitignore | 1 mythvideo/mythvideo/.gitignore | 1 mythvideo/mythvideo/scripts/jamu.py | 22 - mythweather/i18n/.gitignore | 1 mythweather/mythweather/scripts/ca_envcan/ENVCANParser.pm | 6 mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +- mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 +++++++ mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4 mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4 mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1 mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1 mythzoneminder/i18n/.gitignore | 1 mythzoneminder/mythzmserver/.gitignore | 1 mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4 mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12 56 files changed, 533 insertions(+), 168 deletions(-) Index: mythplugins-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythplugins-0.24-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvsS7jZTT and /tmp/cvsxLCePg differ mythtv-0.24-fixes.patch: Makefile | 6 bindings/python/MythTV/__init__.py | 4 bindings/python/MythTV/dataheap.py | 2 bindings/python/MythTV/methodheap.py | 102 - bindings/python/MythTV/mythproto.py | 2 bindings/python/MythTV/static.py | 2 bindings/python/MythTV/system.py | 24 bindings/python/MythTV/utility.py | 4 configure | 9 docs/mythtv-HOWTO.sgml | 123 + external/FFmpeg/Makefile | 11 external/FFmpeg/libavcodec/dvbsubdec.c | 1 external/FFmpeg/libavformat/mpegts.c | 1 external/FFmpeg/libavformat/rmdec.c | 7 filters/quickdnr/quickdnr.pro | 2 i18n/mythfrontend_en_gb.ts | 2 i18n/mythfrontend_fi.ts | 42 i18n/mythfrontend_pt.ts | 2 libs/libmyth/audiooutput.cpp | 40 libs/libmyth/audiooutput.h | 3 libs/libmyth/audiooutputalsa.cpp | 213 +- libs/libmyth/audiooutputalsa.h | 7 libs/libmyth/audiooutputbase.cpp | 395 +++-- libs/libmyth/audiooutputbase.h | 9 libs/libmyth/audiooutputca.cpp | 4 libs/libmyth/audiooutputdigitalencoder.h | 1 libs/libmyth/audiooutputdx.cpp | 2 libs/libmyth/audiooutputpulse.cpp | 9 libs/libmyth/audiooutputsettings.cpp | 14 libs/libmyth/audiooutpututil.cpp | 26 libs/libmyth/audiooutpututil.h | 3 libs/libmyth/audiosettings.cpp | 4 libs/libmyth/mediamonitor-darwin.cpp | 2 libs/libmyth/mythuifilebrowser.cpp | 12 libs/libmythdb/.gitignore | 2 libs/libmythdb/mythcorecontext.cpp | 5 libs/libmythdb/mythdownloadmanager.cpp | 51 libs/libmythdb/mythsystem.cpp | 14 libs/libmythdb/mythversion.h | 2 libs/libmythdb/storagegroup.cpp | 3 libs/libmythfreemheg/Engine.cpp | 9 libs/libmythfreesurround/freesurround.cpp | 4 libs/libmythfreesurround/freesurround.h | 2 libs/libmythmetadata/videometadata.cpp | 16 libs/libmythsoundtouch/cpu_detect.h | 8 libs/libmythtv/RingBuffer.cpp | 39 libs/libmythtv/audioplayer.cpp | 51 libs/libmythtv/audioplayer.h | 3 libs/libmythtv/avformatdecoder.cpp | 257 ++- libs/libmythtv/avformatdecoder.h | 8 libs/libmythtv/bswap.h | 29 libs/libmythtv/cc608reader.cpp | 1 libs/libmythtv/decoderbase.cpp | 2 libs/libmythtv/decoderbase.h | 4 libs/libmythtv/dtvrecorder.cpp | 30 libs/libmythtv/dtvrecorder.h | 2 libs/libmythtv/eithelper.cpp | 16 libs/libmythtv/fourcc.h | 2 libs/libmythtv/frame.h | 2 libs/libmythtv/frequencies.c | 15 libs/libmythtv/frequencytables.cpp | 4 libs/libmythtv/libmythtv.pro | 13 libs/libmythtv/minilzo.cpp | 2 libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++- libs/libmythtv/mpeg/H264Parser.h | 27 libs/libmythtv/mythcommflagplayer.cpp | 2 libs/libmythtv/mythdvdplayer.cpp | 18 libs/libmythtv/mythplayer.cpp | 415 ++--- libs/libmythtv/mythplayer.h | 36 libs/libmythtv/nuppeldecoder.cpp | 18 libs/libmythtv/playercontext.cpp | 2 libs/libmythtv/privatedecoder_vda.cpp | 8 libs/libmythtv/privatedecoder_vda.h | 4 libs/libmythtv/recordinginfo.cpp | 13 libs/libmythtv/recordingprofile.cpp | 8 libs/libmythtv/recordingprofile.h | 1 libs/libmythtv/subtitlescreen.cpp | 33 libs/libmythtv/teletextdecoder.cpp | 51 libs/libmythtv/teletextdecoder.h | 42 libs/libmythtv/teletextreader.cpp | 609 ++++++++ libs/libmythtv/teletextreader.h | 162 ++ libs/libmythtv/teletextscreen.cpp | 754 +--------- libs/libmythtv/teletextscreen.h | 154 -- libs/libmythtv/textsubtitleparser.h | 6 libs/libmythtv/tv_play.cpp | 286 +-- libs/libmythtv/tv_play.h | 23 libs/libmythtv/tv_rec.cpp | 4 libs/libmythtv/videodisplayprofile.h | 1 libs/libmythtv/videoout_d3d.cpp | 2 libs/libmythtv/videoout_d3d.h | 2 libs/libmythtv/videoout_opengl.cpp | 2 libs/libmythtv/videoout_opengl.h | 2 libs/libmythtv/videoout_quartz.cpp | 7 libs/libmythtv/videoout_vdpau.cpp | 2 libs/libmythtv/videoout_vdpau.h | 2 libs/libmythtv/videoout_xv.cpp | 4 libs/libmythtv/videoout_xv.h | 6 libs/libmythtv/videooutbase.cpp | 9 libs/libmythtv/videooutbase.h | 1 libs/libmythui/DisplayResOSX.cpp | 2 libs/libmythui/mythmainwindow.cpp | 2 libs/libmythui/mythrender_opengl.cpp | 34 libs/libmythui/mythrender_opengl.h | 4 libs/libmythui/mythscreentype.cpp | 4 libs/libmythui/mythuibuttonlist.cpp | 2 libs/libmythui/mythuiimage.cpp | 16 libs/libmythui/mythuistatetype.cpp | 16 libs/libmythui/mythuitype.cpp | 2 libs/libmythui/mythuiwebbrowser.cpp | 6 libs/libmythui/util-osx-cocoa.mm | 2 libs/libmythupnp/httprequest.cpp | 28 libs/libmythupnp/soapclient.cpp | 6 libs/libmythupnp/threadpool.cpp | 59 libs/libmythupnp/upnpcds.cpp | 2 libs/libmythupnp/upnpcdsobjects.cpp | 2 programs/mythbackend/mainserver.cpp | 20 programs/mythbackend/playbacksock.cpp | 2 programs/mythbackend/scheduler.cpp | 15 programs/mythfrontend/exitprompt.cpp | 25 programs/mythfrontend/globalsettings.cpp | 115 - programs/mythfrontend/globalsettings.h | 5 programs/mythfrontend/guidegrid.cpp | 7 programs/mythfrontend/playbackbox.cpp | 17 programs/mythfrontend/playbackbox.h | 1 programs/mythfrontend/progfind.cpp | 84 - programs/mythfrontend/proglist.cpp | 46 programs/mythfrontend/proglist.h | 2 programs/mythfrontend/programrecpriority.cpp | 24 programs/mythtranscode/mpeg2fix.cpp | 2 programs/mythtranscode/mpeg2fix.h | 2 programs/mythtranscode/replex/.gitignore | 1 programs/mythtranscode/transcode.cpp | 9 programs/scripts/database/mythconverg_restore.pl | 8 programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18 programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17 programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39 programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5 programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2 programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 - programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18 programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39 themes/.gitignore | 1 themes/DVR/util_menu.xml | 7 themes/MythCenter-wide/base.xml | 1 themes/MythCenter-wide/osd.xml | 16 themes/MythCenter-wide/schedule-ui.xml | 26 themes/MythCenter-wide/zoneminder-ui.xml | 12 themes/MythCenter/base.xml | 1 version.sh | 23 149 files changed, 3278 insertions(+), 2445 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.24-fixes.patch Index: mythtv-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv-0.24-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.24-fixes.patch 3 Mar 2011 02:36:28 -0000 1.1 +++ mythtv-0.24-fixes.patch 25 Mar 2011 03:52:54 -0000 1.2 @@ -1,127 +1,6 @@ -diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore ---- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1,4 @@ -+Makefile.perl -+Makefile.perl.* -+blib/ -+pm_to_blib -diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # A MythTV Socket class that extends IO::Socket::INET to include some - # MythTV-specific data queries - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/IO/Socke... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # @copyright Silicon Mechanics - # - -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV channel. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/C... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV program. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/P... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Program; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV recording. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/R... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Recording; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV Storage Group. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/S... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -1,10 +1,10 @@ - # - # MythTV bindings for perl. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Version -diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore ---- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1 @@ -+build/ diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py --- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-03-24 22:18:50.000000000 -0400 @@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C return vid @@ -133,7 +12,7 @@ class VideoGrabber( Grabber ): diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py --- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-03-24 22:18:50.000000000 -0400 @@ -53,8 +53,10 @@ from methodheap import * from sys import version_info if version_info >= (2, 6): # 2.6 or newer @@ -148,8 +27,145 @@ static.mysqldb = MySQLdb.version_info diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py --- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500 -@@ -625,9 +625,9 @@ class MythDB( DBCache ): ++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-03-24 22:18:50.000000000 -0400 +@@ -11,7 +11,7 @@ from exceptions import * + from logging import MythLog + from connections import FEConnection, XMLConnection + from utility import databaseSearch, datetime +-from database import DBCache ++from database import DBCache, DBData + from system import SystemEvent + from mythproto import BEEvent, FileOps, Program, FreeSpace + from dataheap import * +@@ -20,6 +20,9 @@ from datetime import timedelta + from weakref import proxy + import re + ++class CaptureCard( DBData ): ++ pass ++ + class MythBE( FileOps ): + __doc__ = FileOps.__doc__+""" + getPendingRecordings() - returns a list of scheduled recordings +@@ -50,7 +53,7 @@ class MythBE( FileOps ): + and dictionary of filenames with sizes + """ + +- locked_tuners = [] ++ locked_tuners = {} + + def __del__(self): + self.freeTuner() +@@ -110,51 +113,77 @@ class MythBE( FileOps ): + Returns an ID of -2 if tuner is locked + -1 if no tuner could be found + """ +- local = True + cmd = 'LOCK_TUNER' ++ be = self ++ + if id is not None: ++ card = None ++ try: ++ # pull information from database to confirm existance ++ card = CaptureCard(id) ++ except MythError: ++ raise MythError("Capture card %s not found" % id) ++ + cmd += ' %d' % id +- res = self.getRecorderDetails(id).hostname +- if res != self.localname(): [...4312 lines suppressed...] +</html> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-03-24 22:18:50.000000000 -0400 @@ -19,9 +19,8 @@ <url> <name>BBC iPlayer Search</name> @@ -11457,7 +10562,7 @@ </urls> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-03-24 22:18:50.000000000 -0400 @@ -46,7 +46,7 @@ </subDirectory> @@ -11469,7 +10574,7 @@ <subDirectory name="TrailerAddict.com"> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2010-07-13 12:14:21.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-03-24 22:18:50.000000000 -0400 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- @@ -11732,7 +10837,7 @@ </xsl:stylesheet> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -19,7 +19,7 @@ metadata, video and image URLs from MTV. for this api are published at http://developer.mtvnservices.com/docs ''' @@ -11803,7 +10908,7 @@ dictionaries.append([self.massageDescription(self.feed_names[self.tree_key][self.feed]), self.setTreeViewIcon()]) diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -21,8 +21,9 @@ See this link for the specifications: http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format ''' @@ -11901,7 +11006,7 @@ # End of XPath extension functions diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml --- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400 -+++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-03-24 22:18:50.000000000 -0400 @@ -8,6 +8,13 @@ </button> @@ -11918,12 +11023,12 @@ <action>PLUGIN mythmusic</action> diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore --- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/.gitignore 2011-03-24 22:18:50.000000000 -0400 @@ -0,0 +1 @@ +themes diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml --- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -766,6 +766,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,125</area> @@ -11934,7 +11039,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml --- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -881,6 +881,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,126</area> @@ -11945,7 +11050,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml --- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-03-24 22:18:50.000000000 -0400 @@ -429,6 +429,22 @@ <fill color="#FFFFFF" alpha="255" /> <alphapulse min="180" max="255" change="4" /> @@ -11971,7 +11076,25 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-03-24 22:18:50.000000000 -0400 +@@ -145,7 +145,7 @@ + </textarea> + + <textarea name="subtitle" from="basetextarea"> +- <area>40,80,620,30</area> ++ <area>40,80,640,30</area> + <align>left,vcenter</align> + <font>basesmall</font> + </textarea> +@@ -157,7 +157,7 @@ + </textarea> + + <textarea name="rectypestatus" from="basetextarea"> +- <area>680,80,550,30</area> ++ <area>710,80,530,30</area> + <align>right,vcenter</align> + <font>basesmallyellow</font> + </textarea> @@ -532,7 +532,7 @@ <area>240,2,220,24</area> </textarea> @@ -11981,9 +11104,69 @@ </textarea> <textarea name="card" from="shortstarttimedate"> <area>1165,2,30,24</area> +@@ -1205,26 +1205,26 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>30,454,1200,50</area> ++ <area>30,454,1220,40</area> + <font>baselarge</font> + </textarea> + <textarea name="channel" from="basetextarea"> + <area>30,494,360,30</area> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>410,490,520,30</area> ++ <area>410,494,520,30</area> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>30,524,1200,150</area> ++ <area>30,524,1220,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%YEARSTARS| %%DESCRIPTION%</template> + </textarea> + <textarea name="type" from="basetextarea"> +- <area>30,670,560,30</area> ++ <area>30,685,560,30</area> + <font>basemedium_highlight</font> + </textarea> + <textarea name="programid" from="basetextarea"> +- <area>800,670,440,30</area> ++ <area>800,685,450,30</area> + <align>right</align> + </textarea> + <textarea name="msg" from="basetextarea"> +@@ -1411,22 +1411,22 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>90,50,1040,46</area> ++ <area>90,50,1075,40</area> + <font>baselarge</font> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>90,290,540,28</area> ++ <area>90,290,540,30</area> + </textarea> + <textarea name="channel" from="basetextarea"> +- <area>780,290,380,36</area> ++ <area>780,290,385,30</area> + <align>right</align> + </textarea> + <textarea name="rectypestatus" from="basetextarea"> +- <area>90,254,600,36</area> ++ <area>90,254,600,30</area> + <font>basesmallyellow</font> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>90,90,1040,176</area> ++ <area>90,90,1075,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%LONGREPEAT%%(|STARS|) %%DESCRIPTION%</template> + </textarea> diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-03-24 22:18:50.000000000 -0400 @@ -652,23 +652,23 @@ <window name="zmplayer"> @@ -12014,14 +11197,9 @@ <textarea name="pagetitle" from="basetextarea"> <area>30,10,570,40</area> -diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION ---- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500 -+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500 -@@ -1 +0,0 @@ --SOURCE_VERSION="0.24" diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh --- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400 -+++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/version.sh 2011-03-24 22:18:50.000000000 -0400 @@ -1,12 +1,11 @@ #!/bin/sh # Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- mythtv.spec 3 Mar 2011 02:36:28 -0000 1.95 +++ mythtv.spec 25 Mar 2011 03:52:54 -0000 1.96 @@ -66,7 +66,7 @@ # Git revision and branch ID # 0.24 release: git tag b0.24 -%define _gitrev 4af46b1f5d +%define _gitrev 464fa28373 %define branch fixes/0.24 # @@ -83,7 +83,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -417,10 +417,6 @@ Requires: libXxf86vm-devel Requires: mesa-libGLU-devel Requires: xorg-x11-proto-devel -%ifarch %{ix86} x86_64 -Requires: xorg-x11-drv-i810-devel -Requires: xorg-x11-drv-openchrome-devel -%endif # OpenGL video output and vsync support Requires: libGL-devel, libGLU-devel @@ -1457,6 +1453,10 @@ ################################################################################ %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 +- Update to 0.24 fixes, git revision 464fa28373 +- Remove i810 and openchrome detritus + * Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6 - Update to 0.24 fixes, git revision 4af46b1f5d - Fix mythtv version output to properly show git revision

13 years

1
0
0 / 0

rpms/mythtv/F-14 mythplugins-0.24-fixes.patch, 1.2, 1.3 mythtv-0.24-fixes.patch, 1.3, 1.4 mythtv.spec, 1.87, 1.88

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21152 Modified Files: mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch mythtv.spec Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 - Update to 0.24 fixes, git revision 464fa28373 - Remove i810 and openchrome detritus mythplugins-0.24-fixes.patch: .gitignore | 6 configure | 17 mytharchive/i18n/.gitignore | 1 mytharchive/i18n/mytharchive_fi.qm | 6 mytharchive/i18n/mytharchive_fi.ts | 8 mytharchive/mytharchive/recordingselector.cpp | 2 mytharchive/mytharchivehelper/.gitignore | 1 mytharchive/mytharchivehelper/pxsup2dast.c | 2 mytharchive/mythburn/scripts/mythburn.py | 13 mytharchive/theme/default-wide/mytharchive-ui.xml | 12 mytharchive/theme/default-wide/mythburn-ui.xml | 7 mytharchive/theme/default/mytharchive-ui.xml | 12 mytharchive/theme/default/mythburn-ui.xml | 7 mythbrowser/i18n/.gitignore | 1 mythbrowser/theme/default-wide/browser-ui.xml | 15 mythbrowser/theme/default/browser-ui.xml | 15 mythgallery/dcrawplugin/.gitignore | 1 mythgallery/i18n/.gitignore | 1 mythgallery/i18n/mythgallery_fi.qm | 19 - mythgallery/i18n/mythgallery_fi.ts | 8 mythgallery/mythgallery/.gitignore | 1 mythgallery/mythgallery/gallerysettings.cpp | 10 mythgallery/mythgallery/galleryutil.cpp | 4 mythgallery/mythgallery/main.cpp | 3 mythgame/i18n/.gitignore | 1 mythgame/mythgame/.gitignore | 1 mythmusic/i18n/.gitignore | 1 mythmusic/mythmusic/.gitignore | 1 mythmusic/mythmusic/cddecoder.h | 1 mythmusic/mythmusic/cdrip.cpp | 2 mythmusic/mythmusic/filescanner.cpp | 40 +- mythmusic/mythmusic/musicplayer.cpp | 5 mythmusic/mythmusic/visualize.cpp | 19 - mythmusic/mythmusic/visualize.h | 11 mythmusic/theme/default-wide/music-ui.xml | 42 +- mythmusic/theme/default/music-ui.xml | 173 +++++++++- mythnetvision/i18n/.gitignore | 1 mythnetvision/mythfillnetvision/.gitignore | 1 mythnews/i18n/.gitignore | 1 mythnews/mythnews/main.cpp | 2 mythvideo/i18n/.gitignore | 1 mythvideo/mtd/.gitignore | 1 mythvideo/mythvideo/.gitignore | 1 mythvideo/mythvideo/scripts/jamu.py | 22 - mythweather/i18n/.gitignore | 1 mythweather/mythweather/scripts/ca_envcan/ENVCANParser.pm | 6 mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +- mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 +++++++ mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4 mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4 mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1 mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1 mythzoneminder/i18n/.gitignore | 1 mythzoneminder/mythzmserver/.gitignore | 1 mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4 mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12 56 files changed, 533 insertions(+), 168 deletions(-) Index: mythplugins-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-14/mythplugins-0.24-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /tmp/cvsZ8G6Ob and /tmp/cvsiunmEk differ mythtv-0.24-fixes.patch: Makefile | 6 bindings/python/MythTV/__init__.py | 4 bindings/python/MythTV/dataheap.py | 2 bindings/python/MythTV/methodheap.py | 102 - bindings/python/MythTV/mythproto.py | 2 bindings/python/MythTV/static.py | 2 bindings/python/MythTV/system.py | 24 bindings/python/MythTV/utility.py | 4 configure | 9 docs/mythtv-HOWTO.sgml | 123 + external/FFmpeg/Makefile | 11 external/FFmpeg/libavcodec/dvbsubdec.c | 1 external/FFmpeg/libavformat/mpegts.c | 1 external/FFmpeg/libavformat/rmdec.c | 7 filters/quickdnr/quickdnr.pro | 2 i18n/mythfrontend_en_gb.ts | 2 i18n/mythfrontend_fi.ts | 42 i18n/mythfrontend_pt.ts | 2 libs/libmyth/audiooutput.cpp | 40 libs/libmyth/audiooutput.h | 3 libs/libmyth/audiooutputalsa.cpp | 213 +- libs/libmyth/audiooutputalsa.h | 7 libs/libmyth/audiooutputbase.cpp | 395 +++-- libs/libmyth/audiooutputbase.h | 9 libs/libmyth/audiooutputca.cpp | 4 libs/libmyth/audiooutputdigitalencoder.h | 1 libs/libmyth/audiooutputdx.cpp | 2 libs/libmyth/audiooutputpulse.cpp | 9 libs/libmyth/audiooutputsettings.cpp | 14 libs/libmyth/audiooutpututil.cpp | 26 libs/libmyth/audiooutpututil.h | 3 libs/libmyth/audiosettings.cpp | 4 libs/libmyth/mediamonitor-darwin.cpp | 2 libs/libmyth/mythuifilebrowser.cpp | 12 libs/libmythdb/.gitignore | 2 libs/libmythdb/mythcorecontext.cpp | 5 libs/libmythdb/mythdownloadmanager.cpp | 51 libs/libmythdb/mythsystem.cpp | 14 libs/libmythdb/mythversion.h | 2 libs/libmythdb/storagegroup.cpp | 3 libs/libmythfreemheg/Engine.cpp | 9 libs/libmythfreesurround/freesurround.cpp | 4 libs/libmythfreesurround/freesurround.h | 2 libs/libmythmetadata/videometadata.cpp | 16 libs/libmythsoundtouch/cpu_detect.h | 8 libs/libmythtv/RingBuffer.cpp | 39 libs/libmythtv/audioplayer.cpp | 51 libs/libmythtv/audioplayer.h | 3 libs/libmythtv/avformatdecoder.cpp | 257 ++- libs/libmythtv/avformatdecoder.h | 8 libs/libmythtv/bswap.h | 29 libs/libmythtv/cc608reader.cpp | 1 libs/libmythtv/decoderbase.cpp | 2 libs/libmythtv/decoderbase.h | 4 libs/libmythtv/dtvrecorder.cpp | 30 libs/libmythtv/dtvrecorder.h | 2 libs/libmythtv/eithelper.cpp | 16 libs/libmythtv/fourcc.h | 2 libs/libmythtv/frame.h | 2 libs/libmythtv/frequencies.c | 15 libs/libmythtv/frequencytables.cpp | 4 libs/libmythtv/libmythtv.pro | 13 libs/libmythtv/minilzo.cpp | 2 libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++- libs/libmythtv/mpeg/H264Parser.h | 27 libs/libmythtv/mythcommflagplayer.cpp | 2 libs/libmythtv/mythdvdplayer.cpp | 18 libs/libmythtv/mythplayer.cpp | 415 ++--- libs/libmythtv/mythplayer.h | 36 libs/libmythtv/nuppeldecoder.cpp | 18 libs/libmythtv/playercontext.cpp | 2 libs/libmythtv/privatedecoder_vda.cpp | 8 libs/libmythtv/privatedecoder_vda.h | 4 libs/libmythtv/recordinginfo.cpp | 13 libs/libmythtv/recordingprofile.cpp | 8 libs/libmythtv/recordingprofile.h | 1 libs/libmythtv/subtitlescreen.cpp | 33 libs/libmythtv/teletextdecoder.cpp | 51 libs/libmythtv/teletextdecoder.h | 42 libs/libmythtv/teletextreader.cpp | 609 ++++++++ libs/libmythtv/teletextreader.h | 162 ++ libs/libmythtv/teletextscreen.cpp | 754 +--------- libs/libmythtv/teletextscreen.h | 154 -- libs/libmythtv/textsubtitleparser.h | 6 libs/libmythtv/tv_play.cpp | 286 +-- libs/libmythtv/tv_play.h | 23 libs/libmythtv/tv_rec.cpp | 4 libs/libmythtv/videodisplayprofile.h | 1 libs/libmythtv/videoout_d3d.cpp | 2 libs/libmythtv/videoout_d3d.h | 2 libs/libmythtv/videoout_opengl.cpp | 2 libs/libmythtv/videoout_opengl.h | 2 libs/libmythtv/videoout_quartz.cpp | 7 libs/libmythtv/videoout_vdpau.cpp | 2 libs/libmythtv/videoout_vdpau.h | 2 libs/libmythtv/videoout_xv.cpp | 4 libs/libmythtv/videoout_xv.h | 6 libs/libmythtv/videooutbase.cpp | 9 libs/libmythtv/videooutbase.h | 1 libs/libmythui/DisplayResOSX.cpp | 2 libs/libmythui/mythmainwindow.cpp | 2 libs/libmythui/mythrender_opengl.cpp | 34 libs/libmythui/mythrender_opengl.h | 4 libs/libmythui/mythscreentype.cpp | 4 libs/libmythui/mythuibuttonlist.cpp | 2 libs/libmythui/mythuiimage.cpp | 16 libs/libmythui/mythuistatetype.cpp | 16 libs/libmythui/mythuitype.cpp | 2 libs/libmythui/mythuiwebbrowser.cpp | 6 libs/libmythui/util-osx-cocoa.mm | 2 libs/libmythupnp/httprequest.cpp | 28 libs/libmythupnp/soapclient.cpp | 6 libs/libmythupnp/threadpool.cpp | 59 libs/libmythupnp/upnpcds.cpp | 2 libs/libmythupnp/upnpcdsobjects.cpp | 2 programs/mythbackend/mainserver.cpp | 20 programs/mythbackend/playbacksock.cpp | 2 programs/mythbackend/scheduler.cpp | 15 programs/mythfrontend/exitprompt.cpp | 25 programs/mythfrontend/globalsettings.cpp | 115 - programs/mythfrontend/globalsettings.h | 5 programs/mythfrontend/guidegrid.cpp | 7 programs/mythfrontend/playbackbox.cpp | 17 programs/mythfrontend/playbackbox.h | 1 programs/mythfrontend/progfind.cpp | 84 - programs/mythfrontend/proglist.cpp | 46 programs/mythfrontend/proglist.h | 2 programs/mythfrontend/programrecpriority.cpp | 24 programs/mythtranscode/mpeg2fix.cpp | 2 programs/mythtranscode/mpeg2fix.h | 2 programs/mythtranscode/replex/.gitignore | 1 programs/mythtranscode/transcode.cpp | 9 programs/scripts/database/mythconverg_restore.pl | 8 programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18 programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17 programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39 programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5 programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2 programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 - programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18 programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39 themes/.gitignore | 1 themes/DVR/util_menu.xml | 7 themes/MythCenter-wide/base.xml | 1 themes/MythCenter-wide/osd.xml | 16 themes/MythCenter-wide/schedule-ui.xml | 26 themes/MythCenter-wide/zoneminder-ui.xml | 12 themes/MythCenter/base.xml | 1 version.sh | 23 149 files changed, 3278 insertions(+), 2445 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.24-fixes.patch Index: mythtv-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-14/mythtv-0.24-fixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mythtv-0.24-fixes.patch 3 Mar 2011 02:34:21 -0000 1.3 +++ mythtv-0.24-fixes.patch 25 Mar 2011 03:51:40 -0000 1.4 @@ -1,127 +1,6 @@ -diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore ---- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1,4 @@ -+Makefile.perl -+Makefile.perl.* -+blib/ -+pm_to_blib -diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # A MythTV Socket class that extends IO::Socket::INET to include some - # MythTV-specific data queries - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/IO/Socke... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # @copyright Silicon Mechanics - # - -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV channel. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/C... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV program. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/P... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Program; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV recording. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/R... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Recording; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV Storage Group. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/S... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -1,10 +1,10 @@ - # - # MythTV bindings for perl. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Version -diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore ---- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1 @@ -+build/ diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py --- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-03-24 22:18:50.000000000 -0400 @@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C return vid @@ -133,7 +12,7 @@ class VideoGrabber( Grabber ): diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py --- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-03-24 22:18:50.000000000 -0400 @@ -53,8 +53,10 @@ from methodheap import * from sys import version_info if version_info >= (2, 6): # 2.6 or newer @@ -148,8 +27,145 @@ static.mysqldb = MySQLdb.version_info diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py --- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500 -@@ -625,9 +625,9 @@ class MythDB( DBCache ): ++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-03-24 22:18:50.000000000 -0400 +@@ -11,7 +11,7 @@ from exceptions import * + from logging import MythLog + from connections import FEConnection, XMLConnection + from utility import databaseSearch, datetime +-from database import DBCache ++from database import DBCache, DBData + from system import SystemEvent + from mythproto import BEEvent, FileOps, Program, FreeSpace + from dataheap import * +@@ -20,6 +20,9 @@ from datetime import timedelta + from weakref import proxy + import re + ++class CaptureCard( DBData ): ++ pass ++ + class MythBE( FileOps ): + __doc__ = FileOps.__doc__+""" + getPendingRecordings() - returns a list of scheduled recordings +@@ -50,7 +53,7 @@ class MythBE( FileOps ): + and dictionary of filenames with sizes + """ + +- locked_tuners = [] ++ locked_tuners = {} + + def __del__(self): + self.freeTuner() +@@ -110,51 +113,77 @@ class MythBE( FileOps ): + Returns an ID of -2 if tuner is locked + -1 if no tuner could be found + """ +- local = True + cmd = 'LOCK_TUNER' ++ be = self ++ + if id is not None: ++ card = None ++ try: ++ # pull information from database to confirm existance ++ card = CaptureCard(id) ++ except MythError: ++ raise MythError("Capture card %s not found" % id) ++ + cmd += ' %d' % id +- res = self.getRecorderDetails(id).hostname +- if res != self.localname(): [...4312 lines suppressed...] +</html> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-03-24 22:18:50.000000000 -0400 @@ -19,9 +19,8 @@ <url> <name>BBC iPlayer Search</name> @@ -11457,7 +10562,7 @@ </urls> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-03-24 22:18:50.000000000 -0400 @@ -46,7 +46,7 @@ </subDirectory> @@ -11469,7 +10574,7 @@ <subDirectory name="TrailerAddict.com"> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2010-07-13 12:14:21.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-03-24 22:18:50.000000000 -0400 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- @@ -11732,7 +10837,7 @@ </xsl:stylesheet> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -19,7 +19,7 @@ metadata, video and image URLs from MTV. for this api are published at http://developer.mtvnservices.com/docs ''' @@ -11803,7 +10908,7 @@ dictionaries.append([self.massageDescription(self.feed_names[self.tree_key][self.feed]), self.setTreeViewIcon()]) diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -21,8 +21,9 @@ See this link for the specifications: http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format ''' @@ -11901,7 +11006,7 @@ # End of XPath extension functions diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml --- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400 -+++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-03-24 22:18:50.000000000 -0400 @@ -8,6 +8,13 @@ </button> @@ -11918,12 +11023,12 @@ <action>PLUGIN mythmusic</action> diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore --- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/.gitignore 2011-03-24 22:18:50.000000000 -0400 @@ -0,0 +1 @@ +themes diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml --- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -766,6 +766,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,125</area> @@ -11934,7 +11039,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml --- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -881,6 +881,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,126</area> @@ -11945,7 +11050,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml --- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-03-24 22:18:50.000000000 -0400 @@ -429,6 +429,22 @@ <fill color="#FFFFFF" alpha="255" /> <alphapulse min="180" max="255" change="4" /> @@ -11971,7 +11076,25 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-03-24 22:18:50.000000000 -0400 +@@ -145,7 +145,7 @@ + </textarea> + + <textarea name="subtitle" from="basetextarea"> +- <area>40,80,620,30</area> ++ <area>40,80,640,30</area> + <align>left,vcenter</align> + <font>basesmall</font> + </textarea> +@@ -157,7 +157,7 @@ + </textarea> + + <textarea name="rectypestatus" from="basetextarea"> +- <area>680,80,550,30</area> ++ <area>710,80,530,30</area> + <align>right,vcenter</align> + <font>basesmallyellow</font> + </textarea> @@ -532,7 +532,7 @@ <area>240,2,220,24</area> </textarea> @@ -11981,9 +11104,69 @@ </textarea> <textarea name="card" from="shortstarttimedate"> <area>1165,2,30,24</area> +@@ -1205,26 +1205,26 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>30,454,1200,50</area> ++ <area>30,454,1220,40</area> + <font>baselarge</font> + </textarea> + <textarea name="channel" from="basetextarea"> + <area>30,494,360,30</area> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>410,490,520,30</area> ++ <area>410,494,520,30</area> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>30,524,1200,150</area> ++ <area>30,524,1220,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%YEARSTARS| %%DESCRIPTION%</template> + </textarea> + <textarea name="type" from="basetextarea"> +- <area>30,670,560,30</area> ++ <area>30,685,560,30</area> + <font>basemedium_highlight</font> + </textarea> + <textarea name="programid" from="basetextarea"> +- <area>800,670,440,30</area> ++ <area>800,685,450,30</area> + <align>right</align> + </textarea> + <textarea name="msg" from="basetextarea"> +@@ -1411,22 +1411,22 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>90,50,1040,46</area> ++ <area>90,50,1075,40</area> + <font>baselarge</font> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>90,290,540,28</area> ++ <area>90,290,540,30</area> + </textarea> + <textarea name="channel" from="basetextarea"> +- <area>780,290,380,36</area> ++ <area>780,290,385,30</area> + <align>right</align> + </textarea> + <textarea name="rectypestatus" from="basetextarea"> +- <area>90,254,600,36</area> ++ <area>90,254,600,30</area> + <font>basesmallyellow</font> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>90,90,1040,176</area> ++ <area>90,90,1075,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%LONGREPEAT%%(|STARS|) %%DESCRIPTION%</template> + </textarea> diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-03-24 22:18:50.000000000 -0400 @@ -652,23 +652,23 @@ <window name="zmplayer"> @@ -12014,14 +11197,9 @@ <textarea name="pagetitle" from="basetextarea"> <area>30,10,570,40</area> -diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION ---- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500 -+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500 -@@ -1 +0,0 @@ --SOURCE_VERSION="0.24" diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh --- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400 -+++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/version.sh 2011-03-24 22:18:50.000000000 -0400 @@ -1,12 +1,11 @@ #!/bin/sh # Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- mythtv.spec 3 Mar 2011 02:34:21 -0000 1.87 +++ mythtv.spec 25 Mar 2011 03:51:40 -0000 1.88 @@ -66,7 +66,7 @@ # Git revision and branch ID # 0.24 release: git tag b0.24 -%define _gitrev 4af46b1f5d +%define _gitrev 464fa28373 %define branch fixes/0.24 # @@ -83,7 +83,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -417,10 +417,6 @@ Requires: libXxf86vm-devel Requires: mesa-libGLU-devel Requires: xorg-x11-proto-devel -%ifarch %{ix86} x86_64 -Requires: xorg-x11-drv-i810-devel -Requires: xorg-x11-drv-openchrome-devel -%endif # OpenGL video output and vsync support Requires: libGL-devel, libGLU-devel @@ -1457,6 +1453,10 @@ ################################################################################ %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 +- Update to 0.24 fixes, git revision 464fa28373 +- Remove i810 and openchrome detritus + * Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6 - Update to 0.24 fixes, git revision 4af46b1f5d - Fix mythtv version output to properly show git revision

13 years

1
0
0 / 0

rpms/mythtv/devel mythplugins-0.24-fixes.patch, 1.1, 1.2 mythtv-0.24-fixes.patch, 1.1, 1.2 mythtv.spec, 1.77, 1.78

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20344 Modified Files: mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch mythtv.spec Log Message: * Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 - Update to 0.24 fixes, git revision 464fa28373 - Remove i810 and openchrome detritus mythplugins-0.24-fixes.patch: .gitignore | 6 configure | 17 mytharchive/i18n/.gitignore | 1 mytharchive/i18n/mytharchive_fi.qm | 6 mytharchive/i18n/mytharchive_fi.ts | 8 mytharchive/mytharchive/recordingselector.cpp | 2 mytharchive/mytharchivehelper/.gitignore | 1 mytharchive/mytharchivehelper/pxsup2dast.c | 2 mytharchive/mythburn/scripts/mythburn.py | 13 mytharchive/theme/default-wide/mytharchive-ui.xml | 12 mytharchive/theme/default-wide/mythburn-ui.xml | 7 mytharchive/theme/default/mytharchive-ui.xml | 12 mytharchive/theme/default/mythburn-ui.xml | 7 mythbrowser/i18n/.gitignore | 1 mythbrowser/theme/default-wide/browser-ui.xml | 15 mythbrowser/theme/default/browser-ui.xml | 15 mythgallery/dcrawplugin/.gitignore | 1 mythgallery/i18n/.gitignore | 1 mythgallery/i18n/mythgallery_fi.qm | 19 - mythgallery/i18n/mythgallery_fi.ts | 8 mythgallery/mythgallery/.gitignore | 1 mythgallery/mythgallery/gallerysettings.cpp | 10 mythgallery/mythgallery/galleryutil.cpp | 4 mythgallery/mythgallery/main.cpp | 3 mythgame/i18n/.gitignore | 1 mythgame/mythgame/.gitignore | 1 mythmusic/i18n/.gitignore | 1 mythmusic/mythmusic/.gitignore | 1 mythmusic/mythmusic/cddecoder.h | 1 mythmusic/mythmusic/cdrip.cpp | 2 mythmusic/mythmusic/filescanner.cpp | 40 +- mythmusic/mythmusic/musicplayer.cpp | 5 mythmusic/mythmusic/visualize.cpp | 19 - mythmusic/mythmusic/visualize.h | 11 mythmusic/theme/default-wide/music-ui.xml | 42 +- mythmusic/theme/default/music-ui.xml | 173 +++++++++- mythnetvision/i18n/.gitignore | 1 mythnetvision/mythfillnetvision/.gitignore | 1 mythnews/i18n/.gitignore | 1 mythnews/mythnews/main.cpp | 2 mythvideo/i18n/.gitignore | 1 mythvideo/mtd/.gitignore | 1 mythvideo/mythvideo/.gitignore | 1 mythvideo/mythvideo/scripts/jamu.py | 22 - mythweather/i18n/.gitignore | 1 mythweather/mythweather/scripts/ca_envcan/ENVCANParser.pm | 6 mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +- mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 +++++++ mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4 mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4 mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1 mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1 mythzoneminder/i18n/.gitignore | 1 mythzoneminder/mythzmserver/.gitignore | 1 mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4 mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12 56 files changed, 533 insertions(+), 168 deletions(-) Index: mythplugins-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythplugins-0.24-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvsidbN2N and /tmp/cvsvqz0wE differ mythtv-0.24-fixes.patch: Makefile | 6 bindings/python/MythTV/__init__.py | 4 bindings/python/MythTV/dataheap.py | 2 bindings/python/MythTV/methodheap.py | 102 - bindings/python/MythTV/mythproto.py | 2 bindings/python/MythTV/static.py | 2 bindings/python/MythTV/system.py | 24 bindings/python/MythTV/utility.py | 4 configure | 9 docs/mythtv-HOWTO.sgml | 123 + external/FFmpeg/Makefile | 11 external/FFmpeg/libavcodec/dvbsubdec.c | 1 external/FFmpeg/libavformat/mpegts.c | 1 external/FFmpeg/libavformat/rmdec.c | 7 filters/quickdnr/quickdnr.pro | 2 i18n/mythfrontend_en_gb.ts | 2 i18n/mythfrontend_fi.ts | 42 i18n/mythfrontend_pt.ts | 2 libs/libmyth/audiooutput.cpp | 40 libs/libmyth/audiooutput.h | 3 libs/libmyth/audiooutputalsa.cpp | 213 +- libs/libmyth/audiooutputalsa.h | 7 libs/libmyth/audiooutputbase.cpp | 395 +++-- libs/libmyth/audiooutputbase.h | 9 libs/libmyth/audiooutputca.cpp | 4 libs/libmyth/audiooutputdigitalencoder.h | 1 libs/libmyth/audiooutputdx.cpp | 2 libs/libmyth/audiooutputpulse.cpp | 9 libs/libmyth/audiooutputsettings.cpp | 14 libs/libmyth/audiooutpututil.cpp | 26 libs/libmyth/audiooutpututil.h | 3 libs/libmyth/audiosettings.cpp | 4 libs/libmyth/mediamonitor-darwin.cpp | 2 libs/libmyth/mythuifilebrowser.cpp | 12 libs/libmythdb/.gitignore | 2 libs/libmythdb/mythcorecontext.cpp | 5 libs/libmythdb/mythdownloadmanager.cpp | 51 libs/libmythdb/mythsystem.cpp | 14 libs/libmythdb/mythversion.h | 2 libs/libmythdb/storagegroup.cpp | 3 libs/libmythfreemheg/Engine.cpp | 9 libs/libmythfreesurround/freesurround.cpp | 4 libs/libmythfreesurround/freesurround.h | 2 libs/libmythmetadata/videometadata.cpp | 16 libs/libmythsoundtouch/cpu_detect.h | 8 libs/libmythtv/RingBuffer.cpp | 39 libs/libmythtv/audioplayer.cpp | 51 libs/libmythtv/audioplayer.h | 3 libs/libmythtv/avformatdecoder.cpp | 257 ++- libs/libmythtv/avformatdecoder.h | 8 libs/libmythtv/bswap.h | 29 libs/libmythtv/cc608reader.cpp | 1 libs/libmythtv/decoderbase.cpp | 2 libs/libmythtv/decoderbase.h | 4 libs/libmythtv/dtvrecorder.cpp | 30 libs/libmythtv/dtvrecorder.h | 2 libs/libmythtv/eithelper.cpp | 16 libs/libmythtv/fourcc.h | 2 libs/libmythtv/frame.h | 2 libs/libmythtv/frequencies.c | 15 libs/libmythtv/frequencytables.cpp | 4 libs/libmythtv/libmythtv.pro | 13 libs/libmythtv/minilzo.cpp | 2 libs/libmythtv/mpeg/H264Parser.cpp | 424 ++++- libs/libmythtv/mpeg/H264Parser.h | 27 libs/libmythtv/mythcommflagplayer.cpp | 2 libs/libmythtv/mythdvdplayer.cpp | 18 libs/libmythtv/mythplayer.cpp | 415 ++--- libs/libmythtv/mythplayer.h | 36 libs/libmythtv/nuppeldecoder.cpp | 18 libs/libmythtv/playercontext.cpp | 2 libs/libmythtv/privatedecoder_vda.cpp | 8 libs/libmythtv/privatedecoder_vda.h | 4 libs/libmythtv/recordinginfo.cpp | 13 libs/libmythtv/recordingprofile.cpp | 8 libs/libmythtv/recordingprofile.h | 1 libs/libmythtv/subtitlescreen.cpp | 33 libs/libmythtv/teletextdecoder.cpp | 51 libs/libmythtv/teletextdecoder.h | 42 libs/libmythtv/teletextreader.cpp | 609 ++++++++ libs/libmythtv/teletextreader.h | 162 ++ libs/libmythtv/teletextscreen.cpp | 754 +--------- libs/libmythtv/teletextscreen.h | 154 -- libs/libmythtv/textsubtitleparser.h | 6 libs/libmythtv/tv_play.cpp | 286 +-- libs/libmythtv/tv_play.h | 23 libs/libmythtv/tv_rec.cpp | 4 libs/libmythtv/videodisplayprofile.h | 1 libs/libmythtv/videoout_d3d.cpp | 2 libs/libmythtv/videoout_d3d.h | 2 libs/libmythtv/videoout_opengl.cpp | 2 libs/libmythtv/videoout_opengl.h | 2 libs/libmythtv/videoout_quartz.cpp | 7 libs/libmythtv/videoout_vdpau.cpp | 2 libs/libmythtv/videoout_vdpau.h | 2 libs/libmythtv/videoout_xv.cpp | 4 libs/libmythtv/videoout_xv.h | 6 libs/libmythtv/videooutbase.cpp | 9 libs/libmythtv/videooutbase.h | 1 libs/libmythui/DisplayResOSX.cpp | 2 libs/libmythui/mythmainwindow.cpp | 2 libs/libmythui/mythrender_opengl.cpp | 34 libs/libmythui/mythrender_opengl.h | 4 libs/libmythui/mythscreentype.cpp | 4 libs/libmythui/mythuibuttonlist.cpp | 2 libs/libmythui/mythuiimage.cpp | 16 libs/libmythui/mythuistatetype.cpp | 16 libs/libmythui/mythuitype.cpp | 2 libs/libmythui/mythuiwebbrowser.cpp | 6 libs/libmythui/util-osx-cocoa.mm | 2 libs/libmythupnp/httprequest.cpp | 28 libs/libmythupnp/soapclient.cpp | 6 libs/libmythupnp/threadpool.cpp | 59 libs/libmythupnp/upnpcds.cpp | 2 libs/libmythupnp/upnpcdsobjects.cpp | 2 programs/mythbackend/mainserver.cpp | 20 programs/mythbackend/playbacksock.cpp | 2 programs/mythbackend/scheduler.cpp | 15 programs/mythfrontend/exitprompt.cpp | 25 programs/mythfrontend/globalsettings.cpp | 115 - programs/mythfrontend/globalsettings.h | 5 programs/mythfrontend/guidegrid.cpp | 7 programs/mythfrontend/playbackbox.cpp | 17 programs/mythfrontend/playbackbox.h | 1 programs/mythfrontend/progfind.cpp | 84 - programs/mythfrontend/proglist.cpp | 46 programs/mythfrontend/proglist.h | 2 programs/mythfrontend/programrecpriority.cpp | 24 programs/mythtranscode/mpeg2fix.cpp | 2 programs/mythtranscode/mpeg2fix.h | 2 programs/mythtranscode/replex/.gitignore | 1 programs/mythtranscode/transcode.cpp | 9 programs/scripts/database/mythconverg_restore.pl | 8 programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py | 18 programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 17 programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html | 39 programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml | 5 programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml | 2 programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl | 100 - programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py | 18 programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py | 39 themes/.gitignore | 1 themes/DVR/util_menu.xml | 7 themes/MythCenter-wide/base.xml | 1 themes/MythCenter-wide/osd.xml | 16 themes/MythCenter-wide/schedule-ui.xml | 26 themes/MythCenter-wide/zoneminder-ui.xml | 12 themes/MythCenter/base.xml | 1 version.sh | 23 149 files changed, 3278 insertions(+), 2445 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.24-fixes.patch Index: mythtv-0.24-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.24-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.24-fixes.patch 3 Mar 2011 02:43:26 -0000 1.1 +++ mythtv-0.24-fixes.patch 25 Mar 2011 03:43:35 -0000 1.2 @@ -1,127 +1,6 @@ -diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore mythtv-0.24.fixes/bindings/perl/.gitignore ---- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1,4 @@ -+Makefile.perl -+Makefile.perl.* -+blib/ -+pm_to_blib -diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # A MythTV Socket class that extends IO::Socket::INET to include some - # MythTV-specific data queries - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/IO/Socke... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # @copyright Silicon Mechanics - # - -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV channel. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/C... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV program. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/P... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Program; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV recording. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/R... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - package MythTV::Recording; -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm ---- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -3,10 +3,10 @@ - # - # Object containing info about a particular MythTV Storage Group. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/S... $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Make sure that the main MythTV package is loaded -diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm mythtv-0.24.fixes/bindings/perl/MythTV.pm ---- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500 -@@ -1,10 +1,10 @@ - # - # MythTV bindings for perl. - # --# @url $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $ --# @date $Date$ --# @version $Revision$ --# @author $Author$ -+# @url $URL$ -+# @date $Date$ -+# @version $Revision$ -+# @author $Author$ - # - - # Version -diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore mythtv-0.24.fixes/bindings/python/.gitignore ---- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500 -@@ -0,0 +1 @@ -+build/ diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py --- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-03-24 22:18:50.000000000 -0400 @@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C return vid @@ -133,7 +12,7 @@ class VideoGrabber( Grabber ): diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py mythtv-0.24.fixes/bindings/python/MythTV/__init__.py --- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-03-24 22:18:50.000000000 -0400 @@ -53,8 +53,10 @@ from methodheap import * from sys import version_info if version_info >= (2, 6): # 2.6 or newer @@ -148,8 +27,145 @@ static.mysqldb = MySQLdb.version_info diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py --- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000 -0400 -+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000 -0500 -@@ -625,9 +625,9 @@ class MythDB( DBCache ): ++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-03-24 22:18:50.000000000 -0400 +@@ -11,7 +11,7 @@ from exceptions import * + from logging import MythLog + from connections import FEConnection, XMLConnection + from utility import databaseSearch, datetime +-from database import DBCache ++from database import DBCache, DBData + from system import SystemEvent + from mythproto import BEEvent, FileOps, Program, FreeSpace + from dataheap import * +@@ -20,6 +20,9 @@ from datetime import timedelta + from weakref import proxy + import re + ++class CaptureCard( DBData ): ++ pass ++ + class MythBE( FileOps ): + __doc__ = FileOps.__doc__+""" + getPendingRecordings() - returns a list of scheduled recordings +@@ -50,7 +53,7 @@ class MythBE( FileOps ): + and dictionary of filenames with sizes + """ + +- locked_tuners = [] ++ locked_tuners = {} + + def __del__(self): + self.freeTuner() +@@ -110,51 +113,77 @@ class MythBE( FileOps ): + Returns an ID of -2 if tuner is locked + -1 if no tuner could be found + """ +- local = True + cmd = 'LOCK_TUNER' ++ be = self ++ + if id is not None: ++ card = None ++ try: ++ # pull information from database to confirm existance ++ card = CaptureCard(id) ++ except MythError: ++ raise MythError("Capture card %s not found" % id) ++ + cmd += ' %d' % id +- res = self.getRecorderDetails(id).hostname +- if res != self.localname(): [...4312 lines suppressed...] +</html> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-03-24 22:18:50.000000000 -0400 @@ -19,9 +19,8 @@ <url> <name>BBC iPlayer Search</name> @@ -11457,7 +10562,7 @@ </urls> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-03-24 22:18:50.000000000 -0400 @@ -46,7 +46,7 @@ </subDirectory> @@ -11469,7 +10574,7 @@ <subDirectory name="TrailerAddict.com"> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2010-07-13 12:14:21.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-03-24 22:18:50.000000000 -0400 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- @@ -11732,7 +10837,7 @@ </xsl:stylesheet> diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -19,7 +19,7 @@ metadata, video and image URLs from MTV. for this api are published at http://developer.mtvnservices.com/docs ''' @@ -11803,7 +10908,7 @@ dictionaries.append([self.massageDescription(self.feed_names[self.tree_key][self.feed]), self.setTreeViewIcon()]) diff -Naurp mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py --- mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2010-08-28 16:16:22.000000000 -0400 -+++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-03-24 22:18:50.000000000 -0400 @@ -21,8 +21,9 @@ See this link for the specifications: http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format ''' @@ -11901,7 +11006,7 @@ # End of XPath extension functions diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml mythtv-0.24.fixes/themes/DVR/util_menu.xml --- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400 -+++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-03-24 22:18:50.000000000 -0400 @@ -8,6 +8,13 @@ </button> @@ -11918,12 +11023,12 @@ <action>PLUGIN mythmusic</action> diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore --- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/.gitignore 2011-03-24 22:18:50.000000000 -0400 @@ -0,0 +1 @@ +themes diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml mythtv-0.24.fixes/themes/MythCenter/base.xml --- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -766,6 +766,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,125</area> @@ -11934,7 +11039,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml mythtv-0.24.fixes/themes/MythCenter-wide/base.xml --- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-03-24 22:18:50.000000000 -0400 @@ -881,6 +881,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,126</area> @@ -11945,7 +11050,7 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml --- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-03-24 22:18:50.000000000 -0400 @@ -429,6 +429,22 @@ <fill color="#FFFFFF" alpha="255" /> <alphapulse min="180" max="255" change="4" /> @@ -11971,7 +11076,25 @@ diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-03-24 22:18:50.000000000 -0400 +@@ -145,7 +145,7 @@ + </textarea> + + <textarea name="subtitle" from="basetextarea"> +- <area>40,80,620,30</area> ++ <area>40,80,640,30</area> + <align>left,vcenter</align> + <font>basesmall</font> + </textarea> +@@ -157,7 +157,7 @@ + </textarea> + + <textarea name="rectypestatus" from="basetextarea"> +- <area>680,80,550,30</area> ++ <area>710,80,530,30</area> + <align>right,vcenter</align> + <font>basesmallyellow</font> + </textarea> @@ -532,7 +532,7 @@ <area>240,2,220,24</area> </textarea> @@ -11981,9 +11104,69 @@ </textarea> <textarea name="card" from="shortstarttimedate"> <area>1165,2,30,24</area> +@@ -1205,26 +1205,26 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>30,454,1200,50</area> ++ <area>30,454,1220,40</area> + <font>baselarge</font> + </textarea> + <textarea name="channel" from="basetextarea"> + <area>30,494,360,30</area> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>410,490,520,30</area> ++ <area>410,494,520,30</area> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>30,524,1200,150</area> ++ <area>30,524,1220,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%YEARSTARS| %%DESCRIPTION%</template> + </textarea> + <textarea name="type" from="basetextarea"> +- <area>30,670,560,30</area> ++ <area>30,685,560,30</area> + <font>basemedium_highlight</font> + </textarea> + <textarea name="programid" from="basetextarea"> +- <area>800,670,440,30</area> ++ <area>800,685,450,30</area> + <align>right</align> + </textarea> + <textarea name="msg" from="basetextarea"> +@@ -1411,22 +1411,22 @@ + </buttonlist> + + <textarea name="title" from="basetextarea"> +- <area>90,50,1040,46</area> ++ <area>90,50,1075,40</area> + <font>baselarge</font> + </textarea> + <textarea name="timedate" from="basetextarea"> +- <area>90,290,540,28</area> ++ <area>90,290,540,30</area> + </textarea> + <textarea name="channel" from="basetextarea"> +- <area>780,290,380,36</area> ++ <area>780,290,385,30</area> + <align>right</align> + </textarea> + <textarea name="rectypestatus" from="basetextarea"> +- <area>90,254,600,36</area> ++ <area>90,254,600,30</area> + <font>basesmallyellow</font> + </textarea> + <textarea name="description" from="basetextarea"> +- <area>90,90,1040,176</area> ++ <area>90,90,1075,160</area> + <multiline>yes</multiline> + <template>%"|SUBTITLE|"\n%%LONGREPEAT%%(|STARS|) %%DESCRIPTION%</template> + </textarea> diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml --- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06 11:37:20.000000000 -0400 -+++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-03-24 22:18:50.000000000 -0400 @@ -652,23 +652,23 @@ <window name="zmplayer"> @@ -12014,14 +11197,9 @@ <textarea name="pagetitle" from="basetextarea"> <area>30,10,570,40</area> -diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION ---- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500 -+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500 -@@ -1 +0,0 @@ --SOURCE_VERSION="0.24" diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh --- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400 -+++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500 ++++ mythtv-0.24.fixes/version.sh 2011-03-24 22:18:50.000000000 -0400 @@ -1,12 +1,11 @@ #!/bin/sh # Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- mythtv.spec 3 Mar 2011 02:43:26 -0000 1.77 +++ mythtv.spec 25 Mar 2011 03:43:35 -0000 1.78 @@ -66,7 +66,7 @@ # Git revision and branch ID # 0.24 release: git tag b0.24 -%define _gitrev 4af46b1f5d +%define _gitrev 464fa28373 %define branch fixes/0.24 # @@ -83,7 +83,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -417,10 +417,6 @@ Requires: libXxf86vm-devel Requires: mesa-libGLU-devel Requires: xorg-x11-proto-devel -%ifarch %{ix86} x86_64 -Requires: xorg-x11-drv-i810-devel -Requires: xorg-x11-drv-openchrome-devel -%endif # OpenGL video output and vsync support Requires: libGL-devel, libGLU-devel @@ -1457,6 +1453,10 @@ ################################################################################ %changelog +* Thu Mar 24 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-7 +- Update to 0.24 fixes, git revision 464fa28373 +- Remove i810 and openchrome detritus + * Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6 - Update to 0.24 fixes, git revision 4af46b1f5d - Fix mythtv version output to properly show git revision

13 years

1
0
0 / 0

rpms/rt2870/devel rt2870.spec,1.10,1.11

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2870/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11623 Modified Files: rt2870.spec Log Message: * Thu Mar 24 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-2 - Blacklist kernel rt2870 modules up to Fedora 15 Index: rt2870.spec =================================================================== RCS file: /cvs/free/rpms/rt2870/devel/rt2870.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rt2870.spec 11 Jul 2010 04:44:13 -0000 1.10 +++ rt2870.spec 25 Mar 2011 01:45:11 -0000 1.11 @@ -1,8 +1,9 @@ -%define SourceName 2010_0709_RT2870_Linux_STA_v2.4.0.1 +%global blacklist_up_to_fedora 15 +%global SourceName 2010_0709_RT2870_Linux_STA_v2.4.0.1 Name: rt2870 Version: 2.4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common files for RaLink rt2870 kernel driver Group: System Environment/Kernel License: GPLv2+ @@ -57,7 +58,7 @@ install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2870STA/ install -pm 0644 RT2870STA*.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2870STA/ cp -a %{SOURCE2} . -%if 0%{fedora} < 14 +%if 0%{fedora} < %{blacklist_up_to_fedora} install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ %endif @@ -71,11 +72,14 @@ %dir %{_sysconfdir}/Wireless %dir %{_sysconfdir}/Wireless/RT2870STA %config(noreplace) %{_sysconfdir}/Wireless/RT2870STA/RT2870STA*.dat -%if 0%{fedora} < 14 +%if 0%{fedora} < %{blacklist_up_to_fedora} %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf %endif %changelog +* Thu Mar 24 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-2 +- Blacklist kernel rt2870 modules up to Fedora 15 + * Sat Jul 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-1 - Update to 2.4.0.1

13 years

1
0
0 / 0

rpms/rt2870/F-14 rt2870.spec,1.10,1.11

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2870/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11519 Modified Files: rt2870.spec Log Message: * Thu Mar 24 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-2 - Blacklist kernel rt2870 modules up to Fedora 15 Index: rt2870.spec =================================================================== RCS file: /cvs/free/rpms/rt2870/F-14/rt2870.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rt2870.spec 11 Jul 2010 04:44:13 -0000 1.10 +++ rt2870.spec 25 Mar 2011 01:44:18 -0000 1.11 @@ -1,8 +1,9 @@ -%define SourceName 2010_0709_RT2870_Linux_STA_v2.4.0.1 +%global blacklist_up_to_fedora 15 +%global SourceName 2010_0709_RT2870_Linux_STA_v2.4.0.1 Name: rt2870 Version: 2.4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common files for RaLink rt2870 kernel driver Group: System Environment/Kernel License: GPLv2+ @@ -57,7 +58,7 @@ install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2870STA/ install -pm 0644 RT2870STA*.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2870STA/ cp -a %{SOURCE2} . -%if 0%{fedora} < 14 +%if 0%{fedora} < %{blacklist_up_to_fedora} install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ %endif @@ -71,11 +72,14 @@ %dir %{_sysconfdir}/Wireless %dir %{_sysconfdir}/Wireless/RT2870STA %config(noreplace) %{_sysconfdir}/Wireless/RT2870STA/RT2870STA*.dat -%if 0%{fedora} < 14 +%if 0%{fedora} < %{blacklist_up_to_fedora} %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf %endif %changelog +* Thu Mar 24 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-2 +- Blacklist kernel rt2870 modules up to Fedora 15 + * Sat Jul 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-1 - Update to 2.4.0.1

13 years

1
0
0 / 0

rpms/vlc/F-14 vlc-1.1.8-bugfix.opencv22.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 sources, 1.41, 1.42 vlc.spec, 1.104, 1.105

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24237/F-14 Modified Files: .cvsignore sources vlc.spec Added Files: vlc-1.1.8-bugfix.opencv22.patch Log Message: Update to 1.1.8 vlc-1.1.8-bugfix.opencv22.patch: opencv_example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vlc-1.1.8-bugfix.opencv22.patch --- diff -up vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22 vlc-1.1.8/modules/video_filter/opencv_example.c --- vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22 2010-04-13 02:22:27.000000000 +0200 +++ vlc-1.1.8/modules/video_filter/opencv_example.c 2011-03-23 10:47:05.053097995 +0100 @@ -191,7 +191,7 @@ static picture_t *Filter( filter_t *p_fi CvSeq *faces = cvHaarDetectObjects( p_img[0], p_sys->p_cascade, p_sys->p_storage, 1.15, 5, CV_HAAR_DO_CANNY_PRUNING, - cvSize(20, 20) ); + cvSize(0, 0), cvSize(0, 0) ); //create the video_filter_region_info_t struct if (faces && (faces->total > 0)) { Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 2 Feb 2011 17:23:53 -0000 1.35 +++ .cvsignore 24 Mar 2011 08:39:36 -0000 1.36 @@ -1 +1 @@ -vlc-1.1.7.tar.bz2 +vlc-1.1.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 2 Feb 2011 17:23:53 -0000 1.41 +++ sources 24 Mar 2011 08:39:36 -0000 1.42 @@ -1 +1 @@ -932ce1fa4afa54b56ac0ccc0655667b6 vlc-1.1.7.tar.bz2 +c0065ec11b6fd12167cd440cbe0ef0d9 vlc-1.1.8.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- vlc.spec 2 Feb 2011 17:23:53 -0000 1.104 +++ vlc.spec 24 Mar 2011 08:39:36 -0000 1.105 @@ -1,6 +1,8 @@ #global live555_date 2009.07.28 #global vlc_rc -rc3 %global vlc_bootstrap 1 +%global tarball_version 1.1.8 +#global _with_workaround_circle_deps 1 %global _with_freeworld 1 %if 0%{?_with_freeworld:1} %global _with_a52dec --with-a52dec @@ -19,13 +21,14 @@ %endif %if 0%{?fedora} > 14 # Those need works in Rawhide -%global _without_opencv 1 %global _without_mozilla 1 +%else +%global _with_gnomevfs 1 %endif Summary: The cross-platform open-source multimedia framework, player and server Name: vlc -Version: 1.1.7 +Version: 1.1.8 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -37,6 +40,7 @@ Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch Patch3: vlc-1.1.6-hardode_font_patch.patch Patch4: vlc-1.1.4-tls_path.patch +Patch5: vlc-1.1.8-bugfix.opencv22.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -61,7 +65,7 @@ BuildRequires: flac-devel BuildRequires: fluidsynth-devel BuildRequires: fribidi-devel -BuildRequires: gnome-vfs2-devel +%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel} BuildRequires: gnutls-devel >= 1.0.17 BuildRequires: gsm-devel BuildRequires: jack-audio-connection-kit-devel @@ -151,6 +155,7 @@ %{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel} %{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}} +%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer} Provides: %{name}-xorg%{_isa} = %{version}-%{release} @@ -238,13 +243,16 @@ %prep -%setup -q -n %{name}-%{version}%{?vlc_rc} +%setup -q -n %{name}-%{tarball_version}%{?vlc_rc} %if 0%{?live555_date:1} %setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc} %endif %patch0 -p1 -b .noerror %patch3 -p1 -b .hardode_path %patch4 -p1 -b .tls_path +%if 0%{?fedora} >= 15 +%patch5 -p1 -b .opencv22 +%endif sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in rm modules/access/videodev2.h @@ -288,8 +296,8 @@ %{!?_without_opencv:--enable-opencv} \ --enable-sftp \ --enable-pvr \ - --enable-gnomevfs \ -%{?_with_vcdimager--enable-vcdx} \ +%{?_with_gnomevfs:--enable-gnomevfs} \ +%{?_with_vcdimager:--enable-vcdx} \ %if 0 %{?_with_freeworld:--enable-wma-fixed} \ %{?_with_freeworld:--enable-shine} \ @@ -444,7 +452,9 @@ %{_bindir}/qvlc %{_bindir}/svlc %{_libdir}/vlc/plugins/gui/libqt4_plugin.so +%{?_with_gnomevfs: %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so +} %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %{_libdir}/vlc/plugins/misc/libsvg_plugin.so @@ -473,7 +483,9 @@ %{_datadir}/vlc/ %{_libdir}/*.so.* %exclude %{_libdir}/vlc/plugins/gui/libqt4_plugin.so +%{?_with_gnomevfs: %exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so +} %exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so @@ -552,6 +564,15 @@ %changelog +* Thu Mar 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-1 +- Update to 1.1.8 + +* Fri Mar 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-0.2.1 +- Rebuilt for new x264/FFmpeg + +* Mon Mar 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-0.1.1 +- Update to pre-1.1.8 bugfix git from today + * Wed Feb 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.7-1 - Update to 1.1.7

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits March 2011