December 2008 - rpmfusion-commits

rpms/mythtv/F-10 mythplugins-0.21-svnfixes.patch, 1.4, 1.5 mythtv-0.21-svnfixes.patch, 1.4, 1.5 mythtv.spec, 1.13, 1.14

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv31892 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15 - Update to release-0-21-fixes patches (r19344) - Includes critical fix for supporting use of FireWire cable boxes w/Fedora's native FireWire driver stack (finally!) - Fix missing package ownership of some stray dirs (rpmfusion bz#222) mythplugins-0.21-svnfixes.patch: Index: mythplugins-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythplugins-0.21-svnfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4 +++ mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:48:37 -0000 1.5 @@ -2,7 +2,24 @@ =================================================================== --- mythplugins/mythweb/INSTALL (revision 16468) +++ mythplugins/mythweb/INSTALL (working copy) -@@ -195,6 +195,10 @@ +@@ -2,7 +2,7 @@ + requirements and instructions for MythWeb. Please see README for other + information. + +-February 16, 2008 ++October 26, 2008 + + ======== + Contents +@@ -18,6 +18,7 @@ + 5.0 Apache + 5.1 Apache Config + 6.0 Lighttpd ++7.0 PHP + + ======= + Summary +@@ -195,6 +196,10 @@ mod_deflate mod_headers @@ -13,6 +30,32 @@ ================= 5.1 Apache Config ================= +@@ -245,3 +250,25 @@ + + Sorry, no documentation here yet... + ++======= ++7.0 PHP ++======= ++ ++PHP tries to determine the system's local timezone settings automatically ++but may not be successful on every distribution. To ensure that PHP uses ++the correct timezone, edit php.ini and configure the date.timezone variable ++to your local timezone. ++ ++For example, to set the PHP timezone to Europe/London: ++ ++ vim /etc/php.ini ++ ++add/uncomment the date.timezone variable: ++ ++ date.timezone = Europe/London ++ ++and then restart Apache (exact commands depend on distribution): ++ ++ /etc/init.d/apache2 stop ++ /etc/init.d/apache2 start ++ Index: mythplugins/mythweb/modules/music/stream.php =================================================================== --- mythplugins/mythweb/modules/music/stream.php (revision 16468) @@ -1176,6 +1219,34 @@ backend_command(array('FORGET_RECORDING', implode(backend_sep, $row), '0')); // Delay a second so the scheduler can catch up sleep(1); +Index: mythplugins/mythweb/README +=================================================================== +--- mythplugins/mythweb/README (revision 16468) ++++ mythplugins/mythweb/README (working copy) +@@ -135,10 +135,16 @@ + Q: I get a "500 server error" (or some other number) when trying to view + MythWeb. + A: Check your apache logs for details about what caused the error. Usually, +- it means that you didn't set up a required module. Read the ++ it means that you didn't set up a required module. Read the + mythweb.conf.apache file in more detail to make sure you didn't miss + an important setup file. + ++Q: MythWeb complains about "Warning: Unknown Programme" after Daylight Savings ++ Time has started/finished. ++A: PHP may not have determined your local timezone correctly. Read the PHP ++ section of MythWeb's INSTALL file to find out how to correctly configure ++ your timezone in PHP. ++ + ====================== + 4.0 Submitting Patches + ====================== +@@ -150,5 +156,3 @@ + other "diff -u" patches, but if there have been any major changes in SVN (there + occasionally are), I won't put much effort into trying to make your patch work, + so please just use SVN. +- +- Index: mythplugins/configure =================================================================== --- mythplugins/configure (revision 16468) @@ -10168,6 +10239,7 @@ <position>0,0</position> </image> + Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts =================================================================== --- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468) @@ -12142,6 +12214,19 @@ command_string = "Internal"; gContext->GetMainWindow()->HandleMedia(command_string, filename); +Index: mythplugins/mythvideo/mythvideo/videofilter.cpp +=================================================================== +--- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468) ++++ mythplugins/mythvideo/mythvideo/videofilter.cpp (working copy) +@@ -293,7 +293,7 @@ + { + if (runtime == kRuntimeFilterUnknown) + { +- matches = mdata.Length() < 0; ++ matches = mdata.Length() == 0; + } + else + { Index: mythplugins/mythphone/i18n/mythphone_nl.ts =================================================================== --- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468) mythtv-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 mythtv-0.21-svnfixes.patch Index: mythtv-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv-0.21-svnfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4 +++ mythtv-0.21-svnfixes.patch 12 Dec 2008 03:48:38 -0000 1.5 @@ -7332,6 +7332,10 @@ </message> </context> </TS> +Index: mythtv/i18n/mythfrontend_nb.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythtv/i18n/mythfrontend_de.ts =================================================================== --- mythtv/i18n/mythfrontend_de.ts (revision 16468) @@ -25114,6 +25118,34 @@ </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_de.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) @@ -26358,6 +26390,10 @@ Hauppauge website for the most accurate information.</P> <P>A PVR-150 comes in a number of versions: <UL> +Index: mythtv/docs/mythtv-HOWTO.pdf +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythtv/docs/index.html =================================================================== --- mythtv/docs/index.html (revision 16468) @@ -26387,7 +26423,7 @@ Index: mythtv/libs/libs-targetfix.pro =================================================================== --- mythtv/libs/libs-targetfix.pro (revision 0) -+++ mythtv/libs/libs-targetfix.pro (revision 19169) ++++ mythtv/libs/libs-targetfix.pro (revision 19344) @@ -0,0 +1,20 @@ +# Common project modifications to change the generated target. + @@ -26679,6 +26715,55 @@ image->SetDontRoundPosition(true); subtitleOSD->AddType(image); +Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +=================================================================== +--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (revision 16468) ++++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (working copy) +@@ -981,28 +981,25 @@ + correct_bttv = true; + + QString driver = (char *)vcap.driver; +- if (driver == "cx8800" || driver == "go7007" || driver == "em28xx") ++ channelfd = open(videodevice.ascii(), O_RDWR); ++ if (channelfd < 0) + { +- channelfd = open(videodevice.ascii(), O_RDWR); +- if (channelfd < 0) +- { +- VERBOSE(VB_IMPORTANT, LOC_ERR + +- QString("Can't open video device: %1").arg(videodevice)); +- perror("open video:"); +- KillChildren(); +- return false; +- } +- +- if (driver == "go7007") +- { +- go7007 = true; +- } +- +- inpixfmt = FMT_NONE; +- InitFilters(); +- DoV4L2(); ++ VERBOSE(VB_IMPORTANT, LOC_ERR + ++ QString("Can't open video device: %1").arg(videodevice)); ++ perror("open video:"); ++ KillChildren(); + return false; + } ++ ++ if (driver == "go7007") ++ { ++ go7007 = true; ++ } ++ ++ inpixfmt = FMT_NONE; ++ InitFilters(); ++ DoV4L2(); ++ return false; + } + + channelfd = fd; Index: mythtv/libs/libmythtv/videoout_d3d.cpp =================================================================== --- mythtv/libs/libmythtv/videoout_d3d.cpp (revision 16468) @@ -26999,6 +27084,28 @@ allowedquit = true; dvd_video_codec_changed = false; continue; +@@ -3446,10 +3447,6 @@ + .av_substream_index; + } + +- if (firstloop && pkt->pts != (int64_t)AV_NOPTS_VALUE) +- lastapts = (long long)(av_q2d(curstream->time_base) * +- pkt->pts * 1000); +- + if ((onlyvideo > 0) || (pkt->stream_index != audIdx)) + { + ptr += len; +@@ -3457,6 +3454,10 @@ + continue; + } + ++ if (firstloop && pkt->pts != (int64_t)AV_NOPTS_VALUE) ++ lastapts = (long long)(av_q2d(curstream->time_base) * ++ pkt->pts * 1000); ++ + if (skipaudio) + { + if ((lastapts < lastvpts - (10.0 / fps)) || @@ -3749,9 +3750,6 @@ picframe->frameNumber = framesPlayed; @@ -27982,7 +28089,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19169) ++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19344) @@ -0,0 +1,12 @@ +#ifndef _FREESAT_HUFFMAN_H_ +#define _FREESAT_HUFFMAN_H_ @@ -28005,3049 +28112,4377 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19169) -@@ -0,0 +1,3042 @@ -+/* -+ * This table was derived from on-air transmissions. It certainly has omissions and -+ * almost certainly contains errors. Use entirely at your own risk. -+ */ -+ -+static struct hufftab fsat_huffman1[] = -+{ -+ { START, 0x00000000, 2, 'T'}, -+ { START, 0x40000000, 3, 'B'}, -+ { START, 0x60000000, 5, 'L'}, -+ { START, 0x68000000, 7, 'K'}, -+ { START, 0x6a000000, 8, '6'}, -+ { START, 0x6c000000, 6, 'Q'}, -+ { START, 0x70000000, 5, 'D'}, -+ { START, 0x78000000, 5, 'H'}, -+ { START, 0x80000000, 4, 'C'}, -+ { START, 0x90000000, 4, 'I'}, -+ { START, 0xa0000000, 5, 'R'}, -+ { START, 0xa8000000, 5, 'N'}, -+ { START, 0xb0000000, 5, 'E'}, -+ { START, 0xb8000000, 8, 'V'}, -+ { START, 0xb9000000, 10, 'Z'}, -+ { START, 0xb9400000, 11, '1'}, -+ { START, 0xb9600000, 11, '3'}, -+ { START, 0xb9800000, 9, '2'}, -+ { START, 0xba000000, 7, 'U'}, [...9085 lines suppressed...] ++ ++} ++ + MHEntryField::~MHEntryField() + { + Index: mythtv/libs/libmythdvdnav/libmythdvdnav.pro =================================================================== --- mythtv/libs/libmythdvdnav/libmythdvdnav.pro (revision 16468) @@ -40283,24 +43222,150 @@ =================================================================== --- mythtv/programs/mythbackend/backendutil.cpp (revision 16468) +++ mythtv/programs/mythbackend/backendutil.cpp (working copy) -@@ -207,7 +207,7 @@ +@@ -20,26 +20,20 @@ + #include "libmyth/util.h" + #include "libmyth/compat.h" + +-static QMap<int, int> fsID_cache; ++static QMap<QString, int> fsID_cache; + static QMutex cache_lock; + + /// gets stable fsIDs based of the dirID +-static int GetfsID(int dirID) ++static int GetfsID(vector<FileSystemInfo>::iterator fsInfo) + { ++ QString fskey = fsInfo->hostname + ":" + fsInfo->directory; + QMutexLocker lock(&cache_lock); +- if (!fsID_cache.contains(dirID)) +- fsID_cache[dirID] = fsID_cache.count(); ++ if (!fsID_cache.contains(fskey)) ++ fsID_cache[fskey] = fsID_cache.count(); + +- return fsID_cache[dirID]; ++ return fsID_cache[fskey]; + } + +-// checks the cache if we know this dirID, used to skip known unique file systems +-static bool HasfsID(int dirID) +-{ +- QMutexLocker lock(&cache_lock); +- return fsID_cache.contains(dirID); +-} +- + static size_t GetCurrentMaxBitrate(QMap<int, EncoderLink *> *encoderList) + { + size_t totalKBperMin = 0; +@@ -180,7 +174,7 @@ + while (it != strlist.end()) + { + fsInfo.hostname = *(it++); +- fsInfo.directory = fsInfo.hostname.section(".", 0, 0) + ":" + *(it++); ++ fsInfo.directory = *(it++); + fsInfo.isLocal = (*(it++)).toInt(); + fsInfo.fsID = (*(it++)).toInt(); + fsInfo.dirID = (*(it++)).toInt(); +@@ -198,7 +192,11 @@ + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) + { + if (it1->fsID == -1) +- it1->fsID = GetfsID(it1->dirID); ++ { ++ it1->fsID = GetfsID(it1); ++ it1->directory = ++ it1->hostname.section(".", 0, 0) + ":" + it1->directory; ++ } + + it2 = it1; + for (it2++; it2 != fsInfos.end(); it2++) +@@ -206,14 +204,14 @@ + // Sometimes the space reported for an NFS mounted dir is slightly // different than when it is locally mounted because of block sizes if (it2->fsID == -1 && - (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) && +- (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) && - (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && + (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) <= maxWriteFiveSec)) { -@@ -292,7 +292,7 @@ + if (!it1->hostname.contains(it2->hostname)) + it1->hostname = it1->hostname + "," + it2->hostname; +- it1->directory = it1->directory + "," + it2->directory; ++ it1->directory = it1->directory + "," + ++ it2->hostname.section(".", 0, 0) + ":" + it2->directory; + fsInfos.erase(it2); + it2 = it1; + } +@@ -276,32 +274,56 @@ + fsInfos.push_back(fsInfo); + } + ++ VERBOSE(VB_SCHEDULE+VB_FILE, "Determining unique filesystems"); + size_t maxWriteFiveSec = GetCurrentMaxBitrate(tvList)/12 /*5 seconds*/; + maxWriteFiveSec = max((size_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs + vector<FileSystemInfo>::iterator it1, it2; + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) + { + if (it1->fsID == -1) +- it1->fsID = GetfsID(it1->dirID); ++ it1->fsID = GetfsID(it1); + else + continue; + ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString("%1:%2 (fsID %3, dirID %4) using %5 out of %6 KB, " ++ "looking for matches") ++ .arg(it1->hostname).arg(it1->directory) ++ .arg(it1->fsID).arg(it1->dirID) ++ .arg(it1->usedSpaceKB).arg(it1->totalSpaceKB)); + it2 = it1; + for (it2++; it2 != fsInfos.end(); it2++) + { ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Checking %1:%2 (dirID %3) using %4 of %5 KB") ++ .arg(it2->hostname).arg(it2->directory).arg(it2->dirID) ++ .arg(it2->usedSpaceKB).arg(it2->totalSpaceKB)); ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Total KB Diff: %1 (want <= 32)") ++ .arg((long)absLongLong(it1->totalSpaceKB - it2->totalSpaceKB))); ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Used KB Diff: %1 (want <= %2)") ++ .arg((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)) ++ .arg(maxWriteFiveSec)); ++ // Sometimes the space reported for an NFS mounted dir is slightly // different than when it is locally mounted because of block sizes - if (it2->fsID == -1 && !HasfsID(it2->dirID) && +- if (it2->fsID == -1 && !HasfsID(it2->dirID) && - (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && ++ if (it2->fsID == -1 && + (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) <= maxWriteFiveSec)) { + it2->fsID = it1->fsID; ++ ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" MATCH Found: %1:%2 will use fsID %3") ++ .arg(it2->hostname).arg(it2->directory) ++ .arg(it2->fsID)); + } + } + } + +- if (print_verbose_messages & VB_FILE) ++ if (print_verbose_messages & (VB_FILE|VB_SCHEDULE)) + { + cout << "--- GetFilesystemInfos directory list start ---" << endl; + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) +@@ -313,7 +335,8 @@ + else + cout << "Remote"; + cout << endl; +- cout << " Drive ID: " << it1->fsID << endl; ++ cout << " fsID : " << it1->fsID << endl; ++ cout << " dirID : " << it1->dirID << endl; + cout << " TotalKB : " << it1->totalSpaceKB << endl; + cout << " UsedKB : " << it1->usedSpaceKB << endl; + cout << " FreeKB : " << it1->freeSpaceKB << endl; Index: mythtv/programs/mythtv-setup/setup.xml =================================================================== --- mythtv/programs/mythtv-setup/setup.xml (revision 16468) @@ -40784,7 +43849,7 @@ Index: mythtv/contrib/Win32/build/mythtvsetup.iss =================================================================== --- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0) -+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169) ++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344) @@ -0,0 +1,493 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -41288,7 +44353,7 @@ Index: mythtv/contrib/Win32/MythInstaller.bat =================================================================== --- mythtv/contrib/Win32/MythInstaller.bat (revision 0) -+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344) @@ -0,0 +1,69 @@ +@rem = '--*-Perl-*-- +@rem @@ -41370,7 +44435,7 @@ Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -41432,7 +44497,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344) @@ -0,0 +1,58 @@ +@Echo off +:: Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mythtv.spec 29 Nov 2008 06:31:16 -0000 1.13 +++ mythtv.spec 12 Dec 2008 03:48:38 -0000 1.14 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r19169 +%define _svnver r19344 %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: 14%{?dist} +Release: 15%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -255,6 +255,8 @@ Group: Applications/Multimedia Requires: lame Requires: mythtv-common = %{version}-%{release} +# libraw1394 2.0.0-5 for f10+ and 1.3.0-11 for f9 contain a critical fix +Requires: libraw1394 >= 2.0.0-5 Conflicts: xmltv-grabbers < 0.5.37 %description backend @@ -772,6 +774,7 @@ %files common %defattr(-,root,root,-) %dir %{_sysconfdir}/mythtv +%dir %{_datadir}/mythtv %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml %{_bindir}/mythcommflag @@ -826,7 +829,8 @@ %{_bindir}/mythlcdserver %{_bindir}/mythshutdown %{_bindir}/mythwelcome -%{_libdir}/mythtv/filters +%dir %{_libdir}/mythtv +%dir %{_libdir}/mythtv/filters %dir %{_libdir}/mythtv/plugins %{_datadir}/mythtv/*.ttf %dir %{_datadir}/mythtv/i18n @@ -848,6 +852,7 @@ %{_includedir}/* %{_libdir}/*.so %exclude %{_libdir}/*.a +%dir %{_datadir}/mythtv/build %{_datadir}/mythtv/build/settings.pro %files -n mythplugins @@ -1003,6 +1008,8 @@ %{perl_vendorlib}/MythTV.pm %dir %{perl_vendorlib}/MythTV %{perl_vendorlib}/MythTV/*.pm +%dir %{perl_vendorlib}/IO/Socket +%dir %{perl_vendorlib}/IO/Socket/INET %{perl_vendorlib}/IO/Socket/INET/MythTV.pm %exclude %{perl_vendorarch}/auto/MythTV/.packlist @@ -1015,6 +1022,12 @@ %endif %changelog +* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15 +- Update to release-0-21-fixes patches (r19344) +- Includes critical fix for supporting use of FireWire cable + boxes w/Fedora's native FireWire driver stack (finally!) +- Fix missing package ownership of some stray dirs (rpmfusion bz#222) + * Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14 - Update release-0-21-fixes patches (r19169) - Should resolve 720p playback stutter, rpmfusion bz#186

