rpms/ndiswrapper-kmod/F-16 ndiswrapper_3.3_kernel.patch,NONE,1.1
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24994
Added Files:
ndiswrapper_3.3_kernel.patch
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag
ndiswrapper_3.3_kernel.patch:
ndis.c | 6 ++++++
wrapndis.c | 4 ++++
2 files changed, 10 insertions(+)
--- NEW FILE ndiswrapper_3.3_kernel.patch ---
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
@@ -1675,6 +1675,7 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
static u32 ndis_get_tx_csum(struct net_device *dev)
{
struct ndis_device *wnd = netdev_priv(dev);
@@ -1735,18 +1736,21 @@
else
return -EOPNOTSUPP;
}
+#endif
static struct ethtool_ops ndis_ethtool_ops = {
.get_drvinfo = ndis_get_drvinfo,
.get_link = ndis_get_link,
.get_wol = ndis_get_wol,
.set_wol = ndis_set_wol,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
.get_tx_csum = ndis_get_tx_csum,
.get_rx_csum = ndis_get_rx_csum,
.set_tx_csum = ndis_set_tx_csum,
.set_rx_csum = ndis_set_rx_csum,
.get_sg = ndis_get_sg,
.set_sg = ndis_set_sg,
+#endif
};
static int notifier_event(struct notifier_block *notifier, unsigned long event,
--- a/driver/ndis.c 2011/10/04 15:31:37 3085
+++ b/driver/ndis.c 2012/03/26 17:00:31 3107
@@ -2654,9 +2654,15 @@
(ULONG *idle, ULONG *kernel_user, ULONG *index)
{
int cpu = smp_processor_id();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
+ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
+ kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
+#else
*idle = kstat_cpu(cpu).cpustat.idle;
*kernel_user = kstat_cpu(cpu).cpustat.system +
kstat_cpu(cpu).cpustat.user;
+#endif
*index = cpu;
}
12 years, 7 months
rpms/ndiswrapper-kmod/F-16 ndiswrapper-kmod.spec,1.76,1.77
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24839
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-16/ndiswrapper-kmod.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ndiswrapper-kmod.spec 30 Mar 2012 09:35:47 -0000 1.76
+++ ndiswrapper-kmod.spec 30 Mar 2012 15:46:52 -0000 1.77
@@ -3,20 +3,21 @@
# "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 current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 1%{?_rc}%{?dist}.15
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?_rc}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
+Patch1: ndiswrapper_3.3_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -48,6 +49,7 @@
%setup -q -c -T -a 0 -n %{name}-%{version}%{?_rc}
(cd ndiswrapper-%{version} ;
%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?_rc}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -75,6 +77,10 @@
%changelog
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
+- patched for 3.3.0 kernel
+- fix release tag
+
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.15
- rebuild for updated kernel
12 years, 7 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper_3.3_kernel.patch,1.2,1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24253
Modified Files:
ndiswrapper_3.3_kernel.patch
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag
ndiswrapper_3.3_kernel.patch:
ndis.c | 6 ++++++
wrapndis.c | 4 ++++
2 files changed, 10 insertions(+)
Index: ndiswrapper_3.3_kernel.patch
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper_3.3_kernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:36:03 -0000 1.2
+++ ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:43:21 -0000 1.3
@@ -1,6 +1,6 @@
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
-@@ -1675,6 +1675,7 @@ static int ndis_set_wol(struct net_devic
+@@ -1675,6 +1675,7 @@
return 0;
}
@@ -8,7 +8,7 @@
static u32 ndis_get_tx_csum(struct net_device *dev)
{
struct ndis_device *wnd = netdev_priv(dev);
-@@ -1735,18 +1736,21 @@ static int ndis_set_sg(struct net_device
+@@ -1735,18 +1736,21 @@
else
return -EOPNOTSUPP;
}
@@ -30,17 +30,6 @@
};
static int notifier_event(struct notifier_block *notifier, unsigned long event,
-@@ -1837,6 +1841,10 @@ static NDIS_STATUS ndis_start_device(str
- NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
- net_dev->netdev_ops = &ndis_netdev_ops;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
-+ net_dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM |
-+ NETIF_F_RXCSUM;
-+#endif
- #else
- net_dev->init = ndis_net_dev_init;
- net_dev->uninit = ndis_net_dev_uninit;
--- a/driver/ndis.c 2011/10/04 15:31:37 3085
+++ b/driver/ndis.c 2012/03/26 17:00:31 3107
@@ -2654,9 +2654,15 @@
12 years, 7 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper_3.3_kernel.patch,1.1,1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23220
Modified Files:
ndiswrapper_3.3_kernel.patch
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag
ndiswrapper_3.3_kernel.patch:
ndis.c | 6 ++++++
wrapndis.c | 8 ++++++++
2 files changed, 14 insertions(+)
Index: ndiswrapper_3.3_kernel.patch
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper_3.3_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:09:03 -0000 1.1
+++ ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:36:03 -0000 1.2
@@ -1,6 +1,6 @@
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
-@@ -1675,6 +1675,7 @@
+@@ -1675,6 +1675,7 @@ static int ndis_set_wol(struct net_devic
return 0;
}
@@ -8,7 +8,7 @@
static u32 ndis_get_tx_csum(struct net_device *dev)
{
struct ndis_device *wnd = netdev_priv(dev);
-@@ -1735,18 +1736,21 @@
+@@ -1735,18 +1736,21 @@ static int ndis_set_sg(struct net_device
else
return -EOPNOTSUPP;
}
@@ -30,6 +30,17 @@
};
static int notifier_event(struct notifier_block *notifier, unsigned long event,
+@@ -1837,6 +1841,10 @@ static NDIS_STATUS ndis_start_device(str
+ NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ net_dev->netdev_ops = &ndis_netdev_ops;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
++ net_dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM |
++ NETIF_F_RXCSUM;
++#endif
+ #else
+ net_dev->init = ndis_net_dev_init;
+ net_dev->uninit = ndis_net_dev_uninit;
--- a/driver/ndis.c 2011/10/04 15:31:37 3085
+++ b/driver/ndis.c 2012/03/26 17:00:31 3107
@@ -2654,9 +2654,15 @@
12 years, 7 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper_3.3_kernel.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.54, 1.55
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20163
Modified Files:
ndiswrapper-kmod.spec
Added Files:
ndiswrapper_3.3_kernel.patch
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
- patched for 3.3.0 kernel
- fix release tag
ndiswrapper_3.3_kernel.patch:
ndis.c | 6 ++++++
wrapndis.c | 4 ++++
2 files changed, 10 insertions(+)
--- NEW FILE ndiswrapper_3.3_kernel.patch ---
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
@@ -1675,6 +1675,7 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
static u32 ndis_get_tx_csum(struct net_device *dev)
{
struct ndis_device *wnd = netdev_priv(dev);
@@ -1735,18 +1736,21 @@
else
return -EOPNOTSUPP;
}
+#endif
static struct ethtool_ops ndis_ethtool_ops = {
.get_drvinfo = ndis_get_drvinfo,
.get_link = ndis_get_link,
.get_wol = ndis_get_wol,
.set_wol = ndis_set_wol,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
.get_tx_csum = ndis_get_tx_csum,
.get_rx_csum = ndis_get_rx_csum,
.set_tx_csum = ndis_set_tx_csum,
.set_rx_csum = ndis_set_rx_csum,
.get_sg = ndis_get_sg,
.set_sg = ndis_set_sg,
+#endif
};
static int notifier_event(struct notifier_block *notifier, unsigned long event,
--- a/driver/ndis.c 2011/10/04 15:31:37 3085
+++ b/driver/ndis.c 2012/03/26 17:00:31 3107
@@ -2654,9 +2654,15 @@
(ULONG *idle, ULONG *kernel_user, ULONG *index)
{
int cpu = smp_processor_id();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
+ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
+ kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
+#else
*idle = kstat_cpu(cpu).cpustat.idle;
*kernel_user = kstat_cpu(cpu).cpustat.system +
kstat_cpu(cpu).cpustat.user;
+#endif
*index = cpu;
}
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ndiswrapper-kmod.spec 8 Feb 2012 23:19:52 -0000 1.54
+++ ndiswrapper-kmod.spec 30 Mar 2012 15:09:03 -0000 1.55
@@ -3,20 +3,21 @@
# "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 akmod
+%define buildforkernels current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 1%{?_rc}%{?dist}.1
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?_rc}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
+Patch1: ndiswrapper_3.3_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -48,6 +49,7 @@
%setup -q -c -T -a 0 -n %{name}-%{version}%{?_rc}
(cd ndiswrapper-%{version} ;
%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?_rc}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -75,6 +77,10 @@
%changelog
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.57-2
+- patched for 3.3.0 kernel
+- fix release tag
+
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.1
- Rebuild for UsrMove
12 years, 7 months
rpms/xorg-x11-drv-catalyst/F-16 sources,1.7,1.8
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26556
Modified Files:
sources
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
- Update to Catalyst 12.3 (internal version 8.951)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 30 Mar 2012 11:13:02 -0000 1.7
+++ sources 30 Mar 2012 11:15:58 -0000 1.8
@@ -1 +1,2 @@
7c7b82f0d87a7ce9ee816b7d77212faa amd-driver-installer-12-3-x86.x86_64.run
+b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
12 years, 7 months
rpms/xorg-x11-drv-catalyst/F-16 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 xorg-x11-drv-catalyst.spec, 1.7, 1.8
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26287
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
- Update to Catalyst 12.3 (internal version 8.951)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 5 Feb 2012 19:06:54 -0000 1.7
+++ .cvsignore 30 Mar 2012 11:13:02 -0000 1.8
@@ -1,2 +1 @@
-amd-driver-installer-12-1-x86.x86_64.run
-xvba-sdk-0.74-404001.tar.gz
+amd-driver-installer-12-3-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Feb 2012 19:06:54 -0000 1.6
+++ sources 30 Mar 2012 11:13:02 -0000 1.7
@@ -1,2 +1 @@
-6396d0f6f70b89d605bac896feb2b7c9 amd-driver-installer-12-1-x86.x86_64.run
-b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
+7c7b82f0d87a7ce9ee816b7d77212faa amd-driver-installer-12-3-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-catalyst.spec 5 Feb 2012 19:06:54 -0000 1.7
+++ xorg-x11-drv-catalyst.spec 30 Mar 2012 11:13:02 -0000 1.8
@@ -4,13 +4,13 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 12.1
+Version: 12.3
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-dri...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -394,6 +394,9 @@
%changelog
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+
* Sun Feb 05 2012 Stewart Adam <s.adam at diffingo.com> - 12.1-1
- Update to Catalyst 12.1 (internal version 8.93)
12 years, 7 months
rpms/catalyst-kmod/F-16 catalyst-kmod.spec,1.38,1.39
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26172
Modified Files:
catalyst-kmod.spec
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-2
- rebuild with current
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- catalyst-kmod.spec 30 Mar 2012 11:04:15 -0000 1.38
+++ catalyst-kmod.spec 30 Mar 2012 11:12:28 -0000 1.39
@@ -3,7 +3,7 @@
# "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 current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -103,6 +103,9 @@
%changelog
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-2
+- rebuild with current
+
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
- Update to Catalyst 12.3 (internal version 8.951)
- patch for newer kernels
12 years, 7 months
rpms/catalyst-kmod/F-16 catalyst-kmod-i386.patch, NONE, 1.1 rename_debug.patch, NONE, 1.1 catalyst-kmod.spec, 1.37, 1.38 sources, 1.7, 1.8
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25035
Modified Files:
catalyst-kmod.spec sources
Added Files:
catalyst-kmod-i386.patch rename_debug.patch
Log Message:
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
- Update to Catalyst 12.3 (internal version 8.951)
- patch for newer kernels
catalyst-kmod-i386.patch:
firegl_public.c | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE catalyst-kmod-i386.patch ---
diff -purN catalyst-kmod-data-12.2/common/lib/modules/fglrx/build_mod/firegl_public.c catalyst-kmod-data-12.2-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c
--- lib/modules/fglrx/build_mod/firegl_public.c.i387 2012-02-29 21:34:52.000000000 +0100
+++ lib/modules/fglrx/build_mod/firegl_public.c 2012-03-13 12:47:23.500889722 +0100
@@ -5799,10 +5799,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
#ifdef CONFIG_X86_64
kernel_fpu_begin();
#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,8)
+ preempt_disable();
+ if (__thread_has_fpu(current))
+ __save_init_fpu(current);
+#else
struct thread_info *cur_task = current_thread_info();
preempt_disable();
if (cur_task->status & TS_USEDFPU)
__save_init_fpu(cur_task->task);
+#endif
else
clts();
#endif
rename_debug.patch:
kcl_debug.c | 2 +-
kcl_debug.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE rename_debug.patch ---
--- lib/modules/fglrx/build_mod/kcl_debug.h 2012-02-29 22:34:52.000000000 +0200
+++ lib/modules/fglrx/build_mod/kcl_debug.h 2012-03-22 13:56:37.441824720 +0200
@@ -85,8 +85,8 @@
#ifdef ERROR
#undef ERROR
#endif
-#ifdef WARN
-#undef WARN
+#ifdef KCL_WARN
+#undef KCL_WARN
#endif
#ifdef INFO
#undef INFO
@@ -122,7 +122,7 @@
{
SPECIAL = 0,
ERROR ,
- WARN ,
+ KCL_WARN ,
INFO ,
INFOEX,
TRACE,
@@ -160,7 +160,7 @@
}log_map;
-#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(KCL_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
#define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
extern const log_map module_log_map[];
extern const module_map module_type_map[];
--- lib/modules/fglrx/build_mod/kcl_debug.c 2012-02-29 22:34:52.000000000 +0200
+++ lib/modules/fglrx/build_mod/kcl_debug.c 2012-03-22 13:56:21.594823600 +0200
@@ -69,7 +69,7 @@
{
{SPECIAL , 'S'},
{ERROR , 'E'},
- {WARN , 'W'},
+ {KCL_WARN , 'W'},
{INFO , 'I'},
{INFOEX , 'X'},
{TRACE , 'T'},
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- catalyst-kmod.spec 30 Mar 2012 09:36:51 -0000 1.37
+++ catalyst-kmod.spec 30 Mar 2012 11:04:15 -0000 1.38
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 12.1
-Release: 1%{?dist}.10
+Version: 12.3
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -22,6 +22,8 @@
Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve...
Source11: catalyst-kmodtool-excludekernel-filterfile
Patch0: compat_alloc-Makefile.patch
+Patch1: rename_debug.patch
+Patch2: catalyst-kmod-i386.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i686
@@ -67,6 +69,10 @@
pushd fglrxpkg
%patch0 -p0 -b.compat_alloc
+%patch1 -p0 -b.rename_debug
+%ifarch %{ix86}
+%patch2 -p0 -b.catalyst-kmod-i386
+%endif
popd
for kernel_version in %{?kernel_versions} ; do
@@ -97,6 +103,10 @@
%changelog
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+- patch for newer kernels
+
* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.1-1.10
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 5 Feb 2012 19:05:51 -0000 1.7
+++ sources 30 Mar 2012 11:04:15 -0000 1.8
@@ -1 +1 @@
-9a2a8f10a14e6eb14664d1db2180c6f8 catalyst-kmod-data-12.1.tar.bz2
+b234bbb76947415916cc76006697ba80 catalyst-kmod-data-12.3.tar.bz2
12 years, 7 months
rpms/get-flash-videos/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/get-flash-videos/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsb19136/rpms/get-flash-videos/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module get-flash-videos
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: get-flash-videos
# $Id: Makefile,v 1.1 2012/03/30 10:16:16 kwizart Exp $
NAME := get-flash-videos
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 7 months