summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPol Vinogradov2014-09-27 15:48:04 -0400
committerPol Vinogradov2014-09-27 15:48:04 -0400
commit1153382643610a0379d74fb0aca0be10eabaa8ac (patch)
tree060b5e2f5a861ffbec9c1a4b10eafb27ffb4f758
parentdb4925ef6975214e1dc4eddf7fbf7bd597bbf17b (diff)
xorg-driver/xf86-video-ati: fixed mesalib with DRI request in DEPENDS, some cleanup
-rwxr-xr-xxorg-driver/xf86-video-ati/DEPENDS7
-rw-r--r--xorg-driver/xf86-video-ati/HISTORY4
2 files changed, 5 insertions, 6 deletions
diff --git a/xorg-driver/xf86-video-ati/DEPENDS b/xorg-driver/xf86-video-ati/DEPENDS
index afd1cd8ee2..a3a5c3ae5d 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -7,7 +7,7 @@ depends xineramaproto &&
depends xorg-server &&
depends xproto &&
-optional_depends mesalib \
+optional_depends -sub DRI mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
@@ -23,8 +23,3 @@ optional_depends UDEV \
'--enable-udev' \
'--disable-udev' \
'for libudev hardware detection'
-=======
-if is_depends_enabled $SPELL mesalib ; then
- sub_depends mesalib DRI
-fi
->>>>>>> origin/master
diff --git a/xorg-driver/xf86-video-ati/HISTORY b/xorg-driver/xf86-video-ati/HISTORY
index a079b97bf3..f3719b64f8 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,7 @@
+2014-09-27 Pol Vinogradov <vin.public@gmail.com>
+ * DEPENDS: simplified mesalib with DRI request, removed merge
+ marks crap
+
2014-09-25 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: MESALIB => mesalib