15 years, 11 months

1
0
0 / 0

rpms/mythtv/devel mythtv-0.21-svnfixes.patch,1.5,1.6

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31780 Modified Files: mythtv-0.21-svnfixes.patch Log Message: forgot about these os x bits that don't apply cleanly for some reason I don't care enough about to investigate... 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.21-svnfixes.patch 12 Dec 2008 03:44:14 -0000 1.5 +++ mythtv-0.21-svnfixes.patch 12 Dec 2008 03:46:58 -0000 1.6 @@ -26825,1103 +26825,6 @@ (model == "GENERIC")); } -Index: mythtv/libs/libmythtv/videoout_quartz.cpp -=================================================================== ---- mythtv/libs/libmythtv/videoout_quartz.cpp (revision 16468) -+++ mythtv/libs/libmythtv/videoout_quartz.cpp (working copy) -@@ -12,9 +12,10 @@ - * - Other viewing options? - * - * = KNOWN BUGS -- * - Aspect switching occasionally fails -- * - Floating window needs testing. Resizing, or viewing something -- * a second time, may cause a crash (backtraces appreciated) -+ * - Drawing on the desktop only updates the main screen? -+ * - The floating window can only be created on the main screen? -+ * - The fullscreen window doesn't display anything when created -+ * on any screen except, you guessed it, the main screen. - * - * = REVISION - * $Id$ -@@ -36,11 +37,11 @@ - // **************************************************************************** - - #include <map> -+#include <vector> - #include <iostream> -+#include <algorithm> - using namespace std; - --#include <qptrlist.h> -- - #include "DisplayRes.h" - #include "yuv2rgb.h" - #include "uitypes.h" -@@ -59,19 +60,73 @@ - #include "osd.h" - #include "osdsurface.h" - #include "mythconfig.h" -+#include "mythverbose.h" - #include "videodisplayprofile.h" - #include "videoout_dvdv.h" - - #define LOC QString("VideoOutputQuartz: ") - #define LOC_ERR QString("VideoOutputQuartz Error: ") - --class VideoOutputQuartzView; -+/** -+ * An abstract class for implementing QuickTime output viewports. -+ * -+ * This class is further sub-classed for different Mac OS X UI output types. -+ * e.g. Main Window, Full Screen, Dock Icon, Finder/Desktop background -+ */ -+class VideoOutputQuartzView -+{ -+ public: -+ VideoOutputQuartzView(QuartzData *pData); -+ virtual ~VideoOutputQuartzView(); - -+ virtual bool Init(void); -+ -+ virtual void SetFrameSkip(int numskip); -+ virtual void Show(void); -+ -+ virtual void InputChanged(int width, int height, float aspect, -+ MythCodecID av_codec_id); -+ virtual void MoveResize(QRect newRect); -+ -+ virtual void EmbedChanged(bool embedded); -+ -+ protected: -+ virtual bool Begin(void); -+ virtual void End(void); -+ virtual void Transform(QRect newRect); -+ virtual void BlankScreen(bool deferred); -+ -+ // Subclasses implement the following methods: -+ virtual bool BeginPort(void) = 0; // Set up a valid thePort object -+ virtual void EndPort(void) = 0; // Release thePort -+ -+ char * name; // Name, for verbose output -+ -+ QuartzData * parentData; // information about video source is here -+ -+ CGrafPtr thePort; // QuickDraw graphics port -+ QRect m_desired; // Desired output size characteristics -+ ImageSequence theCodec; // QuickTime sequence ID -+ RgnHandle theMask; // clipping region -+ -+ int frameSkip; // do we skip frames? -+ int frameCounter; // keep track of skip status -+ bool drawBlank; // draw a blank frame before next Show -+ -+ /// Set if this view can use the aspect/fill/zoom calculations -+ /// from the base class (which are passed in by MoveResize()), -+ /// to rescale in the output rectangle via Transform(). -+ bool applyMoveResize; -+ -+ QMutex viewLock; -+}; -+ -+ - /* - * The floating window class needs an event callback. - */ --OSStatus VoqvFloater_Callback(EventHandlerCallRef inHandlerCallRef, -- EventRef inEvent, -+OSStatus VoqvFloater_Callback(EventHandlerCallRef inHandlerCallRef, -+ EventRef inEvent, - void *inUserData); - - /* -@@ -85,7 +140,7 @@ - srcAspect(1.3333f), srcMode(kAspect_Off), - - pixelData(0), pixelSize(0), -- pixelLock(false), -+ pixelLock(), - - window(0), - screen(0), refreshRate(60.0f), -@@ -94,12 +149,18 @@ - scaleUpVideo(false), correctGamma(false), - convertI420to2VUY(NULL), - -- ZoomedH(1.0f), ZoomedV(1.0f), -- ZoomedUp(0), ZoomedRight(0), -- - embeddedView(NULL), dvdv(NULL) - {;} -+ ~QuartzData() { ClearViews(); } - -+ void ClearViews(void) -+ { -+ vector<VideoOutputQuartzView*>::iterator it = views.begin(); -+ for (; it != views.end(); ++it) -+ delete *it; -+ views.clear(); -+ } -+ - // Stored information about the media stream: - int srcWidth, - srcHeight; -@@ -124,15 +185,9 @@ - bool scaleUpVideo; // Enlarge video as needed? - bool correctGamma; // Video gamma correction - conv_i420_2vuy_fun convertI420to2VUY; // I420 -> 2VUY conversion function -- -- // Zoom preferences: -- float ZoomedH; // VideoOutputBase::mz_scale_h -- float ZoomedV; // VideoOutputBase::mz_scale_v -- int ZoomedUp; // VideoOutputBase::mz_move.y() -- int ZoomedRight; // VideoOutputBase::mz_move.x() - - // Output viewports: -- QPtrList<VideoOutputQuartzView> views; // current views -+ vector<VideoOutputQuartzView*> views; // current views - - // Embedding: - VideoOutputQuartzView * embeddedView; // special embedded widget -@@ -140,78 +195,11 @@ - DVDV * dvdv; // MPEG acceleration data - }; - --/** -- * An abstract class for implementing QuickTime output viewports. -- * -- * This class is further sub-classed for different Mac OS X UI output types. -- * e.g. Main Window, Full Screen, Dock Icon, Finder/Desktop background -- */ --class VideoOutputQuartzView --{ -- public: -- VideoOutputQuartzView(QuartzData *pData); -- virtual ~VideoOutputQuartzView(); -- -- virtual bool Init(void); -- -- virtual void SetFrameSkip(int numskip); -- virtual void Show(void); -- -- virtual void InputChanged(int width, int height, float aspect, -- MythCodecID av_codec_id); -- virtual void VideoAspectRatioChanged(float aspect); -- virtual void Zoom(ZoomDirection direction); -- -- virtual void EmbedChanged(bool embedded); -- -- protected: -- virtual bool Begin(void); -- virtual void End(void); -- virtual void Transform(void); -- virtual void BlankScreen(bool deferred); -- -- // Subclasses implement the following methods: -- virtual bool BeginPort(void) = 0; // Set up a valid thePort object -- virtual void EndPort(void) = 0; // Release thePort -- -- char * name; // Name, for verbose output -- -- QuartzData * parentData; // information about video source is here -- -- CGrafPtr thePort; // QuickDraw graphics port -- int desiredWidth, -- desiredHeight, -- desiredXoff, -- desiredYoff; // output size characteristics -- ImageSequence theCodec; // QuickTime sequence ID -- RgnHandle theMask; // clipping region -- -- int frameSkip; // do we skip frames? -- int frameCounter; // keep track of skip status -- bool drawBlank; // draw a blank frame before next Show -- -- bool applyTVoffset; // subclasses set this to affect transform -- -- QMutex viewLock; --}; -- - VideoOutputQuartzView::VideoOutputQuartzView(QuartzData *pData) -+ : name(NULL), parentData(pData), -+ thePort(NULL), theCodec(0), theMask(NULL), frameSkip(1), frameCounter(0), -+ drawBlank(true), applyMoveResize(false) - { -- parentData = pData; -- -- thePort = NULL; -- desiredWidth = desiredHeight = desiredXoff = desiredYoff = 0; -- theCodec = 0; -- theMask = NULL; -- -- frameSkip = 1; -- frameCounter = 0; -- drawBlank = true; -- -- // This variable is set by subclasses to indicate whether -- // to apply the scan displacement TV mode settings. -- // Embedded or small viewports should set this to false. -- applyTVoffset = true; - } - - VideoOutputQuartzView::~VideoOutputQuartzView() -@@ -231,28 +219,21 @@ - return false; - } - -- // Set output size and clipping mask (if necessary) -+ // Set initial output size - Rect portBounds; - GetPortBounds(thePort, &portBounds); -- desiredXoff += portBounds.left; -- desiredYoff += portBounds.top; -+ VERBOSE(VB_PLAYBACK, QString("%0Viewport currently %1,%2 -> %3,%4") -+ .arg(name).arg(portBounds.left).arg(portBounds.top) -+ .arg(portBounds.right).arg(portBounds.bottom)); -+ m_desired.setWidth(portBounds.right); -+ m_desired.setHeight(portBounds.bottom); -+#if 0 -+ // The clipping mask -+ theMask = NewRgn(); -+ SetRectRgn(theMask, m_desired.left(), m_desired.top(), -+ m_desired.width(), m_desired.height()); -+#endif - -- if (!desiredWidth && !desiredHeight) -- { -- // no mask, set width and height to that of port -- desiredWidth = portBounds.right - portBounds.left; -- desiredHeight = portBounds.bottom - portBounds.top; -- theMask = NULL; -- } -- else -- { -- // mask to requested bounds -- theMask = NewRgn(); -- SetRectRgn(theMask, desiredXoff, desiredYoff, -- desiredXoff + desiredWidth, -- desiredYoff + desiredHeight); -- } -- - // create the decompressor - if (DecompressSequenceBeginS(&theCodec, - parentData->imgDesc, -@@ -272,24 +253,24 @@ - viewLock.unlock(); - return false; - } -- -+ - // Turn off gamma correction unless requested - if (!parentData->correctGamma) - QTSetPixMapHandleRequestedGammaLevel(GetPortPixMap(thePort), - kQTUseSourceGammaLevel); -- -+ - SetDSequenceFlags(theCodec, - codecDSequenceFlushInsteadOfDirtying, - codecDSequenceFlushInsteadOfDirtying); - viewLock.unlock(); - - // set transformation matrix -- Transform(); -+ Transform(m_desired); - - return true; - } - --/// Clean up the codec. -+/// Clean up the codec. - void VideoOutputQuartzView::End(void) - { - viewLock.lock(); -@@ -308,16 +289,16 @@ - } - - /// Build the transformation matrix to scale the video appropriately. --void VideoOutputQuartzView::Transform(void) -+void VideoOutputQuartzView::Transform(QRect newRect) - { - MatrixRecord matrix; - SetIdentityMatrix(&matrix); - - int x, y, w, h, sw, sh; -- x = desiredXoff; -- y = desiredYoff; -- w = desiredWidth; -- h = desiredHeight; -+ x = newRect.left(); -+ y = newRect.top(); -+ w = newRect.width(); -+ h = newRect.height(); - sw = parentData->srcWidth; - sh = parentData->srcHeight; - float aspect = parentData->srcAspect; -@@ -332,75 +313,9 @@ - VERBOSE(VB_PLAYBACK, QString("%0Image is %1 x %2") - .arg(name).arg(sw).arg(sh)); - -- // scale for non-square pixels -- float realAspect = sw * 1.0 / sh; -- if (fabsf(aspect - realAspect) > 0.015) -- { -- VERBOSE(VB_PLAYBACK, QString("Image aspect doesn't match" -- " its resolution (%1 vs %2).") -- .arg(aspect).arg(realAspect)); -+ double hscale = (double) w / sw; -+ double vscale = (double) h / sh; - -- if (parentData->scaleUpVideo) -- { -- // scale width up, leave height alone -- double aspectScale = aspect * sh / sw; -- VERBOSE(VB_PLAYBACK, QString("%0Scaling to %1 of width") -- .arg(name).arg(aspectScale)); -- ScaleMatrix(&matrix, -- X2Fix(aspectScale), -- one, -- zero, zero); -- -- // reset sw to be apparent width -- sw = (int)lroundf(sh * aspect); -- } -- else -- { -- // scale height down -- double aspectScale = sw / (aspect * sh); -- VERBOSE(VB_PLAYBACK, -- QString("%0Scaling to %1 of height") -- .arg(name).arg(aspectScale)); -- ScaleMatrix(&matrix, -- one, -- X2Fix(aspectScale), -- zero, zero); -- -- // reset sw to be apparent width -- sh = (int)lroundf(sw / aspect); -- } -- } -- -- // figure out how much zooming we want -- double hscale, vscale; -- switch (parentData->srcMode) -- { -- case kAdjustFill_Full: -- // height only fills 3/4 of image, zoom up -- // (16:9 movie in 4:3 letterbox format on 16:9 screen) -- hscale = vscale = w * 1.0 / (sw * 0.75); -- break; -- case kAdjustFill_Half: -- // height only fills 3/4 of image, zoom up -- // (4:3 movie on 16:9 screen - 14:9 zoom is a good compromise) -- hscale = vscale = w * 7.0 / (sw * 6); -- break; -- case kAdjustFill_Stretch: -- // like 16 x 9 standard, but with a horizontal stretch applied -- hscale = vscale = fmin(h * 1.0 / sh, w * 1.0 / sw); -- hscale *= 4.0 / 3.0; -- break; -- default: -- // standard, fill viewport with scaled image -- hscale = vscale = fmin(h * 1.0 / sh, w * 1.0 / sw); -- break; -- } -- if ((parentData->ZoomedH != 1.0f) || (parentData->ZoomedV != 1.0f)) -- { -- hscale *= 1 + (parentData->ZoomedH); -- vscale *= 1 + (parentData->ZoomedV); -- } -- - // cap zooming if we requested it - if (!parentData->scaleUpVideo) - { -@@ -428,7 +343,7 @@ - if ((h != sh) || (w != sw)) - { - VERBOSE(VB_PLAYBACK, QString("%0Centering with %1, %2") -- .arg(name).arg((w - sw)/2.0).arg((h - sh)/2.0)); -+ .arg(name).arg((w - sw)/2.0).arg((h - sh)/2.0)); - TranslateMatrix(&matrix, X2Fix((w - sw) / 2.0), X2Fix((h - sh) / 2.0)); - } - -@@ -442,57 +357,6 @@ - } - #endif // USING_DVDV - -- // apply over/underscan -- int hscan = gContext->GetNumSetting("HorizScanPercentage", 5); -- int vscan = gContext->GetNumSetting("VertScanPercentage", 5); -- if (hscan || vscan) -- { -- if (vscan > 0) -- { -- vscan *= 2; // Confusing, but matches X behavior -- } -- if (hscan > 0) -- { -- hscan *= 2; -- } -- -- VERBOSE(VB_PLAYBACK, QString("%0Overscanning to %1, %2") -- .arg(name).arg(hscan).arg(vscan)); -- ScaleMatrix(&matrix, -- X2Fix((double)(1.0 + (hscan / 50.0))), -- X2Fix((double)(1.0 + (vscan / 50.0))), -- X2Fix(sw / 2.0), -- X2Fix(sh / 2.0)); -- } -- -- // apply TV mode offset -- if (applyTVoffset) -- { -- int tv_xoff = gContext->GetNumSetting("xScanDisplacement", 0); -- int tv_yoff = gContext->GetNumSetting("yScanDisplacement", 0); -- if (tv_xoff || tv_yoff) -- { -- VERBOSE(VB_PLAYBACK, -- QString("%0TV offset by %1, %2").arg(name).arg(tv_xoff).arg(tv_yoff)); -- TranslateMatrix(&matrix, Long2Fix(tv_xoff), Long2Fix(tv_yoff)); -- } -- } -- -- // apply zoomed offsets -- if ((parentData->ZoomedH != 1.0f) || (parentData->ZoomedV != 1.0f)) -- { -- // calculate original vs. zoomed dimensions -- int zw = (int)(sw / (1.0 + (parentData->ZoomedH))); -- int zh = (int)(sh / (1.0 + (parentData->ZoomedV))); -- -- int zoomx = (int)((sw - zw) * parentData->ZoomedRight * .005); -- int zoomy = (int)((sh - zh) * parentData->ZoomedUp * .005); -- -- VERBOSE(VB_PLAYBACK, QString("%0Zoom translating to %1, %2") -- .arg(name).arg(zoomx).arg(zoomy)); -- TranslateMatrix(&matrix, Long2Fix(zoomx), Long2Fix(zoomy)); -- } -- - // apply graphics port or embedding offset - if (x || y) - { -@@ -520,15 +384,15 @@ - if (thePort) - { - SetPort(thePort); -- -+ - // set clipping rectangle - Rect clipRect; -- if (desiredWidth && desiredHeight) -+ if (m_desired.width() && m_desired.height()) - { -- clipRect.left = desiredXoff; -- clipRect.top = desiredYoff; -- clipRect.right = desiredWidth - desiredXoff; -- clipRect.bottom = desiredHeight - desiredYoff; -+ clipRect.left = m_desired.left(); -+ clipRect.top = m_desired.top(); -+ clipRect.right = m_desired.right(); -+ clipRect.bottom = m_desired.bottom(); - } - else - { -@@ -542,7 +406,7 @@ - RGBBackColor(&rgbBlack); - EraseRect(&clipRect); - QDFlushPortBuffer(thePort, clipRgn); -- -+ - drawBlank = false; - } - viewLock.unlock(); -@@ -602,22 +466,12 @@ - Begin(); - } - --void VideoOutputQuartzView::VideoAspectRatioChanged(float aspect) -+void VideoOutputQuartzView::MoveResize(QRect newRect) - { -- (void)aspect; -- -- // need to redo transformation matrix -- Transform(); -+ if (applyMoveResize) -+ Transform(newRect); - } - --void VideoOutputQuartzView::Zoom(ZoomDirection direction) --{ -- (void)direction; -- -- // need to redo transformation matrix -- Transform(); --} -- - /// Subclasses that block the main window should suspend - /// playback, hide windows, etc by overriding this method. - void VideoOutputQuartzView::EmbedChanged(bool embedded) -@@ -636,7 +490,7 @@ - : VideoOutputQuartzView(pData) - { - alpha = fminf(1.0, fmaxf(0.0, alphaBlend)); -- applyTVoffset = true; -+ applyMoveResize = true; - name = "Main window: "; - }; - -@@ -715,10 +569,7 @@ - VoqvEmbedded(QuartzData *pData, int x, int y, int w, int h) - : VideoOutputQuartzView(pData) - { -- desiredXoff = x; -- desiredYoff = y; -- desiredWidth = w; -- desiredHeight = h; -+ m_desired = QRect(x, y, w, h); - name = "Embedded window: "; - }; - -@@ -739,14 +590,13 @@ - viewLock.unlock(); - return false; - } -- -+ - // Ensure Qt updates by invalidating the window. - Rect portBounds; - GetPortBounds(thePort, &portBounds); - InvalWindowRect(parentData->window, &portBounds); - -- // The main class handles masking and resizing, -- // since we set the desiredXoff, etc. variables. -+ // The main class handles masking and resizing, since we set m_desired - viewLock.unlock(); - return true; - }; -@@ -768,7 +618,7 @@ - VoqvFullscreen(QuartzData *pData) - : VideoOutputQuartzView(pData) - { -- applyTVoffset = true; -+ applyMoveResize = true; - name = "Full screen: "; - }; - -@@ -792,7 +642,7 @@ - viewLock.unlock(); - return false; - } -- -+ - // switch screen resolution if desired - if (gContext->GetNumSetting("UseVideoModes", 0)) - { -@@ -822,7 +672,7 @@ - DisposePort(thePort); - thePort = NULL; - } -- -+ - // return screen resolution to normal - if (gContext->GetNumSetting("UseVideoModes", 0)) - DisplayRes::GetDisplayRes()->SwitchToGUI(); -@@ -921,7 +771,7 @@ - - VideoOutputQuartzView::Show(); - } -- -+ - void ResizeChanged(bool startResizing) - { - if (!startResizing) -@@ -929,17 +779,20 @@ - // Resize complete, reset the window drawing transformation - Rect curBounds; - GetPortBounds(thePort, &curBounds); -- desiredWidth = curBounds.right - curBounds.left; -- desiredHeight = curBounds.bottom - curBounds.top; -- Transform(); -+ m_desired.setWidth(curBounds.right - curBounds.left); -+ m_desired.setHeight(curBounds.bottom - curBounds.top); -+ SetRectRgn(theMask, m_desired.left(), m_desired.top(), -+ m_desired.width(), m_desired.height()); -+ Transform(m_desired); - } - resizing = startResizing; - } - - protected: -- WindowRef window; -- float alpha; -- bool resizing; -+ ToolboxObjectClassRef myClass; -+ WindowRef window; -+ float alpha; -+ bool resizing; - - bool BeginPort(void) - { -@@ -947,16 +800,28 @@ - - Rect bounds; - bounds.top = bounds.left = bounds.right = bounds.bottom = 50; -- bounds.right += CGDisplayPixelsWide(parentData->screen) / 3; -- bounds.bottom += CGDisplayPixelsHigh(parentData->screen) / 3; -- -+ switch ((int)(10 * parentData->srcAspect)) -+ { -+ case 17: -+ case 18: -+ bounds.right += 320; -+ bounds.bottom += 180; -+ break; -+ case 13: -+ bounds.right += 280; -+ bounds.bottom += 210; -+ break; -+ default: -+ bounds.right += CGDisplayPixelsWide(parentData->screen) / 3; -+ bounds.bottom += CGDisplayPixelsHigh(parentData->screen) / 3; -+ } -+ - // custom window definition - EventHandlerUPP myUPP = NewEventHandlerUPP(VoqvFloater_Callback); - EventTypeSpec defEvents[] = - { { kEventClassWindow, kEventWindowHitTest }, - { kEventClassWindow, kEventWindowDrawFrame }, - { kEventClassWindow, kEventWindowClickResizeRgn } }; -- ToolboxObjectClassRef myClass; - RegisterToolboxObjectClass(CFSTR("org.mythtv.myth.VoqvFloater"), - NULL, - 3, -@@ -982,7 +847,7 @@ - SetWindowAlpha(window, alpha); - RGBColor black = { 0, 0, 0 }; - SetWindowContentColor(window, &black); -- -+ - thePort = GetWindowPort(window); - if (!thePort) - { -@@ -1023,6 +888,7 @@ - DisposeWindow(window); - window = NULL; - } -+ UnregisterToolboxObjectClass(myClass); - viewLock.unlock(); - }; - -@@ -1043,8 +909,8 @@ - }; - - // The event callback for the floating window above --OSStatus VoqvFloater_Callback(EventHandlerCallRef inHandlerCallRef, -- EventRef inEvent, -+OSStatus VoqvFloater_Callback(EventHandlerCallRef inHandlerCallRef, -+ EventRef inEvent, - void *inUserData) - { - (void)inHandlerCallRef; -@@ -1053,7 +919,7 @@ - Point mouseLoc; - Rect winLoc; - WindowDefPartCode where; -- -+ - switch (GetEventKind(inEvent)) - { - case kEventWindowHitTest: -@@ -1072,7 +938,7 @@ - sizeof(mouseLoc), - NULL, - &mouseLoc); -- -+ - // see if user hit grow area - GetWindowBounds(window, - kWindowGlobalPortRgn, -@@ -1089,7 +955,7 @@ - sizeof(WindowDefPartCode), - &where); - break; -- -+ - case kEventWindowClickResizeRgn: - // gather info about window and click - GetEventParameter(inEvent, -@@ -1125,7 +991,6 @@ - VoqvDesktop(QuartzData *pData) - : VideoOutputQuartzView(pData) - { -- applyTVoffset = true; - name = "Desktop: "; - }; - -@@ -1205,9 +1070,6 @@ - myth_codec_id(_myth_codec_id) - { - init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); -- -- data->views.setAutoDelete(true); -- - SetDVDVDecoder((DVDV*)codec_priv); - } - -@@ -1233,10 +1095,6 @@ - - data->srcAspect = aspect; - data->srcMode = db_aspectoverride; -- -- VideoOutputQuartzView *view = NULL; -- for (view = data->views.first(); view; view = data->views.next()) -- view->VideoAspectRatioChanged(aspect); - } - - // this is documented in videooutbase.cpp -@@ -1247,16 +1105,18 @@ - - VideoOutput::Zoom(direction); - MoveResize(); -- data->ZoomedH = mz_scale_h; -- data->ZoomedV = mz_scale_v; -- data->ZoomedUp = mz_move.y(); -- data->ZoomedRight = mz_move.x(); -+} - -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -+void VideoOutputQuartz::MoveResize(void) -+{ -+ // This recalculates the desired output rectangle, based on -+ // the user's current aspect/fill/letterbox/zoom settings. -+ VideoOutput::MoveResize(); -+ -+ vector<VideoOutputQuartzView*>::iterator it; -+ for (it = data->views.begin(); it != data->views.end(); ++it) - { -- view->Zoom(direction); -+ (*it)->MoveResize(display_video_rect); - } - } - -@@ -1310,11 +1170,10 @@ - - CreateQuartzBuffers(); - -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -+ vector<VideoOutputQuartzView*>::iterator it = data->views.begin(); -+ for (; it != data->views.end(); ++it) - { -- view->InputChanged( -+ (*it)->InputChanged( - video_dim.width(), video_dim.height(), aspect, av_codec_id); - } - -@@ -1353,8 +1212,8 @@ - return false; - } - -- vbuffers.Init(kNumBuffers, true, kNeedFreeFrames, -- kPrebufferFramesNormal, kPrebufferFramesSmall, -+ vbuffers.Init(kNumBuffers, true, kNeedFreeFrames, -+ kPrebufferFramesNormal, kPrebufferFramesSmall, - kKeepPrebuffer); - VideoOutput::Init(width, height, aspect, winid, - winx, winy, winw, winh, embedid); -@@ -1364,11 +1223,6 @@ - data->srcAspect = aspect; - data->srcMode = db_aspectoverride; - -- data->ZoomedH = 1.0f; -- data->ZoomedV = 1.0f; -- data->ZoomedUp = 0; -- data->ZoomedRight = 0; -- - // Initialize QuickTime - if (EnterMovies()) - { -@@ -1419,6 +1273,9 @@ - { - display_dim = QSize((uint) size_in_mm.width, (uint) size_in_mm.height); - display_aspect = size_in_mm.width / size_in_mm.height; -+ VERBOSE(VB_PLAYBACK, QString("Screen size is %1 x %2 (mm), aspect %3") -+ .arg(size_in_mm.width).arg(size_in_mm.height) -+ .arg(display_aspect)); - } - - // Global configuration options -@@ -1426,29 +1283,46 @@ - data->drawInWindow = gContext->GetNumSetting("GuiSizeForTV", 0); - data->windowedMode = gContext->GetNumSetting("RunFrontendInWindow", 0); - data->correctGamma = gContext->GetNumSetting("MacGammaCorrect", 0); -- -+ - data->convertI420to2VUY = get_i420_2vuy_conv(); - -+ -+ if (data->drawInWindow) -+ { -+ // display_aspect and _dim have to be scaled to actual window size -+ float winWidth = size_in_mm.width * winw -+ / get_int_CF(m, kCGDisplayWidth); -+ float winHeight = size_in_mm.height * winh -+ / get_int_CF(m, kCGDisplayHeight); -+ display_dim = QSize(winWidth, winHeight); -+ display_aspect = winWidth / winHeight; -+ VERBOSE(VB_PLAYBACK, QString("Main window is %1 x %2 (mm), aspect %3") -+ .arg((int)winWidth).arg((int)winHeight) -+ .arg(display_aspect)); -+ } -+ - if (!CreateQuartzBuffers()) - { - puts("CreateQuartzBuffers failed"); - return false; - } - -+ -+ // Create the output view objects - VideoOutputQuartzView *tmp; - if (!data->drawInWindow) - { - // Fullscreen will take over everything - tmp = new VoqvFullscreen(data); - tmp->SetFrameSkip(gContext->GetNumSetting("MacFullSkip", 0)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - else if (!data->windowedMode) - { - // Full GUI is hidden, only show the main window - tmp = new VoqvMainWindow(data, 1.0); - tmp->SetFrameSkip(gContext->GetNumSetting("MacFullSkip", 0)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - else - { -@@ -1459,45 +1333,44 @@ - gContext->GetNumSetting("MacMainOpacity", 100) / 100.0; - tmp = new VoqvMainWindow(data, opacity); - tmp->SetFrameSkip(gContext->GetNumSetting("MacMainSkip", 0)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - else -- { -+ { - // If video in the main window is not enabled, -- // hide (shrink) it so it is not in the way -+ // hide (shrink) it so it is not in the way - VERBOSE(VB_PLAYBACK, QString("Shrinking Main Window to 1x1")); -- SizeWindow(data->window, 1, 1, true); -- } -+ SizeWindow(data->window, 1, 1, true); -+ } - if (gContext->GetNumSetting("MacFloatEnabled", 0)) - { - float opacity = - gContext->GetNumSetting("MacFloatOpacity", 100) / 100.0; - tmp = new VoqvFloater(data, opacity); - tmp->SetFrameSkip(gContext->GetNumSetting("MacFloatSkip", 0)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - if (gContext->GetNumSetting("MacDesktopEnabled", 0)) - { - tmp = new VoqvDesktop(data); - tmp->SetFrameSkip(gContext->GetNumSetting("MacDesktopSkip", 0)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - if (gContext->GetNumSetting("MacDockEnabled", 1)) -- { -+ { - tmp = new VoqvDock(data); - tmp->SetFrameSkip(gContext->GetNumSetting("MacDockSkip", 3)); -- data->views.append(tmp); -+ data->views.push_back(tmp); - } - } - -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -+ vector<VideoOutputQuartzView*>::iterator it = data->views.begin(); -+ for (; it != data->views.end(); ++it) - { -- if (!view->Init()) -- { -+ if (!(*it)->Init()) -+ { - puts("Init failed on view"); -- } -+ } - } - - MoveResize(); -@@ -1563,14 +1436,14 @@ - VERBOSE(VB_IMPORTANT, LOC + "VProf: " + db_vdisp_profile->toString()); - - vbuffers.CreateBuffers(video_dim.width(), video_dim.height()); -- -+ - // Set up pause frame - if (pauseFrame.buf) - delete [] pauseFrame.buf; - - VideoFrame *scratch = vbuffers.GetScratchFrame(); -- -- init(&pauseFrame, FMT_YV12, new unsigned char[scratch->size], -+ -+ init(&pauseFrame, FMT_YV12, new unsigned char[scratch->size], - scratch->width, scratch->height, scratch->bpp, scratch->size); - - pauseFrame.frameNumber = scratch->frameNumber; -@@ -1605,13 +1478,13 @@ - desc->frameCount = 0; - desc->dataSize = 0; - desc->clutID = -1; -- -+ - HUnlock((Handle)(data->imgDesc)); - - // Set up storage area for one YUV frame - data->pixelSize = width * height * 2; - data->pixelData = new char[data->pixelSize]; -- -+ - data->pixelLock.unlock(); - - return true; -@@ -1619,23 +1492,23 @@ - - void VideoOutputQuartz::Exit(void) - { -- if (Started) -+ if (Started) - { - Started = false; - - // Restore main window - // (assuming it was shrunk i.e. we were not in full screen mode) - if (data->windowedMode) -- { -+ { - VERBOSE(VB_PLAYBACK, -- QString("Restoring Main Window to %1x%2") -+ QString("Restoring Main Window to %1x%2") - .arg(data->windowBounds.right - data->windowBounds.left) - .arg(data->windowBounds.bottom - data->windowBounds.top)); - SetWindowBounds(data->window, kWindowStructureRgn, - &(data->windowBounds)); -- } -+ } - -- data->views.clear(); -+ data->ClearViews(); - DeleteQuartzBuffers(); - } - } -@@ -1667,27 +1540,22 @@ - - void VideoOutputQuartz::EmbedInWidget(WId wid, int x, int y, int w, int h) - { -- VERBOSE(VB_PLAYBACK, -- QString("VideoOutputQuartz::EmbedInWidget(wid=%1, x=%2, y=%3, w=%4, h=%5)") -- .arg(wid) -- .arg(x) -- .arg(y) -- .arg(w) -- .arg(h)); -+ VERBOSE(VB_PLAYBACK, "VideoOutputQuartz::EmbedInWidget(" + -+ QString("wid=%1, x=%2, y=%3, w=%4, h=%5)") -+ .arg(wid).arg(x).arg(y).arg(w).arg(h)); - - if (embedding) - return; - - VideoOutput::EmbedInWidget(wid, x, y, w, h); -- -+ - data->pixelLock.lock(); - - // warn other views that embedding is starting -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -+ vector<VideoOutputQuartzView*>::iterator it = data->views.begin(); -+ for (; it != data->views.end(); ++it) - { -- view->EmbedChanged(true); -+ (*it)->EmbedChanged(true); - } - - // create embedded widget -@@ -1695,9 +1563,9 @@ - if (data->embeddedView) - { - data->embeddedView->Init(); -- data->views.append(data->embeddedView); -+ data->views.push_back(data->embeddedView); - } -- -+ - data->pixelLock.unlock(); - } - -@@ -1712,22 +1580,25 @@ - VideoOutput::StopEmbedding(); - - data->pixelLock.lock(); -- -+ - // delete embedded widget - if (data->embeddedView) - { -- data->views.removeRef(data->embeddedView); -+ vector<VideoOutputQuartzView*>::iterator it = -+ find(data->views.begin(), data->views.end(), data->embeddedView); -+ if (it != data->views.end()) -+ { -+ delete *it; -+ data->views.erase(it); -+ } - data->embeddedView = NULL; - } - - // tell other views to return to normal -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -- { -- view->EmbedChanged(false); -- } -- -+ vector<VideoOutputQuartzView*>::iterator it = data->views.begin(); -+ for (; it != data->views.end(); ++it) -+ (*it)->EmbedChanged(false); -+ - data->pixelLock.unlock(); - } - -@@ -1765,12 +1636,9 @@ - #endif // USING_DVDV - - data->pixelLock.lock(); -- for (VideoOutputQuartzView *view = data->views.first(); -- view; -- view = data->views.next()) -- { -- view->Show(); -- } -+ vector<VideoOutputQuartzView*>::iterator it = data->views.begin(); -+ for (; it != data->views.end(); ++it) -+ (*it)->Show(); - data->pixelLock.unlock(); - } - Index: mythtv/libs/libmythtv/avformatdecoder.cpp =================================================================== --- mythtv/libs/libmythtv/avformatdecoder.cpp (revision 16468) @@ -45717,51 +44620,6 @@ # make [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], -Index: mythtv/contrib/OSX/osx-packager.pl -=================================================================== ---- mythtv/contrib/OSX/osx-packager.pl (revision 16468) -+++ mythtv/contrib/OSX/osx-packager.pl (working copy) -@@ -7,7 +7,7 @@ - ### $Id$ - ### - ### = location --### http://svn.mythtv.org/svn/trunk/mythtv/contrib/OSX/osx-packager.pl -+### http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv/contrib/OSX/... - ### - ### = description - ### Tool for automating frontend builds on Mac OS X. -@@ -577,6 +577,7 @@ - 'mythtv' - => [ - '--prefix=' . $PREFIX, -+ '--runtime-prefix=../Resources', - # To "cross compile" something for a lesser Mac: - #'--tune=G3', - #'--disable-altivec', -@@ -1041,6 +1042,13 @@ - if ( $OPT{'verbose'} ) - { push @bundler, '--verbose' } - -+### Framework that has a screwed up link dependency path -+my $AVCfw = '/Developer/FireWireSDK*/Examples/' . -+ 'Framework/AVCVideoServices.framework'; -+my @AVCfw = split / /, `ls -d $AVCfw`; -+my $AVCfw = pop @AVCfw; -+chop $AVCfw; -+ - ### Create each package. - ### Note that this is a bit of a waste of disk space, - ### because there are now multiple copies of each library. -@@ -1072,6 +1080,9 @@ - # Remove copy of binary - unlink "$SCRIPTDIR/$target" or die; - -+ if ( $AVCfw ) -+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") } -+ - if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ ) - { - my $res = "$finalTarget/Contents/Resources"; Index: mythtv/contrib/channel_changers/6200ch.c =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468)

