| 1 |
dberkholz 08/06/27 21:42:38 |
| 2 |
|
| 3 |
Modified: ChangeLog mesa-7.1_rc1.ebuild |
| 4 |
Log: |
| 5 |
Stop fetching from git pointlessly after downloading the tarball. Add a patch to attempt allowing builds against libdrm 2.3.1. It still doesn't actually work for reasons I don't understand, but it seems to have something to do with the 'depend' files mesa's weird build system uses. |
| 6 |
(Portage version: 2.1.5.6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.175 media-libs/mesa/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.175&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.175&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.174&r2=1.175 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v |
| 18 |
retrieving revision 1.174 |
| 19 |
retrieving revision 1.175 |
| 20 |
diff -u -r1.174 -r1.175 |
| 21 |
--- ChangeLog 27 Jun 2008 10:11:26 -0000 1.174 |
| 22 |
+++ ChangeLog 27 Jun 2008 21:42:38 -0000 1.175 |
| 23 |
@@ -1,6 +1,14 @@ |
| 24 |
# ChangeLog for media-libs/mesa |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.174 2008/06/27 10:11:26 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.175 2008/06/27 21:42:38 dberkholz Exp $ |
| 28 |
+ |
| 29 |
+ 27 Jun 2008; Donnie Berkholz <dberkholz@g.o>; |
| 30 |
+ +files/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch, |
| 31 |
+ mesa-7.1_rc1.ebuild: |
| 32 |
+ Stop fetching from git pointlessly after downloading the tarball. Add a |
| 33 |
+ patch to attempt allowing builds against libdrm 2.3.1. It still doesn't |
| 34 |
+ actually work for reasons I don't understand, but it seems to have |
| 35 |
+ something to do with the 'depend' files mesa's weird build system uses. |
| 36 |
|
| 37 |
27 Jun 2008; Ulrich Mueller <ulm@g.o> mesa-6.5.2-r1.ebuild, |
| 38 |
mesa-7.0.2.ebuild, mesa-7.0.3.ebuild, mesa-7.1_rc1.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.4 media-libs/mesa/mesa-7.1_rc1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild?rev=1.4&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild?rev=1.4&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild?r1=1.3&r2=1.4 |
| 47 |
|
| 48 |
Index: mesa-7.1_rc1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v |
| 51 |
retrieving revision 1.3 |
| 52 |
retrieving revision 1.4 |
| 53 |
diff -u -r1.3 -r1.4 |
| 54 |
--- mesa-7.1_rc1.ebuild 27 Jun 2008 10:11:26 -0000 1.3 |
| 55 |
+++ mesa-7.1_rc1.ebuild 27 Jun 2008 21:42:38 -0000 1.4 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2008 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v 1.3 2008/06/27 10:11:26 ulm Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v 1.4 2008/06/27 21:42:38 dberkholz Exp $ |
| 61 |
|
| 62 |
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" |
| 63 |
|
| 64 |
@@ -9,7 +9,7 @@ |
| 65 |
OPENGL_DIR="xorg-x11" |
| 66 |
|
| 67 |
MY_PN="${PN/m/M}" |
| 68 |
-MY_P="${MY_PN}-${PV//_}" |
| 69 |
+MY_P="${MY_PN}-${PV//_/-}" |
| 70 |
MY_SRC_P="${MY_PN}Lib-${PV/_/-}" |
| 71 |
DESCRIPTION="OpenGL-like graphic library for Linux" |
| 72 |
HOMEPAGE="http://mesa3d.sourceforge.net/" |
| 73 |
@@ -98,9 +98,14 @@ |
| 74 |
} |
| 75 |
|
| 76 |
src_unpack() { |
| 77 |
- git_src_unpack |
| 78 |
+ unpack ${A} |
| 79 |
cd "${S}" |
| 80 |
|
| 81 |
+ # Disable TTM |
| 82 |
+ epatch "${FILESDIR}/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch" |
| 83 |
+ |
| 84 |
+ cp "${FILESDIR}/version.mk" bin/ || die |
| 85 |
+ |
| 86 |
# FreeBSD 6.* doesn't have posix_memalign(). |
| 87 |
[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac |
| 88 |
|
| 89 |
@@ -110,7 +115,7 @@ |
| 90 |
find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; |
| 91 |
fi |
| 92 |
|
| 93 |
- eautoreconf |
| 94 |
+ eautoconf |
| 95 |
} |
| 96 |
|
| 97 |
src_compile() { |
| 98 |
@@ -119,6 +124,9 @@ |
| 99 |
# This is where we might later change to build xlib/osmesa |
| 100 |
myconf="${myconf} --with-driver=dri" |
| 101 |
|
| 102 |
+ # No TTM |
| 103 |
+ myconf="${myconf} --disable-ttm-api" |
| 104 |
+ |
| 105 |
# Do we want thread-local storage (TLS)? |
| 106 |
myconf="${myconf} $(use_enable nptl glx-tls)" |
| 107 |
|
| 108 |
@@ -157,7 +165,10 @@ |
| 109 |
|
| 110 |
myconf="${myconf} $(use_enable motif glw)" |
| 111 |
|
| 112 |
+ emake realclean || die |
| 113 |
econf ${myconf} || die |
| 114 |
+ # So makedepend runs for header changes |
| 115 |
+ find src/mesa/drivers/dri/ | xargs touch |
| 116 |
emake || die |
| 117 |
} |
| 118 |
|
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
-- |
| 123 |
gentoo-commits@l.g.o mailing list |
Archives