rpms/mythtv/F-10 mythplugins-0.21-svnfixes.patch, 1.10,
1.11 mythtv-0.21-svnfixes.patch, 1.9, 1.10 mythtv.spec, 1.19, 1.20
Jarod Wilson
jarod at rpmfusion.org
Thu Jun 18 06:44:18 CEST 2009
Author: jarod
Update of /cvs/free/rpms/mythtv/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14895
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Sat Jun 13 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-20
- Update to release-0-21-fixes patches (r20697)
- Add missing BR: pulseaudio-libs-devel so we work when pulse
is running (rfbz#651)
- Fix compatability with forthcoming lcdproc 0.5.3 release
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mythplugins-0.21-svnfixes.patch 4 Jun 2009 04:02:20 -0000 1.10
+++ mythplugins-0.21-svnfixes.patch 18 Jun 2009 04:44:17 -0000 1.11
@@ -14640,7 +14640,15 @@
===================================================================
--- mythplugins/mythzoneminder/mythzmserver/main.cpp (revision 16468)
+++ mythplugins/mythzoneminder/mythzmserver/main.cpp (working copy)
-@@ -204,23 +204,6 @@
+@@ -18,6 +18,7 @@
+ #include <unistd.h>
+ #include <cstdlib>
+ #include <cstring>
++#include <cstdio>
+ #include <map>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -204,23 +205,6 @@
// load the config
loadZMConfig(zmconfig);
@@ -14680,7 +14688,15 @@
===================================================================
--- mythplugins/mythzoneminder/mythzmserver/zmserver.cpp (revision 16468)
+++ mythplugins/mythzoneminder/mythzmserver/zmserver.cpp (working copy)
-@@ -41,7 +41,7 @@
+@@ -17,6 +17,7 @@
+ #include <iostream>
+ #include <cstdlib>
+ #include <cstring>
++#include <cstdio>
+ #include <errno.h>
+ #include <sys/socket.h>
+ #include <fcntl.h>
+@@ -41,7 +42,7 @@
#include "zmserver.h"
// the version of the protocol we understand
@@ -14689,7 +14705,7 @@
// the maximum image size we are ever likely to get from ZM
#define MAX_IMAGE_SIZE (2048*1536*3)
-@@ -55,6 +55,8 @@
+@@ -55,6 +56,8 @@
#define ERROR_FILE_OPEN "Cannot open event file"
#define ERROR_INVALID_MONITOR "Invalid Monitor"
#define ERROR_INVALID_POINTERS "Cannot get shared memory pointers"
@@ -14698,7 +14714,7 @@
MYSQL g_dbConn;
string g_zmversion = "";
-@@ -303,6 +305,8 @@
+@@ -303,6 +306,8 @@
handleDeleteEventList(tokens);
else if (tokens[0] == "RUN_ZMAUDIT")
handleRunZMAudit();
@@ -14707,7 +14723,7 @@
else
send("UNKNOWN_COMMAND");
}
-@@ -593,7 +597,7 @@
+@@ -593,7 +598,7 @@
MYSQL_RES *res;
MYSQL_ROW row;
@@ -14716,7 +14732,7 @@
"FROM Monitors;");
if (mysql_query(&g_dbConn, sql.c_str()))
{
-@@ -624,12 +628,13 @@
+@@ -624,12 +629,13 @@
string device = row[3];
string channel = row[4];
string function = row[5];
@@ -14731,7 +14747,7 @@
MYSQL_RES *res2;
MYSQL_ROW row2;
-@@ -658,10 +663,13 @@
+@@ -658,10 +664,13 @@
}
}
@@ -14745,7 +14761,7 @@
mysql_free_result(res2);
}
-@@ -693,7 +701,8 @@
+@@ -693,7 +702,8 @@
}
void ZMServer::getMonitorStatus(string id, string type, string device, string channel,
@@ -14755,7 +14771,7 @@
{
zmaStatus = "";
zmcStatus = "";
-@@ -701,21 +710,27 @@
+@@ -701,21 +711,27 @@
string command(g_binPath + "/zmdc.pl status");
string status = runCommand(command);
@@ -14786,7 +14802,7 @@
zmcStatus = function + " [R]";
else
zmcStatus = function + " [S]";
-@@ -1206,8 +1221,9 @@
+@@ -1206,8 +1222,9 @@
{
m_monitors.clear();
@@ -14798,7 +14814,7 @@
MYSQL_RES *res;
MYSQL_ROW row;
-@@ -1236,6 +1252,12 @@
+@@ -1236,6 +1253,12 @@
m->height = atoi(row[3]);
m->image_buffer_count = atoi(row[4]);
m->palette = atoi(row[6]);
@@ -14811,7 +14827,7 @@
m_monitors[m->mon_id] = m;
initMonitor(m);
-@@ -1262,10 +1284,19 @@
+@@ -1262,10 +1285,19 @@
else
monitor->frame_size = monitor->width * monitor->height * 3;
@@ -14832,7 +14848,7 @@
int shmid;
if ((shmid = shmget((m_shmKey & 0xffffff00) | monitor->mon_id,
-@@ -1299,8 +1330,14 @@
+@@ -1299,8 +1331,14 @@
monitor->shared_data = (SharedData*)shm_ptr;
@@ -14848,7 +14864,7 @@
sizeof(TriggerData) +
((monitor->image_buffer_count) * sizeof(struct timeval));
}
-@@ -1387,3 +1424,200 @@
+@@ -1387,3 +1425,200 @@
return result;
}
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mythtv-0.21-svnfixes.patch 4 Jun 2009 04:02:20 -0000 1.9
+++ mythtv-0.21-svnfixes.patch 18 Jun 2009 04:44:18 -0000 1.10
@@ -27229,7 +27229,7 @@
Index: mythtv/libs/libs-targetfix.pro
===================================================================
--- mythtv/libs/libs-targetfix.pro (revision 0)
-+++ mythtv/libs/libs-targetfix.pro (revision 20668)
++++ mythtv/libs/libs-targetfix.pro (revision 20697)
@@ -0,0 +1,20 @@
+# Common project modifications to change the generated target.
+
@@ -27810,7 +27810,24 @@
for (uint i = 0; i < ic->nb_streams; i++)
{
AVCodecContext *enc = ic->streams[i]->codec;
-@@ -1511,7 +1517,7 @@
+@@ -1479,6 +1485,16 @@
+ if (novideo)
+ break;
+
++ // HACK -- ignore CODEC_ID_MPEG1VIDEO if the bit_rate
++ // is 0. CBS/KTVT recordings seem to be screwing up.
++ if (enc->codec_id == CODEC_ID_MPEG1VIDEO &&
++ enc->bit_rate == 0)
++ {
++ VERBOSE(VB_IMPORTANT,
++ LOC + QString("Stream #%1 is MPEG1VIDEO with 0 bit rate, skipping.").arg(i));
++ continue;
++ }
++
+ d->DestroyMPEG2();
+ h264_kf_seq->Reset();
+
+@@ -1511,7 +1527,7 @@
// HACK -- end
bool force_xv = false;
@@ -27819,7 +27836,7 @@
{
if (dec.left(4) == "xvmc")
dvd_xvmc_enabled = true;
-@@ -1536,7 +1542,8 @@
+@@ -1536,7 +1552,8 @@
enc->codec_id = (CodecID)
myth2av_codecid(mcid, vcd, idct, mc);
@@ -27829,7 +27846,7 @@
dvd_video_codec_changed)
{
dvd_video_codec_changed = false;
-@@ -1617,9 +1624,9 @@
+@@ -1617,9 +1634,9 @@
InitVideoCodec(ic->streams[i], enc,
selectedVideoIndex == (int) i);
@@ -27841,7 +27858,7 @@
VERBOSE(VB_PLAYBACK, LOC +
QString("Using %1 for video decoding")
.arg(GetCodecDecoderName()));
-@@ -1798,7 +1805,7 @@
+@@ -1798,7 +1815,7 @@
ringBuffer->UpdateRawBitrate(bitrate);
}
@@ -27850,7 +27867,7 @@
{
if (tracks[kTrackTypeAudio].size() > 1)
{
-@@ -1859,6 +1866,8 @@
+@@ -1859,6 +1876,8 @@
{
GetNVP()->SetAudioParams(-1, -1, -1, false /* AC3/DTS pass-through */);
GetNVP()->ReinitAudio();
@@ -27859,7 +27876,7 @@
}
// if we don't have a video stream we still need to make sure some
-@@ -1980,6 +1989,9 @@
+@@ -1980,6 +1999,9 @@
*/
void AvFormatDecoder::RemoveAudioStreams()
{
@@ -27869,7 +27886,7 @@
QMutexLocker locker(&avcodeclock);
for (uint i = 0; i < ic->nb_streams;)
{
-@@ -2337,7 +2349,7 @@
+@@ -2337,7 +2359,7 @@
bool changed = (seqFPS > fps+0.01) || (seqFPS < fps-0.01);
changed |= (width != (uint)current_width );
changed |= (height != (uint)current_height);
@@ -27878,7 +27895,7 @@
if (changed)
{
-@@ -2414,7 +2426,7 @@
+@@ -2414,7 +2436,7 @@
bool changed = (seqFPS > fps+0.01) || (seqFPS < fps-0.01);
changed |= (width != (uint)current_width );
changed |= (height != (uint)current_height);
@@ -27887,7 +27904,7 @@
if (changed)
{
-@@ -3014,14 +3026,15 @@
+@@ -3014,14 +3036,15 @@
int dvdtitle = 0;
int dvdpart = 0;
ringBuffer->DVD()->GetPartAndTitle(dvdpart, dvdtitle);
@@ -27905,7 +27922,7 @@
storevideoframes = false;
dvdTitleChanged = false;
ScanStreams(true);
-@@ -3032,45 +3045,23 @@
+@@ -3032,45 +3055,23 @@
else
{
storevideoframes = false;
@@ -27960,7 +27977,7 @@
VERBOSE(VB_PLAYBACK, LOC + "DVD Title Changed");
lastdvdtitle = dvdtitle;
if (lastdvdtitle != -1 )
-@@ -3083,26 +3074,37 @@
+@@ -3083,26 +3084,37 @@
GetNVP()->getVideoOutput()->SetPrebuffering(true);
}
}
@@ -28002,7 +28019,7 @@
allowedquit = true;
continue;
}
-@@ -3221,7 +3223,6 @@
+@@ -3221,7 +3233,6 @@
av_free_packet(pkt);
CloseCodecs();
ScanStreams(false);
@@ -28010,7 +28027,7 @@
allowedquit = true;
dvd_video_codec_changed = false;
continue;
-@@ -3446,10 +3447,6 @@
+@@ -3446,10 +3457,6 @@
.av_substream_index;
}
@@ -28021,7 +28038,7 @@
if ((onlyvideo > 0) || (pkt->stream_index != audIdx))
{
ptr += len;
-@@ -3457,6 +3454,10 @@
+@@ -3457,6 +3464,10 @@
continue;
}
@@ -28032,7 +28049,7 @@
if (skipaudio)
{
if ((lastapts < lastvpts - (10.0 / fps)) ||
-@@ -3749,9 +3750,6 @@
+@@ -3749,9 +3760,6 @@
picframe->frameNumber = framesPlayed;
GetNVP()->ReleaseNextVideoFrame(picframe, temppts);
@@ -28042,7 +28059,7 @@
if (d->HasMPEG2Dec() && mpa_pic.data[3])
context->release_buffer(context, &mpa_pic);
-@@ -3759,15 +3757,8 @@
+@@ -3759,15 +3767,8 @@
gotvideo = 1;
framesPlayed++;
@@ -28059,7 +28076,7 @@
lastvpts = temppts;
break;
-@@ -3780,7 +3771,7 @@
+@@ -3780,7 +3781,7 @@
if (ringBuffer->isDVD())
{
@@ -28228,6 +28245,15 @@
if (blockBuf != dvdBlockWriteBuf)
{
+@@ -478,7 +494,7 @@
+ {
+
+ int relativetime = (int)((seektime - currentTime)/ 90000);
+- if (relativetime <= 0)
++ if (relativetime <= 1)
+ {
+ seeking = false;
+ seektime = 0;
@@ -536,18 +552,13 @@
.arg(hl->pts).arg(hl->buttonN));
@@ -29268,7 +29294,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 20668)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 20697)
@@ -0,0 +1,12 @@
+#ifndef _FREESAT_HUFFMAN_H_
+#define _FREESAT_HUFFMAN_H_
@@ -29291,7 +29317,7 @@
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 20668)
++++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 20697)
@@ -0,0 +1,4370 @@
+struct fsattab fsat_table[] = {
+ { 0x00000000, 2, 'T'},
@@ -33672,7 +33698,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 20668)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 20697)
@@ -0,0 +1,107 @@
+#include "freesat_huffman.h"
+
@@ -35601,7 +35627,7 @@
Index: mythtv/libs/libavcodec/rectangle.h
===================================================================
--- mythtv/libs/libavcodec/rectangle.h (revision 0)
-+++ mythtv/libs/libavcodec/rectangle.h (revision 20668)
++++ mythtv/libs/libavcodec/rectangle.h (revision 20697)
@@ -0,0 +1,121 @@
+/*
+ * rectangle filling function
@@ -35826,7 +35852,7 @@
Index: mythtv/libs/libavcodec/i386/h264_i386.h
===================================================================
--- mythtv/libs/libavcodec/i386/h264_i386.h (revision 0)
-+++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 20668)
++++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 20697)
@@ -0,0 +1,144 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
@@ -40635,7 +40661,7 @@
Index: mythtv/libs/libmyth/audiopulseutil.h
===================================================================
--- mythtv/libs/libmyth/audiopulseutil.h (revision 0)
-+++ mythtv/libs/libmyth/audiopulseutil.h (revision 20668)
++++ mythtv/libs/libmyth/audiopulseutil.h (revision 20697)
@@ -0,0 +1,6 @@
+#include "mythexp.h"
+
@@ -40646,7 +40672,7 @@
Index: mythtv/libs/libmyth/audiopulseutil.cpp
===================================================================
--- mythtv/libs/libmyth/audiopulseutil.cpp (revision 0)
-+++ mythtv/libs/libmyth/audiopulseutil.cpp (revision 20668)
++++ mythtv/libs/libmyth/audiopulseutil.cpp (revision 20697)
@@ -0,0 +1,383 @@
+/***
+ * This file was part of PulseAudio, the license has been upgraded to GPL v2
@@ -43941,6 +43967,15 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
+@@ -242,7 +242,7 @@
+ }
+ else { // Textual form.
+ const unsigned char *str = attrs.Bytes();
+- const char *p = (const char *)str;
++ char *p = (char *)str;
+ char *q = strchr(p, '.'); // Find the terminating dot
+ if (q != NULL) { // plain, italic etc.
+ if (q-p == 6 && strncmp(p, "italic", 6) == 0) style = 1;
@@ -463,6 +463,11 @@
pNewLine->m_Items.Append(pNewItem);
pNewItem->m_Unicode = pItem->m_Unicode.mid(nNewStart, nNewWidth);
@@ -46083,6 +46118,115 @@
<action>STORAGE GROUPS</action>
</button>
+Index: mythtv/programs/mythlcdserver/lcdprocclient.cpp
+===================================================================
+--- mythtv/programs/mythlcdserver/lcdprocclient.cpp (revision 16468)
++++ mythtv/programs/mythlcdserver/lcdprocclient.cpp (working copy)
+@@ -221,34 +221,36 @@
+ void LCDProcClient::setPriority(const QString &screen, PRIORITY priority)
+ {
+ QString aString;
+-
++ int err = 0;
+ aString = "screen_set ";
+ aString += screen;
+ aString += " priority ";
+
+ switch (priority) {
+ case TOP:
+- aString += QString::number (prioTop);
++ aString += prioTop;
+ break;
+ case URGENT:
+- aString += QString::number (prioUrgent);
++ aString += prioUrgent;
+ break;
+ case HIGH:
+- aString += QString::number (prioHigh);
++ aString += prioHigh;
+ break;
+ case MEDIUM:
+- aString += QString::number (prioMedium);
++ aString += prioMedium;
+ break;
+ case LOW:
+- aString += QString::number (prioLow);
++ aString += prioLow;
+ break;
+ case OFF:
+- aString += QString::number (prioOff);
++ aString += prioOff;
+ break;
+-
++ default:
++ err = 1;
++ break;
+ }
+-
+- sendToServer (aString);
++ if (err == 0)
++ sendToServer (aString);
+ }
+
+ void LCDProcClient::setHeartbeat (const QString &screen, bool onoff)
+@@ -662,22 +664,22 @@
+ {
+ // Latest CVS versions of LCDd has priorities switched
+ pVersion = LCD_VERSION_5;
+- prioTop = 252;
+- prioUrgent = 248;
+- prioHigh = 240;
+- prioMedium = 128;
+- prioLow = 64;
+- prioOff = 0;
++ prioTop = "input";
++ prioUrgent = "alert";
++ prioHigh = "foreground";
++ prioMedium = "info";
++ prioLow = "background";
++ prioOff = "hidden";
+ }
+ else
+ {
+ pVersion = LCD_VERSION_4;
+- prioTop = 64;
+- prioUrgent = 128;
+- prioHigh = 240;
+- prioMedium = 248;
+- prioLow = 252;
+- prioOff = 255;
++ prioTop = "64";
++ prioUrgent = "128";
++ prioHigh = "240";
++ prioMedium = "248";
++ prioLow = "252";
++ prioOff = "255";
+ }
+ }
+
+Index: mythtv/programs/mythlcdserver/lcdprocclient.h
+===================================================================
+--- mythtv/programs/mythlcdserver/lcdprocclient.h (revision 16468)
++++ mythtv/programs/mythlcdserver/lcdprocclient.h (working copy)
+@@ -150,12 +150,12 @@
+ void setVersion(const QString &, const QString &);
+ void describeServer();
+
+- unsigned int prioTop;
+- unsigned int prioUrgent;
+- unsigned int prioHigh;
+- unsigned int prioMedium;
+- unsigned int prioLow;
+- unsigned int prioOff;
++ QString prioTop;
++ QString prioUrgent;
++ QString prioHigh;
++ QString prioMedium;
++ QString prioLow;
++ QString prioOff;
+
+ unsigned int lcdWidth;
+ unsigned int lcdHeight;
Index: mythtv/programs/mythtv/main.cpp
===================================================================
--- mythtv/programs/mythtv/main.cpp (revision 16468)
@@ -46629,7 +46773,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 20668)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 20697)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -47133,7 +47277,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 20668)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 20697)
@@ -0,0 +1,69 @@
+ at rem = '--*-Perl-*--
+ at rem
@@ -47215,7 +47359,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 20668)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 20697)
@@ -0,0 +1,57 @@
+ at Echo off
+::
@@ -47277,7 +47421,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 20668)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 20697)
@@ -0,0 +1,58 @@
+ at Echo off
+::
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mythtv.spec 4 Jun 2009 04:02:20 -0000 1.19
+++ mythtv.spec 18 Jun 2009 04:44:18 -0000 1.20
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r20668
+%define _svnver r20697
%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: 19%{?dist}
+Release: 20%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -59,6 +59,7 @@
# Audio framework support
BuildRequires: alsa-lib-devel, arts-devel
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: pulseaudio-libs-devel
# Need dvb headers to build in dvb support
BuildRequires: kernel-headers
# Remote control support (BR: on lirc-libs works around some mock funkiness on f8)
@@ -214,6 +215,7 @@
Requires: libiec61883-devel, libraw1394-devel, libavc1394-devel
Requires: alsa-lib-devel, arts-devel
Requires: jack-audio-connection-kit-devel
+Requires: pulseaudio-libs-devel
%if %with_directfb
Requires: directfb-devel
%endif
@@ -1026,6 +1028,12 @@
%endif
%changelog
+* Sat Jun 13 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-20
+- Update to release-0-21-fixes patches (r20697)
+- Add missing BR: pulseaudio-libs-devel so we work when pulse
+ is running (rfbz#651)
+- Fix compatability with forthcoming lcdproc 0.5.3 release
+
* Wed Jun 03 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-19
- Update to release-0-21-fixes patches (r20668)
More information about the rpmfusion-commits
mailing list