15 years, 11 months

1
0
0 / 0

rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.4, 1.5 mythtv-0.21-svnfixes.patch, 1.4, 1.5 mythtv.spec, 1.13, 1.14

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31464 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15 - Update to release-0-21-fixes patches (r19344) - Includes critical fix for supporting use of FireWire cable boxes w/Fedora's native FireWire driver stack (finally!) - Fix missing package ownership of some stray dirs (rpmfusion bz#222) 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:29:50 -0000 1.4 +++ mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:44:14 -0000 1.5 @@ -2,7 +2,24 @@ =================================================================== --- mythplugins/mythweb/INSTALL (revision 16468) +++ mythplugins/mythweb/INSTALL (working copy) -@@ -195,6 +195,10 @@ +@@ -2,7 +2,7 @@ + requirements and instructions for MythWeb. Please see README for other + information. + +-February 16, 2008 ++October 26, 2008 + + ======== + Contents +@@ -18,6 +18,7 @@ + 5.0 Apache + 5.1 Apache Config + 6.0 Lighttpd ++7.0 PHP + + ======= + Summary +@@ -195,6 +196,10 @@ mod_deflate mod_headers @@ -13,6 +30,32 @@ ================= 5.1 Apache Config ================= +@@ -245,3 +250,25 @@ + + Sorry, no documentation here yet... + ++======= ++7.0 PHP ++======= ++ ++PHP tries to determine the system's local timezone settings automatically ++but may not be successful on every distribution. To ensure that PHP uses ++the correct timezone, edit php.ini and configure the date.timezone variable ++to your local timezone. ++ ++For example, to set the PHP timezone to Europe/London: ++ ++ vim /etc/php.ini ++ ++add/uncomment the date.timezone variable: ++ ++ date.timezone = Europe/London ++ ++and then restart Apache (exact commands depend on distribution): ++ ++ /etc/init.d/apache2 stop ++ /etc/init.d/apache2 start ++ Index: mythplugins/mythweb/modules/music/stream.php =================================================================== --- mythplugins/mythweb/modules/music/stream.php (revision 16468) @@ -1176,6 +1219,34 @@ backend_command(array('FORGET_RECORDING', implode(backend_sep, $row), '0')); // Delay a second so the scheduler can catch up sleep(1); +Index: mythplugins/mythweb/README +=================================================================== +--- mythplugins/mythweb/README (revision 16468) ++++ mythplugins/mythweb/README (working copy) +@@ -135,10 +135,16 @@ + Q: I get a "500 server error" (or some other number) when trying to view + MythWeb. + A: Check your apache logs for details about what caused the error. Usually, +- it means that you didn't set up a required module. Read the ++ it means that you didn't set up a required module. Read the + mythweb.conf.apache file in more detail to make sure you didn't miss + an important setup file. + ++Q: MythWeb complains about "Warning: Unknown Programme" after Daylight Savings ++ Time has started/finished. ++A: PHP may not have determined your local timezone correctly. Read the PHP ++ section of MythWeb's INSTALL file to find out how to correctly configure ++ your timezone in PHP. ++ + ====================== + 4.0 Submitting Patches + ====================== +@@ -150,5 +156,3 @@ + other "diff -u" patches, but if there have been any major changes in SVN (there + occasionally are), I won't put much effort into trying to make your patch work, + so please just use SVN. +- +- Index: mythplugins/configure =================================================================== --- mythplugins/configure (revision 16468) @@ -10168,6 +10239,7 @@ <position>0,0</position> </image> + Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts =================================================================== --- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468) @@ -12142,6 +12214,19 @@ command_string = "Internal"; gContext->GetMainWindow()->HandleMedia(command_string, filename); +Index: mythplugins/mythvideo/mythvideo/videofilter.cpp +=================================================================== +--- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468) ++++ mythplugins/mythvideo/mythvideo/videofilter.cpp (working copy) +@@ -293,7 +293,7 @@ + { + if (runtime == kRuntimeFilterUnknown) + { +- matches = mdata.Length() < 0; ++ matches = mdata.Length() == 0; + } + else + { Index: mythplugins/mythphone/i18n/mythphone_nl.ts =================================================================== --- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468) mythtv-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.21-svnfixes.patch 29 Nov 2008 06:29:50 -0000 1.4 +++ mythtv-0.21-svnfixes.patch 12 Dec 2008 03:44:14 -0000 1.5 @@ -7332,6 +7332,10 @@ </message> </context> </TS> +Index: mythtv/i18n/mythfrontend_nb.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythtv/i18n/mythfrontend_de.ts =================================================================== --- mythtv/i18n/mythfrontend_de.ts (revision 16468) @@ -25114,6 +25118,34 @@ </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_de.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) @@ -26358,6 +26390,10 @@ Hauppauge website for the most accurate information.</P> <P>A PVR-150 comes in a number of versions: <UL> +Index: mythtv/docs/mythtv-HOWTO.pdf +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythtv/docs/index.html =================================================================== --- mythtv/docs/index.html (revision 16468) @@ -26387,7 +26423,7 @@ Index: mythtv/libs/libs-targetfix.pro =================================================================== --- mythtv/libs/libs-targetfix.pro (revision 0) -+++ mythtv/libs/libs-targetfix.pro (revision 19169) ++++ mythtv/libs/libs-targetfix.pro (revision 19344) @@ -0,0 +1,20 @@ +# Common project modifications to change the generated target. + @@ -26679,6 +26715,55 @@ image->SetDontRoundPosition(true); subtitleOSD->AddType(image); +Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +=================================================================== +--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (revision 16468) ++++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (working copy) +@@ -981,28 +981,25 @@ + correct_bttv = true; + + QString driver = (char *)vcap.driver; +- if (driver == "cx8800" || driver == "go7007" || driver == "em28xx") ++ channelfd = open(videodevice.ascii(), O_RDWR); ++ if (channelfd < 0) + { +- channelfd = open(videodevice.ascii(), O_RDWR); +- if (channelfd < 0) +- { +- VERBOSE(VB_IMPORTANT, LOC_ERR + +- QString("Can't open video device: %1").arg(videodevice)); +- perror("open video:"); +- KillChildren(); +- return false; +- } +- +- if (driver == "go7007") +- { +- go7007 = true; +- } +- +- inpixfmt = FMT_NONE; +- InitFilters(); +- DoV4L2(); ++ VERBOSE(VB_IMPORTANT, LOC_ERR + ++ QString("Can't open video device: %1").arg(videodevice)); ++ perror("open video:"); ++ KillChildren(); + return false; + } ++ ++ if (driver == "go7007") ++ { ++ go7007 = true; ++ } ++ ++ inpixfmt = FMT_NONE; ++ InitFilters(); ++ DoV4L2(); ++ return false; + } + + channelfd = fd; Index: mythtv/libs/libmythtv/videoout_d3d.cpp =================================================================== --- mythtv/libs/libmythtv/videoout_d3d.cpp (revision 16468) @@ -26740,135 +26825,1232 @@ (model == "GENERIC")); } -Index: mythtv/libs/libmythtv/avformatdecoder.cpp +Index: mythtv/libs/libmythtv/videoout_quartz.cpp =================================================================== ---- mythtv/libs/libmythtv/avformatdecoder.cpp (revision 16468) -+++ mythtv/libs/libmythtv/avformatdecoder.cpp (working copy) -@@ -1,6 +1,7 @@ - // C headers - #include <cassert> - #include <unistd.h> -+#include <cmath> +--- mythtv/libs/libmythtv/videoout_quartz.cpp (revision 16468) ++++ mythtv/libs/libmythtv/videoout_quartz.cpp (working copy) +@@ -12,9 +12,10 @@ + * - Other viewing options? + * + * = KNOWN BUGS +- * - Aspect switching occasionally fails +- * - Floating window needs testing. Resizing, or viewing something +- * a second time, may cause a crash (backtraces appreciated) ++ * - Drawing on the desktop only updates the main screen? ++ * - The floating window can only be created on the main screen? ++ * - The fullscreen window doesn't display anything when created ++ * on any screen except, you guessed it, the main screen. + * + * = REVISION + * $Id$ +@@ -36,11 +37,11 @@ + // **************************************************************************** + + #include <map> ++#include <vector> + #include <iostream> ++#include <algorithm> + using namespace std; + +-#include <qptrlist.h> +- + #include "DisplayRes.h" + #include "yuv2rgb.h" + #include "uitypes.h" +@@ -59,19 +60,73 @@ + #include "osd.h" + #include "osdsurface.h" + #include "mythconfig.h" ++#include "mythverbose.h" + #include "videodisplayprofile.h" + #include "videoout_dvdv.h" - // C++ headers - #include <algorithm> -@@ -51,6 +52,8 @@ + #define LOC QString("VideoOutputQuartz: ") + #define LOC_ERR QString("VideoOutputQuartz Error: ") - #define MAX_AC3_FRAME_SIZE 6144 +-class VideoOutputQuartzView; ++/** ++ * An abstract class for implementing QuickTime output viewports. ++ * ++ * This class is further sub-classed for different Mac OS X UI output types. ++ * e.g. Main Window, Full Screen, Dock Icon, Finder/Desktop background ++ */ ++class VideoOutputQuartzView ++{ ++ public: ++ VideoOutputQuartzView(QuartzData *pData); [...10546 lines suppressed...] ++ fsInfo.directory = *(it++); + fsInfo.isLocal = (*(it++)).toInt(); + fsInfo.fsID = (*(it++)).toInt(); + fsInfo.dirID = (*(it++)).toInt(); +@@ -198,7 +192,11 @@ + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) + { + if (it1->fsID == -1) +- it1->fsID = GetfsID(it1->dirID); ++ { ++ it1->fsID = GetfsID(it1); ++ it1->directory = ++ it1->hostname.section(".", 0, 0) + ":" + it1->directory; ++ } + + it2 = it1; + for (it2++; it2 != fsInfos.end(); it2++) +@@ -206,14 +204,14 @@ + // Sometimes the space reported for an NFS mounted dir is slightly // different than when it is locally mounted because of block sizes if (it2->fsID == -1 && - (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) && +- (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) && - (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && + (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) <= maxWriteFiveSec)) { -@@ -292,7 +292,7 @@ + if (!it1->hostname.contains(it2->hostname)) + it1->hostname = it1->hostname + "," + it2->hostname; +- it1->directory = it1->directory + "," + it2->directory; ++ it1->directory = it1->directory + "," + ++ it2->hostname.section(".", 0, 0) + ":" + it2->directory; + fsInfos.erase(it2); + it2 = it1; + } +@@ -276,32 +274,56 @@ + fsInfos.push_back(fsInfo); + } + ++ VERBOSE(VB_SCHEDULE+VB_FILE, "Determining unique filesystems"); + size_t maxWriteFiveSec = GetCurrentMaxBitrate(tvList)/12 /*5 seconds*/; + maxWriteFiveSec = max((size_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs + vector<FileSystemInfo>::iterator it1, it2; + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) + { + if (it1->fsID == -1) +- it1->fsID = GetfsID(it1->dirID); ++ it1->fsID = GetfsID(it1); + else + continue; + ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString("%1:%2 (fsID %3, dirID %4) using %5 out of %6 KB, " ++ "looking for matches") ++ .arg(it1->hostname).arg(it1->directory) ++ .arg(it1->fsID).arg(it1->dirID) ++ .arg(it1->usedSpaceKB).arg(it1->totalSpaceKB)); + it2 = it1; + for (it2++; it2 != fsInfos.end(); it2++) + { ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Checking %1:%2 (dirID %3) using %4 of %5 KB") ++ .arg(it2->hostname).arg(it2->directory).arg(it2->dirID) ++ .arg(it2->usedSpaceKB).arg(it2->totalSpaceKB)); ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Total KB Diff: %1 (want <= 32)") ++ .arg((long)absLongLong(it1->totalSpaceKB - it2->totalSpaceKB))); ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" Used KB Diff: %1 (want <= %2)") ++ .arg((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)) ++ .arg(maxWriteFiveSec)); ++ // Sometimes the space reported for an NFS mounted dir is slightly // different than when it is locally mounted because of block sizes - if (it2->fsID == -1 && !HasfsID(it2->dirID) && +- if (it2->fsID == -1 && !HasfsID(it2->dirID) && - (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && ++ if (it2->fsID == -1 && + (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) <= maxWriteFiveSec)) { + it2->fsID = it1->fsID; ++ ++ VERBOSE(VB_SCHEDULE+VB_FILE, ++ QString(" MATCH Found: %1:%2 will use fsID %3") ++ .arg(it2->hostname).arg(it2->directory) ++ .arg(it2->fsID)); + } + } + } + +- if (print_verbose_messages & VB_FILE) ++ if (print_verbose_messages & (VB_FILE|VB_SCHEDULE)) + { + cout << "--- GetFilesystemInfos directory list start ---" << endl; + for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++) +@@ -313,7 +335,8 @@ + else + cout << "Remote"; + cout << endl; +- cout << " Drive ID: " << it1->fsID << endl; ++ cout << " fsID : " << it1->fsID << endl; ++ cout << " dirID : " << it1->dirID << endl; + cout << " TotalKB : " << it1->totalSpaceKB << endl; + cout << " UsedKB : " << it1->usedSpaceKB << endl; + cout << " FreeKB : " << it1->freeSpaceKB << endl; Index: mythtv/programs/mythtv-setup/setup.xml =================================================================== --- mythtv/programs/mythtv-setup/setup.xml (revision 16468) @@ -40784,7 +44946,7 @@ Index: mythtv/contrib/Win32/build/mythtvsetup.iss =================================================================== --- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0) -+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169) ++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344) @@ -0,0 +1,493 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -41288,7 +45450,7 @@ Index: mythtv/contrib/Win32/MythInstaller.bat =================================================================== --- mythtv/contrib/Win32/MythInstaller.bat (revision 0) -+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344) @@ -0,0 +1,69 @@ +@rem = '--*-Perl-*-- +@rem @@ -41370,7 +45532,7 @@ Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -41432,7 +45594,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344) @@ -0,0 +1,58 @@ +@Echo off +:: @@ -41555,6 +45717,51 @@ # 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) +@@ -7,7 +7,7 @@ + ### $Id$ + ### + ### = location +-### http://svn.mythtv.org/svn/trunk/mythtv/contrib/OSX/osx-packager.pl ++### http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv/contrib/OSX/... + ### + ### = description + ### Tool for automating frontend builds on Mac OS X. +@@ -577,6 +577,7 @@ + 'mythtv' + => [ + '--prefix=' . $PREFIX, ++ '--runtime-prefix=../Resources', + # To "cross compile" something for a lesser Mac: + #'--tune=G3', + #'--disable-altivec', +@@ -1041,6 +1042,13 @@ + if ( $OPT{'verbose'} ) + { push @bundler, '--verbose' } + ++### Framework that has a screwed up link dependency path ++my $AVCfw = '/Developer/FireWireSDK*/Examples/' . ++ 'Framework/AVCVideoServices.framework'; ++my @AVCfw = split / /, `ls -d $AVCfw`; ++my $AVCfw = pop @AVCfw; ++chop $AVCfw; ++ + ### Create each package. + ### Note that this is a bit of a waste of disk space, + ### because there are now multiple copies of each library. +@@ -1072,6 +1080,9 @@ + # Remove copy of binary + unlink "$SCRIPTDIR/$target" or die; + ++ if ( $AVCfw ) ++ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") } ++ + if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ ) + { + my $res = "$finalTarget/Contents/Resources"; Index: mythtv/contrib/channel_changers/6200ch.c =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mythtv.spec 29 Nov 2008 06:29:50 -0000 1.13 +++ mythtv.spec 12 Dec 2008 03:44:15 -0000 1.14 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r19169 +%define _svnver r19344 %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: 14%{?dist} +Release: 15%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -255,6 +255,8 @@ Group: Applications/Multimedia Requires: lame Requires: mythtv-common = %{version}-%{release} +# libraw1394 2.0.0-5 for f10+ and 1.3.0-11 for f9 contain a critical fix +Requires: libraw1394 >= 2.0.0-5 Conflicts: xmltv-grabbers < 0.5.37 %description backend @@ -772,6 +774,7 @@ %files common %defattr(-,root,root,-) %dir %{_sysconfdir}/mythtv +%dir %{_datadir}/mythtv %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml %{_bindir}/mythcommflag @@ -826,7 +829,8 @@ %{_bindir}/mythlcdserver %{_bindir}/mythshutdown %{_bindir}/mythwelcome -%{_libdir}/mythtv/filters +%dir %{_libdir}/mythtv +%dir %{_libdir}/mythtv/filters %dir %{_libdir}/mythtv/plugins %{_datadir}/mythtv/*.ttf %dir %{_datadir}/mythtv/i18n @@ -848,6 +852,7 @@ %{_includedir}/* %{_libdir}/*.so %exclude %{_libdir}/*.a +%dir %{_datadir}/mythtv/build %{_datadir}/mythtv/build/settings.pro %files -n mythplugins @@ -1003,6 +1008,8 @@ %{perl_vendorlib}/MythTV.pm %dir %{perl_vendorlib}/MythTV %{perl_vendorlib}/MythTV/*.pm +%dir %{perl_vendorlib}/IO/Socket +%dir %{perl_vendorlib}/IO/Socket/INET %{perl_vendorlib}/IO/Socket/INET/MythTV.pm %exclude %{perl_vendorarch}/auto/MythTV/.packlist @@ -1015,6 +1022,12 @@ %endif %changelog +* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15 +- Update to release-0-21-fixes patches (r19344) +- Includes critical fix for supporting use of FireWire cable + boxes w/Fedora's native FireWire driver stack (finally!) +- Fix missing package ownership of some stray dirs (rpmfusion bz#222) + * Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14 - Update release-0-21-fixes patches (r19169) - Should resolve 720p playback stutter, rpmfusion bz#186

