Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 154661 Details for
Bug 204755
app-emulation/emul-linux-x86-xlibs-20071230 opengl crashes X with Intel 965GM chipset
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Mesa ebuild patch to enable multilib build support (really fixed and cleaned up)
mesa.ebuild.diff (text/plain), 4.08 KB, created by
Steven Newbury
on 2008-05-29 04:37:19 UTC
(
hide
)
Description:
Mesa ebuild patch to enable multilib build support (really fixed and cleaned up)
Filename:
MIME Type:
Creator:
Steven Newbury
Created:
2008-05-29 04:37:19 UTC
Size:
4.08 KB
patch
obsolete
>--- /usr/portage/local/layman/x11/media-libs/mesa/mesa-9999.ebuild 2008-05-24 16:25:55.670625010 +0100 >+++ mesa-9999.ebuild 2008-05-29 05:33:53.468493252 +0100 >@@ -23,6 +23,8 @@ > LICENSE="LGPL-2" > SLOT="0" > KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" >+EMULTILIB_PKG="true" >+ > IUSE_VIDEO_CARDS=" > video_cards_i810 > video_cards_mach64 >@@ -44,7 +46,8 @@ > motif > nptl > xcb >- kernel_FreeBSD" >+ kernel_FreeBSD >+ multilib" > > RDEPEND="app-admin/eselect-opengl > dev-libs/expat >@@ -111,9 +114,20 @@ > eautoreconf > } > >-src_compile() { >+mesa_src_compile() { > local myconf > >+ if use amd64 || use ppc64 ; then >+ case ${ABI} in >+ x86|ppc) myconf="${myconf} --enable-32-bit" >+ ;; >+ amd64|ppc64) myconf="${myconf} --enable-64-bit" >+ ;; >+ *) die "Unknown ABI" >+ ;; >+ esac >+ fi >+ > # This is where we might later change to build xlib/osmesa > myconf="${myconf} --with-driver=dri" > >@@ -148,37 +162,64 @@ > > myconf="${myconf} --without-demos" > >- myconf="${myconf} $(use_enable xcb)" >- >+ # xcb is not yet used for the binary 32bit compatibility libs >+ if is_final_abi ; then >+ myconf="${myconf} $(use_enable xcb)" >+ fi >+ > # Get rid of glut includes > rm -f "${S}"/include/GL/glut*h > > myconf="${myconf} $(use_enable motif glw)" > >+ # Create seperate build dir for each ABI since the Mesa build system >+ # doesn't handle building both ABIs in the same tree >+ cp -al ${S} ${WORKDIR}/builddir.${ABI} >+ cd ${WORKDIR}/builddir.${ABI} >+ > econf ${myconf} || die >+ > emake || die > } > >-src_install() { >+src_compile() { >+ if [[ -z ${OABI} ]] ; then >+ local abilist="" >+ if has_multilib_profile ; then >+ abilist=$(get_install_abis) >+ einfo "Building multilib Mesa for ABIs: ${abilist}" >+ elif is_crosscompile || tc-is-cross-compiler ; then >+ abilist=${DEFAULT_ABI} >+ fi >+ if [[ -n ${abilist} ]] ; then >+ OABI=${ABI} >+ for ABI in ${abilist} ; do >+ export ABI >+ src_compile >+ done >+ ABI=${OABI} >+ unset OABI >+ return 0 >+ fi >+ fi >+ mesa_src_compile >+} >+ >+mesa_src_install() { >+ einfo "Installing Mesa ${ABI} ..." >+ cd ${WORKDIR}/builddir.${ABI} >+ > dodir /usr > emake \ > DESTDIR="${D}" \ > install || die "Installation failed" > >- if ! use motif; then >- rm "${D}"/usr/include/GL/GLwMDrawA.h >- fi >- >- # Don't install private headers >- rm -f "${D}"/usr/include/GL/GLw*P.h >- > fix_opengl_symlinks > dynamic_libgl_install > > # Install libtool archives >- insinto /usr/$(get_libdir) >- # (#67729) Needs to be lib, not $(get_libdir) >- doins "${FILESDIR}"/lib/libGLU.la >+ sed -e "s:\/usr\/lib:/usr/$(get_libdir):g" "${FILESDIR}"/lib/libGLU.la \ >+ > "${D}"/usr/$(get_libdir)/libGLU.la > sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \ > > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la > >@@ -190,13 +231,46 @@ > "${D}"/usr/$(get_libdir)/libGLU.la \ > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la > >+ is_final_abi || return 0 >+ > # libGLU doesn't get the plain .so symlink either > #dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so > >+ if ! use motif; then >+ rm "${D}"/usr/include/GL/GLwMDrawA.h >+ fi >+ >+ # Don't install private headers >+ rm -f "${D}"/usr/include/GL/GLw*P.h >+ > # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to > # as the default libGL.so.1 > } > >+src_install() { >+ if [[ -z ${OABI} ]] ; then >+ local abilist="" >+ if has_multilib_profile ; then >+ abilist=$(get_install_abis) >+ einfo "Installing multilib Mesa for ABIs: ${abilist}" >+ elif is_crosscompile || tc-is-cross-compiler ; then >+ abilist=${DEFAULT_ABI} >+ fi >+ if [[ -n ${abilist} ]] ; then >+ OABI=${ABI} >+ for ABI in ${abilist} ; do >+ export ABI >+ src_install >+ done >+ ABI=${OABI} >+ unset OABI >+ return 0 >+ fi >+ fi >+ >+ mesa_src_install >+} >+ > pkg_postinst() { > switch_opengl_implem >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 204755
:
154545
|
154653
|
154655
|
154661
|
154663
|
154695
|
154697
|
154763
|
158747
|
164909
|
164910
|
171577
|
171578
|
173365
|
174019
|
177093
|
181869
|
181870