Author: jarod Update of /cvs/free/rpms/mythtv/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26464 Modified Files: mythplugins-0.23-svnfixes.patch mythtv-0.23-svnfixes.patch mythtv.spec Log Message: * Fri Jul 23 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-8 - Update to release-0-23-fixes branch, svn revision 25413 mythplugins-0.23-svnfixes.patch: configure | 111 mytharchive/mythburn/scripts/mythburn.py | 91 mythgallery/mythgallery/galleryutil.cpp | 5 mythgallery/mythgallery/glsingleview.cpp | 1 mythmusic/mythmusic/avfdecoder.cpp | 3 mythmusic/mythmusic/dbcheck.cpp | 5 mythvideo/mythvideo/dbcheck.cpp | 5 mythvideo/mythvideo/videodlg.cpp | 19 mythweather/mythweather/scripts/ca_envcan/ENVCAN-Stations.xml | 176 mythweather/mythweather/scripts/ca_envcan/envcan.pl | 18 mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 12 mythweather/mythweather/scripts/no_yrno/yrnoxml.pl | 303 + mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 11 mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 11 mythweather/mythweather/scripts/us_nws/MapSearch.pm | 110 mythweather/mythweather/scripts/us_nws/animaps.pl | 78 mythweather/mythweather/scripts/us_nws/maps | 426 - mythweather/mythweather/scripts/us_nws/maps.pl | 73 mythweather/mythweather/scripts/us_nws/maps.xml | 2290 ---------- mythweather/mythweather/scripts/us_nws/ndfd.pl | 30 mythweather/mythweather/scripts/us_nws/ndfd18.pl | 19 mythweather/mythweather/scripts/us_nws/nws-alert.pl | 12 mythweather/mythweather/scripts/us_nws/nwsxml.pl | 16 mythweather/mythweather/scripts/wunderground/maps.csv | 178 mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 196 mythweather/mythweather/scripts/wunderground/wunderground.pl | 267 + mythweather/mythweather/weatherScreen.cpp | 10 mythweather/mythweather/weatherSource.cpp | 30 mythweather/theme/default-wide/weather-ui.xml | 325 - mythweather/theme/default/weather-ui.xml | 79 mythweb/classes/Database.php | 4 mythweb/classes/Database/Query.php | 4 mythweb/classes/Database/Query/mysql.php | 4 mythweb/classes/Database/Query/mysqlicompat.php | 4 mythweb/classes/Database/mysql.php | 4 mythweb/classes/Database/mysqlicompat.php | 4 mythweb/classes/JSON.php | 4 mythweb/classes/Modules.php | 4 mythweb/classes/MythBackend.php | 8 mythweb/classes/MythFrontend.php | 4 mythweb/includes/class_autoload.php | 4 mythweb/includes/cleanup.php | 4 mythweb/includes/config.php | 4 mythweb/includes/css.php | 4 mythweb/includes/data_dir.php | 4 mythweb/includes/database.php | 4 mythweb/includes/db_update.php | 4 mythweb/includes/defines.php | 4 mythweb/includes/errordisplay.php | 4 mythweb/includes/errors.php | 4 mythweb/includes/init.php | 4 mythweb/includes/jobqueue.php | 4 mythweb/includes/lockdown.php | 4 mythweb/includes/mobile.php | 4 mythweb/includes/mouseovers.php | 4 mythweb/includes/php_version_check.php | 4 mythweb/includes/session.php | 4 mythweb/includes/skin.php | 4 mythweb/includes/sorting.php | 4 mythweb/includes/translate.php | 4 mythweb/includes/utils.php | 4 mythweb/js/pngbehavior.htc | 2 mythweb/js/table_sort.js | 4 mythweb/js/utils.js | 4 mythweb/modules/_shared/tmpl/_errors/db_access_denied.php | 4 mythweb/modules/_shared/tmpl/_errors/db_vars_error.php | 4 mythweb/modules/_shared/tmpl/_errors/error.php | 4 mythweb/modules/_shared/tmpl/_errors/fatal.php | 4 mythweb/modules/_shared/tmpl/_errors/lockdown.php | 4 mythweb/modules/_shared/tmpl/_errors/no_modules.php | 4 mythweb/modules/_shared/tmpl/_errors/site_down.php | 4 mythweb/modules/_shared/tmpl/_errors/unknown_module.php | 4 mythweb/modules/_shared/tmpl/default/footer.php | 4 mythweb/modules/_shared/tmpl/default/header.php | 4 mythweb/modules/_shared/tmpl/default/welcome.php | 4 mythweb/modules/_shared/tmpl/iPod/footer.php | 4 mythweb/modules/_shared/tmpl/iPod/header.php | 4 mythweb/modules/_shared/tmpl/iPod/welcome.php | 4 mythweb/modules/_shared/tmpl/lite/footer.php | 4 mythweb/modules/_shared/tmpl/lite/header.php | 4 mythweb/modules/_shared/tmpl/lite/welcome.php | 4 mythweb/modules/_shared/tmpl/wap/footer.php | 4 mythweb/modules/_shared/tmpl/wap/header.php | 4 mythweb/modules/_shared/tmpl/wap/welcome.php | 4 mythweb/modules/backend_log/handler.php | 4 mythweb/modules/backend_log/init.php | 4 mythweb/modules/backend_log/tmpl/default/backend_log.php | 4 mythweb/modules/backend_log/tmpl/default/welcome.php | 4 mythweb/modules/backend_log/tmpl/lite/backend_log.php | 4 mythweb/modules/backend_log/tmpl/lite/welcome.php | 4 mythweb/modules/database/init.php | 4 mythweb/modules/database/set_settings.php | 4 mythweb/modules/database/tmpl/default/set_settings.php | 4 mythweb/modules/music/handler.php | 4 mythweb/modules/music/init.php | 4 mythweb/modules/music/mp3act_functions.php | 4 mythweb/modules/music/stream.php | 4 mythweb/modules/music/tmpl/default/welcome.php | 4 mythweb/modules/mythtv/init.php | 4 mythweb/modules/mythtv/set_keys.php | 4 mythweb/modules/mythtv/set_settings.php | 4 mythweb/modules/mythtv/tmpl/default/set_keys.php | 4 mythweb/modules/mythtv/tmpl/default/set_settings.php | 4 mythweb/modules/mythtv/tmpl/lite/set_keys.php | 4 mythweb/modules/mythtv/tmpl/lite/set_settings.php | 4 mythweb/modules/mythweb/init.php | 4 mythweb/modules/mythweb/set_defaults.php | 4 mythweb/modules/mythweb/set_flvplayer.php | 4 mythweb/modules/mythweb/set_session.php | 4 mythweb/modules/mythweb/tmpl/default/set_defaults.php | 4 mythweb/modules/mythweb/tmpl/default/set_flvplayer.php | 4 mythweb/modules/mythweb/tmpl/default/set_session.php | 4 mythweb/modules/mythweb/tmpl/lite/set_defaults.php | 4 mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php | 4 mythweb/modules/mythweb/tmpl/lite/set_session.php | 4 mythweb/modules/remote/do.php | 4 mythweb/modules/remote/handler.php | 4 mythweb/modules/remote/init.php | 4 mythweb/modules/remote/keys.php | 4 mythweb/modules/remote/play_program_on_frontend.php | 4 mythweb/modules/remote/tmpl/default/keys.php | 4 mythweb/modules/remote/tmpl/default/remote.php | 4 mythweb/modules/remote/tmpl/default/welcome.php | 4 mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php | 4 mythweb/modules/remote/tmpl/iPod/welcome.php | 4 mythweb/modules/settings/handler.php | 4 mythweb/modules/settings/init.php | 4 mythweb/modules/settings/tmpl/default/header.php | 4 mythweb/modules/settings/tmpl/default/welcome.php | 4 mythweb/modules/settings/tmpl/lite/header.php | 4 mythweb/modules/settings/tmpl/lite/mythweb.php | 4 mythweb/modules/settings/tmpl/lite/welcome.php | 4 mythweb/modules/stats/handler.php | 4 mythweb/modules/stats/init.php | 4 mythweb/modules/stats/tmpl/default/stats.php | 4 mythweb/modules/stats/tmpl/default/welcome.php | 4 mythweb/modules/stats/tmpl/lite/stats.php | 4 mythweb/modules/stats/tmpl/lite/welcome.php | 4 mythweb/modules/status/handler.php | 4 mythweb/modules/status/init.php | 4 mythweb/modules/status/tmpl/default/status.php | 4 mythweb/modules/status/tmpl/default/welcome.php | 4 mythweb/modules/status/tmpl/lite/status.php | 4 mythweb/modules/status/tmpl/lite/welcome.php | 4 mythweb/modules/status/tmpl/wap/status.php | 4 mythweb/modules/stream/handler.pl | 4 mythweb/modules/stream/init.php | 4 mythweb/modules/stream/set_protocol.php | 4 mythweb/modules/stream/stream_asx.pl | 4 mythweb/modules/stream/stream_flv.pl | 4 mythweb/modules/stream/stream_flvp.pl | 4 mythweb/modules/stream/stream_mp4.pl | 4 mythweb/modules/stream/stream_raw.pl | 4 mythweb/modules/stream/tmpl/default/set_protocol.php | 4 mythweb/modules/stream/tmpl/lite/set_protocol.php | 4 mythweb/modules/stream/tv.pl | 4 mythweb/modules/tv/canned_searches.conf.php | 4 mythweb/modules/tv/channel.php | 4 mythweb/modules/tv/classes/Channel.php | 4 mythweb/modules/tv/classes/Channel_List.php | 4 mythweb/modules/tv/classes/Program.php | 4 mythweb/modules/tv/classes/Recording.php | 4 mythweb/modules/tv/classes/Schedule.php | 4 mythweb/modules/tv/detail.php | 4 mythweb/modules/tv/get_pixmap.php | 4 mythweb/modules/tv/handler.php | 4 mythweb/modules/tv/includes/channels.php | 4 mythweb/modules/tv/includes/programs.php | 4 mythweb/modules/tv/includes/recording_schedules.php | 4 mythweb/modules/tv/includes/schedule_utils.php | 4 mythweb/modules/tv/init.php | 4 mythweb/modules/tv/list.php | 4 mythweb/modules/tv/list_recording_groups.php | 4 mythweb/modules/tv/list_shows_in_title_and_group.php | 4 mythweb/modules/tv/list_titles_in_group.php | 4 mythweb/modules/tv/opensearch.php | 4 mythweb/modules/tv/recorded.php | 4 mythweb/modules/tv/schedules.php | 4 mythweb/modules/tv/schedules_custom.php | 4 mythweb/modules/tv/schedules_manual.php | 4 mythweb/modules/tv/search.php | 4 mythweb/modules/tv/searches.php | 4 mythweb/modules/tv/set_channels.php | 4 mythweb/modules/tv/set_playgroup.php | 4 mythweb/modules/tv/set_screens.php | 4 mythweb/modules/tv/set_session.php | 4 mythweb/modules/tv/submenu.php | 4 mythweb/modules/tv/tmpl/default/channel.php | 4 mythweb/modules/tv/tmpl/default/detail.php | 4 mythweb/modules/tv/tmpl/default/list.php | 4 mythweb/modules/tv/tmpl/default/list_data.php | 4 mythweb/modules/tv/tmpl/default/recorded.php | 4 mythweb/modules/tv/tmpl/default/schedules.php | 4 mythweb/modules/tv/tmpl/default/schedules_custom.php | 4 mythweb/modules/tv/tmpl/default/schedules_manual.php | 4 mythweb/modules/tv/tmpl/default/search.php | 4 mythweb/modules/tv/tmpl/default/searches.php | 4 mythweb/modules/tv/tmpl/default/set_channels.php | 4 mythweb/modules/tv/tmpl/default/set_playgroup.php | 4 mythweb/modules/tv/tmpl/default/set_screens.php | 4 mythweb/modules/tv/tmpl/default/set_session.php | 4 mythweb/modules/tv/tmpl/default/upcoming.php | 4 mythweb/modules/tv/tmpl/default/welcome.php | 4 mythweb/modules/tv/tmpl/iPod/detail.php | 4 mythweb/modules/tv/tmpl/iPod/list_recording_groups.php | 4 mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php | 4 mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php | 4 mythweb/modules/tv/tmpl/iPod/search.php | 4 mythweb/modules/tv/tmpl/iPod/submenu.php | 4 mythweb/modules/tv/tmpl/iPod/upcoming.php | 4 mythweb/modules/tv/tmpl/iPod/welcome.php | 4 mythweb/modules/tv/tmpl/ical/upcoming.php | 4 mythweb/modules/tv/tmpl/lite/channel.php | 4 mythweb/modules/tv/tmpl/lite/detail.php | 4 mythweb/modules/tv/tmpl/lite/list.php | 4 mythweb/modules/tv/tmpl/lite/recorded.php | 4 mythweb/modules/tv/tmpl/lite/schedules.php | 4 mythweb/modules/tv/tmpl/lite/schedules_custom.php | 4 mythweb/modules/tv/tmpl/lite/schedules_manual.php | 4 mythweb/modules/tv/tmpl/lite/search.php | 4 mythweb/modules/tv/tmpl/lite/searches.php | 4 mythweb/modules/tv/tmpl/lite/set_channels.php | 10 mythweb/modules/tv/tmpl/lite/set_session.php | 4 mythweb/modules/tv/tmpl/lite/upcoming.php | 4 mythweb/modules/tv/tmpl/lite/welcome.php | 4 mythweb/modules/tv/tmpl/rss/recorded.php | 4 mythweb/modules/tv/tmpl/wap/channel.php | 4 mythweb/modules/tv/tmpl/wap/detail.php | 4 mythweb/modules/tv/tmpl/wap/list.php | 4 mythweb/modules/tv/tmpl/wap/recorded.php | 4 mythweb/modules/tv/tmpl/wap/search.php | 4 mythweb/modules/tv/tmpl/wap/upcoming.php | 4 mythweb/modules/tv/upcoming.php | 4 mythweb/modules/video/edit.php | 4 mythweb/modules/video/handler.php | 4 mythweb/modules/video/imdb.php | 4 mythweb/modules/video/init.php | 4 mythweb/modules/video/scan.php | 4 mythweb/modules/video/set_settings.php | 4 mythweb/modules/video/tmpl/default/set_settings.php | 4 mythweb/modules/video/tmpl/default/video.php | 4 mythweb/modules/video/tmpl/default/welcome.php | 4 mythweb/modules/weather/classes/WeatherScreen.php | 4 mythweb/modules/weather/handler.php | 4 mythweb/modules/weather/init.php | 4 mythweb/modules/weather/set_screen.php | 4 mythweb/modules/weather/tmpl/default/set_screen.php | 4 mythweb/modules/weather/tmpl/default/weather.18h.php | 4 mythweb/modules/weather/tmpl/default/weather.3d.php | 4 mythweb/modules/weather/tmpl/default/weather.6d.php | 4 mythweb/modules/weather/tmpl/default/weather.am.php | 4 mythweb/modules/weather/tmpl/default/weather.cc.php | 4 mythweb/modules/weather/tmpl/default/weather.php | 4 mythweb/modules/weather/tmpl/default/weather.sm.php | 4 mythweb/modules/weather/tmpl/default/welcome.php | 4 mythweb/modules/welcome.php | 4 mythweb/mythweb.php | 4 mythweb/mythweb.pl | 4 mythzoneminder/mythzoneminder/zmclient.cpp | 34 mythzoneminder/mythzoneminder/zmdefines.h | 1 mythzoneminder/mythzoneminder/zmliveplayer.cpp | 18 settings.pro | 4 262 files changed, 2077 insertions(+), 3810 deletions(-) Index: mythplugins-0.23-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythplugins-0.23-svnfixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythplugins-0.23-svnfixes.patch 20 Jul 2010 03:56:33 -0000 1.5 +++ mythplugins-0.23-svnfixes.patch 23 Jul 2010 19:10:21 -0000 1.6 @@ -9630,7 +9630,15 @@ diff -Naurp mythplugins-0.23-release/settings.pro mythplugins-0.23/settings.pro --- mythplugins-0.23-release/settings.pro 2010-02-16 17:59:56.000000000 -0500 -+++ mythplugins-0.23/settings.pro 2010-05-11 11:29:36.773259000 -0400 ++++ mythplugins-0.23/settings.pro 2010-07-21 22:21:00.112292000 -0400 +@@ -1,6 +1,6 @@ + CONFIG += $$CCONFIG + +-LIBVERSION = 0.23 ++LIBVERSION = 0.23.1 + + INCLUDEPATH += $${SYSROOT}$${PREFIX}/include + #INCLUDEPATH += /usr/include/cdda @@ -60,7 +60,7 @@ LOCAL_LIBDIR_X11 = } QMAKE_LIBDIR_X11 = mythtv-0.23-svnfixes.patch: VERSION | 1 bindings/perl/IO/Socket/INET/MythTV.pm | 4 bindings/perl/MythTV.pm | 15 - bindings/perl/MythTV/Channel.pm | 64 ++--- bindings/perl/MythTV/Program.pm | 4 bindings/perl/MythTV/Recording.pm | 4 bindings/perl/MythTV/StorageGroup.pm | 4 bindings/python/MythTV/MythData.py | 4 bindings/python/MythTV/MythFunc.py | 13 - bindings/python/MythTV/MythStatic.py | 3 bindings/python/MythTV/__init__.py | 3 bindings/python/scripts/mythpython | 34 ++ bindings/python/setup.py | 3 configure | 22 + contrib/config_files/lirc/lircrc.native.example.mceusb2 | 2 contrib/icons/master_iconmap/channel_icons.pl | 4 contrib/maintenance/flush_deleted_recgroup.pl | 4 contrib/maintenance/optimize_mythdb.pl | 4 contrib/user_jobs/firewire_primer.pl | 4 contrib/user_jobs/mythlink.pl | 4 libs/libavcodec/libavcodec.pro | 5 libs/libmyth/audiooutput.h | 1 libs/libmyth/audiooutputalsa.cpp | 4 libs/libmyth/audiooutputbase.cpp | 5 libs/libmyth/audiooutputbase.h | 1 libs/libmyth/audiooutputca.cpp | 4 libs/libmyth/audiooutputoss.cpp | 2 libs/libmyth/audiooutputpulse.cpp | 13 - libs/libmyth/mediamonitor-darwin.cpp | 29 +- libs/libmyth/mythcdrom-linux.cpp | 10 libs/libmyth/mythcontext.cpp | 9 libs/libmyth/programinfo.cpp | 3 libs/libmyth/remoteutil.cpp | 8 libs/libmyth/remoteutil.h | 3 libs/libmyth/schemawizard.cpp | 17 + libs/libmythdb/mythdirs.cpp | 5 libs/libmythdb/mythsocket.cpp | 19 + libs/libmythdb/mythsocket.h | 4 libs/libmythdb/mythsocketthread.cpp | 4 libs/libmythdb/mythversion.h | 12 - libs/libmythdvdnav/dvdnav/dvdnav_internal.h | 4 libs/libmythdvdnav/dvdread/bswap.h | 4 libs/libmythdvdnav/libmythdvdnav.pro | 3 libs/libmythsoundtouch/AAFilter.cpp | 2 libs/libmythsoundtouch/AAFilter.h | 2 libs/libmythsoundtouch/BPMDetect.h | 2 libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 2 libs/libmythsoundtouch/FIFOSampleBuffer.h | 2 libs/libmythsoundtouch/FIFOSamplePipe.h | 2 libs/libmythsoundtouch/FIRFilter.cpp | 2 libs/libmythsoundtouch/FIRFilter.h | 2 libs/libmythsoundtouch/RateTransposer.cpp | 2 libs/libmythsoundtouch/RateTransposer.h | 2 libs/libmythsoundtouch/STTypes.h | 2 libs/libmythsoundtouch/SoundTouch.cpp | 2 libs/libmythsoundtouch/SoundTouch.h | 2 libs/libmythsoundtouch/TDStretch.cpp | 2 libs/libmythsoundtouch/TDStretch.h | 2 libs/libmythsoundtouch/cpu_detect.h | 2 libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 2 libs/libmythsoundtouch/mmx_gcc.cpp | 2 libs/libmythtv/NuppelVideoPlayer.cpp | 16 + libs/libmythtv/NuppelVideoPlayer.h | 1 libs/libmythtv/NuppelVideoRecorder.cpp | 12 - libs/libmythtv/RTjpegN.h | 2 libs/libmythtv/avformatdecoder.cpp | 33 ++ libs/libmythtv/dbcheck.cpp | 9 libs/libmythtv/firewiredevice.cpp | 2 libs/libmythtv/firewirerecorder.cpp | 2 libs/libmythtv/iptvrecorder.cpp | 2 libs/libmythtv/jobqueue.h | 1 libs/libmythtv/mpeg/mpegstreamdata.cpp | 8 libs/libmythtv/mpeg/tspacket.cpp | 2 libs/libmythtv/mpeg/tspacket.h | 4 libs/libmythtv/nuppeldecoder.cpp | 20 - libs/libmythtv/nuppeldecoder.h | 4 libs/libmythtv/recordinginfo.cpp | 3 libs/libmythtv/tv_play.cpp | 19 - libs/libmythtv/tv_play.h | 2 libs/libmythtv/videoout_d3d.cpp | 4 libs/libmythtv/videoout_d3d.h | 2 libs/libmythtv/videoout_quartz.cpp | 192 ++++++++++------ libs/libmythtv/videoout_quartz.h | 6 libs/libmythtv/videooutbase.h | 6 libs/libmythtv/yuv2rgb.cpp | 4 libs/libmythui/mythfontmanager.cpp | 6 libs/libmythui/mythmainwindow.cpp | 12 - libs/libmythui/mythsystem.cpp | 4 libs/libmythui/mythuitext.cpp | 12 - libs/libmythui/util-nvctrl.cpp | 24 +- libs/libmythui/xmlparsebase.cpp | 6 libs/libswscale/libswscale.pro | 6 programs/mythbackend/filetransfer.cpp | 3 programs/mythbackend/main.cpp | 7 programs/mythbackend/mainserver.cpp | 37 +-- programs/mythbackend/mainserver.h | 6 programs/mythcommflag/main.cpp | 35 ++ programs/mythfrontend/playbackbox.cpp | 35 +- programs/mythfrontend/playbackboxhelper.cpp | 11 programs/mythfrontend/playbackboxhelper.h | 3 programs/mythfrontend/statusbox.cpp | 2 programs/mythtranscode/transcode.cpp | 5 programs/mythtv-setup/main.cpp | 2 settings.pro | 6 themes/MythCenter-wide/base.xml | 4 themes/MythCenter/base.xml | 4 version.pro | 2 107 files changed, 636 insertions(+), 357 deletions(-) Index: mythtv-0.23-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv-0.23-svnfixes.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mythtv-0.23-svnfixes.patch 20 Jul 2010 03:56:33 -0000 1.6 +++ mythtv-0.23-svnfixes.patch 23 Jul 2010 19:10:21 -0000 1.7 @@ -150,20 +150,27 @@ # diff -Naurp mythtv-0.23-release/bindings/perl/MythTV.pm mythtv-0.23/bindings/perl/MythTV.pm --- mythtv-0.23-release/bindings/perl/MythTV.pm 2010-03-01 17:17:19.000000000 -0500 -+++ mythtv-0.23/bindings/perl/MythTV.pm 2010-07-16 23:32:13.745324000 -0400 -@@ -1,9 +1,9 @@ ++++ mythtv-0.23/bindings/perl/MythTV.pm 2010-07-21 22:21:00.112292000 -0400 +@@ -1,14 +1,14 @@ # # MythTV bindings for perl. # -# @url $URL: http://svn.mythtv.org/svn/tags/release-0-23/mythtv/bindings/perl/MythTV.pm $ -# @date $Date$ -# @version $Revision$ +-# @author $Author$ +# @url $URL: svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b... $ +# @date $Date$ +# @version $Revision$ - # @author $Author$ ++# @author $Author$ # + # Version +- $VERSION = '.21svn'; ++ $VERSION = '.23.1svn'; + + # Load sub libraries + use IO::Socket::INET::MythTV; @@ -101,7 +101,7 @@ package MythTV; # MYTH_PROTO_VERSION is defined in libmyth in mythtv/libs/libmyth/mythcontext.h @@ -269,12 +276,12 @@ diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythStatic.py mythtv-0.23/bindings/python/MythTV/MythStatic.py --- mythtv-0.23-release/bindings/python/MythTV/MythStatic.py 2010-01-29 20:25:12.000000000 -0500 -+++ mythtv-0.23/bindings/python/MythTV/MythStatic.py 2010-07-16 23:32:13.745324000 -0400 ++++ mythtv-0.23/bindings/python/MythTV/MythStatic.py 2010-07-21 22:21:00.112292000 -0400 @@ -4,9 +4,10 @@ Contains any static and global variables for MythTV Python Bindings """ -+OWN_VERSION = (0,23,0,0) ++OWN_VERSION = (0,23,1,0) SCHEMA_VERSION = 1254 MVSCHEMA_VERSION = 1032 NVSCHEMA_VERSION = 1004 @@ -322,8 +329,13 @@ + code.InteractiveConsole(namespace).interact(banner) diff -Naurp mythtv-0.23-release/bindings/python/setup.py mythtv-0.23/bindings/python/setup.py --- mythtv-0.23-release/bindings/python/setup.py 2010-01-28 20:39:37.000000000 -0500 -+++ mythtv-0.23/bindings/python/setup.py 2010-06-21 23:35:41.632640000 -0400 -@@ -8,4 +8,5 @@ setup( ++++ mythtv-0.23/bindings/python/setup.py 2010-07-21 22:21:00.112292000 -0400 +@@ -4,8 +4,9 @@ from distutils.core import setup + + setup( + name='MythTV', +- version='0.23.0', ++ version='0.23.1', description='MythTV Python bindings.', packages=['MythTV', 'MythTV/tmdb', 'MythTV/ttvdb'], url=['http://www.mythtv.org/'], @@ -969,7 +981,7 @@ VERBOSE(VB_SOCKET, SLOC(sock) + "calling m_cb->readyRead()"); diff -Naurp mythtv-0.23-release/libs/libmythdb/mythversion.h mythtv-0.23/libs/libmythdb/mythversion.h --- mythtv-0.23-release/libs/libmythdb/mythversion.h 2010-04-29 20:59:58.000000000 -0400 -+++ mythtv-0.23/libs/libmythdb/mythversion.h 2010-07-16 23:32:13.745324000 -0400 ++++ mythtv-0.23/libs/libmythdb/mythversion.h 2010-07-21 22:21:00.112292000 -0400 @@ -9,9 +9,9 @@ #endif @@ -979,7 +991,7 @@ -#define MYTH_BINARY_VERSION "0.23.20100429-1" +/// Including changes in the libmythdb, libmyth, libmythtv, libmythav* and +/// libmythui class methods used by plug-ins. -+#define MYTH_BINARY_VERSION "0.23.201000710-1" ++#define MYTH_BINARY_VERSION "0.23.1.201000710-1" /** \brief Increment this whenever the MythTV network protocol changes. * @@ -1740,6 +1752,24 @@ bswap_16_buf((short int*) buf, sample_cnt, audio_channels); #endif +diff -Naurp mythtv-0.23-release/libs/libmythtv/recordinginfo.cpp mythtv-0.23/libs/libmythtv/recordinginfo.cpp +--- mythtv-0.23-release/libs/libmythtv/recordinginfo.cpp 2010-03-06 22:11:52.000000000 -0500 ++++ mythtv-0.23/libs/libmythtv/recordinginfo.cpp 2010-07-20 17:13:11.577995000 -0400 +@@ -688,12 +688,13 @@ void RecordingInfo::FinishedRecording(bo + { + MSqlQuery query(MSqlQuery::InitCon()); + query.prepare("UPDATE recorded SET endtime = :ENDTIME, " +- " duplicate = 1 " ++ " duplicate = :DUPLICATE " + "WHERE chanid = :CHANID AND " + " starttime = :STARTTIME "); + query.bindValue(":ENDTIME", recendts); + query.bindValue(":CHANID", chanid); + query.bindValue(":STARTTIME", recstartts); ++ query.bindValue(":DUPLICATE", !prematurestop); + + if (!query.exec()) + MythDB::DBError("FinishedRecording update", query); diff -Naurp mythtv-0.23-release/libs/libmythtv/RTjpegN.h mythtv-0.23/libs/libmythtv/RTjpegN.h --- mythtv-0.23-release/libs/libmythtv/RTjpegN.h 2009-07-06 16:42:28.000000000 -0400 +++ mythtv-0.23/libs/libmythtv/RTjpegN.h 2010-06-28 03:29:58.793477000 -0400 @@ -2926,7 +2956,18 @@ ChannelScannerCLI scanner(doScanSaveOnly, scanInteractive); diff -Naurp mythtv-0.23-release/settings.pro mythtv-0.23/settings.pro --- mythtv-0.23-release/settings.pro 2010-03-26 09:36:07.000000000 -0400 -+++ mythtv-0.23/settings.pro 2010-05-11 10:29:50.223949000 -0400 ++++ mythtv-0.23/settings.pro 2010-07-21 22:21:00.112292000 -0400 +@@ -24,8 +24,8 @@ isEmpty( LIBDIR ) { + LIBDIR = $${RUNPREFIX}/$${LIBDIRNAME} + } + +-LIBVERSION = 0.23 +-VERSION = 0.23.0 ++LIBVERSION = 0.23.1 ++VERSION = 0.23.1 + + isEmpty(TARGET_OS) : win32 { + CONFIG += mingw @@ -123,7 +123,7 @@ ALSA_LIBS = $$CONFIG_AUDIO_ALSA_LIBS JACK_LIBS = $$CONFIG_AUDIO_JACK_LIBS PULSE_LIBS = $$CONFIG_AUDIO_PULSE_LIBS Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- mythtv.spec 20 Jul 2010 03:56:33 -0000 1.88 +++ mythtv.spec 23 Jul 2010 19:10:21 -0000 1.89 @@ -65,7 +65,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r25380 +%define _svnrev r25413 %define branch release-0-23-fixes # @@ -81,7 +81,7 @@ %if "%{branch}" == "trunk" Release: 0.1.svn.%{_svnrev}%{?dist} %else -Release: 7%{?dist} +Release: 8%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1449,6 +1449,9 @@ ################################################################################ %changelog +* Fri Jul 23 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-8 +- Update to release-0-23-fixes branch, svn revision 25413 + * Mon Jul 19 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-7 - Update to release-0-23-fixes branch, svn revision 25380 - Drop vuvuzela filter patch, the World Cup is over