From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBc3Z-0003Mh-Ud for garchives@archives.gentoo.org; Sun, 25 Mar 2012 01:15:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57D80E059B; Sun, 25 Mar 2012 01:15:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 384CEE0495 for ; Sun, 25 Mar 2012 01:15:04 +0000 (UTC) Received: from [10.10.1.111] (174-127-38-130.static-ip.telepacific.net [174.127.38.130]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: lu_zero) by smtp.gentoo.org (Postfix) with ESMTPSA id 6B4431B4036 for ; Sun, 25 Mar 2012 01:15:03 +0000 (UTC) Message-ID: <4F6E718F.6010204@gentoo.org> Date: Sat, 24 Mar 2012 18:14:55 -0700 From: Luca Barbato User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20120118 Thunderbird/9.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] Supporting GLES-only implementations X-Enigmail-Version: 1.3.4 Content-Type: multipart/mixed; boundary="------------050408090901000603020002" X-Archives-Salt: 46fd96a5-9836-4cf3-84ac-04406ef4c060 X-Archives-Hash: 61ef5ec3125c807564d1234d1b851231 This is a multi-part message in MIME format. --------------050408090901000603020002 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Provided with the eselect opengl patch an implementation and the mesa changes. If they are ok for everybody I'd change the ati and nvidia drivers as well. (a better name for the amd-graphics driver would be welcome btw) lu -- Luca Barbato Gentoo/linux http://dev.gentoo.org/~lu_zero --------------050408090901000603020002 Content-Type: text/x-patch; name="0001-opengl-support-gles-only-implementation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-opengl-support-gles-only-implementation.patch" >From 17add6bb04836ee49f4babad51ed9f15b3fd9abe Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 24 Mar 2012 18:07:06 -0700 Subject: [PATCH] opengl: support gles only implementation Additionally make switching headers and libraries work for GLES OpenVG and EGL. --- modules/opengl.eselect | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/opengl.eselect b/modules/opengl.eselect index 2e8dd23..3f55ed5 100644 --- a/modules/opengl.eselect +++ b/modules/opengl.eselect @@ -140,14 +140,14 @@ setup_extensions_symlinks() { setup_includes_symlinks() { local target=$1 + local files=$2 local file local sdir - shift - + shift 2 mkdir -p "${target}" || die "Failed to create ${target}" pushd "${target}" &> /dev/null - for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do + for file in ${files}; do for sdir in "$@"; do if [[ -e ${sdir}/${file} ]]; then upgrade_file "${sdir}/${file}" "${target}" @@ -165,6 +165,7 @@ set_new_implementation() { local moduledir local gl_dir local gl_local + local -A gl_header # Set a sane umask... bug #83115 umask 022 @@ -178,7 +179,7 @@ set_new_implementation() { for libdir in $(list_libdirs); do [[ ${ROOT} != / ]] && libdir=${libdir#${EROOT}} [[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue - [[ -f "${PREFIX}/${libdir}/opengl/${gl_implem}/lib/libGL.so" ]] && found_libgl=yes + [[ -f "${PREFIX}/${libdir}/opengl/${gl_implem}/lib/libGL.so" || -f "${PREFIX}/${libdir}/opengl/${gl_implem}/.gles-only" ]] && found_libgl=yes done if [[ -z ${found_libgl} ]]; then @@ -242,14 +243,19 @@ set_new_implementation() { "${PREFIX}/${libdir}/opengl/${gl_local}/extensions" \ "${DST_PREFIX}/${libdir}/${moduledir}/extensions" - setup_includes_symlinks \ - "${DST_PREFIX}/include/GL" \ - "${PREFIX}/${libdir}/opengl/${gl_implem}/include/GL/" \ - "${PREFIX}/${libdir}/opengl/${gl_implem}/include/" \ - "${PREFIX}/${libdir}/opengl/global/include/" \ - "${PREFIX}/${libdir}/opengl/xorg-x11/include/GL/" \ - "${PREFIX}/${libdir}/opengl/xorg-x11/include/" - + gl_header[GL]="gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h" + gl_header[GLES]="egl.h gl_extensions.h glext.h gl.h glplatform.h" + gl_header[GLES2]="gl2ext.h gl2.h gl2platform.h" + gl_header[KHR]="khrplatform.h" + gl_header[VG]="openvg.h vgext.h vgplatform.h vgu.h" + for gl_dir in {GL,GLES,GLES2,KHR,VG}; do + setup_includes_symlinks \ + "${DST_PREFIX}/include/${gl_dir}" \ + "${gl_header[${gl_dir}]}" \ + "${PREFIX}/${libdir}/opengl/${gl_implem}/include/${gl_dir}/" \ + "${PREFIX}/${libdir}/opengl/global/include/${gl_dir}" \ + "${PREFIX}/${libdir}/opengl/xorg-x11/include/${gl_dir}/" + done # Setup the $LDPATH if [[ "x${REMOVE_ONLY}" == "xfalse" ]]; then # we need this relative to ROOT -- 1.7.8.rc1 --------------050408090901000603020002 Content-Type: text/plain; name="amd-graphics-bin-2012.1.ebuild" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="amd-graphics-bin-2012.1.ebuild" IyBDb3B5cmlnaHQgMTk5OS0yMDEyIEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2Mgoj ICRIZWFkZXI6ICQKCkVBUEk9MwoKaW5oZXJpdCBtdWx0aWxpYgoKREVTQ1JJUFRJT049IkNs b3NlZCBzb3VyY2UgaW14NSBPcGVuR0wvT3BlblZHIGRyaXZlciIKSE9NRVBBR0U9Imh0dHA6 Ly9mcmVlc2NhbGUuY29tIgpTUkNfVVJJPSJodHRwOi8vbG9jYWxob3N0LyR7UH0udGFyLnh6 IgoKTElDRU5TRT0iRVVMQSIKU0xPVD0iMCIKS0VZV09SRFM9In5hcm0iCklVU0U9IiIKCkRF UEVORD0iPj1hcHAtYWRtaW4vZXNlbGVjdC1vcGVuZ2wtMS4yLjYiClJERVBFTkQ9IiR7REVQ RU5EfQoJCXgxMS1saWJzL2xpYlgxMQoJCXgxMS1saWJzL2xpYlhyZW5kZXIKCQl4MTEtbGli cy9saWJYZXh0CiIKClJFU1RSSUNUPSJ0ZXN0IgoKCnNyY19pbnN0YWxsKCkgewoJbG9jYWwg b3BlbmdsX2ltcD0iYW1kLWdyYXBoaWNzIgoJbG9jYWwgb3BlbmdsX2Rpcj0iL3Vzci8kKGdl dF9saWJkaXIpL29wZW5nbC8ke29wZW5nbF9pbXB9IgoJZG9kaXIgIiRvcGVuZ2xfZGlyIi9s aWIgICIkb3BlbmdsX2RpciIvaW5jbHVkZQoJbG9jYWwgeAoJZm9yIHggaW4gdXNyL2xpYi9s aWJ7RUdMLEdMKixPcGVuVkd9LntsYSxhLHNvKn07IGRvCgkJaWYgWyAtZiAke3h9IC1vIC1M ICR7eH0gXTsgdGhlbgoJCQltdiAiJHt4fSIgIiR7RUR9Ii8ke29wZW5nbF9kaXJ9L2xpYiBc CgkJCQl8fCBkaWUgIkZhaWxlZCB0byBtb3ZlICR7eH0iCgkJZmkKCWRvbmUKCW12IHVzci9p bmNsdWRlL3tFR0wsR0xFUyosVkcsS0hSfS8gIFwKCQkiJHtFRH0iLyR7b3BlbmdsX2Rpcn0v aW5jbHVkZSB8fCBkaWUgIkZhaWxlZCB0byBtb3ZlIGhlYWRlcnMiCglpbnNpbnRvIC91c3IK CWRvaW5zIC1yIHVzci9pbmNsdWRlCglkb2xpYiB1c3IvbGliLyoKfQoKcGtnX3Bvc3RpbnN0 KCkgewoJZXNlbGVjdCBvcGVuZ2wgc2V0IC0tdXNlLW9sZCAke29wZW5nbF9pbXB9Cn0K --------------050408090901000603020002 Content-Type: text/x-patch; name="mesa-8.0.1-r3.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mesa-8.0.1-r3.diff" --- /usr/portage/media-libs/mesa/mesa-8.0.1-r2.ebuild 2012-02-24 18:01:18.000000000 +0000 +++ /usr/portage/media-libs/mesa/mesa-8.0.1-r3.ebuild 2012-03-24 22:40:44.000000000 +0000 @@ -285,6 +287,9 @@ || die "Failed to move ${x}" fi done + mv "${ED}"/usr/include/{EGL,GLES*,VG,KHR}/ \ + "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ + || die "Failed to move headers" eend $? if use classic || use gallium; then --------------050408090901000603020002--