15 years, 11 months

1
0
0 / 0

rpms/livna-config-display/devel livna-config-display.spec,1.3,1.4

by Stewart Adam

Author: firewing Update of /cvs/nonfree/rpms/livna-config-display/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6923 Modified Files: livna-config-display.spec Log Message: rebuild Index: livna-config-display.spec =================================================================== RCS file: /cvs/nonfree/rpms/livna-config-display/devel/livna-config-display.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- livna-config-display.spec 6 Nov 2008 15:35:25 -0000 1.3 +++ livna-config-display.spec 11 Dec 2008 20:10:57 -0000 1.4 @@ -2,7 +2,7 @@ Name: livna-config-display Version: 0.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage graphic drivers from the Livna repository URL: http://rpm.livna.org @@ -65,6 +65,9 @@ %doc TODO CHANGELOG COPYING %changelog +* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 0.0.22-2 +- Rebuild for python 2.6 + * Thu Nov 6 2008 Stewart Adam <s.adam at diffingo.com> - 0.0.22-1 - Update to 0.0.22

15 years, 11 months

1
0
0 / 0

rpms/dvdstyler/F-9 dvdstyler-1.7.1-wxsvg_freeworld.patch, NONE, 1.1 dvdstyler.spec, 1.2, 1.3 sources, 1.2, 1.3

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/dvdstyler/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5271/F-9 Modified Files: dvdstyler.spec sources Added Files: dvdstyler-1.7.1-wxsvg_freeworld.patch Log Message: Build works with wxsvg-freeworld soname rename dvdstyler-1.7.1-wxsvg_freeworld.patch: --- NEW FILE dvdstyler-1.7.1-wxsvg_freeworld.patch --- --- configure.in.orig 2008-11-14 11:20:25.000000000 -0500 +++ configure.in 2008-12-11 14:11:19.000000000 -0500 @@ -57,7 +57,7 @@ LIBS="$LIBS $WX_LIBS " dnl check for wxSVG -AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) +AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg_freeworld"], [AC_MSG_ERROR([*** missing wxsvg-freeworld library (rpmfusion.org) ***])]) AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) dnl check gnomeui-2.0 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-9/dvdstyler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dvdstyler.spec 14 Nov 2008 04:50:39 -0000 1.2 +++ dvdstyler.spec 11 Dec 2008 19:41:19 -0000 1.3 @@ -1,7 +1,7 @@ Name: dvdstyler Epoch: 1 Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform DVD authoring application Group: Applications/Multimedia @@ -9,11 +9,10 @@ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 Patch0: dvdstyler-1.6.2-desktop.patch +Patch1: dvdstyler-1.7.1-wxsvg_freeworld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build -BuildRequires: gettext -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: automake, autoconf, gettext # libraries BuildRequires: wxGTK-devel >= 2.6.3 BuildRequires: wxsvg-devel >= 1.0 @@ -33,15 +32,17 @@ # finally BuildRequires: desktop-file-utils -Requires: mpgtx -Requires: netpbm-progs -Requires: mjpegtools +Requires: dvd+rw-tools Requires: dvdauthor +Requires: mjpegtools Requires: mkisofs -Requires: dvd+rw-tools +Requires: mpgtx +Requires: netpbm-progs Requires: wxsvg-freeworld >= 1.0 +# Don't care what backend, but we need one to preview DVDs. +Requires: totem-backend # Optional, defaults to off in burn settings in 1.5.1 -Requires(hint): dvdisaster +#Requires(hint): dvdisaster %description DVDStyler is a cross-platform DVD menu creation GUI that allows @@ -53,11 +54,10 @@ %prep %setup -q -n DVDStyler-%{version} %patch0 -b .desktop +%patch1 -b .wxsvg_freeworld +%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h %build -# some sed magic so we find wxsvg-freeworld properly -%{__sed} -i 's|LIBS="$LIBS $WX_LIBS "|LIBS="$LIBS $WX_LIBS -L%{_libdir}/wxsvg-freeworld "|g' configure.in -%{__sed} -i 's|LDADD = ../wxVillaLib/libwxvilla.a|LDADD = ../wxVillaLib/libwxvilla.a -L%{_libdir}/wxsvg-freeworld|g' src/Makefile.am ./autogen.sh %configure \ --disable-dependency-tracking @@ -109,18 +109,24 @@ %{_mandir}/*/*.gz %changelog -* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.1-1 +* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-2 +- Remove previous link hacks and link against wxsvg_freeworld +- Use totem to preview DVDs +- Don't require dvdisaster; it's optional +- Fix changelog dates wrt epoch + +* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-1 - Update to 1.7.1 - Remove AVCodecTag patch - Add wxsvg-freeworld to the linker paths -* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3 +* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-3 - Add ffmpeg-devel and fix wxsvg-freeworld-devel BR - Add patch to fix AVCodecTag conversion errors - Update wxsvg-freeworld patch so dvdstyler can be built without wxsvg (and use only wxsvg-freeworld instead) -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-2 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-2 - Rebuild for wxsvg 1.0b11 with ffmpeg enabled * Sat Sep 06 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Nov 2008 04:50:39 -0000 1.2 +++ sources 11 Dec 2008 19:41:19 -0000 1.3 @@ -1 +1 @@ -9bbab1e83ad8e998f9eb008b4293b278 DVDStyler-1.7.1.tar.bz2 +035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2

