diff options
author | Emil Karlson <jekarlson@gmail.com> | 2014-03-26 07:40:49 +0200 |
---|---|---|
committer | Emil Karlson <jekarlson@gmail.com> | 2014-03-26 07:40:49 +0200 |
commit | 3e594905ea4fce9c4327dee6dbb7db16d23d0814 (patch) | |
tree | e0b542d232a68a3d86e07048cdf8851d0aa6c9b2 /x11-drivers | |
parent | x11-libs/libxkbcommon: Add new libxcb[xkb] dep. (diff) | |
download | x11-3e594905ea4fce9c4327dee6dbb7db16d23d0814.tar.gz x11-3e594905ea4fce9c4327dee6dbb7db16d23d0814.tar.bz2 x11-3e594905ea4fce9c4327dee6dbb7db16d23d0814.zip |
x11-drivers/ati-drivers: beta version bump
Diffstat (limited to 'x11-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/Manifest | 2 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild (renamed from x11-drivers/ati-drivers/ati-drivers-13.1.ebuild) | 140 |
2 files changed, 85 insertions, 57 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index b2d415c2..f9fa01bd 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -1,3 +1,4 @@ +DIST Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip 122838522 SHA256 6b98f4c18d1d08d3b6bd859aa576aba2d5733d43812c55d3135508b82d549961 SHA512 d6d4b99c3ea0e32b570f6598f4b51d9adfb2f1587a753100e63d32d22317c8c2b18344174bfc847ab604b1baccbe28c7d14fe96283681ecb68062ed99109ba00 WHIRLPOOL c45cc03a369ca4a6ee7ef34be5c9918ae8ad295d4197e7d095a8d3152fb5aa4f2d0620a5f06581fa8a51ccb1d413ea0a2786b4969036c47035ef49b709188527 DIST amd-catalyst-13.11-beta6-linux-x86.x86_64.zip 160487039 SHA256 f09ed24b6541e5bd91ff0f76d2c94dff50d671a1ebc71c99ef6847f904eb2b70 SHA512 b7261f411a08927f48b3c56151dc1590bfae8201ae7f3fbab1a041531006f45c543b1077d3ecbd983a65a9ec249172019db9160ec71018308ff49243a29000a4 WHIRLPOOL a7d1a6f53cd6d61dac3c4176d0e2bb2d373b79c8a351555158100aa995c1e9f15cc2fd82e5f727ff99244c2e15f83953455152c60066b50f220713e640b424f7 DIST amd-catalyst-13.11-betav1-linux-x86.x86_64.zip 122951918 SHA256 6597cf12dc50437c59b2517b45408013c15612952d759b15cef7e8498ccd290a SHA512 c31ba31d32db42041306da61275a51a1b9aa6556493cca338facfe84d5a80c8a744a33fbc93b31b65ff50e2367662e4c9a05610d7d848b9dfa8a38c964be4c4a WHIRLPOOL c7af5b350fa45179657a5949f4dd42b9c74a6855c51f2add6ec67404a37ad0463567e4b6961bc94a47c1858295fec4a8d66e55dee074a323436c553dc3bbde64 DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707 @@ -7,6 +8,5 @@ DIST amd-catalyst-14.1-betav1.3-linux-x86.x86_64.zip 122280358 SHA256 6125853475 DIST amd-catalyst-14.2-betav1.3-linux-x86.x86_64.zip 122287831 SHA256 b729fa327fbc030d9e73266997cbbba3186c6ba3f2d3059b9adf6bf9ab5d63cd SHA512 308881f34e58319cb6efd89ee1ff068ecb7058ddbb871b5543568151cd810ae08c49b94026bb81042edb526309b3f4144be3c92432a4e1421f100a905d95fc35 WHIRLPOOL 4c017cb01c281f2f0652e129e26a3c2fa7eb0846a2a194928d2c0a755806a4f14ee4746767d5408574903144ddd3bfbbb9e2b15f4e1bf8ccd86ca195b7f12bb2 DIST amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip 118103843 SHA256 3e1bd2ac2d2fcf7188c9e365f77b0c27fc71d788618ab9b2cbf86d0d48e8b63a SHA512 0af9a32528fb381cb1e39462ec6effaa7a6999c6f9bfdc30524e1ecbc2dbd5ce388bcf4f35b8a93225bb56a0bed536622183e78cb2c980a4a3916c30c5ab27c7 WHIRLPOOL 314c92e0d6a9ff5f4477ce38ae2b813cd09910d720fb40a21f0b4f193cd4a1ac210344050a9abb105494888e37097c9a2e8e1bbeafde7a21e6128daaad540319 DIST amd-driver-installer-catalyst-13.1-legacy-linux-x86.x86_64.zip 106908508 SHA256 3a992fb7564dba17a696217dc32043dabc21743c82116a6657817ee8a3a1d55f SHA512 96b34045dca3ad70156500b37d3f06008728ff81878a3e1432060d08e668d8cbd9bfe172440bcb818f01d731d39e3eeccc25396417993d2b9b8985b3b7dc7357 WHIRLPOOL f0e34ccb1a9dfe3cfd9e9c640c3d6ed97a4a3e892b65325a78045653b40d29a78427dc9092d8e14bee1a8ba603405ed9e8cd60188d5bc5e8c5eee03d66a8f25c -DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad SHA512 30763ab7f47ac22c5b5055495e2d8ae6cc2c8e5ce711fa389f1145a48da2799020c2b8cbf082759d93628017860c39d69337f42ce21b78e1d60c9eda32096df9 WHIRLPOOL ee5dc85a89bc56858ef1c2bcdc6cbfde7e2f9e5675d209c1f6db877e0104cc536f1e18139f0b991a064b14b231a982770eef47368ea281067d62647b4c5365a5 DIST amd-driver-installer-catalyst-13.2-beta7-linux-x86.x86_64.zip 122067629 SHA256 c718facfe236a2a2c17a04333666a561d451a62f83917b45b04a736d71e0282c SHA512 2c618a289892b3660c4c03432c52d50bf7c671b9e0f962eb4fb882b4dfa03c508d50c6ea506b058b45677375c1c5fba2058a8bff8631f408c84364e8163c5b72 WHIRLPOOL 4472b1c557bac30be8ce20419f268d26549610f7b620c1ddb52bd15f51919846b73098065d6c7724658b94ee9243bc7620440fbb3fe808839856e16f523f51df DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951 diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild index 138e3b0c..92b54d92 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild @@ -4,30 +4,27 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator +inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com" -MY_V=( $(get_version_components) ) -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-13.35.1005/amd-driver-installer-13.35.1005-x86.x86_64.run" SLOT="1" -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-linux-x86.x86_64.zip" -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-legacy-linux-x86.x86_64.zip" -fi +# Uses javascript for download YESSSS +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip" +DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz" SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs disable-watermark pax_kernel" +IUSE="debug +modules multilib qt4 static-libs pax_kernel" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist test" +RESTRICT="bindist test fetch" RDEPEND=" - <=x11-base/xorg-server-1.13.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -40,7 +37,16 @@ RDEPEND=" virtual/glu multilib? ( app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-xlibs + || ( + ( + x11-libs/libX11[abi_x86_32] + x11-libs/libXext[abi_x86_32] + x11-libs/libXinerama[abi_x86_32] + x11-libs/libXrandr[abi_x86_32] + x11-libs/libXrender[abi_x86_32] + ) + app-emulation/emul-linux-x86-xlibs + ) ) qt4? ( x11-libs/libICE @@ -104,6 +110,8 @@ QA_PRESTRIPPED=" usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 usr/lib\(32\|64\)\?/libaticaldd.so usr/lib\(32\|64\)\?/dri/fglrx_dri.so + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so " QA_SONAME=" @@ -144,33 +152,47 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP" -use amd64 && CONFIG_CHECK="${CONFIG_CHECK} COMPAT" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module for direct - rendering." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi +pkg_nofetch() { + einfo "The driver package" + einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "needs to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64" - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi } pkg_pretend() { + local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" + use amd64 && CONFIG_CHECK+=" COMPAT" + + local ERROR_MTRR="CONFIG_MTRR required for direct rendering." + local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct + rendering to work." + local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire + as GPL-only. This prevents ${P} from compiling with an error like this: + FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" + local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause + kernel to reject loading the fglrx module with + \"ERROR: could not insert 'fglrx': Exec format error.\" + You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." + local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." + # workaround until bug 365543 is solved if use modules; then linux-info_pkg_setup require_configured_kernel - _check_kernel_config + kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL" + check_extra_config + if ! linux_chkconfig_present AGP && \ + ! linux_chkconfig_present PCIEPORTBUS; then + ewarn "You don't have AGP and/or PCIe support enabled in the kernel" + ewarn "Direct rendering will not work." + fi + fi + + if ! has XT ${PAX_MARKINGS} && use pax_kernel; then + ewarn "You have disabled xattr pax markings for portage." + ewarn "This will likely cause programs using ati-drivers provided" + ewarn "libraries to be killed kernel." fi } @@ -229,12 +251,16 @@ src_unpack() { else RUN="${DISTDIR}/${DRIVERS_DISTFILE}" fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die + sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die fi mkdir xvba_sdk cd xvba_sdk unpack ${XVBA_SDK_DISTFILE} + + mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed" + cd "${WORKDIR}/extra" + tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz" } src_prepare() { @@ -275,16 +301,24 @@ src_prepare() { # first hunk applied upstream second (x32 related) was not epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - # compile fix for linux-3.7 - # https://bugs.gentoo.org/show_bug.cgi?id=438516 - epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch" - # compile fix for AGP-less kernel, bug #435322 epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - # Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8 - # see https://bugs.gentoo.org/show_bug.cgi?id=448216 - epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch" + # Compile fix for kernel typesafe uid types #469160 + epatch "${FILESDIR}/typesafe-kuid.diff" + + epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch" + + epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch" + + # Fix #483400 + epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" + + # Fix build on new kernels + #epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch" + + # Add support for linux-3.13. See #498766 + #epatch "${FILESDIR}/ati-drivers-linux-3.13-acpi-handle.patch" # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" @@ -304,22 +338,6 @@ src_prepare() { 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" - cd "${S}" - - mkdir extra || die "mkdir extra failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz - - # Get rid of watermark. Oldest known reference: - # http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark - if use disable-watermark; then - ebegin "Disabling watermark" - driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do - sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1 - done - eend $? || die "Disabling watermark failed" - fi } src_compile() { @@ -412,7 +430,7 @@ src_install() { insinto /etc/ati exeinto /etc/ati # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default} doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh # include. @@ -549,6 +567,10 @@ src_install-libs() { #install xvba sdk headers doheader xvba_sdk/include/amdxvba.h + + if use pax_kernel; then + pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" + fi } pkg_postinst() { @@ -578,6 +600,12 @@ pkg_postinst() { ewarn "try disabling sna for xf86-video-intel." ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" fi + + if use pax_kernel; then + ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and" + ewarn "after you have run \"eselect opengl set ati\". Executacle" + ewarn "revdep-pax is part of package sys-apps/elfix." + fi } pkg_preinst() { |