rpms/xorg-server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install libglx.so out of xorg/modules tree for server to pick right alternative [release 1.15.2-7mamba;Sat May 23 2015]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 19:48:57 +01:00
parent 46ec1715c7
commit 730b5814b7
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xorg-server.spec
View File

@ -1,6 +1,6 @@
Name: xorg-server Name: xorg-server
Version: 1.15.2 Version: 1.15.2
Release: 6mamba Release: 7mamba
Summary: The core of the X.Org Foundation implementation of the X Window system Summary: The core of the X.Org Foundation implementation of the X Window system
Group: System/X11 Group: System/X11
Vendor: openmamba Vendor: openmamba
@ -161,9 +161,9 @@ install -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/xprofile
install hw/xfree86/parser/xf86Parser.h %{buildroot}%{_includedir}/xorg/ install hw/xfree86/parser/xf86Parser.h %{buildroot}%{_includedir}/xorg/
install hw/xfree86/parser/xf86Optrec.h %{buildroot}%{_includedir}/xorg/ install hw/xfree86/parser/xf86Optrec.h %{buildroot}%{_includedir}/xorg/
install -d -m0755 %{buildroot}%{_libdir}/xorg/modules/glx-dri install -d -m0755 %{buildroot}%{_libdir}/xorg/glx-dri
mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \ mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
%{buildroot}%{_libdir}/xorg/modules/glx-dri/libglx.so %{buildroot}%{_libdir}/xorg/glx-dri/libglx.so
#mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \ #mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \
# %{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so # %{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so
@ -198,17 +198,21 @@ exit 0
--remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so 2>/dev/null --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so 2>/dev/null
/usr/sbin/update-alternatives \ /usr/sbin/update-alternatives \
--remove libglx.so %{_libdir}/xorg/modules/extensions/dri/libglx.so 2>/dev/null --remove libglx.so %{_libdir}/xorg/modules/extensions/dri/libglx.so 2>/dev/null
/usr/sbin/update-alternatives \
--remove libglx.so %{_libdir}/xorg/modules/extensions/glx-dri/libglx.so 2>/dev/null
/usr/sbin/update-alternatives \
--remove libglx.so %{_libdir}/xorg/modules/glx-dri/libglx.so 2>/dev/null
/usr/sbin/update-alternatives \ /usr/sbin/update-alternatives \
--install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so \ --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so \
%{_libdir}/xorg/modules/glx-dri/libglx.so 50 %{_libdir}/xorg/glx-dri/libglx.so 50
#/usr/sbin/update-alternatives \ #/usr/sbin/update-alternatives \
# --install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \ # --install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \
# %{_libdir}/xorg/modules/extensions/libdri_so 50 # %{_libdir}/xorg/modules/extensions/libdri_so 50
[ -e `readlink /etc/alternatives/libglx.so` ] || { [ -e `readlink /etc/alternatives/libglx.so` ] || {
/usr/sbin/update-alternatives --set libglx.so %{_libdir}/xorg/modules/glx-dri/libglx.so /usr/sbin/update-alternatives --set libglx.so %{_libdir}/xorg/glx-dri/libglx.so
} }
exit 0 exit 0
@ -220,6 +224,8 @@ if [ $1 -eq 0 ]; then
%{_libdir}/xorg/modules/extensions/dri/libglx.so %{_libdir}/xorg/modules/extensions/dri/libglx.so
/usr/sbin/update-alternatives --remove libglx.so \ /usr/sbin/update-alternatives --remove libglx.so \
%{_libdir}/xorg/modules/glx-dri/libglx.so %{_libdir}/xorg/modules/glx-dri/libglx.so
/usr/sbin/update-alternatives --remove libglx.so \
%{_libdir}/xorg/glx-dri/libglx.so
/usr/sbin/update-alternatives --remove libdri.so \ /usr/sbin/update-alternatives --remove libdri.so \
%{_libdir}/xorg/modules/extensions/libdri_so %{_libdir}/xorg/modules/extensions/libdri_so
fi fi
@ -293,10 +299,13 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/xorg/modules/extensions %dir %{_libdir}/xorg/modules/extensions
%{_libdir}/xorg/modules/extensions/libglx.la %{_libdir}/xorg/modules/extensions/libglx.la
%dir %{_libdir}/xorg/modules/glx-dri %dir %{_libdir}/xorg/glx-dri
%{_libdir}/xorg/modules/glx-dri/libglx.so %{_libdir}/xorg/glx-dri/libglx.so
%changelog %changelog
* Sat May 23 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-7mamba
- install libglx.so out of xorg/modules tree for server to pick right alternative
* Sat Dec 06 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-6mamba * Sat Dec 06 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-6mamba
- move libglx.so out for /extensions subdir or it gets preferred as opposite of what we want - move libglx.so out for /extensions subdir or it gets preferred as opposite of what we want