rpms/openafs-kmod/devel .cvsignore, 1.14, 1.15 openafs-kmod.spec, 1.30, 1.31 sources, 1.17, 1.18 openafs-1.6.2.1-hlist-iterator-change.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7092
Modified Files:
.cvsignore openafs-kmod.spec sources
Removed Files:
openafs-1.6.2.1-hlist-iterator-change.patch
Log Message:
* Thu Jul 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.4-1
- Update to OpenAFS 1.6.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 1 May 2013 02:29:30 -0000 1.14
+++ .cvsignore 5 Jul 2013 09:17:05 -0000 1.15
@@ -1 +1 @@
-openafs-1.6.2.1-src.tar.bz2
+openafs-1.6.4-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openafs-kmod.spec 1 May 2013 02:29:33 -0000 1.30
+++ openafs-kmod.spec 5 Jul 2013 09:17:05 -0000 1.31
@@ -20,7 +20,7 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.2.1
+Version: 1.6.4
Release: 1%{?dist}
Summary: Kernel module(s)
@@ -32,10 +32,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream patch to support kernel 3.9.
-# http://gerrit.openafs.org/9639
-Patch0: openafs-1.6.2.1-hlist-iterator-change.patch
-
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -63,8 +59,6 @@
# apply patches and do other stuff here
pushd %{kmod_name}-%{version}
-# Kernel 3.9 patch
-%patch0 -p1
./regen.sh
popd
@@ -103,6 +97,9 @@
%changelog
+* Thu Jul 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.4-1
+- Update to OpenAFS 1.6.4
+
* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
- Update to OpenAFS 1.6.2.1
- Add patches to support kernel 3.9
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 1 May 2013 02:29:33 -0000 1.17
+++ sources 5 Jul 2013 09:17:05 -0000 1.18
@@ -1 +1 @@
-465092bf21ca7704ed9d175506ba6cef openafs-1.6.2.1-src.tar.bz2
+73824e40bc92b626531408b7a040eb85 openafs-1.6.4-src.tar.bz2
--- openafs-1.6.2.1-hlist-iterator-change.patch DELETED ---
10 years, 9 months
rpms/openafs/devel .cvsignore, 1.13, 1.14 openafs.spec, 1.39, 1.40 sources, 1.17, 1.18 openafs-1.6.2-pod.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6761
Modified Files:
.cvsignore openafs.spec sources
Removed Files:
openafs-1.6.2-pod.patch
Log Message:
* Wed Jul 03 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.4-1
- Update to OpenAFS 1.6.4
- Drop upstreamed POD patch (http://gerrit.openafs.org/9842)
- BR systemd-units to get the _unitdir RPM macro
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 1 May 2013 02:28:08 -0000 1.13
+++ .cvsignore 5 Jul 2013 09:16:03 -0000 1.14
@@ -1,2 +1,2 @@
-openafs-1.6.2.1-src.tar.bz2
-openafs-1.6.2.1-doc.tar.bz2
+openafs-1.6.4-src.tar.bz2
+openafs-1.6.4-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openafs.spec 1 May 2013 19:53:53 -0000 1.39
+++ openafs.spec 5 Jul 2013 09:16:03 -0000 1.40
@@ -10,10 +10,16 @@
%define sysname amd64_linux26
%endif
+# Use systemd unit files on Fedora 18 and above.
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+ %global _with_systemd 1
+%endif
+
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.2.1
-Release: 2%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -35,6 +41,9 @@
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
BuildRequires: automake, autoconf
BuildRequires: %{_bindir}/pod2man
+%if 0%{?_with_systemd}
+BuildRequires: systemd-units
+%endif
Patch0: openafs-1.6.0-fPIC.patch
# systemd: Skip CellServDB manipulation
@@ -48,15 +57,6 @@
# Add ExecPostStart "sysnames" helper script.
Patch5: openafs-1.6.1-systemd-execpoststart.patch
-# Support newer Pod::Simple
-# http://gerrit.openafs.org/9838
-Patch6: openafs-1.6.2-pod.patch
-
-# Use systemd unit files on Fedora 18 and above.
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
- %global _with_systemd 1
-%endif
-
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -143,9 +143,6 @@
%patch4 -p1 -b .envvars
%patch5 -p1 -b .execpoststart
-# Support newer Pod::Simple
-%patch6 -p1
-
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -460,6 +457,11 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Wed Jul 03 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.4-1
+- Update to OpenAFS 1.6.4
+- Drop upstreamed POD patch (http://gerrit.openafs.org/9842)
+- BR systemd-units to get the _unitdir RPM macro
+
* Wed May 01 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2.1-2
- Patch for newer Pod::Simple (http://gerrit.openafs.org/9838)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 1 May 2013 02:28:09 -0000 1.17
+++ sources 5 Jul 2013 09:16:03 -0000 1.18
@@ -1,2 +1,2 @@
-465092bf21ca7704ed9d175506ba6cef openafs-1.6.2.1-src.tar.bz2
-1cbba36d87490cd4cb7294156abc0672 openafs-1.6.2.1-doc.tar.bz2
+73824e40bc92b626531408b7a040eb85 openafs-1.6.4-src.tar.bz2
+f7933e93a93b9fd48277107a6ddf976b openafs-1.6.4-doc.tar.bz2
--- openafs-1.6.2-pod.patch DELETED ---
10 years, 9 months
rpms/wl-kmod/devel broadcom-wl-5.100.82.112-kernel-3.10.patch, NONE, 1.1 wl-kmod.spec, 1.74, 1.75
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30580
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.10.patch
Log Message:
* Wed Jul 03 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
- Modified patch to build for kernel >= 3.10
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/devel/wl-kmod.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- wl-kmod.spec 8 Mar 2013 20:01:47 -0000 1.74
+++ wl-kmod.spec 3 Jul 2013 15:38:12 -0000 1.75
@@ -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 akmod
+%global buildforkernels current
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}
+Release: 11%{?dist}
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,6 +103,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 03 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
+- Modified patch to build for kernel >= 3.10
+
* 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
10 years, 9 months
rpms/ffmpeg/devel ffmpeg.spec,1.88,1.89
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv998
Modified Files:
ffmpeg.spec
Log Message:
fix building with libcdio
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ffmpeg.spec 1 Jul 2013 20:29:45 -0000 1.88
+++ ffmpeg.spec 1 Jul 2013 22:10:59 -0000 1.89
@@ -10,14 +10,11 @@
%global _without_opencv 1
%global _without_vpx 1
%endif
-%if 0%{?fedora} >= 19
-%global _without_cdio 1
-%endif
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 1.2.1
-Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 6%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -42,7 +39,7 @@
BuildRequires: lame-devel >= 3.98.3
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
BuildRequires: libass-devel
-%{!?_without_cdio:BuildRequires: libcdio-devel cdparanoia-devel}
+%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel}
#libcrystalhd is currently broken
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel
@@ -290,6 +287,9 @@
%changelog
+* Tue Jul 02 2013 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-6
+- fix building with libcdio
+
* Mon Jul 01 2013 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-5
- build with soxr support enabled (rfbz#2853)
10 years, 9 months
rpms/ffmpeg/devel ffmpeg.spec,1.87,1.88
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32024
Modified Files:
ffmpeg.spec
Log Message:
build with soxr support enabled (rfbz#2853)
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ffmpeg.spec 27 Jun 2013 19:30:55 -0000 1.87
+++ ffmpeg.spec 1 Jul 2013 20:29:45 -0000 1.88
@@ -17,7 +17,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 1.2.1
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -66,6 +66,7 @@
BuildRequires: perl(Pod::Man)
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
+BuildRequires: soxr-devel
BuildRequires: speex-devel
BuildRequires: subversion
BuildRequires: texi2html
@@ -136,6 +137,7 @@
%{!?_without_pulse:--enable-libpulse} \\\
%{?_with_rtmp:--enable-librtmp} \\\
--enable-libschroedinger \\\
+ --enable-libsoxr \\\
--enable-libspeex \\\
--enable-libtheora \\\
--enable-libvorbis \\\
@@ -288,6 +290,9 @@
%changelog
+* Mon Jul 01 2013 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-5
+- build with soxr support enabled (rfbz#2853)
+
* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.1-4
- Reverse the logic for neon on arm
10 years, 9 months