From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:opencl commit in: /
Date: Wed, 12 Sep 2012 16:30:09 +0000 (UTC) [thread overview]
Message-ID: <1347467287.0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2.alexxy@gentoo> (raw)
commit: 0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 16:28:07 2012 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 16:28:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0e16c8a0
Merge branch 'master' into opencl
Conflicts:
media-libs/mesa/mesa-9999.ebuild
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
dev-libs/weston/Manifest | 1 +
dev-libs/weston/metadata.xml | 13 +++++++++++++
dev-libs/weston/weston-0.85.0.ebuild | 2 +-
.../{weston-9999.ebuild => weston-0.95.0.ebuild} | 4 ++--
dev-libs/weston/weston-9999.ebuild | 4 ++--
media-libs/mesa/mesa-9999.ebuild | 9 +++------
media-libs/mesa/metadata.xml | 1 -
x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 5 +++--
x11-drivers/ati-drivers/Manifest | 1 +
x11-drivers/xf86-video-intel/metadata.xml | 2 ++
.../xf86-video-intel/xf86-video-intel-9999.ebuild | 16 ++++++++++------
11 files changed, 38 insertions(+), 20 deletions(-)
diff --cc media-libs/mesa/mesa-9999.ebuild
index 413c40c,a094a48..7c2cea0
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@@ -46,12 -46,11 +46,11 @@@ for card in ${VIDEO_CARDS}; d
done
IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
- opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi
- vdpau wayland xvmc xa xorg kernel_FreeBSD"
+ bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
- openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
++ opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+ wayland xvmc xa xorg kernel_FreeBSD"
REQUIRED_USE="
- d3d? ( gallium )
g3dvl? ( gallium )
llvm? ( gallium )
openvg? ( egl gallium )
@@@ -99,11 -97,6 +98,10 @@@ RDEPEND="${EXTERNAL_DEPEND
x11-libs/libXext
x11-libs/libXxf86vm
>=x11-libs/libxcb-1.8.1
- d3d? ( app-emulation/wine )
+ opencl? (
+ app-admin/eselect-opencl
+ dev-libs/libclc
+ )
vdpau? ( >=x11-libs/libvdpau-0.4.1 )
wayland? ( dev-libs/wayland )
xorg? (
next reply other threads:[~2012-09-12 16:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 16:30 Alexey Shvetsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-05-03 20:34 [gentoo-commits] proj/x11:opencl commit in: / Alexey Shvetsov
2013-04-08 18:37 Alexey Shvetsov
2013-04-06 10:34 Alexey Shvetsov
2013-04-06 10:34 Alexey Shvetsov
2013-03-05 5:38 Alexey Shvetsov
2013-03-05 5:38 Alexey Shvetsov
2013-03-05 5:38 Alexey Shvetsov
2013-03-05 5:38 Alexey Shvetsov
2012-12-22 21:09 Alexey Shvetsov
2012-12-05 14:02 Alexey Shvetsov
2012-12-05 14:02 Alexey Shvetsov
2012-10-11 8:51 Alexey Shvetsov
2012-09-22 21:13 Alexey Shvetsov
2012-09-06 11:52 Alexey Shvetsov
2012-08-25 19:00 Alexey Shvetsov
2012-08-02 12:31 Alexey Shvetsov
2012-07-17 16:01 Alexey Shvetsov
2012-07-10 22:41 Alexey Shvetsov
2012-07-05 22:54 Alexey Shvetsov
2012-06-24 19:11 Alexey Shvetsov
2012-06-19 22:10 Alexey Shvetsov
2012-06-08 20:58 Alexey Shvetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347467287.0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2.alexxy@gentoo \
--to=alexxy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox