From 83917b2ee9f416755f93bbf8ba920ed9bba36be1 Mon Sep 17 00:00:00 2001
From: superconvert <cwf12345@sina.com>
Date: Fri, 5 Aug 2022 00:08:53 +0800
Subject: [PATCH] add compile xclient code

---
 01_build_src.sh |  10 ++---
 common.sh       |   2 +-
 mk_xorg.sh      | 107 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 112 insertions(+), 7 deletions(-)

diff --git a/01_build_src.sh b/01_build_src.sh
index 4e3c678..2531733 100755
--- a/01_build_src.sh
+++ b/01_build_src.sh
@@ -29,27 +29,27 @@ cd source
 
 LINUX_SRC_NAME=$(file_name ${LINUX_SRC_URL})
 if [ ! -f ${LINUX_SRC_NAME} ]; then 
-  wget $LINUX_SRC_URL 
+  wget -c -t 0 $LINUX_SRC_URL
 fi
 
 GLIBC_SRC_NAME=$(file_name ${GLIBC_SRC_URL})
 if [ ! -f ${GLIBC_SRC_NAME} ]; then
-  wget $GLIBC_SRC_URL
+  wget -c -t 0 $GLIBC_SRC_URL
 fi
 
 BUSYBOX_SRC_NAME=$(file_name ${BUSYBOX_SRC_URL})
 if [ ! -f ${BUSYBOX_SRC_NAME} ]; then 
-  wget $BUSYBOX_SRC_URL 
+  wget -c -t 0 $BUSYBOX_SRC_URL
 fi
 
 GCC_SRC_NAME=$(file_name ${GCC_SRC_URL})
 if [ ! -f ${GCC_SRC_NAME} ]; then 
-  wget $GCC_SRC_URL 
+  wget -c -t 0 $GCC_SRC_URL
 fi
 
 BINUTILS_SRC_NAME=$(file_name ${BINUTILS_SRC_URL})
 if [ ! -f ${BINUTILS_SRC_NAME} ]; then
-  wget $BINUTILS_SRC_URL
+  wget -c -t 0 $BINUTILS_SRC_URL
 fi
 
 cd ..
diff --git a/common.sh b/common.sh
index a22ff2c..ce72d2b 100755
--- a/common.sh
+++ b/common.sh
@@ -5,7 +5,7 @@ core_num=`nproc`
 with_gcc=false
 
 # 是否开启 xorg
-with_org=false
+with_xorg=true
 
 # 是否挂载第二块硬盘
 with_sdb=false
diff --git a/mk_xorg.sh b/mk_xorg.sh
index daf4c03..bb4a303 100755
--- a/mk_xorg.sh
+++ b/mk_xorg.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # 预装工具
+apt install git autoconf libtool gcc g++ gettext pkg-config -y
 apt install xutils-dev libtool m4 pkg-config xtrans-dev libpixman-1-dev libdrm-dev libx11-dev libgl-dev libgcrypt-dev libxkbfile-dev libxfont-dev libpciaccess-dev libepoxy-dev libgbm-dev libegl1-mesa-dev -y
 
 #-----------------------------------------------
@@ -51,7 +52,111 @@ cd ${build_dir}
 if [ ! -d "xorg_install" ]; then
   mkdir -pv xorg_install && cd ${XORG_SRC_DIR} && make distclean && ./autogensh 
   ./configure --prefix=/usr
-  CFLAGS="-L${glibc_install}/lib64 $CFLAGS" make -j8 && make install -j8 DESTDIR=${xorg_install} && cd ..
+  CFLAGS="-L${glibc_install}/lib64 $CFLAGS" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" -j8 DESTDIR=${xorg_install}"/server" && cd ..
 fi
 
+#--------------------------------------------
+#
+# 编译 xclient
+#
+#--------------------------------------------
+export XLOAD_CFLAGS="-I${xorg_install}/xclient/usr"
+export XLOAD_LDFLAGS="-L${xorg_install}/xclient/usr/lib"
+
+echo "${GREEN}build macros begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/util/macros.git
+cd macros
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build macros success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build xcbproto begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/proto/xcbproto.git
+cd xcbproto
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build xcbproto success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build xorgproto begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git
+cd xorgproto
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build xorgproto success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxau begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxau.git
+cd libxau
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxau success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxcb begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxcb.git
+cd libxcb
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxcb success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxtrans begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxtrans.git
+cd libxtrans
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxtrans success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libx11 begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libx11.git
+cd libx11
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libx11 success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libice begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libice.git
+cd libice
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libice success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libsm begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libsm.git
+cd libsm
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libsm success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxt begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxt.git
+cd libxt
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxt success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxext begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxext.git
+cd libxext
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxext success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxmu begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxmu.git
+cd libxmu
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxmu success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxpm begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxpm.git
+cd libxpm
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxpm success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxaw begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxaw.git
+cd libxaw
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxaw success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build libxdmcp begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/lib/libxdmcp.git
+cd libxdmcp
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build libxdmcp success${NC}"
+cd .. && sleep 1
+
+echo "${GREEN}build xload begin${NC}"
+git clone https://gitlab.freedesktop.org/xorg/app/xload.git
+cd xload
+./autogen.sh && ./configure --prefix=/usr && CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" make -j8 && make install -j8 DESTDIR=${xorg_install}"/xclient" && echo "${GREEN}build xload success${NC}"
+cd .. && sleep 1
+
 cd ..