rpms/sdlmame-data-samples/devel sdlmame-data-samples.spec, 1.2, 1.3 sources, 1.2, 1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16070
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
- Added cosmica
- Updated the URL
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/devel/sdlmame-data-samples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmame-data-samples.spec 30 Jul 2008 16:28:36 -0000 1.2
+++ sdlmame-data-samples.spec 9 Mar 2009 11:04:45 -0000 1.3
@@ -1,17 +1,17 @@
Name: sdlmame-data-samples
-Version: 0126
-Release: 2%{?dist}
+Version: 0129
+Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
Group: Amusements/Games
License: Distributable
-URL: http://www.mameworld.net/samples
+URL: http://samples.mameworld.info
Source0: sdlmame-samples.tar
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: sdlmame >= 0126
+Requires: sdlmame >= 0129
%description
%{summary}.
@@ -41,6 +41,10 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
+- Added cosmica
+- Updated the URL
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0126-2
- rebuild for buildsys cflags issue
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jul 2008 11:20:14 -0000 1.2
+++ sources 9 Mar 2009 11:04:45 -0000 1.3
@@ -1 +1 @@
-14cbe838a8f242b8ddbdd5b2c758466e sdlmame-samples.tar
+5f05530db3c6b260cbe9bd9f8832da83 sdlmame-samples.tar
15 years, 1 month
rpms/dvdstyler/F-9 .cvsignore, 1.3, 1.4 dvdstyler.spec, 1.4, 1.5 sources, 1.3, 1.4
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15609/F-9
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
- Remove dependency on totem-backend (#366)
- Update to 1.7.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Nov 2008 04:50:39 -0000 1.3
+++ .cvsignore 9 Mar 2009 01:11:40 -0000 1.4
@@ -1 +1 @@
-DVDStyler-1.7.1.tar.bz2
+DVDStyler-1.7.2.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-9/dvdstyler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdstyler.spec 24 Jan 2009 21:42:51 -0000 1.4
+++ dvdstyler.spec 9 Mar 2009 01:11:40 -0000 1.5
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 1.7.1
-Release: 3%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -17,6 +17,7 @@
BuildRequires: wxsvg-devel >= 1.0-6
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
+BuildRequires: zip
# mpeg
BuildRequires: mpgtx
BuildRequires: mjpegtools
@@ -30,6 +31,7 @@
BuildRequires: netpbm-progs
# finally
BuildRequires: desktop-file-utils
+BuildRequires: xmlto
Requires: dvd+rw-tools
Requires: dvdauthor
@@ -38,8 +40,8 @@
Requires: mpgtx
Requires: netpbm-progs
Requires: wxsvg >= 1.0-6
-# Don't care what backend, but we need one to preview DVDs.
-Requires: totem-backend
+# note: do not add Require: totem-backend or another DVD player - see
+# RPM Fusion bug 366 for more details
%description
DVDStyler is a cross-platform DVD authoring application that makes possible for
@@ -87,6 +89,10 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
+- Remove dependency on totem-backend (#366)
+- Update to 1.7.2
+
* Sat Jan 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-4
- Remove wxsvg_freeworld patch
- desktop and icon files now install correctly, don't install them manually
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Dec 2008 19:41:19 -0000 1.3
+++ sources 9 Mar 2009 01:11:40 -0000 1.4
@@ -1 +1 @@
-035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2
+a4480a4193e6df0041215e07ccfefc3a DVDStyler-1.7.2.tar.bz2
15 years, 1 month
rpms/dvdstyler/F-10 .cvsignore, 1.4, 1.5 dvdstyler.spec, 1.5, 1.6 sources, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15580/F-10
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
- Remove dependency on totem-backend (#366)
- Update to 1.7.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Nov 2008 04:50:39 -0000 1.4
+++ .cvsignore 9 Mar 2009 01:11:35 -0000 1.5
@@ -1 +1 @@
-DVDStyler-1.7.1.tar.bz2
+DVDStyler-1.7.2.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-10/dvdstyler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdstyler.spec 24 Jan 2009 21:42:51 -0000 1.5
+++ dvdstyler.spec 9 Mar 2009 01:11:35 -0000 1.6
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 1.7.1
-Release: 4%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -17,6 +17,7 @@
BuildRequires: wxsvg-devel >= 1.0-6
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
+BuildRequires: zip
# mpeg
BuildRequires: mpgtx
BuildRequires: mjpegtools
@@ -30,6 +31,7 @@
BuildRequires: netpbm-progs
# finally
BuildRequires: desktop-file-utils
+BuildRequires: xmlto
Requires: dvd+rw-tools
Requires: dvdauthor
@@ -38,8 +40,8 @@
Requires: mpgtx
Requires: netpbm-progs
Requires: wxsvg >= 1.0-6
-# Don't care what backend, but we need one to preview DVDs.
-Requires: totem-backend
+# note: do not add Require: totem-backend or another DVD player - see
+# RPM Fusion bug 366 for more details
%description
DVDStyler is a cross-platform DVD authoring application that makes possible for
@@ -87,6 +89,10 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
+- Remove dependency on totem-backend (#366)
+- Update to 1.7.2
+
* Sat Jan 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-4
- Remove wxsvg_freeworld patch
- desktop and icon files now install correctly, don't install them manually
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2008 19:41:18 -0000 1.5
+++ sources 9 Mar 2009 01:11:35 -0000 1.6
@@ -1 +1 @@
-035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2
+a4480a4193e6df0041215e07ccfefc3a DVDStyler-1.7.2.tar.bz2
15 years, 1 month
rpms/dvdstyler/devel .cvsignore, 1.4, 1.5 dvdstyler.spec, 1.5, 1.6 sources, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/dvdstyler/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15542/devel
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
- Remove dependency on totem-backend (#366)
- Update to 1.7.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Nov 2008 04:50:39 -0000 1.4
+++ .cvsignore 9 Mar 2009 01:11:29 -0000 1.5
@@ -1 +1 @@
-DVDStyler-1.7.1.tar.bz2
+DVDStyler-1.7.2.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdstyler.spec 24 Jan 2009 21:42:51 -0000 1.5
+++ dvdstyler.spec 9 Mar 2009 01:11:29 -0000 1.6
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 1.7.1
-Release: 4%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -17,6 +17,7 @@
BuildRequires: wxsvg-devel >= 1.0-6
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
+BuildRequires: zip
# mpeg
BuildRequires: mpgtx
BuildRequires: mjpegtools
@@ -30,6 +31,7 @@
BuildRequires: netpbm-progs
# finally
BuildRequires: desktop-file-utils
+BuildRequires: xmlto
Requires: dvd+rw-tools
Requires: dvdauthor
@@ -38,8 +40,8 @@
Requires: mpgtx
Requires: netpbm-progs
Requires: wxsvg >= 1.0-6
-# Don't care what backend, but we need one to preview DVDs.
-Requires: totem-backend
+# note: do not add Require: totem-backend or another DVD player - see
+# RPM Fusion bug 366 for more details
%description
DVDStyler is a cross-platform DVD authoring application that makes possible for
@@ -87,6 +89,10 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Mar 8 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.2-1
+- Remove dependency on totem-backend (#366)
+- Update to 1.7.2
+
* Sat Jan 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.1-4
- Remove wxsvg_freeworld patch
- desktop and icon files now install correctly, don't install them manually
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2008 19:41:19 -0000 1.5
+++ sources 9 Mar 2009 01:11:29 -0000 1.6
@@ -1 +1 @@
-035aa8631f1e063e68401fdd8543d98f DVDStyler-1.7.1.tar.bz2
+a4480a4193e6df0041215e07ccfefc3a DVDStyler-1.7.2.tar.bz2
15 years, 1 month
rpms/ffmpeg/F-10 ffmpeg.spec,1.10,1.11
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8355
Modified Files:
ffmpeg.spec
Log Message:
reorder changelog lines in last entry
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ffmpeg.spec 8 Mar 2009 21:58:08 -0000 1.10
+++ ffmpeg.spec 8 Mar 2009 23:02:44 -0000 1.11
@@ -263,11 +263,11 @@
%changelog
* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20080908
-- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
-- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
- backport support for Dirac in Matroska
- add comments for all patches
- enable yasm on x86_64, fix resulting textrels
+- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
+- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
- drop --disable-optimizations from configure call (loses performance)
- drop obsolete patch
15 years, 1 month
rpms/ffmpeg/F-9 ffmpeg-r15415.patch, NONE, 1.1 ffmpeg-r16080.patch, NONE, 1.1 ffmpeg.spec, 1.5, 1.6
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6974
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-r15415.patch ffmpeg-r16080.patch
Log Message:
* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.51.20080908
- backport support for Dirac in Matroska
- add comments for all patches
- enable yasm on x86_64, fix resulting textrels
- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
- drop --disable-optimizations from configure call (loses performance)
- drop obsolete patch
ffmpeg-r15415.patch:
--- NEW FILE ffmpeg-r15415.patch ---
diff -up ffmpeg-20080908/libavutil/avutil.h.r15415 ffmpeg-20080908/libavutil/avutil.h
--- ffmpeg-20080908/libavutil/avutil.h.r15415 2008-09-04 22:39:09.000000000 +0200
+++ ffmpeg-20080908/libavutil/avutil.h 2009-03-08 18:24:13.000000000 +0100
@@ -35,7 +35,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 49
-#define LIBAVUTIL_VERSION_MINOR 10
+#define LIBAVUTIL_VERSION_MINOR 11
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff -up ffmpeg-20080908/libavutil/rational.c.r15415 ffmpeg-20080908/libavutil/rational.c
--- ffmpeg-20080908/libavutil/rational.c.r15415 2007-07-05 12:40:25.000000000 +0200
+++ ffmpeg-20080908/libavutil/rational.c 2009-03-08 18:24:13.000000000 +0100
@@ -101,3 +101,28 @@ AVRational av_d2q(double d, int max){
return a;
}
+
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2)
+{
+ /* n/d is q, a/b is the median between q1 and q2 */
+ int64_t a = q1.num * (int64_t)q2.den + q2.num * (int64_t)q1.den;
+ int64_t b = 2 * (int64_t)q1.den * q2.den;
+
+ /* rnd_up(a*d/b) > n => a*d/b > n */
+ int64_t x_up = av_rescale_rnd(a, q.den, b, AV_ROUND_UP);
+
+ /* rnd_down(a*d/b) < n => a*d/b < n */
+ int64_t x_down = av_rescale_rnd(a, q.den, b, AV_ROUND_DOWN);
+
+ return ((x_up > q.num) - (x_down < q.num)) * av_cmp_q(q2, q1);
+}
+
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list)
+{
+ int i, nearest_q_idx = 0;
+ for(i=0; q_list[i].den; i++)
+ if (av_nearer_q(q, q_list[i], q_list[nearest_q_idx]) > 0)
+ nearest_q_idx = i;
+
+ return nearest_q_idx;
+}
diff -up ffmpeg-20080908/libavutil/rational.h.r15415 ffmpeg-20080908/libavutil/rational.h
--- ffmpeg-20080908/libavutil/rational.h.r15415 2008-08-31 09:39:47.000000000 +0200
+++ ffmpeg-20080908/libavutil/rational.h 2009-03-08 18:24:13.000000000 +0100
@@ -113,4 +113,17 @@ AVRational av_sub_q(AVRational b, AVRati
*/
AVRational av_d2q(double d, int max) av_const;
+/**
+ * @return 1 if \q1 is nearer to \p q than \p q2, -1 if \p q2 is nearer
+ * than \p q1, 0 if they have the same distance.
+ */
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
+
+/**
+ * Finds the nearest value in \p q_list to \p q.
+ * @param q_list an array of rationals terminated by {0, 0}
+ * @return the index of the nearest value found in the array
+ */
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
+
#endif /* AVUTIL_RATIONAL_H */
ffmpeg-r16080.patch:
--- NEW FILE ffmpeg-r16080.patch ---
diff -up ffmpeg-20080908/libavformat/matroska.c.drc ffmpeg-20080908/libavformat/matroska.c
--- ffmpeg-20080908/libavformat/matroska.c.drc 2008-09-01 17:50:12.000000000 +0200
+++ ffmpeg-20080908/libavformat/matroska.c 2009-02-09 21:09:21.000000000 +0100
@@ -23,6 +23,7 @@
const CodecTags ff_mkv_codec_tags[]={
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
+ {"V_DIRAC" , CODEC_ID_DIRAC},
{"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4},
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/ffmpeg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ffmpeg.spec 4 Feb 2009 18:58:13 -0000 1.5
+++ ffmpeg.spec 8 Mar 2009 22:37:57 -0000 1.6
@@ -6,17 +6,25 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.50.%{svn}%{?dist}
+Release: 0.51.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
+# backported .pc files generation fix
Patch0: %{name}-pkgconfig.patch
+# backported unconditional enabling of cmov on x86_64
Patch1: %{name}-cmov.patch
-Patch4: %{name}-asmreg.patch
+# backported support for Dirac in Matroska
+Patch2: %{name}-r16080.patch
+# get rid of textrels on x86_64 in yasm code
+Patch3: %{name}-textrel.patch
+# backported security fixes
Patch10: %{name}-r16802.patch
Patch11: %{name}-r16846.patch
+# backport av_find_nearest_q_idx for dvdstyler
+Patch12: %{name}-r15415.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
@@ -35,8 +43,7 @@
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
-#don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm)
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
@@ -65,6 +72,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Obsoletes: ffmpeg-compat-devel < 0.4.9-0.49
%description devel
FFMpeg is a complete and free Internet live audio and video
@@ -103,7 +111,6 @@
--enable-shared \\\
--enable-gpl \\\
--disable-debug \\\
- --disable-optimizations \\\
--disable-stripping
@@ -111,9 +118,11 @@
%setup -q -n %{name}-%{svn}
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .cmov
-%patch4 -p1 -b .asmreg
+%patch2 -p1
+%patch3 -p1 -b .textrel
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
mkdir generic
@@ -253,6 +262,15 @@
%changelog
+* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.51.20080908
+- backport support for Dirac in Matroska
+- add comments for all patches
+- enable yasm on x86_64, fix resulting textrels
+- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
+- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
+- drop --disable-optimizations from configure call (loses performance)
+- drop obsolete patch
+
* Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.50.20080908
- fix pkgconfig file generation
15 years, 1 month
rpms/ffmpeg/F-10 ffmpeg-r15415.patch, NONE, 1.1 ffmpeg-r16080.patch, NONE, 1.1 ffmpeg-textrel.patch, NONE, 1.1 ffmpeg.spec, 1.9, 1.10
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4768
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-r15415.patch ffmpeg-r16080.patch ffmpeg-textrel.patch
Log Message:
* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20080908
- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
- backport support for Dirac in Matroska
- add comments for all patches
- enable yasm on x86_64, fix resulting textrels
- drop --disable-optimizations from configure call (loses performance)
- drop obsolete patch
ffmpeg-r15415.patch:
--- NEW FILE ffmpeg-r15415.patch ---
diff -up ffmpeg-20080908/libavutil/avutil.h.r15415 ffmpeg-20080908/libavutil/avutil.h
--- ffmpeg-20080908/libavutil/avutil.h.r15415 2008-09-04 22:39:09.000000000 +0200
+++ ffmpeg-20080908/libavutil/avutil.h 2009-03-08 18:24:13.000000000 +0100
@@ -35,7 +35,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 49
-#define LIBAVUTIL_VERSION_MINOR 10
+#define LIBAVUTIL_VERSION_MINOR 11
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff -up ffmpeg-20080908/libavutil/rational.c.r15415 ffmpeg-20080908/libavutil/rational.c
--- ffmpeg-20080908/libavutil/rational.c.r15415 2007-07-05 12:40:25.000000000 +0200
+++ ffmpeg-20080908/libavutil/rational.c 2009-03-08 18:24:13.000000000 +0100
@@ -101,3 +101,28 @@ AVRational av_d2q(double d, int max){
return a;
}
+
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2)
+{
+ /* n/d is q, a/b is the median between q1 and q2 */
+ int64_t a = q1.num * (int64_t)q2.den + q2.num * (int64_t)q1.den;
+ int64_t b = 2 * (int64_t)q1.den * q2.den;
+
+ /* rnd_up(a*d/b) > n => a*d/b > n */
+ int64_t x_up = av_rescale_rnd(a, q.den, b, AV_ROUND_UP);
+
+ /* rnd_down(a*d/b) < n => a*d/b < n */
+ int64_t x_down = av_rescale_rnd(a, q.den, b, AV_ROUND_DOWN);
+
+ return ((x_up > q.num) - (x_down < q.num)) * av_cmp_q(q2, q1);
+}
+
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list)
+{
+ int i, nearest_q_idx = 0;
+ for(i=0; q_list[i].den; i++)
+ if (av_nearer_q(q, q_list[i], q_list[nearest_q_idx]) > 0)
+ nearest_q_idx = i;
+
+ return nearest_q_idx;
+}
diff -up ffmpeg-20080908/libavutil/rational.h.r15415 ffmpeg-20080908/libavutil/rational.h
--- ffmpeg-20080908/libavutil/rational.h.r15415 2008-08-31 09:39:47.000000000 +0200
+++ ffmpeg-20080908/libavutil/rational.h 2009-03-08 18:24:13.000000000 +0100
@@ -113,4 +113,17 @@ AVRational av_sub_q(AVRational b, AVRati
*/
AVRational av_d2q(double d, int max) av_const;
+/**
+ * @return 1 if \q1 is nearer to \p q than \p q2, -1 if \p q2 is nearer
+ * than \p q1, 0 if they have the same distance.
+ */
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
+
+/**
+ * Finds the nearest value in \p q_list to \p q.
+ * @param q_list an array of rationals terminated by {0, 0}
+ * @return the index of the nearest value found in the array
+ */
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
+
#endif /* AVUTIL_RATIONAL_H */
ffmpeg-r16080.patch:
--- NEW FILE ffmpeg-r16080.patch ---
diff -up ffmpeg-20080908/libavformat/matroska.c.drc ffmpeg-20080908/libavformat/matroska.c
--- ffmpeg-20080908/libavformat/matroska.c.drc 2008-09-01 17:50:12.000000000 +0200
+++ ffmpeg-20080908/libavformat/matroska.c 2009-02-09 21:09:21.000000000 +0100
@@ -23,6 +23,7 @@
const CodecTags ff_mkv_codec_tags[]={
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
+ {"V_DIRAC" , CODEC_ID_DIRAC},
{"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4},
ffmpeg-textrel.patch:
--- NEW FILE ffmpeg-textrel.patch ---
diff -up ffmpeg-20090204/libavcodec/i386/fft_mmx.asm.textrel ffmpeg-20090204/libavcodec/i386/fft_mmx.asm
--- ffmpeg-20090204/libavcodec/i386/fft_mmx.asm.textrel 2008-12-19 04:01:08.000000000 +0100
+++ ffmpeg-20090204/libavcodec/i386/fft_mmx.asm 2009-02-08 18:51:15.000000000 +0100
@@ -446,8 +446,9 @@ fft %+ n %+ %3%2:
%endrep
%undef n
-align 8
+section .data
dispatch_tab%3%2: pointer list_of_fft
+section .text
; On x86_32, this function does the register saving and restoring for all of fft.
; The others pass args in registers and don't spill anything.
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ffmpeg.spec 4 Feb 2009 18:57:39 -0000 1.9
+++ ffmpeg.spec 8 Mar 2009 21:58:08 -0000 1.10
@@ -6,17 +6,25 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.54.%{svn}%{?dist}
+Release: 0.55.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
+# backported .pc files generation fix
Patch0: %{name}-pkgconfig.patch
+# backported unconditional enabling of cmov on x86_64
Patch1: %{name}-cmov.patch
-Patch4: %{name}-asmreg.patch
+# backported support for Dirac in Matroska
+Patch2: %{name}-r16080.patch
+# get rid of textrels on x86_64 in yasm code
+Patch3: %{name}-textrel.patch
+# backported security fixes
Patch10: %{name}-r16802.patch
Patch11: %{name}-r16846.patch
+# backport av_find_nearest_q_idx for dvdstyler
+Patch12: %{name}-r15415.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
@@ -35,8 +43,7 @@
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
-#don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm)
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
@@ -65,6 +72,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Obsoletes: ffmpeg-compat-devel < 0.4.9-0.49
%description devel
FFMpeg is a complete and free Internet live audio and video
@@ -103,7 +111,6 @@
--enable-shared \\\
--enable-gpl \\\
--disable-debug \\\
- --disable-optimizations \\\
--disable-stripping
@@ -111,9 +118,11 @@
%setup -q -n %{name}-%{svn}
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .cmov
-%patch4 -p1 -b .asmreg
+%patch2 -p1
+%patch3 -p1 -b .textrel
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
mkdir generic
@@ -253,6 +262,15 @@
%changelog
+* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20080908
+- backport av_find_nearest_q_idx() for DVDStyler (bug #398)
+- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173)
+- backport support for Dirac in Matroska
+- add comments for all patches
+- enable yasm on x86_64, fix resulting textrels
+- drop --disable-optimizations from configure call (loses performance)
+- drop obsolete patch
+
* Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.54.20080908
- fix pkgconfig file generation
15 years, 1 month
rpms/wl-kmod/F-9 broadcom-wl-5.10.79.10-linux-2.6.29.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wl-kmod.spec, 1.19, 1.20 broadcom-wl-5.10.27.14-linux-2.6.29.patch, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2540
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.79.10-linux-2.6.29.patch
Removed Files:
broadcom-wl-5.10.27.14-linux-2.6.29.patch
Log Message:
* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
- update version to 5.10.79.10
broadcom-wl-5.10.79.10-linux-2.6.29.patch:
--- NEW FILE broadcom-wl-5.10.79.10-linux-2.6.29.patch ---
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_iw.c 5.10.79.10/src/wl/sys/wl_iw.c
--- 5.10.79.10.orig/src/wl/sys/wl_iw.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_iw.c 2009-03-08 20:19:23.000000000 +0000
@@ -610,7 +610,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
int i;
@@ -635,7 +639,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
int i;
@@ -1111,7 +1119,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
@@ -1135,7 +1147,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
@@ -1795,7 +1811,11 @@
int paramid;
int paramval;
int val = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
@@ -1926,7 +1946,11 @@
int paramid;
int paramval = 0;
int val;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_linux.c 5.10.79.10/src/wl/sys/wl_linux.c
--- 5.10.79.10.orig/src/wl/sys/wl_linux.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_linux.c 2009-03-08 20:19:23.000000000 +0000
@@ -53,6 +53,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#include <net/lib80211.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
@@ -149,7 +152,11 @@
bool resched;
uint32 pci_psstate[16];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ struct lib80211_crypto_ops *tkipmodops;
+#else
struct ieee80211_crypto_ops *tkipmodops;
+#endif
struct ieee80211_tkip_data *tkip_ucast_data;
struct ieee80211_tkip_data *tkip_bcast_data;
#endif
@@ -201,7 +208,11 @@
static int wl_found = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
+#else
#define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
+#endif
#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
#define WL_LOCK(wl) spin_lock_bh(&(wl)->lock)
@@ -363,6 +374,9 @@
dev = wlif->dev;
wl->dev = dev;
wl_if_setup(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
dev->base_addr = regs;
@@ -436,10 +450,19 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
if (wl->tkipmodops == NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ request_module("lib80211");
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
request_module("ieee80211_crypt_tkip");
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
}
#endif
#ifdef CONFIG_WIRELESS_EXT
@@ -744,7 +767,11 @@
}
if (wl->monitor) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
+#else
wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
+#endif
wl->monitor = NULL;
}
@@ -913,6 +940,9 @@
#else
dev = alloc_netdev(0, name, ether_setup);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
if (!dev) {
MFREE(wl->osh, wlif, sizeof(wl_if_t));
WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
@@ -926,7 +956,9 @@
wlif->wl = wl;
wlif->wlcif = wlcif;
wlif->subunit = subunit;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
dev->priv = wlif;
+#endif
if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
netif_stop_queue(dev);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Feb 2009 17:04:26 -0000 1.5
+++ .cvsignore 8 Mar 2009 21:16:46 -0000 1.6
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Feb 2009 17:04:26 -0000 1.5
+++ sources 8 Mar 2009 21:16:46 -0000 1.6
@@ -1,2 +1,2 @@
-4592a6da9a5c0a14f1be0210ebbb2faa hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-5a39e3f891cc08fda03278f36dc5293c hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+72af629785af3777bc7398f742fb87af hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/wl-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wl-kmod.spec 26 Feb 2009 14:07:48 -0000 1.19
+++ wl-kmod.spec 8 Mar 2009 21:16:46 -0000 1.20
@@ -3,19 +3,19 @@
# "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: wl-kmod
-Version: 5.10.27.14
-Release: 2%{?dist}.1
+Version: 5.10.79.10
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_27_14....
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_27_14....
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10....
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_79_10....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.14-linux-2.6.29.patch
+Patch0: broadcom-wl-5.10.79.10-linux-2.6.29.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
+- update version to 5.10.79.10
+
* Thu Feb 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-2.1
- rebuild for latest Fedora kernel;
--- broadcom-wl-5.10.27.14-linux-2.6.29.patch DELETED ---
15 years, 1 month
rpms/wl-kmod/F-10 broadcom-wl-5.10.79.10-linux-2.6.29.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wl-kmod.spec, 1.19, 1.20 broadcom-wl-5.10.27.14-linux-2.6.29.patch, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2088
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.79.10-linux-2.6.29.patch
Removed Files:
broadcom-wl-5.10.27.14-linux-2.6.29.patch
Log Message:
* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
- update version to 5.10.79.10
broadcom-wl-5.10.79.10-linux-2.6.29.patch:
--- NEW FILE broadcom-wl-5.10.79.10-linux-2.6.29.patch ---
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_iw.c 5.10.79.10/src/wl/sys/wl_iw.c
--- 5.10.79.10.orig/src/wl/sys/wl_iw.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_iw.c 2009-03-08 20:19:23.000000000 +0000
@@ -610,7 +610,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
int i;
@@ -635,7 +639,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
int i;
@@ -1111,7 +1119,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
@@ -1135,7 +1147,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
@@ -1795,7 +1811,11 @@
int paramid;
int paramval;
int val = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
@@ -1926,7 +1946,11 @@
int paramid;
int paramval = 0;
int val;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_linux.c 5.10.79.10/src/wl/sys/wl_linux.c
--- 5.10.79.10.orig/src/wl/sys/wl_linux.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_linux.c 2009-03-08 20:19:23.000000000 +0000
@@ -53,6 +53,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#include <net/lib80211.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
@@ -149,7 +152,11 @@
bool resched;
uint32 pci_psstate[16];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ struct lib80211_crypto_ops *tkipmodops;
+#else
struct ieee80211_crypto_ops *tkipmodops;
+#endif
struct ieee80211_tkip_data *tkip_ucast_data;
struct ieee80211_tkip_data *tkip_bcast_data;
#endif
@@ -201,7 +208,11 @@
static int wl_found = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
+#else
#define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
+#endif
#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
#define WL_LOCK(wl) spin_lock_bh(&(wl)->lock)
@@ -363,6 +374,9 @@
dev = wlif->dev;
wl->dev = dev;
wl_if_setup(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
dev->base_addr = regs;
@@ -436,10 +450,19 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
if (wl->tkipmodops == NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ request_module("lib80211");
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
request_module("ieee80211_crypt_tkip");
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
}
#endif
#ifdef CONFIG_WIRELESS_EXT
@@ -744,7 +767,11 @@
}
if (wl->monitor) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
+#else
wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
+#endif
wl->monitor = NULL;
}
@@ -913,6 +940,9 @@
#else
dev = alloc_netdev(0, name, ether_setup);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
if (!dev) {
MFREE(wl->osh, wlif, sizeof(wl_if_t));
WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
@@ -926,7 +956,9 @@
wlif->wl = wl;
wlif->wlcif = wlcif;
wlif->subunit = subunit;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
dev->priv = wlif;
+#endif
if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
netif_stop_queue(dev);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Feb 2009 16:59:21 -0000 1.5
+++ .cvsignore 8 Mar 2009 21:12:03 -0000 1.6
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Feb 2009 16:59:21 -0000 1.5
+++ sources 8 Mar 2009 21:12:03 -0000 1.6
@@ -1,2 +1,2 @@
-4592a6da9a5c0a14f1be0210ebbb2faa hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-5a39e3f891cc08fda03278f36dc5293c hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+72af629785af3777bc7398f742fb87af hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wl-kmod.spec 24 Feb 2009 15:46:07 -0000 1.19
+++ wl-kmod.spec 8 Mar 2009 21:12:03 -0000 1.20
@@ -3,19 +3,19 @@
# "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: wl-kmod
-Version: 5.10.27.14
-Release: 2%{?dist}.1
+Version: 5.10.79.10
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_27_14....
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_27_14....
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10....
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_79_10....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.14-linux-2.6.29.patch
+Patch0: broadcom-wl-5.10.79.10-linux-2.6.29.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
+- update version to 5.10.79.10
+
* Tue Feb 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-2.1
- rebuild for latest Fedora kernel;
--- broadcom-wl-5.10.27.14-linux-2.6.29.patch DELETED ---
15 years, 1 month
rpms/wl-kmod/devel broadcom-wl-5.10.79.10-linux-2.6.29.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wl-kmod.spec, 1.25, 1.26 broadcom-wl-5.10.27.14-linux-2.6.29.patch, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1571
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.79.10-linux-2.6.29.patch
Removed Files:
broadcom-wl-5.10.27.14-linux-2.6.29.patch
Log Message:
* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
- update version to 5.10.79.10
broadcom-wl-5.10.79.10-linux-2.6.29.patch:
--- NEW FILE broadcom-wl-5.10.79.10-linux-2.6.29.patch ---
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_iw.c 5.10.79.10/src/wl/sys/wl_iw.c
--- 5.10.79.10.orig/src/wl/sys/wl_iw.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_iw.c 2009-03-08 20:19:23.000000000 +0000
@@ -610,7 +610,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
int i;
@@ -635,7 +639,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
int i;
@@ -1111,7 +1119,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
@@ -1135,7 +1147,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
@@ -1795,7 +1811,11 @@
int paramid;
int paramval;
int val = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
@@ -1926,7 +1946,11 @@
int paramid;
int paramval = 0;
int val;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
diff -u -r 5.10.79.10.orig/src/wl/sys/wl_linux.c 5.10.79.10/src/wl/sys/wl_linux.c
--- 5.10.79.10.orig/src/wl/sys/wl_linux.c 2009-03-08 20:19:07.000000000 +0000
+++ 5.10.79.10/src/wl/sys/wl_linux.c 2009-03-08 20:19:23.000000000 +0000
@@ -53,6 +53,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#include <net/lib80211.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
@@ -149,7 +152,11 @@
bool resched;
uint32 pci_psstate[16];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ struct lib80211_crypto_ops *tkipmodops;
+#else
struct ieee80211_crypto_ops *tkipmodops;
+#endif
struct ieee80211_tkip_data *tkip_ucast_data;
struct ieee80211_tkip_data *tkip_bcast_data;
#endif
@@ -201,7 +208,11 @@
static int wl_found = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
+#else
#define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
+#endif
#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
#define WL_LOCK(wl) spin_lock_bh(&(wl)->lock)
@@ -363,6 +374,9 @@
dev = wlif->dev;
wl->dev = dev;
wl_if_setup(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
dev->base_addr = regs;
@@ -436,10 +450,19 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
if (wl->tkipmodops == NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ request_module("lib80211");
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
request_module("ieee80211_crypt_tkip");
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
}
#endif
#ifdef CONFIG_WIRELESS_EXT
@@ -744,7 +767,11 @@
}
if (wl->monitor) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
+#else
wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
+#endif
wl->monitor = NULL;
}
@@ -913,6 +940,9 @@
#else
dev = alloc_netdev(0, name, ether_setup);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
if (!dev) {
MFREE(wl->osh, wlif, sizeof(wl_if_t));
WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
@@ -926,7 +956,9 @@
wlif->wl = wl;
wlif->wlcif = wlcif;
wlif->subunit = subunit;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
dev->priv = wlif;
+#endif
if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
netif_stop_queue(dev);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Feb 2009 16:40:11 -0000 1.5
+++ .cvsignore 8 Mar 2009 21:06:13 -0000 1.6
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Feb 2009 16:40:11 -0000 1.5
+++ sources 8 Mar 2009 21:06:13 -0000 1.6
@@ -1,2 +1,2 @@
-4592a6da9a5c0a14f1be0210ebbb2faa hybrid-portsrc-x86_32-v5_10_27_14.tar.gz
-5a39e3f891cc08fda03278f36dc5293c hybrid-portsrc-x86_64-v5_10_27_14.tar.gz
+7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+72af629785af3777bc7398f742fb87af hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wl-kmod.spec 15 Feb 2009 15:16:41 -0000 1.25
+++ wl-kmod.spec 8 Mar 2009 21:06:13 -0000 1.26
@@ -3,19 +3,19 @@
# "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: wl-kmod
-Version: 5.10.27.14
-Release: 1%{?dist}.2
+Version: 5.10.79.10
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_27_14....
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_27_14....
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10....
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_79_10....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.14-linux-2.6.29.patch
+Patch0: broadcom-wl-5.10.79.10-linux-2.6.29.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
+- update version to 5.10.79.10
+
* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-1.2
- rebuild for latest Fedora kernel;
--- broadcom-wl-5.10.27.14-linux-2.6.29.patch DELETED ---
15 years, 1 month