diff options
20 files changed, 834 insertions, 0 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest new file mode 100644 index 0000000..e765d8d --- /dev/null +++ b/x11-drivers/ati-drivers/Manifest @@ -0,0 +1,13 @@ +AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 +AUX 8.532/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6 +AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8 +AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01 +AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6 +AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 +AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289 +AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 +AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e +AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 +DIST ati-driver-installer-8-9-x86.x86_64.run 66269347 RMD160 895c2a10b66551ed0b5c250d7ae1aa8c06e010d4 SHA1 b4d6fdc10fe8ca11baad90214c9b4590ec07ee0d SHA256 59f33611d164cd80dcc820182f03e7d23188db93b6a2c949ef1e3e3765b7ae75 +EBUILD ati-drivers-8.532.ebuild 14584 RMD160 765c0a553e185ab2fb19d000dd614262bcee40fe SHA1 844a6ea248b7e06e27a1474ad1d36d249aba7895 SHA256 d1b08a6d3b7d87ba02df792fc43eacea90ddb415ccc886898fc622c90340882a diff --git a/x11-drivers/ati-drivers/ati-drivers-8.532.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.532.ebuild new file mode 100644 index 0000000..aba786f --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.532.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +IUSE="acpi debug" + +inherit eutils multilib linux-mod toolchain-funcs versionator + +DESCRIPTION="Ati precompiled drivers for recent chipsets" +HOMEPAGE="http://www.ati.com" +ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/" +SRC_URI="${ATI_URL}/ati-driver-installer-8-9-x86.x86_64.run" + +LICENSE="AMD GPL-2 QPL-1.0 as-is" +KEYWORDS="~amd64 ~x86" + +# The portage dep is for COLON_SEPARATED support in env-update. +# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update. +RDEPEND="x11-base/xorg-server + !x11-apps/ati-drivers-extra + >=app-admin/eselect-1.0.9 + app-admin/eselect-opengl + amd64? ( app-emulation/emul-linux-x86-xlibs ) + acpi? ( + x11-apps/xauth + sys-power/acpid + ) + x11-libs/libXrandr + >=sys-apps/portage-2.1.1-r1" + +DEPEND="${RDEPEND} + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/inputproto" + +EMULTILIB_PKG="true" + +QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so + usr/lib/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" +QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so + usr/lib32/dri/fglrx_dri.so + usr/lib64/opengl/ati/lib/libGL.so.1.2 + usr/lib32/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" +QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so + usr/lib/xorg/modules/drivers/fglrx_drv.so + usr/lib/opengl/ati/lib/libGL.so.1.2 + usr/lib/xorg/modules/glesx.so + usr/lib/xorg/modules/amdxmm.so" +QA_TEXTRELS_amd64=" + usr/lib64/opengl/ati/lib/libGL.so.1.2 + usr/lib32/opengl/ati/lib/libGL.so.1.2 + usr/lib64/dri/fglrx_dri.so + usr/lib32/dri/fglrx_dri.so + usr/lib32/xorg/modules/glesx.so + usr/lib64/xorg/modules/glesx.so" + +S="${WORKDIR}" + +pkg_setup() { + + # Define module dir. + MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" + + #check kernel and sets up KV_OBJ + MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)" + BUILD_TARGETS="kmod_build" + linux-mod_pkg_setup + BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" + + if ! kernel_is 2 6; then + eerror "Need a 2.6 kernel to compile against!" + die "Need a 2.6 kernel to compile against!" + fi + + if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then + die "${P} is not compatible with RCU Preemption (bug #223281), please disable it" + fi + + if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then + eerror "${P} requires support for pci_find_slot." + die "${P} requires support for pci_find_slot." + fi + + if ! linux_chkconfig_present MTRR; then + ewarn "You don't have MTRR support enabled, the direct rendering will not work." + fi + + if linux_chkconfig_builtin DRM; then + ewarn "You have DRM support enabled builtin, the direct rendering will not work." + fi + + if ! linux_chkconfig_present AGP && \ + ! linux_chkconfig_present PCIEPORTBUS; then + ewarn "You need AGP and/or PCI Express support for direct rendering to work." + fi + + if linux_chkconfig_present PARAVIRT; then + eerror "The current ati-drivers don't compile when having" + eerror "paravirtualization active due to GPL symbol export" + eerror "restrictions." + eerror "Please disable it:" + eerror " CONFIG_PARAVIRT=n" + eerror "in /usr/src/linux/.config or" + eerror " Processor type and features -->" + eerror " [ ] Paravirtualization support (EXPERIMENTAL)" + eerror "in 'menuconfig'" + die "CONFIG_PARAVIRT enabled" + fi + + # Only support xorg-server >=1.1 + BASE_DIR="${S}/x710" + + # This is used like $(get_libdir) for paths in ati's package. + if use amd64 ; then + BASE_DIR="${BASE_DIR}_64a" + PKG_LIBDIR=lib64 + ARCH_DIR="${S}/arch/x86_64" + else + PKG_LIBDIR=lib + ARCH_DIR="${S}/arch/x86" + fi +} + +src_unpack() { + #Switching to a standard way to extract the files since otherwise no signature file + #would be created + local src="${DISTDIR}/${A}" + sh "${src}" --extract "${S}" 2&>1 /dev/null + + # These are the userspace utilities that we also have source for. + # We rebuild these later. + rm \ + "${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \ + "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ + || die "bin rm failed" + + if use debug; then + # Enable debug mode in the Source Code. + sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ + "${MODULE_DIR}/firegl_public.c" \ + || die "Failed to enable debug output." + fi + + if use acpi; then + sed -i \ + -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ + -e "s:/var/lib/gdm/:/var/gdm/:" \ + "${S}/common/etc/ati/authatieventsd.sh" \ + || die "sed failed." + + # Since "who" is in coreutils, we're using that one instead of "finger". + sed -i -e 's:finger:who:' \ + "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ + || die "Replacing 'finger' with 'who' failed." + # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and + # add funktion to detect default state. + epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch + fi + + pushd ${MODULE_DIR} >/dev/null + ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ + || die "symlinking precompiled core failed" + + convert_to_m 2.6.x/Makefile || die "convert_to_m failed" + + # When built with ati's make.sh it defines a bunch of macros if + # certain .config values are set, falling back to less reliable + # detection methods if linux/autoconf.h is not available. We + # simply use the linux/autoconf.h settings directly, bypassing the + # detection script. + sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" + sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ + || die "MODVERSIONS sed failed" + popd >/dev/null + + mkdir extra || die "mkdir failed" + cd extra + unpack ./../common/usr/src/ati/fglrx_sample_source.tgz + sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \ + lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed" + # Add a category. + mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed" + cd .. +} + +src_compile() { + linux-mod_src_compile + + einfo "Building fgl_glxgears" + cd "${S}"/extra/fgl_glxgears + # These extra libs/utils either have an Imakefile that does not + # work very well without tweaking or a Makefile ignoring CFLAGS + # and the like. We bypass those. + + # The -DUSE_GLU is needed to compile using nvidia headers + # according to a comment in ati-drivers-extra-8.33.6.ebuild. + "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ + -I"${S}"/common/usr/include fgl_glxgears.c \ + -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" + + einfo "Building fglrx_gamma lib" + cd "${S}"/extra/lib/fglrx_gamma + "$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \ + -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \ + -lXext || die "fglrx_gamma lib build failed" + ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed" + ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed" + + einfo "Building fglrx_gamma util" + cd "${S}"/extra/programs/fglrx_gamma + "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \ + -I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \ + fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \ + || die "fglrx_gamma util build failed" + +} + +src_install() { + linux-mod_src_install + + # We can do two things here, and neither of them is very nice. + + # For direct rendering libGL has to be able to load one or more + # dri modules (files ending in _dri.so, like fglrx_dri.so). + # Gentoo's mesa looks for these files in the location specified by + # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded + # location /usr/$(get_libdir)/dri. Ati's libGL does the same + # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri + # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 + # 64bit. So we can either put the .so files in that (unusual, + # compared to "normal" mesa libGL) location or set + # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug + # 101539. + + # The problem with this approach is that LIBGL_DRIVERS_PATH + # *overrides* the default hardcoded location, it does not extend + # it. So if ati-drivers is merged but a non-ati libGL is selected + # and its hardcoded path does not match our LIBGL_DRIVERS_PATH + # (because it changed in a newer mesa or because it was compiled + # for a different set of multilib abis than we are) stuff breaks. + + # We create one file per ABI to work with "native" multilib, see + # below. + + echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" + doenvd "${T}/03ati-colon-sep" + + # All libraries that we have a 32 bit and 64 bit version of on + # amd64 are installed in src_install-libs. Everything else + # (including libraries only available in native 64bit on amd64) + # goes in here. + + # There used to be some code here that tried to detect running + # under a "native multilib" portage ((precursor of) + # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it + # should just work (only doing some duplicate work). --marienz + if has_multilib_profile; then + local OABI=${ABI} + for ABI in $(get_install_abis); do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + # This is sorted by the order the files occur in the source tree. + + # X modules. + exeinto /usr/$(get_libdir)/xorg/modules/drivers + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so + exeinto /usr/$(get_libdir)/xorg/modules/linux + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so + exeinto /usr/$(get_libdir)/xorg/modules + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so} + + # Arch-specific files. + # (s)bin. + into /opt + if use acpi; then + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd + fi + # We cleaned out the compilable stuff in src_unpack + dobin "${ARCH_DIR}"/usr/X11R6/bin/* + + # lib. + exeinto /usr/$(get_libdir) + # Everything except for the libGL.so installed in src_install-libs. + doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ + -maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*') + insinto /usr/$(get_libdir) + doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ + -maxdepth 1 -type f -not -name '*.so*') + + # Common files. + # etc. + insinto /etc/ati + # Everything except for the authatieventsd.sh script. + doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + if use acpi; then + doins common/etc/ati/authatieventsd.sh + fi + + # include. + insinto /usr + doins -r common/usr/include + insinto /usr/include/X11/extensions + doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h + + # Just the atigetsysteminfo.sh script. + into /usr + dosbin common/usr/sbin/* + + # data files for the control panel. + insinto /usr/share + doins -r common/usr/share/ati + insinto /usr/share/pixmaps + doins common/usr/share/icons/ccc_{large,small}.xpm + make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ + ccc_large System + + # doc. + dohtml -r common/usr/share/doc/fglrx + + if use acpi; then + doman common/usr/share/man/man8/atieventsd.8 + + pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null + + exeinto /etc/acpi + doexe ati-powermode.sh + insinto /etc/acpi/events + doins events/* + + popd >/dev/null + fi + + # Done with the "source" tree. Install tools we rebuilt: + dobin extra/fgl_glxgears/fgl_glxgears + newdoc extra/fgl_glxgears/README README.fgl_glxgears + + dolib extra/lib/fglrx_gamma/*so* + newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma + + dobin extra/programs/fglrx_gamma/fglrx_xgamma + doman extra/programs/fglrx_gamma/fglrx_xgamma.1 + newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma + + # Gentoo-specific stuff: + if use acpi; then + newinitd "${FILESDIR}"/atieventsd.init atieventsd \ + || die "Failed to install atieventsd.init.d" + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf + newconfd "${T}"/atieventsd.conf atieventsd + fi +} + +src_install-libs() { + if [[ "${ABI}" == "amd64" ]]; then + local pkglibdir=lib64 + local MY_ARCH_DIR="${S}/arch/x86_64" + else + local pkglibdir=lib + local MY_ARCH_DIR="${S}/arch/x86" + fi + einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" + + local ATI_ROOT=/usr/$(get_libdir)/opengl/ati + # To make sure we do not miss a spot when these change. + local libmajor=1 libminor=2 + local libver=${libmajor}.${libminor} + + # The GLX libraries + # (yes, this really is "lib" even on amd64/multilib --marienz) + exeinto ${ATI_ROOT}/lib + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so + + # Same as the xorg implementation (eselect opengl does not fall + # back to xorg-x11 if we omit this symlink, meaning no glx). + dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions + + # DRI modules, installed into the path used by recent versions of mesa. + exeinto /usr/$(get_libdir)/dri + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so + + # Make up a libGL.la. Ati does not provide one, but mesa does. If + # a (libtool-based) libfoo is built with libGL.la present a + # reference to it is put into libfoo.la, and compiling + # (libtool-based) things that link too libfoo.la will complain if + # libGL.la disappears. So if we do not make up a libGL.la + # switching between mesa and ati becomes painful. + local revision=$(printf '%d%02d%02d' $(get_version_components)) + sed -e "s:\${libmajor}:${libmajor}:g" \ + -e "s:\${libminor}:${libminor}:g" \ + -e "s:\${libdir}:$(get_libdir):g" \ + -e "s:\${revision}:${revision}:g" \ + "${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \ + || die "sed failed to make libGL.la" + + local envname="${T}"/04ati-dri-path + if [[ -n ${ABI} ]]; then + envname="${envname}-${ABI}" + fi + echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" + doenvd "${envname}" +} + +pkg_postinst() { + /usr/bin/eselect opengl set --use-old ati + + elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" + elog "To change your xorg.conf you can use the bundled \"aticonfig\"" + elog + elog "If you experience unexplained segmentation faults and kernel crashes" + elog "with this driver and multi-threaded applications such as wine," + elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." + elog + elog "You will have to source /etc/profile (or logout and back in) for dri" + elog "to work, unless you previously had ati-drivers installed." + + # Workaroud screen corruption + ewarn "If you experience screen corruption with this driver, try putting" + ewarn ' Option "XAANoOffscreenPixmaps" "true"' + ewarn "in the Device Section of /etc/X11/xorg.conf." + + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm + /usr/bin/eselect opengl set --use-old xorg-x11 +} diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati new file mode 100644 index 0000000..27180e0 --- /dev/null +++ b/x11-drivers/ati-drivers/files/09ati @@ -0,0 +1,3 @@ +PATH=/opt/ati/bin +ROOTPATH=/opt/ati/bin:/opt/ati/sbin +MANPATH=/opt/ati/man diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Entries b/x11-drivers/ati-drivers/files/8.532/CVS/Entries new file mode 100644 index 0000000..79dd080 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.532/CVS/Entries @@ -0,0 +1,2 @@ +/ati-powermode-opt-path-2.patch/1.1/Sat Apr 26 10:50:46 2008// +D diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Repository b/x11-drivers/ati-drivers/files/8.532/CVS/Repository new file mode 100644 index 0000000..2360779 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.532/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/x11-drivers/ati-drivers/files/8.476 diff --git a/x11-drivers/ati-drivers/files/8.532/CVS/Root b/x11-drivers/ati-drivers/files/8.532/CVS/Root new file mode 100644 index 0000000..8e31e07 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.532/CVS/Root @@ -0,0 +1 @@ +je_fro@cvs.gentoo.org:/var/cvsroot diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/CVS/Entries b/x11-drivers/ati-drivers/files/CVS/Entries new file mode 100644 index 0000000..a6d5a28 --- /dev/null +++ b/x11-drivers/ati-drivers/files/CVS/Entries @@ -0,0 +1,11 @@ +/09ati/1.2/Thu Jul 6 13:04:05 2006// +/ati-drivers-2.6.19.patch/1.1/Sun Dec 3 15:51:37 2006// +/ati-drivers-2.6.20.patch/1.1/Mon Feb 5 10:01:57 2007// +/ati-drivers-8.35.5-2.6.19.patch/1.1/Fri Mar 30 15:46:11 2007// +/ati-drivers-8.35.5-2.6.20.patch/1.2/Fri Mar 30 15:46:11 2007// +/ati-powermode-opt-path.patch/1.1/Sat Feb 10 00:01:13 2007// +/ati-powermode.sh.patch/1.1/Fri Aug 4 12:20:19 2006// +/atieventsd.init/1.3/Fri May 18 23:58:01 2007// +/atieventsd.rc6/1.2/Fri Aug 4 12:20:19 2006// +/libGL.la.in/1.1/Tue Jun 5 18:49:04 2007// +D diff --git a/x11-drivers/ati-drivers/files/CVS/Entries.Log b/x11-drivers/ati-drivers/files/CVS/Entries.Log new file mode 100644 index 0000000..fa2699a --- /dev/null +++ b/x11-drivers/ati-drivers/files/CVS/Entries.Log @@ -0,0 +1,10 @@ +A D/8.37.6//// +A D/8.40.4//// +A D/8.42.3//// +A D/8.433//// +A D/8.443.1//// +A D/8.452//// +A D/8.455.2//// +A D/8.471.3//// +A D/8.476//// +R D/8.42.3//// diff --git a/x11-drivers/ati-drivers/files/CVS/Repository b/x11-drivers/ati-drivers/files/CVS/Repository new file mode 100644 index 0000000..12184ee --- /dev/null +++ b/x11-drivers/ati-drivers/files/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/x11-drivers/ati-drivers/files diff --git a/x11-drivers/ati-drivers/files/CVS/Root b/x11-drivers/ati-drivers/files/CVS/Root new file mode 100644 index 0000000..8e31e07 --- /dev/null +++ b/x11-drivers/ati-drivers/files/CVS/Root @@ -0,0 +1 @@ +je_fro@cvs.gentoo.org:/var/cvsroot diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch new file mode 100644 index 0000000..160565a --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch @@ -0,0 +1,67 @@ +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c 2006-10-27 09:44:23.902749464 -0500 +@@ -61,7 +61,6 @@ + #include <linux/modversions.h> + #endif + #endif +-#include <linux/config.h> + #include <linux/module.h> + #include <linux/pci.h> + #include <linux/init.h> +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-10-27 09:44:34.265174136 -0500 +@@ -99,9 +99,6 @@ + #endif + #endif + +-#include <linux/config.h> +- +- + #include <linux/module.h> + #include <linux/types.h> + #include <linux/kernel.h> +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h 2006-10-27 09:44:52.502401656 -0500 +@@ -38,7 +38,6 @@ + #define _DRM_H_ + + #if defined(__linux__) +-#include <linux/config.h> + #include <asm/ioctl.h> /* For _IO* macros */ + #define DRM_IOCTL_NR(n) _IOC_NR(n) + #define DRM_IOC_VOID _IOC_NONE +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h 2006-10-27 09:45:03.912667032 -0500 +@@ -42,7 +42,6 @@ + * can build the DRM (part of PI DRI). 4/21/2000 S + B */ + #include <asm/current.h> + #endif /* __alpha__ */ +-#include <linux/config.h> + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/miscdevice.h> +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-10-27 09:45:47.463046368 -0500 +@@ -67,9 +67,6 @@ + * for example for CPU hot-plugging. I wonder why a desktop + * distribution would even include such a kernel patch. */ + #ifdef CONFIG_MEM_MIRROR +-/* Prevent linux/config.h from being included again in subsequent +- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ +-#include <linux/config.h> + #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules." + #warning "This will break page tracking when the fglrx kernel module is used." + #undef CONFIG_MEM_MIRROR +@@ -86,7 +83,6 @@ + #include <asm/unistd.h> /* for installing the patch wrapper */ + #include <linux/module.h> + +-#include <linux/config.h> + #include <linux/kernel.h> + #include <linux/fs.h> + #include <linux/proc_fs.h> diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch new file mode 100644 index 0000000..aeaba71 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch @@ -0,0 +1,73 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 10:58:15.000000000 -0500 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 11:14:04.000000000 -0500 +@@ -181,6 +181,70 @@ + int errno; + #endif // __ia64__ + ++#if defined(__i386__) ++#define __syscall_return(type, res) \ ++do { \ ++ if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \ ++ errno = -(res); \ ++ res = -1; \ ++ } \ ++ return (type) (res); \ ++} while (0) ++#define _syscall2(type,name,type1,arg1,type2,arg2) \ ++type name(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \ ++ : "memory"); \ ++__syscall_return(type,__res); \ ++} ++ ++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ ++type name(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \ ++ "d" ((long)(arg3)) : "memory"); \ ++__syscall_return(type,__res); \ ++} ++#elif defined(__x86_64__) ++#define __syscall_clobber "r11","rcx","memory" ++#define __syscall "syscall" ++ ++#define __syscall_return(type, res) \ ++do { \ ++ if ((unsigned long)(res) >= (unsigned long)(-127)) { \ ++ errno = -(res); \ ++ res = -1; \ ++ } \ ++ return (type) (res); \ ++} while (0) ++#define _syscall2(type,name,type1,arg1,type2,arg2) \ ++type name(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++__asm__ volatile (__syscall \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ ++__syscall_return(type,__res); \ ++} ++ ++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ ++type name(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++__asm__ volatile (__syscall \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \ ++ "d" ((long)(arg3)) : __syscall_clobber); \ ++__syscall_return(type,__res); \ ++} ++#endif ++ + // int mlock(const void *addr, size_t len); + _syscall2(int, mlock, const void *, addr, size_t, len ) + // int munlock(const void *addr, size_t len); diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch new file mode 100644 index 0000000..665d8d6 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch @@ -0,0 +1,33 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -5055,7 +5057,6 @@ + */ + unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) + { +- unsigned int ret = 0; + kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; + + DBG_ENTER("0x%08X", hSlabCache); +@@ -5069,18 +5070,11 @@ + + DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); + +- if (kmem_cache_destroy(slabcache_obj->cache) == 0) +- { +- ret = 1; +- slabcache_obj->cache = NULL; +- } +- else +- { +- DBG_ERROR("destroying failed"); +- } ++ kmem_cache_destroy(slabcache_obj->cache); ++ slabcache_obj->cache = NULL; + +- DBG_LEAVE("%d", ret); +- return ret; ++ DBG_LEAVE("1"); ++ return 1; + } + + /** \brief Allocate an entry in a Slab Cache diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch new file mode 100644 index 0000000..c830d38 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch @@ -0,0 +1,11 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -171,6 +171,8 @@ + #endif + #endif + ++#include <linux/freezer.h> ++ + #include <linux/kmod.h> + + // To enable DBG_* macros set this variable to nonzero diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch new file mode 100644 index 0000000..fb6119e --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch @@ -0,0 +1,22 @@ +=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh' +--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:25:40 +0000 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:28:54 +0000 +@@ -46,7 +46,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +56,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now" + fi + done + fi + diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch new file mode 100644 index 0000000..cd776e0 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch @@ -0,0 +1,32 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -17,6 +17,10 @@ + fi + } + ++aticonfig='/opt/ati/bin/aticonfig' ++ ++# default high power state ++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` + + grep -q closed /proc/acpi/button/lid/*/state + if [ $? = 0 ]; then +@@ -46,7 +50,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +60,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" + fi + done + fi diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init new file mode 100644 index 0000000..73139ce --- /dev/null +++ b/x11-drivers/ati-drivers/files/atieventsd.init @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $ + +depend() { + need acpid +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd + eend $? +}
\ No newline at end of file diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6 new file mode 100644 index 0000000..2180e0e --- /dev/null +++ b/x11-drivers/ati-drivers/files/atieventsd.rc6 @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $ + +depend() { + need acpid +} + +start() { + start-stop-daemon --start --pidfile /var/run/atieventsd.pid \ + --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS} + local pid=`pidof atieventsd` + echo $pid > /var/run/atieventsd.pid + eend $? +} + +stop() { + start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid + eend $? +} + diff --git a/x11-drivers/ati-drivers/files/libGL.la.in b/x11-drivers/ati-drivers/files/libGL.la.in new file mode 100644 index 0000000..7fdc409 --- /dev/null +++ b/x11-drivers/ati-drivers/files/libGL.la.in @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.${libmajor}.${libminor} libGL.so.${libmajor} libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-L/usr/${libdir} -lX11 -lXext -ldl' + +# Version information for libGL. +current=1 +age=0 +revision=${revision} + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/${libdir}' |