summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/Manifest.gzbin1559 -> 1557 bytes
-rw-r--r--x11-base/xorg-server/Manifest4
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.4.ebuild6
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild6
4 files changed, 10 insertions, 6 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index d429e8ac559b..d9ec4bf573a1 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
Binary files differ
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cee860204999..d69a1871c30d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,6 +2,6 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
-EBUILD xorg-server-21.1.4.ebuild 4451 BLAKE2B 4e6e0a405e8c92ccf0e96bf582da830095e4503baccf57488067cc26fa7dab03e4232e1359a60006450a5afe252258ed8cd894457ba6efbac2cfeb18f234c1ff SHA512 1f362b0cf23ea22aa883086fa89aadd7356819740cc043a83c7ae4d5695a81ee6da849923c097f7f0f32af6cbdfc6a7a7dde7193dc2c666b52d6e4373ebb4a59
-EBUILD xorg-server-9999.ebuild 4459 BLAKE2B 07b51df2be6cb5939c6d3b23982df5b691453fb1a4b1c9afc37cded6823371a03bb09bcede9417304edc319861414571171f1c05e5e742edf333ec858239426e SHA512 8f2363b32a015c816b8169a6db437bd5fd3550f02f62d91fce850f63f9f4a043e8094959da670ff4b8daa67099cc3632c99e35b8898b80fd5c28ed5335638659
+EBUILD xorg-server-21.1.4.ebuild 4515 BLAKE2B d4e76b545375aaf945739c51cc88ac64fa2a139b7ee2486607a867c29da171541ce2fa376435410db77194add5d33546c1c1f4cd141b1b4919dbec2040a53485 SHA512 25799c629b52e469395860bc9549bf23eef16139d61fefa8dfeb490e2f88f432a38396ae5a10726b447610b4daf862e686c6e8ad5ecf0619f16636be74d81b8a
+EBUILD xorg-server-9999.ebuild 4521 BLAKE2B 734301a62c12a7a3bf89375e2e5d64bca3330f8804d22f4142f2fa8c5afbd66a816b317c5e5ffbcdebd8950ca55f7dae92972d9ecf63457a1aa9b25b66ef9225 SHA512 d452355a73fbcaf59ab8aef919e71fa4b03404babde572356dfc6b267b8688c159cee94a02923c58c1cbb0742f8ff835eacc5332fdca0871c0d7102f3128ad3f
MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild
index 068d342b87c5..00ab2ea8f078 100644
--- a/x11-base/xorg-server/xorg-server-21.1.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
XORG_TARBALL_SUFFIX="xz"
XORG_EAUTORECONF="no"
-inherit xorg-3 meson
+inherit flag-o-matic xorg-3 meson
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
@@ -103,10 +103,12 @@ PATCHES=(
)
src_configure() {
+ # bug #835653
+ use amd64 && replace-flags -Os -O2
+
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
-
local emesonargs=(
--localstatedir "${EPREFIX}/var"
--sysconfdir "${EPREFIX}/etc/X11"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 85fc86f9ac72..316e0c3ba53c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
XORG_TARBALL_SUFFIX="xz"
XORG_EAUTORECONF="no"
-inherit xorg-3 meson
+inherit flag-o-matic xorg-3 meson
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
@@ -103,10 +103,12 @@ PATCHES=(
)
src_configure() {
+ # bug #835653
+ use x86 && replace-flags -Os -O2
+
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
-
local emesonargs=(
--localstatedir "${EPREFIX}/var"
--sysconfdir "${EPREFIX}/etc/X11"