summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-03-03 14:52:30 -0800
committerEric Sandall2010-03-03 07:24:16 -0800
commit1f5938c01998759ab356d94810bebe5395b89f94 (patch)
treebd87a9cb1b259faf6deacd336180bec6db106001
parent2eb8d1e77deef94d0037f45526de87ccae2f735e (diff)
libdrm: Allow depending on Radeon KMS API
-rw-r--r--libs/libdrm/HISTORY1
-rwxr-xr-xlibs/libdrm/PRE_SUB_DEPENDS1
-rwxr-xr-xlibs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS6
-rwxr-xr-xlibs/libdrm/REPAIR^none^PRE_SUB_DEPENDS1
-rwxr-xr-xlibs/libdrm/SUB_DEPENDS3
5 files changed, 12 insertions, 0 deletions
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 852bf2a6a7..816bcdfd0b 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -2,6 +2,7 @@
* DETAILS: Updated to 2.4.19
* BUILD: Radeon KMS API is no longer experimental
Disable Radeon KMS API if not wanted
+ * {PRE_,}SUB_DEPENDS: Allow depending on Radeon KMS API
2010-02-26 Eric Sandall <sandalle@sourcemage.org>
* CONFIGURE: Mark Radeon KMS as experimental
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index 688b0c914e..0e74f8defe 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS b/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..0e74f8defe
--- /dev/null
+++ b/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ RADEON) [[ "$LIBDRM_RADEON" == "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
index 688b0c914e..0e74f8defe 100755
--- a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
+++ b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
*) 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
index c89b004ca8..966e24fd84 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -2,6 +2,9 @@ case $THIS_SUB_DEPENDS in
INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Intel KMS API${DEFAULT_COLOR}" &&
LIBDRM_INTEL='y'
;;
+ RADEON) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR} requested with Radeon KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_RADEON='y'
+ ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1 ;;
esac