From e24268dc7adb68e2c0e8f57b47795d98b630f4c99415d5d11938d7792b214e72 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 7 Aug 2014 17:37:26 +0000 Subject: [PATCH 1/6] - Change U_ to u_ as these patches are not upstream yet: * u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch * u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=531 --- ...yArea-when-using-a-window-with-depth-32-and-24bpp.patch | 0 ...ing-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch | 0 xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) rename U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch => u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch (100%) rename U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch => u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch (100%) diff --git a/U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch b/u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch similarity index 100% rename from U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch rename to u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch diff --git a/U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch b/u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch similarity index 100% rename from U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch rename to u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index e8fb5df..03f1a7d 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 7 17:35:12 UTC 2014 - eich@suse.com + +- Change U_ to u_ as these patches are not upstream yet: + * u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch + * u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch + ------------------------------------------------------------------- Thu Aug 7 14:50:55 CEST 2014 - tiwai@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index fa8c529..ec3efd4 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -152,8 +152,8 @@ Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-cal Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch Patch130: U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch -Patch131: U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch -Patch132: U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch +Patch131: u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch +Patch132: u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch From c982de63ac7b9de97409c0b4f5a61b5ce3d81408356467cf62996990af0e8fe5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 7 Aug 2014 17:47:56 +0000 Subject: [PATCH 2/6] Add bug id to changelog - (bnc#890599). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=532 --- xorg-x11-server.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 03f1a7d..a28ba64 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -4,6 +4,7 @@ Thu Aug 7 17:35:12 UTC 2014 - eich@suse.com - Change U_ to u_ as these patches are not upstream yet: * u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch * u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch + (bnc#890599). ------------------------------------------------------------------- Thu Aug 7 14:50:55 CEST 2014 - tiwai@suse.de From 6dc751702f68293d84774a06e9bec7b849df4a6f971473dbffe564f191b4d464 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 12 Aug 2014 12:35:17 +0000 Subject: [PATCH 3/6] - make use of update-alternatives for libglx.so (FATE#317822) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=534 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index a28ba64..46974d5 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 12 12:26:52 UTC 2014 - sndirsch@suse.com + +- make use of update-alternatives for libglx.so (FATE#317822) + ------------------------------------------------------------------- Thu Aug 7 17:35:12 UTC 2014 - eich@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ec3efd4..08e63b0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -118,6 +118,10 @@ Requires: libpixman-1-0 >= 0.24 %(cat %{SOURCE91}) %endif Requires: Mesa +%if 0%{?suse_version} >= 1315 +Requires(post): update-alternatives +Requires(postun): update-alternatives +%endif Provides: xorg-x11-Xvfb Provides: xorg-x11-server-glx Obsoletes: xorg-x11-Xvfb @@ -341,6 +345,12 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \ %endif install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server +%ifnarch s390 s390x +%if 0%{?suse_version} >= 1315 +mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx{,-xorg}.so +ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so +%endif +%endif %post %ifnarch s390 s390x @@ -367,9 +377,22 @@ if [ -f etc/X11/xorg.conf -a ! -f etc/X11/xorg.conf.sle11 ]; then chmod -x usr/sbin/sax2 fi fi +%if 0%{?suse_version} >= 1315 +%_sbindir/update-alternatives \ + --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so 50 +%endif %endif exit 0 +%ifnarch s390 s390x +%if 0%{?suse_version} >= 1315 +%postun +if [ "$1" = 0 ] ; then + "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so +fi +%endif +%endif + %files %defattr(-,root,root) %ifnarch s390 s390x From 63dffb3f9e07cbef7897a488d7ab12a3a0a44922953a37ff258ddba20cc04c10 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 12 Aug 2014 12:46:42 +0000 Subject: [PATCH 4/6] - minor changes in changelog in order to make openSUSE:Factory checkin guidelines happy OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=535 --- xorg-x11-server.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 46974d5..11abeaf 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -7,8 +7,10 @@ Tue Aug 12 12:26:52 UTC 2014 - sndirsch@suse.com Thu Aug 7 17:35:12 UTC 2014 - eich@suse.com - Change U_ to u_ as these patches are not upstream yet: - * u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch - * u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch + * U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch + --> u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch + * U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch + --> u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch (bnc#890599). ------------------------------------------------------------------- From afd4b3b9fabfb9e91b6822f55c73c874f657eabe3742218eb1dcaaffc5aa8715 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 13 Aug 2014 08:28:25 +0000 Subject: [PATCH 5/6] - added /etc/alternatives/libglx.so as ghost - moved libglx-xorg.so to xorg/xorg-libglx.so to avoid messup in case anybody runs ldconfig in modules/extensions OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=536 --- xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 11abeaf..91cf875 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 13 08:13:21 UTC 2014 - sndirsch@suse.com + +- added /etc/alternatives/libglx.so as ghost +- moved libglx-xorg.so to xorg/xorg-libglx.so to avoid messup in case + anybody runs ldconfig in modules/extensions + ------------------------------------------------------------------- Tue Aug 12 12:26:52 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 08e63b0..85d7759 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -347,7 +347,9 @@ install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtr install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server %ifnarch s390 s390x %if 0%{?suse_version} >= 1315 -mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx{,-xorg}.so +mkdir -p %{buildroot}%{_libdir}/xorg/modules/extensions/xorg +mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \ + %{buildroot}%{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so %endif %endif @@ -379,7 +381,7 @@ if [ -f etc/X11/xorg.conf -a ! -f etc/X11/xorg.conf.sle11 ]; then fi %if 0%{?suse_version} >= 1315 %_sbindir/update-alternatives \ - --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so 50 + --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so %{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so 50 %endif %endif exit 0 @@ -388,7 +390,7 @@ exit 0 %if 0%{?suse_version} >= 1315 %postun if [ "$1" = 0 ] ; then - "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so + "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so fi %endif %endif @@ -428,6 +430,7 @@ fi %{_mandir}/man5/* %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name} %{_localstatedir}/lib/X11/X +%ghost %{_sysconfdir}/alternatives/libglx.so %endif %{_bindir}/Xvfb %{_bindir}/xorg-backtrace From e35f04d66357a3b03724de4f122f373e9609a98e87f773acd32987b44afd8368 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 13 Aug 2014 12:40:28 +0000 Subject: [PATCH 6/6] - only add /etc/alternatives/libglx.so as ghost on suse >= 1315 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=537 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 91cf875..58bfdb3 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 13 12:39:39 UTC 2014 - sndirsch@suse.com + +- only add /etc/alternatives/libglx.so as ghost on suse >= 1315 + ------------------------------------------------------------------- Wed Aug 13 08:13:21 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 85d7759..dfb644a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -430,8 +430,10 @@ fi %{_mandir}/man5/* %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name} %{_localstatedir}/lib/X11/X +%if 0%{?suse_version} >= 1315 %ghost %{_sysconfdir}/alternatives/libglx.so %endif +%endif %{_bindir}/Xvfb %{_bindir}/xorg-backtrace