From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 51A86138A1A for ; Tue, 6 Jan 2015 12:46:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7704EE0841; Tue, 6 Jan 2015 12:46:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05238E0841 for ; Tue, 6 Jan 2015 12:46:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93F753406D9 for ; Tue, 6 Jan 2015 12:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D7C9EFCC for ; Tue, 6 Jan 2015 12:46:40 +0000 (UTC) From: "Emil Karlson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Emil Karlson" Message-ID: <1420548067.9868cd5bfacf40afbdcfa216d6a83144536b5dcb.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: 9868cd5bfacf40afbdcfa216d6a83144536b5dcb X-VCS-Branch: master Date: Tue, 6 Jan 2015 12:46:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 986dd644-a241-4b57-9a77-a622e9b65c34 X-Archives-Hash: c702a4039914b19e008fdfc215229155 commit: 9868cd5bfacf40afbdcfa216d6a83144536b5dcb Author: Emil Karlson gmail com> AuthorDate: Tue Jan 6 12:41:07 2015 +0000 Commit: Emil Karlson gmail com> CommitDate: Tue Jan 6 12:41:07 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9868cd5b x11-drivers/ati-drivers: misc fixes sync portage multilib fixes by Michał Górny 534710, thanks to Marek gmail.com> 534398, thanks to Dani Church gmail.com> --- ....4_p1-r1.ebuild => ati-drivers-14.12-r3.ebuild} | 39 +++++++++++++--------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild similarity index 95% rename from x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild index f6cb383..2b31c43 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 +MULTILIB_COMPAT=( abi_x86_{32,64} ) inherit eutils multilib-build 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" -RUN="${WORKDIR}/fglrx-14.10.1006.1001/amd-driver-installer-14.10.1006.1001-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run" SLOT="1" # Uses javascript for download YESSSS #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip" -DRIVERS_URI="mirror://gentoo/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip" +DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.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/" @@ -24,7 +25,7 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="bindist test fetch" RDEPEND=" - <=x11-base/xorg-server-1.15.49[-minimal] + <=x11-base/xorg-server-1.16.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -35,6 +36,7 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender virtual/glu + !x11-libs/xvba-video abi_x86_32? ( || ( virtual/glu[abi_x86_32] @@ -123,6 +125,7 @@ QA_SONAME=" usr/lib\(32\|64\)\?/libaticaldd.so usr/lib\(32\|64\)\?/libaticalrt.so usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so + usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so " QA_DT_HASH=" @@ -204,7 +207,7 @@ pkg_setup() { MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/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}" + BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}" BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" @@ -307,17 +310,20 @@ src_prepare() { # compile fix for AGP-less kernel, bug #435322 epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.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" # Fix #483400 epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" + # Fix #524658 + epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch" + # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" + # Compile fix, #526602 + epatch "${FILESDIR}/use-kernel_fpu_begin.patch" + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand @@ -385,11 +391,6 @@ src_install() { # 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 multilib_foreach_abi src_install-libs # This is sorted by the order the files occur in the source tree. @@ -495,9 +496,11 @@ src_install-libs() { dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so + if multilib_is_native_abi; then + exeinto ${ATI_ROOT}/extensions + doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so + mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so + fi # other libs exeinto /usr/$(get_libdir) @@ -519,6 +522,7 @@ src_install-libs() { dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so exeinto /usr/$(get_libdir) doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdhsasc*.so # OpenCL vendor files insinto /etc/OpenCL/vendors/ @@ -554,6 +558,9 @@ src_install-libs() { #install xvba sdk headers doheader xvba_sdk/include/amdxvba.h + # VA-API internal wrapper + dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so + if use pax_kernel; then pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" fi