diff options
| author | Eric Sandall | 2010-01-20 10:27:10 -0800 |
|---|---|---|
| committer | Eric Sandall | 2010-02-06 17:59:09 -0800 |
| commit | a88e06e5070a72dab35cca3823f4cea0d1bccde7 (patch) | |
| tree | e37b7428ff979f15fcd377fe724424e816a120a3 | |
| parent | d1639099e5b91032c882d416cc0f4db617b831d0 (diff) | |
libdrm: Use correct flag ('y' not --enable-intel)
Pass --enable-intel when Intel KMS API is wanted
Removed unneeded REPAIR^none^{PRE_,}SUB_DEPENDS
(cherry picked from commit cb8718bda1a57c0ff80cf70a4e2f9fa7be0c2243)
| -rwxr-xr-x | libs/libdrm/BUILD | 2 | ||||
| -rw-r--r-- | libs/libdrm/HISTORY | 5 | ||||
| -rwxr-xr-x | libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS | 5 | ||||
| -rwxr-xr-x | libs/libdrm/REPAIR^none^SUB_DEPENDS | 7 | ||||
| -rwxr-xr-x | libs/libdrm/SUB_DEPENDS | 2 |
5 files changed, 8 insertions, 13 deletions
diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD index e164734fc5..7a65a7bd09 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 7bd4eacc52..66320b19d3 100644 --- a/libs/libdrm/HISTORY +++ b/libs/libdrm/HISTORY @@ -1,3 +1,8 @@ +2010-01-20 Eric Sandall <sandalle@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@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 688b0c914e..0000000000 --- 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 2a26b035be..0000000000 --- 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 2a26b035be..c89b004ca8 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 ;; |