sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (1f5938c01998759ab356d94810bebe5395b89f94)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (1f5938c01998759ab356d94810bebe5395b89f94)
Date: Wed, 3 Mar 2010 17:24:23 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/libdrm/BUILD | 4
+++-
libs/libdrm/CONFIGURE | 2 +-
libs/libdrm/HISTORY | 3
+++
libs/libdrm/PRE_SUB_DEPENDS | 1 +
libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS | 6
++++++
libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS | 1 +
libs/libdrm/SUB_DEPENDS | 3
+++
7 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 1f5938c01998759ab356d94810bebe5395b89f94
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Allow depending on Radeon KMS API

commit 2eb8d1e77deef94d0037f45526de87ccae2f735e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Disable Radeon KMS API if not wanted

commit 197671f4ee9acd68faf5cdfd5d9532dc904b5259
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Radeon KMS API is no longer experimental

diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index 7a65a7b..c160d7f 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -7,7 +7,9 @@ else
OPTS="--enable-intel $OPTS"
fi &&
if [[ $LIBDRM_RADEON == y ]]; then
- OPTS="--enable-radeon-experimental-api $OPTS"
+ OPTS="--enable-radeon $OPTS"
+else
+ OPTS="--disable-radeon $OPTS"
fi &&

default_build &&
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index 82d1812..45af6dc 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,4 +1,4 @@
config_query LIBDRM_NV 'Enable nouveau KMS api?' n
config_query LIBDRM_INTEL 'Enable intel KMS api?' n
-config_query LIBDRM_RADEON 'Enable radeon KMS api (EXPERIMENTAL, not
recommended)?' n
+config_query LIBDRM_RADEON 'Enable radeon KMS api' n
config_query LIBDRM_LIBS 'Install radeon libs?' n
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index f35df64..816bcdf 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,5 +1,8 @@
2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
* 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 AT sourcemage.org>
* CONFIGURE: Mark Radeon KMS as experimental
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index 688b0c9..0e74f8d 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 0000000..0e74f8d
--- /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 688b0c9..0e74f8d 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 c89b004..966e24f 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

[SM-Commit] GIT changes to master grimoire by Eric Sandall (1f5938c01998759ab356d94810bebe5395b89f94), Eric Sandall, 03/03/2010