15 years, 11 months

1
0
0 / 0

rpms/dvdstyler/F-8 dvdstyler-1.7.1-wxsvg_freeworld.patch, NONE, 1.1 dvdstyler.spec, 1.2, 1.3 sources, 1.2, 1.3

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/dvdstyler/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5271/F-8 Modified Files: dvdstyler.spec sources Added Files: dvdstyler-1.7.1-wxsvg_freeworld.patch Log Message: Build works with wxsvg-freeworld soname rename dvdstyler-1.7.1-wxsvg_freeworld.patch: --- NEW FILE dvdstyler-1.7.1-wxsvg_freeworld.patch --- --- configure.in.orig 2008-11-14 11:20:25.000000000 -0500 +++ configure.in 2008-12-11 14:11:19.000000000 -0500 @@ -57,7 +57,7 @@ LIBS="$LIBS $WX_LIBS " dnl check for wxSVG -AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) +AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg_freeworld"], [AC_MSG_ERROR([*** missing wxsvg-freeworld library (rpmfusion.org) ***])]) AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) dnl check gnomeui-2.0 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-8/dvdstyler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dvdstyler.spec 14 Nov 2008 04:50:38 -0000 1.2 +++ dvdstyler.spec 11 Dec 2008 19:41:18 -0000 1.3 @@ -1,7 +1,7 @@ Name: dvdstyler Epoch: 1 Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform DVD authoring application Group: Applications/Multimedia @@ -9,11 +9,10 @@ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 Patch0: dvdstyler-1.6.2-desktop.patch +Patch1: dvdstyler-1.7.1-wxsvg_freeworld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build -BuildRequires: gettext -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: automake, autoconf, gettext # libraries BuildRequires: wxGTK-devel >= 2.6.3 BuildRequires: wxsvg-devel >= 1.0 @@ -33,15 +32,17 @@ # finally BuildRequires: desktop-file-utils -Requires: mpgtx -Requires: netpbm-progs -Requires: mjpegtools +Requires: dvd+rw-tools Requires: dvdauthor +Requires: mjpegtools Requires: mkisofs -Requires: dvd+rw-tools -Requires: wxsvg-freeworld >= 1.0 +Requires: mpgtx +Requires: netpbm-progs +Requires: wxsvg-freeworld >= 1.0 +# Don't care what backend, but we need one to preview DVDs. +Requires: totem-backend # Optional, defaults to off in burn settings in 1.5.1 -Requires(hint): dvdisaster +#Requires(hint): dvdisaster %description DVDStyler is a cross-platform DVD menu creation GUI that allows @@ -53,11 +54,10 @@ %prep %setup -q -n DVDStyler-%{version} %patch0 -b .desktop +%patch1 -b .wxsvg_freeworld +%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h %build -# some sed magic so we find wxsvg-freeworld properly -%{__sed} -i 's|LIBS="$LIBS $WX_LIBS "|LIBS="$LIBS $WX_LIBS -L%{_libdir}/wxsvg-freeworld "|g' configure.in -%{__sed} -i 's|LDADD = ../wxVillaLib/libwxvilla.a|LDADD = ../wxVillaLib/libwxvilla.a -L%{_libdir}/wxsvg-freeworld|g' src/Makefile.am ./autogen.sh %configure \ --disable-dependency-tracking @@ -109,18 +109,24 @@ %{_mandir}/*/*.gz %changelog -* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.1-1 +* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-2 +- Remove previous link hacks and link against wxsvg_freeworld +- Use totem to preview DVDs +- Don't require dvdisaster; it's optional +- Fix changelog dates wrt epoch + +* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-1 - Update to 1.7.1 - Remove AVCodecTag patch - Add wxsvg-freeworld to the linker paths -* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3 +* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-3 - Add ffmpeg-devel and fix wxsvg-freeworld-devel BR - Add patch to fix AVCodecTag conversion errors - Update wxsvg-freeworld patch so dvdstyler can be built without wxsvg (and use only wxsvg-freeworld instead) -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-2 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-2 - Rebuild for wxsvg 1.0b11 with ffmpeg enabled * Sat Sep 06 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Nov 2008 04:50:38 -0000 1.2 +++ sources 11 Dec 2008 19:41:18 -0000 1.3 @@ -1 +1 @@ -9bbab1e83ad8e998f9eb008b4293b278 DVDStyler-1.7.1.tar.bz2 +035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2

