From 0adb274da4e1049cfed349df1b94fa362eff400e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 23 Jan 2005 21:15:23 +0000 Subject: libGL.la fix Package-Manager: portage-2.0.51-r14 --- media-video/ati-drivers/ChangeLog | 10 +- media-video/ati-drivers/Manifest | 44 +++-- .../ati-drivers/ati-drivers-8.8.25-r2.ebuild | 211 +++++++++++++++++++++ .../ati-drivers/files/digest-ati-drivers-8.8.25-r2 | 2 + 4 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 media-video/ati-drivers/ati-drivers-8.8.25-r2.ebuild create mode 100644 media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r2 (limited to 'media-video') diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog index 4512457fd6b8..6b560718cf8c 100644 --- a/media-video/ati-drivers/ChangeLog +++ b/media-video/ati-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ati-drivers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.65 2005/01/22 02:08:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.66 2005/01/23 21:15:23 lu_zero Exp $ + +*ati-drivers-8.8.25-r2 (23 Jan 2005) + + 23 Jan 2005; Luca Barbato + +ati-drivers-8.8.25-r2.ebuild: + Fixed the libGL.la, solves bug #78937 21 Jan 2005; Luca Barbato ati-drivers-8.8.25-r1.ebuild: @@ -13,7 +19,7 @@ Multilib cleanups. 19 Jan 2005; Luca Barbato ati-drivers-8.8.25.ebuild: - typo in the multilib support section, fixed thanks Robert Führicht + typo in the multilib support section, fixed thanks Robert Führicht 19 Jan 2005; Luca Barbato ati-drivers-8.8.25.ebuild: diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest index e5cf7d3b93b3..69f834182a33 100644 --- a/media-video/ati-drivers/Manifest +++ b/media-video/ati-drivers/Manifest @@ -1,31 +1,33 @@ -MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860 -MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523 -MD5 288875c3b198a3ec0d786dbc63505f8b ChangeLog 11370 -MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219 -MD5 0a031af3f7ec144c8aa1cf057b4f75bd ati-drivers-8.8.25-r1.ebuild 5423 MD5 cccfe3c64bc7c3dd72443f478e49a123 ati-drivers-8.8.25.ebuild 5062 -MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123 +MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219 +MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860 MD5 375a467b7a4e36edf6514421f8f64694 ati-drivers-3.11.1.ebuild 4772 -MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346 +MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123 +MD5 f89b079629a5378bcbe5dde71a08fdde ati-drivers-8.8.25-r2.ebuild 5461 MD5 d73ae47566be08fd04b3c11deba4261c ati-drivers-3.9.0-r1.ebuild 4511 -MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25 154 +MD5 f9706de703fc3bff160711784fd08303 ChangeLog 11533 +MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346 +MD5 0a031af3f7ec144c8aa1cf057b4f75bd ati-drivers-8.8.25-r1.ebuild 5423 +MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523 +MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468 +MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466 +MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-3.11.1 73 -MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172 -MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309 +MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561 +MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-3.14.6 73 +MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r2 154 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0-r1 72 +MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125 +MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-3.12.0 73 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39 MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r1 154 -MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73 -MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096 MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492 -MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-3.12.0 73 -MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466 -MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125 -MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-3.14.6 73 -MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561 -MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468 MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370 -MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571 -MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72 -MD5 8dfc593069132b05be220d12a24697b4 files/fglrx-3.9.0-allocation.patch 946 MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847 +MD5 8dfc593069132b05be220d12a24697b4 files/fglrx-3.9.0-allocation.patch 946 +MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172 +MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096 +MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72 +MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25 154 +MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309 +MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571 diff --git a/media-video/ati-drivers/ati-drivers-8.8.25-r2.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25-r2.ebuild new file mode 100644 index 000000000000..63c5bb91e0f7 --- /dev/null +++ b/media-video/ati-drivers/ati-drivers-8.8.25-r2.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25-r2.ebuild,v 1.1 2005/01/23 21:15:23 lu_zero Exp $ + +IUSE="" + +inherit eutils rpm multilib linux-info linux-mod + +DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" +HOMEPAGE="http://www.ati.com" +SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) + amd64? ( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" + +LICENSE="ATI" +KEYWORDS="-* ~x86 ~amd64" + +RDEPEND=">=x11-base/xorg-x11-6.8.0" + +DEPEND=">=virtual/linux-sources-2.4 + ${RDEPEND}" + +PROVIDE="virtual/opengl" + +ATIBIN="${D}/opt/ati/bin" +RESTRICT="nostrip multilib-pkg-force" + +pkg_setup(){ + #check kernel and sets up KV_OBJ + linux-mod_pkg_setup + # Set up X11 implementation + X11_IMPLEM_P="$(best_version virtual/x11)" + X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" + X11_IMPLEM="${X11_IMPLEM##*\/}" + einfo "X11 implementation is ${X11_IMPLEM}." +} + +src_unpack() { + local OLDBIN="/usr/X11R6/bin" + + cd ${WORKDIR} + rpm_src_unpack + + cd ${WORKDIR}/lib/modules/fglrx/build_mod + + #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch + + if kernel_is 2 6 + then + #epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch + epatch ${FILESDIR}/8.08-kernel-2.6.10.patch + fi + + rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears +} + +src_compile() { + einfo "Building the DRM module..." + cd ${WORKDIR}/lib/modules/fglrx/build_mod + if kernel_is 2 6 + then + set_arch_to_kernel + addwrite "/usr/src/${FK}" + cp 2.6.x/Makefile . + export _POSIX2_VERSION="199209" + if use_m ; + then + make -C ${KV_DIR} M="`pwd`" modules || \ + ewarn "DRM module not built" + else + make -C ${KV_DIR} SUBDIRS="`pwd`" modules || \ + ewarn "DRM module not built" + fi + set_arch_to_portage + else + export _POSIX2_VERSION="199209" + # That is the dirty way to avoid the id -u check + sed -e 's:`id -u`:0:' \ + -e 's:`uname -r`:${KV_FULL}:' \ + -i make.sh + chmod +x make.sh + ./make.sh || die "DRM module not built" + fi +} + +pkg_preinst() { + # Clean the dinamic libGL stuff's home to ensure + # we don't have stale libs floating around ... + if [ -d "${ROOT}/usr/lib/opengl/ati" ] + then + rm -rf ${ROOT}/usr/lib/opengl/ati/* + fi +} + +src_install() { + local ATI_ROOT="/usr/lib/opengl/ati" + + cd ${WORKDIR} + + # DRM module + insinto /lib/modules/${KV_FULL}/video + # set_kvobj + doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} + + local native_dir + use x86 && native_dir="lib" + use amd64 && native_dir="lib64" + + # Install the libs + if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then + local OABI=${ABI} + for ABI in $(get_abi_order); do + src_install-libs + done + ABI=${OABI} + unset OABI + elif has_multilib_profile; then + src_install-libs + elif use amd64; then + src_install-libs lib $(get_multilibdir) + src_install-libs lib64 $(get_libdir) + else + src_install-libs + fi &> /dev/null + + #apps + insinto /etc/env.d + doins ${FILESDIR}/09ati + exeinto /opt/ati/bin + doexe usr/X11R6/bin/* + + #ati custom stuff + cp -a ${WORKDIR}/usr/include ${D}/usr/include + insinto /usr/X11R6/include/X11/extensions + doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h +} + +src_install-libs() { + local pkglibdir=lib + local inslibdir=$(get_libdir) + + if [ ${#} -eq 2 ]; then + pkglibdir=${1} + inslibdir=${2} + elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then + pkglibdir=lib64 + fi + + einfo "${pkglibdir} -> ${inslibdir}" + + local ATI_ROOT="/usr/${inslibdir}/opengl/ati" + + # The GLX libraries + exeinto ${ATI_ROOT}/lib + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 + dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 + dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so + dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so + + # same as the xorg implementation + dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions + #Workaround + sed -e "s:libdir=.*:libdir=/usr/${inslibdir}:" \ + /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ + > $D/${ATI_ROOT}/lib/libGL.la + dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include + + # X and DRI driver + if has_version ">=x11-base/xorg-x11-6.8.0-r4" + then + local X11_DIR="/usr/" + else + local X11_DIR="/usr/X11R6/" + fi + + local X11_LIB_DIR="${X11_DIR}${inslibdir}" + + exeinto ${X11_LIB_DIR}/modules/drivers + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o + exeinto ${X11_LIB_DIR}/modules/dri + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so + exeinto ${X11_LIB_DIR}/modules/linux + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a + cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ + ${D}/${X11_LIB_DIR} + + exeinto ${X11_LIB_DIR}/modules/dri + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so +} + + +pkg_postinst() { +# Ebuild shouldn't do this automatically, just tell the user to do it, +# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) +# if [ "${ROOT}" = "/" ] +# then +# /usr/sbin/opengl-update ati +# fi + + echo + einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" + einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" + echo + ewarn "***" + ewarn "If you are experiencing problems with memory allocation try to add" + ewarn "this line to in your X11 configuration file:" + ewarn " Option \"KernelModuleParm\" \"agplock=0\" " + ewarn "That should solve the hangups you could have with Neverwinter Nights" + ewarn "***" + # DRM module + update-modules +} diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r2 b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r2 new file mode 100644 index 000000000000..6cee20b67110 --- /dev/null +++ b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r2 @@ -0,0 +1,2 @@ +MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683 +MD5 4967e36a1bdf275a37251605b6a2356c fglrx64_6_8_0-8.8.25-1.x86_64.rpm 7275330 -- cgit v1.2.3-65-gdbad