From 2d5f088aeb37d13fb9893ec5da4bd683f5b4e0f0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 20 Mar 2014 08:52:49 +0000
Subject: main/xorg-server: ship config for modules

Since lazy loading is not supported in musl we need tell xorg what in
what order the modules should be loaded.
---
 main/xorg-server/20-modules.conf | 17 +++++++++++++++++
 main/xorg-server/APKBUILD        | 18 ++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 main/xorg-server/20-modules.conf

(limited to 'main')

diff --git a/main/xorg-server/20-modules.conf b/main/xorg-server/20-modules.conf
new file mode 100644
index 000000000..caae3e523
--- /dev/null
+++ b/main/xorg-server/20-modules.conf
@@ -0,0 +1,17 @@
+Section "Module"
+    Load "exa"
+    Load "wfb"
+
+    Load "dri"
+    Load "dri2"
+    Load "glx"
+
+    Load "int10"
+    Load "vbe"
+    Load "fb"
+    Load "shadowfb"
+    Load "shadow"
+    Load "vgahw"
+    Load "evdev"
+    Load "fbdevhw"
+EndSection
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index fc12bab20..ab5cd4d92 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
 pkgver=1.15.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
 arch="all"
@@ -53,7 +53,7 @@ makedepends="
 	libxfont-dev
 	libxinerama-dev
 	libxkbfile-dev
-	libxkbui-dev	
+	libxkbui-dev
 	libxv-dev
 	libxxf86dga-dev
 	libxxf86misc-dev
@@ -73,6 +73,7 @@ source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver
 	autoconfig-nvidia.patch
 	autoconfig-sis.patch
 	fix-musl-arm.patch
+	20-modules.conf
 	"
 
 
@@ -139,7 +140,9 @@ package() {
 	find "$pkgdir" -name '*.la' -delete || return 1
 	chmod u+s "$pkgdir"/usr/bin/Xorg
 
-	install -m755 -d "$pkgdir"/etc/X11 || return 1
+	install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d || return 1
+	install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/ \
+		|| return 1
 	install -m755 -d "$pkgdir"/var/lib/xkb || return 1
 	install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
@@ -175,12 +178,15 @@ xnest() {
 md5sums="c2ace3697b32414094cf8c597c39d7d9  xorg-server-1.15.0.tar.bz2
 ea4852dedbb89550f6bc113ca66348a2  autoconfig-nvidia.patch
 825ca99ea9348c66abdf2c479e0af485  autoconfig-sis.patch
-ccc57d75801b716a45ce6a67f4a9f163  fix-musl-arm.patch"
+ccc57d75801b716a45ce6a67f4a9f163  fix-musl-arm.patch
+6c2ce6a968b92661494fc27a6364317e  20-modules.conf"
 sha256sums="613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8  xorg-server-1.15.0.tar.bz2
 66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162  autoconfig-nvidia.patch
 7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50  autoconfig-sis.patch
-0cb8f7a5628037f24d05d86eed26ca0252c3ff95856367b606b64080da6db432  fix-musl-arm.patch"
+0cb8f7a5628037f24d05d86eed26ca0252c3ff95856367b606b64080da6db432  fix-musl-arm.patch
+3c545888d585cf9931e19f85e758dd9b3bae0e9a117488f2024ab48acf67f831  20-modules.conf"
 sha512sums="7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d  xorg-server-1.15.0.tar.bz2
 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447  autoconfig-nvidia.patch
 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200  autoconfig-sis.patch
-fdb45ed50e5aeac1bc8d22f1377517c52235aea7d15bb4664a774aea5c2c4fbbc9654dce6e5b3fee15ec9eadb2f87f88ca7d62a36c458df8a0dfa5b431ab225a  fix-musl-arm.patch"
+fdb45ed50e5aeac1bc8d22f1377517c52235aea7d15bb4664a774aea5c2c4fbbc9654dce6e5b3fee15ec9eadb2f87f88ca7d62a36c458df8a0dfa5b431ab225a  fix-musl-arm.patch
+ac3e0c191c3b8fda1a78488d326b1ce01836998b6640c228b8f5f6f80be416d7534dab086bb0fbec60727c6c8afc1ef2dfd3072bf571975724943997dc7c2b73  20-modules.conf"
-- 
cgit v1.2.3