packages: xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy...

[baggins]

Author: baggins                      Date: Mon Feb  6 22:07:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added xorg configs

---- Files affected:
packages/xorg-driver-video-fglrx-legacy-9.x:
   xorg-driver-video-fglrx-legacy-9.x.spec (1.3 -> 1.4) , 10-fglrx-modules.conf (NONE -> 1.1)  (NEW), 10-fglrx.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec
diff -u packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.3 packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.4
--- packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.3	Mon Feb  6 23:05:30 2012
+++ packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec	Mon Feb  6 23:07:17 2012
@@ -44,6 +44,8 @@
 Source0:	http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-9-12-x86.x86_64.run
 # Source0-md5:	a6b2b52921add6f39c3bfa9d366d8820
 Source1:	%{pname}.desktop
+Source2:	10-fglrx.conf
+Source3:	10-fglrx-modules.conf
 Patch0:		%{pname}-kh.patch
 Patch1:		%{pname}-smp.patch
 Patch2:		%{pname}-x86genericarch.patch
@@ -212,6 +214,11 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{ati,env.d},%{_bindir},%{_sbindir},%{_pixmapsdir},%{_desktopdir},%{_datadir}/ati,%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}}
+install -d $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-fglrx-modules.conf
 
 install common%{_bindir}/{amdcccle,aticonfig,atiodcli,atiode,fgl_glxgears,fglrx_xgamma,fglrxinfo} \
 	$RPM_BUILD_ROOT%{_bindir}
@@ -298,6 +305,8 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/amdxmm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/glesx.so
 %attr(755,root,root) %{_libdir}/xorg/modules/esut.a
+%{_sysconfdir}/X11/xorg.conf.d/10-fglrx.conf
+%{_sysconfdir}/X11/xorg.conf.d/10-fglrx-modules.conf
 
 %files libdri
 %defattr(644,root,root,755)
@@ -337,6 +346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/02/06 22:07:17  baggins
+- added xorg configs
+
 Revision 1.3  2012/02/06 22:05:30  baggins
 - dropped multigl bcond
 

================================================================
Index: packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx-modules.conf
diff -u /dev/null packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx-modules.conf:1.1
--- /dev/null	Mon Feb  6 23:07:22 2012
+++ packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx-modules.conf	Mon Feb  6 23:07:17 2012
@@ -0,0 +1,4 @@
+Section "Files"
+	ModulePath   "@@LIBDIR@@/xorg/modules/extensions/fglrx"
+	ModulePath   "@@LIBDIR@@/xorg/modules"
+EndSection

================================================================
Index: packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx.conf
diff -u /dev/null packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx.conf:1.1
--- /dev/null	Mon Feb  6 23:07:22 2012
+++ packages/xorg-driver-video-fglrx-legacy-9.x/10-fglrx.conf	Mon Feb  6 23:07:17 2012
@@ -0,0 +1,5 @@
+Section "Device"
+	Identifier "ATI"
+	Driver "fglrx"
+EndSection
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec?r1=1.3&r2=1.4&f=u