Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b06514d93f0227fc52e268d456221c9ba9edb84c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b06514d93f0227fc52e268d456221c9ba9edb84c)
  • Date: Fri, 18 Dec 2009 11:32:51 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

libs/libdrm/BUILD | 10 ++++------
libs/libdrm/CONFIGURE | 16 ++++------------
libs/libdrm/HISTORY | 5 +++++
libs/libdrm/INSTALL | 6 +-----
4 files changed, 14 insertions(+), 23 deletions(-)

New commits:
commit b06514d93f0227fc52e268d456221c9ba9edb84c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

libdrm: can not install kernel modules anymore, made intel optional,
libdrm subdir no longer exists and enabled KMS queries for the release
version.

diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index ebae123..e164734 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -1,6 +1,9 @@
if [[ $LIBDRM_NV == y ]]; then
OPTS="--enable-nouveau-experimental-api $OPTS"
fi &&
+if [[ $LIBDRM_INTEL == n ]]; then
+ OPTS="--disable-intel $OPTS"
+fi &&
if [[ $LIBDRM_RADEON == y ]]; then
OPTS="--enable-radeon-experimental-api $OPTS"
fi &&
@@ -8,11 +11,6 @@ fi &&
default_build &&

if [[ $LIBDRM_LIBS == y ]]; then
- cd ${SOURCE_DIRECTORY}/libdrm/radeon &&
- make
-fi &&
-
-if [[ $LIBDRM_KERNEL == y ]]; then
- cd ${SOURCE_DIRECTORY}/linux-core &&
+ cd ${SOURCE_DIRECTORY}/radeon &&
make
fi
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index 3e63266..baf516c 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,12 +1,4 @@
-if [[ $LIBDRM_VCS == y ]]; then
- config_query LIBDRM_NV 'enable experimental nouveau api?' n
-fi &&
-if [[ $LIBDRM_VCS == y ]]; then
- config_query LIBDRM_RADEON 'enable experimental radeon api?' n
-fi &&
-if [[ $LIBDRM_VCS == y ]]; then
- config_query LIBDRM_LIBS 'install radeon libs?' n
-fi &&
-if [[ $LIBDRM_VCS == y ]]; then
- config_query LIBDRM_KERNEL 'install kernel modules?' n
-fi
+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?' n
+config_query LIBDRM_LIBS 'install radeon libs?' n
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 4cbff40..b90bf61 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,8 @@
+2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE,BUILD,INSTALL: there is no longer a libdrm subdir
+ and the kernel modules can not be build here. Made intel optional.
+ * CONFIGURE: the KMS options are also in the release versions now
+
2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.4.16
SOURCE matches upstream posted SHA1
diff --git a/libs/libdrm/INSTALL b/libs/libdrm/INSTALL
index 2c449e5..313dafd 100755
--- a/libs/libdrm/INSTALL
+++ b/libs/libdrm/INSTALL
@@ -1,10 +1,6 @@
cd ${SOURCE_DIRECTORY} &&
make install &&
if [[ $LIBDRM_LIBS == y ]]; then
-cd ${SOURCE_DIRECTORY}/libdrm/radeon &&
-make install
-fi
-if [[ $LIBDRM_KERNEL == y ]]; then
-cd ${SOURCE_DIRECTORY}/linux-core &&
+cd ${SOURCE_DIRECTORY}/radeon &&
make install
fi



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b06514d93f0227fc52e268d456221c9ba9edb84c), Arjan Bouter, 12/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page