From 5d68b43cc1094aa8d9e519aadbd818df22ae4bc2 Mon Sep 17 00:00:00 2001
From: AleksArt000 <aleksart000@gmail.com>
Date: Sat, 2 Nov 2024 01:44:16 +0100
Subject: [PATCH] Xwayland

---
 extra/src/fonts/xorg-fonts.ecmp        | 56 ++++++++++++++++++++++++++
 extra/src/graphics/libXdmcp.ecmp       | 25 ++++++++++++
 extra/src/graphics/xcursor-themes.ecmp | 24 +++++++++++
 extra/src/graphics/xorg-apps.ecmp      | 20 +++++----
 extra/src/graphics/xorgproto.ecmp      | 10 ++---
 extra/src/xwayland.ecmp                |  1 +
 6 files changed, 123 insertions(+), 13 deletions(-)
 create mode 100644 extra/src/fonts/xorg-fonts.ecmp
 create mode 100644 extra/src/graphics/libXdmcp.ecmp
 create mode 100644 extra/src/graphics/xcursor-themes.ecmp

diff --git a/extra/src/fonts/xorg-fonts.ecmp b/extra/src/fonts/xorg-fonts.ecmp
new file mode 100644
index 00000000..fa3d3608
--- /dev/null
+++ b/extra/src/fonts/xorg-fonts.ecmp
@@ -0,0 +1,56 @@
+[info]
+name = xorg-fonts
+type = src
+version = 7
+url = https://www.x.org/pub/individual/font
+environment = xorg-build-env
+
+[dependencies]
+xorg-build-env
+xcursor-themes
+
+[description]
+The Xorg font packages provide some scalable fonts and supporting packages for Xorg applications.
+
+[files]
+font-util-1.4.1.tar.xz $URL/font-util-1.4.1.tar.xz 5c9f64123c194b150fee89049991687386e6ff36ef2af7b80ba53efaf368cc95
+encodings-1.1.0.tar.xz $URL/encodings-1.1.0.tar.xz 9ff13c621756cfa12e95f32ba48a5b23839e8f577d0048beda66c67dab4de975
+font-alias-1.0.5.tar.xz $URL/font-alias-1.0.5.tar.xz 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e
+font-adobe-utopia-type1-1.0.5.tar.xz $URL/font-adobe-utopia-type1-1.0.5.tar.xz 4cb280bc47693b07c5e00fd0e5ad5721aabebc0548c3f06774e5cc3cbcf75697
+font-bh-ttf-1.0.4.tar.xz $URL/font-bh-ttf-1.0.4.tar.xz 85a5f90d00c48c2b06fd125ea8adbc8b8ee97429e3075081c8710926efec3a56
+font-bh-type1-1.0.4.tar.xz $URL/font-bh-type1-1.0.4.tar.xz 19dec3ec06abde6bedd10094579e928be0f0fc3bdb4fbe93f4c69cce406d72a6
+font-ibm-type1-1.0.4.tar.xz $URL/font-ibm-type1-1.0.4.tar.xz c4395e95ba46d40c4ad1737e91cac20c0ab75411329b60db5d99fed92b60ce7f
+font-misc-ethiopic-1.0.5.tar.xz $URL/font-misc-ethiopic-1.0.5.tar.xz 4749a7e6e1a1eef6c91fcc9a04e8b1c0ed027d40c1599e5a6c93270d8469b612
+font-xfree86-type1-1.0.5.tar.xz $URL/font-xfree86-type1-1.0.5.tar.xz a93c2c788a5ea1c002af7c8662cf9d9821fb1df51b8d2b2c5e0026dfdfea4837
+
+[download]
+cat > list << "EOF"
+font-util-1.4.1.tar.xz
+encodings-1.1.0.tar.xz
+font-alias-1.0.5.tar.xz
+font-adobe-utopia-type1-1.0.5.tar.xz
+font-bh-ttf-1.0.4.tar.xz
+font-bh-type1-1.0.4.tar.xz
+font-ibm-type1-1.0.4.tar.xz
+font-misc-ethiopic-1.0.5.tar.xz
+font-xfree86-type1-1.0.5.tar.xz
+EOF
+mkdir xorg-fonts-7
+cp ./*.tar.xz xorg-fonts-7/
+
+[install]
+for package in $(grep -v '^#' ../list | awk '{print $1}')
+do
+  packagedir=${package%.tar.?z*}
+  tar -xf $package
+  pushd $packagedir
+  ./configure $XORG_CONFIG
+    make
+    make DESTDIR=$BUILD_ROOT install
+  popd
+  rm -rf $packagedir
+done
+
+[special]
+fc-cache -v /usr/share/fonts/X11/OTF
+fc-cache -v /usr/share/fonts/X11/TTF
\ No newline at end of file
diff --git a/extra/src/graphics/libXdmcp.ecmp b/extra/src/graphics/libXdmcp.ecmp
new file mode 100644
index 00000000..e67ba374
--- /dev/null
+++ b/extra/src/graphics/libXdmcp.ecmp
@@ -0,0 +1,25 @@
+[info]
+name = libXdmcp
+type = src
+version = 1.1.5
+url = https://www.x.org/pub/individual/lib/
+environment = xorg-build-env
+
+[dependencies]
+xorgproto
+xorg-build-env
+
+[description]
+The libXdmcp package contains a library implementing the X Display Manager Control Protocol.
+This is useful for allowing clients to interact with the X Display Manager. 
+
+[files]
+libXdmcp-1.1.5.tar.xz https://www.x.org/pub/individual/lib/libXdmcp-1.1.5.tar.xz d8a5222828c3adab70adf69a5583f1d32eb5ece04304f7f8392b6a353aa2228c
+
+[download]
+tar -xf libXdmcp-1.1.5.tar.xz
+
+[install]
+./configure --prefix=$XORG_PREFIX --docdir=$BUILD_ROOT/usr/share/doc/libXdmcp-1.1.5 &&
+make
+make DESTDIR=$BUILD_ROOT install
\ No newline at end of file
diff --git a/extra/src/graphics/xcursor-themes.ecmp b/extra/src/graphics/xcursor-themes.ecmp
new file mode 100644
index 00000000..3cfd2162
--- /dev/null
+++ b/extra/src/graphics/xcursor-themes.ecmp
@@ -0,0 +1,24 @@
+[info]
+name = xcursor-themes 
+type = src
+version = 1.0.7
+url = https://www.x.org/pub/individual/data/
+environment = xorg-build-env
+
+[dependencies]
+libxcb
+xorg-build-env
+
+[description]
+The xcursor-themes package contains the redglass and whiteglass animated cursor themes. 
+
+[files]
+xcursor-themes-1.0.7.tar.xz https://www.x.org/pub/individual/data/xcursor-themes-1.0.7.tar.xz 95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8
+
+[download]
+tar -xf xcursor-themes-1.0.7.tar.xz
+
+[install]
+./configure --prefix=$XORG_PREFIX
+make
+make DESTDIR=$BUILD_ROOT install
\ No newline at end of file
diff --git a/extra/src/graphics/xorg-apps.ecmp b/extra/src/graphics/xorg-apps.ecmp
index 9b6cf16c..07cfaa29 100644
--- a/extra/src/graphics/xorg-apps.ecmp
+++ b/extra/src/graphics/xorg-apps.ecmp
@@ -24,7 +24,7 @@ smproxy-1.0.7.tar.xz $URL/smproxy-1.0.7.tar.xz 4aa99237cc9dab7d87ce9bc7cca411667
 x11perf-1.6.1.tar.bz2 $URL/x11perf-1.6.1.tar.bz2 1c7e0b8ffc2794b4ccf11e04d551823abe0ea47b4f7db0637390db6fbe817c34
 xauth-1.1.3.tar.xz $URL/xauth-1.1.3.tar.xz e7075498bae332f917f01d660f9b940c0752b2556a8da61ccb62a44d0ffe9d33
 xcmsdb-1.0.6.tar.xz $URL/xcmsdb-1.0.6.tar.xz 3c77eec4537d5942bb0966973b787bfdaf7121f3125ffa81bb1c9708d4cf4f55
-xcursorgen-1.0.8.tar.x $URL/xcursorgen-1.0.8.tar.xz 32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b
+xcursorgen-1.0.8.tar.xz $URL/xcursorgen-1.0.8.tar.xz 32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b
 xdpyinfo-1.3.4.tar.xz $URL/xdpyinfo-1.3.4.tar.xz a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b
 xdriinfo-1.0.7.tar.xz $URL/xdriinfo-1.0.7.tar.xz dd838bae9d2b19ddd71fe6d30ed33abc7c85e19d223e79d35600db3fa44bf734
 xev-1.2.6.tar.xz $URL/xev-1.2.6.tar.xz 61e1c5e008ac9973aca7cdddf36e9df7410e77083b030eb04f4dc737c51807d7
@@ -94,11 +94,15 @@ cp ./*.tar.xz xorg-apps-7/
 [install]
 for package in $(grep -v '^#' ../list | awk '{print $1}')
 do
-  packagedir=${package%.tar.?z*}
-  tar -xf $package
-  pushd $packagedir
-  ./configure $XORG_CONFIG
-    make
-    make DESTDIR=$BUILD_ROOT install
-  popd
+  packagedir=${package%.tar.?z*}  
+  tar -xf $package &&
+  pushd $packagedir &&
+
+  echo "  Building $packagedir in $PWD" &&
+
+  ./configure $XORG_CONFIG &&
+    make &&
+    make DESTDIR=$BUILD_ROOT install &&
+  popd &&
+  rm -rf $packagedir
 done
\ No newline at end of file
diff --git a/extra/src/graphics/xorgproto.ecmp b/extra/src/graphics/xorgproto.ecmp
index e7f1bd73..fabb7aec 100644
--- a/extra/src/graphics/xorgproto.ecmp
+++ b/extra/src/graphics/xorgproto.ecmp
@@ -1,7 +1,7 @@
 [info]
 name = xorgproto
 type = src
-version = 2023.2
+version = 2024.1
 url = https://xorg.freedesktop.org/archive/individual/proto/
 environment = xorg-build-env
 
@@ -15,17 +15,17 @@ libxslt
 xmlto
 
 [files]
-xorgproto-2023.2.tar.xz https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2023.2.tar.xz
+xorgproto-2024.1.tar.xz https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz
 
 [description]
 The xorgproto package provides the header files required to build the X Window system,
 and to allow other applications to build against the installed X Window system. 
 
 [files]
-xorgproto-2023.2.tar.xz https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2023.2.tar.xz b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
+xorgproto-2024.1.tar.xz https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
 
 [download]
-tar -xf xorgproto-2023.2.tar.xz
+tar -xf xorgproto-2024.1.tar.xz
 
 [install]
 mkdir build
@@ -36,4 +36,4 @@ ninja
 DESTDIR=$BUILD_ROOT ninja install
 
 [special]
-mv -v $XORG_PREFIX/share/doc/xorgproto{,-2023.2}
\ No newline at end of file
+mv -v $XORG_PREFIX/share/doc/xorgproto{,-2024.1}
\ No newline at end of file
diff --git a/extra/src/xwayland.ecmp b/extra/src/xwayland.ecmp
index bb2ea851..717e9e7b 100644
--- a/extra/src/xwayland.ecmp
+++ b/extra/src/xwayland.ecmp
@@ -16,6 +16,7 @@ mesa
 libxcvt
 libepoxy
 libtirpc
+libXdmcp
 
 [description]
 The Xwayland package is an Xorg server running on top of the wayland server. It has been separated from the main Xorg server package. It allows running X clients inside a wayland session.