Author: baggins Date: Sat Jul 17 14:17:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added -libs subpackage for multilib installs
- provide proper opengl implementation version
- removed libGL.so.1 hack (AFAICS provs are generated properly)
---- Files affected:
packages/xorg-driver-video-fglrx:
xorg-driver-video-fglrx.spec (1.175 -> 1.176)
---- 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.175
packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.176
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.175 Sat Jul
17 12:51:38 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Sat Jul
17 16:17:37 2010
@@ -55,25 +55,12 @@
BuildRequires: xorg-proto-recordproto-devel
BuildRequires: xorg-proto-xf86miscproto-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Requires: xorg-xserver-server(videodrv-abi) <= 7.0
-Provides: OpenGL = 2.0
-Provides: OpenGL-GLX = 1.4
Provides: xorg-xserver-module(glx)
-# hack to make OpenGL ABI compatible
-%ifarch %{x8664}
-Provides: libGL.so.1()(64bit)
-%else
-Provides: libGL.so.1
-%endif
-%if !%{with multigl}
-Obsoletes: Mesa
-Conflicts: Mesa-libGL
-%endif
-Obsoletes: X11-OpenGL-libGL < 1:7.0.0
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
Obsoletes: xorg-driver-video-fglrx-libglx
@@ -99,13 +86,41 @@
dostarcza sterowniki obsługujące wyświetlanie 2D oraz sprzętowo
akcelerowany OpenGL.
+%package libs
+Summary: OpenGL (GL and GLX) ATI/AMD libraries
+Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) ATI/AMD
+Group: X11/Development/Libraries
+Requires(post,postun): /sbin/ldconfig
+# 4.0 for Radeon HD 5000 Series
+Provides: OpenGL = 3.3
+Provides: OpenGL-GLX = 1.4
+%if %{without multigl}
+Obsoletes: Mesa
+Conflicts: Mesa-libGL
+%endif
+Obsoletes: X11-OpenGL-core < 1:7.0.0
+Obsoletes: X11-OpenGL-libGL < 1:7.0.0
+Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
+
+%description libs
+ATI/AMD OpenGL (GL and GLX only) implementation libraries.
+
+%description libs -l pl.UTF-8
+Implementacja OpenGL (tylko GL i GLX) firmy ATI/AMD.
+
%package devel
Summary: Header files for development for the ATI Radeon cards
proprietary driver
Summary(pl.UTF-8): Pliki nagłówkowe do programowania z użyciem
własnościowego sterownika dla kart ATI Radeon
Group: X11/Development/Libraries
-Requires: %{pname} = %{epoch}:%{version}-%{release}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
# or more?
Requires: xorg-proto-glproto-devel
+# 4.0 for Radeon HD 5000 Series
+Provides: OpenGL-devel = 3.3
+Provides: OpenGL-GLX-devel = 1.4
+Obsoletes: X11-OpenGL-devel-base
+Obsoletes: XFree86-OpenGL-devel-base
%description devel
Header files for development for the ATI proprietary driver for
@@ -239,15 +254,13 @@
%if %{with multigl}
%post
-/sbin/ldconfig
if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
fi
-%else
-%post -p /sbin/ldconfig
%endif
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post -n kernel%{_alt_kernel}-video-firegl
%depmod %{_kernel_ver}
@@ -271,6 +284,21 @@
%{_pixmapsdir}/*.xpm
%{_datadir}/ati
%if %{with multigl}
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
+%else
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%endif
+%{_libdir}/dri
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
+%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
+
+%files libs
+%defattr(644,root,root,755)
+%if %{with multigl}
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/ld.so.conf.d/fglrx.conf
%dir %{_libdir}/fglrx
%attr(755,root,root) %{_libdir}/fglrx/libAMDXvBA.so.*.*
@@ -285,8 +313,6 @@
%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
-%ghost %{_libdir}/xorg/modules/extensions/libglx.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
%else
%attr(755,root,root) %{_libdir}/libAMDXvBA.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libAMDXvBA.so.1
@@ -302,14 +328,7 @@
%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}/xorg/modules/extensions/libglx.so
%endif
-%{_libdir}/dri
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
-%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
%files devel
%defattr(644,root,root,755)
@@ -339,6 +358,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.176 2010/07/17 14:17:37 baggins
+- added -libs subpackage for multilib installs
+- provide proper opengl implementation version
+- removed libGL.so.1 hack (AFAICS provs are generated properly)
+
Revision 1.175 2010/07/17 10:51:38 baggins
- fixed multigl bcond wrt libglx
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.175&r2=1.176&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
