summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-19 19:44:36 -0800
committerEric Sandall2010-02-06 17:59:07 -0800
commit3a468d41449124a12238ef4ff87a7a8c7e7b0214 (patch)
treed7eadca72d9c1a6e01ad9737b0ed67d412d97e08
parent291ad5775f761230c62c308fa0de9abdb3032eeb (diff)
libdrm: Allow forcing Intel KMS API
(cherry picked from commit 35b10d52656cd6c4b3ac8a969b3290ddcec6e865)
-rw-r--r--libs/libdrm/HISTORY4
-rwxr-xr-xlibs/libdrm/PRE_SUB_DEPENDS5
-rwxr-xr-xlibs/libdrm/REPAIR^none^PRE_SUB_DEPENDS5
-rwxr-xr-xlibs/libdrm/REPAIR^none^SUB_DEPENDS7
-rwxr-xr-xlibs/libdrm/SUB_DEPENDS7
5 files changed, 28 insertions, 0 deletions
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index b90bf613b1..7bd4eacc52 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2010-01-19 Eric Sandall <sandalle@sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing Intel KMS API
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Replace missing files
+
2009-12-18 Arjan Bouter <abouter@sourcemage.org>
* CONFIGURE,BUILD,INSTALL: there is no longer a libdrm subdir
and the kernel modules can not be build here. Made intel optional.
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..688b0c914e
--- /dev/null
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..688b0c914e
--- /dev/null
+++ b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libdrm/REPAIR^none^SUB_DEPENDS b/libs/libdrm/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000000..2a26b035be
--- /dev/null
+++ b/libs/libdrm/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Intel KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_INTEL='--enable-intel'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
new file mode 100755
index 0000000000..2a26b035be
--- /dev/null
+++ b/libs/libdrm/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Intel KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_INTEL='--enable-intel'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac