summaryrefslogtreecommitdiffstats
path: root/source/x/x11
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/build/appres2
-rw-r--r--source/x/x11/build/bdftopcf2
-rw-r--r--source/x/x11/build/beforelight2
-rw-r--r--source/x/x11/build/bitmap2
-rw-r--r--source/x/x11/build/dejavu-fonts-ttf1
-rw-r--r--source/x/x11/build/editres2
-rw-r--r--source/x/x11/build/encodings2
-rw-r--r--source/x/x11/build/font-adobe-100dpi2
-rw-r--r--source/x/x11/build/font-adobe-75dpi2
-rw-r--r--source/x/x11/build/font-adobe-utopia-100dpi2
-rw-r--r--source/x/x11/build/font-adobe-utopia-75dpi2
-rw-r--r--source/x/x11/build/font-adobe-utopia-type12
-rw-r--r--source/x/x11/build/font-alias2
-rw-r--r--source/x/x11/build/font-arabic-misc2
-rw-r--r--source/x/x11/build/font-bh-100dpi2
-rw-r--r--source/x/x11/build/font-bh-75dpi2
-rw-r--r--source/x/x11/build/font-bh-lucidatypewriter-100dpi2
-rw-r--r--source/x/x11/build/font-bh-lucidatypewriter-75dpi2
-rw-r--r--source/x/x11/build/font-bh-ttf2
-rw-r--r--source/x/x11/build/font-bh-type12
-rw-r--r--source/x/x11/build/font-bitstream-100dpi2
-rw-r--r--source/x/x11/build/font-bitstream-75dpi2
-rw-r--r--source/x/x11/build/font-bitstream-type12
-rw-r--r--source/x/x11/build/font-cronyx-cyrillic2
-rw-r--r--source/x/x11/build/font-cursor-misc2
-rw-r--r--source/x/x11/build/font-daewoo-misc2
-rw-r--r--source/x/x11/build/font-dec-misc2
-rw-r--r--source/x/x11/build/font-ibm-type12
-rw-r--r--source/x/x11/build/font-isas-misc2
-rw-r--r--source/x/x11/build/font-jis-misc2
-rw-r--r--source/x/x11/build/font-micro-misc2
-rw-r--r--source/x/x11/build/font-misc-cyrillic2
-rw-r--r--source/x/x11/build/font-misc-ethiopic2
-rw-r--r--source/x/x11/build/font-misc-meltho2
-rw-r--r--source/x/x11/build/font-misc-misc2
-rw-r--r--source/x/x11/build/font-mutt-misc2
-rw-r--r--source/x/x11/build/font-schumacher-misc2
-rw-r--r--source/x/x11/build/font-screen-cyrillic2
-rw-r--r--source/x/x11/build/font-sony-misc2
-rw-r--r--source/x/x11/build/font-sun-misc2
-rw-r--r--source/x/x11/build/font-util2
-rw-r--r--source/x/x11/build/font-winitzki-cyrillic2
-rw-r--r--source/x/x11/build/font-xfree86-type12
-rw-r--r--source/x/x11/build/fontconfig1
-rw-r--r--source/x/x11/build/freeglut1
-rw-r--r--source/x/x11/build/fslsfonts2
-rw-r--r--source/x/x11/build/fstobdf2
-rw-r--r--source/x/x11/build/gccmakedep2
-rw-r--r--source/x/x11/build/glew1
-rw-r--r--source/x/x11/build/glu1
-rw-r--r--source/x/x11/build/iceauth2
-rw-r--r--source/x/x11/build/ico2
-rw-r--r--source/x/x11/build/igt-gpu-tools2
-rw-r--r--source/x/x11/build/imake2
-rw-r--r--source/x/x11/build/intel-vaapi-driver1
-rw-r--r--source/x/x11/build/libFS2
-rw-r--r--source/x/x11/build/libICE2
-rw-r--r--source/x/x11/build/libSM2
-rw-r--r--source/x/x11/build/libXScrnSaver2
-rw-r--r--source/x/x11/build/libXau2
-rw-r--r--source/x/x11/build/libXaw3d2
-rw-r--r--source/x/x11/build/libXaw3dXft1
-rw-r--r--source/x/x11/build/libXcomposite2
-rw-r--r--source/x/x11/build/libXcursor2
-rw-r--r--source/x/x11/build/libXdamage2
-rw-r--r--source/x/x11/build/libXdmcp2
-rw-r--r--source/x/x11/build/libXext2
-rw-r--r--source/x/x11/build/libXi2
-rw-r--r--source/x/x11/build/libXinerama2
-rw-r--r--source/x/x11/build/libXmu2
-rw-r--r--source/x/x11/build/libXp2
-rw-r--r--source/x/x11/build/libXpm2
-rw-r--r--source/x/x11/build/libXpresent2
-rw-r--r--source/x/x11/build/libXrandr2
-rw-r--r--source/x/x11/build/libXrender2
-rw-r--r--source/x/x11/build/libXt2
-rw-r--r--source/x/x11/build/libXtst2
-rw-r--r--source/x/x11/build/libXv2
-rw-r--r--source/x/x11/build/libXvMC2
-rw-r--r--source/x/x11/build/libXxf86dga2
-rw-r--r--source/x/x11/build/libXxf86vm2
-rw-r--r--source/x/x11/build/libdmx2
-rw-r--r--source/x/x11/build/libdrm1
-rw-r--r--source/x/x11/build/libepoxy1
-rw-r--r--source/x/x11/build/liberation-fonts-ttf1
-rw-r--r--source/x/x11/build/libevdev1
-rw-r--r--source/x/x11/build/libfontenc2
-rw-r--r--source/x/x11/build/libinput1
-rw-r--r--source/x/x11/build/libpciaccess2
-rw-r--r--source/x/x11/build/libpthread-stubs2
-rw-r--r--source/x/x11/build/libva1
-rw-r--r--source/x/x11/build/libva-utils1
-rw-r--r--source/x/x11/build/libvdpau1
-rw-r--r--source/x/x11/build/libwacom1
-rw-r--r--source/x/x11/build/libxcb2
-rw-r--r--source/x/x11/build/libxcvt1
-rw-r--r--source/x/x11/build/libxkbfile2
-rw-r--r--source/x/x11/build/libxshmfence2
-rw-r--r--source/x/x11/build/listres2
-rw-r--r--source/x/x11/build/lndir2
-rw-r--r--source/x/x11/build/makedepend2
-rw-r--r--source/x/x11/build/mesa1
-rw-r--r--source/x/x11/build/mkcomposecache2
-rw-r--r--source/x/x11/build/mkfontscale2
-rw-r--r--source/x/x11/build/oclock2
-rw-r--r--source/x/x11/build/pixman2
-rw-r--r--source/x/x11/build/rendercheck2
-rw-r--r--source/x/x11/build/rgb2
-rw-r--r--source/x/x11/build/sazanami-fonts-ttf1
-rw-r--r--source/x/x11/build/sessreg2
-rw-r--r--source/x/x11/build/setxkbmap2
-rw-r--r--source/x/x11/build/showfont2
-rw-r--r--source/x/x11/build/sinhala_lklug-font-ttf1
-rw-r--r--source/x/x11/build/smproxy2
-rw-r--r--source/x/x11/build/tibmachuni-font-ttf1
-rw-r--r--source/x/x11/build/transset2
-rw-r--r--source/x/x11/build/ttf-indic-fonts1
-rw-r--r--source/x/x11/build/ttf-tlwg1
-rw-r--r--source/x/x11/build/twm2
-rw-r--r--source/x/x11/build/util-macros2
-rw-r--r--source/x/x11/build/viewres2
-rw-r--r--source/x/x11/build/vulkan-sdk1
-rw-r--r--source/x/x11/build/x11-skel1
-rw-r--r--source/x/x11/build/x11perf2
-rw-r--r--source/x/x11/build/xauth2
-rw-r--r--source/x/x11/build/xbiff2
-rw-r--r--source/x/x11/build/xbitmaps2
-rw-r--r--source/x/x11/build/xcalc2
-rw-r--r--source/x/x11/build/xcb-proto2
-rw-r--r--source/x/x11/build/xcb-util2
-rw-r--r--source/x/x11/build/xcb-util-cursor2
-rw-r--r--source/x/x11/build/xcb-util-errors2
-rw-r--r--source/x/x11/build/xcb-util-image2
-rw-r--r--source/x/x11/build/xcb-util-keysyms2
-rw-r--r--source/x/x11/build/xcb-util-renderutil2
-rw-r--r--source/x/x11/build/xcb-util-wm2
-rw-r--r--source/x/x11/build/xclipboard2
-rw-r--r--source/x/x11/build/xclock2
-rw-r--r--source/x/x11/build/xcmsdb2
-rw-r--r--source/x/x11/build/xcompmgr2
-rw-r--r--source/x/x11/build/xconsole2
-rw-r--r--source/x/x11/build/xcursor-themes2
-rw-r--r--source/x/x11/build/xcursorgen2
-rw-r--r--source/x/x11/build/xdg-user-dirs1
-rw-r--r--source/x/x11/build/xditview2
-rw-r--r--source/x/x11/build/xdm2
-rw-r--r--source/x/x11/build/xdpyinfo2
-rw-r--r--source/x/x11/build/xdriinfo2
-rw-r--r--source/x/x11/build/xedit2
-rw-r--r--source/x/x11/build/xev2
-rw-r--r--source/x/x11/build/xf86-input-acecad2
-rw-r--r--source/x/x11/build/xf86-input-evdev2
-rw-r--r--source/x/x11/build/xf86-input-joystick2
-rw-r--r--source/x/x11/build/xf86-input-keyboard2
-rw-r--r--source/x/x11/build/xf86-input-mouse2
-rw-r--r--source/x/x11/build/xf86-input-penmount2
-rw-r--r--source/x/x11/build/xf86-input-synaptics2
-rw-r--r--source/x/x11/build/xf86-input-vmmouse2
-rw-r--r--source/x/x11/build/xf86-input-void2
-rw-r--r--source/x/x11/build/xf86-input-wacom2
-rw-r--r--source/x/x11/build/xf86-video-apm2
-rw-r--r--source/x/x11/build/xf86-video-ark2
-rw-r--r--source/x/x11/build/xf86-video-ast2
-rw-r--r--source/x/x11/build/xf86-video-ati2
-rw-r--r--source/x/x11/build/xf86-video-chips2
-rw-r--r--source/x/x11/build/xf86-video-cirrus2
-rw-r--r--source/x/x11/build/xf86-video-dummy2
-rw-r--r--source/x/x11/build/xf86-video-geode2
-rw-r--r--source/x/x11/build/xf86-video-glint2
-rw-r--r--source/x/x11/build/xf86-video-i1282
-rw-r--r--source/x/x11/build/xf86-video-i7402
-rw-r--r--source/x/x11/build/xf86-video-intel2
-rw-r--r--source/x/x11/build/xf86-video-mach642
-rw-r--r--source/x/x11/build/xf86-video-mga2
-rw-r--r--source/x/x11/build/xf86-video-neomagic2
-rw-r--r--source/x/x11/build/xf86-video-nouveau2
-rw-r--r--source/x/x11/build/xf86-video-nv2
-rw-r--r--source/x/x11/build/xf86-video-omap2
-rw-r--r--source/x/x11/build/xf86-video-openchrome2
-rw-r--r--source/x/x11/build/xf86-video-r1282
-rw-r--r--source/x/x11/build/xf86-video-rendition2
-rw-r--r--source/x/x11/build/xf86-video-s32
-rw-r--r--source/x/x11/build/xf86-video-s3virge2
-rw-r--r--source/x/x11/build/xf86-video-savage2
-rw-r--r--source/x/x11/build/xf86-video-siliconmotion2
-rw-r--r--source/x/x11/build/xf86-video-sis2
-rw-r--r--source/x/x11/build/xf86-video-sisusb2
-rw-r--r--source/x/x11/build/xf86-video-tdfx2
-rw-r--r--source/x/x11/build/xf86-video-tga2
-rw-r--r--source/x/x11/build/xf86-video-trident2
-rw-r--r--source/x/x11/build/xf86-video-tseng2
-rw-r--r--source/x/x11/build/xf86-video-v4l2
-rw-r--r--source/x/x11/build/xf86-video-vboxvideo2
-rw-r--r--source/x/x11/build/xf86-video-vesa2
-rw-r--r--source/x/x11/build/xf86-video-vmware2
-rw-r--r--source/x/x11/build/xf86-video-voodoo2
-rw-r--r--source/x/x11/build/xfd2
-rw-r--r--source/x/x11/build/xfontsel2
-rw-r--r--source/x/x11/build/xfs2
-rw-r--r--source/x/x11/build/xfsinfo2
-rw-r--r--source/x/x11/build/xgamma2
-rw-r--r--source/x/x11/build/xgc2
-rw-r--r--source/x/x11/build/xhost2
-rw-r--r--source/x/x11/build/xinit2
-rw-r--r--source/x/x11/build/xinput2
-rw-r--r--source/x/x11/build/xisxwayland2
-rw-r--r--source/x/x11/build/xkbevd2
-rw-r--r--source/x/x11/build/xkbprint2
-rw-r--r--source/x/x11/build/xkbutils2
-rw-r--r--source/x/x11/build/xkill2
-rw-r--r--source/x/x11/build/xload2
-rw-r--r--source/x/x11/build/xlogo2
-rw-r--r--source/x/x11/build/xlsatoms2
-rw-r--r--source/x/x11/build/xlsclients2
-rw-r--r--source/x/x11/build/xlsfonts2
-rw-r--r--source/x/x11/build/xmag2
-rw-r--r--source/x/x11/build/xman2
-rw-r--r--source/x/x11/build/xmessage2
-rw-r--r--source/x/x11/build/xmh2
-rw-r--r--source/x/x11/build/xmodmap2
-rw-r--r--source/x/x11/build/xmore2
-rw-r--r--source/x/x11/build/xorg-docs2
-rw-r--r--source/x/x11/build/xorg-sgml-doctools2
-rw-r--r--source/x/x11/build/xpr2
-rw-r--r--source/x/x11/build/xprop2
-rw-r--r--source/x/x11/build/xrandr2
-rw-r--r--source/x/x11/build/xrefresh2
-rw-r--r--source/x/x11/build/xscope2
-rw-r--r--source/x/x11/build/xset2
-rw-r--r--source/x/x11/build/xsetroot2
-rw-r--r--source/x/x11/build/xsm2
-rw-r--r--source/x/x11/build/xstdcmap2
-rw-r--r--source/x/x11/build/xterm1
-rw-r--r--source/x/x11/build/xtrans2
-rw-r--r--source/x/x11/build/xvidtune2
-rw-r--r--source/x/x11/build/xvinfo2
-rw-r--r--source/x/x11/build/xwininfo2
-rw-r--r--source/x/x11/build/xwud2
-rw-r--r--source/x/x11/configure/configure1
-rw-r--r--source/x/x11/configure/gccmakedep1
-rw-r--r--source/x/x11/configure/libX112
-rw-r--r--source/x/x11/configure/libXaw3d1
-rw-r--r--source/x/x11/configure/libXp1
-rw-r--r--source/x/x11/configure/libXt1
-rw-r--r--source/x/x11/configure/libpciaccess17
-rw-r--r--source/x/x11/configure/libxcb1
-rw-r--r--source/x/x11/configure/libxcvt17
-rw-r--r--source/x/x11/configure/libxshmfence1
-rw-r--r--source/x/x11/configure/meson17
-rw-r--r--source/x/x11/configure/pixman31
-rw-r--r--source/x/x11/configure/rendercheck17
-rw-r--r--source/x/x11/configure/setxkbmap1
-rw-r--r--source/x/x11/configure/xcb-proto22
-rw-r--r--source/x/x11/configure/xdm1
-rw-r--r--source/x/x11/configure/xf86-video-geode1
-rw-r--r--source/x/x11/configure/xf86-video-glint (renamed from source/x/x11/configure/xf86-video-savage)1
-rw-r--r--source/x/x11/configure/xf86-video-intel1
-rw-r--r--source/x/x11/configure/xf86-video-nouveau3
-rw-r--r--source/x/x11/configure/xf86-video-s314
-rw-r--r--source/x/x11/configure/xfs1
-rw-r--r--source/x/x11/configure/xkbcomp1
-rw-r--r--source/x/x11/configure/xkeyboard-config30
-rw-r--r--source/x/x11/configure/xorg-server47
-rw-r--r--source/x/x11/doinst.sh/xdm5
-rw-r--r--source/x/x11/make/libpciaccess5
-rw-r--r--source/x/x11/make/libxcvt5
-rw-r--r--source/x/x11/make/ninja5
-rw-r--r--source/x/x11/make/pixman5
-rw-r--r--source/x/x11/make/rendercheck5
-rw-r--r--source/x/x11/make/xcb-proto10
-rw-r--r--source/x/x11/make/xkeyboard-config5
-rw-r--r--source/x/x11/makepkg/xorg-server4
-rw-r--r--source/x/x11/package-blacklist64
-rw-r--r--source/x/x11/patch/pixman.patch1
-rw-r--r--source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff919
-rw-r--r--source/x/x11/patch/xdm.patch6
-rw-r--r--source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch18
-rw-r--r--source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch37
-rw-r--r--source/x/x11/patch/xdm/xdm.glibc.crypt.diff42
-rw-r--r--source/x/x11/patch/xf86-video-s3virge.patch2
-rw-r--r--source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff19
-rw-r--r--source/x/x11/patch/xorg-server.patch13
-rw-r--r--source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch37
-rw-r--r--source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch293
-rw-r--r--source/x/x11/patch/xorg-server/fix-pci-segfault.diff12
-rw-r--r--source/x/x11/post-install/xkeyboard-config.post-install13
-rw-r--r--source/x/x11/post-install/xorg-cf-files.post-install2
-rw-r--r--source/x/x11/slack-desc/libxcvt19
-rw-r--r--source/x/x11/slack-desc/xorg-server4
-rwxr-xr-xsource/x/x11/src/get-xf86-video-mach64.sh49
-rwxr-xr-xsource/x/x11/src/get-xf86-video-mga.sh49
-rwxr-xr-xsource/x/x11/src/get-xf86-video-vmware.sh49
-rw-r--r--source/x/x11/src/xf86-input-wacom.url1
293 files changed, 635 insertions, 1743 deletions
diff --git a/source/x/x11/build/appres b/source/x/x11/build/appres
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/appres
+++ b/source/x/x11/build/appres
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/bdftopcf b/source/x/x11/build/bdftopcf
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/bdftopcf
+++ b/source/x/x11/build/bdftopcf
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/beforelight b/source/x/x11/build/beforelight
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/beforelight
+++ b/source/x/x11/build/beforelight
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/bitmap
+++ b/source/x/x11/build/bitmap
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/dejavu-fonts-ttf b/source/x/x11/build/dejavu-fonts-ttf
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/dejavu-fonts-ttf
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/editres b/source/x/x11/build/editres
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/editres
+++ b/source/x/x11/build/editres
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/encodings b/source/x/x11/build/encodings
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/encodings
+++ b/source/x/x11/build/encodings
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-adobe-100dpi
+++ b/source/x/x11/build/font-adobe-100dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-adobe-75dpi
+++ b/source/x/x11/build/font-adobe-75dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-adobe-utopia-100dpi
+++ b/source/x/x11/build/font-adobe-utopia-100dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-adobe-utopia-75dpi
+++ b/source/x/x11/build/font-adobe-utopia-75dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-adobe-utopia-type1
+++ b/source/x/x11/build/font-adobe-utopia-type1
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/font-alias
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/font-alias
+++ b/source/x/x11/build/font-alias
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-arabic-misc
+++ b/source/x/x11/build/font-arabic-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-100dpi
+++ b/source/x/x11/build/font-bh-100dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-75dpi
+++ b/source/x/x11/build/font-bh-75dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-lucidatypewriter-100dpi
+++ b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-lucidatypewriter-75dpi
+++ b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-ttf
+++ b/source/x/x11/build/font-bh-ttf
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bh-type1
+++ b/source/x/x11/build/font-bh-type1
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bitstream-100dpi
+++ b/source/x/x11/build/font-bitstream-100dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bitstream-75dpi
+++ b/source/x/x11/build/font-bitstream-75dpi
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-bitstream-type1
+++ b/source/x/x11/build/font-bitstream-type1
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-cronyx-cyrillic
+++ b/source/x/x11/build/font-cronyx-cyrillic
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-cursor-misc
+++ b/source/x/x11/build/font-cursor-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-daewoo-misc
+++ b/source/x/x11/build/font-daewoo-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-dec-misc
+++ b/source/x/x11/build/font-dec-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-ibm-type1
+++ b/source/x/x11/build/font-ibm-type1
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-isas-misc
+++ b/source/x/x11/build/font-isas-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-jis-misc
+++ b/source/x/x11/build/font-jis-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-micro-misc
+++ b/source/x/x11/build/font-micro-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-misc-cyrillic
+++ b/source/x/x11/build/font-misc-cyrillic
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/font-misc-ethiopic
+++ b/source/x/x11/build/font-misc-ethiopic
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-misc-meltho
+++ b/source/x/x11/build/font-misc-meltho
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-misc-misc
+++ b/source/x/x11/build/font-misc-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-mutt-misc
+++ b/source/x/x11/build/font-mutt-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-schumacher-misc
+++ b/source/x/x11/build/font-schumacher-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-screen-cyrillic
+++ b/source/x/x11/build/font-screen-cyrillic
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-sony-misc
+++ b/source/x/x11/build/font-sony-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-sun-misc
+++ b/source/x/x11/build/font-sun-misc
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-util b/source/x/x11/build/font-util
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/font-util
+++ b/source/x/x11/build/font-util
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-winitzki-cyrillic
+++ b/source/x/x11/build/font-winitzki-cyrillic
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/font-xfree86-type1
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/font-xfree86-type1
+++ b/source/x/x11/build/font-xfree86-type1
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/fontconfig b/source/x/x11/build/fontconfig
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/fontconfig
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/freeglut b/source/x/x11/build/freeglut
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/freeglut
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/fslsfonts b/source/x/x11/build/fslsfonts
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/fslsfonts
+++ b/source/x/x11/build/fslsfonts
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/fstobdf
+++ b/source/x/x11/build/fstobdf
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/gccmakedep b/source/x/x11/build/gccmakedep
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/gccmakedep
+++ b/source/x/x11/build/gccmakedep
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/glew b/source/x/x11/build/glew
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/glew
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/glu b/source/x/x11/build/glu
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/glu
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/iceauth b/source/x/x11/build/iceauth
index b8626c4cf..0cfbf0888 100644
--- a/source/x/x11/build/iceauth
+++ b/source/x/x11/build/iceauth
@@ -1 +1 @@
-4
+2
diff --git a/source/x/x11/build/ico b/source/x/x11/build/ico
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/ico
+++ b/source/x/x11/build/ico
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/igt-gpu-tools
+++ b/source/x/x11/build/igt-gpu-tools
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/imake
+++ b/source/x/x11/build/imake
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/intel-vaapi-driver b/source/x/x11/build/intel-vaapi-driver
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/intel-vaapi-driver
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libFS b/source/x/x11/build/libFS
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libFS
+++ b/source/x/x11/build/libFS
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libICE b/source/x/x11/build/libICE
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libICE
+++ b/source/x/x11/build/libICE
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libSM b/source/x/x11/build/libSM
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libSM
+++ b/source/x/x11/build/libSM
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXScrnSaver b/source/x/x11/build/libXScrnSaver
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXScrnSaver
+++ b/source/x/x11/build/libXScrnSaver
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXau
+++ b/source/x/x11/build/libXau
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXaw3d
+++ b/source/x/x11/build/libXaw3d
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXaw3dXft b/source/x/x11/build/libXaw3dXft
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libXaw3dXft
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libXcomposite b/source/x/x11/build/libXcomposite
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXcomposite
+++ b/source/x/x11/build/libXcomposite
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXcursor b/source/x/x11/build/libXcursor
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXcursor
+++ b/source/x/x11/build/libXcursor
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXdamage b/source/x/x11/build/libXdamage
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXdamage
+++ b/source/x/x11/build/libXdamage
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXdmcp
+++ b/source/x/x11/build/libXdmcp
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXext
+++ b/source/x/x11/build/libXext
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXi b/source/x/x11/build/libXi
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXi
+++ b/source/x/x11/build/libXi
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXinerama
+++ b/source/x/x11/build/libXinerama
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXmu
+++ b/source/x/x11/build/libXmu
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXp b/source/x/x11/build/libXp
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/libXp
+++ b/source/x/x11/build/libXp
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/libXpm b/source/x/x11/build/libXpm
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXpm
+++ b/source/x/x11/build/libXpm
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXpresent b/source/x/x11/build/libXpresent
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/libXpresent
+++ b/source/x/x11/build/libXpresent
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/libXrandr b/source/x/x11/build/libXrandr
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXrandr
+++ b/source/x/x11/build/libXrandr
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXrender b/source/x/x11/build/libXrender
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/libXrender
+++ b/source/x/x11/build/libXrender
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/libXt b/source/x/x11/build/libXt
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/libXt
+++ b/source/x/x11/build/libXt
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/libXtst b/source/x/x11/build/libXtst
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/libXtst
+++ b/source/x/x11/build/libXtst
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/libXv b/source/x/x11/build/libXv
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/libXv
+++ b/source/x/x11/build/libXv
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/libXvMC b/source/x/x11/build/libXvMC
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/libXvMC
+++ b/source/x/x11/build/libXvMC
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXxf86dga
+++ b/source/x/x11/build/libXxf86dga
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXxf86vm b/source/x/x11/build/libXxf86vm
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/libXxf86vm
+++ b/source/x/x11/build/libXxf86vm
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/libdmx b/source/x/x11/build/libdmx
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libdmx
+++ b/source/x/x11/build/libdmx
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libdrm b/source/x/x11/build/libdrm
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libdrm
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libepoxy b/source/x/x11/build/libepoxy
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libepoxy
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/liberation-fonts-ttf b/source/x/x11/build/liberation-fonts-ttf
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/liberation-fonts-ttf
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libevdev b/source/x/x11/build/libevdev
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libevdev
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libfontenc b/source/x/x11/build/libfontenc
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libfontenc
+++ b/source/x/x11/build/libfontenc
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libinput b/source/x/x11/build/libinput
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libinput
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libpciaccess b/source/x/x11/build/libpciaccess
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libpciaccess
+++ b/source/x/x11/build/libpciaccess
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libpthread-stubs b/source/x/x11/build/libpthread-stubs
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/libpthread-stubs
+++ b/source/x/x11/build/libpthread-stubs
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/libva b/source/x/x11/build/libva
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libva
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libva-utils b/source/x/x11/build/libva-utils
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libva-utils
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libvdpau b/source/x/x11/build/libvdpau
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libvdpau
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libwacom b/source/x/x11/build/libwacom
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/libwacom
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/libxcb b/source/x/x11/build/libxcb
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libxcb
+++ b/source/x/x11/build/libxcb
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libxcvt b/source/x/x11/build/libxcvt
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/libxcvt
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libxkbfile
+++ b/source/x/x11/build/libxkbfile
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libxshmfence b/source/x/x11/build/libxshmfence
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/libxshmfence
+++ b/source/x/x11/build/libxshmfence
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/listres b/source/x/x11/build/listres
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/listres
+++ b/source/x/x11/build/listres
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/lndir
+++ b/source/x/x11/build/lndir
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/makedepend
+++ b/source/x/x11/build/makedepend
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/mesa b/source/x/x11/build/mesa
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/mesa
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/mkcomposecache b/source/x/x11/build/mkcomposecache
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/mkcomposecache
+++ b/source/x/x11/build/mkcomposecache
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/mkfontscale b/source/x/x11/build/mkfontscale
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/mkfontscale
+++ b/source/x/x11/build/mkfontscale
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/oclock b/source/x/x11/build/oclock
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/oclock
+++ b/source/x/x11/build/oclock
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/pixman b/source/x/x11/build/pixman
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/pixman
+++ b/source/x/x11/build/pixman
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/rendercheck
+++ b/source/x/x11/build/rendercheck
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/rgb b/source/x/x11/build/rgb
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/rgb
+++ b/source/x/x11/build/rgb
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/sazanami-fonts-ttf b/source/x/x11/build/sazanami-fonts-ttf
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/sazanami-fonts-ttf
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/sessreg b/source/x/x11/build/sessreg
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/sessreg
+++ b/source/x/x11/build/sessreg
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/setxkbmap b/source/x/x11/build/setxkbmap
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/setxkbmap
+++ b/source/x/x11/build/setxkbmap
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/showfont b/source/x/x11/build/showfont
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/showfont
+++ b/source/x/x11/build/showfont
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/sinhala_lklug-font-ttf b/source/x/x11/build/sinhala_lklug-font-ttf
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/sinhala_lklug-font-ttf
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/smproxy
+++ b/source/x/x11/build/smproxy
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/tibmachuni-font-ttf b/source/x/x11/build/tibmachuni-font-ttf
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/tibmachuni-font-ttf
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/transset b/source/x/x11/build/transset
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/transset
+++ b/source/x/x11/build/transset
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/ttf-indic-fonts b/source/x/x11/build/ttf-indic-fonts
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/ttf-indic-fonts
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/ttf-tlwg b/source/x/x11/build/ttf-tlwg
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/ttf-tlwg
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/twm
+++ b/source/x/x11/build/twm
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/util-macros b/source/x/x11/build/util-macros
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/util-macros
+++ b/source/x/x11/build/util-macros
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/viewres b/source/x/x11/build/viewres
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/viewres
+++ b/source/x/x11/build/viewres
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/vulkan-sdk b/source/x/x11/build/vulkan-sdk
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/vulkan-sdk
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/x11-skel b/source/x/x11/build/x11-skel
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/x11-skel
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/x11perf
+++ b/source/x/x11/build/x11perf
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xauth b/source/x/x11/build/xauth
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xauth
+++ b/source/x/x11/build/xauth
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xbiff b/source/x/x11/build/xbiff
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xbiff
+++ b/source/x/x11/build/xbiff
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xbitmaps b/source/x/x11/build/xbitmaps
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xbitmaps
+++ b/source/x/x11/build/xbitmaps
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcalc b/source/x/x11/build/xcalc
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xcalc
+++ b/source/x/x11/build/xcalc
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xcb-proto
+++ b/source/x/x11/build/xcb-proto
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcb-util b/source/x/x11/build/xcb-util
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xcb-util
+++ b/source/x/x11/build/xcb-util
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xcb-util-cursor b/source/x/x11/build/xcb-util-cursor
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-cursor
+++ b/source/x/x11/build/xcb-util-cursor
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcb-util-errors b/source/x/x11/build/xcb-util-errors
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-errors
+++ b/source/x/x11/build/xcb-util-errors
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcb-util-image b/source/x/x11/build/xcb-util-image
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-image
+++ b/source/x/x11/build/xcb-util-image
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xcb-util-keysyms b/source/x/x11/build/xcb-util-keysyms
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-keysyms
+++ b/source/x/x11/build/xcb-util-keysyms
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xcb-util-renderutil b/source/x/x11/build/xcb-util-renderutil
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-renderutil
+++ b/source/x/x11/build/xcb-util-renderutil
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xcb-util-wm b/source/x/x11/build/xcb-util-wm
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xcb-util-wm
+++ b/source/x/x11/build/xcb-util-wm
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xclipboard b/source/x/x11/build/xclipboard
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xclipboard
+++ b/source/x/x11/build/xclipboard
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xclock b/source/x/x11/build/xclock
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xclock
+++ b/source/x/x11/build/xclock
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xcmsdb b/source/x/x11/build/xcmsdb
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xcmsdb
+++ b/source/x/x11/build/xcmsdb
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xcompmgr
+++ b/source/x/x11/build/xcompmgr
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xconsole b/source/x/x11/build/xconsole
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xconsole
+++ b/source/x/x11/build/xconsole
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xcursor-themes
+++ b/source/x/x11/build/xcursor-themes
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xcursorgen
+++ b/source/x/x11/build/xcursorgen
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xdg-user-dirs b/source/x/x11/build/xdg-user-dirs
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/xdg-user-dirs
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xditview
+++ b/source/x/x11/build/xditview
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index 8351c1939..d00491fd7 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-14
+1
diff --git a/source/x/x11/build/xdpyinfo b/source/x/x11/build/xdpyinfo
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xdpyinfo
+++ b/source/x/x11/build/xdpyinfo
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xdriinfo b/source/x/x11/build/xdriinfo
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xdriinfo
+++ b/source/x/x11/build/xdriinfo
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xedit b/source/x/x11/build/xedit
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xedit
+++ b/source/x/x11/build/xedit
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xev b/source/x/x11/build/xev
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xev
+++ b/source/x/x11/build/xev
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad
index 8351c1939..60d3b2f4a 100644
--- a/source/x/x11/build/xf86-input-acecad
+++ b/source/x/x11/build/xf86-input-acecad
@@ -1 +1 @@
-14
+15
diff --git a/source/x/x11/build/xf86-input-evdev b/source/x/x11/build/xf86-input-evdev
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-input-evdev
+++ b/source/x/x11/build/xf86-input-evdev
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-input-joystick b/source/x/x11/build/xf86-input-joystick
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-input-joystick
+++ b/source/x/x11/build/xf86-input-joystick
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/build/xf86-input-keyboard b/source/x/x11/build/xf86-input-keyboard
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-keyboard
+++ b/source/x/x11/build/xf86-input-keyboard
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-input-mouse
+++ b/source/x/x11/build/xf86-input-mouse
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount
index 8351c1939..60d3b2f4a 100644
--- a/source/x/x11/build/xf86-input-penmount
+++ b/source/x/x11/build/xf86-input-penmount
@@ -1 +1 @@
-14
+15
diff --git a/source/x/x11/build/xf86-input-synaptics b/source/x/x11/build/xf86-input-synaptics
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-synaptics
+++ b/source/x/x11/build/xf86-input-synaptics
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
index ec635144f..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-vmmouse
+++ b/source/x/x11/build/xf86-input-vmmouse
@@ -1 +1 @@
-9
+1
diff --git a/source/x/x11/build/xf86-input-void b/source/x/x11/build/xf86-input-void
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-input-void
+++ b/source/x/x11/build/xf86-input-void
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-wacom
+++ b/source/x/x11/build/xf86-input-wacom
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-apm
+++ b/source/x/x11/build/xf86-video-apm
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-ark b/source/x/x11/build/xf86-video-ark
index b1bd38b62..8351c1939 100644
--- a/source/x/x11/build/xf86-video-ark
+++ b/source/x/x11/build/xf86-video-ark
@@ -1 +1 @@
-13
+14
diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast
index 7f8f011eb..45a4fb75d 100644
--- a/source/x/x11/build/xf86-video-ast
+++ b/source/x/x11/build/xf86-video-ast
@@ -1 +1 @@
-7
+8
diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-ati
+++ b/source/x/x11/build/xf86-video-ati
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-chips
+++ b/source/x/x11/build/xf86-video-chips
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus
index 7f8f011eb..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-7
+1
diff --git a/source/x/x11/build/xf86-video-dummy b/source/x/x11/build/xf86-video-dummy
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-dummy
+++ b/source/x/x11/build/xf86-video-dummy
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-video-geode b/source/x/x11/build/xf86-video-geode
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-geode
+++ b/source/x/x11/build/xf86-video-geode
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-glint
+++ b/source/x/x11/build/xf86-video-glint
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-i128
+++ b/source/x/x11/build/xf86-video-i128
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-i740
+++ b/source/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-intel b/source/x/x11/build/xf86-video-intel
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-intel
+++ b/source/x/x11/build/xf86-video-intel
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-mach64
+++ b/source/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-mga
+++ b/source/x/x11/build/xf86-video-mga
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-neomagic
+++ b/source/x/x11/build/xf86-video-neomagic
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-nouveau
+++ b/source/x/x11/build/xf86-video-nouveau
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xf86-video-nv b/source/x/x11/build/xf86-video-nv
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-nv
+++ b/source/x/x11/build/xf86-video-nv
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-video-omap b/source/x/x11/build/xf86-video-omap
index 7f8f011eb..45a4fb75d 100644
--- a/source/x/x11/build/xf86-video-omap
+++ b/source/x/x11/build/xf86-video-omap
@@ -1 +1 @@
-7
+8
diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-video-openchrome
+++ b/source/x/x11/build/xf86-video-openchrome
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-r128
+++ b/source/x/x11/build/xf86-video-r128
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-rendition b/source/x/x11/build/xf86-video-rendition
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-rendition
+++ b/source/x/x11/build/xf86-video-rendition
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-s3virge
+++ b/source/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-savage b/source/x/x11/build/xf86-video-savage
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-savage
+++ b/source/x/x11/build/xf86-video-savage
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-siliconmotion b/source/x/x11/build/xf86-video-siliconmotion
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-video-siliconmotion
+++ b/source/x/x11/build/xf86-video-siliconmotion
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-sis
+++ b/source/x/x11/build/xf86-video-sis
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-video-sisusb
+++ b/source/x/x11/build/xf86-video-sisusb
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-tdfx
+++ b/source/x/x11/build/xf86-video-tdfx
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga
index b1bd38b62..8351c1939 100644
--- a/source/x/x11/build/xf86-video-tga
+++ b/source/x/x11/build/xf86-video-tga
@@ -1 +1 @@
-13
+14
diff --git a/source/x/x11/build/xf86-video-trident b/source/x/x11/build/xf86-video-trident
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-trident
+++ b/source/x/x11/build/xf86-video-trident
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng
index b1bd38b62..8351c1939 100644
--- a/source/x/x11/build/xf86-video-tseng
+++ b/source/x/x11/build/xf86-video-tseng
@@ -1 +1 @@
-13
+14
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-vboxvideo b/source/x/x11/build/xf86-video-vboxvideo
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-video-vboxvideo
+++ b/source/x/x11/build/xf86-video-vboxvideo
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-vmware
+++ b/source/x/x11/build/xf86-video-vmware
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
index 8351c1939..60d3b2f4a 100644
--- a/source/x/x11/build/xf86-video-voodoo
+++ b/source/x/x11/build/xf86-video-voodoo
@@ -1 +1 @@
-14
+15
diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xfd
+++ b/source/x/x11/build/xfd
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xfontsel b/source/x/x11/build/xfontsel
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xfontsel
+++ b/source/x/x11/build/xfontsel
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xfs b/source/x/x11/build/xfs
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xfs
+++ b/source/x/x11/build/xfs
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xfsinfo b/source/x/x11/build/xfsinfo
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xfsinfo
+++ b/source/x/x11/build/xfsinfo
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xgamma b/source/x/x11/build/xgamma
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xgamma
+++ b/source/x/x11/build/xgamma
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xgc
+++ b/source/x/x11/build/xgc
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xhost b/source/x/x11/build/xhost
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xhost
+++ b/source/x/x11/build/xhost
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xinit b/source/x/x11/build/xinit
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xinit
+++ b/source/x/x11/build/xinit
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xinput b/source/x/x11/build/xinput
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xinput
+++ b/source/x/x11/build/xinput
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xisxwayland b/source/x/x11/build/xisxwayland
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xisxwayland
+++ b/source/x/x11/build/xisxwayland
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xkbevd b/source/x/x11/build/xkbevd
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xkbevd
+++ b/source/x/x11/build/xkbevd
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xkbprint
+++ b/source/x/x11/build/xkbprint
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xkbutils b/source/x/x11/build/xkbutils
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xkbutils
+++ b/source/x/x11/build/xkbutils
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xkill b/source/x/x11/build/xkill
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xkill
+++ b/source/x/x11/build/xkill
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xload b/source/x/x11/build/xload
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xload
+++ b/source/x/x11/build/xload
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xlogo b/source/x/x11/build/xlogo
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xlogo
+++ b/source/x/x11/build/xlogo
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xlsatoms b/source/x/x11/build/xlsatoms
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xlsatoms
+++ b/source/x/x11/build/xlsatoms
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xlsclients b/source/x/x11/build/xlsclients
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xlsclients
+++ b/source/x/x11/build/xlsclients
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xlsfonts
+++ b/source/x/x11/build/xlsfonts
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xmag b/source/x/x11/build/xmag
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xmag
+++ b/source/x/x11/build/xmag
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xman b/source/x/x11/build/xman
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xman
+++ b/source/x/x11/build/xman
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xmessage b/source/x/x11/build/xmessage
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xmessage
+++ b/source/x/x11/build/xmessage
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xmh
+++ b/source/x/x11/build/xmh
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xmodmap b/source/x/x11/build/xmodmap
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xmodmap
+++ b/source/x/x11/build/xmodmap
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xmore
+++ b/source/x/x11/build/xmore
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xorg-docs b/source/x/x11/build/xorg-docs
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xorg-docs
+++ b/source/x/x11/build/xorg-docs
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xorg-sgml-doctools b/source/x/x11/build/xorg-sgml-doctools
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xorg-sgml-doctools
+++ b/source/x/x11/build/xorg-sgml-doctools
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xpr b/source/x/x11/build/xpr
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xpr
+++ b/source/x/x11/build/xpr
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xprop b/source/x/x11/build/xprop
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xprop
+++ b/source/x/x11/build/xprop
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xrandr b/source/x/x11/build/xrandr
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xrandr
+++ b/source/x/x11/build/xrandr
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xrefresh b/source/x/x11/build/xrefresh
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xrefresh
+++ b/source/x/x11/build/xrefresh
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xscope b/source/x/x11/build/xscope
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xscope
+++ b/source/x/x11/build/xscope
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xset b/source/x/x11/build/xset
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xset
+++ b/source/x/x11/build/xset
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xsetroot b/source/x/x11/build/xsetroot
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xsetroot
+++ b/source/x/x11/build/xsetroot
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xsm b/source/x/x11/build/xsm
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xsm
+++ b/source/x/x11/build/xsm
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xstdcmap
+++ b/source/x/x11/build/xstdcmap
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xterm b/source/x/x11/build/xterm
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/x/x11/build/xterm
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/x/x11/build/xtrans b/source/x/x11/build/xtrans
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xtrans
+++ b/source/x/x11/build/xtrans
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/xvidtune
+++ b/source/x/x11/build/xvidtune
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/xvinfo b/source/x/x11/build/xvinfo
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xvinfo
+++ b/source/x/x11/build/xvinfo
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xwininfo b/source/x/x11/build/xwininfo
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xwininfo
+++ b/source/x/x11/build/xwininfo
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xwud b/source/x/x11/build/xwud
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xwud
+++ b/source/x/x11/build/xwud
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure
index dcb1109bd..61a80c318 100644
--- a/source/x/x11/configure/configure
+++ b/source/x/x11/configure/configure
@@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--with-udev-rules-dir=/lib/udev/rules.d \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep
index 181ae81e9..741f8ea6e 100644
--- a/source/x/x11/configure/gccmakedep
+++ b/source/x/x11/configure/gccmakedep
@@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \
--infodir=/usr/info \
--mandir=/usr/man \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
#
# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11
index cf85e58d4..625ca2e15 100644
--- a/source/x/x11/configure/libX11
+++ b/source/x/x11/configure/libX11
@@ -9,4 +9,6 @@ CXXFLAGS=$SLKCFLAGS \
--infodir=/usr/info \
--mandir=/usr/man \
--disable-static \
+ --disable-thread-safety-constructor \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d
index 0d802fa3b..814adf0e7 100644
--- a/source/x/x11/configure/libXaw3d
+++ b/source/x/x11/configure/libXaw3d
@@ -13,4 +13,5 @@ CXXFLAGS=$SLKCFLAGS \
--enable-gray-stipples \
--enable-arrow-scrollbars \
--enable-internationalization \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp
index 181ae81e9..741f8ea6e 100644
--- a/source/x/x11/configure/libXp
+++ b/source/x/x11/configure/libXp
@@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \
--infodir=/usr/info \
--mandir=/usr/man \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
#
# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
diff --git a/source/x/x11/configure/libXt b/source/x/x11/configure/libXt
index 3c832abd2..758e719ca 100644
--- a/source/x/x11/configure/libXt
+++ b/source/x/x11/configure/libXt
@@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--disable-static \
--with-appdefaultdir=/etc/X11/app-defaults \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libpciaccess b/source/x/x11/configure/libpciaccess
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/libpciaccess
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ .. || exit 1
diff --git a/source/x/x11/configure/libxcb b/source/x/x11/configure/libxcb
index 0c8a4a8c8..c3cc35473 100644
--- a/source/x/x11/configure/libxcb
+++ b/source/x/x11/configure/libxcb
@@ -11,4 +11,5 @@ CXXFLAGS=$SLKCFLAGS \
--disable-static \
--enable-xinput \
--enable-xkb \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libxcvt b/source/x/x11/configure/libxcvt
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/libxcvt
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ .. || exit 1
diff --git a/source/x/x11/configure/libxshmfence b/source/x/x11/configure/libxshmfence
index ec0521d86..7b3b7025d 100644
--- a/source/x/x11/configure/libxshmfence
+++ b/source/x/x11/configure/libxshmfence
@@ -12,4 +12,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/meson b/source/x/x11/configure/meson
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/meson
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ .. || exit 1
diff --git a/source/x/x11/configure/pixman b/source/x/x11/configure/pixman
index 52cb86c34..8a76b364b 100644
--- a/source/x/x11/configure/pixman
+++ b/source/x/x11/configure/pixman
@@ -2,21 +2,28 @@
PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
if [ "$ARCH" = "x86_64" ]; then
- do_sse2="--enable-sse2"
+ do_sse2=enabled
else
- do_sse2="--disable-sse2"
+ do_sse2=disabled
fi
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
-./configure \
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --disable-vmx \
- --build=$ARCH-slackware-linux \
- ${do_sse2}
+ --buildtype=release \
+ -Dvmx=disabled \
+ -Dtests=disabled \
+ -Dsse2=$do_sse2 \
+ .. || exit 1
diff --git a/source/x/x11/configure/rendercheck b/source/x/x11/configure/rendercheck
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/rendercheck
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ .. || exit 1
diff --git a/source/x/x11/configure/setxkbmap b/source/x/x11/configure/setxkbmap
index 91f8353fb..0a6de166f 100644
--- a/source/x/x11/configure/setxkbmap
+++ b/source/x/x11/configure/setxkbmap
@@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \
--infodir=/usr/info \
--mandir=/usr/man \
--with-xkb-config-root=/etc/X11/xkb \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
index 2df1aaf74..4074f1583 100644
--- a/source/x/x11/configure/xcb-proto
+++ b/source/x/x11/configure/xcb-proto
@@ -1,26 +1,8 @@
-mkdir python2 python3
-
-cd python2
- CFLAGS=$SLKCFLAGS \
- CXXFLAGS=$SLKCFLAGS \
- PYTHON=python3 \
- ../configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
- --with-udev-rules-dir=/lib/udev/rules.d \
- --disable-static \
- --build=$ARCH-slackware-linux
-cd -
-
+mkdir python3
cd python3
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
- PYTHON=python \
+ PYTHON=python3 \
../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/x/x11/configure/xdm b/source/x/x11/configure/xdm
index 1c7dc7ccd..5bc76962b 100644
--- a/source/x/x11/configure/xdm
+++ b/source/x/x11/configure/xdm
@@ -16,4 +16,5 @@ CXXFLAGS=$SLKCFLAGS \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
$XDM_PAM_OPTION \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-geode b/source/x/x11/configure/xf86-video-geode
index a6eab1095..128f66476 100644
--- a/source/x/x11/configure/xf86-video-geode
+++ b/source/x/x11/configure/xf86-video-geode
@@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--with-udev-rules-dir=/lib/udev/rules.d \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-savage b/source/x/x11/configure/xf86-video-glint
index 291eb9b94..39eaf927c 100644
--- a/source/x/x11/configure/xf86-video-savage
+++ b/source/x/x11/configure/xf86-video-glint
@@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--with-udev-rules-dir=/lib/udev/rules.d \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel
index 88581a1e7..faf752eba 100644
--- a/source/x/x11/configure/xf86-video-intel
+++ b/source/x/x11/configure/xf86-video-intel
@@ -18,4 +18,5 @@ CXXFLAGS="$ALTCFLAGS" \
--enable-kms-only \
--enable-uxa \
--with-default-dri=3 \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau
index 0f3bccf24..a9dcd059b 100644
--- a/source/x/x11/configure/xf86-video-nouveau
+++ b/source/x/x11/configure/xf86-video-nouveau
@@ -1,6 +1,6 @@
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-s3 b/source/x/x11/configure/xf86-video-s3
new file mode 100644
index 000000000..39eaf927c
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-s3
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./autogen.sh \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --with-udev-rules-dir=/lib/udev/rules.d \
+ --disable-static \
+ --enable-year2038 \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xfs b/source/x/x11/configure/xfs
index 38f50c9a8..570dca393 100644
--- a/source/x/x11/configure/xfs
+++ b/source/x/x11/configure/xfs
@@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--disable-static \
--disable-devel-docs \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xkbcomp b/source/x/x11/configure/xkbcomp
index 91f8353fb..0a6de166f 100644
--- a/source/x/x11/configure/xkbcomp
+++ b/source/x/x11/configure/xkbcomp
@@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \
--infodir=/usr/info \
--mandir=/usr/man \
--with-xkb-config-root=/etc/X11/xkb \
+ --enable-year2038 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xkeyboard-config b/source/x/x11/configure/xkeyboard-config
index a5e05d6b5..fc2a5f14e 100644
--- a/source/x/x11/configure/xkeyboard-config
+++ b/source/x/x11/configure/xkeyboard-config
@@ -1,13 +1,19 @@
-./configure \
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --enable-xkbcomp-symlink \
- --enable-compat-rules \
- --with-xkb-base=/etc/X11/xkb \
- --with-xkb-rules-symlink=xfree86,xorg \
- --build=$ARCH-slackware-linux
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ -Dcompat-rules=true \
+ -Dxorg-rules-symlinks=true \
+ .. || exit 1
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index c107644e0..6a536c0d5 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,6 +1,34 @@
# Build Wayland X Server (currently built as standalone):
BUILD_XWAYLAND=NO
+# Build rootless X packages. This is not the default in Slackware and is
+# unlikely to be any time soon, as --enable-systemd-logind seems to really
+# require systemd and does not function 100% with all graphics chipsets.
+# In particular, resuming from suspend may not work with (at least) Radeon
+# chipsets, and NVIDIA chipsets using proprietary drivers. Also, while
+# rootless X works from "startx", it is unsupported by most login managers
+# which will continue to start X as root.
+#
+# Feel free to try it out, though. To build rootless X packages, start the
+# build like this:
+#
+# ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server
+#
+if [ "$ROOTLESSX" = "YES" ]; then
+ ROOTLESS_OPTIONS="--enable-suid-wrapper --disable-install-setuid --enable-systemd-logind"
+else
+ # Here we are building the traditional setuid root X. Technically we could
+ # dispense with the Xorg.wrap wrapper and just have the actual Xorg binary
+ # in /usr/bin, but we've always had the wrapper anyway and it should not
+ # cause any problems. Besides, it might be possible with this configuration
+ # to remove the setuid permissions from /usr/libexec/Xorg and then add the
+ # user to required groups such as input to run rootless as well, though it
+ # may bring its own security issues since other users who are members of
+ # these groups could monitor the devices. It's not recommended to try to
+ # run X rootless in this way, but we're going to keep the option open for now.
+ ROOTLESS_OPTIONS="--enable-suid-wrapper --enable-install-setuid --disable-systemd-logind"
+fi
+
# Servers to build:
if [ "$BUILD_XWAYLAND" = "NO" ]; then
XWAYLAND_OPTION="--disable-xwayland"
@@ -14,12 +42,7 @@ BUILD_SERVERS="--enable-xorg \
--enable-glamor \
--enable-kdrive \
--enable-xephyr \
- $XWAYLAND_OPTION \
- --enable-config-udev \
- --disable-config-hal \
- --disable-systemd-logind"
-
-#MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+
+ $XWAYLAND_OPTION "
# Default font paths to be used by the X server:
DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/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"
@@ -37,22 +60,22 @@ CFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--disable-static \
--with-pic \
- --enable-suid-wrapper \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-os-name="Slackware 15.0" \
+ --with-os-name="Slackware 15.1" \
--with-os-vendor="Slackware Linux Project" \
- --with-xkb-path=/etc/X11/xkb \
+ --with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
+ --enable-config-udev \
+ --disable-config-hal \
+ --enable-year2038 \
$BUILD_SERVERS \
+ $ROOTLESS_OPTIONS \
--build=$ARCH-slackware-linux
-# --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
-
if [ "$ARCH" = "x86_64" ]; then
# To prevent the error "No rule to make target `-ldl'"
sed -i -e 's#-ldl##' hw/xfree86/Makefile
sed -i -e 's#-lm#-lm -ldl#' hw/xfree86/Makefile
fi
-
diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm
index fc3b5a679..78d53d822 100644
--- a/source/x/x11/doinst.sh/xdm
+++ b/source/x/x11/doinst.sh/xdm
@@ -21,3 +21,8 @@ do
config etc/X11/xdm/${conffile}.new
done
+# Prevent a black background for login/password when upgrading from xdm-1.1.1
+# and ignoring the .new files :-)
+if ! grep -q inpColor etc/X11/xdm/Xresources ; then
+ echo 'xlogin*inpColor: grey80' >> etc/X11/xdm/Xresources
+fi
diff --git a/source/x/x11/make/libpciaccess b/source/x/x11/make/libpciaccess
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/libpciaccess
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/libxcvt b/source/x/x11/make/libxcvt
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/libxcvt
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/ninja b/source/x/x11/make/ninja
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/ninja
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/pixman b/source/x/x11/make/pixman
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/pixman
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/rendercheck b/source/x/x11/make/rendercheck
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/rendercheck
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto
index a4c380bbc..b39aa7786 100644
--- a/source/x/x11/make/xcb-proto
+++ b/source/x/x11/make/xcb-proto
@@ -1,17 +1,7 @@
-cd python2
- if ! make $NUMJOBS ; then
- touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
- continue
- fi
-
- make install DESTDIR=$PKG
-cd -
-
cd python3
if ! make $NUMJOBS ; then
touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
continue
fi
-
make install DESTDIR=$PKG
cd -
diff --git a/source/x/x11/make/xkeyboard-config b/source/x/x11/make/xkeyboard-config
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/xkeyboard-config
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index 1f5faf3c4..f395855d5 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -1,3 +1,7 @@
+# Add _rootless tag to the $BUILD if making rootless X packages:
+if [ "$ROOTLESSX" = "YES" ]; then
+ BUILD="${BUILD}_rootless"
+fi
rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest
mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin
diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist
index 8e2f3eb5c..51c508d07 100644
--- a/source/x/x11/package-blacklist
+++ b/source/x/x11/package-blacklist
@@ -6,38 +6,44 @@
# They also say in the README for this one that it is not yet ready:
xf86-video-omap
-# MacOS related packages:
-applewmproto
-windowswmproto
-libAppleWM
-libWindowsWM
-
-# Sun video cards:
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
-
# Obsolete packages:
-liboldX
-xf86-video-amd
-xf86-video-via
-xkbdata
-xphelloworld
-xrx
-
-# Not applicable to us
-grandr
-constype
+xf86-input-acecad
+xf86-input-aiptek
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-penmount
+xf86-input-void
+xf86-video-apm
+xf86-video-ark
+xf86-video-ast
+xf86-video-chips
+xf86-video-cirrus
+xf86-video-geode
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+#xf86-video-neomagic
+xf86-video-nv
+xf86-video-omap
+xf86-video-qxl
+xf86-video-rendition
+xf86-video-s3
+#xf86-video-savage
+xf86-video-siliconmotion
+xf86-video-sis
+xf86-video-sisusb
+xf86-video-tdfx
+xf86-video-tga
+xf86-video-tseng
+xf86-video-v4l
+xf86-video-vboxvideo
+xf86-video-voodoo
+xf86-video-xgi
+xf86-video-xgixp
+xpyb
# CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR!
-# This is probably obsolete, and kills "X -configure" too
-xf86-video-nsc
-
# We don't want this one, as it causes failure of X with no xorg.conf
xf86-video-fbdev
-
diff --git a/source/x/x11/patch/pixman.patch b/source/x/x11/patch/pixman.patch
deleted file mode 100644
index 947341105..000000000
--- a/source/x/x11/patch/pixman.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
deleted file mode 100644
index 99017b166..000000000
--- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
+++ /dev/null
@@ -1,919 +0,0 @@
---- ./test/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500
-+++ ./test/Makefile.in 2020-04-20 15:08:52.348545235 -0500
-@@ -102,24 +102,15 @@
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__EXEEXT_1 = oob-test$(EXEEXT) infinite-loop$(EXEEXT) \
-- trap-crasher$(EXEEXT) fence-image-self-test$(EXEEXT) \
-+ trap-crasher$(EXEEXT) \
- region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \
- a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \
- radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \
-- region-test$(EXEEXT) combiner-test$(EXEEXT) \
-- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \
-- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \
-- rotate-test$(EXEEXT) alphamap$(EXEEXT) \
-- gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
-- matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \
-- composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \
-- glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
-- cover-test$(EXEEXT) blitters-test$(EXEEXT) \
-- affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \
-- tolerance-test$(EXEEXT)
--am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
-- check-formats$(EXEEXT) scaling-bench$(EXEEXT) \
-- affine-bench$(EXEEXT)
-+ combiner-test$(EXEEXT) \
-+ scaling-crash-test$(EXEEXT) \
-+ thread-test$(EXEEXT) \
-+ pixel-test$(EXEEXT)
-+am__EXEEXT_2 =
- PROGRAMS = $(noinst_PROGRAMS)
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libutils_la_LIBADD =
-@@ -138,114 +129,24 @@
- a1_trap_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--affine_bench_SOURCES = affine-bench.c
--affine_bench_OBJECTS = affine-bench.$(OBJEXT)
--affine_bench_LDADD = $(LDADD)
--affine_bench_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--affine_test_SOURCES = affine-test.c
--affine_test_OBJECTS = affine-test.$(OBJEXT)
--affine_test_LDADD = $(LDADD)
--affine_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--alpha_loop_SOURCES = alpha-loop.c
--alpha_loop_OBJECTS = alpha-loop.$(OBJEXT)
--alpha_loop_LDADD = $(LDADD)
--alpha_loop_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--alphamap_SOURCES = alphamap.c
--alphamap_OBJECTS = alphamap.$(OBJEXT)
--alphamap_LDADD = $(LDADD)
--alphamap_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--blitters_test_SOURCES = blitters-test.c
--blitters_test_OBJECTS = blitters-test.$(OBJEXT)
--blitters_test_LDADD = $(LDADD)
--blitters_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--check_formats_SOURCES = check-formats.c
--check_formats_OBJECTS = check-formats.$(OBJEXT)
--check_formats_LDADD = $(LDADD)
--check_formats_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- combiner_test_SOURCES = combiner-test.c
- combiner_test_OBJECTS = combiner-test.$(OBJEXT)
- combiner_test_LDADD = $(LDADD)
- combiner_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--composite_SOURCES = composite.c
--composite_OBJECTS = composite.$(OBJEXT)
--composite_LDADD = $(LDADD)
--composite_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--composite_traps_test_SOURCES = composite-traps-test.c
--composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
--composite_traps_test_LDADD = $(LDADD)
--composite_traps_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--cover_test_SOURCES = cover-test.c
--cover_test_OBJECTS = cover-test.$(OBJEXT)
--cover_test_LDADD = $(LDADD)
--cover_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--fence_image_self_test_SOURCES = fence-image-self-test.c
--fence_image_self_test_OBJECTS = fence-image-self-test.$(OBJEXT)
--fence_image_self_test_LDADD = $(LDADD)
--fence_image_self_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- fetch_test_SOURCES = fetch-test.c
- fetch_test_OBJECTS = fetch-test.$(OBJEXT)
- fetch_test_LDADD = $(LDADD)
- fetch_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--filter_reduction_test_SOURCES = filter-reduction-test.c
--filter_reduction_test_OBJECTS = filter-reduction-test.$(OBJEXT)
--filter_reduction_test_LDADD = $(LDADD)
--filter_reduction_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--glyph_test_SOURCES = glyph-test.c
--glyph_test_OBJECTS = glyph-test.$(OBJEXT)
--glyph_test_LDADD = $(LDADD)
--glyph_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--gradient_crash_test_SOURCES = gradient-crash-test.c
--gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
--gradient_crash_test_LDADD = $(LDADD)
--gradient_crash_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- infinite_loop_SOURCES = infinite-loop.c
- infinite_loop_OBJECTS = infinite-loop.$(OBJEXT)
- infinite_loop_LDADD = $(LDADD)
- infinite_loop_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c
--lowlevel_blt_bench_OBJECTS = lowlevel-blt-bench.$(OBJEXT)
--lowlevel_blt_bench_LDADD = $(LDADD)
--lowlevel_blt_bench_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--matrix_test_SOURCES = matrix-test.c
--matrix_test_OBJECTS = matrix-test.$(OBJEXT)
--matrix_test_LDADD = $(LDADD)
--matrix_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- oob_test_SOURCES = oob-test.c
- oob_test_OBJECTS = oob-test.$(OBJEXT)
- oob_test_LDADD = $(LDADD)
-@@ -276,84 +177,24 @@
- radial_invalid_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--radial_perf_test_SOURCES = radial-perf-test.c
--radial_perf_test_OBJECTS = radial-perf-test.$(OBJEXT)
--radial_perf_test_LDADD = $(LDADD)
--radial_perf_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--region_contains_test_SOURCES = region-contains-test.c
--region_contains_test_OBJECTS = region-contains-test.$(OBJEXT)
--region_contains_test_LDADD = $(LDADD)
--region_contains_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--region_test_SOURCES = region-test.c
--region_test_OBJECTS = region-test.$(OBJEXT)
--region_test_LDADD = $(LDADD)
--region_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- region_translate_test_SOURCES = region-translate-test.c
- region_translate_test_OBJECTS = region-translate-test.$(OBJEXT)
- region_translate_test_LDADD = $(LDADD)
- region_translate_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--rotate_test_SOURCES = rotate-test.c
--rotate_test_OBJECTS = rotate-test.$(OBJEXT)
--rotate_test_LDADD = $(LDADD)
--rotate_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--scaling_bench_SOURCES = scaling-bench.c
--scaling_bench_OBJECTS = scaling-bench.$(OBJEXT)
--scaling_bench_LDADD = $(LDADD)
--scaling_bench_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- scaling_crash_test_SOURCES = scaling-crash-test.c
- scaling_crash_test_OBJECTS = scaling-crash-test.$(OBJEXT)
- scaling_crash_test_LDADD = $(LDADD)
- scaling_crash_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--scaling_helpers_test_SOURCES = scaling-helpers-test.c
--scaling_helpers_test_OBJECTS = scaling-helpers-test.$(OBJEXT)
--scaling_helpers_test_LDADD = $(LDADD)
--scaling_helpers_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--scaling_test_SOURCES = scaling-test.c
--scaling_test_OBJECTS = scaling-test.$(OBJEXT)
--scaling_test_LDADD = $(LDADD)
--scaling_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--solid_test_SOURCES = solid-test.c
--solid_test_OBJECTS = solid-test.$(OBJEXT)
--solid_test_LDADD = $(LDADD)
--solid_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
--stress_test_SOURCES = stress-test.c
--stress_test_OBJECTS = stress-test.$(OBJEXT)
--stress_test_LDADD = $(LDADD)
--stress_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- thread_test_SOURCES = thread-test.c
- thread_test_OBJECTS = thread-test.$(OBJEXT)
- thread_test_LDADD = $(LDADD)
- thread_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--tolerance_test_SOURCES = tolerance-test.c
--tolerance_test_OBJECTS = tolerance-test.$(OBJEXT)
--tolerance_test_LDADD = $(LDADD)
--tolerance_test_DEPENDENCIES = libutils.la \
-- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
- trap_crasher_SOURCES = trap-crasher.c
- trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
- trap_crasher_LDADD = $(LDADD)
-@@ -376,27 +217,16 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__maybe_remake_depfiles = depfiles
- am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \
-- ./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \
-- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
-- ./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \
- ./$(DEPDIR)/combiner-test.Po \
-- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
-- ./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
-- ./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
-- ./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
-- ./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
-- ./$(DEPDIR)/matrix-test.Po ./$(DEPDIR)/oob-test.Po \
-+ ./$(DEPDIR)/fetch-test.Po \
-+ ./$(DEPDIR)/infinite-loop.Po \
-+ ./$(DEPDIR)/oob-test.Po \
- ./$(DEPDIR)/pdf-op-test.Po ./$(DEPDIR)/pixel-test.Po \
- ./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \
-- ./$(DEPDIR)/radial-perf-test.Po \
-- ./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \
- ./$(DEPDIR)/region-translate-test.Po \
-- ./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \
- ./$(DEPDIR)/scaling-crash-test.Po \
-- ./$(DEPDIR)/scaling-helpers-test.Po \
-- ./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
-- ./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
-- ./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \
-+ ./$(DEPDIR)/thread-test.Po \
-+ ./$(DEPDIR)/trap-crasher.Po \
- ./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo
- am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -417,30 +247,24 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
-- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
-- check-formats.c combiner-test.c composite.c \
-- composite-traps-test.c cover-test.c fence-image-self-test.c \
-- fetch-test.c filter-reduction-test.c glyph-test.c \
-- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
-- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
-- prng-test.c radial-invalid.c radial-perf-test.c \
-- region-contains-test.c region-test.c region-translate-test.c \
-- rotate-test.c scaling-bench.c scaling-crash-test.c \
-- scaling-helpers-test.c scaling-test.c solid-test.c \
-- stress-test.c thread-test.c tolerance-test.c trap-crasher.c
--DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
-- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
-- check-formats.c combiner-test.c composite.c \
-- composite-traps-test.c cover-test.c fence-image-self-test.c \
-- fetch-test.c filter-reduction-test.c glyph-test.c \
-- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
-- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
-- prng-test.c radial-invalid.c radial-perf-test.c \
-- region-contains-test.c region-test.c region-translate-test.c \
-- rotate-test.c scaling-bench.c scaling-crash-test.c \
-- scaling-helpers-test.c scaling-test.c solid-test.c \
-- stress-test.c thread-test.c tolerance-test.c trap-crasher.c
-+SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
-+ combiner-test.c \
-+ fetch-test.c \
-+ infinite-loop.c \
-+ oob-test.c pdf-op-test.c pixel-test.c \
-+ prng-test.c radial-invalid.c \
-+ region-translate-test.c \
-+ scaling-crash-test.c \
-+ thread-test.c trap-crasher.c
-+DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
-+ combiner-test.c \
-+ fetch-test.c \
-+ infinite-loop.c \
-+ oob-test.c pdf-op-test.c pixel-test.c \
-+ prng-test.c radial-invalid.c \
-+ region-translate-test.c \
-+ scaling-crash-test.c \
-+ thread-test.c trap-crasher.c
- am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
-@@ -826,46 +650,21 @@
- oob-test \
- infinite-loop \
- trap-crasher \
-- fence-image-self-test \
- region-translate-test \
- fetch-test \
- a1-trap-test \
- prng-test \
- radial-invalid \
- pdf-op-test \
-- region-test \
- combiner-test \
- scaling-crash-test \
-- alpha-loop \
-- scaling-helpers-test \
- thread-test \
-- rotate-test \
-- alphamap \
-- gradient-crash-test \
- pixel-test \
-- matrix-test \
-- filter-reduction-test \
-- composite-traps-test \
-- region-contains-test \
-- glyph-test \
-- solid-test \
-- stress-test \
-- cover-test \
-- blitters-test \
-- affine-test \
-- scaling-test \
-- composite \
-- tolerance-test \
- $(NULL)
-
-
- # Other programs
- OTHERPROGRAMS = \
-- lowlevel-blt-bench \
-- radial-perf-test \
-- check-formats \
-- scaling-bench \
-- affine-bench \
- $(NULL)
-
-
-@@ -952,78 +751,18 @@
- @rm -f a1-trap-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(a1_trap_test_OBJECTS) $(a1_trap_test_LDADD) $(LIBS)
-
--affine-bench$(EXEEXT): $(affine_bench_OBJECTS) $(affine_bench_DEPENDENCIES) $(EXTRA_affine_bench_DEPENDENCIES)
-- @rm -f affine-bench$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
--
--affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES) $(EXTRA_affine_test_DEPENDENCIES)
-- @rm -f affine-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS)
--
--alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES)
-- @rm -f alpha-loop$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS)
--
--alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap_DEPENDENCIES)
-- @rm -f alphamap$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS)
--
--blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES)
-- @rm -f blitters-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
--
--check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES)
-- @rm -f check-formats$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
--
- combiner-test$(EXEEXT): $(combiner_test_OBJECTS) $(combiner_test_DEPENDENCIES) $(EXTRA_combiner_test_DEPENDENCIES)
- @rm -f combiner-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS)
-
--composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) $(EXTRA_composite_DEPENDENCIES)
-- @rm -f composite$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS)
--
--composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES)
-- @rm -f composite-traps-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
--
--cover-test$(EXEEXT): $(cover_test_OBJECTS) $(cover_test_DEPENDENCIES) $(EXTRA_cover_test_DEPENDENCIES)
-- @rm -f cover-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(cover_test_OBJECTS) $(cover_test_LDADD) $(LIBS)
--
--fence-image-self-test$(EXEEXT): $(fence_image_self_test_OBJECTS) $(fence_image_self_test_DEPENDENCIES) $(EXTRA_fence_image_self_test_DEPENDENCIES)
-- @rm -f fence-image-self-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(fence_image_self_test_OBJECTS) $(fence_image_self_test_LDADD) $(LIBS)
--
- fetch-test$(EXEEXT): $(fetch_test_OBJECTS) $(fetch_test_DEPENDENCIES) $(EXTRA_fetch_test_DEPENDENCIES)
- @rm -f fetch-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
-
--filter-reduction-test$(EXEEXT): $(filter_reduction_test_OBJECTS) $(filter_reduction_test_DEPENDENCIES) $(EXTRA_filter_reduction_test_DEPENDENCIES)
-- @rm -f filter-reduction-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(filter_reduction_test_OBJECTS) $(filter_reduction_test_LDADD) $(LIBS)
--
--glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES)
-- @rm -f glyph-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS)
--
--gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES)
-- @rm -f gradient-crash-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
--
- infinite-loop$(EXEEXT): $(infinite_loop_OBJECTS) $(infinite_loop_DEPENDENCIES) $(EXTRA_infinite_loop_DEPENDENCIES)
- @rm -f infinite-loop$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(infinite_loop_OBJECTS) $(infinite_loop_LDADD) $(LIBS)
-
--lowlevel-blt-bench$(EXEEXT): $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_DEPENDENCIES) $(EXTRA_lowlevel_blt_bench_DEPENDENCIES)
-- @rm -f lowlevel-blt-bench$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
--
--matrix-test$(EXEEXT): $(matrix_test_OBJECTS) $(matrix_test_DEPENDENCIES) $(EXTRA_matrix_test_DEPENDENCIES)
-- @rm -f matrix-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(matrix_test_OBJECTS) $(matrix_test_LDADD) $(LIBS)
--
- oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES)
- @rm -f oob-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
-@@ -1044,58 +783,18 @@
- @rm -f radial-invalid$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(radial_invalid_OBJECTS) $(radial_invalid_LDADD) $(LIBS)
-
--radial-perf-test$(EXEEXT): $(radial_perf_test_OBJECTS) $(radial_perf_test_DEPENDENCIES) $(EXTRA_radial_perf_test_DEPENDENCIES)
-- @rm -f radial-perf-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
--
--region-contains-test$(EXEEXT): $(region_contains_test_OBJECTS) $(region_contains_test_DEPENDENCIES) $(EXTRA_region_contains_test_DEPENDENCIES)
-- @rm -f region-contains-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS)
--
--region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES)
-- @rm -f region-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS)
--
- region-translate-test$(EXEEXT): $(region_translate_test_OBJECTS) $(region_translate_test_DEPENDENCIES) $(EXTRA_region_translate_test_DEPENDENCIES)
- @rm -f region-translate-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(region_translate_test_OBJECTS) $(region_translate_test_LDADD) $(LIBS)
-
--rotate-test$(EXEEXT): $(rotate_test_OBJECTS) $(rotate_test_DEPENDENCIES) $(EXTRA_rotate_test_DEPENDENCIES)
-- @rm -f rotate-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(rotate_test_OBJECTS) $(rotate_test_LDADD) $(LIBS)
--
--scaling-bench$(EXEEXT): $(scaling_bench_OBJECTS) $(scaling_bench_DEPENDENCIES) $(EXTRA_scaling_bench_DEPENDENCIES)
-- @rm -f scaling-bench$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(scaling_bench_OBJECTS) $(scaling_bench_LDADD) $(LIBS)
--
- scaling-crash-test$(EXEEXT): $(scaling_crash_test_OBJECTS) $(scaling_crash_test_DEPENDENCIES) $(EXTRA_scaling_crash_test_DEPENDENCIES)
- @rm -f scaling-crash-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(scaling_crash_test_OBJECTS) $(scaling_crash_test_LDADD) $(LIBS)
-
--scaling-helpers-test$(EXEEXT): $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_DEPENDENCIES) $(EXTRA_scaling_helpers_test_DEPENDENCIES)
-- @rm -f scaling-helpers-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS)
--
--scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES)
-- @rm -f scaling-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
--
--solid-test$(EXEEXT): $(solid_test_OBJECTS) $(solid_test_DEPENDENCIES) $(EXTRA_solid_test_DEPENDENCIES)
-- @rm -f solid-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(solid_test_OBJECTS) $(solid_test_LDADD) $(LIBS)
--
--stress-test$(EXEEXT): $(stress_test_OBJECTS) $(stress_test_DEPENDENCIES) $(EXTRA_stress_test_DEPENDENCIES)
-- @rm -f stress-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(stress_test_OBJECTS) $(stress_test_LDADD) $(LIBS)
--
- thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) $(EXTRA_thread_test_DEPENDENCIES)
- @rm -f thread-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
-
--tolerance-test$(EXEEXT): $(tolerance_test_OBJECTS) $(tolerance_test_DEPENDENCIES) $(EXTRA_tolerance_test_DEPENDENCIES)
-- @rm -f tolerance-test$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(tolerance_test_OBJECTS) $(tolerance_test_LDADD) $(LIBS)
--
- trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES)
- @rm -f trap-crasher$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
-@@ -1107,42 +806,17 @@
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-reduction-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-bench.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tolerance-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker
-@@ -1394,13 +1068,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
--fence-image-self-test.log: fence-image-self-test$(EXEEXT)
-- @p='fence-image-self-test$(EXEEXT)'; \
-- b='fence-image-self-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
- region-translate-test.log: region-translate-test$(EXEEXT)
- @p='region-translate-test$(EXEEXT)'; \
- b='region-translate-test'; \
-@@ -1443,13 +1110,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
--region-test.log: region-test$(EXEEXT)
-- @p='region-test$(EXEEXT)'; \
-- b='region-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
- combiner-test.log: combiner-test$(EXEEXT)
- @p='combiner-test$(EXEEXT)'; \
- b='combiner-test'; \
-@@ -1464,20 +1124,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
--alpha-loop.log: alpha-loop$(EXEEXT)
-- @p='alpha-loop$(EXEEXT)'; \
-- b='alpha-loop'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--scaling-helpers-test.log: scaling-helpers-test$(EXEEXT)
-- @p='scaling-helpers-test$(EXEEXT)'; \
-- b='scaling-helpers-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
- thread-test.log: thread-test$(EXEEXT)
- @p='thread-test$(EXEEXT)'; \
- b='thread-test'; \
-@@ -1485,27 +1131,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
--rotate-test.log: rotate-test$(EXEEXT)
-- @p='rotate-test$(EXEEXT)'; \
-- b='rotate-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--alphamap.log: alphamap$(EXEEXT)
-- @p='alphamap$(EXEEXT)'; \
-- b='alphamap'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--gradient-crash-test.log: gradient-crash-test$(EXEEXT)
-- @p='gradient-crash-test$(EXEEXT)'; \
-- b='gradient-crash-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
- pixel-test.log: pixel-test$(EXEEXT)
- @p='pixel-test$(EXEEXT)'; \
- b='pixel-test'; \
-@@ -1513,97 +1138,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
--matrix-test.log: matrix-test$(EXEEXT)
-- @p='matrix-test$(EXEEXT)'; \
-- b='matrix-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--filter-reduction-test.log: filter-reduction-test$(EXEEXT)
-- @p='filter-reduction-test$(EXEEXT)'; \
-- b='filter-reduction-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--composite-traps-test.log: composite-traps-test$(EXEEXT)
-- @p='composite-traps-test$(EXEEXT)'; \
-- b='composite-traps-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--region-contains-test.log: region-contains-test$(EXEEXT)
-- @p='region-contains-test$(EXEEXT)'; \
-- b='region-contains-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--glyph-test.log: glyph-test$(EXEEXT)
-- @p='glyph-test$(EXEEXT)'; \
-- b='glyph-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--solid-test.log: solid-test$(EXEEXT)
-- @p='solid-test$(EXEEXT)'; \
-- b='solid-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--stress-test.log: stress-test$(EXEEXT)
-- @p='stress-test$(EXEEXT)'; \
-- b='stress-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--cover-test.log: cover-test$(EXEEXT)
-- @p='cover-test$(EXEEXT)'; \
-- b='cover-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--blitters-test.log: blitters-test$(EXEEXT)
-- @p='blitters-test$(EXEEXT)'; \
-- b='blitters-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--affine-test.log: affine-test$(EXEEXT)
-- @p='affine-test$(EXEEXT)'; \
-- b='affine-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--scaling-test.log: scaling-test$(EXEEXT)
-- @p='scaling-test$(EXEEXT)'; \
-- b='scaling-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--composite.log: composite$(EXEEXT)
-- @p='composite$(EXEEXT)'; \
-- b='composite'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--tolerance-test.log: tolerance-test$(EXEEXT)
-- @p='tolerance-test$(EXEEXT)'; \
-- b='tolerance-test'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
- .test.log:
- @p='$<'; \
- $(am__set_b); \
-@@ -1697,42 +1231,17 @@
-
- distclean: distclean-am
- -rm -f ./$(DEPDIR)/a1-trap-test.Po
-- -rm -f ./$(DEPDIR)/affine-bench.Po
-- -rm -f ./$(DEPDIR)/affine-test.Po
-- -rm -f ./$(DEPDIR)/alpha-loop.Po
-- -rm -f ./$(DEPDIR)/alphamap.Po
-- -rm -f ./$(DEPDIR)/blitters-test.Po
-- -rm -f ./$(DEPDIR)/check-formats.Po
- -rm -f ./$(DEPDIR)/combiner-test.Po
-- -rm -f ./$(DEPDIR)/composite-traps-test.Po
-- -rm -f ./$(DEPDIR)/composite.Po
-- -rm -f ./$(DEPDIR)/cover-test.Po
-- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
- -rm -f ./$(DEPDIR)/fetch-test.Po
-- -rm -f ./$(DEPDIR)/filter-reduction-test.Po
-- -rm -f ./$(DEPDIR)/glyph-test.Po
-- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
- -rm -f ./$(DEPDIR)/infinite-loop.Po
-- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
-- -rm -f ./$(DEPDIR)/matrix-test.Po
- -rm -f ./$(DEPDIR)/oob-test.Po
- -rm -f ./$(DEPDIR)/pdf-op-test.Po
- -rm -f ./$(DEPDIR)/pixel-test.Po
- -rm -f ./$(DEPDIR)/prng-test.Po
- -rm -f ./$(DEPDIR)/radial-invalid.Po
-- -rm -f ./$(DEPDIR)/radial-perf-test.Po
-- -rm -f ./$(DEPDIR)/region-contains-test.Po
-- -rm -f ./$(DEPDIR)/region-test.Po
- -rm -f ./$(DEPDIR)/region-translate-test.Po
-- -rm -f ./$(DEPDIR)/rotate-test.Po
-- -rm -f ./$(DEPDIR)/scaling-bench.Po
- -rm -f ./$(DEPDIR)/scaling-crash-test.Po
-- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po
-- -rm -f ./$(DEPDIR)/scaling-test.Po
-- -rm -f ./$(DEPDIR)/solid-test.Po
-- -rm -f ./$(DEPDIR)/stress-test.Po
- -rm -f ./$(DEPDIR)/thread-test.Po
-- -rm -f ./$(DEPDIR)/tolerance-test.Po
- -rm -f ./$(DEPDIR)/trap-crasher.Po
- -rm -f ./$(DEPDIR)/utils-prng.Plo
- -rm -f ./$(DEPDIR)/utils.Plo
-@@ -1782,42 +1291,17 @@
-
- maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/a1-trap-test.Po
-- -rm -f ./$(DEPDIR)/affine-bench.Po
-- -rm -f ./$(DEPDIR)/affine-test.Po
-- -rm -f ./$(DEPDIR)/alpha-loop.Po
-- -rm -f ./$(DEPDIR)/alphamap.Po
-- -rm -f ./$(DEPDIR)/blitters-test.Po
-- -rm -f ./$(DEPDIR)/check-formats.Po
- -rm -f ./$(DEPDIR)/combiner-test.Po
-- -rm -f ./$(DEPDIR)/composite-traps-test.Po
-- -rm -f ./$(DEPDIR)/composite.Po
-- -rm -f ./$(DEPDIR)/cover-test.Po
-- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
- -rm -f ./$(DEPDIR)/fetch-test.Po
-- -rm -f ./$(DEPDIR)/filter-reduction-test.Po
-- -rm -f ./$(DEPDIR)/glyph-test.Po
-- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
- -rm -f ./$(DEPDIR)/infinite-loop.Po
-- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
-- -rm -f ./$(DEPDIR)/matrix-test.Po
- -rm -f ./$(DEPDIR)/oob-test.Po
- -rm -f ./$(DEPDIR)/pdf-op-test.Po
- -rm -f ./$(DEPDIR)/pixel-test.Po
- -rm -f ./$(DEPDIR)/prng-test.Po
- -rm -f ./$(DEPDIR)/radial-invalid.Po
-- -rm -f ./$(DEPDIR)/radial-perf-test.Po
-- -rm -f ./$(DEPDIR)/region-contains-test.Po
-- -rm -f ./$(DEPDIR)/region-test.Po
- -rm -f ./$(DEPDIR)/region-translate-test.Po
-- -rm -f ./$(DEPDIR)/rotate-test.Po
-- -rm -f ./$(DEPDIR)/scaling-bench.Po
- -rm -f ./$(DEPDIR)/scaling-crash-test.Po
-- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po
-- -rm -f ./$(DEPDIR)/scaling-test.Po
-- -rm -f ./$(DEPDIR)/solid-test.Po
-- -rm -f ./$(DEPDIR)/stress-test.Po
- -rm -f ./$(DEPDIR)/thread-test.Po
-- -rm -f ./$(DEPDIR)/tolerance-test.Po
- -rm -f ./$(DEPDIR)/trap-crasher.Po
- -rm -f ./$(DEPDIR)/utils-prng.Plo
- -rm -f ./$(DEPDIR)/utils.Plo
---- ./demos/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500
-+++ ./demos/Makefile.in 2020-04-20 14:54:20.827508022 -0500
-@@ -107,7 +107,7 @@
- @HAVE_GTK_TRUE@ trap-test$(EXEEXT) tri-test$(EXEEXT) \
- @HAVE_GTK_TRUE@ quad2quad$(EXEEXT) checkerboard$(EXEEXT) \
- @HAVE_GTK_TRUE@ srgb-trap-test$(EXEEXT) srgb-test$(EXEEXT) \
--@HAVE_GTK_TRUE@ scale$(EXEEXT) dither$(EXEEXT)
-+@HAVE_GTK_TRUE@ scale$(EXEEXT)
- PROGRAMS = $(noinst_PROGRAMS)
- am__alpha_test_SOURCES_DIST = alpha-test.c gtk-utils.c gtk-utils.h \
- ../test/utils.c ../test/utils.h ../test/utils-prng.c \
-@@ -185,15 +185,6 @@
- @HAVE_GTK_TRUE@convolution_test_DEPENDENCIES = \
- @HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \
- @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
--am__dither_SOURCES_DIST = dither.c gtk-utils.c gtk-utils.h \
-- ../test/utils.c ../test/utils.h ../test/utils-prng.c \
-- ../test/utils-prng.h
--@HAVE_GTK_TRUE@am_dither_OBJECTS = dither.$(OBJEXT) $(am__objects_1)
--dither_OBJECTS = $(am_dither_OBJECTS)
--dither_LDADD = $(LDADD)
--@HAVE_GTK_TRUE@dither_DEPENDENCIES = \
--@HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \
--@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__gradient_test_SOURCES_DIST = gradient-test.c gtk-utils.c \
- gtk-utils.h ../test/utils.c ../test/utils.h \
- ../test/utils-prng.c ../test/utils-prng.h
-@@ -308,7 +299,7 @@
- ./$(DEPDIR)/checkerboard.Po ./$(DEPDIR)/clip-in.Po \
- ./$(DEPDIR)/clip-test.Po ./$(DEPDIR)/composite-test.Po \
- ./$(DEPDIR)/conical-test.Po ./$(DEPDIR)/convolution-test.Po \
-- ./$(DEPDIR)/dither.Po ./$(DEPDIR)/gradient-test.Po \
-+ ./$(DEPDIR)/gradient-test.Po \
- ./$(DEPDIR)/gtk-utils.Po ./$(DEPDIR)/linear-gradient.Po \
- ./$(DEPDIR)/quad2quad.Po ./$(DEPDIR)/radial-test.Po \
- ./$(DEPDIR)/scale.Po ./$(DEPDIR)/screen-test.Po \
-@@ -337,7 +328,7 @@
- SOURCES = $(alpha_test_SOURCES) $(checkerboard_SOURCES) \
- $(clip_in_SOURCES) $(clip_test_SOURCES) \
- $(composite_test_SOURCES) $(conical_test_SOURCES) \
-- $(convolution_test_SOURCES) $(dither_SOURCES) \
-+ $(convolution_test_SOURCES) \
- $(gradient_test_SOURCES) $(linear_gradient_SOURCES) \
- quad2quad.c $(radial_test_SOURCES) $(scale_SOURCES) \
- $(screen_test_SOURCES) $(srgb_test_SOURCES) \
-@@ -349,7 +340,7 @@
- $(am__composite_test_SOURCES_DIST) \
- $(am__conical_test_SOURCES_DIST) \
- $(am__convolution_test_SOURCES_DIST) \
-- $(am__dither_SOURCES_DIST) $(am__gradient_test_SOURCES_DIST) \
-+ $(am__gradient_test_SOURCES_DIST) \
- $(am__linear_gradient_SOURCES_DIST) quad2quad.c \
- $(am__radial_test_SOURCES_DIST) $(am__scale_SOURCES_DIST) \
- $(am__screen_test_SOURCES_DIST) $(am__srgb_test_SOURCES_DIST) \
-@@ -533,7 +524,6 @@
- parrot.c \
- parrot.jpg \
- scale.ui \
-- dither.ui \
- meson.build \
- $(NULL)
-
-@@ -561,8 +551,7 @@
- @HAVE_GTK_TRUE@ checkerboard \
- @HAVE_GTK_TRUE@ srgb-trap-test \
- @HAVE_GTK_TRUE@ srgb-test \
--@HAVE_GTK_TRUE@ scale \
--@HAVE_GTK_TRUE@ dither
-+@HAVE_GTK_TRUE@ scale
-
- @HAVE_GTK_TRUE@gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
- @HAVE_GTK_TRUE@alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
-@@ -580,7 +569,6 @@
- @HAVE_GTK_TRUE@srgb_test_SOURCES = srgb-test.c $(GTK_UTILS)
- @HAVE_GTK_TRUE@srgb_trap_test_SOURCES = srgb-trap-test.c $(GTK_UTILS)
- @HAVE_GTK_TRUE@scale_SOURCES = scale.c $(GTK_UTILS)
--@HAVE_GTK_TRUE@dither_SOURCES = dither.c $(GTK_UTILS)
- all: all-am
-
- .SUFFIXES:
-@@ -652,10 +640,6 @@
- @rm -f convolution-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(convolution_test_OBJECTS) $(convolution_test_LDADD) $(LIBS)
-
--dither$(EXEEXT): $(dither_OBJECTS) $(dither_DEPENDENCIES) $(EXTRA_dither_DEPENDENCIES)
-- @rm -f dither$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(dither_OBJECTS) $(dither_LDADD) $(LIBS)
--
- gradient-test$(EXEEXT): $(gradient_test_OBJECTS) $(gradient_test_DEPENDENCIES) $(EXTRA_gradient_test_DEPENDENCIES)
- @rm -f gradient-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(gradient_test_OBJECTS) $(gradient_test_LDADD) $(LIBS)
-@@ -709,7 +693,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conical-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolution-test.Po@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-utils.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear-gradient.Po@am__quote@ # am--include-marker
-@@ -917,7 +900,6 @@
- -rm -f ./$(DEPDIR)/composite-test.Po
- -rm -f ./$(DEPDIR)/conical-test.Po
- -rm -f ./$(DEPDIR)/convolution-test.Po
-- -rm -f ./$(DEPDIR)/dither.Po
- -rm -f ./$(DEPDIR)/gradient-test.Po
- -rm -f ./$(DEPDIR)/gtk-utils.Po
- -rm -f ./$(DEPDIR)/linear-gradient.Po
-@@ -983,7 +965,6 @@
- -rm -f ./$(DEPDIR)/composite-test.Po
- -rm -f ./$(DEPDIR)/conical-test.Po
- -rm -f ./$(DEPDIR)/convolution-test.Po
-- -rm -f ./$(DEPDIR)/dither.Po
- -rm -f ./$(DEPDIR)/gradient-test.Po
- -rm -f ./$(DEPDIR)/gtk-utils.Po
- -rm -f ./$(DEPDIR)/linear-gradient.Po
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
deleted file mode 100644
index 936bf1ca4..000000000
--- a/source/x/x11/patch/xdm.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || \
- { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose || \
- { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \
- { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch
deleted file mode 100644
index db948094b..000000000
--- a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/xdm/genauth.c b/xdm/genauth.c
---- a/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/genauth.c 2014-01-06 16:28:09.664060603 +0100
-@@ -40,6 +40,14 @@
-
- #include <errno.h>
-
-+#ifdef HAVE_ARC4RANDOM
-+# ifdef __linux__
-+# include <bsd/stdlib.h>
-+# else
-+# include <stdlib.h>
-+# endif
-+#endif
-+
- #include <time.h>
- #define Time_t time_t
-
diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch
deleted file mode 100644
index 0a3f32bbe..000000000
--- a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur a/xdm/choose.c b/xdm/choose.c
---- a/xdm/choose.c 2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/choose.c 2014-01-06 16:33:09.628065364 +0100
-@@ -54,6 +54,14 @@
- # include <tiuser.h>
- # endif
-
-+# ifdef HAVE_SETPROCTITLE
-+# ifdef __linux__
-+# include <bsd/unistd.h>
-+# else
-+# include <unistd.h>
-+# endif
-+# endif
-+
- # include <time.h>
- # define Time_t time_t
-
-diff -ur a/xdm/session.c b/xdm/session.c
---- a/xdm/session.c 2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/session.c 2014-01-06 16:40:57.508072789 +0100
-@@ -54,6 +54,15 @@
- # include <usersec.h>
- #endif
-
-+# ifdef HAVE_SETPROCTITLE
-+# include <sys/types.h>
-+# ifdef __linux__
-+# include <bsd/unistd.h>
-+# else
-+# include <unistd.h>
-+# endif
-+# endif
-+
- #ifndef USE_PAM /* PAM modules should handle these */
- # ifdef SECURE_RPC
- # include <rpc/rpc.h>
diff --git a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff b/source/x/x11/patch/xdm/xdm.glibc.crypt.diff
deleted file mode 100644
index 076df37dc..000000000
--- a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Wed, 22 May 2013 14:20:26 +0000
-Subject: Handle NULL returns from glibc 2.17+ crypt().
-
-Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
-(w/ NULL return) if the salt violates specifications. Additionally,
-on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
-passed to crypt() fail with EPERM (w/ NULL return).
-
-If using glibc's crypt(), check return value to avoid a possible
-NULL pointer dereference.
-
-Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index db3cb7d..b009e2b 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
- struct spwd *sp;
- # endif
- char *user_pass = NULL;
-+ char *crypted_pass = NULL;
- # endif
- # ifdef __OpenBSD__
- char *s;
-@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
- # if defined(ultrix) || defined(__ultrix__)
- if (authenticate_user(p, greet->password, NULL) < 0)
- # else
-- if (strcmp (crypt (greet->password, user_pass), user_pass))
-+ crypted_pass = crypt (greet->password, user_pass);
-+ if ((crypted_pass == NULL)
-+ || (strcmp (crypted_pass, user_pass)))
- # endif
- {
- if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) {
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch
deleted file mode 100644
index 5e65d8563..000000000
--- a/source/x/x11/patch/xf86-video-s3virge.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Patch for xorg-server-1.20.x:
-zcat $CWD/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff
deleted file mode 100644
index 685282dfa..000000000
--- a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -aurN xf86-video-s3virge-1.10.7/src/s3v_driver.c xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c
---- xf86-video-s3virge-1.10.7/src/s3v_driver.c 2015-09-26 18:28:11.000000000 +0200
-+++ xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c 2018-07-14 12:43:11.986789561 +0200
-@@ -1203,6 +1203,7 @@
- vga256InfoRec.directMode = XF86DGADirectPresent;
- #endif
-
-+#if 0
- /*
- * xf86ValidateModes will check that the mode HTotal and VTotal values
- * don't exceed the chipset's limit if pScrn->maxHValue and
-@@ -1214,6 +1215,7 @@
- /* true for all ViRGE? */
- pScrn->maxHValue = 2048;
- pScrn->maxVValue = 2048;
-+#endif
-
- /* Lower depths default to config file */
- pScrn->virtualX = pScrn->display->virtualX;
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index e1e5d20f6..b75c4cf40 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -9,13 +9,8 @@ zcat $CWD/patch/xorg-server/xorg-server.combo.mouse.keyboard.layout.patch.gz | p
# the next xorg-server and will no longer apply then.
zcat $CWD/patch/xorg-server/fix-nouveau-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-# From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything):
-zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# From Fedora Rawhide 2018/7, looks like many other distributions have added
-# this patch for a long time. Keep an eye out for newer versions though, and
-# revisit this if any DE begin to manage secondary GPUs (although none do yet):
-zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+## From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything):
+#zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
# The upstream nouveau developers recommend this. On newer nvidia cards it works
# better to use the generic modesetting ddx rather than nouveau.
@@ -23,8 +18,6 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
# Added here 2018/7.
zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-# Fix a PCI related segfault:
-zcat $CWD/patch/xorg-server/fix-pci-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
# Only use Intel DDX with pre-gen4 hardware. Newer hardware will the the modesetting driver by default:
zcat $CWD/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch b/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch
deleted file mode 100644
index c613eb8f9..000000000
--- a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e96a83d9b1b5a52a41213c7a4840dc96b4f5b06f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 15 Aug 2012 12:35:21 -0400
-Subject: [PATCH] Always install vbe and int10 sdk headers
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- hw/xfree86/Makefile.am | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index b876b79..a170b58 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -26,17 +26,9 @@ if VGAHW
- VGAHW_SUBDIR = vgahw
- endif
-
--if VBE
--VBE_SUBDIR = vbe
--endif
--
--if INT10MODULE
--INT10_SUBDIR = int10
--endif
--
--SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
-+SUBDIRS = common ddc x86emu int10 os-support parser \
- ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
-- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \
-+ $(DRI2_SUBDIR) . vbe i2c dixmods xkb \
- fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
- $(GLAMOR_EGL_SUBDIR) drivers
-
---
-2.13.6
-
diff --git a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch b/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch
deleted file mode 100644
index 86b96a23e..000000000
--- a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c | 2 ++
- hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h | 1 +
- hw/xfree86/common/xf86Privstr.h | 1 +
- hw/xfree86/common/xf86platformBus.c | 4 ++++
- hw/xfree86/man/Xorg.man | 7 +++++++
- hw/xfree86/man/xorg.conf.man | 6 ++++++
- randr/randrstr.h | 3 +++
- randr/rrprovider.c | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
- FLAG_DRI2,
- FLAG_USE_SIGIO,
- FLAG_AUTO_ADD_GPU,
-+ FLAG_AUTO_BIND_GPU,
- FLAG_MAX_CLIENTS,
- FLAG_IGLX,
- FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
- {0}, FALSE},
- {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
- {0}, FALSE},
-+ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+ {0}, FALSE},
- {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
- {0}, FALSE },
- {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
- }
- xf86Msg(from, "%sutomatically adding GPU devices\n",
- xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+ if (xf86AutoBindGPUDisabled) {
-+ xf86Info.autoBindGPU = FALSE;
-+ from = X_CMDLINE;
-+ }
-+ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+ &xf86Info.autoBindGPU);
-+ from = X_CONFIG;
-+ }
-+ else {
-+ from = X_DEFAULT;
-+ }
-+ xf86Msg(from, "%sutomatically binding GPU devices\n",
-+ xf86Info.autoBindGPU ? "A" : "Not a");
-+
- /*
- * Set things up based on the config file information. Some of these
- * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
- .autoAddGPU = FALSE,
- #endif
-+ .autoBindGPU = TRUE,
- };
-
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
-
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
-
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
- return PrivsElevated();
- }
-
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+ int i;
-+
-+ if (!xf86Info.autoBindGPU)
-+ return;
-+
-+ for (i = 0; i < xf86NumGPUScreens; i++)
-+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+ xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
- for (i = 0; i < xf86NumGPUScreens; i++)
- AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-
-+ xf86AutoConfigOutputDevices();
-+
- xf86VGAarbiterWrapFunctions();
- if (sigio_blocked)
- input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
- xf86Info.iglxFrom = X_CMDLINE;
- return 0;
- }
-+ if (!strcmp(argv[i], "-noautoBindGPU")) {
-+ xf86AutoBindGPUDisabled = TRUE;
-+ return 1;
-+ }
-
- /* OS-specific processing */
- return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
-
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
-
- Bool autoAddGPU;
- const char *debug;
-+ Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
-
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
-
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
- }
- /* attach unbound to 0 protocol screen */
- AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+ if (xf86Info.autoBindGPU)
-+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+ xf86ScrnToScreen(xf86Screens[0]));
-
- RRResourcesChanged(xf86Screens[0]->pScreen);
- RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules. This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
-
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
-
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
-
- WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+ RRProviderPtr provider = pScrPriv->provider;
-+ RRProviderPtr master_provider = masterPriv->provider;
-+
-+ if (!provider || !master_provider)
-+ return;
-+
-+ if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+ (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+ RRInitPrimeSyncProps(pScreen);
-+ }
-+
-+ if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+ (master_provider->capabilities & RR_Capability_SinkOffload))
-+ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
---
-2.16.2
-
diff --git a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff b/source/x/x11/patch/xorg-server/fix-pci-segfault.diff
deleted file mode 100644
index 400376287..000000000
--- a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da03d0e91e6a56a5e3cb14a51d931633eff..dadbac6c8f0ae6f3d636fdfe245e61bc0c98581d 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -289,7 +289,7 @@ xf86platformProbe(void)
- for (i = 0; i < xf86_num_platform_devices; i++) {
- char *busid = xf86_platform_odev_attributes(i)->busid;
-
-- if (pci && (strncmp(busid, "pci:", 4) == 0)) {
-+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
- platform_find_pci_info(&xf86_platform_devices[i], busid);
- }
diff --git a/source/x/x11/post-install/xkeyboard-config.post-install b/source/x/x11/post-install/xkeyboard-config.post-install
index 8446f0641..92c647239 100644
--- a/source/x/x11/post-install/xkeyboard-config.post-install
+++ b/source/x/x11/post-install/xkeyboard-config.post-install
@@ -1,11 +1,2 @@
-# Move things into /etc/X11 that are supposed to be there:
-#mkdir -p $PKG/etc/X11
-#rm -rf $PKG/etc/X11/xkb
-#mv $PKG/usr/share/X11/xkb $PKG/etc/X11
-mkdir -p $PKG/usr/share/X11
-( cd $PKG/usr/share/X11 ; ln -sf ../../../etc/X11/xkb . )
-#( cd $PKG/etc/X11/xkb/rules
-# ln -sf base.lst xorg.lst
-# ln -sf base.xml xorg.xml
-# ln -sf base xorg
-#)
+mkdir -p $PKG/etc/X11
+( cd $PKG/etc/X11 ; ln -sf ../../usr/share/X11/xkb . )
diff --git a/source/x/x11/post-install/xorg-cf-files.post-install b/source/x/x11/post-install/xorg-cf-files.post-install
index e5fc2cc45..650ed9dac 100644
--- a/source/x/x11/post-install/xorg-cf-files.post-install
+++ b/source/x/x11/post-install/xorg-cf-files.post-install
@@ -1,4 +1,4 @@
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then
( cd $PKG/usr/lib/X11/config
zcat $CWD/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff.gz | patch -p1 || exit 1
)
diff --git a/source/x/x11/slack-desc/libxcvt b/source/x/x11/slack-desc/libxcvt
new file mode 100644
index 000000000..b9162be46
--- /dev/null
+++ b/source/x/x11/slack-desc/libxcvt
@@ -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------------------------------------------------------|
+libxcvt: libxcvt (VESA CVT standard modelines library)
+libxcvt:
+libxcvt: libxcvt is a library providing a standalone version of the X server
+libxcvt: implementation of the VESA CVT standard timing modelines generator.
+libxcvt: libxcvt also provides a command line tool "cvt".
+libxcvt:
+libxcvt:
+libxcvt:
+libxcvt:
+libxcvt:
+libxcvt:
diff --git a/source/x/x11/slack-desc/xorg-server b/source/x/x11/slack-desc/xorg-server
index 981a1a3dc..5595ad0be 100644
--- a/source/x/x11/slack-desc/xorg-server
+++ b/source/x/x11/slack-desc/xorg-server
@@ -12,8 +12,8 @@ xorg-server: Xorg is a full featured X server that was originally designed for U
xorg-server: and UNIX-like operating systems running on Intel x86 hardware. It now
xorg-server: runs on a wider range of hardware and OS platforms. This work was
xorg-server: derived by the X.Org Foundation from the XFree86 Project's XFree86
-xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386
+xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386
xorg-server: 1.2 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
xorg-server: Consulting Service.
xorg-server:
-xorg-server: Homepage: https://www.x.org
+xorg-server: Homepage: https://www.x.org
diff --git a/source/x/x11/src/get-xf86-video-mach64.sh b/source/x/x11/src/get-xf86-video-mach64.sh
new file mode 100755
index 000000000..0f1f827d2
--- /dev/null
+++ b/source/x/x11/src/get-xf86-video-mach64.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf xf86-video-mach64
+
+# Clone repository:
+git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/
+
+# checkout $BRANCH:
+( cd xf86-video-mach64
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd xf86-video-mach64 && git log -1 --format=%h )"
+DATE="$( cd xf86-video-mach64 && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd xf86-video-mach64 && git log -1 --format=%cd --date=format:%c )"
+# Cleanup. We're not packing up the whole git repo.
+( cd xf86-video-mach64 && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv xf86-video-mach64 xf86-video-mach64-${DATE}_${HEADISAT}
+tar cf xf86-video-mach64-${DATE}_${HEADISAT}.tar xf86-video-mach64-${DATE}_${HEADISAT}
+xz -9 -f xf86-video-mach64-${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-mach64-${DATE}_${HEADISAT}
+touch -d "$LONGDATE" xf86-video-mach64-${DATE}_${HEADISAT}.tar.xz
+echo
+echo "xf86-video-mach64 branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-mach64-${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/x11/src/get-xf86-video-mga.sh b/source/x/x11/src/get-xf86-video-mga.sh
new file mode 100755
index 000000000..8550b38c5
--- /dev/null
+++ b/source/x/x11/src/get-xf86-video-mga.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf xf86-video-mga
+
+# Clone repository:
+git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/
+
+# checkout $BRANCH:
+( cd xf86-video-mga
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd xf86-video-mga && git log -1 --format=%h )"
+DATE="$( cd xf86-video-mga && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd xf86-video-mga && git log -1 --format=%cd --date=format:%c )"
+# Cleanup. We're not packing up the whole git repo.
+( cd xf86-video-mga && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv xf86-video-mga xf86-video-mga-${DATE}_${HEADISAT}
+tar cf xf86-video-mga-${DATE}_${HEADISAT}.tar xf86-video-mga-${DATE}_${HEADISAT}
+xz -9 -f xf86-video-mga-${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-mga-${DATE}_${HEADISAT}
+touch -d "$LONGDATE" xf86-video-mga-${DATE}_${HEADISAT}.tar.xz
+echo
+echo "xf86-video-mga branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-mga-${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/x11/src/get-xf86-video-vmware.sh b/source/x/x11/src/get-xf86-video-vmware.sh
new file mode 100755
index 000000000..00fef209b
--- /dev/null
+++ b/source/x/x11/src/get-xf86-video-vmware.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modificvmwareon, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf xf86-video-vmware
+
+# Clone repository:
+git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/
+
+# checkout $BRANCH:
+( cd xf86-video-vmware
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd xf86-video-vmware && git log -1 --format=%h )"
+DATE="$( cd xf86-video-vmware && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd xf86-video-vmware && git log -1 --format=%cd --date=format:%c )"
+# Cleanup. We're not packing up the whole git repo.
+( cd xf86-video-vmware && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv xf86-video-vmware xf86-video-vmware-${DATE}_${HEADISAT}
+tar cf xf86-video-vmware-${DATE}_${HEADISAT}.tar xf86-video-vmware-${DATE}_${HEADISAT}
+xz -9 -f xf86-video-vmware-${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-vmware-${DATE}_${HEADISAT}
+touch -d "$LONGDATE" xf86-video-vmware-${DATE}_${HEADISAT}.tar.xz
+echo
+echo "xf86-video-vmware branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-vmware-${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url
index 9550a8000..53b87de6f 100644
--- a/source/x/x11/src/xf86-input-wacom.url
+++ b/source/x/x11/src/xf86-input-wacom.url
@@ -1 +1,2 @@
https://github.com/linuxwacom/xf86-input-wacom
+https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.2/xf86-input-wacom-1.2.2.tar.bz2