rpms/libquicktime/devel libquicktime-backport.patch,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2221
Modified Files:
libquicktime-backport.patch
Log Message:
Fix path
libquicktime-backport.patch:
audio.c | 5 +++++
params.c | 34 +++++++++++++++++++++++++++++++++-
video.c | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
3 files changed, 81 insertions(+), 16 deletions(-)
Index: libquicktime-backport.patch
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime-backport.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libquicktime-backport.patch 20 Aug 2013 11:41:25 -0000 1.1
+++ libquicktime-backport.patch 20 Aug 2013 13:33:48 -0000 1.2
@@ -1,5 +1,5 @@
---- params.c 2012/03/07 14:10:41 1.18
-+++ params.c 2013/05/07 09:18:51 1.19
+--- plugins/ffmpeg/params.c 2012/03/07 14:10:41 1.18
++++ plugins/ffmpeg/params.c 2013/05/07 09:18:51 1.19
@@ -101,6 +101,17 @@
} \
}
@@ -75,8 +75,8 @@
PARAM_ENUM("ff_coder_type",coder_type,coder_type);
}
---- audio.c 2012/03/29 19:44:28 1.61
-+++ audio.c 2013/04/21 21:54:58 1.62
+--- plugins/ffmpeg/audio.c 2012/03/29 19:44:28 1.61
++++ plugins/ffmpeg/audio.c 2013/04/21 21:54:58 1.62
@@ -45,6 +45,11 @@
#define ENCODE_AUDIO 1
#endif
@@ -89,8 +89,8 @@
/* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
/* MPEG Audio header parsing code */
---- video.c 2012/11/27 15:46:40 1.117
-+++ video.c 2013/06/05 15:10:48 1.123
+--- plugins/ffmpeg/video.c 2012/11/27 15:46:40 1.117
++++ plugins/ffmpeg/video.c 2013/06/05 15:10:48 1.123
@@ -469,7 +469,17 @@
codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
10 years, 11 months
rpms/gpac/devel .cvsignore, 1.10, 1.11 gpac-snapshot.sh, 1.4, 1.5 gpac.spec, 1.43, 1.44 sources, 1.10, 1.11
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1102/devel
Modified Files:
.cvsignore gpac-snapshot.sh gpac.spec sources
Log Message:
Update to today's snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 23 Jun 2012 18:09:53 -0000 1.10
+++ .cvsignore 20 Aug 2013 12:53:43 -0000 1.11
@@ -1 +1 @@
-gpac-0.5.0.tar.gz
+gpac-20130820.tar.xz
Index: gpac-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-snapshot.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpac-snapshot.sh 23 Jun 2012 17:38:54 -0000 1.4
+++ gpac-snapshot.sh 20 Aug 2013 12:53:43 -0000 1.5
@@ -15,10 +15,10 @@
svn=$(date +%Y%m%d)
cd "$tmp"
-svn co http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
+svn co http://svn.code.sf.net/p/gpac/code/trunk/gpac gpac
revision=$(svnversion gpac)
echo "#define GPAC_SVN_REVISION \"$revision\"" > gpac/include/gpac/version.h
-find gpac -name '.svn' -type d -exec rm -rf {} ';' || :
+find gpac -name ".svn" -type d -exec rm -rf {} ';' || :
rm -rf gpac/extra_lib/
-tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac
+tar Jcf "$pwd"/gpac-$svn.tar.xz gpac
cd - >/dev/null
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gpac.spec 15 Aug 2013 10:16:08 -0000 1.43
+++ gpac.spec 20 Aug 2013 12:53:43 -0000 1.44
@@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-#global svn 20120623
+%global svn 20130820
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 2.0.0
@@ -17,11 +17,12 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.5.0
-Release: 5%{?svn}%{?dist}
+Release: 6%{?svn:.%{svn}svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
-Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
+#Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
+Source0: gpac-%{svn}.tar.xz
Source9: gpac-snapshot.sh
Patch1: gpac-0.5.0-libdir.patch
Patch2: gpac-0.4.5-amr.patch
@@ -325,6 +326,9 @@
%changelog
+* Tue Aug 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.0-6.20130820svn
+- Update to 20130820
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.0-5
- Rebuilt for FFmpeg 2.0.x
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 23 Jun 2012 18:09:53 -0000 1.10
+++ sources 20 Aug 2013 12:53:43 -0000 1.11
@@ -1 +1 @@
-19f7bb7c16913c22bdd453db1e653ca0 gpac-0.5.0.tar.gz
+a7c51cfaf54c5c779ee6517c2dc55198 gpac-20130820.tar.xz
10 years, 11 months
rpms/libquicktime/devel libquicktime-backport.patch, NONE, 1.1 libquicktime.spec, 1.35, 1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31258/devel
Modified Files:
libquicktime.spec
Added Files:
libquicktime-backport.patch
Log Message:
Fix build with FFmpeg 2.0x
libquicktime-backport.patch:
audio.c | 5 +++++
params.c | 34 +++++++++++++++++++++++++++++++++-
video.c | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
3 files changed, 81 insertions(+), 16 deletions(-)
--- NEW FILE libquicktime-backport.patch ---
--- params.c 2012/03/07 14:10:41 1.18
+++ params.c 2013/05/07 09:18:51 1.19
@@ -101,6 +101,17 @@
} \
}
+#define PARAM_DICT_INT(name, dict_name) \
+ { \
+ if(!strcasecmp(name, key)) \
+ { \
+ char buf[128]; \
+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \
+ av_dict_set(options, dict_name, buf, 0); \
+ found = 1; \
+ } \
+ }
+
#define PARAM_DICT_FLAG(name, dict_name) \
{ \
if(!strcasecmp(name, key)) \
@@ -202,8 +213,15 @@
PARAM_INT("ff_max_b_frames",max_b_frames);
PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");
+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");
+#else
PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
+#endif
+
PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
PARAM_INT("ff_rc_min_rate",rc_min_rate);
@@ -241,8 +259,15 @@
PARAM_QP2LAMBDA("ff_lmax", lmax);
PARAM_INT("ff_noise_reduction",noise_reduction);
PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold");
+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");
+#else
PARAM_INT("ff_inter_threshold",inter_threshold);
PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
+#endif
+
PARAM_INT("ff_thread_count",thread_count);
PARAM_INT("ff_me_threshold",me_threshold);
PARAM_INT("ff_mb_threshold",mb_threshold);
@@ -272,8 +297,16 @@
PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
// PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");
+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+#else
PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+#endif
#if LIBAVCODEC_VERSION_MAJOR >= 54
PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");
@@ -288,7 +321,6 @@
PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
PARAM_ENUM("ff_coder_type",coder_type,coder_type);
}
--- audio.c 2012/03/29 19:44:28 1.61
+++ audio.c 2013/04/21 21:54:58 1.62
@@ -45,6 +45,11 @@
#define ENCODE_AUDIO 1
#endif
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+/* from libavcodec/avcodec.h dated Dec 23 2012 */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
/* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
/* MPEG Audio header parsing code */
--- video.c 2012/11/27 15:46:40 1.117
+++ video.c 2013/06/05 15:10:48 1.123
@@ -469,7 +469,17 @@
codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
/* First we try codec-specific colormodel matching. */
- if(codec->decoder->id == CODEC_ID_DNXHD)
+ if(codec->is_imx && quicktime_match_32(vtrack->track->mdia.minf.stbl.stsd.table[0].format, "AVmp"))
+ {
+ if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
+ {
+ vtrack->stream_cmodel = BC_YUVJ422P;
+ codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P;
+ *exact = 1;
+ return;
+ }
+ }
+ else if(codec->decoder->id == CODEC_ID_DNXHD)
{
/* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
@@ -731,12 +741,13 @@
codec->y_offset = codec->avctx->height - trak->tkhd.track_height;
vtrack->height_extension = 0;
} else {
+ int stsd_height = trak->mdia.minf.stbl.stsd.table[0].height;
codec->y_offset = 0;
- if (vtrack->height_extension == codec->avctx->height - trak->tkhd.track_height) {
+ if (vtrack->height_extension == codec->avctx->height - stsd_height) {
return;
}
- vtrack->height_extension = codec->avctx->height - trak->tkhd.track_height;
+ vtrack->height_extension = codec->avctx->height - stsd_height;
/* Now we need a larger temp_frame */
if (vtrack->temp_frame) {
@@ -952,8 +963,9 @@
&got_pic,
&codec->pkt) < 0)
{
- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame");
- continue;
+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered");
+ codec->decoding_delay--;
+ return 1;
}
#if LIBAVCODEC_VERSION_MAJOR >= 54
@@ -976,15 +988,16 @@
codec->buffer,
buffer_size) < 0)
{
- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame");
- continue;
+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered");
+ codec->decoding_delay--;
+ return 1;
}
#endif
if(got_pic)
codec->decoding_delay--;
if((buffer_size <= 0) && !got_pic)
- return 0;
+ return 1;
}
}
@@ -1041,9 +1054,11 @@
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
vtrack->ci.id = LQT_COMPRESSION_D10;
- vtrack->ci.bitrate =
- (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') *
- 10000000;
+ if (quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "AVmp"))
+ vtrack->ci.bitrate = 50000000;
+ else
+ vtrack->ci.bitrate =
+ (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * 10000000;
}
if(codec->avctx->sample_aspect_ratio.num)
@@ -1358,7 +1373,7 @@
codec->avctx->gop_size = 0;
codec->avctx->intra_dc_precision = 2;
codec->avctx->qmin = 1;
- codec->avctx->qmax = 3;
+ codec->avctx->qmax = codec->imx_bitrate == 30 ? 8 : 3;
codec->avctx->rtp_payload_size = 1; // ??
codec->avctx->rc_buffer_aggressivity = 0.25;
codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
@@ -1613,6 +1628,7 @@
#endif
int64_t pts;
int kf;
+ uint8_t* encoded_data;
if(!row_pointers)
{
@@ -1667,7 +1683,12 @@
codec->avctx->height = height;
lqt_ffmpeg_setup_encoding_colormodel(vtrack);
-
+#if ENCODE_VIDEO2
+ codec->frame->width = width;
+ codec->frame->height = height;
+ codec->frame->format = codec->avctx->pix_fmt;
+#endif
+
lqt_get_pixel_aspect(file, track, &pixel_width, &pixel_height);
codec->avctx->sample_aspect_ratio.num = pixel_width;
codec->avctx->sample_aspect_ratio.den = pixel_height;
@@ -1878,6 +1899,7 @@
else
bytes_encoded = 0;
+ encoded_data = pkt.data; // May be different from codec->buffer!
pts = pkt.pts * codec->encoding_pts_factor;
kf = !!(pkt.flags & AV_PKT_FLAG_KEY);
@@ -1891,6 +1913,7 @@
if(bytes_encoded < 0)
return -1;
+ encoded_data = codec->buffer;
pts = codec->avctx->coded_frame->pts * encoding_pts_factor;
kf = codec->avctx->coded_frame->key_frame;
@@ -1916,9 +1939,13 @@
kf);
result = !quicktime_write_data(file,
- codec->buffer,
+ encoded_data,
bytes_encoded);
+#if ENCODE_VIDEO2
+ av_free_packet(&pkt);
+#endif
+
// Must go before lqt_write_frame_header() which increments vtrack->cur_chunk.
// cur_chunk is a frame number in storage order.
maybe_add_sdtp_entry(file, vtrack->cur_chunk, track);
@@ -2346,7 +2373,8 @@
quicktime_match_32(compressor, "mx5p") ||
quicktime_match_32(compressor, "mx3n") ||
quicktime_match_32(compressor, "mx4n") ||
- quicktime_match_32(compressor, "mx5n"))
+ quicktime_match_32(compressor, "mx5n") ||
+ quicktime_match_32(compressor, "AVmp"))
{
vtrack->stream_cmodel = BC_YUV422P;
codec->is_imx = 1;
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libquicktime.spec 15 Aug 2013 10:17:08 -0000 1.35
+++ libquicktime.spec 20 Aug 2013 11:41:25 -0000 1.36
@@ -1,11 +1,12 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
-Release: 8%{?dist}
+Release: 9%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Patch0: libquicktime-backport.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
@@ -56,6 +57,7 @@
%prep
%setup -q
+%patch0 -p0
# --------------------------------------------------------------------
@@ -129,6 +131,9 @@
# --------------------------------------------------------------------
%changelog
+* Tue Aug 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.4-9
+- Fix build with FFmpeg 2.0x
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.4-8
- Rebuilt for FFmpeg 2.0.x
10 years, 11 months
rpms/ffmpeg2theora/devel ffmpeg2theora-backport.patch, NONE, 1.1 ffmpeg2theora.spec, 1.21, 1.22
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg2theora/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28862/devel
Modified Files:
ffmpeg2theora.spec
Added Files:
ffmpeg2theora-backport.patch
Log Message:
Backport support for ffmpeg 2.0x
ffmpeg2theora-backport.patch:
ffmpeg2theora.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE ffmpeg2theora-backport.patch ---
commit d3435a6a83dc656379de9e6523ecf8d565da6ca6
Author: Jan Gerber <j(a)xiph.org>
Date: Sun May 26 15:25:42 2013 +0200
don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
diff --git a/src/ffmpeg2theora.c b/src/ffmpeg2theora.c
index cde63b9..8bebf28 100644
--- a/src/ffmpeg2theora.c
+++ b/src/ffmpeg2theora.c
@@ -47,6 +47,9 @@
#include "ffmpeg2theora.h"
#include "avinfo.h"
+#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+
+
#define LENGTH(x) (sizeof(x) / sizeof(*x))
enum {
@@ -1069,8 +1072,8 @@ void ff2theora_output(ff2theora this) {
int first = 1;
int audio_eos = 0, video_eos = 0, audio_done = 0, video_done = 0;
int ret;
- int16_t *audio_buf=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
- int16_t *resampled=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ int16_t *audio_buf=av_malloc(4*MAX_AUDIO_FRAME_SIZE);
+ int16_t *resampled=av_malloc(4*MAX_AUDIO_FRAME_SIZE);
int16_t *audio_p=NULL;
int no_frames;
int no_samples;
@@ -1531,7 +1534,7 @@ void ff2theora_output(ff2theora this) {
while((audio_eos && !audio_done) || avpkt.size > 0 ) {
int samples=0;
int samples_out=0;
- int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ int data_size = 4*MAX_AUDIO_FRAME_SIZE;
int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt);
if (avpkt.size > 0) {
Index: ffmpeg2theora.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg2theora/devel/ffmpeg2theora.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ffmpeg2theora.spec 15 Aug 2013 10:15:27 -0000 1.21
+++ ffmpeg2theora.spec 20 Aug 2013 10:14:25 -0000 1.22
@@ -2,13 +2,14 @@
Name: ffmpeg2theora
Version: 0.29
-Release: 5%{?posttag}%{?dist}
+Release: 6%{?posttag}%{?dist}
Summary: Convert any file that ffmpeg can decode to theora
Group: Applications/Multimedia
License: GPLv2+
URL: http://v2v.cc/~j/ffmpeg2theora/
Source0: http://v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-%{version}.tar.bz2
+Patch0: ffmpeg2theora-backport.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons
@@ -28,6 +29,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
@@ -53,6 +55,9 @@
%changelog
+* Tue Aug 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.29-6
+- Backport support for ffmpeg 2.0x
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.29-5
- Rebuilt for FFmpeg 2.0.x
10 years, 11 months
rpms/nvidia-173xx-kmod/F-18 fix-build-with-linux-3.10.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.93, 1.94
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6402/F-18
Modified Files:
nvidia-173xx-kmod.spec
Added Files:
fix-build-with-linux-3.10.patch
Log Message:
Update to 3.10 kernel
fix-build-with-linux-3.10.patch:
nv-i2c.c | 13 --
nv-linux.h | 1
nv.c | 376 ++++++++++++++++++++++++++++++++++++++-----------------------
3 files changed, 241 insertions(+), 149 deletions(-)
--- NEW FILE fix-build-with-linux-3.10.patch ---
>From c3248bb6c976c112e9efa9e8f202590b2f9b40a5 Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone(a)canonical.com>
Date: Tue, 18 Jun 2013 15:16:18 +0200
Subject: [PATCH 1/1] Add support for Linux 3.10
---
nv-i2c.c | 13 +--
nv-linux.h | 1 +
nv.c | 375 ++++++++++++++++++++++++++++++++++++++----------------------
3 files changed, 241 insertions(+), 148 deletions(-)
diff --git a/usr/src/nv/nv-i2c.c b/usr/src/nv/nv-i2c.c
index 143f9e4..aaee787 100644
--- a/usr/src/nv/nv-i2c.c
+++ b/usr/src/nv/nv-i2c.c
@@ -307,8 +307,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_state_t *nv, U032 port)
BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
{
struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
- int osstatus = 0;
- BOOL wasReleased = FALSE;
#if defined(KERNEL_2_4)
if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
@@ -320,15 +318,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
- osstatus = i2c_del_adapter(pI2cAdapter);
-
- if (!osstatus)
- {
- os_free_mem(pI2cAdapter);
- wasReleased = TRUE;
- }
+ i2c_del_adapter(pI2cAdapter);
+ os_free_mem(pI2cAdapter);
- return wasReleased;
+ return TRUE;
}
#else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
diff --git a/usr/src/nv/nv-linux.h b/usr/src/nv/nv-linux.h
index 963e059..9aac81a 100644
--- a/usr/src/nv/nv-linux.h
+++ b/usr/src/nv/nv-linux.h
@@ -163,6 +163,7 @@
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
#endif
#ifdef CONFIG_MTRR
diff --git a/usr/src/nv/nv.c b/usr/src/nv/nv.c
index f82e46f..570c266 100644
--- a/usr/src/nv/nv.c
+++ b/usr/src/nv/nv.c
@@ -291,7 +291,6 @@ void NV_API_CALL nv_verify_pci_config(nv_state_t *nv, BOOL check_the_bars)
/* nvos_ functions.. do not take a state device parameter */
static void nvos_proc_create(void);
-static void nvos_proc_remove_all(struct proc_dir_entry *);
static void nvos_proc_remove(void);
static int nvos_count_devices(nv_stack_t *);
@@ -333,12 +332,34 @@ void nv_kern_rc_timer(unsigned long);
static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
#endif
-static int nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
-static int nv_kern_read_status(char *, char **, off_t off, int, int *, void *);
-static int nv_kern_read_registry(char *, char **, off_t off, int, int *, void *);
-static int nv_kern_read_agpinfo(char *, char **, off_t off, int, int *, void *);
-static int nv_kern_read_version(char *, char **, off_t off, int, int *, void *);
-static int nv_kern_read_text_file(char *, char **, off_t off, int, int *, void *);
+static const struct file_operations nv_procfs_text_fops;
+static const struct file_operations nv_procfs_read_card_info_fops;
+static const struct file_operations nv_procfs_version_fops;
+static const struct file_operations nv_procfs_read_agp_info_fops;
+static const struct file_operations nv_procfs_read_agp_info_gpu_fops;
+static const struct file_operations nv_procfs_read_agp_status_fops;
+static const struct file_operations nv_procfs_registry_fops;
+
+static int nv_procfs_show_text_file(struct seq_file *, void *);
+static int nv_procfs_open_text_file(struct inode *, struct file *);
+static void nvos_proc_add_text_file(struct proc_dir_entry *, const char *, const char *);
+
+static int nv_procfs_show_card_info(struct seq_file *, void *);
+static int nv_procfs_read_card_info(struct inode *, struct file *);
+
+static int nv_procfs_show_version(struct seq_file *, void *);
+static int nv_procfs_open_version(struct inode *, struct file *);
+
+static int nv_procfs_show_agp_info(struct seq_file *, void *);
+static int nv_procfs_read_agp_info(struct inode *, struct file *);
+
+static int nv_procfs_read_agp_info_gpu(struct inode *, struct file *file);
+static int nv_procfs_show_agp_status(struct seq_file *, void *);
+static int nv_procfs_read_agp_status(struct inode *, struct file *);
+
+static int nv_procfs_show_registry(struct seq_file *, void *);
+static int nv_procfs_open_registry(struct inode *, struct file *);
+
int nv_kern_ctl_open(struct inode *, struct file *);
int nv_kern_ctl_close(struct inode *, struct file *);
@@ -604,6 +625,12 @@ static struct pci_dev* nv_get_pci_device(nv_state_t *nv)
return NULL;
}
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
+static inline void *PDE_DATA(const struct inode *inode) {
+ return PDE(inode)->data;
+}
+#endif
+
static void nvos_proc_create(void)
{
#ifdef CONFIG_PROC_FS
@@ -623,19 +650,19 @@ static void nvos_proc_create(void)
nv_state_t *nv;
nv_linux_state_t *nvl;
- proc_nvidia = create_proc_entry("driver/nvidia", d_flags, NULL);
+ proc_nvidia = proc_mkdir_mode("driver/nvidia", d_flags, NULL);
if (!proc_nvidia)
goto failed;
- proc_nvidia_cards = create_proc_entry("cards", d_flags, proc_nvidia);
+ proc_nvidia_cards = proc_mkdir_mode("cards", d_flags, proc_nvidia);
if (!proc_nvidia_cards)
goto failed;
- proc_nvidia_warnings = create_proc_entry("warnings", d_flags, proc_nvidia);
+ proc_nvidia_warnings = proc_mkdir_mode("warnings", d_flags, proc_nvidia);
if (!proc_nvidia_warnings)
goto failed;
- proc_nvidia_patches = create_proc_entry("patches", d_flags, proc_nvidia);
+ proc_nvidia_patches = proc_mkdir_mode("patches", d_flags, proc_nvidia);
if (!proc_nvidia_patches)
goto failed;
@@ -660,24 +687,19 @@ static void nvos_proc_create(void)
break;
sprintf(name, "%d", i++);
- entry = create_proc_entry(name, flags, proc_nvidia_cards);
+ entry = proc_create_data(name, flags, proc_nvidia_cards,
+ &nv_procfs_read_card_info_fops, nv);
if (!entry) {
NV_PCI_DEV_PUT(dev);
goto failed;
}
- entry->data = nv;
- entry->read_proc = nv_kern_read_cardinfo;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
-
if (nvos_find_agp_capability(dev)) {
/*
* Create the /proc/driver/nvidia/agp/{status,host-bridge,card}
* entries now that we know there's AGP hardware.
*/
- entry = create_proc_entry("agp", d_flags, proc_nvidia);
+ entry = proc_mkdir_mode("agp", d_flags, proc_nvidia);
if (!entry) {
NV_PCI_DEV_PUT(dev);
goto failed;
@@ -688,72 +710,78 @@ static void nvos_proc_create(void)
#endif
proc_nvidia_agp = entry;
- entry = create_proc_entry("status", flags, proc_nvidia_agp);
+ entry = proc_create_data("status", flags, proc_nvidia_agp,
+ &nv_procfs_read_agp_status_fops, nv);
if (!entry) {
NV_PCI_DEV_PUT(dev);
goto failed;
}
- entry->data = nv;
- entry->read_proc = nv_kern_read_status;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
+ entry = proc_create("host-bridge", flags, proc_nvidia_agp,
+ &nv_procfs_read_agp_info_fops);
- entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
if (!entry) {
NV_PCI_DEV_PUT(dev);
goto failed;
}
- entry->data = NULL;
- entry->read_proc = nv_kern_read_agpinfo;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
-
- entry = create_proc_entry("card", flags, proc_nvidia_agp);
+ entry = proc_create_data("card", flags, proc_nvidia_agp,
+ &nv_procfs_read_agp_info_gpu_fops, nv);
if (!entry) {
NV_PCI_DEV_PUT(dev);
goto failed;
}
- entry->data = nv;
- entry->read_proc = nv_kern_read_agpinfo;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
}
NV_PCI_DEV_PUT(dev);
}
- entry = create_proc_entry("version", flags, proc_nvidia);
+ entry = proc_create("version", flags, proc_nvidia, &nv_procfs_version_fops);
if (!entry)
goto failed;
- entry->read_proc = nv_kern_read_version;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
-
- entry = create_proc_entry("registry", flags, proc_nvidia);
+ entry = proc_create("registry", flags, proc_nvidia,
+ &nv_procfs_registry_fops);
if (!entry)
goto failed;
- entry->read_proc = nv_kern_read_registry;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
-
return;
failed:
nv_printf(NV_DBG_ERRORS, "NVRM: failed to create /proc entries!\n");
- nvos_proc_remove_all(proc_nvidia);
+ remove_proc_subtree("nvidia", proc_nvidia);
#endif
}
+static int
+nv_procfs_show_text_file(
+ struct seq_file *m,
+ void *v
+)
+{
+ seq_printf(m, "%s", (char *)m->private);
+
+ return 0;
+}
+
+static int
+nv_procfs_open_text_file(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
+}
+
+static const struct file_operations nv_procfs_text_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_text_file,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static void
nvos_proc_add_text_file(
struct proc_dir_entry *parent,
@@ -762,41 +790,18 @@ nvos_proc_add_text_file(
)
{
#ifdef CONFIG_PROC_FS
- struct proc_dir_entry *entry;
-
/* world readable file */
int flags = S_IFREG | S_IRUGO;
- entry = create_proc_entry(filename, flags, parent);
- if (!entry) return;
-
- entry->data = (void *)text;
- entry->read_proc = nv_kern_read_text_file;
-#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
- entry->owner = THIS_MODULE;
-#endif
+ proc_create_data(filename, flags, parent, &nv_procfs_text_fops,
+ (void *)text);
#endif
}
-#ifdef CONFIG_PROC_FS
-static void nvos_proc_remove_all(struct proc_dir_entry *entry)
-{
- while (entry) {
- struct proc_dir_entry *next = entry->next;
- if (entry->subdir)
- nvos_proc_remove_all(entry->subdir);
- remove_proc_entry(entry->name, entry->parent);
- if (entry == proc_nvidia)
- break;
- entry = next;
- }
-}
-#endif
-
static void nvos_proc_remove(void)
{
#ifdef CONFIG_PROC_FS
- nvos_proc_remove_all(proc_nvidia);
+ remove_proc_subtree("nvidia", proc_nvidia);
#endif
}
@@ -3065,18 +3070,19 @@ void NV_API_CALL nv_set_dma_address_size(
}
static int
-nv_kern_read_cardinfo(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_show_card_info(
+ struct seq_file *m,
+ void *v
+)
{
struct pci_dev *dev;
char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
- int len = 0, status;
+ int status;
U032 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
nv_stack_t *sp = NULL;
nv_state_t *nv;
- nv = (nv_state_t *) data;
- *eof = 1;
+ nv = (nv_state_t *) m->private;
dev = nv_get_pci_device(nv);
if (!dev)
@@ -3094,38 +3100,38 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
strcpy (tmpstr, "Unknown");
}
- len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
- len += sprintf(page+len, "IRQ: \t\t %d\n", nv->interrupt_line);
+ seq_printf(m, "Model: \t\t %s\n", tmpstr);
+ seq_printf(m, "IRQ: \t\t %d\n", nv->interrupt_line);
status = rm_get_vbios_version(sp, nv, &vbios_rev1, &vbios_rev2,
&vbios_rev3, &vbios_rev4, &vbios_rev5);
if (status < 0) {
/* before rm_init_adapter */
- len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
+ seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
} else {
fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
- len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
+ seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
vbios_rev4, vbios_rev5);
}
if (nvos_find_agp_capability(dev)) type = "AGP";
else if (nvos_find_pci_express_capability(dev)) type = "PCI-E";
else type = "PCI";
- len += sprintf(page+len, "Card Type: \t %s\n", type);
+ seq_printf(m, "Card Type: \t %s\n", type);
// Report the number of bits set in dev->dma_mask
- len += sprintf(page+len, "DMA Size: \t %d bits\n",
+ seq_printf(m, "DMA Size: \t %d bits\n",
nv_count_bits(dev->dma_mask));
- len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
- len += sprintf(page+len, "Bus Location: \t %02x.%02x.%x\n",
+ seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
+ seq_printf(m, "Bus Location: \t %02x.%02x.%x\n",
nv->bus, nv->slot, PCI_FUNC(dev->devfn));
#ifdef DEBUG
do
{
int j;
for (j = 0; j < NV_GPU_NUM_BARS; j++)
- len += sprintf(page+len, "BAR%i: \t\t 0x%08x (%iMB)\n",
+ seq_printf(m, "BAR%i: \t\t 0x%08x (%iMB)\n",
j, nv->bars[j].address, nv->bars[j].size >> 20);
} while(0);
#endif
@@ -3133,35 +3139,68 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
NV_KMEM_CACHE_FREE_STACK(sp);
NV_PCI_DEV_PUT(dev);
- return len;
+ return 0;
+}
+
+static int
+nv_procfs_read_card_info(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_card_info, PDE_DATA(inode));
}
+static const struct file_operations nv_procfs_read_card_info_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_read_card_info,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static int
-nv_kern_read_version(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_show_version(
+ struct seq_file *m,
+ void *v
+)
{
- int len = 0;
- *eof = 1;
-
- len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
- len += sprintf(page+len, "GCC version: %s\n", NV_COMPILER);
-
- return len;
+ seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
+ seq_printf(m, "GCC version: %s\n", NV_COMPILER);
+
+ return 0;
+}
+
+static int
+nv_procfs_open_version(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_version, NULL);
}
+static const struct file_operations nv_procfs_version_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_version,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static int
-nv_kern_read_agpinfo(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_show_agp_info(
+ struct seq_file *m,
+ void *v
+)
{
struct pci_dev *dev;
char *fw, *sba;
u8 cap_ptr;
u32 status, command, agp_rate;
- int len = 0;
nv_state_t *nv;
- nv = (nv_state_t *) data;
- *eof = 1;
+ nv = (nv_state_t *) m->private;
if (nv) {
dev = nv_get_pci_device(nv);
@@ -3172,12 +3211,12 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
if (!dev)
return 0;
- len += sprintf(page+len, "Host Bridge: \t ");
+ seq_printf(m, "Host Bridge: \t ");
#if defined(CONFIG_PCI_NAMES)
- len += sprintf(page+len, "%s\n", NV_PCI_DEVICE_NAME(dev));
+ seq_printf(m, "%s\n", NV_PCI_DEVICE_NAME(dev));
#else
- len += sprintf(page+len, "PCI device %04x:%04x\n",
+ seq_printf(m, "PCI device %04x:%04x\n",
dev->vendor, dev->device);
#endif
}
@@ -3191,40 +3230,74 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
fw = (status & 0x00000010) ? "Supported" : "Not Supported";
sba = (status & 0x00000200) ? "Supported" : "Not Supported";
- len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
- len += sprintf(page+len, "SBA: \t\t %s\n", sba);
+ seq_printf(m, "Fast Writes: \t %s\n", fw);
+ seq_printf(m, "SBA: \t\t %s\n", sba);
agp_rate = status & 0x7;
if (status & 0x8) // agp 3.0
agp_rate <<= 2;
- len += sprintf(page+len, "AGP Rates: \t %s%s%s%s\n",
+ seq_printf(m, "AGP Rates: \t %s%s%s%s\n",
(agp_rate & 0x00000008) ? "8x " : "",
(agp_rate & 0x00000004) ? "4x " : "",
(agp_rate & 0x00000002) ? "2x " : "",
(agp_rate & 0x00000001) ? "1x " : "");
- len += sprintf(page+len, "Registers: \t 0x%08x:0x%08x\n", status, command);
+ seq_printf(m, "Registers: \t 0x%08x:0x%08x\n", status, command);
NV_PCI_DEV_PUT(dev);
- return len;
+ return 0;
+}
+
+static int
+nv_procfs_read_agp_info(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_agp_info, NULL);
}
+static const struct file_operations nv_procfs_read_agp_info_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_read_agp_info,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static int
-nv_kern_read_status(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_read_agp_info_gpu(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_agp_info, PDE_DATA(inode));
+}
+
+static const struct file_operations nv_procfs_read_agp_info_gpu_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_read_agp_info_gpu,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static int
+nv_procfs_show_agp_status(
+ struct seq_file *m,
+ void *v
+)
{
struct pci_dev *dev;
char *fw, *sba, *drv;
- int len = 0;
u8 cap_ptr;
u32 scratch;
u32 status, command, agp_rate;
nv_stack_t *sp = NULL;
nv_state_t *nv;
- nv = (nv_state_t *) data;
- *eof = 1;
+ nv = (nv_state_t *) m->private;
dev = nvos_get_agp_device_by_class(PCI_CLASS_BRIDGE_HOST);
if (!dev)
@@ -3246,10 +3319,10 @@ nv_kern_read_status(char *page, char **start, off_t off,
command &= scratch;
if (NV_AGP_ENABLED(nv) && (command & 0x100)) {
- len += sprintf(page+len, "Status: \t Enabled\n");
+ seq_printf(m, "Status: \t Enabled\n");
drv = NV_OSAGP_ENABLED(nv) ? "AGPGART" : "NVIDIA";
- len += sprintf(page+len, "Driver: \t %s\n", drv);
+ seq_printf(m, "Driver: \t %s\n", drv);
// mask off agp rate.
// If this is agp 3.0, we need to shift the value
@@ -3257,13 +3330,13 @@ nv_kern_read_status(char *page, char **start, off_t off,
if (status & 0x8) // agp 3.0
agp_rate <<= 2;
- len += sprintf(page+len, "AGP Rate: \t %dx\n", agp_rate);
+ seq_printf(m, "AGP Rate: \t %dx\n", agp_rate);
fw = (command & 0x00000010) ? "Enabled" : "Disabled";
- len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
+ seq_printf(m, "Fast Writes: \t %s\n", fw);
sba = (command & 0x00000200) ? "Enabled" : "Disabled";
- len += sprintf(page+len, "SBA: \t\t %s\n", sba);
+ seq_printf(m, "SBA: \t\t %s\n", sba);
} else {
int agp_config = 0;
@@ -3274,7 +3347,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
return 0;
}
- len += sprintf(page+len, "Status: \t Disabled\n\n");
+ seq_printf(m, "Status: \t Disabled\n\n");
/*
* If we find AGP is disabled, but the RM registry indicates it
@@ -3288,7 +3361,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
rm_read_registry_dword(sp, nv, "NVreg", "XNvAGP", &agp_config);
if (agp_config != NVOS_AGP_CONFIG_DISABLE_AGP && NV_AGP_FAILED(nv)) {
- len += sprintf(page+len,
+ seq_printf(m,
"AGP initialization failed, please check the ouput \n"
"of the 'dmesg' command and/or your system log file \n"
"for additional information on this problem. \n");
@@ -3298,37 +3371,63 @@ nv_kern_read_status(char *page, char **start, off_t off,
}
NV_PCI_DEV_PUT(dev);
- return len;
+ return 0;
+}
+
+static int
+nv_procfs_read_agp_status(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_agp_status, PDE_DATA(inode));
}
+static const struct file_operations nv_procfs_read_agp_status_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_read_agp_status,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
extern nv_parm_t nv_parms[];
extern char *NVreg_RegistryDwords;
static int
-nv_kern_read_registry(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_show_registry(
+ struct seq_file *m,
+ void *v
+)
{
- unsigned int i, len = 0;
+ unsigned int i;
nv_parm_t *entry;
- *eof = 1;
for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
- len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
+ seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
+ seq_printf(m, "RegistryDwords: \"%s\"\n",
(NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
- return len;
+ return 0;
}
static int
-nv_kern_read_text_file(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+nv_procfs_open_registry(
+ struct inode *inode,
+ struct file *file
+)
{
- *eof = 1;
- return sprintf(page, "%s", (char *)data);
+ return single_open(file, nv_procfs_show_registry, NULL);
}
+static const struct file_operations nv_procfs_registry_fops = {
+ .open = nv_procfs_open_registry,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
/***
*** EXPORTS to rest of resman
***/
--
1.7.9.5
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/nvidia-173xx-kmod.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- nvidia-173xx-kmod.spec 16 Aug 2013 18:15:03 -0000 1.93
+++ nvidia-173xx-kmod.spec 19 Aug 2013 16:08:12 -0000 1.94
@@ -3,12 +3,12 @@
# "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
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-173xx-kmod
Version: 173.14.37
# Taken over by kmodtool
-Release: 1%{?dist}.12
+Release: 2%{?dist}.4
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@
# http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
Source0: nvidia-kmod-data-%{version}.tar.bz2
+Patch0: fix-build-with-linux-3.10.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,7 +46,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-echo "Nothing to patch"
+%patch0 -p1
popd
done
@@ -89,16 +90,22 @@
%changelog
-* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.12
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2.4
- Rebuilt for kernel
-* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.11
+* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2.3
- Rebuilt for kernel
-* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.10
+* Thu Aug 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2.2
- Rebuilt for kernel
-* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.9
+* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2.1
+- Rebuilt for kernel
+
+* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.37-2
+- patch for 3.10 kernel
+
+* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.9
- Rebuilt for kernel
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1.8
10 years, 11 months
rpms/wl-kmod/F-18 wl-kmod.spec,1.113,1.114
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10918
Modified Files:
wl-kmod.spec
Log Message:
SPEC file changelog section cleaned-up
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- wl-kmod.spec 17 Aug 2013 11:28:54 -0000 1.113
+++ wl-kmod.spec 17 Aug 2013 21:38:54 -0000 1.114
@@ -105,56 +105,128 @@
%changelog
* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.6
- Rebuilt for kernel
+- Added patch to build for kernel >= 3.10
-* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.5
+* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
- Rebuilt for kernel
-* Thu Aug 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.4
+* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.7
- Rebuilt for kernel
-* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.3
+* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
- Rebuilt for kernel
-* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.1
+* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.5
- Rebuilt for kernel
-* Tue Jul 23 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
-- Added patch to build for kernel >= 3.10
+* Mon Jun 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.4
+- Rebuilt for kernel
-* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
+* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.3
- Rebuilt for kernel
-* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.7
+* Sat May 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.2
- Rebuilt for kernel
-* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
+* Wed May 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.1
- Rebuilt for kernel
-* Sat Jun 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.5
+* Tue May 14 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
+- Added patch to build for kernel >= 3.9
+
+* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.12
- Rebuilt for kernel
-* Fri Jun 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.4
-- Rebuilt for current f19 kernel
+* Fri May 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.11
+- Rebuilt for kernel
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.3
-- Rebuilt for current f19 kernel
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.10
+- Rebuilt for kernel
+
+* Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.9
+Rebuilt for kernel
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.2
+* Thu Apr 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.8
- Rebuilt for kernel
-* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.1
+* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.7
- Rebuilt for kernel
-* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
-- Modified patch to build for kernel >= 3.8 rfbz#2715
-- Modified patch to build for kernel >= 3.9
+* Sat Apr 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.6
+- Rebuilt for kernel
-* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
-- Added patch to build for kernel >= 3.9
+* Wed Apr 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.5
+- Rebuilt for kernel
+
+* Tue Apr 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.4
+- Rebuilt for kernel
+
+* Fri Mar 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.3
+- Rebuilt for kernel
+
+* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.2
+- Rebuilt for kernel
+
+* Fri Mar 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.1
+- Rebuilt for kernel
+
+* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-8.1
+- Rebuilt for kernel
+
+* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
+- Modified patch to build for kernel >= 3.8 rfbz#2715
* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
+* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.16
+- Rebuilt for kernel
+
+* Tue Feb 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.15
+- Rebuilt for kernel
+
+* Thu Feb 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.14
+- Rebuilt for kernel
+
+* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.13
+- Rebuilt for kernel
+
+* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.12
+- Rebuilt for kernel
+
+* Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.11
+- Rebuilt for kernel
+
+* Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.10
+- Rebuilt for kernel
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.9
+- Rebuilt for updated kernel
+
+* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.8
+- Rebuilt for updated kernel
+
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.7
+- Rebuilt for updated kernel
+
+* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.6
+- Rebuilt for updated kernel
+
+* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.5
+- Rebuilt for updated kernel
+
+* Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.4
+- Rebuilt for f18 final kernel
+
+* Fri Dec 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.3
+- Rebuilt for current f18 kernel
+
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.2
+- Rebuilt for current f18 kernel
+
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.1
+- Rebuilt for Fedora 18 Beta kernel
+
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
@@ -170,7 +242,7 @@
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
-* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
+* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4
- Added patch to build with CFG80211 API as default for F-17
* Sun Jun 24 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
10 years, 11 months
rpms/wl-kmod/F-18 broadcom-wl-5.100.82.112-kernel-3.10.patch, NONE, 1.1 wl-kmod.spec, 1.112, 1.113
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15838/F-18
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.10.patch
Log Message:
Sync with F-19
broadcom-wl-5.100.82.112-kernel-3.10.patch:
wl_linux.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.10.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-11-07 17:59:01.000000000 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2013-07-03 07:52:45.570402687 +0200
@@ -2964,7 +2964,7 @@
void
wl_tkip_printstats(wl_info_t *wl, bool group_key)
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
char debug_buf[512];
int idx;
if (wl->tkipmodops) {
@@ -3123,11 +3123,19 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static int
+wl_proc_read(struct seq_file *seq, void *offset)
+{
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int bcmerror, to_user;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
int len;
if (offset > 0) {
@@ -3139,17 +3147,33 @@
WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
return 0;
}
+#endif
WL_LOCK(wl);
bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
len = sprintf(buffer, "%d\n", to_user);
+#endif
WL_UNLOCK(wl);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return len;
+#else
+ seq_printf(seq, "%d\n", to_user);
+ return bcmerror;
+#endif
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_write(struct file *filp, const char __user *buff, unsigned long length, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static ssize_t
+wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *ppos)
+{
+ struct seq_file *seq = filp->private_data;
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int from_user = 0;
int bcmerror;
@@ -3160,7 +3184,11 @@
}
if (copy_from_user(&from_user, buff, 1)) {
WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return -EIO;
+#else
+ return -EFAULT;
+#endif
}
if (from_user >= 0x30)
@@ -3174,21 +3202,47 @@
WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
return -EIO;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ *ppos += length;
+#endif
return length;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+static int wl_proc_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, wl_proc_read, PDE_DATA(inode));
+}
+
+static const struct file_operations wl_fops = {
+ .owner = THIS_MODULE,
+ .open = wl_proc_open,
+ .read = seq_read,
+ .write = wl_proc_write,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+#endif
+
static int
wl_reg_proc_entry(wl_info_t *wl)
{
char tmp[32];
sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
+#else
+ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
+ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
+#endif
ASSERT(0);
return -1;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
wl->proc_entry->read_proc = wl_proc_read;
wl->proc_entry->write_proc = wl_proc_write;
wl->proc_entry->data = wl;
+#endif
return 0;
}
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- wl-kmod.spec 16 Aug 2013 18:15:43 -0000 1.112
+++ wl-kmod.spec 17 Aug 2013 11:28:54 -0000 1.113
@@ -3,11 +3,11 @@
# "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
-%global buildforkernels newest
+#global buildforkernels newest
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}.11
+Release: 11%{?dist}.6
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@
Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
Patch8: broadcom-wl-5.100.82.112-kernel-3.8.patch
Patch9: broadcom-wl-5.100.82.112-kernel-3.9.patch
+Patch10: broadcom-wl-5.100.82.112-kernel-3.10.patch
BuildRequires: %{_bindir}/kmodtool
@@ -62,16 +63,17 @@
%else
tar xzf %{SOURCE1}
%endif
-%patch0 -p1 -b .license
-%patch1 -p1 -b .kernel-3.2
-%patch2 -p1 -b .kernel-3.4
-%patch3 -p1 -b .cfg80211
-%patch4 -p1 -b .kernel-3.6
-%patch5 -p1 -b .recent_kernel_semaphore
-%patch6 -p1 -b .recent_kernel_ioctl
-%patch7 -p1 -b .wext_workaround.patch
-%patch8 -p1 -b .kernel-3.8
-%patch9 -p1 -b .kernel-3.9
+%patch0 -p1 -b .license
+%patch1 -p1 -b .kernel-3.2
+%patch2 -p1 -b .kernel-3.4
+%patch3 -p1 -b .cfg80211
+%patch4 -p1 -b .kernel-3.6
+%patch5 -p1 -b .recent_kernel_semaphore
+%patch6 -p1 -b .recent_kernel_ioctl
+%patch7 -p1 -b .wext_workaround.patch
+%patch8 -p1 -b .kernel-3.8
+%patch9 -p1 -b .kernel-3.9
+%patch10 -p1 -b .kernel-3.10
popd
for kernel_version in %{?kernel_versions} ; do
@@ -101,135 +103,58 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.11
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.6
- Rebuilt for kernel
-* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.10
+* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.5
- Rebuilt for kernel
-* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.9
+* Thu Aug 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.4
- Rebuilt for kernel
-* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
+* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.3
- Rebuilt for kernel
-* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.7
+* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.1
- Rebuilt for kernel
-* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
-- Rebuilt for kernel
-
-* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.5
-- Rebuilt for kernel
-
-* Mon Jun 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.4
-- Rebuilt for kernel
-
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.3
-- Rebuilt for kernel
-
-* Sat May 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.2
-- Rebuilt for kernel
-
-* Wed May 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.1
-- Rebuilt for kernel
-
-* Tue May 14 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
-- Added patch to build for kernel >= 3.9
-
-* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.12
-- Rebuilt for kernel
+* Tue Jul 23 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
+- Added patch to build for kernel >= 3.10
-* Fri May 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.11
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
- Rebuilt for kernel
-* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.10
+* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.7
- Rebuilt for kernel
-* Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.9
-Rebuilt for kernel
-
-* Thu Apr 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.8
+* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.6
- Rebuilt for kernel
-* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.7
+* Sat Jun 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.5
- Rebuilt for kernel
-* Sat Apr 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.6
-- Rebuilt for kernel
-
-* Wed Apr 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.5
-- Rebuilt for kernel
+* Fri Jun 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.4
+- Rebuilt for current f19 kernel
-* Tue Apr 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.4
-- Rebuilt for kernel
-
-* Fri Mar 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.3
-- Rebuilt for kernel
-
-* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.2
-- Rebuilt for kernel
+* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.3
+- Rebuilt for current f19 kernel
-* Fri Mar 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-9.1
+* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.2
- Rebuilt for kernel
-* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-8.1
+* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.1
- Rebuilt for kernel
-* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
+* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
- Modified patch to build for kernel >= 3.8 rfbz#2715
+- Modified patch to build for kernel >= 3.9
+
+* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
+- Added patch to build for kernel >= 3.9
* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
-* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.16
-- Rebuilt for kernel
-
-* Tue Feb 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.15
-- Rebuilt for kernel
-
-* Thu Feb 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.14
-- Rebuilt for kernel
-
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.13
-- Rebuilt for kernel
-
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.12
-- Rebuilt for kernel
-
-* Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.11
-- Rebuilt for kernel
-
-* Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.10
-- Rebuilt for kernel
-
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.9
-- Rebuilt for updated kernel
-
-* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.8
-- Rebuilt for updated kernel
-
-* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.7
-- Rebuilt for updated kernel
-
-* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.6
-- Rebuilt for updated kernel
-
-* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.5
-- Rebuilt for updated kernel
-
-* Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.4
-- Rebuilt for f18 final kernel
-
-* Fri Dec 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.3
-- Rebuilt for current f18 kernel
-
-* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.2
-- Rebuilt for current f18 kernel
-
-* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.1
-- Rebuilt for Fedora 18 Beta kernel
-
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
@@ -245,7 +170,7 @@
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
-* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4
+* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
- Added patch to build with CFG80211 API as default for F-17
* Sun Jun 24 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
10 years, 11 months
rpms/wl-kmod/F-18 wl-kmod.spec,1.111,1.112
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30430
Modified Files:
wl-kmod.spec
Log Message:
* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.11
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- wl-kmod.spec 13 Aug 2013 07:39:22 -0000 1.111
+++ wl-kmod.spec 16 Aug 2013 18:15:43 -0000 1.112
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}.10
+Release: 10%{?dist}.11
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -101,6 +101,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.11
+- Rebuilt for kernel
+
* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.10
- Rebuilt for kernel
10 years, 11 months
rpms/nvidia-kmod/F-18 nvidia-kmod.spec,1.159,1.160
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30298
Modified Files:
nvidia-kmod.spec
Log Message:
* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.2
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- nvidia-kmod.spec 13 Aug 2013 07:39:08 -0000 1.159
+++ nvidia-kmod.spec 16 Aug 2013 18:15:29 -0000 1.160
@@ -9,7 +9,7 @@
Epoch: 1
Version: 319.32
# Taken over by kmodtool
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -78,6 +78,9 @@
%changelog
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.2
+- Rebuilt for kernel
+
* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.1
- Rebuilt for kernel
10 years, 11 months
rpms/nvidia-304xx-kmod/F-18 nvidia-304xx-kmod.spec,1.10,1.11
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30177
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-2.2
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18/nvidia-304xx-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nvidia-304xx-kmod.spec 13 Aug 2013 07:38:55 -0000 1.10
+++ nvidia-304xx-kmod.spec 16 Aug 2013 18:15:17 -0000 1.11
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.88
# Taken over by kmodtool
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-2.2
+- Rebuilt for kernel
+
* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-2.1
- Rebuilt for kernel
10 years, 11 months