15 years, 11 months

1
0
0 / 0

rpms/dvdstyler/F-10 dvdstyler-1.7.1-wxsvg_freeworld.patch, NONE, 1.1 dvdstyler.spec, 1.3, 1.4 sources, 1.4, 1.5

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/dvdstyler/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5271/F-10 Modified Files: dvdstyler.spec sources Added Files: dvdstyler-1.7.1-wxsvg_freeworld.patch Log Message: Build works with wxsvg-freeworld soname rename dvdstyler-1.7.1-wxsvg_freeworld.patch: --- NEW FILE dvdstyler-1.7.1-wxsvg_freeworld.patch --- --- configure.in.orig 2008-11-14 11:20:25.000000000 -0500 +++ configure.in 2008-12-11 14:11:19.000000000 -0500 @@ -57,7 +57,7 @@ LIBS="$LIBS $WX_LIBS " dnl check for wxSVG -AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) +AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg_freeworld"], [AC_MSG_ERROR([*** missing wxsvg-freeworld library (rpmfusion.org) ***])]) AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) dnl check gnomeui-2.0 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-10/dvdstyler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvdstyler.spec 14 Nov 2008 04:50:39 -0000 1.3 +++ dvdstyler.spec 11 Dec 2008 19:41:18 -0000 1.4 @@ -1,7 +1,7 @@ Name: dvdstyler Epoch: 1 Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform DVD authoring application Group: Applications/Multimedia @@ -9,11 +9,10 @@ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 Patch0: dvdstyler-1.6.2-desktop.patch +Patch1: dvdstyler-1.7.1-wxsvg_freeworld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build -BuildRequires: gettext -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: automake, autoconf, gettext # libraries BuildRequires: wxGTK-devel >= 2.6.3 BuildRequires: wxsvg-devel >= 1.0 @@ -33,15 +32,17 @@ # finally BuildRequires: desktop-file-utils -Requires: mpgtx -Requires: netpbm-progs -Requires: mjpegtools +Requires: dvd+rw-tools Requires: dvdauthor +Requires: mjpegtools Requires: mkisofs -Requires: dvd+rw-tools +Requires: mpgtx +Requires: netpbm-progs Requires: wxsvg-freeworld >= 1.0 +# Don't care what backend, but we need one to preview DVDs. +Requires: totem-backend # Optional, defaults to off in burn settings in 1.5.1 -Requires(hint): dvdisaster +#Requires(hint): dvdisaster %description DVDStyler is a cross-platform DVD menu creation GUI that allows @@ -53,11 +54,10 @@ %prep %setup -q -n DVDStyler-%{version} %patch0 -b .desktop +%patch1 -b .wxsvg_freeworld +%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h %build -# some sed magic so we find wxsvg-freeworld properly -%{__sed} -i 's|LIBS="$LIBS $WX_LIBS "|LIBS="$LIBS $WX_LIBS -L%{_libdir}/wxsvg-freeworld "|g' configure.in -%{__sed} -i 's|LDADD = ../wxVillaLib/libwxvilla.a|LDADD = ../wxVillaLib/libwxvilla.a -L%{_libdir}/wxsvg-freeworld|g' src/Makefile.am ./autogen.sh %configure \ --disable-dependency-tracking @@ -109,18 +109,24 @@ %{_mandir}/*/*.gz %changelog -* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.1-1 +* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-2 +- Remove previous link hacks and link against wxsvg_freeworld +- Use totem to preview DVDs +- Don't require dvdisaster; it's optional +- Fix changelog dates wrt epoch + +* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-2 - Update to 1.7.1 - Remove AVCodecTag patch - Add wxsvg-freeworld to the linker paths -* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3 +* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-3 - Add ffmpeg-devel and fix wxsvg-freeworld-devel BR - Add patch to fix AVCodecTag conversion errors - Update wxsvg-freeworld patch so dvdstyler can be built without wxsvg (and use only wxsvg-freeworld instead) -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-2 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-2 - Rebuild for wxsvg 1.0b11 with ffmpeg enabled * Sat Sep 06 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Nov 2008 04:50:39 -0000 1.4 +++ sources 11 Dec 2008 19:41:18 -0000 1.5 @@ -1 +1 @@ -9bbab1e83ad8e998f9eb008b4293b278 DVDStyler-1.7.1.tar.bz2 +035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2

