rpms/mythtv/F-12 mythbackend.init, 1.4, 1.5 mythplugins-0.23-svnfixes.patch, 1.3, 1.4 mythtv-0.23-svnfixes.patch, 1.4, 1.5 mythtv.spec, 1.70, 1.71

Jarod Wilson jarod at rpmfusion.org
Wed Jul 7 06:13:49 CEST 2010


Author: jarod

Update of /cvs/free/rpms/mythtv/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28530

Modified Files:
	mythbackend.init mythplugins-0.23-svnfixes.patch 
	mythtv-0.23-svnfixes.patch mythtv.spec 
Log Message:
* Wed Jul 07 2010 Jarod Wilson <jarod at wilsonet.com> 0.23-6
- Update to release-0-23-fixes branch, svn revision 25277
- Even more run-as-non-root initscript tweaks (rpmfusion bz#1295)



Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythbackend.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythbackend.init	21 Jun 2010 14:51:40 -0000	1.4
+++ mythbackend.init	7 Jul 2010 04:13:48 -0000	1.5
@@ -32,6 +32,7 @@
     /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
     /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
     /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
+    /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/vbi*
   fi
   export MYTHCONFDIR="$MYTHTV_HOME"
   export HOME="$MYTHTV_HOME"
@@ -50,6 +51,7 @@
     /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
     /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
     /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
+    /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/vbi*
   fi
   echo
   [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid

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 
 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                                   |    4 
 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                                                      |    2 
 261 files changed, 2061 insertions(+), 3801 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 mythplugins-0.23-svnfixes.patch
Index: mythplugins-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythplugins-0.23-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythplugins-0.23-svnfixes.patch	18 Jun 2010 12:00:22 -0000	1.3
+++ mythplugins-0.23-svnfixes.patch	7 Jul 2010 04:13:48 -0000	1.4
@@ -1,3 +1,138 @@
+diff -Naurp mythplugins-0.23-release/configure mythplugins-0.23/configure
+--- mythplugins-0.23-release/configure	2010-01-13 17:16:20.000000000 -0500
++++ mythplugins-0.23/configure	2010-06-28 05:32:49.842135000 -0400
+@@ -3,6 +3,95 @@
+ # Configure script for mythplugins
+ #
+ 
++###
++# functions from ffmpeg'sconfigure
++
++log(){
++    echo "$@" >> $logfile
++}
++
++log_file(){
++    log BEGIN $1
++    pr -n -t $1 >> $logfile
++    log END $1
++}
++
++echolog(){
++    log "$@"
++    echo "$@"
++}
++
++set_all(){
++    value=$1
++    shift
++    for var in $*; do
++        eval $var=$value
++    done
++}
++
++enable(){
++    set_all yes $*
++}
++
++disable(){
++    set_all no $*
++}
++
++enabled(){
++    test "${1#!}" = "$1" && op== || op=!=
++    eval test "x\$${1#!}" $op "xyes"
++}
++
++disabled(){
++    test "${1#!}" = "$1" && op== || op=!=
++    eval test "x\$${1#!}" $op "xno"
++}
++
++enabled_all(){
++    for opt; do
++        enabled $opt || return 1
++    done
++}
++
++disabled_all(){
++    for opt; do
++        disabled $opt || return 1
++    done
++}
++
++enabled_any(){
++    for opt; do
++        enabled $opt && return 0
++    done
++}
++
++disabled_any(){
++    for opt; do
++        disabled $opt && return 0
++    done
++    return 1
++}
++
++is_in(){
++    value=$1
++    shift
++    for var in $*; do
++        [ $var = $value ] && return 0
++    done
++    return 1
++}
++
++check_cmd(){
++    log "$@"
++    "$@" >> $logfile 2>&1
++}
++
++die_unknown(){
++    echo "Unknown option \"$1\"."
++    echo "See $0 --help for available options."
++    exit 1
++}
++
+ #
+ #    default parameters for all plugins
+ #
+@@ -11,6 +100,8 @@ prefix="/usr/local"
+ libdir_name="lib"
+ sysroot=""
+ 
++logfile="config.ep"
++
+ music="yes"
+ video="yes"
+ weather="yes"
+@@ -385,6 +476,26 @@ if test "$exif" != "no" ; then
+     fi
+ fi
+ 
++if ! disabled weather; then
++    check_pl_lib(){
++        log check_pl_lib "$@"
++        check_cmd perl -e "use ${1};"
++    }
++ 
++    disable_weather(){
++        echo "WARNING: disabling MythWeather; missing $1"
++        disable weather
++    }
++
++    check_pl_lib "Date::Manip"  || disable_weather "Date::Manip"
++    check_pl_lib "XML::Simple"  || disable_weather "XML::Simple"
++    check_pl_lib "XML::XPath"  || disable_weather "XML::XPath"
++    check_pl_lib "Image::Size"  || disable_weather "Image::Size"
++    check_pl_lib "DateTime::Format::ISO8601" || 
++        disable_weather "DateTime::Format::ISO8601"
++    check_pl_lib "SOAP::Lite"  || disable_weather "SOAP::Lite"
++fi
++
+ if test "$music" != "no" ; then
+     vorbis="no"
+     if has_header ogg/ogg.h && has_header vorbis/vorbisenc.h && has_header vorbis/vorbisfile.h && has_header vorbis/codec.h && has_library libogg && has_library libvorbisfile && has_library libvorbisenc && has_library libvorbis ; then
 diff -Naurp mythplugins-0.23-release/mytharchive/mythburn/scripts/mythburn.py mythplugins-0.23/mytharchive/mythburn/scripts/mythburn.py
 --- mythplugins-0.23-release/mytharchive/mythburn/scripts/mythburn.py	2009-04-10 20:04:30.000000000 -0400
 +++ mythplugins-0.23/mytharchive/mythburn/scripts/mythburn.py	2010-05-26 18:32:28.669273000 -0400
@@ -242,6 +377,26 @@
      m_view = new GLSingleView(itemList, pos, slideShow, sortOrder, this);
      l->addWidget(m_view);
  
+diff -Naurp mythplugins-0.23-release/mythmusic/mythmusic/avfdecoder.cpp mythplugins-0.23/mythmusic/mythmusic/avfdecoder.cpp
+--- mythplugins-0.23-release/mythmusic/mythmusic/avfdecoder.cpp	2010-01-04 18:20:21.000000000 -0500
++++ mythplugins-0.23/mythmusic/mythmusic/avfdecoder.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -27,6 +27,7 @@
+ #include <QFile>
+ 
+ // Myth headers
++#include <mythconfig.h>
+ #include <mythcontext.h>
+ #include <audiooutput.h>
+ #include <mythverbose.h>
+@@ -192,7 +193,7 @@ bool avfDecoder::initialize()
+     // Given we are outputing to a sound card, this will always
+     // be a PCM format
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     m_outputFormat = guess_format("s16be", NULL, NULL);
+ #else
+     m_outputFormat = guess_format("s16le", NULL, NULL);
 diff -Naurp mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp
 --- mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp	2009-10-12 02:28:43.000000000 -0400
 +++ mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp	2010-06-06 00:54:24.555359000 -0400
@@ -272,6 +427,5852 @@
          // Pop up messages, questions, warnings, et c. 
          switch (DBup->PromptForUpgrade("Video", true, false)) 
          { 
+diff -Naurp mythplugins-0.23-release/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl mythplugins-0.23/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
+--- mythplugins-0.23-release/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl	2009-04-10 20:04:30.000000000 -0400
++++ mythplugins-0.23/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl	2010-06-28 05:32:49.842135000 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/perl
+ # 
+ # Animated satellite map grabber for Environment Canada.
+ #
+@@ -10,10 +10,20 @@
+ # Lucien Dunning (ldunning at gmail.com).
+ 
+ use strict;
++use warnings;
++
++use English;
++use File::Basename;
++use Cwd 'abs_path';
++use lib dirname(abs_path($0 or $PROGRAM_NAME)), 
++        '/usr/share/mythtv/mythweather/scripts/ca_envcan', 
++        '/usr/local/share/mythtv/mythweather/scripts/ca_envcan';
++
[...5627 lines suppressed...]
+             <type>box</type>
+             <fill color="#000000" alpha="30" />
+         </shape>
+ 
+         <shape name="background-1" from="background-0">
+-            <position>465,165</position>
++            <position>465,140</position>
+         </shape>
+ 
+         <shape name="background-2" from="background-0">
+-            <position>840,165</position>
++            <position>840,140</position>
+         </shape>
+ 
+         <shape name="background-3" from="background-0">
+-            <position>90,405</position>
++            <position>90,380</position>
+         </shape>
+ 
+         <shape name="background-4" from="background-0">
+-            <position>465,405</position>
++            <position>465,380</position>
+         </shape>
+ 
+         <shape name="background-5" from="background-0">
+-            <position>840,405</position>
++            <position>840,380</position>
+         </shape>
+ 
+         <textarea name="time-0" from="basetextarea">
+-            <area>90,165,350,30</area>
++            <area>90,140,350,30</area>
+             <align>allcenter</align>
+         </textarea>
+         <textarea name="time-1" from="time-0">
+-            <position>465,165</position>
++            <position>465,140</position>
+         </textarea>
+         <textarea name="time-2" from="time-0">
+-            <position>840,165</position>
++            <position>840,140</position>
+         </textarea>
+         <textarea name="time-3" from="time-0">
+-            <position>90,405</position>
++            <position>90,380</position>
+         </textarea>
+         <textarea name="time-4" from="time-0">
+-            <position>465,405</position>
++            <position>465,380</position>
+         </textarea>
+         <textarea name="time-5" from="time-0">
+-            <position>840,405</position>
++            <position>840,380</position>
+         </textarea>
+ 
+         <imagetype name="18icon-0">
+-            <area>181,190,167,125</area>
++            <area>181,165,167,125</area>
+             <filename>unknown.png</filename>
+         </imagetype>
+         <imagetype name="18icon-1" from="18icon-0">
+-            <position>556,190</position>
++            <position>556,165</position>
+         </imagetype>
+         <imagetype name="18icon-2" from="18icon-0">
+-            <position>931,190</position>
++            <position>931,165</position>
+         </imagetype>
+         <imagetype name="18icon-3" from="18icon-0">
+-            <position>181,430</position>
++            <position>181,405</position>
+         </imagetype>
+         <imagetype name="18icon-4" from="18icon-0">
+-            <position>556,430</position>
++            <position>556,405</position>
+         </imagetype>
+         <imagetype name="18icon-5" from="18icon-0">
+-            <position>931,430</position>
++            <position>931,405</position>
+         </imagetype>
+ 
+         <textarea name="tmplbl0" from="basetextarea">
+-            <area>100,310,100,30</area>
++            <area>100,285,100,30</area>
+             <align>allcenter</align>
+             <value>Temp</value>
+         </textarea>
+         <textarea name="tmplbl1" from="tmplbl0">
+-            <position>475,310</position>
++            <position>475,285</position>
+         </textarea>
+         <textarea name="tmplbl2" from="tmplbl0">
+-            <position>850,310</position>
++            <position>850,285</position>
+         </textarea>
+         <textarea name="tmplbl3" from="tmplbl0">
+-            <position>100,550</position>
++            <position>100,525</position>
+         </textarea>
+         <textarea name="tmplbl4" from="tmplbl0">
+-            <position>475,550</position>
++            <position>475,525</position>
+         </textarea>
+         <textarea name="tmplbl5" from="tmplbl0">
+-            <position>850,550</position>
++            <position>850,525</position>
+         </textarea>
+ 
+         <textarea name="poplbl0" from="basetextarea">
+-            <area>330,310,100,30</area>
++            <area>330,285,100,30</area>
+             <align>allcenter</align>
+             <value>Precip</value>
+         </textarea>
+         <textarea name="poplbl1" from="poplbl0">
+-            <position>705,310</position>
++            <position>705,285</position>
+         </textarea>
+         <textarea name="poplbl2" from="poplbl0">
+-            <position>1080,310</position>
++            <position>1080,285</position>
+         </textarea>
+         <textarea name="poplbl3" from="poplbl0">
+-            <position>330,550</position>
++            <position>330,525</position>
+         </textarea>
+         <textarea name="poplbl4" from="poplbl0">
+-            <position>705,550</position>
++            <position>705,525</position>
+         </textarea>
+         <textarea name="poplbl5" from="poplbl0">
+-            <position>1080,550</position>
++            <position>1080,525</position>
+         </textarea>
+ 
+         <textarea name="temp-0" from="basetextarea">
+-            <area>100,345,100,30</area>
++            <area>100,320,100,30</area>
+             <font>baselarge</font>
+             <align>allcenter</align>
+         </textarea>
+         <textarea name="temp-1" from="temp-0">
+-            <position>475,345</position>
++            <position>475,320</position>
+         </textarea>
+         <textarea name="temp-2" from="temp-0">
+-            <position>850,345</position>
++            <position>850,320</position>
+         </textarea>
+         <textarea name="temp-3" from="temp-0">
+-            <position>100,585</position>
++            <position>100,560</position>
+         </textarea>
+         <textarea name="temp-4" from="temp-0">
+-            <position>475,585</position>
++            <position>475,560</position>
+         </textarea>
+         <textarea name="temp-5" from="temp-0">
+-            <position>850,585</position>
++            <position>850,560</position>
+         </textarea>
+ 
+         <textarea name="pop-0" from="basetextarea">
+-            <area>330,345,100,30</area>
++            <area>330,320,100,30</area>
+             <font>baselarge</font>
+             <align>allcenter</align>
+         </textarea>
+         <textarea name="pop-1" from="pop-0">
+-            <position>705,345</position>
++            <position>705,320</position>
+         </textarea>
+         <textarea name="pop-2" from="pop-0">
+-            <position>1080,345</position>
++            <position>1080,320</position>
+         </textarea>
+         <textarea name="pop-3" from="pop-0">
+-            <position>330,585</position>
++            <position>330,560</position>
+         </textarea>
+         <textarea name="pop-4" from="pop-0">
+-            <position>705,585</position>
++            <position>705,560</position>
+         </textarea>
+         <textarea name="pop-5" from="pop-0">
+-            <position>1080,585</position>
++            <position>1080,560</position>
+         </textarea>
+ 
++        <textarea name="copyright" from="basetextarea">
++            <area>70,640,1140,40</area>
++            <align>left,vcenter</align>
++            <font>basesmaller</font>
++        </textarea>
+     </window>
+ 
+     <window name="global-setup">
 diff -Naurp mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php
 --- mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php	2008-11-08 21:42:14.000000000 -0500
 +++ mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php	2008-11-08 21:42:14.216654000 -0500

mythtv-0.23-svnfixes.patch:
 VERSION                                                 |    1 
 bindings/perl/IO/Socket/INET/MythTV.pm                  |    4 -
 bindings/perl/MythTV.pm                                 |   11 +-
 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                    |    1 
 bindings/python/MythTV/__init__.py                      |    3 
 bindings/python/scripts/mythpython                      |   34 ++++++++
 bindings/python/setup.py                                |    1 
 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/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                            |    6 -
 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                    |    7 +
 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/jobqueue.h                               |    1 
 libs/libmythtv/nuppeldecoder.cpp                        |   20 ++---
 libs/libmythtv/nuppeldecoder.h                          |    4 -
 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                      |    9 +-
 libs/libmythtv/videoout_quartz.h                        |    2 
 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                     |   11 --
 programs/mythcommflag/main.cpp                          |   35 +++++++-
 programs/mythtranscode/transcode.cpp                    |    5 +
 programs/mythtv-setup/main.cpp                          |    2 
 settings.pro                                            |    2 
 themes/MythCenter-wide/base.xml                         |    4 +
 themes/MythCenter/base.xml                              |    4 +
 version.pro                                             |    2 
 91 files changed, 432 insertions(+), 221 deletions(-)

Index: mythtv-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythtv-0.23-svnfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythtv-0.23-svnfixes.patch	21 Jun 2010 14:51:40 -0000	1.4
+++ mythtv-0.23-svnfixes.patch	7 Jul 2010 04:13:48 -0000	1.5
@@ -185,6 +185,19 @@
                                                   dtv_multiplex.serviceversion    AS dtv_serviceversion,
                                                   dtv_multiplex.sistandard        AS dtv_sistandard,
                                                   dtv_multiplex.sourceid          AS dtv_sourceid,
+diff -Naurp mythtv-0.23-release/bindings/python/MythTV/__init__.py mythtv-0.23/bindings/python/MythTV/__init__.py
+--- mythtv-0.23-release/bindings/python/MythTV/__init__.py	2010-05-03 01:03:57.000000000 -0400
++++ mythtv-0.23/bindings/python/MythTV/__init__.py	2010-06-21 23:35:41.632640000 -0400
+@@ -36,6 +36,9 @@ if version_info >= (2, 6): # 2.6 or newe
+ else:
+     exec(import25)
+ 
++__version__ = OWN_VERSION
++MythStatic.mysqldb = MySQLdb.__version__
++
+ if __name__ == '__main__':
+     banner = 'MythTV Python interactive shell.'
+     import code
 diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythData.py mythtv-0.23/bindings/python/MythTV/MythData.py
 --- mythtv-0.23-release/bindings/python/MythTV/MythData.py	2010-04-21 00:46:55.000000000 -0400
 +++ mythtv-0.23/bindings/python/MythTV/MythData.py	2010-06-06 20:03:02.104550000 -0400
@@ -247,9 +260,81 @@
                          #print 'skipping: '+tpath
                          continue
  
+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-06-21 23:35:41.632640000 -0400
+@@ -4,6 +4,7 @@
+ Contains any static and global variables for MythTV Python Bindings
+ """
+ 
++OWN_VERSION = (0,23,0,0)
+ SCHEMA_VERSION = 1254
+ MVSCHEMA_VERSION = 1032
+ NVSCHEMA_VERSION = 1004
+diff -Naurp mythtv-0.23-release/bindings/python/scripts/mythpython mythtv-0.23/bindings/python/scripts/mythpython
+--- mythtv-0.23-release/bindings/python/scripts/mythpython	1969-12-31 19:00:00.000000000 -0500
++++ mythtv-0.23/bindings/python/scripts/mythpython	2010-06-21 23:35:41.632640000 -0400
+@@ -0,0 +1,34 @@
++#!/usr/local/bin/python
++
++from MythTV import *
++import sys
++
++if __name__ == '__main__':
++    if '--version' in sys.argv:
++        print 'MythTV Python Bindings'
++        print '  local versions'
++        print '    bindings version:  ', '.'.join([str(i) for i in MythStatic.OWN_VERSION])
++        import MythTV.ttvdb.tvdb_api
++        print '    ttvdb version:     ', str(MythTV.ttvdb.tvdb_api.__version__)
++        import MythTV.tmdb.tmdb_api
++        print '    tmdb version:      ', str(MythTV.tmdb.tmdb_api.__version__)
++        print '  external versions'
++        try:
++            import lxml.etree
++            print '    lxml version:      ', str(lxml.etree.__version__)
++        except:
++            print '    lxml version:      ', 'NOT FOUND'
++        print '    MySQLdb version:   ', '.'.join([str(i) for i in MythStatic.mysqldb])
++        sys.exit(0)
++    banner = 'MythTV Python interactive shell.'
++    import code
++    try:
++        import readline, rlcompleter
++    except:
++        pass
++    else:
++        readline.parse_and_bind("tab: complete")
++        banner += ' TAB completion available.'
++    namespace = globals().copy()
++    namespace.update(locals())
++    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(
+         description='MythTV Python bindings.',
+         packages=['MythTV', 'MythTV/tmdb', 'MythTV/ttvdb'],
+         url=['http://www.mythtv.org/'],
++        scripts=['scripts/mythpython'],
+         )
 diff -Naurp mythtv-0.23-release/configure mythtv-0.23/configure
 --- mythtv-0.23-release/configure	2010-05-05 11:59:55.000000000 -0400
-+++ mythtv-0.23/configure	2010-05-24 17:37:07.476293000 -0400
++++ mythtv-0.23/configure	2010-06-28 02:48:30.735925000 -0400
+@@ -730,12 +730,12 @@ EOF
+ 
+ check_ld_cxx(){
+     log check_ld_cxx "$@"
+-    check_cxx || return
+     flags=''
+     libs=''
+     for f; do
+         test "${f}" = "${f#-l}" && flags="$flags $f" || libs="$libs $f"
+     done
++    check_cxx $($filter_cflags $flags) || return
+     check_cmd $cxx $LDFLAGS $flags -o $TMPE $TMPO $extralibs $libs
+ }
+ 
 @@ -1561,7 +1561,7 @@ libdirac_encoder_deps="libdirac"
  libfaac_encoder_deps="libfaac"
  libfaad_decoder_deps="libfaad"
@@ -259,7 +344,16 @@
  libgsm_decoder_deps="libgsm"
  libgsm_encoder_deps="libgsm"
  libgsm_ms_decoder_deps="libgsm"
-@@ -3763,12 +3763,13 @@ enabled freetype2 ||
+@@ -2473,6 +2473,8 @@ if ! enabled_any cpu_override cross_comp
+        cpu="athlon"
+        enable small
+ # Athlon 64
++   elif expr "$processor" : ".*AMD Athlon(tm) II" > /dev/null ; then
++       cpu="k8"
+    elif expr "$processor" : ".*AMD Athlon(tm) 64" > /dev/null ; then
+        cpu="k8"
+    elif expr "$processor" : ".*AMD Athlon(tm) Dual Core" > /dev/null ; then
+@@ -3763,12 +3765,13 @@ enabled freetype2 ||
  enabled lamemp3 && check_lib2 lame/lame.h lame_init -lmp3lame -lm ||
      die "ERROR! You must have the Lame MP3 encoding library installed to compile MythTV."
  
@@ -276,7 +370,7 @@
      check_cxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
  #include <QtWebKit/QtWebKit>
  #if QT_VERSION < 0x040400
-@@ -3780,9 +3781,11 @@ fi
+@@ -3780,9 +3783,11 @@ fi
  enabled qtwebkit || die "Error! QtWebkit headers not found"
  
  # Check if Qt was built with DBus support:
@@ -290,7 +384,7 @@
  EOF
  
  if enabled firewire; then
-@@ -3844,7 +3847,7 @@ if test x"$xvmc_lib" != x""; then
+@@ -3844,7 +3849,7 @@ if test x"$xvmc_lib" != x""; then
      VENDOR_XVMC_LIBS="-l"$xvmc_lib
      disable xvmcw
  elif enabled xvmcw; then
@@ -299,7 +393,7 @@
  elif enabled xvmc_pro; then
      if has_library libviaXvMCPro ; then
          VENDOR_XVMC_LIBS="-lviaXvMCPro"
-@@ -4312,6 +4315,7 @@ SDL_LIBS=$sdl_libs
+@@ -4312,6 +4317,7 @@ SDL_LIBS=$sdl_libs
  SDL_CFLAGS=$sdl_cflags
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs
@@ -406,6 +500,25 @@
  	QMAKE_CFLAGS_SHLIB =
  }
  
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputalsa.cpp mythtv-0.23/libs/libmyth/audiooutputalsa.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputalsa.cpp	2009-11-16 18:00:20.000000000 -0500
++++ mythtv-0.23/libs/libmyth/audiooutputalsa.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -221,13 +221,13 @@ bool AudioOutputALSA::OpenDevice()
+     else if (audio_bits == 16)
+         // is the sound data coming in really little-endian or is it
+         // CPU-endian?
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+         format = SND_PCM_FORMAT_S16;
+ #else
+         format = SND_PCM_FORMAT_S16_LE;
+ #endif
+     else if (audio_bits == 24)
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+         format = SND_PCM_FORMAT_S24;
+ #else
+         format = SND_PCM_FORMAT_S24_LE;
 diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputbase.cpp mythtv-0.23/libs/libmyth/audiooutputbase.cpp
 --- mythtv-0.23-release/libs/libmyth/audiooutputbase.cpp	2010-04-14 06:36:02.000000000 -0400
 +++ mythtv-0.23/libs/libmyth/audiooutputbase.cpp	2010-06-18 06:50:18.720005000 -0400
@@ -439,6 +552,27 @@
  
      // Wait for all data to finish playing
      virtual void Drain(void);
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputca.cpp mythtv-0.23/libs/libmyth/audiooutputca.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputca.cpp	2009-09-25 14:08:46.000000000 -0400
++++ mythtv-0.23/libs/libmyth/audiooutputca.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -14,7 +14,7 @@
+  * fails and passthru was set.
+  *
+  * = REVISION
+- * $Id$
++ * $Id$
+  *
+  * = AUTHORS
+  * Jeremiah Morris, Andrew Kimpton, Nigel Pearson
+@@ -176,7 +176,7 @@ bool CoreAudioData::OpenAnalog()
+     conv_in_desc.mSampleRate       = mCA->audio_samplerate;
+     conv_in_desc.mFormatID         = kAudioFormatLinearPCM;
+     conv_in_desc.mFormatFlags      = kLinearPCMFormatFlagIsSignedInteger;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     conv_in_desc.mFormatFlags     |= kLinearPCMFormatFlagIsBigEndian;
+ #endif
+     conv_in_desc.mBytesPerPacket   = mCA->audio_bytes_per_sample;
 diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutput.h mythtv-0.23/libs/libmyth/audiooutput.h
 --- mythtv-0.23-release/libs/libmyth/audiooutput.h	2009-10-13 22:57:05.000000000 -0400
 +++ mythtv-0.23/libs/libmyth/audiooutput.h	2010-06-18 06:50:18.720005000 -0400
@@ -450,6 +584,18 @@
   
      // Wait for all data to finish playing
      virtual void Drain(void) = 0;
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputoss.cpp mythtv-0.23/libs/libmyth/audiooutputoss.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputoss.cpp	2009-10-13 22:57:05.000000000 -0400
++++ mythtv-0.23/libs/libmyth/audiooutputoss.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -123,7 +123,7 @@ bool AudioOutputOSS::OpenDevice()
+             format = AFMT_S8;
+             break;
+         case 16:
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+             format = AFMT_S16_BE;
+ #else
+             format = AFMT_S16_LE;
 diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp mythtv-0.23/libs/libmyth/audiooutputpulse.cpp
 --- mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp	2009-11-16 11:18:35.000000000 -0500
 +++ mythtv-0.23/libs/libmyth/audiooutputpulse.cpp	2010-06-07 23:31:50.923907000 -0400
@@ -542,6 +688,54 @@
          reinterpret_cast<MonitorThreadDarwin *>(context)
              ->diskRename(BSDname, volName);
          CFRelease(details);
+diff -Naurp mythtv-0.23-release/libs/libmyth/mythcdrom-linux.cpp mythtv-0.23/libs/libmyth/mythcdrom-linux.cpp
+--- mythtv-0.23-release/libs/libmyth/mythcdrom-linux.cpp	2010-02-03 16:02:18.000000000 -0500
++++ mythtv-0.23/libs/libmyth/mythcdrom-linux.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -12,7 +12,7 @@
+ 
+ #include "mythcdrom.h"
+ #include "mythcdrom-linux.h"
+-#include "mythconfig.h"      // for WORDS_BIGENDIAN
++#include "mythconfig.h"      // for HAVE_BIGENDIAN
+ #include "mythcontext.h"
+ #include "mythverbose.h"
+ 
+@@ -35,7 +35,7 @@ typedef struct cdrom_generic_command CDR
+ typedef struct
+ {
+     uint16_t data_len[2];
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     uint8_t  nea                : 1;
+     uint8_t  reserved1          : 4;
+     uint8_t  notification_class : 3;
+@@ -45,7 +45,7 @@ typedef struct
+     uint8_t  nea                : 1;
+ #endif
+     uint8_t  supp_event_class;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     uint8_t  reserved2          : 4;
+     uint8_t  media_event_code   : 4;
+     uint8_t  reserved3          : 6;
+@@ -65,7 +65,7 @@ typedef struct
+ // and this is returned by GPCMD_READ_DISC_INFO
+ typedef struct {
+     uint16_t disc_information_length;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     uint8_t  reserved1          : 3;
+     uint8_t  erasable           : 1;
+     uint8_t  border_status      : 2;
+@@ -80,7 +80,7 @@ typedef struct {
+     uint8_t  n_sessions_lsb;
+     uint8_t  first_track_lsb;
+     uint8_t  last_track_lsb;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     uint8_t  did_v              : 1;
+     uint8_t  dbc_v              : 1;
+     uint8_t  uru                : 1;
 diff -Naurp mythtv-0.23-release/libs/libmyth/mythcontext.cpp mythtv-0.23/libs/libmyth/mythcontext.cpp
 --- mythtv-0.23-release/libs/libmyth/mythcontext.cpp	2010-03-23 20:43:43.000000000 -0400
 +++ mythtv-0.23/libs/libmyth/mythcontext.cpp	2010-05-14 18:39:42.189261000 -0400
@@ -722,6 +916,47 @@
  
  /** \brief Increment this whenever the MythTV network protocol changes.
   *
+diff -Naurp mythtv-0.23-release/libs/libmythdvdnav/dvdnav/dvdnav_internal.h mythtv-0.23/libs/libmythdvdnav/dvdnav/dvdnav_internal.h
+--- mythtv-0.23-release/libs/libmythdvdnav/dvdnav/dvdnav_internal.h	2009-07-06 16:42:28.000000000 -0400
++++ mythtv-0.23/libs/libmythdvdnav/dvdnav/dvdnav_internal.h	2010-06-28 03:29:58.793477000 -0400
+@@ -85,7 +85,7 @@ typedef struct read_cache_s read_cache_t
+ 
+ #ifndef audio_status_t
+ typedef struct {
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+   unsigned int available     : 1;
+   unsigned int zero1         : 4;
+   unsigned int stream_number : 3;
+@@ -101,7 +101,7 @@ typedef struct {
+ 
+ #ifndef spu_status_t
+ typedef struct {
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+   unsigned int available               : 1;
+   unsigned int zero1                   : 2;
+   unsigned int stream_number_4_3       : 5;
+diff -Naurp mythtv-0.23-release/libs/libmythdvdnav/dvdread/bswap.h mythtv-0.23/libs/libmythdvdnav/dvdread/bswap.h
+--- mythtv-0.23-release/libs/libmythdvdnav/dvdread/bswap.h	2009-07-06 16:42:28.000000000 -0400
++++ mythtv-0.23/libs/libmythdvdnav/dvdread/bswap.h	2010-06-28 03:29:58.793477000 -0400
+@@ -24,7 +24,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(WORDS_BIGENDIAN)
++#if HAVE_BIGENDIAN
+ /* All bigendian systems are fine, just ignore the swaps. */
+ #define B2N_16(x) (void)(x)
+ #define B2N_32(x) (void)(x)
+@@ -101,6 +101,6 @@
+ 
+ #endif
+ 
+-#endif /* WORDS_BIGENDIAN */
++#endif /* HAVE_BIGENDIAN */
+ 
+ #endif /* LIBDVDREAD_BSWAP_H */
 diff -Naurp mythtv-0.23-release/libs/libmythdvdnav/libmythdvdnav.pro mythtv-0.23/libs/libmythdvdnav/libmythdvdnav.pro
 --- mythtv-0.23-release/libs/libmythdvdnav/libmythdvdnav.pro	2009-10-15 11:47:54.000000000 -0400
 +++ mythtv-0.23/libs/libmythdvdnav/libmythdvdnav.pro	2010-05-11 11:07:54.320600000 -0400
@@ -1067,6 +1302,120 @@
  
  #include <QWaitCondition>
  #include <QObject>
+diff -Naurp mythtv-0.23-release/libs/libmythtv/nuppeldecoder.cpp mythtv-0.23/libs/libmythtv/nuppeldecoder.cpp
+--- mythtv-0.23-release/libs/libmythtv/nuppeldecoder.cpp	2010-03-06 22:11:52.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/nuppeldecoder.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -27,7 +27,7 @@ using namespace std;
+ 
+ #include "minilzo.h"
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ extern "C" {
+ #include "bswap.h"
+ }
+@@ -41,7 +41,7 @@ NuppelDecoder::NuppelDecoder(NuppelVideo
+     : DecoderBase(parent, pginfo),
+       rtjd(0), video_width(0), video_height(0), video_size(0),
+       video_frame_rate(0.0f), audio_samplerate(44100),
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+       audio_bits_per_sample(0),
+ #endif
+       ffmpeg_extradatasize(0), ffmpeg_extradata(0), usingextradata(false),
+@@ -139,7 +139,7 @@ bool NuppelDecoder::ReadFileheader(struc
+     if (ringBuffer->Read(fh, FILEHEADERSIZE) != FILEHEADERSIZE)
+         return false;
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     fh->width         = bswap_32(fh->width);
+     fh->height        = bswap_32(fh->height);
+     fh->desiredwidth  = bswap_32(fh->desiredwidth);
+@@ -160,7 +160,7 @@ bool NuppelDecoder::ReadFrameheader(stru
+     if (ringBuffer->Read(fh, FRAMEHEADERSIZE) != FRAMEHEADERSIZE)
+         return false;
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     fh->timecode     = bswap_32(fh->timecode);
+     fh->packetlength = bswap_32(fh->packetlength);
+ #endif
+@@ -287,7 +287,7 @@ int NuppelDecoder::OpenFile(RingBuffer *
+         else
+         {
+             ringBuffer->Read(&extradata, frameheader.packetlength);
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+             struct extendeddata *ed = &extradata;
+             ed->version                 = bswap_32(ed->version);
+             ed->video_fourcc            = bswap_32(ed->video_fourcc);
+@@ -353,7 +353,7 @@ int NuppelDecoder::OpenFile(RingBuffer *
+                 {
+                     memcpy(&ste, seekbuf + offset,
+                            sizeof(struct seektable_entry));
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+                     ste.file_offset     = bswap_64(ste.file_offset);
+                     ste.keyframe_number = bswap_32(ste.keyframe_number);
+ #endif
+@@ -422,7 +422,7 @@ int NuppelDecoder::OpenFile(RingBuffer *
+                 {
+                     memcpy(&kfate, kfa_buf + offset,
+                            sizeof(struct kfatable_entry));
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+                     kfate.adjust          = bswap_32(kfate.adjust);
+                     kfate.keyframe_number = bswap_32(kfate.keyframe_number);
+ #endif
+@@ -495,7 +495,7 @@ int NuppelDecoder::OpenFile(RingBuffer *
+         effdsp = extradata.audio_sample_rate * 100;
+         GetNVP()->SetEffDsp(effdsp);
+         audio_samplerate = extradata.audio_sample_rate;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+         // Why only if using extradata?
+         audio_bits_per_sample = extradata.audio_bits_per_sample;
+ #endif
+@@ -1242,7 +1242,7 @@ bool NuppelDecoder::GetFrame(DecodeType 
+             else
+             {
+                 getrawframes = 0;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+                 // Why endian correct the audio buffer here?
+                 // Don't big-endian clients have to do it in audiooutBlah.cpp?
+                 if (audio_bits_per_sample == 16) {
+@@ -1290,7 +1290,7 @@ bool NuppelDecoder::GetFrame(DecodeType 
+ 
+             if (QString(fh->finfo) == "MythTVVideo")
+             {
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+                 fh->width         = bswap_32(fh->width);
+                 fh->height        = bswap_32(fh->height);
+                 fh->desiredwidth  = bswap_32(fh->desiredwidth);
+diff -Naurp mythtv-0.23-release/libs/libmythtv/nuppeldecoder.h mythtv-0.23/libs/libmythtv/nuppeldecoder.h
+--- mythtv-0.23-release/libs/libmythtv/nuppeldecoder.h	2010-01-18 13:15:35.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/nuppeldecoder.h	2010-06-28 03:29:58.793477000 -0400
+@@ -1,6 +1,8 @@
+ #ifndef NUPPELDECODER_H_
+ #define NUPPELDECODER_H_
+ 
++#include "config.h"
++
+ #include <list>
+ using namespace std;
+ 
+@@ -81,7 +83,7 @@ class NuppelDecoder : public DecoderBase
+     int video_width, video_height, video_size;
+     double video_frame_rate;
+     int audio_samplerate;
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     int audio_bits_per_sample;
+ #endif
+ 
 diff -Naurp mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.cpp mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.cpp
 --- mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.cpp	2010-04-27 22:54:52.000000000 -0400
 +++ mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.cpp	2010-06-18 06:50:18.720005000 -0400
@@ -1095,6 +1444,75 @@
  
      // Gets
      QSize   GetVideoBufferSize(void) const    { return video_dim; }
+diff -Naurp mythtv-0.23-release/libs/libmythtv/NuppelVideoRecorder.cpp mythtv-0.23/libs/libmythtv/NuppelVideoRecorder.cpp
+--- mythtv-0.23-release/libs/libmythtv/NuppelVideoRecorder.cpp	2010-04-14 18:00:50.000000000 -0400
++++ mythtv-0.23/libs/libmythtv/NuppelVideoRecorder.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -33,7 +33,7 @@ using namespace std;
+ #include "audioinput.h"
+ #include "myth_imgconvert.h"
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ extern "C" {
+ #include "bswap.h"
+ }
+@@ -1873,7 +1873,7 @@ void NuppelVideoRecorder::BufferIt(unsig
+ 
+ inline void NuppelVideoRecorder::WriteFrameheader(rtframeheader *fh)
+ {
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     fh->timecode     = bswap_32(fh->timecode);
+     fh->packetlength = bswap_32(fh->packetlength);
+ #endif
+@@ -1921,7 +1921,7 @@ void NuppelVideoRecorder::WriteFileHeade
+     fileheader.textsblocks = -1; // TODO: make only -1 if VBI support active?
+     fileheader.keyframedist = KEYFRAMEDIST;
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     fileheader.width         = bswap_32(fileheader.width);
+     fileheader.height        = bswap_32(fileheader.height);
+     fileheader.desiredwidth  = bswap_32(fileheader.desiredwidth);
+@@ -2030,7 +2030,7 @@ void NuppelVideoRecorder::WriteHeader(vo
+ 
+     extendeddataOffset = ringBuffer->GetWritePosition();
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+     moredata.version                 = bswap_32(moredata.version);
+     moredata.video_fourcc            = bswap_32(moredata.video_fourcc);
+     moredata.audio_fourcc            = bswap_32(moredata.audio_fourcc);
+@@ -3147,7 +3147,7 @@ void NuppelVideoRecorder::WriteVideo(Vid
+     lf = fnum;
+ }
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ static void bswap_16_buf(short int *buf, int buf_cnt, int audio_channels)
+     __attribute__ ((unused)); /* <- suppress compiler warning */
+ 
+@@ -3214,7 +3214,7 @@ void NuppelVideoRecorder::WriteAudio(uns
+ 
+         int sample_cnt = audio_buffer_size / audio_bytes_per_sample;
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+         bswap_16_buf((short int*) buf, sample_cnt, audio_channels);
+ #endif
+ 
+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
+@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #define RTJPEG_FILE_VERSION 0
+ #define RTJPEG_HEADER_SIZE 12
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ #define RTJPEG_SWAP_WORD(a) ( ((a) << 24) | \
+ 			(((a) << 8) & 0x00ff0000) | \
+ 			(((a) >> 8) & 0x0000ff00) | \
 diff -Naurp mythtv-0.23-release/libs/libmythtv/tv_play.cpp mythtv-0.23/libs/libmythtv/tv_play.cpp
 --- mythtv-0.23-release/libs/libmythtv/tv_play.cpp	2010-04-27 22:54:52.000000000 -0400
 +++ mythtv-0.23/libs/libmythtv/tv_play.cpp	2010-05-17 21:42:52.462765000 -0400
@@ -1242,6 +1660,27 @@
      void StopEmbedding(void);
  
      DisplayInfo GetDisplayInfo(void);
+diff -Naurp mythtv-0.23-release/libs/libmythtv/yuv2rgb.cpp mythtv-0.23/libs/libmythtv/yuv2rgb.cpp
+--- mythtv-0.23-release/libs/libmythtv/yuv2rgb.cpp	2010-03-06 22:11:52.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/yuv2rgb.cpp	2010-06-28 03:29:58.793477000 -0400
+@@ -417,7 +417,7 @@ static void yuv420_argb32_non_mmx(unsign
+     int dstwidth;
+ 
+ // byte indices
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ #define R_OI  1
+ #define G_OI  2
+ #define B_OI  3
+@@ -490,7 +490,7 @@ void rgb32_to_yuv420p(unsigned char *lum
+     unsigned char *p;
+ 
+ // byte indices
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ #define R_II  3
+ #define G_II  2
+ #define B_II  1
 diff -Naurp mythtv-0.23-release/libs/libmythui/mythfontmanager.cpp mythtv-0.23/libs/libmythui/mythfontmanager.cpp
 --- mythtv-0.23-release/libs/libmythui/mythfontmanager.cpp	2010-02-24 02:41:32.000000000 -0500
 +++ mythtv-0.23/libs/libmythui/mythfontmanager.cpp	2010-06-08 18:21:22.370095000 -0400
@@ -1354,6 +1793,58 @@
          }
          else if (element.attribute("lang","").toLower() ==
                   GetMythUI()->GetLanguageAndVariant())
+diff -Naurp mythtv-0.23-release/libs/libmythui/util-nvctrl.cpp mythtv-0.23/libs/libmythui/util-nvctrl.cpp
+--- mythtv-0.23-release/libs/libmythui/util-nvctrl.cpp	2010-03-28 13:16:06.000000000 -0400
++++ mythtv-0.23/libs/libmythui/util-nvctrl.cpp	2010-06-28 04:34:55.227588000 -0400
+@@ -107,9 +107,15 @@ int GetNvidiaRates(t_screenrate& screenm
+ 
+     /* first, we query the MetaModes on this X screen */
+ 
+-    XNVCTRLQueryBinaryData(dpy, screen, 0, // n/a
++    ret = XNVCTRLQueryBinaryData(dpy, screen, 0, // n/a
+                            NV_CTRL_BINARY_DATA_METAMODES,
+                            (unsigned char **)&pMetaModes, &MetaModeLen);
++    if (!ret)
++    {
++        VERBOSE(VB_PLAYBACK, QString("Unknown error. Failed to query the enabled Display Devices."));
++        delete d;
++        return -1;
++    }
+ 
+     /*
+      * then, we query the ModeLines for each display device on
+@@ -122,9 +128,21 @@ int GetNvidiaRates(t_screenrate& screenm
+     {
+         if (!(display_devices & mask)) continue;
+ 
+-        XNVCTRLQueryBinaryData(dpy, screen, mask,
++        ret = XNVCTRLQueryBinaryData(dpy, screen, mask,
+                                NV_CTRL_BINARY_DATA_MODELINES,
+                                (unsigned char **)&str, &len);
++        if (!ret)
++        {
++            VERBOSE(VB_PLAYBACK, QString("Unknown error. Failed to query the enabled Display Devices."));
++            // Free Memory currently allocated
++            for (j=0; j < nDisplayDevice; ++j)
++            {
++                free(pModeLines[j]);
++            }
++            delete d;
++            return -1;
++        }
++		
+         pModeLines[nDisplayDevice] = str;
+         ModeLineLen[nDisplayDevice] = len;
+ 
+@@ -329,6 +347,8 @@ static void parse_mode_string(char *mode
+      * find the modename; stop at the last ' @' (would be easier with regex)
+      */
+ 
++    s_end = strchr(modeString, '\0');
++
+     for (char *s = modeString; *s; s++)
+     {
+         if (*s == ' ' && *(s+1) == '@')
 diff -Naurp mythtv-0.23-release/libs/libmythui/xmlparsebase.cpp mythtv-0.23/libs/libmythui/xmlparsebase.cpp
 --- mythtv-0.23-release/libs/libmythui/xmlparsebase.cpp	2010-03-02 12:36:30.000000000 -0500
 +++ mythtv-0.23/libs/libmythui/xmlparsebase.cpp	2010-05-15 09:04:12.458568000 -0400
@@ -1575,6 +2066,34 @@
  EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
  EXTRA_LIBS += $$CONFIG_DIRECTFB_LIBS
  
+diff -Naurp mythtv-0.23-release/themes/MythCenter/base.xml mythtv-0.23/themes/MythCenter/base.xml
+--- mythtv-0.23-release/themes/MythCenter/base.xml	2010-05-09 10:40:52.000000000 -0400
++++ mythtv-0.23/themes/MythCenter/base.xml	2010-06-28 03:09:44.900378000 -0400
+@@ -8,6 +8,10 @@
+         <bold>yes</bold>
+     </font>
+   
++    <font name="basesmaller" from="basesmall">
++        <pixelsize>18</pixelsize>
++    </font>
++  
+     <font name="basesmallbold" from="basesmall">
+         <bold>yes</bold>
+     </font>
+diff -Naurp mythtv-0.23-release/themes/MythCenter-wide/base.xml mythtv-0.23/themes/MythCenter-wide/base.xml
+--- mythtv-0.23-release/themes/MythCenter-wide/base.xml	2010-04-03 12:52:26.000000000 -0400
++++ mythtv-0.23/themes/MythCenter-wide/base.xml	2010-06-28 03:09:44.900378000 -0400
+@@ -8,6 +8,10 @@
+         <bold>yes</bold>
+     </font>
+   
++    <font name="basesmaller" from="basesmall">
++        <pixelsize>18</pixelsize>
++    </font>
++  
+     <font name="basesmallbold" from="basesmall">
+         <bold>yes</bold>
+     </font>
 diff -Naurp mythtv-0.23-release/VERSION mythtv-0.23/VERSION
 --- mythtv-0.23-release/VERSION	2010-05-09 20:07:58.000000000 -0400
 +++ mythtv-0.23/VERSION	1969-12-31 19:00:00.000000000 -0500


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythtv.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mythtv.spec	21 Jun 2010 14:51:40 -0000	1.70
+++ mythtv.spec	7 Jul 2010 04:13:48 -0000	1.71
@@ -65,7 +65,7 @@
 %define desktop_vendor  RPMFusion
 
 # SVN Revision number and branch ID
-%define _svnrev r25150
+%define _svnrev r25277
 %define branch release-0-23-fixes
 
 #
@@ -81,7 +81,7 @@
 %if "%{branch}" == "trunk"
 Release: 0.1.svn.%{_svnrev}%{?dist}
 %else
-Release: 5%{?dist}
+Release: 6%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1483,6 +1483,10 @@
 ################################################################################
 
 %changelog
+* Wed Jul 07 2010 Jarod Wilson <jarod at wilsonet.com> 0.23-6
+- Update to release-0-23-fixes branch, svn revision 25277
+- Even more run-as-non-root initscript tweaks (rpmfusion bz#1295)
+
 * Mon Jun 21 2010 Jarod Wilson <jarod at wilsonet.com> 0.23-5
 - Update to release-0-23-fixes branch, svn revision 25150
 - Further improvements to run as non-root (rpmfusion bz#1295)



More information about the rpmfusion-commits mailing list