~olbohlen/oi-userland.git

			@@ -14,13 +14,12 @@
			# Copyright 2016-2018 Aurelien Larcher
			#

			BUILD_BITS=64
			include ../../../make-rules/shared-macros.mk
			include $(WS_MAKE_RULES)/x11.mk

			COMPONENT_NAME= xorg-server
			COMPONENT_VERSION= 1.19.7
			COMPONENT_REVISION= 10
			COMPONENT_REVISION= 11
			COMPONENT_SUMMARY= Xorg - X11R7 X server
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
			@@ -41,7 +40,7 @@

			# Missing files in build dir for configure without this.
			COMPONENT_PRE_CONFIGURE_ACTION = (cp -a $(SOURCE_DIR)/* $(@D) &&\
			cd $(@D) && autoreconf --install --force )
			cd $(@D) && PATH="$(PATH)" autoreconf --install --force )

			# Enabling gcc optimization leads to crashes
			gcc_OPT =
			@@ -122,13 +121,8 @@
			REQUIRED_PACKAGES += x11/font-util
			REQUIRED_PACKAGES += x11/library/libxkbfile
			REQUIRED_PACKAGES += x11/library/libxres
			REQUIRED_PACKAGES += x11/library/xcb-util
			REQUIRED_PACKAGES += x11/library/xcb-util-cursor
			REQUIRED_PACKAGES += x11/library/xcb-util-errors
			REQUIRED_PACKAGES += x11/library/xcb-util-image
			REQUIRED_PACKAGES += x11/library/xcb-util-keysyms
			REQUIRED_PACKAGES += x11/library/xcb-util-renderutil
			REQUIRED_PACKAGES += x11/library/xcb-util-wm
			REQUIRED_PACKAGES += x11/library/xtrans
			REQUIRED_PACKAGES += system/header/header-audio
			REQUIRED_PACKAGES += system/header/header-drm
			@@ -136,7 +130,6 @@
			REQUIRED_PACKAGES += developer/build/autoconf/xorg-macros

			# Sustained dependencies
			REQUIRED_PACKAGES += x11/library/libxmu
			REQUIRED_PACKAGES += x11/library/libxfont
			REQUIRED_PACKAGES += x11/library/libxv

			@@ -145,6 +138,7 @@
			REQUIRED_PACKAGES += diagnostic/scanpci
			REQUIRED_PACKAGES += library/graphics/pixman
			REQUIRED_PACKAGES += service/hal
			REQUIRED_PACKAGES += shell/ksh93
			REQUIRED_PACKAGES += system/library
			REQUIRED_PACKAGES += system/library/libdbus
			REQUIRED_PACKAGES += system/library/math
			@@ -158,9 +152,15 @@
			REQUIRED_PACKAGES += x11/library/libxfixes
			REQUIRED_PACKAGES += x11/library/libxfont2
			REQUIRED_PACKAGES += x11/library/libxi
			REQUIRED_PACKAGES += x11/library/libxmu
			REQUIRED_PACKAGES += x11/library/libxmuu
			REQUIRED_PACKAGES += x11/library/libxpm
			REQUIRED_PACKAGES += x11/library/libxrender
			REQUIRED_PACKAGES += x11/library/libxshmfence
			REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
			REQUIRED_PACKAGES += x11/library/toolkit/libxt
			REQUIRED_PACKAGES += x11/library/xcb-util
			REQUIRED_PACKAGES += x11/library/xcb-util-image
			REQUIRED_PACKAGES += x11/library/xcb-util-keysyms
			REQUIRED_PACKAGES += x11/library/xcb-util-renderutil
			REQUIRED_PACKAGES += x11/library/xcb-util-wm

			@@ -51,13 +51,13 @@

			# Required dependencies
			depend fmri=service/opengl/ogl-select type=require
			depend type=require fmri=pkg:/x11/keyboard/data-xkb
			depend type=require fmri=pkg:/x11/keyboard/xkbcomp
			depend type=require fmri=pkg:/system/keyboard/kbd_mode
			depend type=require fmri=x11/keyboard/data-xkb
			depend type=require fmri=x11/keyboard/xkbcomp
			depend type=require fmri=system/keyboard/kbd_mode

			# Follow solaris-xorg
			depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-input-keyboard
			depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-input-mouse
			depend type=group fmri=x11/server/xorg/driver/xorg-input-keyboard
			depend type=group fmri=x11/server/xorg/driver/xorg-input-mouse

			file path=usr/bin/Xorg mode=4555
			file path=usr/bin/cvt

	components/x11/xorg-server/Makefile	18 ●●●●● patch \| view \| raw \| blame \| history
	components/x11/xorg-server/manifests/sample-manifest.p5m	2 ●●●●● patch \| view \| raw \| blame \| history
	components/x11/xorg-server/pkg5	4 ●●●●● patch \| view \| raw \| blame \| history
	components/x11/xorg-server/xorg.p5m	10 ●●●●● patch \| view \| raw \| blame \| history

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2022 <contributor>
			# Copyright 2023 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

			@@ -47,12 +47,12 @@
			"x11/library/xtrans"
			],
			"fmris": [
			"x11/trusted/trusted-xorg",
			"x11/server/xdmx",
			"x11/server/xephyr",
			"x11/server/xorg",
			"x11/server/xserver-common",
			"x11/server/xvfb",
			"x11/trusted/trusted-xorg"
			"x11/server/xvfb"
			],
			"name": "xorg-server"
			}