Index: xorg-server/21.1.7/Makefile
===================================================================
--- xorg-server/21.1.7/Makefile (nonexistent)
+++ xorg-server/21.1.7/Makefile (revision 5)
@@ -0,0 +1,391 @@
+
+COMPONENT_TARGETS = $(HARDWARE_INTEL_PC32)
+COMPONENT_TARGETS += $(HARDWARE_INTEL_PC64)
+COMPONENT_TARGETS += $(HARDWARE_EBOX_3350DX2)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP2E)
+COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_POIN2)
+COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_EDGE)
+COMPONENT_TARGETS += $(HARDWARE_LEEZ_P710)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6DL_C)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6Q_C)
+COMPONENT_TARGETS += $(HARDWARE_BONE_BLACK)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_T1)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_M1)
+COMPONENT_TARGETS += $(HARDWARE_S824L)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN)
+COMPONENT_TARGETS += $(HARDWARE_S824L_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
+
+
+NEED_ABS_PATH = true
+COMPONENT_IS_3PP = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES = sources/X.org/xserver/xorg-server
+
+REQUIRES = libs/eudev/3.2.10
+REQUIRES += libs/libbsd/0.11.4
+REQUIRES += net/nettle/3.7.1
+REQUIRES += X11/app/dbus-x11-launch/1.13.18
+
+REQUIRES += X11/X.org/proto/xorgproto/2022.2
+
+REQUIRES += X11/X.org/lib/libXaw/1.0.14
+REQUIRES += X11/X.org/lib/libXft/2.3.7
+REQUIRES += X11/X.org/lib/libXfont2/2.0.6
+REQUIRES += X11/X.org/lib/libXdamage/1.1.6
+REQUIRES += X11/X.org/lib/libXxf86vm/1.1.5
+REQUIRES += X11/X.org/lib/libXres/1.2.2
+REQUIRES += X11/X.org/lib/libXtst/1.2.4
+REQUIRES += X11/X.org/lib/libdmx/1.1.4
+REQUIRES += X11/X.org/lib/pixman/0.42.2
+REQUIRES += X11/X.org/lib/libxshmfence/1.3.2
+REQUIRES += X11/X.org/lib/libxkbfile/1.1.2
+REQUIRES += X11/X.org/lib/libxcvt/0.1.2
+
+REQUIRES += X11/X.org/xcb/xcb-util-cursor/0.1.4
+REQUIRES += X11/X.org/xcb/xcb-util-keysyms/0.4.1
+REQUIRES += X11/X.org/xcb/xcb-util-wm/0.4.2
+
+REQUIRES += X11/X.org/lib/libpciaccess/0.17
+
+REQUIRES += X11/libs/libdrm/2.4.114
+REQUIRES += X11/libs/libepoxy/1.5.10
+REQUIRES += Wayland/wayland/1.21.0
+
+REQUIRES += X11/libs/opengl-collection
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version = 21.1.7
+tar_xz_archive = $(SRC_PACKAGE_PATH)/X.org/xserver/xorg-server/xorg-server-$(version).tar.xz
+SRC_ARCHIVE = $(tar_xz_archive)
+SRC_DIR = $(TARGET_BUILD_DIR)/xorg-server-$(version)
+src_dir_name = xorg-server-$(version)
+src_done = $(TARGET_BUILD_DIR)/.source_done
+
+kbd_layout_evdev = $(CURDIR)/kbd-layout/90-keyboard-layout-evdev.conf
+
+PATCHES = PATCHES
+
+build_dir = $(TARGET_BUILD_DIR)/build
+build_target = $(TARGET_BUILD_DIR)/.build_done
+install_target = $(TARGET_BUILD_DIR)/.install_done
+
+
+ifeq ($(TOOLCHAIN),$(TOOLCHAIN_S9XX_GLIBC))
+OPTIMIZATION_FLAGS = -O2
+endif
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME = xorg-server
+XORG_PKG_VERSION = 21.1.7
+XORG_PKG_ARCH = $(PKGARCH)
+XORG_PKG_DISTRO_NAME = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+XORG_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION = The Xorg server
+XORG_PKG_URL = $(BUG_URL)
+XORG_PKG_LICENSE = custom
+XORG_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature = $(call sign-name,$(pkg_archive))
+pkg_description = $(call desc-name,$(pkg_archive))
+products = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS = $(build_target)
+BUILD_TARGETS += $(install_target)
+
+PRODUCT_TARGETS = $(products)
+
+ROOTFS_TARGETS = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+#
+# Servers to build:
+#
+BUILD_SERVERS = --enable-xorg
+BUILD_SERVERS += --enable-xvfb
+BUILD_SERVERS += --enable-xnest
+BUILD_SERVERS += --enable-glamor
+BUILD_SERVERS += --enable-kdrive
+BUILD_SERVERS += --enable-xephyr
+
+#
+# Default font paths to be used by the X server:
+#
+DEF_FONTPATH = "/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
+
+extra_configure_switches = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+extra_configure_switches += --enable-config-udev
+extra_configure_switches += --disable-config-hal
+
+extra_configure_switches += --enable-ipv6
+extra_configure_switches += --enable-dri
+extra_configure_switches += --enable-dri2
+extra_configure_switches += --enable-dri3
+
+extra_configure_switches += --with-pic
+extra_configure_switches += --with-int10=x86emu
+extra_configure_switches += --with-default-font-path="$(DEF_FONTPATH)"
+extra_configure_switches += --with-module-dir=/usr/lib$(LIBSUFFIX)/xorg/modules
+extra_configure_switches += --with-xkb-bin-directory=/usr/bin
+extra_configure_switches += --with-xkb-path=/usr/share/X11/xkb
+extra_configure_switches += --with-xkb-output=/var/lib/xkb
+extra_configure_switches += --with-fontrootdir=/usr/share/fonts
+
+extra_configure_switches += --with-vendor-name="$(DISTRO_CAPTION) cross Linux"
+extra_configure_switches += --with-vendor-name-short="$(DISTRO_CAPTION) $(DISTRO_VERSION)"
+extra_configure_switches += --with-vendor-web="$(BUG_URL)"
+
+extra_configure_switches += --with-builderstring="$(DISTRO_CAPTION) cross Linux Project"
+extra_configure_switches += --with-builder-addr="$(BUG_URL)"
+
+extra_configure_switches += --enable-systemd-logind=no
+extra_configure_switches += --with-systemd-daemon=no
+
+
+CFLAGS += -Wno-declaration-after-statement -Wno-missing-prototypes -Wno-unused-variable -Wno-unused-function
+CFLAGS += -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-use-after-free -Wno-logical-op -Wno-missing-declarations
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+LDFLAGS += -Wl,-rpath,$(TARGET_BIN_RPATH)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+ $(UNPACK_SRC_ARCHIVE)
+ $(APPLY_PATCHES)
+ @touch $@
+
+$(build_target): $(src_done)
+ @mkdir -p $(build_dir)
+ @cd $(build_dir) && \
+ $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ --prefix=/usr \
+ --build=$(BUILD) \
+ --host=$(TARGET) \
+ $(extra_configure_switches) \
+ $(BUILD_SERVERS)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ @touch $@
+
+$(install_target): $(build_target)
+ @mkdir -p $(XORG_PKG)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ @rm -rf $(XORG_PKG)/var/log
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+ rm -rf modules ; \
+ ln -sf xorg/modules . ; \
+ )
+ @mkdir -p $(XORG_PKG)/etc/X11/xorg.conf.d $(XORG_PKG)/usr/share/X11/xorg.conf.d
+ @cp -a $(kbd_layout_evdev) $(XORG_PKG)/usr/share/X11/xorg.conf.d
+ @chmod u+s $(XORG_PKG)/usr/bin/Xorg
+ # ======= Install Documentation =======
+ @( cd $(XORG_PKG)/usr/share/man/man5 ; \
+ for file in *.5 ; do \
+ ln=`head -n 1 $$file` ; \
+ if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+ origin=`echo $$ln | cut -f 2 -d ' '` ; \
+ origin=`basename $$origin` ; \
+ rm -f $$file ; \
+ ln -sf $$origin $$file ; \
+ fi ; \
+ done ; \
+ )
+ @if [ -d $(XORG_PKG)/usr/share/man ]; then \
+ ( cd $(XORG_PKG)/usr/share/man ; \
+ for manpagedir in `find . -type d -name "man*"` ; do \
+ ( cd $$manpagedir ; \
+ for eachpage in `find . -type l -maxdepth 1` ; do \
+ ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+ rm $$eachpage ; \
+ done ; \
+ gzip -9 *.? ; \
+ ) \
+ done \
+ ) \
+ fi
+ @mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+ @cp -a $(SRC_DIR)/COPYING \
+ $(XORG_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+ @( cd $(SRC_DIR) ; \
+ cp -a COPYING INSTALL README.md \
+ $(XORG_PKG)/usr/share/doc/$(src_dir_name) ; \
+ )
+ @mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)/html
+ @( cd $(build_dir)/doc ; \
+ cp -a *.html \
+ $(XORG_PKG)/usr/share/doc/$(src_dir_name)/html ; \
+ )
+ @( cd $(XORG_PKG)/usr/share/doc ; \
+ ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+ )
+ @( cd $(SRC_DIR) ; \
+ if [ -r ChangeLog ]; then \
+ DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+ touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+ fi \
+ )
+ # ======= remove toolchain path from target libtool *.la files =======
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libexa.la libfbdevhw.la libglamoregl.la \
+ libint10.la libshadow.la libshadowfb.la \
+ libvgahw.la libwfb.la ; \
+ )
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" modesetting_drv.la ; \
+ )
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/extensions ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libglx.la ; \
+ )
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" inputtest_drv.la ; \
+ )
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(XORG_PKG))
+ # ======= tune libtool *.la search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libexa.la libfbdevhw.la libglamoregl.la \
+ libint10.la libshadow.la libshadowfb.la \
+ libvgahw.la libwfb.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libexa.la libfbdevhw.la libglamoregl.la \
+ libint10.la libshadow.la libshadowfb.la \
+ libvgahw.la libwfb.la ; \
+ )
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" modesetting_drv.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" modesetting_drv.la ; \
+ )
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/extensions ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libglx.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libglx.la ; \
+ )
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" inputtest_drv.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" inputtest_drv.la ; \
+ )
+ # ======= tune pkg-config *.pc search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xorg-server.pc ; \
+ )
+ # ======= Strip binaries =======
+ @( cd $(XORG_PKG) ; \
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ )
+ifneq ($(PATCHELF),)
+ # ======= Set RPATH/RUNPATH for target binaries =======
+ @( cd $(XORG_PKG)/usr/bin ; \
+ for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(PATCHELF) --set-rpath $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Set RPATH/RUNPATH for target shared objects =======
+ @( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+ for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(PATCHELF) --set-rpath $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+endif
+ @touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+ @cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature) : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+ @cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+ @cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+ @echo "pkgname=$(XORG_PKG_NAME)" > $(XORG_PKG)/.PKGINFO ; \
+ echo "pkgver=$(XORG_PKG_VERSION)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "arch=$(XORG_PKG_ARCH)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "distroname=$(XORG_PKG_DISTRO_NAME)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "distrover=$(XORG_PKG_DISTRO_VERSION)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "group=$(XORG_PKG_GROUP)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "url=$(XORG_PKG_URL)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "license=$(XORG_PKG_LICENSE)" >> $(XORG_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+ \
+ chown -R root:root . && \
+ chmod 04755 usr/bin/Xorg && \
+ $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: xorg-server/21.1.7/PATCHES
===================================================================
--- xorg-server/21.1.7/PATCHES (nonexistent)
+++ xorg-server/21.1.7/PATCHES (revision 5)
@@ -0,0 +1,7 @@
+
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-black.patch -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-dont-check-SeatId.patch -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-mouse-kbd-layout.patch -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-modesetting-on-GeForce.patch -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-intel-ddx-only-on-pre-gen4.patch -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-21.1.7-nouveau-segfault.patch -p0
Index: xorg-server/21.1.7/kbd-layout/90-keyboard-layout-evdev.conf
===================================================================
--- xorg-server/21.1.7/kbd-layout/90-keyboard-layout-evdev.conf (nonexistent)
+++ xorg-server/21.1.7/kbd-layout/90-keyboard-layout-evdev.conf (revision 5)
@@ -0,0 +1,42 @@
+
+Section "InputClass"
+ Identifier "keyboard-all"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+ Option "XkbLayout" "us,ru"
+ Option "XkbVariant" ",winkeys"
+ Option "XkbModel" "pc104"
+ Option "XkbOptions" "grp:alt_shift_toggle,terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+# If you want to add a custom model/layout/variant to X, you will need to COPY
+# this file to /etc/X11/xorg.conf.d/ and edit that copy. After editing it to
+# suit, you will need to restart X.
+#
+# Here's an example of the lines from above:
+#
+# Section "InputClass"
+# Identifier "keyboard-all"
+# MatchIsKeyboard "on"
+# MatchDevicePath "/dev/input/event*"
+# Driver "evdev"
+# Option "XkbLayout" "us"
+# Option "XkbVariant" "intl"
+# Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+# Many desktop environments, including KDE and Xfce, have their own methods to
+# configure keyboard layouts and such if you'd like to use them.
+#
+# If you prefer to use the "old" way of configuring keyboards (without input
+# device hotplugging), then you'll need to add the following lines to the
+# ServerFlags section of /etc/X11/xorg.conf:
+# Option "AllowEmptyInput" "false"
+# Option "AutoAddDevices" "false"
+# Option "AutoEnableDevices" "false"
+# Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+# directory, but that's your call. Assuming you elect to keep a monolithic
+# /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
Index: xorg-server/21.1.7/kbd-layout
===================================================================
--- xorg-server/21.1.7/kbd-layout (nonexistent)
+++ xorg-server/21.1.7/kbd-layout (revision 5)
Property changes on: xorg-server/21.1.7/kbd-layout
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: xorg-server/21.1.7/xorg-server-pkg-description.in
===================================================================
--- xorg-server/21.1.7/xorg-server-pkg-description.in (nonexistent)
+++ xorg-server/21.1.7/xorg-server-pkg-description.in (revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+xorg-server: xorg-server @VERSION@ (The Xorg server - core of the X Window System)
+xorg-server:
+xorg-server: Xorg is a full featured X server that was originally designed for
+xorg-server: UNIX and UNIX-like operating systems running on Intel x86 hardware.
+xorg-server: It now runs on a wider range of hardware and OS platforms. This work
+xorg-server: was derived by the X.Org Foundation from the XFree86 Project's
+xorg-server: XFree86 4.4rc2 release. The XFree86 release was originally derived
+xorg-server: from X386 1.2 by Thomas Roell which was contributed to X11R5 by
+xorg-server: Snitily Graphics Consulting Service. [see: http://www.x.org]
+xorg-server:
+xorg-server:
Index: xorg-server/21.1.7/xorg-server-pkg-install.sh
===================================================================
--- xorg-server/21.1.7/xorg-server-pkg-install.sh (nonexistent)
+++ xorg-server/21.1.7/xorg-server-pkg-install.sh (revision 5)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1: the new package version
+pre_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+post_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_update() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_update() {
+ post_install
+}
+
+# arg 1: the old package version
+pre_remove() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
Property changes on: xorg-server/21.1.7/xorg-server-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: xorg-server/21.1.7
===================================================================
--- xorg-server/21.1.7 (nonexistent)
+++ xorg-server/21.1.7 (revision 5)
Property changes on: xorg-server/21.1.7
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: xorg-server
===================================================================
--- xorg-server (nonexistent)
+++ xorg-server (revision 5)
Property changes on: xorg-server
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 5)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~