From f085c6a18cb44b803e0ff64642c9f78c886bee61 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Mon, 22 Dec 2014 21:42:30 -0500 Subject: [PATCH] Upgrade stage4 xorg packages --- config/packages-list | 34 +++---- stage4/configure-xorg | 16 +--- stage4/hv-install-1 | 37 ++++---- stage4/packages-update | 9 +- .../common/libXft-2.3.1-freetype_fix-1.patch | 30 ------ .../common/x11perf-1.5.4-fhs-dir.patch | 12 +++ ...rg-server-1.16.2-add_prime_support-1.patch | 92 +++++++++++++++++++ stage4/pkg/xf86-video-intel | 9 ++ stage4/pkg/xterm | 2 +- stage4/versions/app-7.7-1.md5 | 37 -------- stage4/versions/app-7.7-1.wget | 38 -------- stage4/versions/app.md5 | 38 ++++++++ stage4/versions/driver-7.7-1.md5 | 8 -- stage4/versions/driver-7.7-1.wget | 9 -- stage4/versions/driver.md5 | 8 ++ stage4/versions/font-7.7-1.wget | 38 -------- stage4/versions/{font-7.7-1.md5 => font.md5} | 2 +- stage4/versions/lib-7.7-1.md5 | 31 ------- stage4/versions/lib-7.7-1.wget | 32 ------- stage4/versions/lib.md5 | 32 +++++++ stage4/versions/proto-7.7-1.wget | 24 ----- .../versions/{proto-7.7-1.md5 => proto.md5} | 18 ++-- stage5/patches/common/SDL-1.2.15-libx11.patch | 12 +++ 23 files changed, 250 insertions(+), 318 deletions(-) delete mode 100644 stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch create mode 100644 stage4/patches/common/x11perf-1.5.4-fhs-dir.patch create mode 100644 stage4/patches/common/xorg-server-1.16.2-add_prime_support-1.patch create mode 100644 stage4/pkg/xf86-video-intel delete mode 100644 stage4/versions/app-7.7-1.md5 delete mode 100644 stage4/versions/app-7.7-1.wget create mode 100644 stage4/versions/app.md5 delete mode 100644 stage4/versions/driver-7.7-1.md5 delete mode 100644 stage4/versions/driver-7.7-1.wget create mode 100644 stage4/versions/driver.md5 delete mode 100644 stage4/versions/font-7.7-1.wget rename stage4/versions/{font-7.7-1.md5 => font.md5} (100%) delete mode 100644 stage4/versions/lib-7.7-1.md5 delete mode 100644 stage4/versions/lib-7.7-1.wget create mode 100644 stage4/versions/lib.md5 delete mode 100644 stage4/versions/proto-7.7-1.wget rename stage4/versions/{proto-7.7-1.md5 => proto.md5} (62%) create mode 100644 stage5/patches/common/SDL-1.2.15-libx11.patch diff --git a/config/packages-list b/config/packages-list index 271b95d..a95d9d7 100644 --- a/config/packages-list +++ b/config/packages-list @@ -220,6 +220,7 @@ LIBDVDREAD="libdvdread-5.0.0" LIBEPOXY="libepoxy-1.2" LIBEXIF="libexif-0.6.21" LIBEVENT="libevent-2.0.21" +LIBEVDEV="libevdev-1.3.2" LIBFAAD2="faad2-2.7" LIBFAAC="faac-1.28" LIBFFI="libffi-3.0.11" @@ -438,35 +439,26 @@ WPA_SUPPLICANT="wpa_supplicant-2.0" WV="wv-1.2.9" WXGTK="wxGTK-2.8.12" -XORG_VER="7.7-1" -XORG_APP=app-${XORG_VER} -XORG_DRIVER=driver-${XORG_VER} -XORG_VIDEO_NOUVEAU="xf86-video-nouveau-0.0.16+git20120322" -XORG_FONT=font-${XORG_VER} -XORG_LIB=lib-${XORG_VER} -XORG_PROTO=proto-${XORG_VER} -XORG_UTIL_MACROS="util-macros-1.11.0" -XORG_MAKEDEPEND="makedepend-1.0.3" -LIBXAU="libXau-1.0.7" +XORG_UTIL_MACROS="util-macros-1.19.0" +LIBXAU="libXau-1.0.8" LIBXDMCP="libXdmcp-1.1.1" XBITMAPS="xbitmaps-1.1.1" -LIBDRM="libdrm-2.4.33" +LIBDRM="libdrm-2.4.58" MESALIB="MesaLib-10.3.5" -XCURSOR_THEMES="xcursor-themes-1.0.3" -XKEYBOARD_CONFIG="xkeyboard-config-2.6" -LUIT="luit-1.1.1" -XORG_SERVER="xorg-server-1.12.3" +XCURSOR_THEMES="xcursor-themes-1.0.4" +XKEYBOARD_CONFIG="xkeyboard-config-2.13" +XORG_SERVER="xorg-server-1.16.2" XDM="xdm-1.1.11" -XCB_PROTO="xcb-proto-1.7.1" -XCB_UTIL="xcb-util-0.3.9" -LIBXCB="libxcb-1.8.1" -XDG_UTILS="xdg-utils-1.1.0-rc1" -XARCHIVER="xarchiver-0.5.2" +XCB_PROTO="xcb-proto-1.11" +XCB_UTIL="xcb-util-0.4.0" +LIBXCB="libxcb-1.11" +XDG_UTILS="xdg-utils-1.1.0-rc2" +XARCHIVER="xarchiver-0.5.4" XINETD="xinetd-2.3.15" XMLTO="xmlto-0.0.26" XMLTOMAN="xmltoman-0.4" XSCREENSAVER="xscreensaver-5.32" -XTERM="xterm-293" +XTERM="xterm-313" XVIDCORE="xvidcore-1.3.3" XZ_UTILS="xz-5.0.4" diff --git a/stage4/configure-xorg b/stage4/configure-xorg index a47d6d9..1aed47f 100755 --- a/stage4/configure-xorg +++ b/stage4/configure-xorg @@ -42,8 +42,8 @@ cat > /etc/skel/.xsession << "EOF" userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/usr/lib/xorg/xdm/Xresources +sysmodmap=/etc/X11/Xmodmap if [ -r /etc/profile ]; then . /etc/profile @@ -111,18 +111,6 @@ cat >> /etc/sysconfig/createfiles << "EOF" /tmp/.ICE-unix dir 1777 root root EOF -# Packages in Xorg store their configuration files in /usr/lib/X11 -# by default. This is strictly against FHS guidelines. Correct the -# installation /etc/X11 and create symlinks in the original location: -mkdir -v -p /etc/X11 - -for file in /usr/{lib/X11/{xinit,xdm},share/X11/app-defaults}; do - if [ -f ${file} -a ! -h ${file} ]; then - mv -v ${file} /etc/X11/ 2> /dev/null - ln -svfT /etc/X11/$(basename $file) $file - fi -done - if [ "x${INST_TYPE}" = "xltsp-server" ]; then # Enable remote xdm login for LTSP clients sed -i -e "s@^\(DisplayManager.requestPort.*\)@!\1@g" /etc/X11/xdm/xdm-config diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 index 8c93bd8..5829337 100755 --- a/stage4/hv-install-1 +++ b/stage4/hv-install-1 @@ -18,38 +18,32 @@ ipkg_xorg() { local MODULE=${1} shift - local CONFIGURE_OPTS=${*} + local MY_CONFIGURE_OPTS=${*} - ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS} + ipkg ${MODULE} ${XORG_CONFIG} ${MY_CONFIGURE_OPTS} } # Install all submodules in a module # -# Arg #1: module name and version -# Arg #2: optional configure arguments +# Arg #1: module name install_xorg_modules() { local MODULE=${1} - shift - local CONFIGURE_OPTS=${*} - - local MY_XORG_CONFIG - for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.wget); do - SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')" - ipkg_xorg ${SUBMOD} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS} + for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.md5 | \ + awk '{print $2}' | sed 's!\.tar\.bz2$!!'); do + ipkg_xorg ${package} done } ipkg_xorg ${XORG_UTIL_MACROS} -install_xorg_modules ${XORG_PROTO} -ipkg_xorg ${XORG_MAKEDEPEND} +install_xorg_modules proto ipkg_xorg ${LIBXAU} ipkg_xorg ${LIBXDMCP} ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG} ipkg ${XCB_PROTO} ${XORG_CONFIG} ipkg ${LIBXCB} ${XORG_CONFIG} -install_xorg_modules ${XORG_LIB} +install_xorg_modules lib ipkg ${XCB_UTIL} ${XORG_CONFIG} ipkg -m acnb ${LESSTIF} ipkg_xorg ${XBITMAPS} @@ -67,11 +61,10 @@ ipkg -m acnb ${LLVM} "\ --enable-optimized" ipkg -m acnb ${MESALIB} -install_xorg_modules ${XORG_APP} +install_xorg_modules app ipkg_xorg ${XCURSOR_THEMES} -install_xorg_modules ${XORG_FONT} +install_xorg_modules font ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg -ipkg_xorg ${LUIT} ipkg ${PIXMAN} ipkg ${DBUS} ipkg ${GLIB} @@ -82,16 +75,18 @@ ipkg -m acnb ${DBUS_GLIB} \ ipkg -m acnb -j ${LIBEPOXY} ipkg_xorg ${XORG_SERVER} "\ - --with-module-dir=/usr/lib/X11/modules \ --with-xkb-output=/var/lib/xkb \ + --enable-dmx \ + --enable-glamor \ --enable-install-setuid \ - --disable-config-hal" + --enable-suid-wrapper" ipkg -m acnb ${MTDEV} "--disable-static" -install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules +ipkg ${LIBEVDEV} ${XORG_CONFIG} +install_xorg_modules driver -ipkg_xorg ${XDM} +ipkg_xorg ${XDM} "--with-xdmlibdir=/usr/lib/xorg/xdm" rscr once "Configuring X.org" configure-xorg diff --git a/stage4/packages-update b/stage4/packages-update index 1e30740..c6aec96 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -7,15 +7,15 @@ update_packages_init ${*} lpkg 2 ${PYTHON} lpkg 2 ${GLIB} -XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} \ - ${XORG_PROTO}" +XORG_MODULES_LIST="app driver font lib proto" VERSIONS_DIR="${SCRDIR}/versions" for module in ${XORG_MODULES_LIST}; do MOD_NAME=$(get_pkg_name ${module}) - SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.wget | \ + SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.md5 | \ + awk '{print $2}' | \ sed 's!\.tar\.bz2$!!')" for submod in ${SUBMODS}; do @@ -31,7 +31,6 @@ for module in ${XORG_MODULES_LIST}; do done fpkg -m xorg -s util ${XORG_UTIL_MACROS} -fpkg -m xorg -s util ${XORG_MAKEDEPEND} fpkg -m xorg -s lib ${LIBXAU} fpkg -m xorg -s lib ${LIBXDMCP} fpkg -m sf ${LESSTIF} @@ -49,7 +48,6 @@ fpkg -v 0 ${MESALIB} "ftp://ftp.freedesktop.org/pub/mesa" fpkg -m xorg -s data ${XCURSOR_THEMES} fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL} -fpkg -m xorg -s app ${LUIT} fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL} fpkg -m fd -s "releases/dbus" ${DBUS} @@ -57,6 +55,7 @@ fpkg -m gnome ${GOBJECT_INSTROSPECTION} fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB} fpkg ${LIBEPOXY} "http://crux.nu/files" +fpkg -e "tar.xz" ${LIBEVDEV} "http://www.freedesktop.org/software/libevdev" fpkg -m xorg -s xserver ${XORG_SERVER} fpkg -m xorg -s app ${XDM} fpkg ${MTDEV} "http://bitmath.org/code/mtdev" diff --git a/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch b/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch deleted file mode 100644 index 108aef2..0000000 --- a/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -Submitted By: Chris Staub -Date: 2013-11-29 -Initial Package Version: 2.3.1 -Upstream Status: Fixed -Origin: freedesktop wiki -URL: https://trac.macports.org/changeset/114077 -Description: Fixes build with FreeType-2.5.1 - -diff -Naur libXft-2.3.1.orig/src/xftglyphs.c libXft-2.3.1/src/xftglyphs.c - -Index: src/xftglyphs.c -=================================================================== ---- libXft-2.3.1.orig/src/xftglyphs.c 2012-06-02 12:36:35.000000000 -0400 -+++ libXft-2.3.1/src/xftglyphs.c 2013-11-28 23:12:42.000000000 -0500 -@@ -21,10 +21,10 @@ - */ - - #include "xftint.h" --#include --#include -- --#include -+#include -+#include FT_OUTLINE_H -+#include FT_LCD_FILTER_H -+#include FT_SYNTHESIS_H - - /* - * Validate the memory info for a font - diff --git a/stage4/patches/common/x11perf-1.5.4-fhs-dir.patch b/stage4/patches/common/x11perf-1.5.4-fhs-dir.patch new file mode 100644 index 0000000..6cb7c1c --- /dev/null +++ b/stage4/patches/common/x11perf-1.5.4-fhs-dir.patch @@ -0,0 +1,12 @@ +diff -Naur x11perf-1.5.4.orig/configure x11perf-1.5.4.new/configure +--- x11perf-1.5.4.orig/configure 2011-07-27 21:30:19.000000000 -0400 ++++ x11perf-1.5.4.new/configure 2014-12-24 14:32:06.782649868 -0500 +@@ -4775,7 +4775,7 @@ + + + # Define the installation directory for the x11 performance compare scripts +-x11perfcompdir=$libdir/X11/x11perfcomp ++x11perfcompdir=$libdir/xorg/x11perfcomp + + + # Checks for programs run by the scripts we install diff --git a/stage4/patches/common/xorg-server-1.16.2-add_prime_support-1.patch b/stage4/patches/common/xorg-server-1.16.2-add_prime_support-1.patch new file mode 100644 index 0000000..726c996 --- /dev/null +++ b/stage4/patches/common/xorg-server-1.16.2-add_prime_support-1.patch @@ -0,0 +1,92 @@ +Submitted By: Armin K. +Date: 2012-12-30 +Initial Package Version: 1.13.1 +Upstream Status: Not submitted. +Origin: Upstream mailing list. +Description: Adds PRIME support to Xorg Server to make GPU offloading work. + +--- a/hw/xfree86/common/xf86Init.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86Init.c 2014-06-04 14:00:29.539324458 +0200 +@@ -363,6 +363,16 @@ + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -952,6 +962,8 @@ + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +--- a/hw/xfree86/common/xf86platformBus.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86platformBus.c 2014-06-04 14:00:29.539324458 +0200 +@@ -426,6 +426,8 @@ + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -494,6 +496,7 @@ + } + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + RRResourcesChanged(xf86Screens[0]->pScreen); + RRTellChanged(xf86Screens[0]->pScreen); +--- a/hw/xfree86/modes/xf86Crtc.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/modes/xf86Crtc.c 2014-06-04 14:00:29.540324474 +0200 +@@ -3387,3 +3387,35 @@ + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ Bool unbound = FALSE; ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ unbound = TRUE; ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } ++ if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ if (!unbound) ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} diff --git a/stage4/pkg/xf86-video-intel b/stage4/pkg/xf86-video-intel new file mode 100644 index 0000000..41c6093 --- /dev/null +++ b/stage4/pkg/xf86-video-intel @@ -0,0 +1,9 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS+=" \ + --enable-kms-only \ + --enable-uxa \ + --enable-glamor" +} diff --git a/stage4/pkg/xterm b/stage4/pkg/xterm index aaa8051..32e85e4 100644 --- a/stage4/pkg/xterm +++ b/stage4/pkg/xterm @@ -9,7 +9,7 @@ hvconfig_pre() CONFIGURE_OPTS+=" \ --enable-luit \ --enable-wide-chars \ - --with-app-defaults=/usr/share/X11/app-defaults \ + --with-app-defaults=/etc/X11/app-defaults \ ${XORG_CONFIG}" } diff --git a/stage4/versions/app-7.7-1.md5 b/stage4/versions/app-7.7-1.md5 deleted file mode 100644 index 059bf7a..0000000 --- a/stage4/versions/app-7.7-1.md5 +++ /dev/null @@ -1,37 +0,0 @@ -4a7a4a848c43c42f7d499b60666434a4 bdftopcf-1.0.3.tar.bz2 -08e3f6b523da8b0af179f22f339508b2 iceauth-1.0.5.tar.bz2 -c4a3664e08e5a47c120ff9263ee2f20c luit-1.1.1.tar.bz2 -18c429148c96c2079edda922a2b67632 mkfontdir-1.0.7.tar.bz2 -414fcb053418fb1418e3a39f4a37e0f7 mkfontscale-1.1.0.tar.bz2 -e99172cbd72700eeeae99f64632b5dc2 sessreg-1.0.7.tar.bz2 -1001771344608e120e943a396317c33a setxkbmap-1.3.0.tar.bz2 -edce41bd7562dcdfb813e05dbeede8ac smproxy-1.0.5.tar.bz2 -5c3c7431a38775caaea6051312a49bc9 x11perf-1.5.4.tar.bz2 -cbcbd8f2156a53b609800bec4c6b6c0e xauth-1.0.7.tar.bz2 -c9891d6a3f3129d56cede72daa0ba26c xbacklight-1.1.2.tar.bz2 -5812be48cbbec1068e7b718eec801766 xcmsdb-1.0.4.tar.bz2 -09f56978a62854534deacc8aa8ff3031 xcursorgen-1.0.5.tar.bz2 -1ef08f4c8d0e669c2edd49e4a1bf650d xdpyinfo-1.3.0.tar.bz2 -3d3cad4d754e10e325438193433d59fd xdriinfo-1.0.4.tar.bz2 -2727c72f3eba0c23f8f6b2e618d195a2 xev-1.2.0.tar.bz2 -c06067f572bc4a5298f324f27340da95 xgamma-1.0.5.tar.bz2 -a0fcd2cb6ddd9f378944cc6f4f83cd7c xhost-1.0.5.tar.bz2 -d2459d35b4e0b41ded26a1d1159b7ac6 xinput-1.6.0.tar.bz2 -a0fc1ac3fc4fe479ade09674347c5aa0 xkbcomp-1.2.4.tar.bz2 -37ed71525c63a9acd42e7cde211dcc5b xkbevd-1.1.3.tar.bz2 -52ad6d8d87577a8ac736ab5488bec210 xkbutils-1.0.3.tar.bz2 -e7f0d57b6ba49c384e9cf8c9ff3243c1 xkill-1.0.3.tar.bz2 -9d0e16d116d1c89e6b668c1b2672eb57 xlsatoms-1.1.1.tar.bz2 -760099f0af112401735801e3b9aa8595 xlsclients-1.1.2.tar.bz2 -5511da3361eea4eaa21427652c559e1c xmodmap-1.0.8.tar.bz2 -6101f04731ffd40803df80eca274ec4b xpr-1.0.4.tar.bz2 -d5529dc8d811efabd136ca2d8e857deb xprop-1.2.1.tar.bz2 -9735173a84dca9b05e06fd4686196b07 xrandr-1.3.5.tar.bz2 -ed2e48cf33584455d74615ad4bbe4246 xrdb-1.0.9.tar.bz2 -2f63f88ad0dcecd33c8cf000f38e9250 xrefresh-1.0.4.tar.bz2 -d44e0057d6722b25d5a314e82e0b7e7c xset-1.2.2.tar.bz2 -b78a2da4cf128775031a5a3422fc0b78 xsetroot-1.1.0.tar.bz2 -c88feb501083951a8f47a21aaeb1529d xvinfo-1.1.1.tar.bz2 -2113126f9ac9c02bb8547c112c5d037e xwd-1.0.5.tar.bz2 -9e8b58c8aa6172e87ab4f9cf3612fedd xwininfo-1.1.2.tar.bz2 -3025b152b4f13fdffd0c46d0be587be6 xwud-1.0.4.tar.bz2 diff --git a/stage4/versions/app-7.7-1.wget b/stage4/versions/app-7.7-1.wget deleted file mode 100644 index 2958de0..0000000 --- a/stage4/versions/app-7.7-1.wget +++ /dev/null @@ -1,38 +0,0 @@ -bdftopcf-1.0.3.tar.bz2 -iceauth-1.0.5.tar.bz2 -luit-1.1.1.tar.bz2 -mkfontdir-1.0.7.tar.bz2 -mkfontscale-1.1.0.tar.bz2 -sessreg-1.0.7.tar.bz2 -setxkbmap-1.3.0.tar.bz2 -smproxy-1.0.5.tar.bz2 -x11perf-1.5.4.tar.bz2 -xauth-1.0.7.tar.bz2 -xbacklight-1.1.2.tar.bz2 -xcmsdb-1.0.4.tar.bz2 -xcursorgen-1.0.5.tar.bz2 -xdpyinfo-1.3.0.tar.bz2 -xdriinfo-1.0.4.tar.bz2 -xev-1.2.0.tar.bz2 -xgamma-1.0.5.tar.bz2 -xhost-1.0.5.tar.bz2 -xinput-1.6.0.tar.bz2 -xkbcomp-1.2.4.tar.bz2 -xkbevd-1.1.3.tar.bz2 -xkbutils-1.0.3.tar.bz2 -xkill-1.0.3.tar.bz2 -xlsatoms-1.1.1.tar.bz2 -xlsclients-1.1.2.tar.bz2 -xmodmap-1.0.8.tar.bz2 -xpr-1.0.4.tar.bz2 -xprop-1.2.1.tar.bz2 -xrandr-1.3.5.tar.bz2 -xrdb-1.0.9.tar.bz2 -xrefresh-1.0.4.tar.bz2 -xset-1.2.2.tar.bz2 -xsetroot-1.1.0.tar.bz2 -xvinfo-1.1.1.tar.bz2 -xwd-1.0.5.tar.bz2 -xwininfo-1.1.2.tar.bz2 -xwud-1.0.4.tar.bz2 - diff --git a/stage4/versions/app.md5 b/stage4/versions/app.md5 new file mode 100644 index 0000000..7c0ea57 --- /dev/null +++ b/stage4/versions/app.md5 @@ -0,0 +1,38 @@ +96a648a332160a7482885800f7a506fa bdftopcf-1.0.4.tar.bz2 +2527344acc60741a709f4858564c5ae6 iceauth-1.0.6.tar.bz2 +c4a3664e08e5a47c120ff9263ee2f20c luit-1.1.1.tar.bz2 +18c429148c96c2079edda922a2b67632 mkfontdir-1.0.7.tar.bz2 +03de3f15db678e277f5ef9c013aca1ad mkfontscale-1.1.1.tar.bz2 +f548e389ff68424947b87785df6a321b sessreg-1.0.8.tar.bz2 +1001771344608e120e943a396317c33a setxkbmap-1.3.0.tar.bz2 +edce41bd7562dcdfb813e05dbeede8ac smproxy-1.0.5.tar.bz2 +5c3c7431a38775caaea6051312a49bc9 x11perf-1.5.4.tar.bz2 +7d6003f32838d5b688e2c8a131083271 xauth-1.0.9.tar.bz2 +0066f23f69ca3ef62dcaeb74a87fdc48 xbacklight-1.2.1.tar.bz2 +5812be48cbbec1068e7b718eec801766 xcmsdb-1.0.4.tar.bz2 +b58a87e6cd7145c70346adad551dba48 xcursorgen-1.0.6.tar.bz2 +cacc0733f16e4f2a97a5c430fcc4420e xdpyinfo-1.3.1.tar.bz2 +3d3cad4d754e10e325438193433d59fd xdriinfo-1.0.4.tar.bz2 +5b0a0b6f589441d546da21739fa75634 xev-1.2.1.tar.bz2 +c06067f572bc4a5298f324f27340da95 xgamma-1.0.5.tar.bz2 +f1669af1fe0554e876f03319c678e79d xhost-1.0.6.tar.bz2 +305980ac78a6954e306a14d80a54c441 xinput-1.6.1.tar.bz2 +0012a8e3092cddf7f87b250f96bb38c5 xkbcomp-1.3.0.tar.bz2 +37ed71525c63a9acd42e7cde211dcc5b xkbevd-1.1.3.tar.bz2 +502b14843f610af977dffc6cbf2102d5 xkbutils-1.0.4.tar.bz2 +0ae6bc2a8d3af68e9c76b1a6ca5f7a78 xkill-1.0.4.tar.bz2 +9d0e16d116d1c89e6b668c1b2672eb57 xlsatoms-1.1.1.tar.bz2 +9fbf6b174a5138a61738a42e707ad8f5 xlsclients-1.1.3.tar.bz2 +2dd5ae46fa18abc9331bc26250a25005 xmessage-1.0.4.tar.bz2 +5511da3361eea4eaa21427652c559e1c xmodmap-1.0.8.tar.bz2 +6101f04731ffd40803df80eca274ec4b xpr-1.0.4.tar.bz2 +fae3d2fda07684027a643ca783d595cc xprop-1.2.2.tar.bz2 +441fdb98d2abc6051108b7075d948fc7 xrandr-1.4.3.tar.bz2 +b54c7e3e53b4f332d41ed435433fbda0 xrdb-1.1.0.tar.bz2 +a896382bc53ef3e149eaf9b13bc81d42 xrefresh-1.0.5.tar.bz2 +dcd227388b57487d543cab2fd7a602d7 xset-1.2.3.tar.bz2 +7211b31ec70631829ebae9460999aa0b xsetroot-1.1.1.tar.bz2 +1fbd65e81323a8c0a4b5e24db0058405 xvinfo-1.1.2.tar.bz2 +6b5d48464c5f366e91efd08b62b12d94 xwd-1.0.6.tar.bz2 +b777bafb674555e48fd8437618270931 xwininfo-1.1.3.tar.bz2 +3025b152b4f13fdffd0c46d0be587be6 xwud-1.0.4.tar.bz2 diff --git a/stage4/versions/driver-7.7-1.md5 b/stage4/versions/driver-7.7-1.md5 deleted file mode 100644 index f74fe85..0000000 --- a/stage4/versions/driver-7.7-1.md5 +++ /dev/null @@ -1,8 +0,0 @@ -4449b2e94900e98d2f41c2f46dd0397e xf86-input-evdev-2.7.0.tar.bz2 -01f416753016f01e328b1098157a5266 xf86-input-joystick-1.6.1.tar.bz2 -d10a7ee362d015975fbef11c6beaac97 xf86-input-synaptics-1.6.1.tar.bz2 -17dd4f0bf4dbe9839e5f7d1161994222 xf86-video-ati-6.14.4.tar.bz2 -53a533d9e0c2da50962282526bace074 xf86-video-fbdev-0.4.2.tar.bz2 -7e24551eae0b952f4d795e791e88ebe5 xf86-video-intel-2.99.916.tar.bz2 -b12f0b2114849d1a542d8084732573d3 xf86-video-nv-2.1.18.tar.bz2 -02e6eacc2d1e07ac893b62481905d6f0 xf86-video-vesa-2.3.1.tar.bz2 diff --git a/stage4/versions/driver-7.7-1.wget b/stage4/versions/driver-7.7-1.wget deleted file mode 100644 index 8add27e..0000000 --- a/stage4/versions/driver-7.7-1.wget +++ /dev/null @@ -1,9 +0,0 @@ -xf86-input-evdev-2.7.0.tar.bz2 -xf86-input-joystick-1.6.1.tar.bz2 -xf86-input-synaptics-1.6.1.tar.bz2 -xf86-video-ati-6.14.4.tar.bz2 -xf86-video-fbdev-0.4.2.tar.bz2 -xf86-video-intel-2.99.916.tar.bz2 -xf86-video-nv-2.1.18.tar.bz2 -xf86-video-vesa-2.3.1.tar.bz2 - diff --git a/stage4/versions/driver.md5 b/stage4/versions/driver.md5 new file mode 100644 index 0000000..ece4430 --- /dev/null +++ b/stage4/versions/driver.md5 @@ -0,0 +1,8 @@ +8f73a98e32dccc9d054b54727cc4093f xf86-input-evdev-2.9.1.tar.bz2 +ed70d0cba94262a4008dcef654ab34a9 xf86-input-synaptics-1.8.1.tar.bz2 +3931c0e19d441cc576dc088f9eb9fd73 xf86-video-fbdev-0.4.4.tar.bz2 +29654190e37310b87e44a14c229967ee xf86-video-ati-7.5.0.tar.bz2 +7e24551eae0b952f4d795e791e88ebe5 xf86-video-intel-2.99.916.tar.bz2 +a0d2932d84ba10c4933c8332c9afe157 xf86-video-nouveau-1.0.11.tar.bz2 +3690a5356ed121b1a7dfb59a6dcf4bf9 xf86-video-vesa-2.3.3.tar.bz2 +91d1d7d33181766714405ab013d31244 xf86-video-vmware-13.0.2.tar.bz2 diff --git a/stage4/versions/font-7.7-1.wget b/stage4/versions/font-7.7-1.wget deleted file mode 100644 index b786662..0000000 --- a/stage4/versions/font-7.7-1.wget +++ /dev/null @@ -1,38 +0,0 @@ -font-util-1.3.0.tar.bz2 -encodings-1.0.4.tar.bz2 -font-adobe-75dpi-1.0.3.tar.bz2 -font-adobe-100dpi-1.0.3.tar.bz2 -font-adobe-utopia-75dpi-1.0.4.tar.bz2 -font-adobe-utopia-100dpi-1.0.4.tar.bz2 -font-adobe-utopia-type1-1.0.4.tar.bz2 -font-alias-1.0.3.tar.bz2 -font-arabic-misc-1.0.3.tar.bz2 -font-bh-75dpi-1.0.3.tar.bz2 -font-bh-100dpi-1.0.3.tar.bz2 -font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 -font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 -font-bh-ttf-1.0.3.tar.bz2 -font-bh-type1-1.0.3.tar.bz2 -font-bitstream-75dpi-1.0.3.tar.bz2 -font-bitstream-100dpi-1.0.3.tar.bz2 -font-bitstream-type1-1.0.3.tar.bz2 -font-cronyx-cyrillic-1.0.3.tar.bz2 -font-cursor-misc-1.0.3.tar.bz2 -font-daewoo-misc-1.0.3.tar.bz2 -font-dec-misc-1.0.3.tar.bz2 -font-ibm-type1-1.0.3.tar.bz2 -font-isas-misc-1.0.3.tar.bz2 -font-jis-misc-1.0.3.tar.bz2 -font-micro-misc-1.0.3.tar.bz2 -font-misc-cyrillic-1.0.3.tar.bz2 -font-misc-ethiopic-1.0.3.tar.bz2 -font-misc-meltho-1.0.3.tar.bz2 -font-misc-misc-1.1.2.tar.bz2 -font-mutt-misc-1.0.3.tar.bz2 -font-schumacher-misc-1.1.2.tar.bz2 -font-screen-cyrillic-1.0.4.tar.bz2 -font-sony-misc-1.0.3.tar.bz2 -font-sun-misc-1.0.3.tar.bz2 -font-winitzki-cyrillic-1.0.3.tar.bz2 -font-xfree86-type1-1.0.4.tar.bz2 - diff --git a/stage4/versions/font-7.7-1.md5 b/stage4/versions/font.md5 similarity index 100% rename from stage4/versions/font-7.7-1.md5 rename to stage4/versions/font.md5 index 7c66d6c..0613a46 100644 --- a/stage4/versions/font-7.7-1.md5 +++ b/stage4/versions/font.md5 @@ -1,3 +1,4 @@ +ddfc8a89d597651408369d940d03d06b font-util-1.3.0.tar.bz2 0f2d6546d514c5cc4ecf78a60657a5c1 encodings-1.0.4.tar.bz2 1347c3031b74c9e91dc4dfa53b12f143 font-adobe-100dpi-1.0.3.tar.bz2 6c9f26c92393c0756f3e8d614713495b font-adobe-75dpi-1.0.3.tar.bz2 @@ -32,6 +33,5 @@ e805feb7c4f20e6bfb1118d19d972219 font-schumacher-misc-1.1.2.tar.bz2 6f3fdcf2454bf08128a651914b7948ca font-screen-cyrillic-1.0.4.tar.bz2 beef61a9b0762aba8af7b736bb961f86 font-sony-misc-1.0.3.tar.bz2 948f2e07810b4f31195185921470f68d font-sun-misc-1.0.3.tar.bz2 -ddfc8a89d597651408369d940d03d06b font-util-1.3.0.tar.bz2 829a3159389b7f96f629e5388bfee67b font-winitzki-cyrillic-1.0.3.tar.bz2 3eeb3fb44690b477d510bbd8f86cf5aa font-xfree86-type1-1.0.4.tar.bz2 diff --git a/stage4/versions/lib-7.7-1.md5 b/stage4/versions/lib-7.7-1.md5 deleted file mode 100644 index da9ae2e..0000000 --- a/stage4/versions/lib-7.7-1.md5 +++ /dev/null @@ -1,31 +0,0 @@ -782ced3a9e754dfeb53a8a006a75eb1a libdmx-1.1.2.tar.bz2 -a2a861f142c3b4367f14fc14239fc1f7 libfontenc-1.1.1.tar.bz2 -645f83160cf7b562734e2038045106d1 libFS-1.0.4.tar.bz2 -471b5ca9f5562ac0d6eac7a0bf650738 libICE-1.0.8.tar.bz2 -399a419ac6a54f0fc07c69c9bdf452dc libpciaccess-0.13.1.tar.bz2 -766de9d1e1ecf8bf74cebe2111d8e2bd libSM-1.2.1.tar.bz2 -78b4b3bab4acbdf0abcfca30a8c70cc6 libX11-1.5.0.tar.bz2 -f39942f2cab379fc9b4c3731bf191b84 libXaw-1.0.11.tar.bz2 -a60e0b5c276d0aa9e2d3b982c98f61c8 libXcomposite-0.4.3.tar.bz2 -52efa81b7f26c8eda13510a2fba98eea libXcursor-1.1.13.tar.bz2 -44774e1a065158b52f1a0da5100cebec libXdamage-1.1.3.tar.bz2 -71251a22bc47068d60a95f50ed2ec3cf libXext-1.3.1.tar.bz2 -678071bd7f9f7467e2fc712d81022318 libXfixes-5.0.tar.bz2 -6851da5dae0a6cf5f7c9b9e2b05dd3b4 libXfont-1.4.5.tar.bz2 -78d64dece560c9e8699199f3faa521c0 libXft-2.3.1.tar.bz2 -78ee882e1ff3b192cf54070bdb19938e libXi-1.6.1.tar.bz2 -cb45d6672c93a608f003b6404f1dd462 libXinerama-1.1.2.tar.bz2 -19e6533ae64abba0773816a23f2b9507 libxkbfile-1.0.8.tar.bz2 -a4efff8de85bd45dd3da124285d10c00 libXmu-1.1.1.tar.bz2 -7ae7eff7a14d411e84a67bd166bcec1a libXpm-3.5.10.tar.bz2 -92473da2fccf5fac665be4fa4f2037fa libXrandr-1.3.2.tar.bz2 -ee62f4c7f0f16ced4da63308963ccad2 libXrender-0.9.7.tar.bz2 -80d0c6d8522fa7a645e4f522e9a9cd20 libXres-1.0.6.tar.bz2 -7a773b16165e39e938650bcc9027c1d5 libXScrnSaver-1.2.2.tar.bz2 -a6f137ae100e74ebe3b71eb4a38c40b3 libXt-1.1.3.tar.bz2 -e8abc5c00c666f551cf26aa53819d592 libXtst-1.2.1.tar.bz2 -5e1ac203ccd3ce3e89755ed1fbe75b0b libXv-1.0.7.tar.bz2 -3340c99ff556ea2457b4be47f5cb96fa libXvMC-1.0.7.tar.bz2 -b7f38465c46e7145782d37dbb9da8c09 libXxf86dga-1.1.3.tar.bz2 -ffd93bcedd8b2b5aeabf184e7b91f326 libXxf86vm-1.1.2.tar.bz2 -84c66908cf003ad8c272b0eecbdbaee3 xtrans-1.2.7.tar.bz2 diff --git a/stage4/versions/lib-7.7-1.wget b/stage4/versions/lib-7.7-1.wget deleted file mode 100644 index 3f0ebd0..0000000 --- a/stage4/versions/lib-7.7-1.wget +++ /dev/null @@ -1,32 +0,0 @@ -xtrans-1.2.7.tar.bz2 -libX11-1.5.0.tar.bz2 -libXext-1.3.1.tar.bz2 -libFS-1.0.4.tar.bz2 -libICE-1.0.8.tar.bz2 -libSM-1.2.1.tar.bz2 -libXScrnSaver-1.2.2.tar.bz2 -libXt-1.1.3.tar.bz2 -libXmu-1.1.1.tar.bz2 -libXpm-3.5.10.tar.bz2 -libXaw-1.0.11.tar.bz2 -libXfixes-5.0.tar.bz2 -libXcomposite-0.4.3.tar.bz2 -libXrender-0.9.7.tar.bz2 -libXcursor-1.1.13.tar.bz2 -libXdamage-1.1.3.tar.bz2 -libfontenc-1.1.1.tar.bz2 -libXfont-1.4.5.tar.bz2 -libXft-2.3.1.tar.bz2 -libXi-1.6.1.tar.bz2 -libXinerama-1.1.2.tar.bz2 -libXrandr-1.3.2.tar.bz2 -libXres-1.0.6.tar.bz2 -libXtst-1.2.1.tar.bz2 -libXv-1.0.7.tar.bz2 -libXvMC-1.0.7.tar.bz2 -libXxf86dga-1.1.3.tar.bz2 -libXxf86vm-1.1.2.tar.bz2 -libdmx-1.1.2.tar.bz2 -libpciaccess-0.13.1.tar.bz2 -libxkbfile-1.0.8.tar.bz2 - diff --git a/stage4/versions/lib.md5 b/stage4/versions/lib.md5 new file mode 100644 index 0000000..d8898e5 --- /dev/null +++ b/stage4/versions/lib.md5 @@ -0,0 +1,32 @@ +c5ba432dd1514d858053ffe9f4737dd8 xtrans-1.3.5.tar.bz2 +c35d6ad95b06635a524579e88622fdb5 libX11-1.6.2.tar.bz2 +52df7c4c1f0badd9f82ab124fb32eb97 libXext-1.3.3.tar.bz2 +a8a0dbd2299b2568d8c919883f5c8501 libFS-1.0.6.tar.bz2 +addfb1e897ca8079531669c7c7711726 libICE-1.0.9.tar.bz2 +499a7773c65aba513609fe651853c5f3 libSM-1.2.2.tar.bz2 +7a773b16165e39e938650bcc9027c1d5 libXScrnSaver-1.2.2.tar.bz2 +03149823ae57bb02d0cec90d5b97d56c libXt-1.1.4.tar.bz2 +41d92ab627dfa06568076043f3e089e4 libXmu-1.1.2.tar.bz2 +769ee12a43611cdebd38094eaf83f3f0 libXpm-3.5.11.tar.bz2 +7446f5fba888672aad068b29c0928ba3 libXaw-1.0.12.tar.bz2 +b985b85f8b9386c85ddcfe1073906b4d libXfixes-5.0.1.tar.bz2 +f7a218dcbf6f0848599c6c36fc65c51a libXcomposite-0.4.4.tar.bz2 +2bd9a15fcf64d216e63b8d129e4f1f1c libXrender-0.9.8.tar.bz2 +1e7c17afbbce83e2215917047c57d1b3 libXcursor-1.1.14.tar.bz2 +0cf292de2a9fa2e9a939aefde68fd34f libXdamage-1.1.4.tar.bz2 +ad2919764933e075bb0361ad5caa3d19 libfontenc-1.1.2.tar.bz2 +664629bfa7cdf8b984155019fd395dcb libXfont-1.5.0.tar.bz2 +331b3a2a3a1a78b5b44cfbd43f86fcfe libXft-2.3.2.tar.bz2 +9c4a69c34b19ec1e4212e849549544cb libXi-1.7.4.tar.bz2 +9336dc46ae3bf5f81c247f7131461efd libXinerama-1.1.3.tar.bz2 +210ed9499a3d9c96e3a221629b7d39b0 libXrandr-1.4.2.tar.bz2 +45ef29206a6b58254c81bea28ec6c95f libXres-1.0.7.tar.bz2 +25c6b366ac3dc7a12c5d79816ce96a59 libXtst-1.2.2.tar.bz2 +e0af49d7d758b990e6fef629722d4aca libXv-1.0.10.tar.bz2 +2e4014e9d55c430e307999a6b3dd256d libXvMC-1.0.8.tar.bz2 +d7dd9b9df336b7dd4028b6b56542ff2c libXxf86dga-1.1.4.tar.bz2 +e46f6ee4f4567349a3189044fe1bb712 libXxf86vm-1.1.3.tar.bz2 +ba983eba5a9f05d152a0725b8e863151 libdmx-1.1.3.tar.bz2 +b7c0d3afce14eedca57312a3141ec13a libpciaccess-0.13.2.tar.bz2 +19e6533ae64abba0773816a23f2b9507 libxkbfile-1.0.8.tar.bz2 +2dd10448c1166e71a176206a8dfabe6d libxshmfence-1.1.tar.bz2 diff --git a/stage4/versions/proto-7.7-1.wget b/stage4/versions/proto-7.7-1.wget deleted file mode 100644 index 49b5675..0000000 --- a/stage4/versions/proto-7.7-1.wget +++ /dev/null @@ -1,24 +0,0 @@ -bigreqsproto-1.1.2.tar.bz2 -compositeproto-0.4.2.tar.bz2 -damageproto-1.2.1.tar.bz2 -dmxproto-2.3.1.tar.bz2 -dri2proto-2.6.tar.bz2 -fixesproto-5.0.tar.bz2 -fontsproto-2.1.2.tar.bz2 -glproto-1.4.15.tar.bz2 -inputproto-2.2.tar.bz2 -kbproto-1.0.6.tar.bz2 -randrproto-1.3.2.tar.bz2 -recordproto-1.14.2.tar.bz2 -renderproto-0.11.1.tar.bz2 -resourceproto-1.2.0.tar.bz2 -scrnsaverproto-1.2.2.tar.bz2 -videoproto-2.3.1.tar.bz2 -xcmiscproto-1.2.2.tar.bz2 -xextproto-7.2.1.tar.bz2 -xf86bigfontproto-1.2.0.tar.bz2 -xf86dgaproto-2.1.tar.bz2 -xf86driproto-2.1.1.tar.bz2 -xf86vidmodeproto-2.3.1.tar.bz2 -xineramaproto-1.2.1.tar.bz2 -xproto-7.0.23.tar.bz2 diff --git a/stage4/versions/proto-7.7-1.md5 b/stage4/versions/proto.md5 similarity index 62% rename from stage4/versions/proto-7.7-1.md5 rename to stage4/versions/proto.md5 index 709802a..216d2f9 100644 --- a/stage4/versions/proto-7.7-1.md5 +++ b/stage4/versions/proto.md5 @@ -2,23 +2,25 @@ 98482f65ba1e74a08bf5b056a4031ef0 compositeproto-0.4.2.tar.bz2 998e5904764b82642cc63d97b4ba9e95 damageproto-1.2.1.tar.bz2 4ee175bbd44d05c34d43bb129be5098a dmxproto-2.3.1.tar.bz2 -2eb74959684f47c862081099059a11ab dri2proto-2.6.tar.bz2 +b2721d5d24c04d9980a0c6540cb5396a dri2proto-2.8.tar.bz2 +a3d2cbe60a9ca1bf3aea6c93c817fee3 dri3proto-1.0.tar.bz2 e7431ab84d37b2678af71e29355e101d fixesproto-5.0.tar.bz2 -c5f4f1fb4ba7766eedbc9489e81f3be2 fontsproto-2.1.2.tar.bz2 -d1ff0c1acc605689919c1ee2fc9b5582 glproto-1.4.15.tar.bz2 -13c8aedaf98a92e282b7e456c0a5bed9 inputproto-2.2.tar.bz2 +36934d00b00555eaacde9f091f392f97 fontsproto-2.1.3.tar.bz2 +5565f1b0facf4a59c2778229c1f70d10 glproto-1.4.17.tar.bz2 +6caebead4b779ba031727f66a7ffa358 inputproto-2.3.1.tar.bz2 677ea8523eec6caca86121ad2dca0b71 kbproto-1.0.6.tar.bz2 -597491c0d8055e2a66f11350c4985775 randrproto-1.3.2.tar.bz2 +2d569c75884455c7148d133d341e8fd6 presentproto-1.0.tar.bz2 +ce4d0b05675968e4c83e003cc809660d randrproto-1.4.0.tar.bz2 1b4e5dede5ea51906f1530ca1e21d216 recordproto-1.14.2.tar.bz2 a914ccc1de66ddeb4b611c6b0686e274 renderproto-0.11.1.tar.bz2 cfdb57dae221b71b2703f8e2980eaaf4 resourceproto-1.2.0.tar.bz2 edd8a73775e8ece1d69515dd17767bfb scrnsaverproto-1.2.2.tar.bz2 -c3b348c6e2031b72b11ae63fc7f805c2 videoproto-2.3.1.tar.bz2 +e658641595327d3990eab70fdb55ca8b videoproto-2.3.2.tar.bz2 5f4847c78e41b801982c8a5e06365b24 xcmiscproto-1.2.2.tar.bz2 -eaac343af094e6b608cf15cfba0f77c5 xextproto-7.2.1.tar.bz2 +70c90f313b4b0851758ef77b95019584 xextproto-7.3.0.tar.bz2 120e226ede5a4687b25dd357cc9b8efe xf86bigfontproto-1.2.0.tar.bz2 a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2 1d716d0dac3b664e5ee20c69d34bc10e xf86driproto-2.1.1.tar.bz2 e793ecefeaecfeabd1aed6a01095174e xf86vidmodeproto-2.3.1.tar.bz2 9959fe0bfb22a0e7260433b8d199590a xineramaproto-1.2.1.tar.bz2 -d4d241a4849167e4e694fe73371c328c xproto-7.0.23.tar.bz2 +4dc2464bfeade23dab5de38da0f6b1b5 xproto-7.0.26.tar.bz2 diff --git a/stage5/patches/common/SDL-1.2.15-libx11.patch b/stage5/patches/common/SDL-1.2.15-libx11.patch new file mode 100644 index 0000000..ab43ab8 --- /dev/null +++ b/stage5/patches/common/SDL-1.2.15-libx11.patch @@ -0,0 +1,12 @@ +diff -Naur SDL-1.2.15.orig/src/video/x11/SDL_x11sym.h SDL-1.2.15.new/src/video/x11/SDL_x11sym.h +--- SDL-1.2.15.orig/src/video/x11/SDL_x11sym.h 2012-01-19 01:30:06.000000000 -0500 ++++ SDL-1.2.15.new/src/video/x11/SDL_x11sym.h 2014-12-26 13:05:39.408413358 -0500 +@@ -165,7 +165,7 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + -- 2.20.1