Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (684e4e5758d71400b728d313f2dd5a622ef6333b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (684e4e5758d71400b728d313f2dd5a622ef6333b)
  • Date: Tue, 19 Jan 2010 21:47:08 -0600

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

libs/glibc/DETAILS | 2 +-
libs/glibc/HISTORY | 5 +++++
libs/glibc/PRE_BUILD | 7 +++++++
libs/glibc/UP_TRIGGERS | 4 ++++
libs/libdrm/HISTORY | 4 ++++
libs/libdrm/PRE_SUB_DEPENDS | 5 +++++
libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS | 5 +++++
libs/libdrm/REPAIR^none^SUB_DEPENDS | 7 +++++++
libs/libdrm/SUB_DEPENDS | 7 +++++++
xorg-driver/xf86-video-intel/DEPENDS | 2 +-
xorg-driver/xf86-video-intel/HISTORY | 4 ++++
11 files changed, 50 insertions(+), 2 deletions(-)

New commits:
commit 684e4e5758d71400b728d313f2dd5a622ef6333b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-intel: Depends on libdrm built with Intel KMS API
Fixes one issue found in Bug #15547

commit 35b10d52656cd6c4b3ac8a969b3290ddcec6e865
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Allow forcing Intel KMS API

commit 8cfc3a7b0bad4d316a60721a0c8d74e9e92f72bd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Remove kernel DRM headers (Bug #15547)
PATCHLEVEL++
Rebuild libdrm if drm/drm.h is registered as from glibc

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index ac7a739..fd8b4b3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -41,7 +41,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
+ PATCHLEVEL=1
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.32
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3aaa8f9..8ef253a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Remove kernel DRM headers (Bug #15547)
+ * UP_TRIGGERS: Rebuild libdrm if drm/drm.h is registered as from glibc
+
2009-12-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.11.1

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c3bb267..c49726c 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,13 @@ else
fi &&

#
+# Remove kernel DRM headers
+# Fixes Bug #15547
+#
+sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
+rm -rf $GLIBC_HEADERS_DIR/include/drm &&
+
+#
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 23d6683..b64343d 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -2,3 +2,7 @@ if ! spell_ok locale; then
up_trigger locale cast_self
echo
fi
+
+if $(gaze from $INSTALL_ROOT/usr/include/drm/drm.h|grep -q glibc); then
+ up_trigger libdrm cast_self
+fi
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index b90bf61..7bd4eac 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing Intel KMS API
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Replace missing files
+
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.
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..688b0c9
--- /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 0000000..688b0c9
--- /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 0000000..2a26b03
--- /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 0000000..2a26b03
--- /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
diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index b424254..856747b 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -1,4 +1,4 @@
-depends libdrm &&
+depends -sub "INTEL" libdrm &&
depends libxvmc &&
depends xproto &&
depends xorg-server &&
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 1b28eb1..af54403 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,7 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libdrm built with Intel KMS API
+ Fixes one issue found in Bug #15547
+
2009-10-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.9.1
SOURCE matches upstream posted MD5



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (684e4e5758d71400b728d313f2dd5a622ef6333b), Eric Sandall, 01/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page