rpms/mixxx/F-18 .cvsignore, 1.9, 1.10 mixxx.spec, 1.13, 1.14 sources, 1.9, 1.10
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mixxx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13995/F-18
Modified Files:
.cvsignore mixxx.spec sources
Log Message:
Update to latest
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 3 May 2012 21:20:31 -0000 1.9
+++ .cvsignore 4 Feb 2013 20:38:12 -0000 1.10
@@ -1 +1 @@
-mixxx-1.10.0-src.tar.gz
+mixxx-1.10.1-src.tar.gz
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-18/mixxx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mixxx.spec 3 May 2012 21:20:33 -0000 1.13
+++ mixxx.spec 4 Feb 2013 20:38:12 -0000 1.14
@@ -2,7 +2,7 @@
%global _with_libgpod 1
Name: mixxx
-Version: 1.10.0
+Version: 1.10.1
Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
@@ -105,6 +105,9 @@
%{_datadir}/pixmaps/mixxx-icon.png
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.10.1-1
+- Update to 1.10.1
+
* Thu May 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.10.0-1
- Update to 1.10.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 3 May 2012 21:20:33 -0000 1.9
+++ sources 4 Feb 2013 20:38:12 -0000 1.10
@@ -1 +1 @@
-d92bf422491fa92adf7ed6c2998e67fb mixxx-1.10.0-src.tar.gz
+765bc5216ec8102c2186dd3ea80187a9 mixxx-1.10.1-src.tar.gz
11 years, 2 months
rpms/xorg-x11-drv-catalyst-legacy/F-18 blacklist-radeon.conf, NONE, 1.1 xorg-x11-drv-catalyst-legacy.spec, 1.1, 1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2273
Modified Files:
xorg-x11-drv-catalyst-legacy.spec
Added Files:
blacklist-radeon.conf
Log Message:
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-2
- add blacklist file to %{_prefix}/lib/modprobe.d/
--- NEW FILE blacklist-radeon.conf ---
# RPM Fusion blacklist for radeon driver - you need to run as root:
# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
# if radeon is loaded despite this file.
blacklist radeon
Index: xorg-x11-drv-catalyst-legacy.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18/xorg-x11-drv-catalyst-legacy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-catalyst-legacy.spec 4 Feb 2013 16:07:37 -0000 1.1
+++ xorg-x11-drv-catalyst-legacy.spec 4 Feb 2013 17:14:47 -0000 1.2
@@ -5,7 +5,7 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst-legacy
Version: 13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: AMD's proprietary driver for ATI legacy graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@
Source7: catalyst-legacy-a-lid-aticonfig
Source8: 00-catalyst-legacy-modulepath.conf
Source9: 01-catalyst-legacy-videodriver.conf
+Source10: blacklist-radeon.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -300,6 +301,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-legacy-%{_lib}.conf
+#Blacklist radeon
+install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -351,6 +356,7 @@
%doc %{_docdir}/amdcccle/ccc_copyrights.txt
%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
+%{_prefix}/lib/modprobe.d/blacklist-radeon.conf
%{_sysconfdir}/ati/atiogl.xml
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
@@ -401,6 +407,9 @@
%changelog
+* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-2
+- add blacklist file to %%{_prefix}/lib/modprobe.d/
+
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
- Update to Catalyst legacy (internal version 13.1 8.97.100.7)
11 years, 2 months
rpms/catalyst-legacy-kmod/F-18 3.5-do_mmap.patch, NONE, 1.1 3.7_kernel.patch, NONE, 1.1 catalyst-kmodtool-excludekernel-filterfile, NONE, 1.1 catalyst-legacy-kmod.spec, NONE, 1.1 compat_alloc-Makefile.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-legacy-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv934
Modified Files:
.cvsignore sources
Added Files:
3.5-do_mmap.patch 3.7_kernel.patch
catalyst-kmodtool-excludekernel-filterfile
catalyst-legacy-kmod.spec compat_alloc-Makefile.patch
Log Message:
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
- Update to Catalyst legacy (internal version 13.1 8.97.100.7)
3.5-do_mmap.patch:
firegl_public.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE 3.5-do_mmap.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
+++ lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
@@ -2106,6 +2106,12 @@
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+# define NO_DO_MMAP
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
+# define do_munmap(a,b,c) vm_munmap(b, c)
+#endif
+
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
KCL_IO_FILE_Handle file,
unsigned long addr,
@@ -2117,10 +2123,13 @@
flags = MAP_SHARED;
prot = PROT_READ|PROT_WRITE;
-
+#ifdef NO_DO_MMAP
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
+#else
down_write(¤t->mm->mmap_sem);
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
up_write(¤t->mm->mmap_sem);
+#endif
if (IS_ERR(vaddr))
return 0;
else
@@ -2131,7 +2140,9 @@
{
int retcode = 0;
+#ifndef NO_DO_MMAP
down_write(¤t->mm->mmap_sem);
+#endif
#ifdef FGL_LINUX_RHEL_MUNMAP_API
retcode = do_munmap(current->mm,
addr,
@@ -2142,7 +2153,9 @@
addr,
len);
#endif
+#ifndef NO_DO_MMAP
up_write(¤t->mm->mmap_sem);
+#endif
return retcode;
}
3.7_kernel.patch:
firegl_public.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
--- NEW FILE 3.7_kernel.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c
+++ lib/modules/fglrx/build_mod/firegl_public.c
@@ -3892,7 +3892,11 @@
KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
return -EAGAIN;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_ops = &vm_ops;
break;
@@ -3922,14 +3926,22 @@
KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
return -EAGAIN;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_ops = &vm_ops;
}
break;
#endif
case __KE_SHM:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_ops = &vm_shm_ops;
break;
@@ -3937,7 +3949,11 @@
pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_RESERVED;
+#else
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
//vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
//vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
@@ -3946,14 +3962,22 @@
case __KE_CTX:
pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
vma->vm_ops = &vm_ctx_ops;
break;
case __KE_PCI_BQS:
pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
vma->vm_ops = &vm_pci_bq_ops;
break;
@@ -3984,9 +4008,17 @@
return -EAGAIN;
}
#ifdef __x86_64__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_RESERVED;
#else
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
#endif
vma->vm_ops = &vm_ops;
}
@@ -4015,9 +4047,17 @@
return -EAGAIN;
}
#ifdef __x86_64__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_RESERVED;
#else
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
#endif
vma->vm_ops = &vm_agp_bq_ops;
}
@@ -4025,7 +4065,11 @@
#endif /* __AGP__BUILTIN__ */
case __KE_KMAP:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_SHM | VM_RESERVED;
+#else
+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_ops = &vm_kmap_ops;
if (readonly && (vma->vm_flags & VM_WRITE))
{
@@ -4046,7 +4090,11 @@
#endif
// fall through
case __KE_GART_CACHEABLE:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
vma->vm_flags |= VM_RESERVED;
+#else
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
vma->vm_ops = &vm_gart_ops;
break;
default:
--- NEW FILE catalyst-kmodtool-excludekernel-filterfile ---
--- NEW FILE catalyst-legacy-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "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 current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
%endif
Name: catalyst-legacy-kmod
Version: 13.1
Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display legacy driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Source0: http://www.linux-ati-drivers.homecall.co.uk/catalyst-legacy-kmod-data-%{v...
Source11: catalyst-kmodtool-excludekernel-filterfile
Patch0: compat_alloc-Makefile.patch
Patch1: 3.5-do_mmap.patch
Patch2: 3.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i686
ExclusiveArch: i686 x86_64
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
The catalyst legacy %{version} display driver kernel module.
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
# Tweak to have debuginfo - part 2/2
%if 0%{?fedora} > 7
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
cp -r fglrx/common/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# proper permissions
find fglrxpkg/lib/modules/fglrx/build_mod/ -type f -print0 | xargs -0 chmod 0644
# debuginfo fix
#sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh
pushd fglrxpkg
%patch0 -p0 -b.compat_alloc
%patch1 -p0 -b.3.5-do_mmap
%patch2 -p0 -b.3.7_kernel
popd
for kernel_version in %{?kernel_versions} ; do
cp -a fglrxpkg/ _kmod_build_${kernel_version%%___*}
done
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
make CC="gcc" PAGE_ATTR_FIX=0 MODVERSIONS=8.98 \
KVER="${kernel_version%%___*}" \
KDIR="/usr/src/kernels/${kernel_version%%___*}"
popd
done
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
install -D -m 0755 _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/fglrx.ko
done
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
- Update to Catalyst legacy (internal version 13.1 8.97.100.7)
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2
- patch for 3.7 kernel
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.7
- Rebuilt for updated kernel
* Wed Jan 09 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.6
- Rebuilt for updated kernel
* Sun Dec 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.5
- Rebuilt for updated kernel
* Sat Dec 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.4
- Rebuilt for updated kernel
* Tue Dec 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.3
- Rebuilt for updated kernel
* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.2
- Rebuilt for updated kernel
* Wed Dec 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.1
- Rebuilt for updated kernel
* Thu Nov 29 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
* Fri Jul 06 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-0.1
- Based on xorg-x11-drv-catalyst
- Update to Catalyst legacy 12.6 beta (internal version 8.97.100.3)
compat_alloc-Makefile.patch:
Makefile | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE compat_alloc-Makefile.patch ---
--- lib/modules/fglrx/build_mod/2.6.x/Makefile.compat_alloc 2010-10-25 19:14:43.157401050 -0400
+++ lib/modules/fglrx/build_mod/2.6.x/Makefile 2010-10-25 19:14:54.586401063 -0400
@@ -66,6 +66,7 @@
-DFGL_GART_RESERVED_SLOT \
-DFGL_LINUX253P1_VMA_API \
-DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
+ -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space \
ifeq ($(KERNELRELEASE),)
# on first call from remote location we get into this path
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-18/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Nov 2012 17:26:44 -0000 1.1
+++ .cvsignore 4 Feb 2013 17:01:56 -0000 1.2
@@ -0,0 +1 @@
+catalyst-legacy-kmod-data-13.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-18/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Nov 2012 17:26:44 -0000 1.1
+++ sources 4 Feb 2013 17:01:56 -0000 1.2
@@ -0,0 +1 @@
+18245a56253d8f87dd8ae0920552f3ca catalyst-legacy-kmod-data-13.1.tar.bz2
11 years, 2 months
rpms/xorg-x11-drv-catalyst-legacy/F-18 00-catalyst-legacy-modulepath.conf, NONE, 1.1 01-catalyst-legacy-videodriver.conf, NONE, 1.1 amdcccle.desktop, NONE, 1.1 catalyst-legacy-README.Fedora, NONE, 1.1 catalyst-legacy-a-ac-aticonfig, NONE, 1.1 catalyst-legacy-a-lid-aticonfig, NONE, 1.1 catalyst-legacy-ati-powermode.sh, NONE, 1.1 catalyst-legacy-atieventsd.init, NONE, 1.1 xorg-x11-drv-catalyst-legacy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31751
Modified Files:
.cvsignore sources
Added Files:
00-catalyst-legacy-modulepath.conf
01-catalyst-legacy-videodriver.conf amdcccle.desktop
catalyst-legacy-README.Fedora catalyst-legacy-a-ac-aticonfig
catalyst-legacy-a-lid-aticonfig
catalyst-legacy-ati-powermode.sh
catalyst-legacy-atieventsd.init
xorg-x11-drv-catalyst-legacy.spec
Log Message:
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
- Update to Catalyst legacy (internal version 13.1 8.97.100.7)
--- NEW FILE 00-catalyst-legacy-modulepath.conf ---
# This file is provided by xorg-x11-drv-catalyst-legacy; do not edit.
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/catalyst-legacy"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE 01-catalyst-legacy-videodriver.conf ---
# This file is provided by xorg-x11-drv-catalyst-legacy; do not edit.
Section "Device"
Identifier "Videocard0"
Driver "fglrx"
EndSection
--- NEW FILE amdcccle.desktop ---
[Desktop Entry]
Name=ATI Catalyst Control Center
Name[de]=ATI Catalyst Control Center
Name[es]=ATI Catalyst Control Center
Name[fr]=ATI Catalyst Control Center
Name[it]=ATI Catalyst Control Center
GenericName=ATI Catalyst Control Center
GenericName[de]=ATI Catalyst Control Center
GenericName[es]=ATI Catalyst Control Center
GenericName[fr]=ATI Catalyst Control Center
GenericName[it]=ATI Catalyst Control Center
Comment=ATI graphics adapter configuration
Comment[de]=ATI Graphik-Adapterkonfiguration
Comment[es]=Configuración del adaptador de los gráficos de ATI
Comment[fr]=Configuration d'adapteur de graphiques d'ATI
Comment[it]=Configurazione dell'adattatore dei grafici di ATI
Icon=ccc_large
Exec=amdcccle
Type=Application
Terminal=false
Categories=Qt;System;
--- NEW FILE catalyst-legacy-README.Fedora ---
README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
1. After Installation
-----------------------------
The easiest way to start using the fglrx drivers after installation is to
restart your system.
The hard way depends on your hardware and your configuration:
Check if you have loaded the module "radeon". If not simply log out of your
X session to restart X -- the catalyst driver should now be loaded if there is
a proper kernel-module installed. You can also run:
modprobe fglrx
to force the fglrx kernel module to load.
If you have loaded the radeon driver, log out of your X session, log in again
and issue the command:
/sbin/rmmod radeon
then end your X session once again.
To check that hardware acceleration is working, issue the following command
in a terminal:
glxinfo | grep "OpenGL vendor"
That should print out
OpenGL vendor string: ATI Technologies Inc.
Also, the command
glxinfo | grep direct
should print out
direct rendering: Yes
If it does, you're all set.
2. Basic Configuration
-----------------------------
The installation scripts perform the basic configuration for you.
When (if) you uninstall the drivers, the configuration is reset to
use the default autodetected driver again. If you want to temporarily disable
the fglrx drivers without uninstalling, look inside /etc/X11/xorg.conf.d and
backup any files with a filename matching the pattern XY-catalyst-* and then
restart your X session. To re-enable the drivers, replace these files to their
original state.
3. Additional configuration
----------------------------------
For configuration options (TwinView, TV-out etc) see
/usr/share/doc/fglrx-*/index.html
4. Kernel Module
-----------------------------
The fglrx kernel module is required for DRI. For Fedora kernels you will find
RPMs with the name:
kmod-catalyst-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
(e.g. kmod-catalyst-2.6.27.19-170.2.35.fc10.x86_64-9.4-1.fc10.x86_64)
at rpmfusion.org. If you use another kernel, grab the proper SRPM:
(e.g catalyst-kmod-9.4.fc10.src.rpm)
from rpmfusion.org and rebuild the kernel module with the following command:
rpmbuild --rebuild /path/to/catalyst-srpm.src.rpm
5. Release-specific notes
-----------------------------
Please note that this release was not written to run correctly on the Xorg
server version included with Fedora 16 and will likely fail to operate correctly
with most, if not all, graphic cards.
During testing it was found that in some cases, kernel modesetting may need to
disabled in order for the fglrx driver to function correctly. You may want to
edit /etc/grub2.cfg manually and add the 'nomodeset' kernel parameter.
--- NEW FILE catalyst-legacy-a-ac-aticonfig ---
# /usr/bin/ati-powermode.sh
# Called when the user connects ac power to us
#
event=ac_adapter
action=/usr/bin/ati-powermode.sh
--- NEW FILE catalyst-legacy-a-lid-aticonfig ---
# /usr/bin/ati-powermode.sh
# Called when the user opens/closes the laptop lid
#
event=button[ /]lid
action=/usr/bin/ati-powermode.sh
--- NEW FILE catalyst-legacy-ati-powermode.sh ---
#!/bin/bash
#
# Control script for ACPI lid state and AC adapter state
#
# Copyright (c) 2006, ATI Technologies Inc. All rights reserved.
#
# Fedora Modifications By Michael Larabel <Michael AT Phoronix.com> on July 5, 2006
getXuser() {
user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
if [ x"$user" = x"" ]; then
user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'`
fi
if [ x"$user" != x"" ]; then
userhome=`getent passwd $user | cut -d: -f6`
export XAUTHORITY=$userhome/.Xauthority
else
export XAUTHORITY=""
fi
}
grep -q closed /proc/acpi/button/lid/*/state
if [ $? = 0 ]; then
lid_closed=1
echo "Lid Closed"
else
lid_closed=0
echo "Lid Open"
fi
grep -q off-line /proc/acpi/ac_adapter/*/state
if [ $? = 0 ]; then
echo "On DC"
on_dc=1
else
echo "On AC"
on_dc=0
fi
if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
echo "Low power"
for x in /tmp/.X11-unix/*; do
displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
getXuser;
if [ x"$XAUTHORITY" != x"" ]; then
export DISPLAY=":$displaynum"
su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
fi
done
else
echo "High power"
for x in /tmp/.X11-unix/*; do
displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
getXuser;
if [ x"$XAUTHORITY" != x"" ]; then
export DISPLAY=":$displaynum"
su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
fi
done
fi
--- NEW FILE catalyst-legacy-atieventsd.init ---
#!/bin/sh
# Startup script for the ATI External Events Daemon (atieventsd)
#
# chkconfig: 5 97 07
# description: Grant or revoke access to X for the ATI External Events Daemon
# Source function library.
. /etc/rc.d/init.d/functions
[ -f /usr/sbin/atieventsd ] || exit 0
prog=atieventsd
opts=""
PATH=/sbin:/usr/sbin:$PATH
RETVAL=0
start() {
echo -n $"Starting ATI External Events Daemon: "
XAUTHORITY=/var/run/$prog.Xauthority $prog $opts
RETVAL=$?
pid=`pidof $prog`
if [ -n "$pid" ] ; then
success $"atieventsd"
touch /var/lock/subsys/$prog
echo $pid > /var/run/$prog.pid
RETVAL=0
else
failure $"atieventsd"
RETVAL=1
fi
echo
}
stop() {
echo -n $"Stopping ATI External Events Daemon: "
killproc $prog
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
rm -f /var/run/$prog.pid
rm -f /var/lock/subsys/$prog
fi
echo
}
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status $prog
;;
restart|reload)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/$prog ]; then
stop
start
fi
;;
*)
echo $"Usage: $0 {start|stop|restart|condrestart|status}"
;;
esac
exit $RETVAL
--- NEW FILE xorg-x11-drv-catalyst-legacy.spec ---
%global atilibdir %{_libdir}/catalyst-legacy
%global amdrun amd-driver-installer-catalyst-%{version}-legacy-linux-x86.x86_64.run
%global debug_package %{nil}
%global __strip /bin/true
Name: xorg-x11-drv-catalyst-legacy
Version: 13.1
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI legacy 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: http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-%{versio...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-legacy-README.Fedora
Source3: amdcccle.desktop
Source4: catalyst-legacy-atieventsd.init
Source5: catalyst-legacy-ati-powermode.sh
Source6: catalyst-legacy-a-ac-aticonfig
Source7: catalyst-legacy-a-lid-aticonfig
Source8: 00-catalyst-legacy-modulepath.conf
Source9: 01-catalyst-legacy-videodriver.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
Requires: catalyst-legacy-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
BuildRequires: chrpath
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
Requires(post): chkconfig
Requires(preun): chkconfig
Provides: catalyst-legacy-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-catalyst
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-173xx
Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-newest
Conflicts: xorg-x11-drv-nvidia-custom
Conflicts: xorg-x11-drv-fglrx
Obsoletes: catalyst-legacy-kmod < %{version}
# ATI auto-generated RPMs
Conflicts: ATI-fglrx
Conflicts: ATI-fglrx-control-panel
Conflicts: ATI-fglrx-devel
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
%{?filter_setup:
%filter_from_provides /^libGL\.so/d;
%filter_from_requires /^libGL\.so/d;
%filter_setup
}
%description
This package provides the legacy proprietary AMD display driver which
allows for hardware accelerated rendering with ATI Mobility, FireGL and
Desktop GPUs. Some of the Desktop and Mobility GPUs supported are the
Radeon HD 2xxx series to the Radeon HD 6xxx series.
For the full product support list, please consult the release notes
for release %{version}.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
%description devel
This package provides the development files of the %{name}
package, such as OpenGL headers.
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{version}-%{release}
Requires(post): ldconfig
Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%description libs
This package provides the shared libraries for %{name}.
%prep
%setup -q -c -T
# Unzip fglrx driver
unzip %{SOURCE0}
# Extract fglrx driver
sh %{amdrun} --extract fglrx
# Extract XvBA devel files
mkdir amdxvba
pushd amdxvba
tar xfz %{SOURCE1}
# rename docs
mv -f LICENSE AMD_XvBA_LICENSE
mv -f README AMD_XvBA_README
popd
# fix end line encoding
sed -i "s|\r||g" fglrx/common/usr/share/doc/amdcccle/ccc_copyrights.txt
# Create tarball of kmod data for use later
tar -cjf catalyst-legacy-kmod-data-%{version}.tar.bz2 fglrx/common/usr/share/doc/fglrx/LICENSE.TXT \
fglrx/common/*/modules/fglrx/ \
fglrx/arch/*/*/modules/fglrx/
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/xpic/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
cp -r fglrx/common/* fglrx/xpic_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
install -pm 0644 %{SOURCE2} ./README.Fedora
# Set the correct path for gdm's Xauth file before we install it in the loop below
sed -i -e 's|GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth|GDM_AUTH_FILE=/var/gdm/$1.Xauth|' fglrxpkg/etc/ati/authatieventsd.sh
%build
# Nothing to build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT ./__doc
set +x
for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e 'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$' -e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e 'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e 'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e '^./lib/modules/fglrx' -e '/usr/share/icons/ccc_' -e '^./usr/share/ati/lib')
do
if [[ ! "/${file##}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} ./__doc/${file##./usr/share/doc/fglrx/}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/drivers}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/drivers/${file##./usr/X11R6/%{_lib}/modules/drivers}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/dri}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/dri/${file##./usr/X11R6/%{_lib}/modules/dri}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst-legacy/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst-legacy/${file##./usr/X11R6/%{_lib}/modules/extensions}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/%{_lib}/modules}
%ifarch %{ix86}
elif [[ ! "/${file##./usr/X11R6/lib/modules/dri}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/lib/dri/${file##./usr/X11R6/lib/modules/dri}
%endif
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
elif [[ ! "/${file##./usr/%{_lib}/fglrx}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/fglrx}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
elif [[ ! "/${file##./usr/X11R6/bin/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_bindir}/${file##./usr/X11R6/bin/}
elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/bin/}
elif [[ ! "/${file##./usr/sbin/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/sbin/}
elif [[ ! "/${file##./etc/}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/${file##./etc/}
elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/${file##./usr/include/}
elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
elif [[ ! "/${file##./usr/share/ati/amdcccle}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file}
elif [[ ! "/${file##./usr/share/doc/amdcccle}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file}
else
echo ${file} found -- don\'t know how to handle
exit 1
fi
done
set -x
# Install XvBA headers
install -D -p -m 0644 amdxvba/include/amdxvba.h $RPM_BUILD_ROOT%{_includedir}/fglrx
# Remove switching scripts
rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibGL
rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibglx
# ATI says this is a 64-bit binary, but it's not.
rm -rf $RPM_BUILD_ROOT%{atilibdir}/libSlotMaximizerBe.so
# Remove some 'fglrx-' prefixes
mv $RPM_BUILD_ROOT%{atilibdir}/{fglrx-,}libGL.so.1.2
mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/catalyst-legacy/{fglrx-,}libglx.so
# Move XvBA data file to correct location
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
mv $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.cap $RPM_BUILD_ROOT%{_prefix}/lib
chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/libAMDXvBA.cap
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
# If we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%%{version}
ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so.1
ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so
ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so.1
ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so
ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so.1
ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so
ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so.1
ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so
ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so.1
ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so
# move authatieventsd.sh to /usr/bin
mv $RPM_BUILD_ROOT%{_sysconfdir}/ati/authatieventsd.sh $RPM_BUILD_ROOT%{_bindir}
install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/atieventsd
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/ati-powermode.sh
install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-ac-aticonfig.conf
install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
# Install static driver dependant configuration files
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-legacy-modulepath.conf
touch -r %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-legacy-modulepath.conf
install -pm 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
# Fix odd perms
find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \;
find fglrxpkg -type f -perm 0744 -exec chmod 0755 '{}' \;
chmod 644 fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
find $RPM_BUILD_ROOT -type f -name '*.a' -exec chmod 0644 '{}' \;
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/*.sh
# Remove rpaths (see comment on chrpath BR above)
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-legacy-%{_lib}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
# Update the user's version numbers in the AMD Control Center.
if [ -f %{_sysconfdir}/amdpcsdb ];then
ReleaseVersion=$(sed '/ReleaseVersion=S/!d; s/ReleaseVersion=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
if [ -n "${ReleaseVersion}" ]; then
%{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
%{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
fi
Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
if [ -n "${Catalyst_Version}" ]; then
%{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
%{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
fi
fi ||:
if [ "${1}" -eq 1 ]; then
# Add init script(s) and start it
/sbin/chkconfig --add atieventsd
/sbin/service atieventsd start >/dev/null 2>&1
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
fi
fi ||:
%post libs -p /sbin/ldconfig
%preun
if [ "${1}" -eq 0 ]; then
/sbin/service atieventsd stop >/dev/null 2>&1
/sbin/chkconfig --del atieventsd
if [ -x /sbin/grubby ] ; then
# remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon' &>/dev/null
fi
fi ||:
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
%dir %{_sysconfdir}/ati/
%doc %{_docdir}/amdcccle/ccc_copyrights.txt
%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
%{_sysconfdir}/ati/atiogl.xml
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
%{_sysconfdir}/ati/amdpcsdb.default
# OpenCL files
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/amd*.icd
# These next two files control "supported hardware" verification
%{_sysconfdir}/ati/signature
%{_sysconfdir}/ati/control
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
# no_multilib
%{_libdir}/xorg/modules/drivers/fglrx_drv.so
%{_libdir}/xorg/modules/linux/libfglrxdrm.so
%{_libdir}/xorg/modules/extensions/catalyst-legacy/
%{_libdir}/xorg/modules/*.so
%{_prefix}/lib/libAMDXvBA.cap
# /no_multilib
%{_datadir}/applications/*amdcccle.desktop
%{_datadir}/ati/amdcccle/*
%{_datadir}/icons/*
%{_mandir}/man[1-9]/atieventsd.*
%files libs
%defattr(-,root,root,-)
%config %{_sysconfdir}/ld.so.conf.d/catalyst-legacy-%{_lib}.conf
%dir %{atilibdir}
%{atilibdir}/*.so*
%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
%doc amdxvba/doc/AMD_XvBA_Spec_v0_74_01_AES_2.pdf
%doc amdxvba/AMD_XvBA_LICENSE amdxvba/AMD_XvBA_README
%{atilibdir}/*.a
%{_includedir}/fglrx/
# enumerate development symlinks
%{atilibdir}/libGL.so
%{atilibdir}/libfglrx_dm.so
%{atilibdir}/libAMDXvBA.so
%{atilibdir}/libXvBAW.so
%{atilibdir}/libatiuki.so
%changelog
* Mon Feb 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
- Update to Catalyst legacy (internal version 13.1 8.97.100.7)
* Fri Sep 21 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-3
- make review changes
* Wed Aug 22 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2
- make review changes
* Fri Aug 17 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- 12.6 released
- Change how the amd source is unpacked
- Fix source url
- change %%define to %%global
* Sun Jun 24 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-0.1
- Based on xorg-x11-drv-catalyst
- Update to Catalyst legacy 12.6 beta (internal version 8.97.100.3)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Nov 2012 17:25:32 -0000 1.1
+++ .cvsignore 4 Feb 2013 16:07:36 -0000 1.2
@@ -0,0 +1 @@
+amd-driver-installer-catalyst-13.1-legacy-linux-x86.x86_64.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Nov 2012 17:25:32 -0000 1.1
+++ sources 4 Feb 2013 16:07:37 -0000 1.2
@@ -0,0 +1,2 @@
+b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
+c07fd1332abe4c742a9a0d0e0d0a90de amd-driver-installer-catalyst-13.1-legacy-linux-x86.x86_64.zip
11 years, 2 months
rpms/wl-kmod/F-17 wl-kmod.spec,1.112,1.113
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30934
Modified Files:
wl-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.13
- Rebuilt for akmod
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- wl-kmod.spec 30 Jan 2013 15:07:26 -0000 1.112
+++ wl-kmod.spec 4 Feb 2013 15:36:01 -0000 1.113
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 7%{?dist}.12
+Release: 7%{?dist}.13
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -97,6 +97,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.13
+- Rebuilt for akmod
+
* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.12
- Rebuilt for akmod
11 years, 2 months
rpms/nvidia-kmod/F-17 nvidia-kmod.spec,1.156,1.157
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30810
Modified Files:
nvidia-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-2.5
- Rebuilt for akmod
11 years, 2 months
rpms/nvidia-96xx-kmod/F-17 nvidia-96xx-kmod.spec,1.59,1.60
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30686
Modified Files:
nvidia-96xx-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-2.5
- Rebuilt for akmod
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17/nvidia-96xx-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- nvidia-96xx-kmod.spec 30 Jan 2013 15:06:55 -0000 1.59
+++ nvidia-96xx-kmod.spec 4 Feb 2013 15:35:34 -0000 1.60
@@ -7,7 +7,7 @@
Name: nvidia-96xx-kmod
Version: 96.43.23
-Release: 2%{?dist}.4
+Release: 2%{?dist}.5
# Taken over by kmodtool
Summary: NVIDIA 96xx display driver kernel module
Group: System Environment/Kernel
@@ -92,6 +92,9 @@
%changelog
+* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-2.5
+- Rebuilt for akmod
+
* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-2.4
- Rebuilt for akmod
11 years, 2 months
rpms/nvidia-173xx-kmod/F-17 nvidia-173xx-kmod.spec,1.88,1.89
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30558
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.36-1.5
- Rebuilt for akmod
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/nvidia-173xx-kmod.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- nvidia-173xx-kmod.spec 30 Jan 2013 15:06:41 -0000 1.88
+++ nvidia-173xx-kmod.spec 4 Feb 2013 15:35:04 -0000 1.89
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.36
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -95,6 +95,9 @@
%changelog
+* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.36-1.5
+- Rebuilt for akmod
+
* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.36-1.4
- Rebuilt for akmod
11 years, 2 months
rpms/catalyst-legacy-kmod/F-17 catalyst-legacy-kmod.spec,1.15,1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30428
Modified Files:
catalyst-legacy-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-2.5
- Rebuilt for akmod
Index: catalyst-legacy-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17/catalyst-legacy-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- catalyst-legacy-kmod.spec 30 Jan 2013 15:06:26 -0000 1.15
+++ catalyst-legacy-kmod.spec 4 Feb 2013 15:34:41 -0000 1.16
@@ -13,7 +13,7 @@
Name: catalyst-legacy-kmod
Version: 12.6
-Release: 2%{?dist}.4
+Release: 2%{?dist}.5
# Taken over by kmodtool
Summary: AMD display legacy driver kernel module
Group: System Environment/Kernel
@@ -101,6 +101,9 @@
%changelog
+* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-2.5
+- Rebuilt for akmod
+
* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-2.4
- Rebuilt for akmod
11 years, 2 months
rpms/catalyst-kmod/F-17 catalyst-kmod.spec,1.69,1.70
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/catalyst-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30296
Modified Files:
catalyst-kmod.spec
Log Message:
* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.10-3.5
- Rebuilt for akmod
11 years, 2 months