Permalink
Browse files

Merge branch 'master' of github.com:FireBurn/Overlay

  • Loading branch information...
2 parents 6f52618 + 27d2d8d commit 67fd7d36e79e743f6adfa7e213525cb3def2f2cf @FireBurn committed Oct 2, 2012
View
6 README
@@ -1,5 +1,7 @@
Simple overlay for 32bit mesa drivers including llvmpipe
-There is now no need to add COLLISION_IGNORE="/usr/lib32 /lib32" to your /etc/make.conf
+The overlay provides stripped x86 compatibility ebuilds to prevent collision problems
-The overlay provides stripped x86 compatibility ebuilds to prevent problems
+Switched back to using a non-live libX11 - we've not needed the live version for a while now
+
+Added libxcb-32bit to work around some issues compiling any software requiring -lGL e.g. wine and mesa-progs-32bit
@@ -1 +1 @@
-DIST emul-linux-x86-xlibs-20120520.tar.xz 2431812 RMD160 86d62e7518929518d8035e206c187eac2462a96f SHA1 51b0bbfbf23fde4e8c7f9175df4c8867e941932e SHA256 55b1a068acd88cd6f7b8f414991af6efda7dec19519a86e2a530b131735f5e69
+DIST emul-linux-x86-xlibs-20120520.tar.xz 2431812 SHA256 55b1a068acd88cd6f7b8f414991af6efda7dec19519a86e2a530b131735f5e69 SHA512 56f9227915e7a94bc60553457da5db37eb74a4b91e74059f67a367bfe8f4d4d658fb9dc717c2cd7f65881b39c310d73e2830a742405cde68f1f072d023afaadb WHIRLPOOL ec2b05afc9dd24692b116a0ba7084bd085c8814b63ea4eedf6cfd6a023d4d9d3bc229033e195e4df012f9e9bf69df5cf58c102f857f2a052e8aa0c405e84db8d
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild,v 1.1 2012/01/27 18:15:13 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="FTL GPL-2 MIT"
-
-KEYWORDS="-* ~amd64"
-IUSE="opengl"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- x11-libs/libX11
- opengl? ( app-emulation/emul-linux-x86-opengl )"
-PDEPEND="x11-libs/libX11-32bit"
-
-src_prepare() {
- emul-linux-x86_src_prepare
- rm -f "${S}/usr/lib32/libX11-xcb.so" || die
- rm -f "${S}/usr/lib32/libX11-xcb.so.1" || die
- rm -f "${S}/usr/lib32/libX11-xcb.so.1.0.0" || die
- rm -f "${S}/usr/lib32/libX11.so" || die
- rm -f "${S}/usr/lib32/libX11.so.6" || die
- rm -f "${S}/usr/lib32/libX11.so.6.3.0" || die
- rm -f "${S}/usr/lib32/pkgconfig/x11-xcb.pc" || die
- rm -f "${S}/usr/lib32/pkgconfig/x11.pc" || die
-}
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild,v 1.1 2012/01/27 18:15:13 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="FTL GPL-2 MIT"
+
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ x11-libs/libX11
+ opengl? ( app-emulation/emul-linux-x86-opengl )"
+PDEPEND="x11-libs/libX11-32bit
+ x11-libs/libxcb-32bit"
+
+src_prepare() {
+ emul-linux-x86_src_prepare
+ rm -f "${S}/usr/lib32/libX11.so.6.3.0" || die
+ rm -f "${S}/usr/lib32/libX11.so.6" || die
+ rm -f "${S}/usr/lib32/libX11.so" || die
+ rm -f "${S}/usr/lib32/libX11-xcb.so.1.0.0" || die
+ rm -f "${S}/usr/lib32/libX11-xcb.so.1" || die
+ rm -f "${S}/usr/lib32/libX11-xcb.so" || die
+ rm -f "${S}/usr/lib32/libxcb-composite.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-composite.so.0" || die
+ rm -f "${S}/usr/lib32/libxcb-composite.so" || die
+ rm -f "${S}/usr/lib32/libxcb-damage.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-damage.so.0" || die
+ rm -f "${S}/usr/lib32/libxcb-damage.so" || die
+ rm -f "${S}/usr/lib32/libxcb-dpms.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-dpms.so" || die
+ rm -f "${S}/usr/lib32/libxcb-dri2.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-dri2.so" || die
+ rm -f "${S}/usr/lib32/libxcb-glx.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-glx.so" || die
+ rm -f "${S}/usr/lib32/libxcb-randr.so.0.1.0" || die
+ rm -f "${S}/usr/lib32/libxcb-randr.so" || die
+ rm -f "${S}/usr/lib32/libxcb-record.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-record.so" || die
+ rm -f "${S}/usr/lib32/libxcb-render.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-render.so" || die
+ rm -f "${S}/usr/lib32/libxcb-res.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-res.so" || die
+ rm -f "${S}/usr/lib32/libxcb-screensaver.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-screensaver.so" || die
+ rm -f "${S}/usr/lib32/libxcb-shape.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-shape.so" || die
+ rm -f "${S}/usr/lib32/libxcb-shm.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-shm.so" || die
+ rm -f "${S}/usr/lib32/libxcb.so.1.1.0" || die
+ rm -f "${S}/usr/lib32/libxcb.so" || die
+ rm -f "${S}/usr/lib32/libxcb-sync.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-sync.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xevie.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xevie.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xf86dri.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xf86dri.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xfixes.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xfixes.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xinerama.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xinerama.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xinput.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xinput.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xprint.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xprint.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xtest.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xtest.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xvmc.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xvmc.so" || die
+ rm -f "${S}/usr/lib32/libxcb-xv.so.0.0.0" || die
+ rm -f "${S}/usr/lib32/libxcb-xv.so" || die
+ rm -f "${S}/usr/lib32/pkgconfig/x11.pc" || die
+ rm -f "${S}/usr/lib32/pkgconfig/x11-xcb.pc" || die
+}
@@ -32,12 +32,11 @@ else
${SRC_PATCHES}"
fi
-# Most of the code is MIT/X11.
-# ralloc is LGPL-3
+# The code is MIT/X11.
# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT LGPL-3 SGI-B-2.0"
+LICENSE="MIT SGI-B-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
@@ -47,12 +46,11 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+ bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
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 )
@@ -76,7 +74,7 @@ REQUIRED_USE="
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-32bit-2.4.34"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-32bit-2.4.39"
# not a runtime dependency of this package, but dependency of packages which
# depend on this package, bug #342393
EXTERNAL_DEPEND="
@@ -87,7 +85,6 @@ EXTERNAL_DEPEND="
# keep blocks in rdepend for binpkg
# gtest file collision bug #411825
RDEPEND="${EXTERNAL_DEPEND}
- dev-util/indent
!<x11-base/xorg-server-1.7
!<=x11-proto/xf86driproto-2.0.3
classic? ( app-admin/eselect-mesa )
@@ -99,8 +96,7 @@ RDEPEND="${EXTERNAL_DEPEND}
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXxf86vm
- >=x11-libs/libxcb-1.8
- d3d? ( app-emulation/wine )
+ >=x11-libs/libxcb-1.8.1
vdpau? ( >=x11-libs/libvdpau-0.4.1 )
wayland? ( dev-libs/wayland )
xorg? (
@@ -224,7 +220,6 @@ src_configure() {
if use gallium; then
myconf+="
- $(use_enable d3d d3d1x)
$(use_enable g3dvl gallium-g3dvl)
$(use_enable llvm gallium-llvm)
$(use_enable openvg)
@@ -4,7 +4,6 @@
<herd>x11</herd>
<use>
<flag name='classic'>Build drivers based on the classic architecture.</flag>
- <flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
<flag name='egl'>Enable EGL support.</flag>
<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
@@ -15,12 +14,13 @@
<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag>
<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+ <flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag>
<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
- <flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
<flag name='wayland'>Enable support for dev-libs/wayland</flag>
<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
+ <flag name='xorg'>Enable the Xorg state tracker for Gallium3D. This is not required for OpenGL acceleration in X.</flag>
<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
</use>
</pkgmetadata>
@@ -1 +1 @@
-DIST llvm-3.1.src.tar.gz 11077429 RMD160 ceb0ef36ab6109da7a8568b04de759752dbee5a7 SHA1 234c96e73ef81aec9a54da92fc2a9024d653b059 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab
+DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef
@@ -0,0 +1,65 @@
+From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001
+From: Ben Longbons <b.r.longbons@gmail.com>
+Date: Fri, 29 Jun 2012 12:58:34 -0700
+Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue
+ lines in a function."
+
+This meants that the debugger could find meaningful line information.
+
+This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
+---
+ lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++-----
+ test/DebugInfo/X86/ending-run.ll | 6 ++----
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+index 3e79a6d..24aedfb 100644
+--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
++++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) {
+ if (!MI->isDebugValue()) {
+ DebugLoc DL = MI->getDebugLoc();
+ if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
+- unsigned Flags = 0;
++ unsigned Flags = DWARF2_FLAG_IS_STMT;
+ PrevInstLoc = DL;
+ if (DL == PrologEndLoc) {
+ Flags |= DWARF2_FLAG_PROLOGUE_END;
+ PrologEndLoc = DebugLoc();
+ }
+- if (PrologEndLoc.isUnknown())
+- Flags |= DWARF2_FLAG_IS_STMT;
+-
+ if (!DL.isUnknown()) {
+ const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
+ recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
+@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
+ MF->getFunction()->getContext());
+ recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(),
+ FnStartDL.getScope(MF->getFunction()->getContext()),
+- 0);
++ DWARF2_FLAG_IS_STMT);
+ }
+ }
+
+diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll
+index 6935c47..0cd3de1 100644
+--- a/test/DebugInfo/X86/ending-run.ll
++++ b/test/DebugInfo/X86/ending-run.ll
+@@ -1,11 +1,9 @@
+ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
+ ; RUN: llvm-dwarfdump %t | FileCheck %s
+
+-; Check that the line table starts at 7, not 4, but that the first
+-; statement isn't until line 8.
++; Check that the line table starts at 7, not 4.
+
+-; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt
+-; CHECK: 0x0000000000000000 7 0 1 0
++; CHECK: 0x0000000000000000 7 0 1 0 is_stmt
+ ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end
+
+ define i32 @callee(i32 %x) nounwind uwtable ssp {
+--
+1.7.10
+
@@ -0,0 +1,13 @@
+--- llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:22:46 155401
++++ llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:41:39 155402
+@@ -230,6 +230,10 @@
+ case 45:
+ return "corei7-avx";
+
++ // Ivy Bridge:
++ case 58:
++ return "core-avx-i";
++
+ case 28: // Intel Atom processor. All processors are manufactured using
+ // the 45 nm process
+ return "atom";
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1.ebuild,v 1.1 2012/05/23 20:45:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r1.ebuild,v 1.1 2012/07/05 22:27:53 voyageur Exp $
EAPI="4"
ABI=x86
@@ -17,7 +17,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz"
LICENSE="UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
DEPEND="dev-lang/perl
@@ -26,7 +26,7 @@ DEPEND="dev-lang/perl
>=sys-devel/bison-1.875d
|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
- gold? ( >=sys-devel/binutils-2.22 )
+ gold? ( >=sys-devel/binutils-2.22[cxx] )
libffi? ( virtual/pkgconfig
app-emulation/emul-linux-x86-baselibs )
ocaml? ( dev-lang/ocaml )
@@ -98,6 +98,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
+ epatch "${FILESDIR}"/${P}-ivybridge_support.patch
+ epatch "${FILESDIR}"/${P}-fix_debug_line_info.patch
# User patches
epatch_user
@@ -0,0 +1 @@
+DIST libX11-1.5.0.tar.bz2 2322265 SHA256 c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86 SHA512 bbcfbaf306d4fff62d2f63daa5312f05bce1dc9655b0b259d77fbd3a39f51e31f9d127ab874a4895868c0ab70599c0b2e05bc984d9ed81c844ae456f77785083 WHIRLPOOL cc3b8f69839baef93c5c56cb1300f3f2cde2f7ef08b1d11ba68be5bd40254a8caee7a5c98bd5d74618f6b6b927609bc33f66c7c6fca5bec597c98f4c89bd9e61
@@ -1,21 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.2 2011/03/21 14:05:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.5.0.ebuild,v 1.7 2012/07/12 17:42:14 ranger Exp $
EAPI=4
ABI=x86
+P="libX11-1.5.0"
+PN="libX11"
+S=${WORKDIR}/${P}
XORG_DOC=doc
inherit xorg-2 toolchain-funcs flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libX11"
-
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 test"
-RDEPEND=">=x11-libs/libxcb-1.1.92
+RDEPEND=">=x11-libs/libxcb-32bit-1.8.1
x11-libs/xtrans
>=x11-proto/xproto-7.0.17
x11-proto/xf86bigfontproto
Oops, something went wrong.

0 comments on commit 67fd7d3

Please sign in to comment.