rpms/mythtv/F-13 mythbackend.init, 1.3, 1.4 mythtv-0.23-svnfixes.patch, 1.3, 1.4 mythtv.spec, 1.84, 1.85
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9738
Modified Files:
mythbackend.init mythtv-0.23-svnfixes.patch mythtv.spec
Log Message:
* Mon Jun 21 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-5
- Update to release-0-23-fixes branch, svn revision 25150
- Further improvements to run as non-root (rpmfusion bz#1295)
- One more try at a 32-bit x86 F11 i586 build w/both mmx and no cmov
Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythbackend.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythbackend.init 17 Jun 2010 04:46:02 -0000 1.3
+++ mythbackend.init 21 Jun 2010 14:44:22 -0000 1.4
@@ -29,7 +29,8 @@
touch /var/run/mythbackend.pid
if [ "${MYTHBACKEND_USER}" != root ]; then
chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
- /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- -R /dev/dvb/
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
fi
export MYTHCONFDIR="$MYTHTV_HOME"
@@ -47,6 +48,7 @@
RETVAL=$?
if [ "${MYTHBACKEND_USER}" != root ]; then
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
fi
echo
mythtv-0.23-svnfixes.patch:
VERSION | 1
bindings/perl/IO/Socket/INET/MythTV.pm | 4 -
bindings/perl/MythTV.pm | 11 +-
bindings/perl/MythTV/Channel.pm | 64 ++++++++--------
bindings/perl/MythTV/Program.pm | 4 -
bindings/perl/MythTV/Recording.pm | 4 -
bindings/perl/MythTV/StorageGroup.pm | 4 -
bindings/python/MythTV/MythData.py | 4 -
bindings/python/MythTV/MythFunc.py | 13 ++-
configure | 18 ++--
contrib/config_files/lirc/lircrc.native.example.mceusb2 | 2
contrib/icons/master_iconmap/channel_icons.pl | 4 -
contrib/maintenance/flush_deleted_recgroup.pl | 4 -
contrib/maintenance/optimize_mythdb.pl | 4 -
contrib/user_jobs/firewire_primer.pl | 4 -
contrib/user_jobs/mythlink.pl | 4 -
libs/libavcodec/libavcodec.pro | 5 -
libs/libmyth/audiooutput.h | 1
libs/libmyth/audiooutputbase.cpp | 5 -
libs/libmyth/audiooutputbase.h | 1
libs/libmyth/audiooutputpulse.cpp | 13 ++-
libs/libmyth/mediamonitor-darwin.cpp | 29 +++++--
libs/libmyth/mythcontext.cpp | 9 +-
libs/libmyth/schemawizard.cpp | 17 ++++
libs/libmythdb/mythdirs.cpp | 5 -
libs/libmythdb/mythsocket.cpp | 19 ++++
libs/libmythdb/mythsocket.h | 4 +
libs/libmythdb/mythsocketthread.cpp | 4 -
libs/libmythdb/mythversion.h | 6 -
libs/libmythdvdnav/libmythdvdnav.pro | 3
libs/libmythsoundtouch/AAFilter.cpp | 2
libs/libmythsoundtouch/AAFilter.h | 2
libs/libmythsoundtouch/BPMDetect.h | 2
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 2
libs/libmythsoundtouch/FIFOSampleBuffer.h | 2
libs/libmythsoundtouch/FIFOSamplePipe.h | 2
libs/libmythsoundtouch/FIRFilter.cpp | 2
libs/libmythsoundtouch/FIRFilter.h | 2
libs/libmythsoundtouch/RateTransposer.cpp | 2
libs/libmythsoundtouch/RateTransposer.h | 2
libs/libmythsoundtouch/STTypes.h | 2
libs/libmythsoundtouch/SoundTouch.cpp | 2
libs/libmythsoundtouch/SoundTouch.h | 2
libs/libmythsoundtouch/TDStretch.cpp | 2
libs/libmythsoundtouch/TDStretch.h | 2
libs/libmythsoundtouch/cpu_detect.h | 2
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 2
libs/libmythsoundtouch/mmx_gcc.cpp | 2
libs/libmythtv/NuppelVideoPlayer.cpp | 7 +
libs/libmythtv/NuppelVideoPlayer.h | 1
libs/libmythtv/avformatdecoder.cpp | 33 +++++++-
libs/libmythtv/dbcheck.cpp | 9 --
libs/libmythtv/jobqueue.h | 1
libs/libmythtv/tv_play.cpp | 19 +---
libs/libmythtv/tv_play.h | 2
libs/libmythtv/videoout_d3d.cpp | 4 -
libs/libmythtv/videoout_d3d.h | 2
libs/libmythtv/videoout_quartz.cpp | 9 +-
libs/libmythtv/videoout_quartz.h | 2
libs/libmythui/mythfontmanager.cpp | 6 -
libs/libmythui/mythmainwindow.cpp | 12 +--
libs/libmythui/mythsystem.cpp | 4 -
libs/libmythui/mythuitext.cpp | 12 +--
libs/libmythui/xmlparsebase.cpp | 6 -
libs/libswscale/libswscale.pro | 6 +
programs/mythbackend/filetransfer.cpp | 3
programs/mythbackend/main.cpp | 7 +
programs/mythbackend/mainserver.cpp | 11 --
programs/mythcommflag/main.cpp | 35 +++++++-
programs/mythtranscode/transcode.cpp | 5 +
programs/mythtv-setup/main.cpp | 2
settings.pro | 2
version.pro | 2
73 files changed, 324 insertions(+), 184 deletions(-)
Index: mythtv-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythtv-0.23-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.23-svnfixes.patch 17 Jun 2010 04:46:02 -0000 1.3
+++ mythtv-0.23-svnfixes.patch 21 Jun 2010 14:44:22 -0000 1.4
@@ -406,6 +406,50 @@
QMAKE_CFLAGS_SHLIB =
}
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputbase.cpp mythtv-0.23/libs/libmyth/audiooutputbase.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputbase.cpp 2010-04-14 06:36:02.000000000 -0400
++++ mythtv-0.23/libs/libmyth/audiooutputbase.cpp 2010-06-18 06:50:18.720005000 -0400
+@@ -848,7 +848,8 @@ bool AudioOutputBase::AddSamples(char *b
+ {
+ // Convert to floats
+ short *buf_ptr = (short*)buffer;
+- for (int sample = 0; sample < samples * audio_channels; sample++)
++ int numSamples = (samples * abps) / sizeof(short);
++ for (int sample = 0; sample < numSamples; sample++)
+ {
+ src_in[sample] = (float)buf_ptr[sample] / (1.0 * 0x8000);
+ }
+@@ -861,7 +862,7 @@ bool AudioOutputBase::AddSamples(char *b
+ QString("Error occurred while resampling audio: %1")
+ .arg(src_strerror(error)));
+ src_float_to_short_array(src_data.data_out, (short int*)tmp_buff,
+- src_data.output_frames_gen*audio_channels);
++ (src_data.output_frames_gen*abps)/sizeof(short));
+
+ _AddSamples(tmp_buff, true, src_data.output_frames_gen, timecode);
+ }
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputbase.h mythtv-0.23/libs/libmyth/audiooutputbase.h
+--- mythtv-0.23-release/libs/libmyth/audiooutputbase.h 2009-11-14 04:49:04.000000000 -0500
++++ mythtv-0.23/libs/libmyth/audiooutputbase.h 2010-06-18 06:50:18.720005000 -0400
+@@ -57,6 +57,7 @@ class AudioOutputBase : public AudioOutp
+ virtual void SetTimecode(long long timecode);
+ virtual bool IsPaused(void) const { return audio_actually_paused; }
+ virtual void Pause(bool paused);
++ virtual bool CanPassthrough(void) const { return !need_resampler; }
+
+ // Wait for all data to finish playing
+ virtual void Drain(void);
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutput.h mythtv-0.23/libs/libmyth/audiooutput.h
+--- mythtv-0.23-release/libs/libmyth/audiooutput.h 2009-10-13 22:57:05.000000000 -0400
++++ mythtv-0.23/libs/libmyth/audiooutput.h 2010-06-18 06:50:18.720005000 -0400
+@@ -49,6 +49,7 @@ class MPUBLIC AudioOutput : public Volum
+ virtual void SetTimecode(long long timecode) = 0;
+ virtual bool IsPaused(void) const = 0;
+ virtual void Pause(bool paused) = 0;
++ virtual bool CanPassthrough(void) const = 0;
+
+ // Wait for all data to finish playing
+ virtual void Drain(void) = 0;
diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp mythtv-0.23/libs/libmyth/audiooutputpulse.cpp
--- mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp 2009-11-16 11:18:35.000000000 -0500
+++ mythtv-0.23/libs/libmyth/audiooutputpulse.cpp 2010-06-07 23:31:50.923907000 -0400
@@ -429,6 +473,75 @@
soundcard_buffer_size = 16 * fragment_size;
buffer_settings.maxlength = soundcard_buffer_size;
buffer_settings.tlength = fragment_size * 4;
+diff -Naurp mythtv-0.23-release/libs/libmyth/mediamonitor-darwin.cpp mythtv-0.23/libs/libmyth/mediamonitor-darwin.cpp
+--- mythtv-0.23-release/libs/libmyth/mediamonitor-darwin.cpp 2009-11-28 10:55:09.000000000 -0500
++++ mythtv-0.23/libs/libmyth/mediamonitor-darwin.cpp 2010-06-17 23:48:36.374058000 -0400
+@@ -1,7 +1,7 @@
+ /**
+ * \file mediamonitor-darwin.cpp
+ * \brief MythMediaMonitor for Darwin/Mac OS X.
+- * \version $Id$
++ * \version $Id$
+ * \author Andrew Kimpton, Nigel Pearson
+ */
+
+@@ -178,11 +178,11 @@ static char * getVolName(CFDictionaryRef
+
+ name = (CFStringRef)
+ CFDictionaryGetValue(diskDetails, kDADiskDescriptionVolumeNameKey);
+- if (name)
+- size = CFStringGetLength(name) + 1;
+- else
+- size = 9; // 'Untitled\0'
+
++ if (!name)
++ return NULL;
++
++ size = CFStringGetLength(name) + 1;
+ volName = (char *) malloc(size);
+ if (!volName)
+ {
+@@ -191,9 +191,11 @@ static char * getVolName(CFDictionaryRef
+ return NULL;
+ }
+
+- if (!name || !CFStringGetCString(name, volName, size,
+- kCFStringEncodingUTF8))
+- strcpy(volName, "Untitled");
++ if (!CFStringGetCString(name, volName, size, kCFStringEncodingUTF8))
++ {
++ free(volName);
++ return NULL;
++ }
+
+ return volName;
+ }
+@@ -291,8 +293,14 @@ void diskAppearedCallback(DADiskRef disk
+
+ // Get the volume and model name for more user-friendly interaction
+ volName = getVolName(details);
+- model = getModel(details);
++ if (!volName)
++ {
++ VERBOSE(VB_MEDIA, msg + "No volume name for dev " + BSDname);
++ CFRelease(details);
++ return;
++ }
+
++ model = getModel(details);
+ mediaType = MediaTypeForBSDName(BSDname);
+ isCDorDVD = (mediaType == MEDIATYPE_DVD) || (mediaType == MEDIATYPE_AUDIO);
+
+@@ -326,6 +334,9 @@ void diskChangedCallback(DADiskRef disk,
+ CFDictionaryRef details = DADiskCopyDescription(disk);
+ char *volName = getVolName(details);
+
++ VERBOSE(VB_MEDIA, QString("Disk %1 - changed name to '%2'.")
++ .arg(BSDname).arg(volName));
++
+ reinterpret_cast<MonitorThreadDarwin *>(context)
+ ->diskRename(BSDname, volName);
+ CFRelease(details);
diff -Naurp mythtv-0.23-release/libs/libmyth/mythcontext.cpp mythtv-0.23/libs/libmyth/mythcontext.cpp
--- mythtv-0.23-release/libs/libmyth/mythcontext.cpp 2010-03-23 20:43:43.000000000 -0400
+++ mythtv-0.23/libs/libmyth/mythcontext.cpp 2010-05-14 18:39:42.189261000 -0400
@@ -511,6 +624,104 @@
confdir.replace("$HOME", QDir::homePath());
}
else
+diff -Naurp mythtv-0.23-release/libs/libmythdb/mythsocket.cpp mythtv-0.23/libs/libmythdb/mythsocket.cpp
+--- mythtv-0.23-release/libs/libmythdb/mythsocket.cpp 2010-02-10 12:02:19.000000000 -0500
++++ mythtv-0.23/libs/libmythdb/mythsocket.cpp 2010-06-17 09:23:59.559532000 -0400
+@@ -34,6 +34,7 @@ MythSocketThread *MythSocket::s_readyrea
+
+ MythSocket::MythSocket(int socket, MythSocketCBs *cb)
+ : MSocketDevice(MSocketDevice::Stream), m_cb(cb),
++ m_useReadyReadCallback(true),
+ m_state(Idle), m_addr(), m_port(0),
+ m_ref_count(0), m_notifyread(false)
+ {
+@@ -200,6 +201,24 @@ void MythSocket::close(void)
+ }
+ }
+
++bool MythSocket::closedByRemote(void)
++{
++ fd_set rfds;
++ FD_ZERO(&rfds);
++ FD_SET(socket(), &rfds);
++
++ struct timeval to;
++ to.tv_sec = 0;
++ to.tv_usec = 1000;
++
++ int rval = select(socket() + 1, &rfds, NULL, NULL, &to);
++
++ if (rval > 0 && FD_ISSET(socket(), &rfds) && !bytesAvailable())
++ return true;
++
++ return false;
++}
++
+ qint64 MythSocket::readBlock(char *data, quint64 len)
+ {
+ VERBOSE(VB_SOCKET|VB_EXTRA, LOC + QString("readBlock(0x%1, %2) called")
+diff -Naurp mythtv-0.23-release/libs/libmythdb/mythsocket.h mythtv-0.23/libs/libmythdb/mythsocket.h
+--- mythtv-0.23-release/libs/libmythdb/mythsocket.h 2009-11-16 11:18:35.000000000 -0500
++++ mythtv-0.23/libs/libmythdb/mythsocket.h 2010-06-17 09:23:59.559532000 -0400
+@@ -29,6 +29,7 @@ class MPUBLIC MythSocket : public MSocke
+ };
+
+ void close(void);
++ bool closedByRemote(void);
+ void deleteLater(void);
+
+ void UpRef(void);
+@@ -43,6 +44,8 @@ class MPUBLIC MythSocket : public MSocke
+
+ void setSocket(int socket, Type type = MSocketDevice::Stream);
+ void setCallbacks(MythSocketCBs *cb);
++ void useReadyReadCallback(bool useReadyReadCallback = true)
++ { m_useReadyReadCallback = useReadyReadCallback; }
+
+ qint64 readBlock(char *data, quint64 len);
+ qint64 writeBlock(const char *data, quint64 len);
+@@ -73,6 +76,7 @@ class MPUBLIC MythSocket : public MSocke
+ void setState(const State state);
+
+ MythSocketCBs *m_cb;
++ bool m_useReadyReadCallback;
+ State m_state;
+ QHostAddress m_addr;
+ quint16 m_port;
+diff -Naurp mythtv-0.23-release/libs/libmythdb/mythsocketthread.cpp mythtv-0.23/libs/libmythdb/mythsocketthread.cpp
+--- mythtv-0.23-release/libs/libmythdb/mythsocketthread.cpp 2010-02-10 12:02:19.000000000 -0500
++++ mythtv-0.23/libs/libmythdb/mythsocketthread.cpp 2010-06-17 09:23:59.559532000 -0400
+@@ -153,12 +153,12 @@ void MythSocketThread::ReadyToBeRead(Myt
+ VERBOSE(VB_SOCKET, SLOC(sock) + "socket is readable");
+ int bytesAvail = sock->bytesAvailable();
+
+- if (bytesAvail == 0)
++ if (bytesAvail == 0 && sock->closedByRemote())
+ {
+ VERBOSE(VB_SOCKET, SLOC(sock) + "socket closed");
+ sock->close();
+ }
+- else if (sock->m_cb)
++ else if (bytesAvail > 0 && sock->m_cb && sock->m_useReadyReadCallback)
+ {
+ sock->m_notifyread = true;
+ VERBOSE(VB_SOCKET, SLOC(sock) + "calling m_cb->readyRead()");
+diff -Naurp mythtv-0.23-release/libs/libmythdb/mythversion.h mythtv-0.23/libs/libmythdb/mythversion.h
+--- mythtv-0.23-release/libs/libmythdb/mythversion.h 2010-04-29 20:59:58.000000000 -0400
++++ mythtv-0.23/libs/libmythdb/mythversion.h 2010-06-17 09:23:59.559532000 -0400
+@@ -9,9 +9,9 @@
+ #endif
+
+ /// Update this whenever the plug-in API changes.
+-/// Including changes in the libmythdb, libmyth and libmythui class methods
+-/// used by plug-ins.
+-#define MYTH_BINARY_VERSION "0.23.20100429-1"
++/// Including changes in the libmythdb, libmyth, libmythtv, libmythav* and
++/// libmythui class methods used by plug-ins.
++#define MYTH_BINARY_VERSION "0.23.201000617-1"
+
+ /** \brief Increment this whenever the MythTV network protocol changes.
+ *
diff -Naurp mythtv-0.23-release/libs/libmythdvdnav/libmythdvdnav.pro mythtv-0.23/libs/libmythdvdnav/libmythdvdnav.pro
--- mythtv-0.23-release/libs/libmythdvdnav/libmythdvdnav.pro 2009-10-15 11:47:54.000000000 -0400
+++ mythtv-0.23/libs/libmythdvdnav/libmythdvdnav.pro 2010-05-11 11:07:54.320600000 -0400
@@ -742,7 +953,7 @@
// $Id$
diff -Naurp mythtv-0.23-release/libs/libmythtv/avformatdecoder.cpp mythtv-0.23/libs/libmythtv/avformatdecoder.cpp
--- mythtv-0.23-release/libs/libmythtv/avformatdecoder.cpp 2010-04-29 20:08:03.000000000 -0400
-+++ mythtv-0.23/libs/libmythtv/avformatdecoder.cpp 2010-06-10 00:02:51.816777000 -0400
++++ mythtv-0.23/libs/libmythtv/avformatdecoder.cpp 2010-06-18 06:50:18.720005000 -0400
@@ -1291,6 +1291,14 @@ static float normalized_fps(AVStream *st
fps = tmpfps;
}
@@ -818,6 +1029,14 @@
long long temppts = pts;
+@@ -4617,6 +4639,7 @@ bool AvFormatDecoder::DoPassThrough(cons
+ else if (ctx->codec_id == CODEC_ID_DTS)
+ passthru = allow_dts_passthru && !internal_vol;
+
++ passthru &= GetNVP()->CanPassthrough();
+ passthru &= !transcoding && !disable_passthru;
+ // Don't know any cards that support spdif clocked at < 44100
+ // Some US cable transmissions have 2ch 32k AC-3 streams
diff -Naurp mythtv-0.23-release/libs/libmythtv/dbcheck.cpp mythtv-0.23/libs/libmythtv/dbcheck.cpp
--- mythtv-0.23-release/libs/libmythtv/dbcheck.cpp 2010-03-06 22:11:52.000000000 -0500
+++ mythtv-0.23/libs/libmythtv/dbcheck.cpp 2010-05-23 19:30:49.920201000 -0400
@@ -837,6 +1056,45 @@
// Pop up messages, questions, warnings, et c.
switch (DBup->PromptForUpgrade("TV", upgradeAllowed,
+diff -Naurp mythtv-0.23-release/libs/libmythtv/jobqueue.h mythtv-0.23/libs/libmythtv/jobqueue.h
+--- mythtv-0.23-release/libs/libmythtv/jobqueue.h 2010-01-31 22:49:37.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/jobqueue.h 2010-06-17 12:33:12.060417000 -0400
+@@ -2,6 +2,7 @@
+ #define JOBQUEUE_H_
+
+ #include <pthread.h>
++#include <sys/types.h>
+
+ #include <QWaitCondition>
+ #include <QObject>
+diff -Naurp mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.cpp mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.cpp
+--- mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.cpp 2010-04-27 22:54:52.000000000 -0400
++++ mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.cpp 2010-06-18 06:50:18.720005000 -0400
+@@ -5134,6 +5134,13 @@ bool NuppelVideoPlayer::ToggleUpmix()
+ return false;
+ }
+
++bool NuppelVideoPlayer::CanPassthrough()
++{
++ if (audioOutput)
++ return audioOutput->CanPassthrough();
++ return false;
++}
++
+ void NuppelVideoPlayer::Zoom(ZoomDirection direction)
+ {
+ if (videoOutput)
+diff -Naurp mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.h mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.h
+--- mythtv-0.23-release/libs/libmythtv/NuppelVideoPlayer.h 2010-03-08 19:33:51.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/NuppelVideoPlayer.h 2010-06-18 06:50:18.720005000 -0400
+@@ -165,6 +165,7 @@ class MPUBLIC NuppelVideoPlayer : public
+ void ToggleAspectOverride(AspectOverrideMode aspectMode = kAspect_Toggle);
+ void ToggleAdjustFill(AdjustFillMode adjustfillMode = kAdjustFill_Toggle);
+ bool ToggleUpmix(void);
++ bool CanPassthrough(void);
+
+ // Gets
+ QSize GetVideoBufferSize(void) const { return video_dim; }
diff -Naurp mythtv-0.23-release/libs/libmythtv/tv_play.cpp mythtv-0.23/libs/libmythtv/tv_play.cpp
--- mythtv-0.23-release/libs/libmythtv/tv_play.cpp 2010-04-27 22:54:52.000000000 -0400
+++ mythtv-0.23/libs/libmythtv/tv_play.cpp 2010-05-17 21:42:52.462765000 -0400
@@ -914,6 +1172,76 @@
void SwitchInputs(PlayerContext*, uint inputid);
void ToggleInputs(PlayerContext*, uint inputid = 0);
void SwitchCards(PlayerContext*,
+diff -Naurp mythtv-0.23-release/libs/libmythtv/videoout_d3d.cpp mythtv-0.23/libs/libmythtv/videoout_d3d.cpp
+--- mythtv-0.23-release/libs/libmythtv/videoout_d3d.cpp 2010-03-06 22:11:52.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/videoout_d3d.cpp 2010-06-19 01:57:23.850116000 -0400
+@@ -1252,13 +1252,13 @@ void VideoOutputD3D::Show(FrameScanType
+ SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
+ }
+
+-void VideoOutputD3D::EmbedInWidget(WId wid, int x, int y, int w, int h)
++void VideoOutputD3D::EmbedInWidget(int x, int y, int w, int h)
+ {
+ if (windows[0].IsEmbedding())
+ return;
+
+ VideoOutput::EmbedInWidget(x, y, w, h);
+- m_hEmbedWnd = wid;
++ // TODO: Initialise m_hEmbedWnd?
+ }
+
+ void VideoOutputD3D::StopEmbedding(void)
+diff -Naurp mythtv-0.23-release/libs/libmythtv/videoout_d3d.h mythtv-0.23/libs/libmythtv/videoout_d3d.h
+--- mythtv-0.23-release/libs/libmythtv/videoout_d3d.h 2010-02-03 10:39:11.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/videoout_d3d.h 2010-06-18 03:11:40.067331000 -0400
+@@ -115,7 +115,7 @@ class VideoOutputD3D : public VideoOutpu
+ void UpdatePauseFrame(void);
+ void DrawUnusedRects(bool) {;}
+ void Zoom(ZoomDirection direction);
+- void EmbedInWidget(WId wid, int x, int y, int w, int h);
++ void EmbedInWidget(int x, int y, int w, int h);
+ void StopEmbedding(void);
+ bool hasFullScreenOSD(void) const { return m_d3d_osd; }
+ static QStringList GetAllowedRenderers(MythCodecID myth_codec_id,
+diff -Naurp mythtv-0.23-release/libs/libmythtv/videoout_quartz.cpp mythtv-0.23/libs/libmythtv/videoout_quartz.cpp
+--- mythtv-0.23-release/libs/libmythtv/videoout_quartz.cpp 2010-03-06 22:11:52.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/videoout_quartz.cpp 2010-06-18 03:11:40.067331000 -0400
+@@ -18,7 +18,7 @@
+ * on any screen except, you guessed it, the main screen.
+ *
+ * = REVISION
+- * $Id$
++ * $Id$
+ *
+ * = AUTHORS
+ * Nigel Pearson, Jeremiah Morris
+@@ -1598,11 +1598,10 @@ void VideoOutputQuartz::DeleteQuartzBuff
+ vbuffers.DeleteBuffers();
+ }
+
+-void VideoOutputQuartz::EmbedInWidget(WId wid, int x, int y, int w, int h)
++void VideoOutputQuartz::EmbedInWidget(int x, int y, int w, int h)
+ {
+- VERBOSE(VB_PLAYBACK,
+- (LOC + "EmbedInWidget(wid=%1, x=%2, y=%3, w=%4, h=%5)")
+- .arg(wid).arg(x).arg(y).arg(w).arg(h));
++ VERBOSE(VB_PLAYBACK, (LOC + "EmbedInWidget(x=%1, y=%2, w=%3, h=%4)")
++ .arg(x).arg(y).arg(w).arg(h));
+
+ if (windows[0].IsEmbedding())
+ return;
+diff -Naurp mythtv-0.23-release/libs/libmythtv/videoout_quartz.h mythtv-0.23/libs/libmythtv/videoout_quartz.h
+--- mythtv-0.23-release/libs/libmythtv/videoout_quartz.h 2010-02-03 10:39:11.000000000 -0500
++++ mythtv-0.23/libs/libmythtv/videoout_quartz.h 2010-06-18 03:11:40.067331000 -0400
+@@ -34,7 +34,7 @@ class VideoOutputQuartz : public VideoOu
+ void Zoom(ZoomDirection direction);
+ void ToggleAdjustFill(AdjustFillMode adjustFill);
+
+- void EmbedInWidget(WId wid, int x, int y, int w, int h);
++ void EmbedInWidget(int x, int y, int w, int h);
+ void StopEmbedding(void);
+
+ DisplayInfo GetDisplayInfo(void);
diff -Naurp mythtv-0.23-release/libs/libmythui/mythfontmanager.cpp mythtv-0.23/libs/libmythui/mythfontmanager.cpp
--- mythtv-0.23-release/libs/libmythui/mythfontmanager.cpp 2010-02-24 02:41:32.000000000 -0500
+++ mythtv-0.23/libs/libmythui/mythfontmanager.cpp 2010-06-08 18:21:22.370095000 -0400
@@ -994,6 +1322,38 @@
}
#endif
+diff -Naurp mythtv-0.23-release/libs/libmythui/mythuitext.cpp mythtv-0.23/libs/libmythui/mythuitext.cpp
+--- mythtv-0.23-release/libs/libmythui/mythuitext.cpp 2010-03-28 16:39:26.000000000 -0400
++++ mythtv-0.23/libs/libmythui/mythuitext.cpp 2010-06-20 13:40:58.513407000 -0400
+@@ -347,13 +347,14 @@ void MythUIText::FillCutMessage()
+ if (isNumber && m_TemplateText.contains("%n"))
+ {
+ m_CutMessage = qApp->translate("ThemeUI",
+- qPrintable(m_TemplateText), "",
+- QCoreApplication::CodecForTr,
+- qAbs(value));
++ m_TemplateText.toUtf8(), NULL,
++ QCoreApplication::UnicodeUTF8,
++ qAbs(value));
+ }
+ else if (m_TemplateText.contains("%1"))
+ {
+- QString tmp = qApp->translate("ThemeUI", qPrintable(m_TemplateText));
++ QString tmp = qApp->translate("ThemeUI", m_TemplateText.toUtf8(),
++ NULL, QCoreApplication::UnicodeUTF8);
+ m_CutMessage = tmp.arg(m_Message);
+ }
+ }
+@@ -577,7 +578,8 @@ bool MythUIText::ParseElement(
+ if (element.attribute("lang","").isEmpty())
+ {
+ m_Message = qApp->translate("ThemeUI",
+- qPrintable(getFirstText(element)));
++ getFirstText(element).toUtf8(), NULL,
++ QCoreApplication::UnicodeUTF8);
+ }
+ else if (element.attribute("lang","").toLower() ==
+ GetMythUI()->GetLanguageAndVariant())
diff -Naurp mythtv-0.23-release/libs/libmythui/xmlparsebase.cpp mythtv-0.23/libs/libmythui/xmlparsebase.cpp
--- mythtv-0.23-release/libs/libmythui/xmlparsebase.cpp 2010-03-02 12:36:30.000000000 -0500
+++ mythtv-0.23/libs/libmythui/xmlparsebase.cpp 2010-05-15 09:04:12.458568000 -0400
@@ -1042,6 +1402,19 @@
!profile:QMAKE_CFLAGS_DEBUG += -O
+diff -Naurp mythtv-0.23-release/programs/mythbackend/filetransfer.cpp mythtv-0.23/programs/mythbackend/filetransfer.cpp
+--- mythtv-0.23-release/programs/mythbackend/filetransfer.cpp 2010-03-10 10:37:33.000000000 -0500
++++ mythtv-0.23/programs/mythbackend/filetransfer.cpp 2010-06-17 09:23:59.559532000 -0400
+@@ -41,6 +41,9 @@ FileTransfer::FileTransfer(QString &file
+ pginfo->pathname = pginfo->GetPlaybackURL();
+ pginfo->MarkAsInUse(true, kFileTransferInUseID);
+ }
++
++ if (write)
++ remote->useReadyReadCallback(false);
+ }
+
+ FileTransfer::~FileTransfer()
diff -Naurp mythtv-0.23-release/programs/mythbackend/main.cpp mythtv-0.23/programs/mythbackend/main.cpp
--- mythtv-0.23-release/programs/mythbackend/main.cpp 2010-04-09 07:29:00.000000000 -0400
+++ mythtv-0.23/programs/mythbackend/main.cpp 2010-05-13 14:45:33.347492000 -0400
@@ -1075,6 +1448,28 @@
}
if (pidfs)
+diff -Naurp mythtv-0.23-release/programs/mythbackend/mainserver.cpp mythtv-0.23/programs/mythbackend/mainserver.cpp
+--- mythtv-0.23-release/programs/mythbackend/mainserver.cpp 2010-04-10 17:19:56.000000000 -0400
++++ mythtv-0.23/programs/mythbackend/mainserver.cpp 2010-06-17 09:23:59.559532000 -0400
+@@ -1270,15 +1270,10 @@ void MainServer::HandleAnnounce(QStringL
+ else
+ filename = LocalFilePath(qurl, wantgroup);
+
+- if (writemode)
+- {
+- socket->setCallbacks(NULL);
+- ft = new FileTransfer(filename, socket, true);
+- }
+- else if (retries >= 0)
+- ft = new FileTransfer(filename, socket, usereadahead, retries);
++ if (retries < 0)
++ ft = new FileTransfer(filename, socket, writemode);
+ else
+- ft = new FileTransfer(filename, socket, false);
++ ft = new FileTransfer(filename, socket, usereadahead, retries);
+
+ sockListLock.lockForWrite();
+ fileTransferList.push_back(ft);
diff -Naurp mythtv-0.23-release/programs/mythcommflag/main.cpp mythtv-0.23/programs/mythcommflag/main.cpp
--- mythtv-0.23-release/programs/mythcommflag/main.cpp 2010-02-10 12:02:19.000000000 -0500
+++ mythtv-0.23/programs/mythcommflag/main.cpp 2010-05-13 20:49:59.310980000 -0400
@@ -1141,6 +1536,21 @@
time_now = time(NULL);
if (!quiet)
+diff -Naurp mythtv-0.23-release/programs/mythtranscode/transcode.cpp mythtv-0.23/programs/mythtranscode/transcode.cpp
+--- mythtv-0.23-release/programs/mythtranscode/transcode.cpp 2010-04-03 13:16:58.000000000 -0400
++++ mythtv-0.23/programs/mythtranscode/transcode.cpp 2010-06-18 06:50:18.720005000 -0400
+@@ -217,6 +217,11 @@ class AudioReencodeBuffer : public Audio
+ // Do nothing
+ return false;
+ }
++ virtual bool CanPassthrough(void) const
++ {
++ // Do nothing
++ return false;
++ }
+
+ virtual void SetSWVolume(int new_volume, bool save)
+ {
diff -Naurp mythtv-0.23-release/programs/mythtv-setup/main.cpp mythtv-0.23/programs/mythtv-setup/main.cpp
--- mythtv-0.23-release/programs/mythtv-setup/main.cpp 2010-03-11 22:54:16.000000000 -0500
+++ mythtv-0.23/programs/mythtv-setup/main.cpp 2010-05-12 11:25:27.228749000 -0400
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mythtv.spec 17 Jun 2010 04:46:02 -0000 1.84
+++ mythtv.spec 21 Jun 2010 14:44:22 -0000 1.85
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r25124
+%define _svnrev r25150
%define branch release-0-23-fixes
#
@@ -81,7 +81,7 @@
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -966,8 +966,12 @@
--extra-cflags="%{optflags} -fomit-frame-pointer" \
--extra-cxxflags="%{optflags} -fomit-frame-pointer" \
%endif
-%ifarch %{ix86}
- --cpu=%{_target_cpu} --tune=%{_target_cpu} --enable-mmx \
+%ifarch i586
+ # --cpu=i586 will result in mmx being disabled
+ --cpu=pentium-mmx --tune=i586 --enable-mmx \
+%endif
+%ifarch i686
+ --cpu=i686 --tune=i686 --enable-mmx \
%endif
%if %{with_proc_opt}
--enable-proc-opt \
@@ -1479,6 +1483,11 @@
################################################################################
%changelog
+* Mon Jun 21 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-5
+- Update to release-0-23-fixes branch, svn revision 25150
+- Further improvements to run as non-root (rpmfusion bz#1295)
+- One more try at a 32-bit x86 F11 i586 build w/both mmx and no cmov
+
* Wed Jun 16 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-4
- Update to release-0-23-fixes branch, svn revision 25124
- Add anti-vuvuzela-filter patch from mythtv ticket #8568, because
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-11 xorg-x11-drv-nvidia.spec, 1.37, 1.38 blacklist-nouveau.conf, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3875
Modified Files:
xorg-x11-drv-nvidia.spec blacklist-nouveau.conf
Log Message:
Fix for F-11
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-drv-nvidia.spec 21 Jun 2010 10:57:58 -0000 1.37
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 13:22:32 -0000 1.38
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 195.36.31
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -349,6 +349,9 @@
%changelog
+* Mon Jun 21 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1.1
+- Fix backport side effect, F-11 uses mkinitrd.
+
* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
- Fallback to nouveau instead of nv
Index: blacklist-nouveau.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/blacklist-nouveau.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blacklist-nouveau.conf 21 Jun 2010 10:29:31 -0000 1.2
+++ blacklist-nouveau.conf 21 Jun 2010 13:22:32 -0000 1.3
@@ -1,4 +1,4 @@
# RPM Fusion blacklist for nouveau driver - you need to run as root:
-# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-11 xorg-x11-drv-nvidia.spec,1.36,1.37
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26196
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Clear uneeded feature for F-11 branch
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-nvidia.spec 21 Jun 2010 10:29:31 -0000 1.36
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:57:58 -0000 1.37
@@ -279,16 +279,6 @@
/sbin/chkconfig --add nvidia ||:
/etc/init.d/nvidia start &>/dev/null ||:
fi
-if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
-fi
-if [ -x /usr/sbin/setsebool ] ; then
- SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
- if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
- /usr/sbin/setsebool -P allow_execstack on &>/dev/null
- fi
-fi ||:
%post libs -p /sbin/ldconfig
@@ -361,8 +351,6 @@
%changelog
* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
-- Add post section to change boot option with grubby
-- Add post section Enabled Selinux allow_execstack boolean.
- Fallback to nouveau instead of nv
- AddARGBGLXVisuals is enabled by default since 195xx serie.
13 years, 10 months
rpms/nvidia-kmod/F-12 nvidia-kmod.spec,1.90,1.91
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24379/F-12
Modified Files:
nvidia-kmod.spec
Log Message:
Clear uneeded patches
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/nvidia-kmod.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- nvidia-kmod.spec 21 Jun 2010 10:33:17 -0000 1.90
+++ nvidia-kmod.spec 21 Jun 2010 10:39:48 -0000 1.91
@@ -25,10 +25,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-#http://www.nvnews.net/vbulletin/showthread.php?t=151791
-Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-#http://bugs.gentoo.org/show_bug.cgi?id=301318
-#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -54,10 +50,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- pushd usr/src/nv
-%patch0 -p3 -b .iommu
-#%patch1 -p3 -b .acpi
- popd
+#disabled
popd
done
@@ -103,11 +96,6 @@
%changelog
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
-- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
- http://bugs.gentoo.org/show_bug.cgi?id=301318
-
-* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
-- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
13 years, 10 months
rpms/nvidia-kmod/F-11 nvidia-kmod.spec,1.76,1.77
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24379/F-11
Modified Files:
nvidia-kmod.spec
Log Message:
Clear uneeded patches
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/nvidia-kmod.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- nvidia-kmod.spec 21 Jun 2010 10:34:04 -0000 1.76
+++ nvidia-kmod.spec 21 Jun 2010 10:39:47 -0000 1.77
@@ -25,10 +25,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-#http://www.nvnews.net/vbulletin/showthread.php?t=151791
-Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-#http://bugs.gentoo.org/show_bug.cgi?id=301318
-#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -54,10 +50,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- pushd usr/src/nv
-%patch0 -p3 -b .iommu
-#%patch1 -p3 -b .acpi
- popd
+#disabled
popd
done
@@ -103,11 +96,6 @@
%changelog
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
-- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
- http://bugs.gentoo.org/show_bug.cgi?id=301318
-
-* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
-- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
13 years, 10 months
rpms/nvidia-kmod/F-13 nvidia-kmod.spec,1.71,1.72
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24379/F-13
Modified Files:
nvidia-kmod.spec
Log Message:
Clear uneeded patches
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/nvidia-kmod.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nvidia-kmod.spec 21 Jun 2010 10:32:35 -0000 1.71
+++ nvidia-kmod.spec 21 Jun 2010 10:39:48 -0000 1.72
@@ -27,8 +27,7 @@
#http://www.nvnews.net/vbulletin/showthread.php?t=151791
Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-#http://bugs.gentoo.org/show_bug.cgi?id=301318
-#Patch1: nvidia-190.53-2.6.33.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -56,7 +55,6 @@
pushd nvidiapkg-${arch}
pushd usr/src/nv
%patch0 -p3 -b .iommu
-#%patch1 -p3 -b .acpi
popd
popd
done
@@ -103,8 +101,6 @@
%changelog
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
-- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
- http://bugs.gentoo.org/show_bug.cgi?id=301318
* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
13 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.63,1.64
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24251
Modified Files:
nvidia-kmod.spec
Log Message:
Clear uneeded patch
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nvidia-kmod.spec 21 Jun 2010 10:31:35 -0000 1.63
+++ nvidia-kmod.spec 21 Jun 2010 10:37:27 -0000 1.64
@@ -27,8 +27,7 @@
#http://www.nvnews.net/vbulletin/showthread.php?t=151791
Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-#http://bugs.gentoo.org/show_bug.cgi?id=301318
-#Patch1: nvidia-190.53-2.6.33.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -56,7 +55,6 @@
pushd nvidiapkg-${arch}
pushd usr/src/nv
%patch0 -p3 -b .iommu
-#%patch1 -p3 -b .acpi
popd
popd
done
@@ -103,8 +101,6 @@
%changelog
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
-- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
- http://bugs.gentoo.org/show_bug.cgi?id=301318
* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
13 years, 10 months
rpms/nvidia-kmod/F-11 NVIDIA_kernel-195.36.24-6120611.diff.txt, NONE, 1.1 .cvsignore, 1.19, 1.20 nvidia-kmod.spec, 1.75, 1.76 sources, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23707/F-11
Modified Files:
.cvsignore nvidia-kmod.spec sources
Added Files:
NVIDIA_kernel-195.36.24-6120611.diff.txt
Log Message:
Update to 195.36.31
--- NEW FILE NVIDIA_kernel-195.36.24-6120611.diff.txt ---
diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.6120611/Makefile.kbuild
--- usr/src/nv/Makefile.kbuild 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/Makefile.kbuild 2010-06-08 07:51:02.147829142 -0700
@@ -165,7 +165,8 @@
proc_dir_entry \
INIT_WORK \
acpi_walk_namespace \
- agp_memory
+ agp_memory \
+ scatterlist
#
# Miscellaneous NVIDIA kernel module build support targets. They are needed
diff -ru usr/src/nv/Makefile.nvidia usr/src/nv.6120611/Makefile.nvidia
--- usr/src/nv/Makefile.nvidia 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/Makefile.nvidia 2010-06-08 07:51:58.040355195 -0700
@@ -56,7 +56,8 @@
i2c_adapter \
smp_call_function \
acpi_evaluate_integer \
- proc_dir_entry
+ proc_dir_entry \
+ scatterlist
DEFINES+=$(EXTRA_DEFINES)
diff -ru usr/src/nv/conftest.sh usr/src/nv.6120611/conftest.sh
--- usr/src/nv/conftest.sh 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/conftest.sh 2010-06-08 07:50:23.346851935 -0700
@@ -1079,6 +1079,31 @@
fi
;;
+ scatterlist)
+ #
+ # Determine if the 'scatterlist' structure has
+ # a 'page_link' member.
+ #
+ echo "$CONFTEST_PREAMBLE
+ #include <linux/types.h>
+ #include <linux/scatterlist.h>
+ int conftest_scatterlist(void) {
+ return offsetof(struct scatterlist, page_link);
+ }" > conftest$$.c
+
+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+ rm -f conftest$$.c
+
+ if [ -f conftest$$.o ]; then
+ echo "#undef NV_SCATTERLIST_HAS_PAGE" >> conftest.h
+ rm -f conftest$$.o
+ return
+ else
+ echo "#define NV_SCATTERLIST_HAS_PAGE" >> conftest.h
+ return
+ fi
+ ;;
+
esac
}
diff -ru usr/src/nv/nv-linux.h usr/src/nv.6120611/nv-linux.h
--- usr/src/nv/nv-linux.h 2010-04-22 20:40:40.000000000 -0700
+++ usr/src/nv.6120611/nv-linux.h 2010-06-08 07:50:23.346851935 -0700
@@ -334,14 +334,28 @@
#define NV_MAX_RECURRING_WARNING_MESSAGES 10
/* add support for iommu.
- * on x86_64 platforms, this uses the gart to remap pages that are > 32-bits
- * to < 32-bits.
+ * On the x86-64 platform, the driver may need to remap system
+ * memory pages via AMD K8/Intel VT-d IOMMUs if a given
+ * GPUs addressing capabilities are limited such that it can
+ * not access the original page directly. Examples of this
+ * are legacy PCI-E devices.
*/
-#if defined(NVCPU_X86_64) && !defined(GFP_DMA32)
+#if (defined(NVCPU_X86_64) && !defined(GFP_DMA32)) || defined(CONFIG_DMAR)
#define NV_SG_MAP_BUFFERS 1
extern int nv_swiotlb;
+
+#if defined(CONFIG_DMAR)
+#define NV_INTEL_IOMMU 1
+#else
+/*
+ * Limit use of IOMMU/SWIOTLB space to 60 MB, leaving 4 MB for the rest of
+ * the system (assuming a 64 MB IOMMU/SWIOTLB).
+ * This is not required if Intel VT-d IOMMU is used to remap pages.
+ */
+#define NV_NEED_REMAP_CHECK 1
#define NV_REMAP_LIMIT_DEFAULT (60 * 1024 * 1024)
#endif
+#endif
/* add support for software i/o tlb support.
* normally, you'd expect this to be transparent, but unfortunately this is not
diff -ru usr/src/nv/nv-vm.c usr/src/nv.6120611/nv-vm.c
--- usr/src/nv/nv-vm.c 2010-04-22 20:40:39.000000000 -0700
+++ usr/src/nv.6120611/nv-vm.c 2010-06-08 07:50:23.346851935 -0700
@@ -102,8 +102,10 @@
/* track how much memory has been remapped through the iommu/swiotlb */
+#if defined(NV_NEED_REMAP_CHECK)
extern unsigned int nv_remap_count;
extern unsigned int nv_remap_limit;
+#endif
static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
{
@@ -136,31 +138,27 @@
unsigned int num_pages
)
{
- int force_remap = FALSE;
struct scatterlist *sg_ptr = &page_list[0]->sg_list;
unsigned int i;
static int count = 0;
+#if defined(NV_SCATTERLIST_HAS_PAGE)
sg_ptr->page = virt_to_page(base);
+#else
+ sg_ptr->page_link = virt_to_page(base);
+#endif
sg_ptr->offset = (unsigned long)base & ~PAGE_MASK;
sg_ptr->length = num_pages * PAGE_SIZE;
-#if defined(DEBUG) && !defined(KERNEL_2_4)
- /*
- * XXX If the user specifically requested that the IOMMU
- * be used, then override the address range check below
- * and unconditionally call nv_map_sg() to remap the page(s).
- */
- force_remap = force_iommu;
-#endif
-
- if (!force_remap &&
- ((virt_to_phys(base) + sg_ptr->length - 1) & ~dev->dma_mask) == 0)
+#if !defined(NV_INTEL_IOMMU)
+ if (((virt_to_phys(base) + sg_ptr->length - 1) & ~dev->dma_mask) == 0)
{
sg_ptr->dma_address = virt_to_phys(base);
goto done;
}
+#endif
+#if defined(NV_NEED_REMAP_CHECK)
if ((nv_remap_count + sg_ptr->length) > nv_remap_limit)
{
if (count < NV_MAX_RECURRING_WARNING_MESSAGES)
@@ -178,6 +176,7 @@
}
return 1;
}
+#endif
i = NV_MAP_SG_MAX_RETRIES;
do {
@@ -190,7 +189,11 @@
nv_unmap_sg(dev, sg_ptr);
memset(&sg_tmp, 0, sizeof(struct scatterlist));
+#if defined(NV_SCATTERLIST_HAS_PAGE)
sg_tmp.page = sg_ptr->page;
+#else
+ sg_tmp.page_link = sg_ptr->page_link;
+#endif
sg_tmp.offset = sg_ptr->offset;
sg_tmp.length = 2048;
@@ -215,8 +218,10 @@
return -1;
}
+#if defined(NV_NEED_REMAP_CHECK)
if (sg_ptr->dma_address != virt_to_phys(base))
nv_remap_count += sg_ptr->length;
+#endif
// this is a bit of a hack to make contiguous allocations easier to handle
// nv_sg_load below relies on the page_ptr addresses being filed in, as
@@ -283,7 +288,9 @@
{
nv_unmap_sg(dev, sg_ptr);
page_ptr->dma_addr = 0;
+#if defined(NV_NEED_REMAP_CHECK)
nv_remap_count -= sg_ptr->length;
+#endif
}
}
#endif /* NV_SG_MAP_BUFFERS */
diff -ru usr/src/nv/nv.c usr/src/nv.6120611/nv.c
--- usr/src/nv/nv.c 2010-04-22 20:40:38.000000000 -0700
+++ usr/src/nv.6120611/nv.c 2010-06-08 07:50:23.350892195 -0700
@@ -129,9 +129,11 @@
#if defined(NV_SG_MAP_BUFFERS)
int nv_swiotlb = 0;
+#if defined(NV_NEED_REMAP_CHECK)
unsigned int nv_remap_count;
unsigned int nv_remap_limit;
#endif
+#endif
int nv_update_memory_types = 1;
static int nv_mmconfig_failure_detected = 0;
@@ -1534,7 +1536,7 @@
goto failed;
}
-#if defined(NV_SG_MAP_BUFFERS)
+#if defined(NV_SG_MAP_BUFFERS) && defined(NV_NEED_REMAP_CHECK)
rm_read_registry_dword(sp, nv, "NVreg", "RemapLimit", &nv_remap_limit);
// allow an override, but use default if no override
@@ -1854,7 +1856,7 @@
"NVRM: final KM memory usage: 0x%x bytes\n", km_usage);
}
#endif
-#if defined(NV_SG_MAP_BUFFERS)
+#if defined(NV_SG_MAP_BUFFERS) && defined(NV_NEED_REMAP_CHECK)
if (nv_remap_count != 0)
{
nv_printf(NV_DBG_ERRORS,
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 30 Dec 2009 13:11:54 -0000 1.19
+++ .cvsignore 21 Jun 2010 10:34:04 -0000 1.20
@@ -1 +1 @@
-nvidia-kmod-data-190.53.tar.bz2
+nvidia-kmod-data-195.36.31.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/nvidia-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- nvidia-kmod.spec 11 Feb 2010 19:48:26 -0000 1.75
+++ nvidia-kmod.spec 21 Jun 2010 10:34:04 -0000 1.76
@@ -3,12 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
-Version: 190.53
+Epoch: 1
+Version: 195.36.31
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,10 +25,14 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+#http://www.nvnews.net/vbulletin/showthread.php?t=151791
+Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
+#http://bugs.gentoo.org/show_bug.cgi?id=301318
+#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64
+ExclusiveArch: i686 x86_64
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
@@ -46,12 +51,15 @@
%setup -q -c -T -a 0
# patch loop
-#for arch in x86 x64
-#do
-# pushd nvidiapkg-${arch}
-# empty
-# popd
-#done
+for arch in x86 x64
+do
+ pushd nvidiapkg-${arch}
+ pushd usr/src/nv
+%patch0 -p3 -b .iommu
+#%patch1 -p3 -b .acpi
+ popd
+ popd
+done
for kernel_version in %{?kernel_versions} ; do
@@ -93,31 +101,77 @@
%changelog
+* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
+
+* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
+- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
+
+* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
+- Update to 195.36.24
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.15-1
+- Update to 195.36.15
+
+* Fri Mar 12 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:190.53-3
+- Bump Epoch - Fan problem in recent release
+
+* Mon Mar 08 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:190.53-2
+- Revert to 190.53 version
+ http://www.nvnews.net/vbulletin/announcement.php?f=14
+
+* Sat Feb 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 195.36.08-1
+- Update to 195.36.08
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.6
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.5
+- rebuild for new kernel
+
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.4
- rebuild for new kernel
-* Mon Feb 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.3
+* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.3
- rebuild for new kernel
-* Thu Feb 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.2
+* Sat Jan 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.2
- rebuild for new kernel
-* Fri Jan 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.1
+* Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.1
- rebuild for new kernel
* Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.53-1
- Update to 190.53
+- Add patch for VGA_ARB
-* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.4
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.9
- rebuild for new kernel
-* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.3
+* Thu Dec 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.8
- rebuild for new kernel
-* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.2
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.7
+- rebuild for new kernel
+
+* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.6
+- rebuild for new kernel
+
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.5
+- rebuild for new kernel, disable i586 builds
+
+* Tue Nov 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.4
+- rebuild for F12 release kernel
+
+* Mon Nov 09 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.3
+- rebuild for new kernels
+
+* Fri Nov 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.2
- rebuild for new kernels
-* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.1
+* Wed Nov 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.1
- rebuild for new kernels
* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 30 Dec 2009 13:11:54 -0000 1.20
+++ sources 21 Jun 2010 10:34:04 -0000 1.21
@@ -1 +1 @@
-9ba74aacc99d41283aff95d119050ec2 nvidia-kmod-data-190.53.tar.bz2
+013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
13 years, 10 months
rpms/nvidia-kmod/F-12 NVIDIA_kernel-195.36.24-6120611.diff.txt, NONE, 1.1 .cvsignore, 1.20, 1.21 nvidia-kmod.spec, 1.89, 1.90 sources, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23518/F-12
Modified Files:
.cvsignore nvidia-kmod.spec sources
Added Files:
NVIDIA_kernel-195.36.24-6120611.diff.txt
Log Message:
Update to 195.36.31
--- NEW FILE NVIDIA_kernel-195.36.24-6120611.diff.txt ---
diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.6120611/Makefile.kbuild
--- usr/src/nv/Makefile.kbuild 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/Makefile.kbuild 2010-06-08 07:51:02.147829142 -0700
@@ -165,7 +165,8 @@
proc_dir_entry \
INIT_WORK \
acpi_walk_namespace \
- agp_memory
+ agp_memory \
+ scatterlist
#
# Miscellaneous NVIDIA kernel module build support targets. They are needed
diff -ru usr/src/nv/Makefile.nvidia usr/src/nv.6120611/Makefile.nvidia
--- usr/src/nv/Makefile.nvidia 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/Makefile.nvidia 2010-06-08 07:51:58.040355195 -0700
@@ -56,7 +56,8 @@
i2c_adapter \
smp_call_function \
acpi_evaluate_integer \
- proc_dir_entry
+ proc_dir_entry \
+ scatterlist
DEFINES+=$(EXTRA_DEFINES)
diff -ru usr/src/nv/conftest.sh usr/src/nv.6120611/conftest.sh
--- usr/src/nv/conftest.sh 2010-04-22 20:40:43.000000000 -0700
+++ usr/src/nv.6120611/conftest.sh 2010-06-08 07:50:23.346851935 -0700
@@ -1079,6 +1079,31 @@
fi
;;
+ scatterlist)
+ #
+ # Determine if the 'scatterlist' structure has
+ # a 'page_link' member.
+ #
+ echo "$CONFTEST_PREAMBLE
+ #include <linux/types.h>
+ #include <linux/scatterlist.h>
+ int conftest_scatterlist(void) {
+ return offsetof(struct scatterlist, page_link);
+ }" > conftest$$.c
+
+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+ rm -f conftest$$.c
+
+ if [ -f conftest$$.o ]; then
+ echo "#undef NV_SCATTERLIST_HAS_PAGE" >> conftest.h
+ rm -f conftest$$.o
+ return
+ else
+ echo "#define NV_SCATTERLIST_HAS_PAGE" >> conftest.h
+ return
+ fi
+ ;;
+
esac
}
diff -ru usr/src/nv/nv-linux.h usr/src/nv.6120611/nv-linux.h
--- usr/src/nv/nv-linux.h 2010-04-22 20:40:40.000000000 -0700
+++ usr/src/nv.6120611/nv-linux.h 2010-06-08 07:50:23.346851935 -0700
@@ -334,14 +334,28 @@
#define NV_MAX_RECURRING_WARNING_MESSAGES 10
/* add support for iommu.
- * on x86_64 platforms, this uses the gart to remap pages that are > 32-bits
- * to < 32-bits.
+ * On the x86-64 platform, the driver may need to remap system
+ * memory pages via AMD K8/Intel VT-d IOMMUs if a given
+ * GPUs addressing capabilities are limited such that it can
+ * not access the original page directly. Examples of this
+ * are legacy PCI-E devices.
*/
-#if defined(NVCPU_X86_64) && !defined(GFP_DMA32)
+#if (defined(NVCPU_X86_64) && !defined(GFP_DMA32)) || defined(CONFIG_DMAR)
#define NV_SG_MAP_BUFFERS 1
extern int nv_swiotlb;
+
+#if defined(CONFIG_DMAR)
+#define NV_INTEL_IOMMU 1
+#else
+/*
+ * Limit use of IOMMU/SWIOTLB space to 60 MB, leaving 4 MB for the rest of
+ * the system (assuming a 64 MB IOMMU/SWIOTLB).
+ * This is not required if Intel VT-d IOMMU is used to remap pages.
+ */
+#define NV_NEED_REMAP_CHECK 1
#define NV_REMAP_LIMIT_DEFAULT (60 * 1024 * 1024)
#endif
+#endif
/* add support for software i/o tlb support.
* normally, you'd expect this to be transparent, but unfortunately this is not
diff -ru usr/src/nv/nv-vm.c usr/src/nv.6120611/nv-vm.c
--- usr/src/nv/nv-vm.c 2010-04-22 20:40:39.000000000 -0700
+++ usr/src/nv.6120611/nv-vm.c 2010-06-08 07:50:23.346851935 -0700
@@ -102,8 +102,10 @@
/* track how much memory has been remapped through the iommu/swiotlb */
+#if defined(NV_NEED_REMAP_CHECK)
extern unsigned int nv_remap_count;
extern unsigned int nv_remap_limit;
+#endif
static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
{
@@ -136,31 +138,27 @@
unsigned int num_pages
)
{
- int force_remap = FALSE;
struct scatterlist *sg_ptr = &page_list[0]->sg_list;
unsigned int i;
static int count = 0;
+#if defined(NV_SCATTERLIST_HAS_PAGE)
sg_ptr->page = virt_to_page(base);
+#else
+ sg_ptr->page_link = virt_to_page(base);
+#endif
sg_ptr->offset = (unsigned long)base & ~PAGE_MASK;
sg_ptr->length = num_pages * PAGE_SIZE;
-#if defined(DEBUG) && !defined(KERNEL_2_4)
- /*
- * XXX If the user specifically requested that the IOMMU
- * be used, then override the address range check below
- * and unconditionally call nv_map_sg() to remap the page(s).
- */
- force_remap = force_iommu;
-#endif
-
- if (!force_remap &&
- ((virt_to_phys(base) + sg_ptr->length - 1) & ~dev->dma_mask) == 0)
+#if !defined(NV_INTEL_IOMMU)
+ if (((virt_to_phys(base) + sg_ptr->length - 1) & ~dev->dma_mask) == 0)
{
sg_ptr->dma_address = virt_to_phys(base);
goto done;
}
+#endif
+#if defined(NV_NEED_REMAP_CHECK)
if ((nv_remap_count + sg_ptr->length) > nv_remap_limit)
{
if (count < NV_MAX_RECURRING_WARNING_MESSAGES)
@@ -178,6 +176,7 @@
}
return 1;
}
+#endif
i = NV_MAP_SG_MAX_RETRIES;
do {
@@ -190,7 +189,11 @@
nv_unmap_sg(dev, sg_ptr);
memset(&sg_tmp, 0, sizeof(struct scatterlist));
+#if defined(NV_SCATTERLIST_HAS_PAGE)
sg_tmp.page = sg_ptr->page;
+#else
+ sg_tmp.page_link = sg_ptr->page_link;
+#endif
sg_tmp.offset = sg_ptr->offset;
sg_tmp.length = 2048;
@@ -215,8 +218,10 @@
return -1;
}
+#if defined(NV_NEED_REMAP_CHECK)
if (sg_ptr->dma_address != virt_to_phys(base))
nv_remap_count += sg_ptr->length;
+#endif
// this is a bit of a hack to make contiguous allocations easier to handle
// nv_sg_load below relies on the page_ptr addresses being filed in, as
@@ -283,7 +288,9 @@
{
nv_unmap_sg(dev, sg_ptr);
page_ptr->dma_addr = 0;
+#if defined(NV_NEED_REMAP_CHECK)
nv_remap_count -= sg_ptr->length;
+#endif
}
}
#endif /* NV_SG_MAP_BUFFERS */
diff -ru usr/src/nv/nv.c usr/src/nv.6120611/nv.c
--- usr/src/nv/nv.c 2010-04-22 20:40:38.000000000 -0700
+++ usr/src/nv.6120611/nv.c 2010-06-08 07:50:23.350892195 -0700
@@ -129,9 +129,11 @@
#if defined(NV_SG_MAP_BUFFERS)
int nv_swiotlb = 0;
+#if defined(NV_NEED_REMAP_CHECK)
unsigned int nv_remap_count;
unsigned int nv_remap_limit;
#endif
+#endif
int nv_update_memory_types = 1;
static int nv_mmconfig_failure_detected = 0;
@@ -1534,7 +1536,7 @@
goto failed;
}
-#if defined(NV_SG_MAP_BUFFERS)
+#if defined(NV_SG_MAP_BUFFERS) && defined(NV_NEED_REMAP_CHECK)
rm_read_registry_dword(sp, nv, "NVreg", "RemapLimit", &nv_remap_limit);
// allow an override, but use default if no override
@@ -1854,7 +1856,7 @@
"NVRM: final KM memory usage: 0x%x bytes\n", km_usage);
}
#endif
-#if defined(NV_SG_MAP_BUFFERS)
+#if defined(NV_SG_MAP_BUFFERS) && defined(NV_NEED_REMAP_CHECK)
if (nv_remap_count != 0)
{
nv_printf(NV_DBG_ERRORS,
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 28 Apr 2010 19:54:26 -0000 1.20
+++ .cvsignore 21 Jun 2010 10:33:17 -0000 1.21
@@ -1 +1 @@
-nvidia-kmod-data-195.36.24.tar.bz2
+nvidia-kmod-data-195.36.31.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/nvidia-kmod.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- nvidia-kmod.spec 18 Jun 2010 12:56:56 -0000 1.89
+++ nvidia-kmod.spec 21 Jun 2010 10:33:17 -0000 1.90
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
# Taken over by kmodtool
-Release: 1%{?dist}.3
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,10 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+#http://www.nvnews.net/vbulletin/showthread.php?t=151791
+Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
+#http://bugs.gentoo.org/show_bug.cgi?id=301318
+#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -50,7 +54,10 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-#disabled
+ pushd usr/src/nv
+%patch0 -p3 -b .iommu
+#%patch1 -p3 -b .acpi
+ popd
popd
done
@@ -94,33 +101,17 @@
%changelog
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.3
-- rebuild for new kernel
-
-* Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.2
-- rebuild for new kernel
+* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.1
-- rebuild for new kernel
+* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
+- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
-* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.5
-- rebuild for new kernel
-
-* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.4
-- rebuild for new kernel
-
-* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.3
-- rebuild for new kernel
-
-* Sat Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.2
-- rebuild for new kernel
-
-* Mon Mar 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.1
-- rebuild for new kernel
-
* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.15-1
- Update to 195.36.15
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 28 Apr 2010 19:54:26 -0000 1.20
+++ sources 21 Jun 2010 10:33:17 -0000 1.21
@@ -1 +1 @@
-f6743503f98dd95f44ddb9b6f87117a5 nvidia-kmod-data-195.36.24.tar.bz2
+013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
13 years, 10 months
rpms/nvidia-kmod/F-13 .cvsignore, 1.19, 1.20 nvidia-kmod.spec, 1.70, 1.71 sources, 1.19, 1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23328/F-13
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 195.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 24 Apr 2010 09:31:20 -0000 1.19
+++ .cvsignore 21 Jun 2010 10:32:35 -0000 1.20
@@ -1 +1 @@
-nvidia-kmod-data-195.36.24.tar.bz2
+nvidia-kmod-data-195.36.31.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/nvidia-kmod.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- nvidia-kmod.spec 18 Jun 2010 09:02:40 -0000 1.70
+++ nvidia-kmod.spec 21 Jun 2010 10:32:35 -0000 1.71
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
# Taken over by kmodtool
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,7 +25,10 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+#http://www.nvnews.net/vbulletin/showthread.php?t=151791
Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
+#http://bugs.gentoo.org/show_bug.cgi?id=301318
+#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -52,7 +55,8 @@
do
pushd nvidiapkg-${arch}
pushd usr/src/nv
-%patch0 -p3
+%patch0 -p3 -b .iommu
+#%patch1 -p3 -b .acpi
popd
popd
done
@@ -97,32 +101,13 @@
%changelog
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-2.1
-- rebuild for new kernel
-
-* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2.7
-- Backport - http://www.nvnews.net/vbulletin/showthread.php?t=151791
-
-* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.7
-- rebuild for new kernel
-
-* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.6
-- rebuild for new kernel
-
-* Mon May 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.5
-- rebuild for new kernel
+* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
-* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.4
-- rebuild for new kernel
-
-* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.3
-- rebuild for new kernel
-
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.2
-- rebuild for new kernel
-
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.24-1.1
-- rebuild for new kernel
+* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
+- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Apr 2010 09:31:20 -0000 1.19
+++ sources 21 Jun 2010 10:32:35 -0000 1.20
@@ -1 +1 @@
-f6743503f98dd95f44ddb9b6f87117a5 nvidia-kmod-data-195.36.24.tar.bz2
+013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
13 years, 10 months