15 years, 11 months

1
0
0 / 0

rpms/dvdstyler/devel dvdstyler-1.7.1-wxsvg_freeworld.patch, NONE, 1.1 dvdstyler.spec, 1.3, 1.4 sources, 1.4, 1.5

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/dvdstyler/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv5271/devel Modified Files: dvdstyler.spec sources Added Files: dvdstyler-1.7.1-wxsvg_freeworld.patch Log Message: Build works with wxsvg-freeworld soname rename dvdstyler-1.7.1-wxsvg_freeworld.patch: --- NEW FILE dvdstyler-1.7.1-wxsvg_freeworld.patch --- --- configure.in.orig 2008-11-14 11:20:25.000000000 -0500 +++ configure.in 2008-12-11 14:11:19.000000000 -0500 @@ -57,7 +57,7 @@ LIBS="$LIBS $WX_LIBS " dnl check for wxSVG -AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) +AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg_freeworld"], [AC_MSG_ERROR([*** missing wxsvg-freeworld library (rpmfusion.org) ***])]) AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) dnl check gnomeui-2.0 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvdstyler.spec 14 Nov 2008 04:50:39 -0000 1.3 +++ dvdstyler.spec 11 Dec 2008 19:41:19 -0000 1.4 @@ -1,7 +1,7 @@ Name: dvdstyler Epoch: 1 Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform DVD authoring application Group: Applications/Multimedia @@ -9,11 +9,10 @@ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 Patch0: dvdstyler-1.6.2-desktop.patch +Patch1: dvdstyler-1.7.1-wxsvg_freeworld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build -BuildRequires: gettext -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: automake, autoconf, gettext # libraries BuildRequires: wxGTK-devel >= 2.6.3 BuildRequires: wxsvg-devel >= 1.0 @@ -33,15 +32,17 @@ # finally BuildRequires: desktop-file-utils -Requires: mpgtx -Requires: netpbm-progs -Requires: mjpegtools +Requires: dvd+rw-tools Requires: dvdauthor +Requires: mjpegtools Requires: mkisofs -Requires: dvd+rw-tools +Requires: mpgtx +Requires: netpbm-progs Requires: wxsvg-freeworld >= 1.0 +# Don't care what backend, but we need one to preview DVDs. +Requires: totem-backend # Optional, defaults to off in burn settings in 1.5.1 -Requires(hint): dvdisaster +#Requires(hint): dvdisaster %description DVDStyler is a cross-platform DVD menu creation GUI that allows @@ -53,11 +54,10 @@ %prep %setup -q -n DVDStyler-%{version} %patch0 -b .desktop +%patch1 -b .wxsvg_freeworld +%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h %build -# some sed magic so we find wxsvg-freeworld properly -%{__sed} -i 's|LIBS="$LIBS $WX_LIBS "|LIBS="$LIBS $WX_LIBS -L%{_libdir}/wxsvg-freeworld "|g' configure.in -%{__sed} -i 's|LDADD = ../wxVillaLib/libwxvilla.a|LDADD = ../wxVillaLib/libwxvilla.a -L%{_libdir}/wxsvg-freeworld|g' src/Makefile.am ./autogen.sh %configure \ --disable-dependency-tracking @@ -109,18 +109,24 @@ %{_mandir}/*/*.gz %changelog -* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.1-1 +* Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-2 +- Remove previous link hacks and link against wxsvg_freeworld +- Use totem to preview DVDs +- Don't require dvdisaster; it's optional +- Fix changelog dates wrt epoch + +* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-1 - Update to 1.7.1 - Remove AVCodecTag patch - Add wxsvg-freeworld to the linker paths -* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3 +* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-3 - Add ffmpeg-devel and fix wxsvg-freeworld-devel BR - Add patch to fix AVCodecTag conversion errors - Update wxsvg-freeworld patch so dvdstyler can be built without wxsvg (and use only wxsvg-freeworld instead) -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-2 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-2 - Rebuild for wxsvg 1.0b11 with ffmpeg enabled * Sat Sep 06 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Nov 2008 04:50:39 -0000 1.4 +++ sources 11 Dec 2008 19:41:19 -0000 1.5 @@ -1 +1 @@ -9bbab1e83ad8e998f9eb008b4293b278 DVDStyler-1.7.1.tar.bz2 +035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2

