packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - new TODO :/
baggins
baggins at pld-linux.org
Wed Apr 28 23:46:36 CEST 2010
Author: baggins Date: Wed Apr 28 21:46:36 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- new TODO :/
---- Files affected:
packages/xorg-driver-video-fglrx:
xorg-driver-video-fglrx.spec (1.167 -> 1.168)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.167 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.168
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.167 Wed Apr 28 20:49:47 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Wed Apr 28 23:46:31 2010
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# TODO:
-# - xserver 1.7 / xorg 7.5 support (10.3 still no-go)
+# - xserver 1.8 support (10.4 fails miserably)
#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
@@ -10,7 +10,7 @@
%bcond_with verbose # verbose build (V=1)
%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers
-%define x11ver x740
+%define x11ver x750
%if %{without kernel}
%undefine with_dist_kernel
@@ -57,7 +57,6 @@
BuildRequires: xorg-proto-recordproto-devel
BuildRequires: xorg-proto-xf86miscproto-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel
-Requires: %{pname}-libdri = %{epoch}:%{version}-%{release}
Requires: %{pname}-libglx = %{epoch}:%{version}-%{release}
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
@@ -78,6 +77,7 @@
Obsoletes: X11-driver-firegl < 1:7.0.0
Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
Obsoletes: XFree86-driver-firegl < 1:7.0.0
+Obsoletes: xorg-driver-video-fglrx-libdri
ExclusiveArch: i586 i686 athlon pentium3 pentium4 %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,20 +96,6 @@
dostarcza sterowniki obsługujące wyświetlanie 2D oraz sprzętowo
akcelerowany OpenGL.
-%package libdri
-Summary: DRI extension library for X.org server with fglrx driver
-Summary(pl.UTF-8): Biblioteka rozszerzenia DRI dla serwera X.org ze sterownikiem fglrx
-Group: X11/Servers
-Provides: xorg-xserver-module(dri)
-Conflicts: xorg-driver-video-nvidia
-Conflicts: xorg-xserver-libdri
-
-%description libdri
-DRI extension library for X.org server with fglrx driver.
-
-%description libdri -l pl.UTF-8
-Biblioteka rozszerzenia DRI dla serwera X.org with fglrx driver.
-
%package libglx
Summary: GLX extension library for X.org server with fglrx driver
Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org ze sterownikiem fglrx
@@ -189,6 +175,7 @@
cp -r arch/%{arch_dir}/usr/X11R6/%{_lib}/* common%{_libdir}
cp -r arch/%{arch_dir}/usr/X11R6/bin/* common%{_bindir}
cp -r arch/%{arch_dir}/usr/sbin/* common%{_sbindir}
+cp -r arch/%{arch_dir}/usr/%{_lib}/*.so.* common%{_libdir}
%build
%if %{with kernel}
@@ -245,7 +232,7 @@
echo "LIBGL_DRIVERS_PATH=%{_libdir}/xorg/modules/dri" > $RPM_BUILD_ROOT%{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
cd $RPM_BUILD_ROOT%{_libdir}
-for f in libfglrx_dm libfglrx_gamma libfglrx_tvout; do
+for f in libfglrx_dm libfglrx_gamma; do
%if %{with multigl}
ln -s fglrx/$f.so.*.* $f.so
%else
@@ -292,13 +279,12 @@
%{_libdir}/fglrx/libAMDXvBA.cap
%endif
%attr(755,root,root) %{_libdir}/fglrx/libatiadlxx.so
+%attr(755,root,root) %{_libdir}/fglrx/libatiuki.so.*.*
%attr(755,root,root) %{_libdir}/fglrx/libGL.so.*.*
%attr(755,root,root) %{_libdir}/fglrx/libGL.so.1
%attr(755,root,root) %{_libdir}/fglrx/libfglrx_dm.so.*.*
%attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.*.*
%attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.1
-#%attr(755,root,root) %{_libdir}/fglrx/libfglrx_tvout.so.*.*
-#%attr(755,root,root) %{_libdir}/fglrx/libfglrx_tvout.so.1
%else
%ifarch %{ix86} %{x8664}
%attr(755,root,root) %{_libdir}/libAMDXvBA.so.*.*
@@ -308,14 +294,14 @@
%{_libdir}/libAMDXvBA.cap
%endif
%attr(755,root,root) %{_libdir}/libatiadlxx.so
+%attr(755,root,root) %{_libdir}/libatiuki.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libatiuki.so.1
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
%attr(755,root,root) %{_libdir}/libGL.so
%attr(755,root,root) %{_libdir}/libfglrx_dm.so.*.*
%attr(755,root,root) %{_libdir}/libfglrx_gamma.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libfglrx_gamma.so.1
-#%attr(755,root,root) %{_libdir}/libfglrx_tvout.so.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libfglrx_tvout.so.1
%endif
%{_libdir}/dri
%attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
@@ -323,11 +309,6 @@
%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfglrxdrm.so
%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
-
-%files libdri
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
%files libglx
%defattr(644,root,root,755)
@@ -337,10 +318,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libfglrx_dm.so
%attr(755,root,root) %{_libdir}/libfglrx_gamma.so
-#%attr(755,root,root) %{_libdir}/libfglrx_tvout.so
%attr(755,root,root) %{_includedir}/GL
-%{_includedir}/GL/glATI.h
-%{_includedir}/GL/glxATI.h
%{_includedir}/X11/extensions/fglrx_gamma.h
%if %{with multigl}
%attr(755,root,root) %{_libdir}/libGL.so
@@ -350,7 +328,6 @@
%defattr(644,root,root,755)
%{_libdir}/libfglrx_dm.a
%{_libdir}/libfglrx_gamma.a
-#%{_libdir}/libfglrx_tvout.a
%endif
%if %{with kernel}
@@ -365,6 +342,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.168 2010/04/28 21:46:31 baggins
+- new TODO :/
+
Revision 1.167 2010/04/28 18:49:47 baggins
- 10.4, finally xorg 7.5 supported
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.167&r2=1.168&f=u
More information about the pld-cvs-commit
mailing list