Сравнение xorg-server-21.1.25 с xorg-server-9999

/usr/portage/x11-base/xorg-server/xorg-server-9999.ebuild 2026-10-13 20:03:07.325246033 +0300
70 70
	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
71 71
"
72 72
DEPEND="${CDEPEND}
73
	>=x11-base/xorg-proto-2021.4.99.2
73
	>=x11-base/xorg-proto-2024.1
74 74
	>=x11-libs/xtrans-1.3.5
75 75
	media-fonts/font-util
76 76
	test? ( >=x11-libs/libxcvt-0.1.0 )
......
92 92
	elogind? ( udev )
93 93
	?? ( elogind systemd )"
94 94

  
95
UPSTREAMED_PATCHES=(
96
)
97

  
98 95
PATCHES=(
99 96
	"${UPSTREAMED_PATCHES[@]}"
100 97
	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
101
	# needed for new eselect-opengl, bug #541232
102
	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
103
	# pending upstream backport, bug #885763
104
	"${FILESDIR}"/${PN}-21.1.10-c99.patch
105
	# bug #984048
106
	"${FILESDIR}"/${PN}-21.1.25-arm-revert-hack.patch
107 98
)
108 99

  
109 100
src_configure() {
......
111 102
	use x86 && replace-flags -Os -O2
112 103
	use x86 && replace-flags -Oz -O2
113 104

  
105
	use debug && EMESON_BUILDTYPE=debug
106

  
114 107
	# localstatedir is used for the log location; we need to override the default
115 108
	#	from ebuild.sh
116 109
	# sysconfdir is used for the xorg.conf location; same applies
117 110
	local XORG_CONFIGURE_OPTIONS=(
118 111
		--localstatedir "${EPREFIX}/var"
119 112
		--sysconfdir "${EPREFIX}/etc/X11"
120
		-Dbuildtype=$(usex debug debug plain)
121 113
		-Db_ndebug=$(usex debug false true)
122 114
		$(meson_use !minimal dri1)
123 115
		$(meson_use !minimal dri2)
124 116
		$(meson_use !minimal dri3)
125 117
		$(meson_use !minimal glamor)
126 118
		$(meson_use !minimal glx)
119
		$(meson_use test tests)
127 120
		$(meson_use udev)
128 121
		$(meson_use udev udev_kms)
129 122
		$(meson_use unwind libunwind)
......
140 133
		-Dhal=false
141 134
		-Dlinux_acpi=false
142 135
		-Dlinux_apm=false
143
		-Dsecure-rpc=false
144 136
		-Dsha1=libcrypto
145 137
		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
146 138
	)
......
176 168
	fi
177 169

  
178 170
	if ! use xorg; then
179
		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
171
		rm -f "${ED}"/usr/share/man/man1/Xserver.1 \
180 172
			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
181
			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
182
			"${ED}"/usr/share/man/man1/Xserver.1x || die
173
			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc || die
183 174
	fi
184 175

  
185 176
	# install the @x11-module-rebuild set for Portage
Спасибо!