Skip to content
Browse files

Update README

  • Loading branch information...
1 parent 7826632 commit ff5d9e102bdbed4f5fe080da609658681f4e74fb @FireBurn committed
Showing with 60 additions and 58 deletions.
  1. +4 −2 README
  2. +56 −56 app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120520-r2.ebuild
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
View
112 app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120520-r2.ebuild
@@ -19,61 +19,61 @@ PDEPEND="x11-libs/libX11-32bit
x11-libs/libxcb-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
+ emul-linux-x86_src_prepare
rm -f "${S}/usr/lib32/libX11.so.6.3.0" || die
- rm -f "${S}/usr/lib32/libxcb-dpms.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-dri2.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-glx.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-randr.so.0.1.0" || die
- rm -f "${S}/usr/lib32/libxcb-record.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-render.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-res.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-screensaver.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-shape.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-shm.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-sync.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xevie.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xf86dri.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xfixes.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xinerama.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xinput.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xprint.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xtest.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xv.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-xvmc.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-res.so" || die
- rm -f "${S}/usr/lib32/libxcb-screensaver.so" || die
- rm -f "${S}/usr/lib32/libxcb-shape.so" || die
- rm -f "${S}/usr/lib32/libxcb-shm.so" || die
- rm -f "${S}/usr/lib32/libxcb-sync.so" || die
- rm -f "${S}/usr/lib32/libxcb-xevie.so" || die
- rm -f "${S}/usr/lib32/libxcb-xf86dri.so" || die
- rm -f "${S}/usr/lib32/libxcb-xfixes.so" || die
- rm -f "${S}/usr/lib32/libxcb-xinerama.so" || die
- rm -f "${S}/usr/lib32/libxcb-xinput.so" || die
- rm -f "${S}/usr/lib32/libxcb-xprint.so" || die
- rm -f "${S}/usr/lib32/libxcb-xtest.so" || die
- rm -f "${S}/usr/lib32/libxcb-xv.so" || die
- rm -f "${S}/usr/lib32/libxcb-xvmc.so" || die
- rm -f "${S}/usr/lib32/libxcb.so.1.1.0" || die
- rm -f "${S}/usr/lib32/libxcb-composite.so" || die
- rm -f "${S}/usr/lib32/libxcb-composite.so.0" || die
- rm -f "${S}/usr/lib32/libxcb-composite.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-damage.so" || die
- rm -f "${S}/usr/lib32/libxcb-damage.so.0" || die
- rm -f "${S}/usr/lib32/libxcb-damage.so.0.0.0" || die
- rm -f "${S}/usr/lib32/libxcb-dpms.so" || die
- rm -f "${S}/usr/lib32/libxcb-dri2.so" || die
- rm -f "${S}/usr/lib32/libxcb-glx.so" || die
- rm -f "${S}/usr/lib32/libxcb-randr.so" || die
- rm -f "${S}/usr/lib32/libxcb-record.so" || die
- rm -f "${S}/usr/lib32/libxcb-render.so" || die
- rm -f "${S}/usr/lib32/libxcb.so" || die
- rm -f "${S}/usr/lib32/pkgconfig/x11-xcb.pc" || die
- rm -f "${S}/usr/lib32/pkgconfig/x11.pc" || 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
}

0 comments on commit ff5d9e1

Please sign in to comment.
Something went wrong with that request. Please try again.