rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.1, 1.2 mythtv-0.21-svnfixes.patch, 1.1, 1.2 mythtv.spec, 1.1, 1.2

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20719 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-8 - Don't BR: libdvdcss-devel - Update release-0-21-fixes patches (r18161) - Rebuild for libraw1394 v2.0.0 mythplugins-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythplugins-0.21-svnfixes.patch Index: mythplugins-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythplugins-0.21-svnfixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythplugins-0.21-svnfixes.patch 3 Aug 2008 15:20:03 -0000 1.1 +++ mythplugins-0.21-svnfixes.patch 18 Aug 2008 01:26:30 -0000 1.2 @@ -1,3 +1,20 @@ +Index: mythplugins/mythweb/modules/music/stream.php +=================================================================== +--- mythplugins/mythweb/modules/music/stream.php (revision 16468) ++++ mythplugins/mythweb/modules/music/stream.php (working copy) +@@ -76,8 +76,11 @@ + $mime = 'audio/mpeg'; + break; + case 'ogg': +- $mine = 'application/ogg'; ++ $mime = 'application/ogg'; + break; ++ case 'm4a': ++ $mime = 'audio/mp4a-latm'; ++ break; + default: + $mime = 'application/octet-stream'; + } Index: mythplugins/mythweb/modules/_shared/lang/German.lang =================================================================== --- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468) @@ -1510,10 +1527,6 @@ </message> </context> </TS> -Index: mythplugins/mythmusic/i18n/mythmusic_fi.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mythmusic/i18n/mythmusic_nl.ts =================================================================== --- mythplugins/mythmusic/i18n/mythmusic_nl.ts (revision 16468) @@ -3785,6 +3798,76 @@ </message> </context> </TS> +Index: mythplugins/mythmusic/mythmusic/miniplayer.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/miniplayer.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/miniplayer.cpp (working copy) +@@ -72,6 +72,7 @@ + + void MiniPlayer::showPlayer(int showTime) + { ++ m_showTime = showTime; + m_displayTimer->start(showTime * 1000, true); + exec(); + } +@@ -294,6 +295,10 @@ + else + handled = false; + } ++ ++ // restart the display timer on any keypress if it is active ++ if (m_displayTimer->isActive()) ++ m_displayTimer->start(m_showTime * 1000, true); + } + } + +Index: mythplugins/mythmusic/mythmusic/aacdecoder.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/aacdecoder.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/aacdecoder.cpp (working copy) +@@ -19,6 +19,7 @@ + #include <qobject.h> + #include <qiodevice.h> + #include <qfile.h> ++#include <stdlib.h> + + #include "aacdecoder.h" + #include "constants.h" +Index: mythplugins/mythmusic/mythmusic/databasebox.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/databasebox.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/databasebox.cpp (working copy) +@@ -875,9 +875,15 @@ + + if (cdwriter) + { ++#if 0 ++ /* ++ Disabled as Playlist::CreateCDAudio() is empty, ++ it is called by CreateCDAudio() ++ */ + cdaudiob = active_popup->addButton(tr("Create Audio CD from " + "Playlist"), this, + SLOT(CreateCDAudio())); ++#endif + + cdmp3b = active_popup->addButton(tr("Create MP3 CD from Playlist"), + this, SLOT(CreateCDMP3())); +@@ -920,8 +926,12 @@ + active_popup->addLabel(label2); + + cdmp3b->setEnabled((ratio_MB <= 100.0)); +- cdaudiob->setEnabled((ratio_sec <= 100.0)); +- cdaudiob->setEnabled(false); ++ ++ if (cdaudiob) ++ { ++ cdaudiob->setEnabled((ratio_sec <= 100.0)); ++ cdaudiob->setEnabled(false); ++ } + } + + (void)item_ptr; Index: mythplugins/mythmusic/mythmusic/musicmenu.xml =================================================================== --- mythplugins/mythmusic/mythmusic/musicmenu.xml (revision 16468) @@ -3805,6 +3888,30 @@ <action>EJECT</action> </button> +Index: mythplugins/mythmusic/mythmusic/metaiomp4.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/metaiomp4.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/metaiomp4.cpp (working copy) +@@ -3,6 +3,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <sys/types.h> ++#include <stdlib.h> + + using namespace std; + +Index: mythplugins/mythmusic/mythmusic/miniplayer.h +=================================================================== +--- mythplugins/mythmusic/mythmusic/miniplayer.h (revision 16468) ++++ mythplugins/mythmusic/mythmusic/miniplayer.h (working copy) +@@ -52,6 +52,7 @@ + + QTimer *m_displayTimer; + QTimer *m_infoTimer; ++ int m_showTime; + + bool m_showingInfo; + Index: mythplugins/mytharchive/i18n/mytharchive_fi.ts =================================================================== --- mythplugins/mytharchive/i18n/mytharchive_fi.ts (revision 16468) @@ -4434,10 +4541,6 @@ </message> </context> </TS> -Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts =================================================================== --- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468) @@ -5329,10 +5432,6 @@ <source>Parental Pin:</source> <translation>Pincode:</translation> </message> -Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mytharchive/mytharchive/archivemenu.xml =================================================================== --- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468) @@ -5421,7 +5520,117 @@ =================================================================== --- mythplugins/mytharchive/mytharchivehelper/main.cpp (revision 16468) +++ mythplugins/mytharchive/mytharchivehelper/main.cpp (working copy) -@@ -2185,7 +2185,14 @@ +@@ -2068,6 +2068,7 @@ + root.appendChild(streams); + streams.setAttribute("count", inputFC->nb_streams); + int ffmpegIndex = 0; ++ uint duration = 0; + + for (uint i = 0; i < inputFC->nb_streams; i++) + { +@@ -2124,56 +2125,60 @@ + + streams.appendChild(stream); + +- uint duration = 0; +- +- switch (lenMethod) ++ // TODO: probably should add a better way to choose which ++ // video stream we use to calc the duration ++ if (duration == 0) + { +- case 0: ++ switch (lenMethod) + { +- // use duration guess from avformat +- if (inputFC->duration != (uint) AV_NOPTS_VALUE) ++ case 0: [...1781 lines suppressed...] ++#elif MINGW ++ QString filename = "dvd:"; // e.g. 'dvd:E\\' ++#else ++ QString filename = "dvd:/"; // e.g. 'dvd://dev/sda' ++#endif ++ filename += dvd_device; + + command_string = "Internal"; + gContext->GetMainWindow()->HandleMedia(command_string, filename); Index: mythplugins/mythphone/i18n/mythphone_nl.ts =================================================================== --- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468) @@ -10672,10 +12265,6 @@ </message> </context> </TS> -Index: mythplugins/mythgame/i18n/mythgame_nl.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mythgame/i18n/mythgame_nl.ts =================================================================== --- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468) @@ -11105,10 +12694,6 @@ <source>Favorite:</source> <translation>Favoriet:</translation> </message> -Index: mythplugins/mythgame/i18n/mythgame_fi.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mythgame/i18n/mythgame_fi.ts =================================================================== --- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468) @@ -11212,6 +12797,150 @@ <text lang="FR">Joueurs</text> <text lang="ET">Mängijad</text> <text lang="NB">Spillere</text> +Index: mythplugins/mythgame/mythgame/rominfo.cpp +=================================================================== +--- mythplugins/mythgame/mythgame/rominfo.cpp (revision 16468) ++++ mythplugins/mythgame/mythgame/rominfo.cpp (working copy) +@@ -19,10 +19,9 @@ + + void RomInfo::edit_rominfo() + { +- + QString rom_ver = Version(); + +- GameEditDialog romeditdlg(Romname().latin1()); ++ GameEditDialog romeditdlg(Romname()); + + DialogCode res = romeditdlg.exec(); + +@@ -32,19 +31,19 @@ + if (res) + { + MSqlQuery query(MSqlQuery::InitCon()); +- query.prepare("SELECT gamename,genre,year,country,publisher,favorite " +- "FROM gamemetadata " +- "WHERE gametype = :GAMETYPE " +- "AND romname = :ROMNAME"); ++ query.prepare("SELECT gamename,genre,year,country,publisher,favorite " ++ "FROM gamemetadata " ++ "WHERE gametype = :GAMETYPE " ++ "AND romname = :ROMNAME"); + +- query.bindValue(":GAMETYPE", GameType()); +- query.bindValue(":ROMNAME", Romname()); ++ query.bindValue(":GAMETYPE", GameType()); ++ query.bindValue(":ROMNAME", Romname()); + + if (!query.exec()) +- { +- MythContext::DBError("RomInfo::edit_rominfo", query); +- return; +- } ++ { ++ MythContext::DBError("RomInfo::edit_rominfo", query); ++ return; ++ } + + if (query.isActive() && query.size() > 0); + { +@@ -62,17 +61,17 @@ + if ((t_gamename != Gamename()) || (t_genre != Genre()) || (t_year != Year()) + || (t_country != Country()) || (t_publisher != Publisher()) || (t_favourite != Favorite())) + { +- query.prepare("UPDATE gamemetadata SET version = 'CUSTOM' " +- "WHERE gametype = :GAMETYPE " +- "AND romname = :ROMNAME"); +- query.bindValue(":GAMETYPE", GameType()); +- query.bindValue(":ROMNAME", Romname()); ++ query.prepare("UPDATE gamemetadata SET version = 'CUSTOM' " ++ "WHERE gametype = :GAMETYPE " ++ "AND romname = :ROMNAME"); ++ query.bindValue(":GAMETYPE", GameType()); ++ query.bindValue(":ROMNAME", Romname()); + +- if (!query.exec()) +- { +- MythContext::DBError("RomInfo::edit_rominfo", query); +- return; +- } ++ if (!query.exec()) ++ { ++ MythContext::DBError("RomInfo::edit_rominfo", query); ++ return; ++ } + } + } + } +@@ -86,8 +85,8 @@ + int count = 0; + + query.prepare("SELECT count(*) FROM gamemetadata " +- "WHERE gametype = :GAMETYPE " +- "AND romname = :ROMNAME"); ++ "WHERE gametype = :GAMETYPE " ++ "AND romname = :ROMNAME"); + + query.bindValue(":GAMETYPE", gametype); + query.bindValue(":ROMNAME", rom); +@@ -157,7 +156,7 @@ + else if (field == "country") + country = data; + else if (field == "publisher") +- publisher = data; ++ publisher = data; + else if (field == "crc_value") + crc_value = data; + else if (field == "diskcount") +@@ -178,7 +177,7 @@ + MSqlQuery query(MSqlQuery::InitCon()); + + query.prepare("UPDATE gamemetadata SET favorite = :FAV " +- "WHERE romname = :ROMNAME"); ++ "WHERE romname = :ROMNAME"); + + query.bindValue(":FAV", favorite); + query.bindValue(":ROMNAME",romname); +@@ -219,7 +218,7 @@ + QString thequery = "SELECT system,gamename,genre,year,romname,favorite," + "rompath,country,crc_value,diskcount,gametype,publisher," + "version FROM gamemetadata WHERE gamename = :GAMENAME " +- + systemtype + " ORDER BY diskcount DESC"; ++ + systemtype + " ORDER BY diskcount DESC"; + + query.prepare(thequery); + query.bindValue(":SYSTEM", system); +@@ -245,15 +244,15 @@ + setVersion(query.value(12).toString()); + } + +- query.prepare("SELECT screenshots FROM gameplayers WHERE playername = :SYSTEM"); ++ query.prepare("SELECT screenshots FROM gameplayers " ++ "WHERE playername = :SYSTEM"); + query.bindValue(":SYSTEM",system); +- + query.exec(); + + if (query.isActive() && query.size() > 0); + { + query.next(); +- if (query.value(0).toString()) ++ if (!query.value(0).toString().isEmpty()) + { + QString Image = query.value(0).toString() + "/" + romname; + if (FindImage(query.value(0).toString() + "/" + romname, &Image)) +@@ -270,9 +269,9 @@ + if (RomCount() > 1) + { + query.prepare("SELECT DISTINCT system FROM gamemetadata " +- "WHERE romname = :ROMNAME"); +- query.bindValue(":ROMNAME", Romname()); +- query.exec(thequery); ++ "WHERE romname = :ROMNAME"); ++ query.bindValue(":ROMNAME", Romname()); ++ query.exec(); + + if (query.isActive() && query.size() > 0); + { Index: mythplugins/mythzoneminder/mythzmserver/zmserver.h =================================================================== --- mythplugins/mythzoneminder/mythzmserver/zmserver.h (revision 16468) @@ -12118,14 +13847,6 @@ </message> </context> <context> -Index: mythplugins/mythnews/i18n/mythnews_nl.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythplugins/mythnews/i18n/mythnews_fi.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythplugins/mythnews/i18n/mythnews_nl.ts =================================================================== --- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468) mythtv-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.21-svnfixes.patch Index: mythtv-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.21-svnfixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.21-svnfixes.patch 3 Aug 2008 15:20:03 -0000 1.1 +++ mythtv-0.21-svnfixes.patch 18 Aug 2008 01:26:30 -0000 1.2 @@ -20607,30 +20607,6 @@ </message> </context> <context> -Index: mythtv/i18n/mythfrontend_nl.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythtv/i18n/mythfrontend_cz.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythtv/i18n/mythfrontend_sv.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythtv/i18n/mythfrontend_he.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythtv/i18n/mythfrontend_fi.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: mythtv/i18n/mythfrontend_dk.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythtv/configure =================================================================== --- mythtv/configure (revision 16468) @@ -20643,7 +20619,16 @@ echo " --disable-xrandr disable X11 resolution switching" echo " --disable-xv disable XVideo (X11 video output accel.)" echo " --disable-xvmc disable XvMC (Linux/BSD MPEG accel.)" -@@ -904,6 +905,7 @@ +@@ -179,6 +180,8 @@ + echo "" + echo " --enable-mac-bundle produce standalone OS X apps (e.g. mythfrontend.app)" + echo "" ++ echo " --runtime-prefix=PREFIX prefix to be used at runtime" ++ echo " (e.g. .. or /myth/latest)" + echo " --with-bindings=LIST install the bindings specified in the" + echo " comma-separated list" + echo " Supported bindings: perl, python" +@@ -904,6 +907,7 @@ xvmc_vld dvdv fribidi @@ -20651,7 +20636,7 @@ ' MYTHTV_LIST=' -@@ -1178,6 +1180,7 @@ +@@ -1178,6 +1182,7 @@ joystick_menu="default" lamemp3="yes" lirc="yes" @@ -20659,7 +20644,7 @@ opengl="yes" v4l="yes" x11="yes" -@@ -1186,9 +1189,9 @@ +@@ -1186,9 +1191,9 @@ xv="yes" xvmc="yes" xvmc_lib="" @@ -20670,7 +20655,7 @@ # libraries enable zlib -@@ -1353,6 +1356,10 @@ +@@ -1353,6 +1358,10 @@ ;; --xvmc-lib=*) xvmc_lib="$optval" ;; @@ -20681,16 +20666,18 @@ --enable-mac-accel) dvdv="yes" ;; --disable-mac-accel) dvdv="no" -@@ -1382,6 +1389,8 @@ +@@ -1382,6 +1391,10 @@ # disabled due to abuse in Gentoo ebuild --disable-backend) ;; + --enable-mac-bundle) enable mac_bundle + ;; ++ --runtime-prefix=*) RUNPREFIX="$optval" ++ ;; --previous|--prev) echo "No history of previous configure parameters." ;; -@@ -1599,10 +1608,13 @@ +@@ -1599,10 +1612,13 @@ enable darwin disable dvb disable ivtv @@ -20707,7 +20694,7 @@ disable need_memalign disable opengl_video disable opengl_vsync -@@ -1619,9 +1631,23 @@ +@@ -1619,9 +1635,23 @@ FFSERVERLDFLAGS=-Wl,-bind_at_load ;; mingw32*) @@ -20733,7 +20720,7 @@ shlibdir="$bindir" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' -@@ -1629,17 +1655,7 @@ +@@ -1629,17 +1659,7 @@ VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" fi @@ -20751,7 +20738,7 @@ SLIBPREF="lib" SLIBSUF=".dll" EXESUF=".exe" -@@ -2034,6 +2050,8 @@ +@@ -2034,6 +2054,8 @@ # EM64T era Intel Xeon if expr "$processor" : ".*Intel(R) Xeon(R) CPU.*5110" > /dev/null ; then ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems @@ -20760,7 +20747,17 @@ # Various Intel Duo processors (EMT64T capable) elif expr "$processor" : ".*Intel(R).*Core(TM)2.*CPU" > /dev/null ; then ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems -@@ -2702,8 +2720,6 @@ +@@ -2691,6 +2713,9 @@ + fi + fi + ++enabled libfftw3 && has_library libfftw3_threads && has_header fftw3.h || ++ disable libfftw3 ++ + enabled x11 && has_library libX11 || disable x11 + enabled xrandr && has_header X11/extensions/Xrandr.h || disable xrandr + enabled xv && has_library libXv || disable xv +@@ -2702,8 +2727,6 @@ check_header X11/extensions/XvMClib.h has_library libXvMCW || disable xvmcw check_header X11/extensions/vldXvMC.h @@ -20769,7 +20766,7 @@ if test x"$xvmc_lib" != x""; then VENDOR_XVMC_LIBS="-l"$xvmc_lib -@@ -2715,25 +2731,34 @@ +@@ -2715,25 +2738,34 @@ VENDOR_XVMC_LIBS="-lviaXvMCPro" elif has_library libchromeXvMCPro ; then VENDOR_XVMC_LIBS="-lchromeXvMCPro" @@ -20807,6 +20804,34 @@ # Can only do Mac accel on Mac platform +@@ -2838,6 +2870,9 @@ + libdir="${PREFIX}/${libdir_name}" + fi + ++if test x"$RUNPREFIX" = x""; then ++ RUNPREFIX=${PREFIX} ++fi + + echo "# Basic Settings" + echo "Compile type $compile_type" +@@ -2848,6 +2883,7 @@ + echo "Compiler cache $ccache$ccache_txt" + echo "DistCC $distcc$distcc_txt" + echo "install prefix $PREFIX" ++echo "runtime prefix $RUNPREFIX" + <<BLOCK_QUOTE + echo "source path $source_path" + echo "C compiler $cc" +@@ -3032,7 +3068,9 @@ + echo "#define FFMPEG_CONFIG_H" >> $TMPH + echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH + ++echo "RUNPREFIX=$RUNPREFIX" >> $MYTH_CONFIG_MAK + echo "PREFIX=$PREFIX" >> $MYTH_CONFIG_MAK ++echo "LIBDIRNAME=$libdir_name" >> $MYTH_CONFIG_MAK + echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK + <<BLOCK_QUOTE + echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak Index: mythtv/themes/themes.pro =================================================================== --- mythtv/themes/themes.pro (revision 16468) @@ -20845,12 +20870,111 @@ <items>8</items> <image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image> <image function="uparrow" filename="gantup.png" location="740,15"></image> +Index: mythtv/docs/doxygen-architecture-document.cpp [...5328 lines suppressed...] @@ -24174,13 +28895,95 @@ Property changes on: mythtv/contrib/Win32/build/mythtvsetup.iss ___________________________________________________________________ -Name: svn:executable +Added: svn:executable + * +Index: mythtv/contrib/Win32/MythInstaller.bat +=================================================================== +--- mythtv/contrib/Win32/MythInstaller.bat (revision 0) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 18161) +@@ -0,0 +1,69 @@ ++@rem = '--*-Perl-*-- ++@rem ++@rem Wrapper for bootstrapping Windows build and install. ++@rem Checks for Perl, attempts to download latest win32-packager.pl, ++@rem and then executes that with any supplied arguments. ++@rem ++ ++@echo off ++ ++if "%OS%" == "Windows_NT" setlocal ++set PERL5LIB= ++set PERLLIB= ++set PERL5OPT= ++set PERLIO= ++set PERL_UNICODE= ++if "%OS%" == "Windows_NT" goto WinNT ++perl -x -S "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9 ++goto endofperl ++ ++:WinNT ++if not exist c:\perl\bin\perl.exe goto no_perl ++@rem ++@rem If we needed any non-standard Perl modules, this is how to install them: ++@rem if NOT exist C:\Perl\site\lib\Config\inifiles.pm call c:\perl\bin\ppm.bat install Config-inifiles ++@rem if errorlevel 1 echo You do not have Perl in your PATH. ++@rem ++perl -x -S %0 %* ++if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endofperl ++if %errorlevel% == 9009 echo You do not have Perl in your PATH. ++if errorlevel 1 goto script_failed_so_exit_with_non_zero_val 2>nul ++goto endofperl ++ ++:no_perl ++echo Could not find Perl in C:\Perl. ++echo Please download ActivePerl from http://www.activestate.com/store ++echo install it, and then run this script again. ++sleep 1 ++c:\windows\explorer http://www.activestate.com/store/activeperl/download ++goto endofperl ++ ++@rem '; ++#!c:/perl/bin/perl.exe -w ++use strict; ++use LWP::UserAgent; ++use IO::File; ++ ++my $file = 'win32-packager.pl'; ++my $url = "http://svn.mythtv.org/svn/trunk/mythtv/contrib/Win32/build/$file"; ++my $proxy = ''; # or somehting like: 'http://enter.your.proxy.here:8080'; ++ ++my $ua = LWP::UserAgent->new; ++$ua->proxy(['http', 'ftp'], $proxy); ++my $req = HTTP::Request->new(GET => $url); ++my $res = $ua->request($req); ++ ++if ($res->is_success) { ++ my $f = new IO::File "> $file" || die "Can't create $file: $!\n"; ++ $f->binmode(); ++ $f->print($res->content); ++ $f->close(); ++} ++ ++if ( ! -s $file ) { ++ die "Cannot download $url"; ++} ++ ++exec "c:/perl/bin/perl.exe -w $file @ARGV"; ++__END__ ++:endofperl + +Property changes on: mythtv/contrib/Win32/MythInstaller.bat +___________________________________________________________________ +Added: svn:svn:eol-style + + native +Added: svn:keywords + + Date Revision Author + Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 17338) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18161) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -24242,7 +29045,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 17338) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18161) @@ -0,0 +1,58 @@ +@Echo off +:: @@ -24302,11 +29105,82 @@ +Echo. +Echo The backtrace can be found in .\gdb.txt +Echo. +Index: mythtv/contrib/Win32/win32-packager.pl +=================================================================== +--- mythtv/contrib/Win32/win32-packager.pl (revision 16468) ++++ mythtv/contrib/Win32/win32-packager.pl (working copy) +@@ -68,11 +68,13 @@ + # it has NOT been tested much, and will with HIGH PROBABILITY fail somewhere. + # TODO - Only $mingw is tested and most likely is safe to change. + +-# perl compatible paths (single forward slashes in DOS style): +-my $msys = 'C:/MSys/1.0/'; # must end in slash, and use forward slashes / +-my $sources = 'C:/msys/1.0/sources/'; # must end in slash, and use forward slashes / +-my $mingw = 'C:/MinGW/'; # must end in slash, and use forward slashes / +-my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives so c:/mythtv/mythtv/ is the main codebase. # must end in slash, and use forward slashes / ++# Perl compatible paths. DOS style, but forward slashes, and must end in slash: ++my $msys = 'C:/MSys/1.0/'; ++my $sources = 'C:/msys/1.0/sources/'; ++my $mingw = 'C:/MinGW/'; ++my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives ++ # so c:/mythtv/mythtv/ is the main codebase. ++my $build = 'C:/mythtv/build/'; # where 'make install' installs into + + # DOS executable CMD.exe versions of the paths (for when we shell to DOS mode): + my $dosmsys = perl2dos($msys); +@@ -80,11 +82,17 @@ + my $dosmingw = perl2dos($mingw); + my $dosmythtv = perl2dos($mythtv); + +-# unix/msys equivalent versions of the paths (for when we shell to MSYS/UNIX mode): +-my $unixmsys = '/'; # msys root is always mounted here, irrespective of where DOS says it really is. +-my $unixmingw = '/mingw/'; # mingw is always mounted here under unix, if you setup mingw right in msys, so we will usually just say /mingw in the code, not '.$unixmingw.' or similar (see /etc/fstab) +-my $unixsources = perl2unix($sources); $unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / ++# Unix/MSys equiv. versions of the paths (for when we shell to MSYS/UNIX mode): ++my $unixmsys = '/'; # MSys root is always mounted here, ++ # irrespective of where DOS says it really is. ++my $unixmingw = '/mingw/'; # MinGW is always mounted here under unix, ++ # if you setup mingw right in msys, ++ # so we will usually just say /mingw in the code, ++ # not '.$unixmingw.' or similar (see /etc/fstab) ++my $unixsources = perl2unix($sources); ++$unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / + my $unixmythtv = perl2unix($mythtv); ++my $unixbuild = perl2unix($build); + + + #NOTE: ITS IMPORTANT that the PATHS use the correct SLASH-ing method for the type of action: +@@ -520,7 +528,16 @@ + [ grep => ['Makefile|MAKEFILE',$mythtv.'mythtv/Makefile'], shell => ['rm '.$unixmythtv.'mythtv/Makefile','nocheck'], comment => 'broken Makefile, delete it' ], + + # configure +-[ file => $mythtv.'mythtv/Makefile', shell => ['source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','./configure --prefix=/usr --disable-dbox2 --disable-hdhomerun --disable-dvb --disable-ivtv --disable-iptv --disable-joystick-menu --disable-xvmc-vld --disable-x11 --disable-xvmc --enable-directx --enable-memalign-hack --cpu=k8 --compile-type=debug'], comment => 'do we already have a Makefile for mythtv?' ], ++[ file => $mythtv.'mythtv/Makefile', ++ shell => ['source '.$unixmythtv.'qt_env.sh', ++ 'cd '.$unixmythtv.'mythtv', ++ './configure --prefix='.$unixbuild.' --runtime-prefix=..'. ++ ' --disable-dbox2 --disable-hdhomerun'. ++ ' --disable-dvb --disable-ivtv --disable-iptv'. ++ ' --disable-joystick-menu --disable-xvmc-vld --disable-x11'. ++ ' --disable-xvmc --enable-directx'. ++ ' --enable-memalign-hack --cpu=k8 --compile-type=debug'], ++comment => 'do we already have a Makefile for mythtv?' ], + # make + [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], + [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], Index: mythtv/contrib/OSX/osx-packager.pl =================================================================== --- mythtv/contrib/OSX/osx-packager.pl (revision 16468) +++ mythtv/contrib/OSX/osx-packager.pl (working copy) -@@ -1041,6 +1041,13 @@ +@@ -577,6 +577,7 @@ + 'mythtv' + => [ + '--prefix=' . $PREFIX, ++ '--runtime-prefix=../Resources', + # To "cross compile" something for a lesser Mac: + #'--tune=G3', + #'--disable-altivec', +@@ -1041,6 +1042,13 @@ if ( $OPT{'verbose'} ) { push @bundler, '--verbose' } @@ -24320,7 +29194,7 @@ ### Create each package. ### Note that this is a bit of a waste of disk space, ### because there are now multiple copies of each library. -@@ -1072,6 +1079,9 @@ +@@ -1072,6 +1080,9 @@ # Remove copy of binary unlink "$SCRIPTDIR/$target" or die; Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv.spec 3 Aug 2008 15:20:03 -0000 1.1 +++ mythtv.spec 18 Aug 2008 01:26:30 -0000 1.2 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r17859 +%define _svnver r18161 %define branch release-0-21-fixes # Nb: base 0.21 svn rev is r16468 #define branch trunk @@ -22,7 +22,7 @@ %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else -Release: 7%{?dist} +Release: 8%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -114,7 +114,7 @@ BuildRequires: mjpegtools-devel >= 1.6.1, xvidcore-devel >= 0.9.1 BuildRequires: libfame-devel >= 0.9.0 BuildRequires: transcode >= 0.6.8 -BuildRequires: libdvdcss-devel >= 1.2.7 +#BuildRequires: libdvdcss-devel >= 1.2.7 # mythbrowser BuildRequires: kdelibs3-devel # mythphone @@ -1003,6 +1003,11 @@ %endif %changelog +* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-8 +- Don't BR: libdvdcss-devel +- Update release-0-21-fixes patches (r18161) +- Rebuild for libraw1394 v2.0.0 + * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7 - rebuild