15 years, 11 months

1
0
0 / 0

rpms/ufoai/devel ufoai.spec,1.1,1.2

by Karel Volný

Author: kvolny Update of /cvs/nonfree/rpms/ufoai/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23055 Modified Files: ufoai.spec Log Message: * Thu Dec 11 2008 Karel Volny <kvolny(a)redhat.com> 2.2.1-3 - Fixed unowned directories (bug #225) Index: ufoai.spec =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ufoai.spec 4 Aug 2008 18:35:22 -0000 1.1 +++ ufoai.spec 11 Dec 2008 15:06:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: ufoai Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: UFO: Alien Invasion Group: Amusements/Games @@ -123,7 +123,7 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi - + %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -134,6 +134,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) # we need to use full path so %doc does not the cleanup +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/CONTRIBUTORS %doc %{_docdir}/%{name}-%{version}/COPYING @@ -145,11 +146,15 @@ %files doc %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/*.pdf %lang(en) %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf %changelog +* Thu Dec 11 2008 Karel Volny <kvolny(a)redhat.com> 2.2.1-3 +- Fixed unowned directories (bug #225) + * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.2.1-2 - rebuild

15 years, 11 months

1
0
0 / 0

rpms/fglrx-kmod/devel .cvsignore, 1.3, 1.4 fglrx-kmod.spec, 1.13, 1.14 sources, 1.3, 1.4

by Stewart Adam

Author: firewing Update of /cvs/nonfree/rpms/fglrx-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22850 Modified Files: .cvsignore fglrx-kmod.spec sources Log Message: Update to Catalyst 8.12 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Nov 2008 17:29:30 -0000 1.3 +++ .cvsignore 10 Dec 2008 18:44:32 -0000 1.4 @@ -1 +1 @@ -fglrx-kmod-data-8.552.tar.bz2 +fglrx-kmod-data-8.561.tar.bz2 Index: fglrx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fglrx-kmod.spec 22 Nov 2008 13:47:32 -0000 1.13 +++ fglrx-kmod.spec 10 Dec 2008 18:44:32 -0000 1.14 @@ -5,7 +5,7 @@ # a new akmod package will only get build when a new one is actually needed #define buildforkernels newest -%define ativersion 8.11 +%define ativersion 8.12 # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -14,17 +14,15 @@ %endif Name: fglrx-kmod -Version: 8.552 -Release: 1.%{ativersion}%{?dist}.3 +Version: 8.561 +Release: 1.%{ativersion}%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html -Source0: http://www.diffingo.com/downloads/livna/kmod-data/fglrx-kmod-data-%{versi... +Source0: http://downloads.diffingo.com/livna/kmod-data/fglrx-kmod-data-%{version}.... Source11: fglrx-kmodtool-excludekernel-filterfile -# These control kernel version detection -Patch1: fglrx-makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,17 +62,12 @@ %endif # proper permissions -find fglrxpkg/lib/modules/fglrx/build_mod/ usr/share/doc -type d -print0 | xargs -0 chmod 0755 +find fglrxpkg/lib/modules/fglrx/build_mod/ -type d -print0 | xargs -0 chmod 0755 find fglrxpkg/lib/modules/fglrx/build_mod/ -type f -print0 | xargs -0 chmod 0644 # debuginfo fix #sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh -# These control kernel version detection -pushd fglrxpkg/lib/modules/fglrx/build_mod/ -%patch1 -b .patch1 -popd - for kernel_version in %{?kernel_versions} ; do cp -a fglrxpkg/ _kmod_build_${kernel_version%%___*} done @@ -83,7 +76,7 @@ %build for kernel_version in %{?kernel_versions}; do pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x - make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}" + make CC="gcc" PAGE_ATTR_FIX=0 KVER="${kernel_version%%___*}" popd done @@ -101,6 +94,10 @@ %changelog +* Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12 +- Update to 8.12 +- Remove unneeded makefile patch + * Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.552-1.8.11.3 - rebuild for latest Fedora kernel; Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Nov 2008 17:29:30 -0000 1.3 +++ sources 10 Dec 2008 18:44:32 -0000 1.4 @@ -1 +1 @@ -767aa42b251e1dd74539fb3b3dda3a7f fglrx-kmod-data-8.552.tar.bz2 +f26a00b32e3d190cf630eda54d5c3410 fglrx-kmod-data-8.561.tar.bz2

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits December 2008