From 8aa51a5e03149837504688ab3cdcb7aa2ee5fadd Mon Sep 17 00:00:00 2001 From: davidovski Date: Sat, 19 Feb 2022 16:00:22 +0000 Subject: fixed dependency issues --- repo/font/encodings.xibuild | 4 ++-- repo/font/font-adobe-utopia-type1.xibuild | 4 ++-- repo/font/font-alias.xibuild | 4 ++-- repo/font/font-bh-ttf.xibuild | 4 ++-- repo/font/font-bh-type1.xibuild | 4 ++-- repo/font/font-ibm-type1.xibuild | 4 ++-- repo/font/font-misc-ethiopic.xibuild | 4 ++-- repo/font/font-xfree86-type1.xibuild | 4 ++-- repo/system/libgudev.xibuild | 21 +++++++++++++++++++++ repo/system/mtdev.xibuild | 20 ++++++++++++++++++++ repo/x11/libwacom.xibuild | 22 ++++++++++++++++++++++ repo/x11/xf86-video-intel.xibuild | 10 +++++++--- 12 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 repo/system/libgudev.xibuild create mode 100644 repo/system/mtdev.xibuild create mode 100644 repo/x11/libwacom.xibuild (limited to 'repo') diff --git a/repo/font/encodings.xibuild b/repo/font/encodings.xibuild index f93faba..1dc5d49 100644 --- a/repo/font/encodings.xibuild +++ b/repo/font/encodings.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.5 SOURCE=https://www.x.org/pub/individual/font/encodings-$PKG_VER.tar.bz2 diff --git a/repo/font/font-adobe-utopia-type1.xibuild b/repo/font/font-adobe-utopia-type1.xibuild index 2e14819..09a6959 100644 --- a/repo/font/font-adobe-utopia-type1.xibuild +++ b/repo/font/font-adobe-utopia-type1.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.4 SOURCE=https://www.x.org/pub/individual/font/font-adobe-utopia-type1-$PKG_VER.tar.bz2 diff --git a/repo/font/font-alias.xibuild b/repo/font/font-alias.xibuild index c0f66f1..c2375a3 100644 --- a/repo/font/font-alias.xibuild +++ b/repo/font/font-alias.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.4 SOURCE=https://www.x.org/pub/individual/font/font-alias-$PKG_VER.tar.bz2 diff --git a/repo/font/font-bh-ttf.xibuild b/repo/font/font-bh-ttf.xibuild index 2ba3a33..3156b3f 100644 --- a/repo/font/font-bh-ttf.xibuild +++ b/repo/font/font-bh-ttf.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.3 SOURCE=https://www.x.org/pub/individual/font/font-bh-ttf-$PKG_VER.tar.bz2 diff --git a/repo/font/font-bh-type1.xibuild b/repo/font/font-bh-type1.xibuild index 347ce5e..f431888 100644 --- a/repo/font/font-bh-type1.xibuild +++ b/repo/font/font-bh-type1.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.3 SOURCE=https://www.x.org/pub/individual/font/font-bh-type1-$PKG_VER.tar.bz2 diff --git a/repo/font/font-ibm-type1.xibuild b/repo/font/font-ibm-type1.xibuild index 4385b72..4b979e2 100644 --- a/repo/font/font-ibm-type1.xibuild +++ b/repo/font/font-ibm-type1.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.3 SOURCE=https://www.x.org/pub/individual/font/font-ibm-type1-$PKG_VER.tar.bz2 diff --git a/repo/font/font-misc-ethiopic.xibuild b/repo/font/font-misc-ethiopic.xibuild index 92e0abf..08107fb 100644 --- a/repo/font/font-misc-ethiopic.xibuild +++ b/repo/font/font-misc-ethiopic.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.4 SOURCE=https://www.x.org/pub/individual/font/font-misc-ethiopic-$PKG_VER.tar.bz2 diff --git a/repo/font/font-xfree86-type1.xibuild b/repo/font/font-xfree86-type1.xibuild index 0ae1ef0..71dd144 100644 --- a/repo/font/font-xfree86-type1.xibuild +++ b/repo/font/font-xfree86-type1.xibuild @@ -1,7 +1,7 @@ #!/bin/bash -MAKEDEPS=(make asciidoc xmlto lynx) -DEPS=(fontconfig libxcb elogind) +MAKEDEPS=(make mkfontscale) +DEPS=(fontconfig libxcb xcursor-themes) PKG_VER=1.0.4 SOURCE=https://www.x.org/pub/individual/font/font-xfree86-type1-$PKG_VER.tar.bz2 diff --git a/repo/system/libgudev.xibuild b/repo/system/libgudev.xibuild new file mode 100644 index 0000000..7ed1eab --- /dev/null +++ b/repo/system/libgudev.xibuild @@ -0,0 +1,21 @@ +#!/bin/bash + +MAKEDEPS=(meson) +DEPS=(glib2 libudev) + +PKG_VER=237 +SOURCE=https://download.gnome.org/sources/libgudev/$PKG_VER/libgudev-$PKG_VER.tar.xz +DESC="GObject bindings for libudev" + +build () { + mkdir build && + cd build && + + meson --prefix=/usr --buildtype=release .. && + ninja + +} + +package () { + DESTDIR=$PKG_DEST ninja install +} diff --git a/repo/system/mtdev.xibuild b/repo/system/mtdev.xibuild new file mode 100644 index 0000000..4cb3646 --- /dev/null +++ b/repo/system/mtdev.xibuild @@ -0,0 +1,20 @@ +#!/bin/bash + +MAKEDEPS=(make ) +DEPS=(glibc) + +PKG_VER=1.1.6 +SOURCE=https://bitmath.org/code/mtdev/mtdev-$PKG_VER.tar.bz2 + +DESC="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol" + +build () { + ./configure --prefix=/usr --disable-static && + make + +} + +package () { + make DESTDIR=$PKG_DEST install +} + 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