diff options
author | 2006-04-08 21:57:12 +0000 | |
---|---|---|
committer | 2006-04-08 21:57:12 +0000 | |
commit | 77e5892328ddcac90bbda6d12a94f3a7bec2ff35 (patch) | |
tree | 094fa64fa9d6543f1dbc89878e4a15914d18cba5 /media-libs | |
parent | Stable on x86; bug #124788 (diff) | |
download | gentoo-2-77e5892328ddcac90bbda6d12a94f3a7bec2ff35.tar.gz gentoo-2-77e5892328ddcac90bbda6d12a94f3a7bec2ff35.tar.bz2 gentoo-2-77e5892328ddcac90bbda6d12a94f3a7bec2ff35.zip |
Add a simple sed to replace -ldl with the right call for the libc used with dlopen_lib() function in portability eclass. This allows to link correctly to libGL when using libtool on Gentoo/FreeBSD.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/mesa/ChangeLog | 369 | ||||
-rw-r--r-- | media-libs/mesa/mesa-6.4.2-r2.ebuild | 12 | ||||
-rw-r--r-- | media-libs/mesa/mesa-6.5.ebuild | 12 |
3 files changed, 26 insertions, 367 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index cdc0959e6c58..2e6297edd154 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,367 +1,10 @@ # ChangeLog for media-libs/mesa -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.76 2006/04/03 01:15:47 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.77 2006/04/08 21:57:12 flameeyes Exp $ - 03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild, + 08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild, mesa-6.5.ebuild: - Add special case for FreeBSD where libGL has only major soversion. + Add a simple sed to replace -ldl with the right call for the libc used with + dlopen_lib() function in portability eclass. This allows to link correctly + to libGL when using libtool on Gentoo/FreeBSD. - 01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.5.ebuild: - Bump the libdrm dependency and fix the i810 chip series driver compile. (Bug - #128328, Alex Rostovtsev) - - 01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> - mesa-6.4.2-r2.ebuild, mesa-6.5.ebuild: - Add some missing x11-proto dependencies. (bug #128336, Steven Jenkins) - -*mesa-6.5 (01 Apr 2006) - - 01 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.5.ebuild: - Bump for masked development release, needed for newer i810 drivers. Also - adds some GLSL (OpenGL Shading Language) support and lots of development in - r300 driver, among others. - - 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild: - Add ~x86-fbsd keyword. - -*mesa-6.4.2-r2 (12 Mar 2006) - - 12 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org> - +files/radeon-texture-problem.patch, -mesa-6.4.2-r1.ebuild, - +mesa-6.4.2-r2.ebuild: - Fix a Radeon crash in certain applications (such as Croquet 0.3), and don't - compile debug code into the drivers if USE=-debug (Santiago Gala, bug - #125004). Also, fix a naming conflict between SGI GLU code and glibc 2.4 - (SpanKY, KIMURA Masaru / hiyuh, bug #125809). - - 28 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2-r1.ebuild: - Make USE=debug work more nicely with FEATURES=splitdebug. - -*mesa-6.4.2-r1 (16 Feb 2006) - - 16 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; - +files/64bit-fix-have-dix-config.patch, - +files/64bit-fix-indirect-vertex-array.patch, - -files/6.4.1-amd64-include-assyntax.patch, -mesa-6.4.1-r1.ebuild, - -mesa-6.4.2.ebuild, +mesa-6.4.2-r1.ebuild: - Really fix direct rendering on amd64. Also remove old versions. - - 14 Feb 2006; Markus Rothe <corsair@gentoo.org> mesa-6.4.1-r1.ebuild, - mesa-6.4.2.ebuild: - Added ~ppc64 - - 06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild: - Add mach64 and tdfx to ppc defaults. Some evidence that glide-v3 works on - ppc exists; needs testing, and is required for tdfx 3D to work. - - 06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild: - Add arch-dependent defaults for building 3D drivers. - - 03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild: - Add a fake video_cards_none for people who don't want any DRI drivers, e.g. - if they're using binary drivers. - -*mesa-6.4.2 (03 Feb 2006) - - 03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.4.2.ebuild: - Bump. Port to VIDEO_CARDS. Not really any relevant upstream changes, except - a change in the install script to install GLw headers. Also, - 6.4.1-amd64-include-assyntax.patch was incorporated into this release. - - 02 Feb 2006; Herbie Hopkins <herbs@gentoo.org> mesa-6.4.1-r1.ebuild: - Fix setting of the default dri drivers directory. - - 02 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.1-r1.ebuild: - Add USE=debug support. - - 31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> mesa-6.4.1-r1.ebuild: - Unstable on hppa. - - 23 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; - -files/configurable-dri-dir.patch, mesa-6.4.1-r1.ebuild: - Some people don't understand what #ifndef means. - - 26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> mesa-6.4.1-r1.ebuild: - Marked ~alpha - - 16 Dec 2005; Herbie Hopkins <herbs@gentoo.org> - +files/6.4-multilib-fix.patch, +files/configurable-dri-dir.patch, - mesa-6.4.1-r1.ebuild: - Cleaned up multilib fixes, made default dri drivers directory configurable - so we can set it to lib64 on multilib systems. - -*mesa-6.4.1-r1 (12 Dec 2005) - - 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4.1.ebuild, - +mesa-6.4.1-r1.ebuild: - Install correct libGLU.so.1.3. - - 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4-r1.ebuild: - Pull old versions. - - 02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; - files/6.4.1-amd64-include-assyntax.patch: - Add more info to patch. - - 02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/6.4.1-amd64-include-assyntax.patch, mesa-6.4.1.ebuild: - (#114066) Add 6.4.1-amd64-include-assyntax.patch to fix amd64 build. - -*mesa-6.4.1 (30 Nov 2005) - - 30 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.4.1.ebuild: - New version. This is the one that's expected to be in X.Org 7.0. Fix libGL.* - symlink deletion so the dot really matches a dot instead of any character, - so other symlinks don't get deleted. (#110840) Build with PIC, since it - hasn't been shown to slow it down. Remove commented-out lines about OSMesa. - Keep using 6.4-dont-install-gles-headers.patch, so don't delete it when - pulling 6.4. - - 27 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4-r1.ebuild: - Added Diego's patch for FreeBSD support. Closes bug #111145. - - 16 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4-r1.ebuild: - Changed xorg-x11 blocker for clarity. - -*mesa-6.4-r1 (14 Nov 2005) - - 14 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4.ebuild, - +mesa-6.4-r1.ebuild: - Install GLwDrawA.h, and if USE=motif, install GLwMDrawA.h. Reported by - Stefaan De Roeck <stefaan@gentoo.org>. - - 14 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; - -files/dont-install-gles-headers.patch, - -files/mesa-add-dri-asm-files.patch, -mesa-6.3.2-r1.ebuild: - Pull old version. - - 11 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> mesa-6.4.ebuild: - added ~sh keyword - - 01 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4.ebuild: - Change xorg-x11 blocker to allow for rc metabuilds. - -*mesa-6.4 (31 Oct 2005) - - 31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/6.4-dont-install-gles-headers.patch, +mesa-6.4.ebuild: - Bump. - - 30 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> - mesa-6.3.2-r1.ebuild: - Change xorg-x11 blocker to allow for metabuilds. - - 19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> mesa-6.3.2-r1.ebuild: - added ~mips keyword - - 12 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2-r1.ebuild: - Add runtime blocker for !<x11-base/xorg-x11-7. - - 12 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; - -files/lib/libOSMesa.la, -mesa-6.3.1.1-r3.ebuild, -mesa-6.3.2.ebuild: - Pull old ebuilds. Current versions aren't using libOSMesa.la either, so pull - that too. - -*mesa-6.3.2-r1 (20 Sep 2005) - - 20 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; - +mesa-6.3.2-r1.ebuild: - Mesa isn't making libGLU.so -> libGLU.so.# unversioned to versioned symlink. - This makes stuff trying to link against libGLU break. - - 09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml: - Add metadata. - - 06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; - mesa-6.3.1.1-r3.ebuild, mesa-6.3.2.ebuild: - Add missing 'set' argument to eselect. - - 06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild: - (#104367) Add xf86vidmodeproto and libICE to deps. - - 04 Sep 2005; Luca Barbato <lu_zero@gentoo.org> mesa-6.3.2.ebuild: - Marked ~ppc - - 03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> - mesa-6.3.1.1-r3.ebuild, mesa-6.3.2.ebuild: - Switching to use eselect over opengl-update. - - 22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild: - Split out an arch-specific variable DRI_DRIVERS_${ARCH} for defining which - drivers to build. Put it up at the top, to try separating data from code. - Perhaps doing something similar in pkg_setup(), but having if...elif and - just DRI_DRIVERS, would work reasonably, but it doesn't isolate the data as - well. - - 22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild: - Move EXTRA_LIB_PATH blanking out from within a sparc block, because it - should be used for everyone. Also move arch-specific section away from - generic sections. - -*mesa-6.3.2 (22 Aug 2005) - - 22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/mesa-add-dri-asm-files.patch, +mesa-6.3.2.ebuild: - Bump to latest devel release. The assembly files in DRI drivers didn't get - packaged, so add mesa-add-dri-asm-files.patch to patch them in. I think this - release will also fix 32/64 systems, if they also have the latest DRM. - - 22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - -files/fix-include-locations.patch, -files/fix-xthreads-location.patch, - -files/use-xthreads.patch, -mesa-6.3.1.1.ebuild, -mesa-6.3.1.1-r1.ebuild, - -mesa-6.3.1.1-r2.ebuild: - Pull old versions. - - 20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - mesa-6.3.1.1-r3.ebuild: - Stop installing glut headers to avoid conflicts with virtual/glut providers. - Reported by Andrej Kacian <ticho@gentoo.org>. - - 17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - mesa-6.3.1.1-r3.ebuild: - Add x11-proto/printproto to DEPEND on USE=motif. - - 16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - mesa-6.3.1.1-r3.ebuild: - libOSMesa isn't building anymore, so stop symlinking and installing libtool - archives. - -*mesa-6.3.1.1-r3 (16 Aug 2005) - - 16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +mesa-6.3.1.1-r3.ebuild: - Fix direct rendering on r200 by adding USING_EGL=0. Turning off EGL takes a - lot of work. - - 15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> mesa-6.3.1.1-r2.ebuild: - Fix multilib issue and add ~amd64 keyword. - - 15 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - mesa-6.3.1.1-r2.ebuild: - Install libGL.la to /usr/lib/opengl/xorg-x11/lib, where libGL.so really is, - instead of /usr/lib. This only seems necessary because of the LDPATH hack in - opengl-update. - -*mesa-6.3.1.1-r2 (14 Aug 2005) - - 14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/change-default-dri-driver-dir.patch, - +files/dont-install-gles-headers.patch, +mesa-6.3.1.1-r2.ebuild: - Stop building EGL things, because they aren't ready upstream. Also the EGL - demos rely on glut, which creates a circular dependency. Change the default - DRI driver directory to the one we actually use. This should be enough to - get direct rendering working. - -*mesa-6.3.1.1-r1 (12 Aug 2005) - - 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +mesa-6.3.1.1-r1.ebuild: - Bump to update to CVS head as of yesterday. - - 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Turn parallel build back off. Can get problems with depend files not existing. - - 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Test out parallel make. fmccor says it works. - - 12 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild: - 1. General cleanup for sparc, get rid of the ill-considered - IUSE=dri; - 2. Make sure to install the actual dri drivers as well as the - base libGL package. - - 11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; Manifest: - Fix manifest. - - 11 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild: - Following changes build a reunning libGL for sparc testing and set - a sane set of DRI drivers, depending on USE=dri flag: - 1. With dri, sparc assembly appears to be unusable. This is because - the build and directory structures have been changed so that the - actual initialization code moves to the dri drivers themselves - when sparc assembly is built. Correcting this is nontrivial, - because the glx build uses hard-defined source names and paths. - 2. With USE=dri, on sparc build only a subset of the full complement - of drivers. For now, DRI_DIRS = fb ffb mach64 mga radeon savage - 3. Without USE=dri, change the target to (generic) linux-sparc. In - this case, architecture is actually set by CFLAGS passed in to the - configure target, and both glx-capable and stand-alone versions - of libGL are built. - 4. For testing, and perhaps ultimately for performance, on sparc, unless - USE=dri, do not fix_opengl_symlinks - With these changes in place, - LD_LIBRARY_PATH=<path-to-libGL>:<path-to-libGLU> some-libGL-program - works fine. - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/fix-include-locations.patch, mesa-6.3.1.1.ebuild: - Add fix-include-locations.patch to standardize include locations to - <X11/extensions/foo.h> instead of some mixture of <foo.h> and "foo.h." - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/makedepend-location.patch, mesa-6.3.1.1.ebuild: - Add makedepend-location.patch to stop mesa from looking in /usr/X11R6/bin. - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Add dep on >=x11-proto/glproto-1.4-r1. - - 10 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild: - 1. Correct echo "$(...)" to echo "\$(...)"; - 2. When building for sparc, make sure that: - a. Use sparc assembly versions where appropriate; - b. Make sure sparc-specific sources are built; - c. For testing, don't actually build the dri drivers - because they are known not to work. - d. TODO: Figure out why two versions of libGL are built, - and why the install ends up linking to the incorrect - version (the one with the undefined externals). - - 10 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild: - Add ~sparc keyword (X modular testing). - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Add dep on >=opengl-update-2.2.2. - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Add fix_opengl_symlinks() from xorg-x11, to set up the libGL symlinks. - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: - Stop cleaning out /usr/lib/opengl/xorg-x11, now that two other packages also - install to it. - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-3.5.ebuild: - Drop old version. - -*mesa-6.3.1.1 (10 Aug 2005) - - 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; - +files/fix-xthreads-location.patch, +files/lib/libGL.la, - +files/lib/libGLU.la, +files/lib/libOSMesa.la, +files/use-xthreads.patch, - +mesa-6.3.1.1.ebuild: - Add for modular X. - - 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild: - Fix use invocation - - 24 Nov 2003; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild: - Add ~alpha - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*mesa-3.5 (22 Jul 2002) - - 22 Jul 2002; Seemant Kulleen <seemant@gentoo.org> mesa-3.5.ebuild - files/digest-mesa-3.5 : - - This was updated a while ago. I repoman'd it, and cleaned up spacing and - syntax a little. - -*mesa-3.4.2 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/media-libs/mesa/mesa-6.4.2-r2.ebuild b/media-libs/mesa/mesa-6.4.2-r2.ebuild index 8f486ce0e56c..9d67524e2f6f 100644 --- a/media-libs/mesa/mesa-6.4.2-r2.ebuild +++ b/media-libs/mesa/mesa-6.4.2-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.4 2006/04/03 01:15:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.5 2006/04/08 21:57:12 flameeyes Exp $ -inherit eutils toolchain-funcs multilib flag-o-matic +inherit eutils toolchain-funcs multilib flag-o-matic portability OPENGL_DIR="xorg-x11" @@ -253,6 +253,14 @@ src_install() { insinto /usr/$(get_libdir)/opengl/xorg-x11/lib doins ${FILESDIR}/lib/libGL.la + # On *BSD libcs dlopen() and similar functions are present directly in + # libc.so and does not require linking to libdl. portability eclass takes + # care of finding the needed library (if needed) witht the dlopen_lib + # function. + sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ + ${D}/usr/$(get_libdir)/libGLU.la \ + ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la + # Create the two-number versioned libs (.so.#.#), since only .so.# and # .so.#.#.# were made dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3 diff --git a/media-libs/mesa/mesa-6.5.ebuild b/media-libs/mesa/mesa-6.5.ebuild index 6e92ffba38c7..62df839bbdd9 100644 --- a/media-libs/mesa/mesa-6.5.ebuild +++ b/media-libs/mesa/mesa-6.5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.ebuild,v 1.4 2006/04/03 01:15:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.ebuild,v 1.5 2006/04/08 21:57:12 flameeyes Exp $ -inherit eutils toolchain-funcs multilib flag-o-matic +inherit eutils toolchain-funcs multilib flag-o-matic portability OPENGL_DIR="xorg-x11" @@ -247,6 +247,14 @@ src_install() { insinto /usr/$(get_libdir)/opengl/xorg-x11/lib doins ${FILESDIR}/lib/libGL.la + # On *BSD libcs dlopen() and similar functions are present directly in + # libc.so and does not require linking to libdl. portability eclass takes + # care of finding the needed library (if needed) witht the dlopen_lib + # function. + sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ + ${D}/usr/$(get_libdir)/libGLU.la \ + ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la + # Create the two-number versioned libs (.so.#.#), since only .so.# and # .so.#.#.# were made dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3 |