From 8aa51a5e03149837504688ab3cdcb7aa2ee5fadd Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Sat, 19 Feb 2022 16:00:22 +0000
Subject: fixed dependency issues

---
 repo/x11/libwacom.xibuild         | 22 ++++++++++++++++++++++
 repo/x11/xf86-video-intel.xibuild | 10 +++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 repo/x11/libwacom.xibuild

(limited to 'repo/x11')

diff --git a/repo/x11/libwacom.xibuild b/repo/x11/libwacom.xibuild
new file mode 100644
index 0000000..18653e9
--- /dev/null
+++ b/repo/x11/libwacom.xibuild
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+MAKEDEPS=(meson libxml2)
+DEPS=(glib2 libgudev librsvg)
+
+DESC="Library to identify Wacom tablets and their features"
+
+PKG_VER=2.1.0
+SOURCE=https://github.com/linuxwacom/libwacom/releases/download/libwacom-$PKG_VER/libwacom-$PKG_VER.tar.xz
+
+build () {
+    mkdir build &&
+    cd    build &&
+
+    meson --prefix=/usr --buildtype=release -Dtests=disabled .. &&
+    ninja
+
+}
+
+package () {
+    DESTDIR=$PKG_DEST ninja install
+}
diff --git a/repo/x11/xf86-video-intel.xibuild b/repo/x11/xf86-video-intel.xibuild
index 90852d3..f3f5a2c 100644
--- a/repo/x11/xf86-video-intel.xibuild
+++ b/repo/x11/xf86-video-intel.xibuild
@@ -6,11 +6,13 @@ DEPS=(xorg-server mesa libxvmc pixman xcb-util)
 DESC="X.org intel video driver"
 
 PKG_VER=2.99.917
-SOURCE=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git
-BRANCH=$PKG_VER
+# TODO switch to official source not blfs
+SOURCE=https://anduin.linuxfromscratch.org/BLFS/xf86-video-intel/xf86-video-intel-20210222.tar.xz
+#BRANCH=$PKG_VER
 
 build () {
-    ./autogen.sh $XORG_CONFIG     \
+    ./autogen.sh
+    ./configure $XORG_CONFIG     \
             --enable-kms-only \
             --enable-uxa      \
             --mandir=/usr/share/man &&
@@ -19,10 +21,12 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install
+    mkdir -pv $PKG_DEST/usr/share/man/man1
     mv -v $PKG_DEST/usr/share/man/man4/intel-virtual-output.4 \
       $PKG_DEST/usr/share/man/man1/intel-virtual-output.1 &&
 
     sed -i '/\.TH/s/4/1/' $PKG_DEST/usr/share/man/man1/intel-virtual-output.1
+    mkdir -pv $PKG_DEST/etc/X11/xorg.conf.d
     cat >> $PKG_DEST/etc/X11/xorg.conf.d/20-intel.conf << "EOF"
 Section   "Device"
         Identifier "Intel Graphics"
-- 
cgit v1.2.1