From d4e2a48a0289e1df34abe9dce2939356d701f167 Mon Sep 17 00:00:00 2001
From: Bas Steins <sebst@users.noreply.github.com>
Date: Sun, 29 Sep 2024 13:48:37 +0000
Subject: [PATCH 1/3] +x.org/xserver

---
 projects/x11.org/xserver/package.yml | 61 ++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 projects/x11.org/xserver/package.yml

diff --git a/projects/x11.org/xserver/package.yml b/projects/x11.org/xserver/package.yml
new file mode 100644
index 0000000000..b30b4d7850
--- /dev/null
+++ b/projects/x11.org/xserver/package.yml
@@ -0,0 +1,61 @@
+distributable:
+  url: https://www.x.org/archive/individual/xserver/xorg-server-{{version}}.tar.gz
+  strip-components: 1
+
+versions:
+  url: https://www.x.org/archive/individual/xserver/
+  match: /xorg-server-\d+\.\d+\.\d+.tar.gz/
+  strip:
+    - /xorg-server-/
+    - /.tar.gz/
+
+dependencies:
+  x.org/xcb: ^1
+  x.org/protocol: '*'
+
+build:
+  dependencies:
+    # libxcvt
+    # xfont2
+    gnu.org/make: '*'
+    gnu.org/gcc: '*'
+    freedesktop.org/pkg-config: ~0.29
+    x.org/util-macros: '*'
+    x.org/xtrans: ^1
+    gnu.org/sed: '*' # or build fails on macOS
+    x.org/x11: '*'
+    # x.org/xext: '*'
+    x.org/protocol: '*'
+    x.org/xau: '*'
+    x.org/xdmcp: '*'
+    x.org/pciaccess: '*'
+    pixman.org: '*'
+    github.com/anholt/libepoxy: '*'
+    x.org/xkbfile: '*'
+    x.org/xshmfence: '*'
+    freedesktop.org/XKeyboardConfig: '*'
+    x.org/xinput: '*'
+    xkbcommon.org: '*'
+
+
+  script:
+    - ./configure $ARGS
+    - make --jobs {{ hw.concurrency }} install
+  env:
+    SHELF: ${{pkgx.prefix}}/x.org
+    ARGS:
+      - --prefix="{{prefix}}"
+      - --sysconfdir="$SHELF"/etc
+      - --localstatedir="$SHELF"/var
+      - --disable-debug
+      - --enable-unix-transport
+      - --enable-tcp-transport
+      - --enable-ipv6
+      - --enable-local-transport
+      - --enable-loadable-i18n
+      - --enable-xthreads
+      - --enable-specs=no
+
+test:
+  script: |
+    xserver --version

From 62ed40bfb14753cf78bfa9009b6d9daf77d4223b Mon Sep 17 00:00:00 2001
From: Bas Steins <sebst@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:02:31 +0000
Subject: [PATCH 2/3] Add Dependencies lbxvt, libxfont2

---
 projects/x11.org/xserver/package.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/projects/x11.org/xserver/package.yml b/projects/x11.org/xserver/package.yml
index b30b4d7850..2aeaece60a 100644
--- a/projects/x11.org/xserver/package.yml
+++ b/projects/x11.org/xserver/package.yml
@@ -16,7 +16,9 @@ dependencies:
 build:
   dependencies:
     # libxcvt
+    x.org/libcvt: '*'
     # xfont2
+    x.org/libxfont2: '*'
     gnu.org/make: '*'
     gnu.org/gcc: '*'
     freedesktop.org/pkg-config: ~0.29

From 1dcc691611b1a1b8c091159e30a56fe5ba025adf Mon Sep 17 00:00:00 2001
From: Bas Steins <sebst@users.noreply.github.com>
Date: Sun, 29 Sep 2024 17:41:39 +0000
Subject: [PATCH 3/3] WIP

---
 projects/x11.org/xserver/package.yml | 32 +++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/projects/x11.org/xserver/package.yml b/projects/x11.org/xserver/package.yml
index 2aeaece60a..aaac0dffad 100644
--- a/projects/x11.org/xserver/package.yml
+++ b/projects/x11.org/xserver/package.yml
@@ -2,6 +2,9 @@ distributable:
   url: https://www.x.org/archive/individual/xserver/xorg-server-{{version}}.tar.gz
   strip-components: 1
 
+provides:
+  - bin/Xorg
+
 versions:
   url: https://www.x.org/archive/individual/xserver/
   match: /xorg-server-\d+\.\d+\.\d+.tar.gz/
@@ -15,9 +18,7 @@ dependencies:
 
 build:
   dependencies:
-    # libxcvt
     x.org/libcvt: '*'
-    # xfont2
     x.org/libxfont2: '*'
     gnu.org/make: '*'
     gnu.org/gcc: '*'
@@ -41,22 +42,29 @@ build:
 
 
   script:
+    - echo {{deps.x.org/libcvt.prefix}}
+    - cp {{deps.x.org/libcvt.prefix}}/lib/x86_64-linux-gnu/pkgconfig/libxcvt.pc  {{deps.x.org/libcvt.prefix}}/lib/x86_64-linux-gnu/pkgconfig/xcvt.pc 
+    - pkg-config --modversion xcvt
     - ./configure $ARGS
+    - cp {{deps.x.org/libxfont2.prefix}}/lib/pkgconfig/../../lib/libXfont2.la lib/
+    - make
     - make --jobs {{ hw.concurrency }} install
   env:
+    PKG_CONFIG_PATH: '{{deps.x.org/libcvt.prefix}}/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'
     SHELF: ${{pkgx.prefix}}/x.org
     ARGS:
       - --prefix="{{prefix}}"
-      - --sysconfdir="$SHELF"/etc
-      - --localstatedir="$SHELF"/var
-      - --disable-debug
-      - --enable-unix-transport
-      - --enable-tcp-transport
-      - --enable-ipv6
-      - --enable-local-transport
-      - --enable-loadable-i18n
-      - --enable-xthreads
-      - --enable-specs=no
+      - --enable-dri
+      # - --sysconfdir="$SHELF"/etc
+      # - --localstatedir="$SHELF"/var
+      # - --disable-debug
+      # - --enable-unix-transport
+      # - --enable-tcp-transport
+      # - --enable-ipv6
+      # - --enable-local-transport
+      # - --enable-loadable-i18n
+      # - --enable-xthreads
+      # - --enable-specs=no
 
 test:
   script: |