Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (cb8718bda1a57c0ff80cf70a4e2f9fa7be0c2243)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-commit <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (cb8718bda1a57c0ff80cf70a4e2f9fa7be0c2243)
  • Date: Thu, 21 Jan 2010 17:39:48 +0100

Excerpts from Eric Sandall's message of Wed Jan 20 19:27:48 +0100 2010:
> GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
>
> libs/libdrm/BUILD | 2 ++
> libs/libdrm/HISTORY | 5 +++++
> libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS | 5 -----
> libs/libdrm/REPAIR^none^SUB_DEPENDS | 7 -------
> libs/libdrm/SUB_DEPENDS | 2 +-
> 5 files changed, 8 insertions(+), 13 deletions(-)
>
> New commits:
> commit cb8718bda1a57c0ff80cf70a4e2f9fa7be0c2243
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> libdrm: Use correct flag ('y' not --enable-intel)
> Pass --enable-intel when Intel KMS API is wanted
> Removed unneeded REPAIR^none^{PRE_,}SUB_DEPENDS

Sorry to bug you again, but the REPAIR^none^PRE_SUB_DEPENDS is needed,
since PRE_SUB_DEPENDS is taken from the tablet. SUB_DEPENDS is taken
from the grimoire, so doesn't need a REPAIR file.

> diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
> index e164734..7a65a7b 100755
> --- a/libs/libdrm/BUILD
> +++ b/libs/libdrm/BUILD
> @@ -3,6 +3,8 @@ if [[ $LIBDRM_NV == y ]]; then
> fi &&
> if [[ $LIBDRM_INTEL == n ]]; then
> OPTS="--disable-intel $OPTS"
> +else
> + OPTS="--enable-intel $OPTS"
> fi &&
> if [[ $LIBDRM_RADEON == y ]]; then
> OPTS="--enable-radeon-experimental-api $OPTS"
> diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
> index 7bd4eac..66320b1 100644
> --- a/libs/libdrm/HISTORY
> +++ b/libs/libdrm/HISTORY
> @@ -1,3 +1,8 @@
> +2010-01-20 Eric Sandall <sandalle AT sourcemage.org>
> + * {PRE_,}SUB_DEPENDS: Use correct flag ('y' not --enable-intel)
> + * BUILD: Pass --enable-intel when Intel KMS API is wanted
> + * REPAIR^none^{PRE_,}SUB_DEPENDS: Removed, unneeded
> +
> 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
> diff --git a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
> b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
> deleted file mode 100755
> index 688b0c9..0000000
> --- a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -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
> deleted file mode 100755
> index 2a26b03..0000000
> --- a/libs/libdrm/REPAIR^none^SUB_DEPENDS
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -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
> index 2a26b03..c89b004 100755
> --- a/libs/libdrm/SUB_DEPENDS
> +++ b/libs/libdrm/SUB_DEPENDS
> @@ -1,6 +1,6 @@
> 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'
> + LIBDRM_INTEL='y'
> ;;
> *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
> return 1 ;;
--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page