[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/
commit: 8dd557ff4303226a49aecb544c8e8d0594b91c99 Author: Emil Karlson gmail com> AuthorDate: Tue Dec 8 11:13:50 2015 + Commit: Emil Karlson gmail com> CommitDate: Tue Dec 8 11:13:50 2015 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=8dd557ff x11-drivers/ati-drivers: version bump Thanks to Rion for comtributed patch ...s-14.2_beta.ebuild => ati-drivers-15.11.ebuild} | 109 +++-- .../ati-drivers-15.11-remove-gpl-symbols.patch | 48 + x11-drivers/ati-drivers/files/atieventsd.service | 9 ++ 3 files changed, 112 insertions(+), 54 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.2_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.11.ebuild similarity index 90% rename from x11-drivers/ati-drivers/ati-drivers-14.2_beta.ebuild rename to x11-drivers/ati-drivers/ati-drivers-15.11.ebuild index bfd9728..e38c540 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.2_beta.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-15.11.ebuild @@ -4,19 +4,20 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils +MULTILIB_COMPAT=( abi_x86_{32,64} ) +inherit eutils multilib-build linux-info linux-mod systemd toolchain-funcs versionator pax-utils DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -RUN="${WORKDIR}/amd-driver-installer-13.35.1005-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-15.30.1025/amd-driver-installer-15.30.1025-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-14.2-betav1.3-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://gentoo/radeon-crimson-15.11-15.30.1025.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 pax_kernel" +IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -24,30 +25,18 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="bindist test" RDEPEND=" - <=x11-base/xorg-server-1.15.49[-minimal] + <=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - 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 - ) - ) + !x11-libs/xvba-video + virtual/glu[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXinerama[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] qt4? ( x11-libs/libICE x11-libs/libSM @@ -57,6 +46,9 @@ RDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) + gdm-hack? ( + x11-base/xorg-server:= + ) " if [[ legacy != ${SLOT} ]]; then RDEPEND="${RDEPEND} @@ -120,6 +112,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=" @@ -152,6 +145,14 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + einfo "and ${XVBA_SDK_URI}" +} + pkg_pretend() { local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" use amd64 && CONFIG_C
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: b36cf38ac007ff327a2c244d737f711c13548119 Author: Emil Karlson gmail com> AuthorDate: Thu Jul 9 17:44:19 2015 + Commit: Emil Karlson gmail com> CommitDate: Thu Jul 9 17:44:19 2015 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=b36cf38a x11-drivers/ati-drivers: version bump ...rivers-13.12.ebuild => ati-drivers-15.7.ebuild} | 113 +++-- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild similarity index 89% rename from x11-drivers/ati-drivers/ati-drivers-13.12.ebuild rename to x11-drivers/ati-drivers/ati-drivers-15.7.ebuild index ec7756e..ebe76f1 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-15.7.ebuild @@ -4,19 +4,20 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils +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}/amd-catalyst-13.11-beta1-linux-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 YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.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 pax_kernel" +IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -24,30 +25,18 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="bindist test" RDEPEND=" - <=x11-base/xorg-server-1.14.49[-minimal] + <=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - 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 - ) - ) + !x11-libs/xvba-video + virtual/glu[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXinerama[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] qt4? ( x11-libs/libICE x11-libs/libSM @@ -57,6 +46,9 @@ RDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) + gdm-hack? ( + x11-base/xorg-server:= + ) " if [[ legacy != ${SLOT} ]]; then RDEPEND="${RDEPEND} @@ -110,6 +102,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=" @@ -118,6 +112,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=" @@ -150,6 +145,14 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + einfo "and ${XVBA_SDK_URI}" +} +
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 05388b20047a8c33575949143b9f9d3ecba039c6 Author: Emil Karlson gmail com> AuthorDate: Wed Apr 1 19:03:35 2015 + Commit: Emil Karlson gmail com> CommitDate: Wed Apr 1 19:04:19 2015 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=05388b20 x11-drivers/ati-drivers: multilib cleanup x11-drivers/ati-drivers/ati-drivers-15.1.ebuild | 28 ++--- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild index 31faf4e..a2b7878 100644 --- a/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild @@ -30,29 +30,13 @@ RDEPEND=" app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu !x11-libs/xvba-video - abi_x86_32? ( - || ( - virtual/glu[abi_x86_32] - app-emulation/emul-linux-x86-opengl - ) - || ( - ( - 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 - ) - ) + virtual/glu[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXinerama[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] qt4? ( x11-libs/libICE x11-libs/libSM
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: e2aafe96a4c764092db1aa90c6840f212df46519 Author: Emil Karlson gmail com> AuthorDate: Wed Apr 1 16:06:32 2015 + Commit: Emil Karlson gmail com> CommitDate: Wed Apr 1 16:06:32 2015 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=e2aafe96 x11-drivers/ati-drivers: version bump ...rs-14.1_beta.ebuild => ati-drivers-15.1.ebuild} | 92 +- 1 file changed, 55 insertions(+), 37 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild similarity index 90% rename from x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild rename to x11-drivers/ati-drivers/ati-drivers-15.1.ebuild index d227c7f..31faf4e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-15.1.ebuild @@ -4,19 +4,20 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils +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}/amd-driver-installer-13.35.1005-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 YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-14.1-betav1.3-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_15.200.orig.tar.gz" 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 pax_kernel" +IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -24,7 +25,7 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="bindist test" RDEPEND=" - <=x11-base/xorg-server-1.15.49[-minimal] + <=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid @@ -35,8 +36,12 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl + !x11-libs/xvba-video + abi_x86_32? ( + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) || ( ( x11-libs/libX11[abi_x86_32] @@ -57,6 +62,9 @@ RDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) + gdm-hack? ( + x11-base/xorg-server:= + ) " if [[ legacy != ${SLOT} ]]; then RDEPEND="${RDEPEND} @@ -110,6 +118,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=" @@ -118,6 +128,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=" @@ -150,6 +161,14 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + einfo "and ${XVBA_SDK_URI}" +} + pkg_pretend() { local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" use amd64 && CONFIG_CHECK+=" COMPAT" @@ -191,7 +210,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_OU
[gentoo-commits] proj/x11:master commit in: profiles/, x11-drivers/ati-drivers/
commit: 60d7bf853ddd41386b87be8f12d4fb8228d29b59 Author: Emil Karlson gmail com> AuthorDate: Wed Apr 1 06:51:23 2015 + Commit: Emil Karlson gmail com> CommitDate: Wed Apr 1 06:51:23 2015 + URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=60d7bf85 x11-drivers/ati-drivers: repoman fixes Mask emul-linux using ebuilds app-admin is now app-eselect profiles/package.mask | 3 ++- x11-drivers/ati-drivers/ati-drivers-13.12.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild| 4 ++-- .../{ati-drivers-14.12-r3.ebuild => ati-drivers-14.12-r4.ebuild} | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.12.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.1_beta.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.2_beta.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.4.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild| 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild | 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild| 4 ++-- x11-drivers/ati-drivers/ati-drivers-14.9.ebuild | 4 ++-- 14 files changed, 28 insertions(+), 27 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index ac64da8..f98e5dc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -127,6 +127,7 @@ =x11-proto/xineramaproto- =x11-proto/xproto- -#mask until new multilib is enabled +#mask until removal related to native multilib =x11-drivers/ati-drivers-14.4_p1-r1 =x11-drivers/ati-drivers-14.9-r1 +
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/
commit: 5c7604800fef9c0b99674970467fb9feec9ec723 Author: Emil Karlson gmail com> AuthorDate: Thu Feb 12 20:03:26 2015 + Commit: Emil Karlson gmail com> CommitDate: Thu Feb 12 20:03:26 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5c760480 x11-drivers/ati-drivers: fix compile on linux-3.19 --- .../ati-drivers/ati-drivers-14.12-r3.ebuild| 2 + .../get-percpu-without-preempt-on-linux-3.19.patch | 45 ++ 2 files changed, 47 insertions(+) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild index b4aa191..a792e68 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild @@ -327,6 +327,8 @@ src_prepare() { # Compile fix, #526602 epatch "${FILESDIR}/use-kernel_fpu_begin.patch" + epatch "${FILESDIR}/get-percpu-without-preempt-on-linux-3.19.patch" + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/files/get-percpu-without-preempt-on-linux-3.19.patch b/x11-drivers/ati-drivers/files/get-percpu-without-preempt-on-linux-3.19.patch new file mode 100644 index 000..d2c6f70 --- /dev/null +++ b/x11-drivers/ati-drivers/files/get-percpu-without-preempt-on-linux-3.19.patch @@ -0,0 +1,45 @@ +From 56ca74832b1f97c8e89329a313c7ca2405cd26cb Mon Sep 17 00:00:00 2001 +From: Emil Karlson +Date: Thu, 12 Feb 2015 21:59:46 +0200 +Subject: [PATCH] get percpu without preempton linux-3.19 + +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 15 --- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 360b6ac..3cba36e 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -4816,8 +4816,13 @@ static unsigned long kasSetExecutionLevel(unsigned long level) + { + unsigned long orig_level; + +-orig_level = __get_cpu_var(kasExecutionLevel); +-__get_cpu_var(kasExecutionLevel) = level; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) ++ orig_level = __get_cpu_var(kasExecutionLevel); ++ __get_cpu_var(kasExecutionLevel) = level; ++#else ++orig_level = (*this_cpu_ptr(&(kasExecutionLevel))); ++(*this_cpu_ptr(&(kasExecutionLevel))) = level; ++#endif + + return orig_level; + } +@@ -4829,7 +4834,11 @@ static unsigned long kasSetExecutionLevel(unsigned long level) + */ + static unsigned long kas_GetExecutionLevel(void) + { +-return __get_cpu_var(kasExecutionLevel); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) ++ return __get_cpu_var(kasExecutionLevel); ++#else ++ return (*this_cpu_ptr(&(kasExecutionLevel))); ++#endif + } + + /** \brief Type definition for kas_spin_lock() parameter */ +-- +2.0.5 +
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 2c657faa1127a11f99dd9ed7c06bd4eb33dc7a5c Author: Emil Karlson gmail com> AuthorDate: Thu Feb 12 18:18:30 2015 + Commit: Emil Karlson gmail com> CommitDate: Thu Feb 12 18:18:30 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2c657faa x11-drivers/ati-drivers: add hack for bug 516816 Thanks to Andrew Mao Oliver Chang --- x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild | 18 +- x11-drivers/ati-drivers/metadata.xml| 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild index 2b31c43..b4aa191 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild @@ -17,7 +17,7 @@ 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/" -IUSE="debug +modules qt4 static-libs pax_kernel" +IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -62,6 +62,9 @@ RDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) + gdm-hack? ( + x11-base/xorg-server:= + ) " if [[ legacy != ${SLOT} ]]; then RDEPEND="${RDEPEND} @@ -403,6 +406,11 @@ src_install() { exeinto /usr/$(get_libdir)/xorg/modules doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} + #516816 + if use gdm-hack; then + sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/usr/$(get_libdir)/xorg/modules/drivers/fglrx_drv.so" || die "Applying gdm-hack failed" + fi + # Arch-specific files. # (s)bin. into /opt @@ -467,6 +475,9 @@ src_install() { doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" + + #516816 + use gdm-hack && Xorg -version > "${D}/etc/ati/xvrn" 2>&1 } src_install-libs() { @@ -500,6 +511,11 @@ src_install-libs() { 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 + + #516816 + if use gdm-hack; then + sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/${ATI_ROOT}/extensions/libglx.so" || die "Applying gdm-hack failed" + fi fi # other libs diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml index dc12ac1..34cec1e 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -12,6 +12,7 @@ Build the kernel modules Do a potentially dangerous binary search and replace to disable watermark + Do a potentially dangerous binary search and replace to fix gdm compatibility Enable pax kernel specific patches
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 410b03b55fb4c7bc2f8c8fc59012d3374a9f1d37 Author: Emil Karlson gmail com> AuthorDate: Wed Feb 11 20:30:25 2015 + Commit: Emil Karlson gmail com> CommitDate: Wed Feb 11 20:30:25 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=410b03b5 Revert "x11-drivers/ati-drivers: make bundled libva driver installation optional" This reverts commit de91c1301eedb830d7dd9d0781ebe23b3e3df4fc. --- x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild | 6 +++--- x11-drivers/ati-drivers/metadata.xml| 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild index f2d4694..2b31c43 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild @@ -17,7 +17,7 @@ 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/" -IUSE="debug +modules qt4 static-libs pax_kernel +internal-va-driver" +IUSE="debug +modules qt4 static-libs pax_kernel" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -36,7 +36,7 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender virtual/glu - internal-va-driver? ( !x11-libs/xvba-video ) + !x11-libs/xvba-video abi_x86_32? ( || ( virtual/glu[abi_x86_32] @@ -559,7 +559,7 @@ src_install-libs() { doheader xvba_sdk/include/amdxvba.h # VA-API internal wrapper - use internal-va-driver && dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so + 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" diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml index 6574c13..dc12ac1 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -13,6 +13,5 @@ Build the kernel modules Do a potentially dangerous binary search and replace to disable watermark Enable pax kernel specific patches - Install bundled libva driver to replace x11-libs/xvba-video
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: de91c1301eedb830d7dd9d0781ebe23b3e3df4fc Author: Emil Karlson gmail com> AuthorDate: Tue Jan 6 18:08:08 2015 + Commit: Emil Karlson gmail com> CommitDate: Tue Jan 6 18:08:08 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=de91c130 x11-drivers/ati-drivers: make bundled libva driver installation optional --- x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild | 6 +++--- x11-drivers/ati-drivers/metadata.xml| 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild index 2b31c43..f2d4694 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild @@ -17,7 +17,7 @@ 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/" -IUSE="debug +modules qt4 static-libs pax_kernel" +IUSE="debug +modules qt4 static-libs pax_kernel +internal-va-driver" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" @@ -36,7 +36,7 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender virtual/glu - !x11-libs/xvba-video + internal-va-driver? ( !x11-libs/xvba-video ) abi_x86_32? ( || ( virtual/glu[abi_x86_32] @@ -559,7 +559,7 @@ src_install-libs() { 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 + use internal-va-driver && 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" diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml index dc12ac1..6574c13 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -13,5 +13,6 @@ Build the kernel modules Do a potentially dangerous binary search and replace to disable watermark Enable pax kernel specific patches + Install bundled libva driver to replace x11-libs/xvba-video
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 9868cd5bfacf40afbdcfa216d6a83144536b5dcb Author: Emil Karlson gmail com> AuthorDate: Tue Jan 6 12:41:07 2015 + Commit: Emil Karlson gmail com> CommitDate: Tue Jan 6 12:41:07 2015 + 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 YE #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 am
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: ab146e358cd2dc977a174f9314f66dae4ee07394 Author: Emil Karlson gmail com> AuthorDate: Mon Dec 29 18:09:13 2014 + Commit: Emil Karlson gmail com> CommitDate: Mon Dec 29 18:09:13 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ab146e35 x11-drivers/ati-drivers: install libamdhsasc*.so bug 533942 --- x11-drivers/ati-drivers/ati-drivers-14.12.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild index d73d87e..8976260 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild @@ -517,6 +517,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/
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 48cfea501374747dcf5099a5f25a32af2a1652bd Author: Emil Karlson gmail com> AuthorDate: Wed Dec 10 07:28:54 2014 + Commit: Emil Karlson gmail com> CommitDate: Wed Dec 10 07:28:54 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=48cfea50 x11-drivers/ati-drivers: version bump --- ...13.11_beta6.ebuild => ati-drivers-14.12.ebuild} | 62 +++--- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild similarity index 93% rename from x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.12.ebuild index edc8d18..d73d87e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild @@ -4,25 +4,27 @@ EAPI=5 -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils +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}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run" SLOT="1" -DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.11-beta6-linux-x86.x86_64.zip"; +# Uses javascript for download YE +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.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/" -IUSE="debug +modules multilib qt4 static-libs pax_kernel" +IUSE="debug +modules 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.14.49[-minimal] + <=x11-base/xorg-server-1.16.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -33,8 +35,11 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl + abi_x86_32? ( + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) || ( ( x11-libs/libX11[abi_x86_32] @@ -108,6 +113,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=" @@ -148,6 +155,14 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + einfo "and ${XVBA_SDK_URI}" +} + pkg_pretend() { local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" use amd64 && CONFIG_CHECK+=" COMPAT" @@ -239,7 +254,7 @@ 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 @@ -292,19 +307,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" - epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.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,
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/
commit: 9589ab069aa08fe9787e02107860128a40940d48 Author: Emil Karlson gmail com> AuthorDate: Mon Nov 10 20:06:33 2014 + Commit: Emil Karlson gmail com> CommitDate: Mon Nov 10 20:06:33 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9589ab06 x11-drivers/ati-drivers: fix x86-32 build failure on linux-3.17 fixes #526602 --- x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild | 3 +++ x11-drivers/ati-drivers/ati-drivers-14.9.ebuild | 3 +++ x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch | 12 3 files changed, 18 insertions(+) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild index 2ebb926..267b375 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild @@ -318,6 +318,9 @@ src_prepare() { # 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 diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild index fae8fb3..378153e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild @@ -318,6 +318,9 @@ src_prepare() { # 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 diff --git a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch new file mode 100644 index 000..f0ba278 --- /dev/null +++ b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch @@ -0,0 +1,12 @@ +diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:30:58.630304842 +0200 b/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-10-27 23:32:57.300306011 +0200 +@@ -6389,7 +6389,7 @@ + */ + void ATI_API_CALL KCL_fpu_begin(void) + { +-#ifdef CONFIG_X86_64 ++#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) + kernel_fpu_begin(); + #else + #ifdef TS_USEDFPU
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/, x11-drivers/ati-drivers/
commit: ca5d3965cec439a39407403f47a1e26258ad51fc Author: Emil Karlson gmail com> AuthorDate: Mon Oct 13 01:26:49 2014 + Commit: Emil Karlson gmail com> CommitDate: Mon Oct 13 01:26:49 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ca5d3965 x11-drivers/ati-drivers fix linux-3.17 no_hotplug build failure Fixes 524658 Thanks to Dominique Michel for providing the patch --- x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild | 3 +++ x11-drivers/ati-drivers/ati-drivers-14.9.ebuild| 3 +++ .../files/fix-the-linux-3.17-no_hotplug-error.patch| 18 ++ 3 files changed, 24 insertions(+) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild index fbaff2e..2ebb926 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild @@ -312,6 +312,9 @@ src_prepare() { # 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" diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild index 70857a8..fae8fb3 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild @@ -312,6 +312,9 @@ src_prepare() { # 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" diff --git a/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch b/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch new file mode 100644 index 000..a8b5462 --- /dev/null +++ b/x11-drivers/ati-drivers/files/fix-the-linux-3.17-no_hotplug-error.patch @@ -0,0 +1,18 @@ +--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig 2014-07-11 11:46:19.0 +0200 common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-10-08 15:12:55.535638391 +0200 +@@ -829,6 +829,7 @@ + + static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) +struct acpi_device *tdev; +struct pci_dev *pdev = (struct pci_dev *)data; +@@ -844,6 +845,7 @@ + } +} + #endif ++#endif +return 0; + } +
[gentoo-commits] proj/x11:master commit in: profiles/, x11-drivers/ati-drivers/
commit: 671846f3c983fc7f9c5c1bab40d783efb1d2f801 Author: Emil Karlson gmail com> AuthorDate: Tue Sep 30 16:43:38 2014 + Commit: Emil Karlson gmail com> CommitDate: Tue Sep 30 16:43:38 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=671846f3 x11-drivers/ati-drivers: version bump --- profiles/package.mask | 2 +- ...-13.12-r1.ebuild => ati-drivers-14.9-r1.ebuild} | 53 +++--- ...s-13.11_beta.ebuild => ati-drivers-14.9.ebuild} | 34 +- 3 files changed, 60 insertions(+), 29 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 86e0412..ac64da8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -128,5 +128,5 @@ =x11-proto/xproto- #mask until new multilib is enabled -=x11-drivers/ati-drivers-13.12-r1 =x11-drivers/ati-drivers-14.4_p1-r1 +=x11-drivers/ati-drivers-14.9-r1 diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild similarity index 94% rename from x11-drivers/ati-drivers/ati-drivers-13.12-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild index 3f1e1f3..fbaff2e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.12-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild @@ -8,11 +8,11 @@ inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator p DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -#RUN="${WORKDIR}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.301.1001/amd-driver-installer-14.301.1001-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://gentoo/amd-catalyst-14-9-linux-x86-x86-64.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/" @@ -21,14 +21,36 @@ IUSE="debug +modules 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.14.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + virtual/glu + abi_x86_32? ( + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) + || ( + ( + 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 x11-libs/libSM @@ -91,6 +113,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=" @@ -131,6 +155,14 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + einfo "and ${XVBA_SDK_URI}" +} + pkg_pretend() { local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" use amd64 && CONFIG_CHECK+=" COMPAT" @@ -275,22 +307,11 @@ 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 "${
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: d42e763b8967703a36933392ff9dca7065582092 Author: Emil Karlson gmail com> AuthorDate: Thu Jul 17 22:05:13 2014 + Commit: Emil Karlson gmail com> CommitDate: Thu Jul 17 22:05:13 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d42e763b x11-drivers/ati-drivers: version bump --- ...s-13.9.ebuild => ati-drivers-14.6_beta2.ebuild} | 78 -- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild similarity index 89% rename from x11-drivers/ati-drivers/ati-drivers-13.9.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild index c4428ec..2db486b 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild @@ -8,9 +8,11 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.20/amd-driver-installer-14.20-x86.x86_64.run" SLOT="1" -DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip"; +# Uses javascript for download YE +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.6-beta-v1.0-jul11.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/" @@ -19,10 +21,10 @@ 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.14.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -34,7 +36,10 @@ RDEPEND=" x11-libs/libXrender virtual/glu multilib? ( - app-emulation/emul-linux-x86-opengl + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) || ( ( x11-libs/libX11[abi_x86_32] @@ -108,6 +113,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=" @@ -148,40 +155,41 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -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'" -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." - -_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 - - 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 - - if use amd64 && ! linux_chkconfig_present COMPAT; then - die "CONFIG_COMPAT must be enabled for amd64 kernels." - fi +pkg_nofetch() { + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/deskto
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: ac2eebc96bae0655e5bfb31e135ea218a7965458 Author: Emil Karlson gmail com> AuthorDate: Tue Jun 3 04:49:37 2014 + Commit: Emil Karlson gmail com> CommitDate: Tue Jun 3 04:49:37 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ac2eebc9 x11-drivers/ati-drivers: version bump --- ...6_beta.ebuild => ati-drivers-14.6_beta1.ebuild} | 118 + 1 file changed, 50 insertions(+), 68 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild similarity index 85% rename from x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild index e48a1a9..870fa4c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild @@ -8,31 +8,23 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti 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-14.20/amd-driver-installer-14.20-x86.x86_64.run" SLOT="1" -if [[ "${MY_V[2]}" =~ beta.* ]]; then - BETADIR="beta/" -else - BETADIR="linux/" -fi -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip"; -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip" -fi +# Uses javascript for download YE +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.6-beta-v1.0-may23.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.14.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -44,7 +36,10 @@ RDEPEND=" x11-libs/libXrender virtual/glu multilib? ( - app-emulation/emul-linux-x86-opengl + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) || ( ( x11-libs/libX11[abi_x86_32] @@ -118,6 +113,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=" @@ -158,46 +155,40 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -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'" -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." - -_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 - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if !
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, profiles/
commit: 18adc2b72fa51baa839e168e1db9fb100da14191 Author: Emil Karlson gmail com> AuthorDate: Tue May 27 03:30:58 2014 + Commit: Emil Karlson gmail com> CommitDate: Tue May 27 03:30:58 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=18adc2b7 x11-drivers/ati-drivers: version bump --- profiles/package.mask | 2 +- .../{ati-drivers-14.4_rc-r1.ebuild => ati-drivers-14.4_p1-r1.ebuild} | 4 ++-- .../{ati-drivers-14.4_rc.ebuild => ati-drivers-14.4_p1.ebuild}| 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 71a5c73..86e0412 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -129,4 +129,4 @@ #mask until new multilib is enabled =x11-drivers/ati-drivers-13.12-r1 -=x11-drivers/ati-drivers-14.4_rc-r1 +=x11-drivers/ati-drivers-14.4_p1-r1 diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild similarity index 99% rename from x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild index 3ac916d..f6cb383 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_p1-r1.ebuild @@ -8,11 +8,11 @@ inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator p DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.10.1006.1001/amd-driver-installer-14.10.1006.1001-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.4-rc-v1.0-apr17.zip" +DRIVERS_URI="mirror://gentoo/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.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/" diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild similarity index 99% rename from x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild index 6812a46..f78e0a4 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild @@ -8,11 +8,11 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.10.1006.1001/amd-driver-installer-14.10.1006.1001-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.4-rc-v1.0-apr17.zip" +DRIVERS_URI="mirror://gentoo/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.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/"
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 9a5e24e52ca5a4333c5b46b123b10225086d1d32 Author: Emil Karlson gmail com> AuthorDate: Mon May 26 18:59:48 2014 + Commit: Emil Karlson gmail com> CommitDate: Mon May 26 18:59:48 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9a5e24e5 x11-drivers/ati-drivers: update proxy maintainer email address --- x11-drivers/ati-drivers/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml index d88b103..dc12ac1 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -3,7 +3,7 @@ x11 - jkarl...@cc.hut.fi + jekarl...@gmail.com Proxy maintainer. Assign to herd and CC him on bugs
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 2b53ef6b011ef12dfca2f6fe155967eca69d7eaa Author: Emil Karlson gmail com> AuthorDate: Tue Apr 29 17:33:42 2014 + Commit: Emil Karlson gmail com> CommitDate: Tue Apr 29 17:33:53 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2b53ef6b x11-drivers/ati-drivers: update SRC_URI and pkg_nofetch --- x11-drivers/ati-drivers/ati-drivers-14.4.ebuild | 10 +- x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild | 10 +- x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild| 10 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild index e5003e1..1a4fa35 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild @@ -12,7 +12,7 @@ RUN="${WORKDIR}/fglrx-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-14-4-linux-x86-x86-64.zip"; +DRIVERS_URI="mirror://gentoo/amd-catalyst-14-4-linux-x86-x86-64.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/" @@ -156,11 +156,11 @@ QA_DT_HASH=" " pkg_nofetch() { - einfo "The driver package" - einfo "${DRIVERS_URI##*/}" - einfo "needs to be downloaded manually from" + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; - + einfo "and ${XVBA_SDK_URI}" } pkg_pretend() { diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild index 089f2fc..3ac916d 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild @@ -12,7 +12,7 @@ RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #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.4-rc-v1.0-apr17.zip"; +DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.4-rc-v1.0-apr17.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/" @@ -156,11 +156,11 @@ QA_DT_HASH=" " pkg_nofetch() { - einfo "The driver package" - einfo "${DRIVERS_URI##*/}" - einfo "needs to be downloaded manually from" + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; - + einfo "and ${XVBA_SDK_URI}" } pkg_pretend() { diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild index fb81724..6812a46 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild @@ -12,7 +12,7 @@ RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" SLOT="1" # Uses javascript for download YE #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.4-rc-v1.0-apr17.zip"; +DRIVERS_URI="mirror://gentoo/linux-amd-catalyst-14.4-rc-v1.0-apr17.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/" @@ -156,11 +156,11 @@ QA_DT_HASH=" " pkg_nofetch() { - einfo "The driver package" - einfo "${DRIVERS_URI##*/}" - einfo "needs to be downloaded manually from" + einfo "The driver packages" + einfo ${A} + einfo "need to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; - + einfo "and ${XVBA_SDK_URI}" } pkg_pretend() {
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 2fca0a51308df5236dcee9687c660c872ff0379f Author: Emil Karlson gmail com> AuthorDate: Tue Apr 29 05:07:46 2014 + Commit: Emil Karlson gmail com> CommitDate: Tue Apr 29 05:07:46 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2fca0a51 x11-drivers/ati-drivers: fix pkg_nofetch pkg name --- x11-drivers/ati-drivers/ati-drivers-14.4.ebuild | 2 +- x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild | 2 +- x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild index 6393985..e5003e1 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild @@ -157,7 +157,7 @@ QA_DT_HASH=" pkg_nofetch() { einfo "The driver package" - einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "${DRIVERS_URI##*/}" einfo "needs to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild index 3bf4b6b..089f2fc 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild @@ -157,7 +157,7 @@ QA_DT_HASH=" pkg_nofetch() { einfo "The driver package" - einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "${DRIVERS_URI##*/}" einfo "needs to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild index e7f3e91..fb81724 100644 --- a/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild @@ -157,7 +157,7 @@ QA_DT_HASH=" pkg_nofetch() { einfo "The driver package" - einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "${DRIVERS_URI##*/}" einfo "needs to be downloaded manually from" einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 47c7b37225942cdf84dfb89d882ecdc4618e42b6 Author: Emil Karlson gmail com> AuthorDate: Sun Apr 27 07:40:59 2014 + Commit: Emil Karlson gmail com> CommitDate: Sun Apr 27 07:40:59 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=47c7b372 x11-drivers/ati-drivers: version bump --- ...drivers-13.4.ebuild => ati-drivers-14.4.ebuild} | 116 + 1 file changed, 49 insertions(+), 67 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild similarity index 85% rename from x11-drivers/ati-drivers/ati-drivers-13.4.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4.ebuild index f2b5693..6393985 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4.ebuild @@ -8,31 +8,23 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti 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-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run" SLOT="1" -if [[ "${MY_V[2]}" =~ beta.* ]]; then - BETADIR="beta/" -else - BETADIR="linux/" -fi -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-catalyst-${PV/_beta/-beta}-linux-x86.x86_64.zip"; -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip" -fi +# Uses javascript for download YE +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-14-4-linux-x86-x86-64.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 @@ -44,7 +36,10 @@ RDEPEND=" x11-libs/libXrender virtual/glu multilib? ( - app-emulation/emul-linux-x86-opengl + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) || ( ( x11-libs/libX11[abi_x86_32] @@ -118,6 +113,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=" @@ -158,46 +155,40 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -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'" -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." - -_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 - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chk
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/, profiles/
commit: c67a2388792fa99eb9f6b985475be69805a6cdc4 Author: Emil Karlson gmail com> AuthorDate: Fri Apr 25 21:17:23 2014 + Commit: Emil Karlson gmail com> CommitDate: Fri Apr 25 21:17:23 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c67a2388 x11-drivers/ati-drivers: version bump Remove unused patches Drop old ebuilds Improve multilib-build compatibility Bump multilib-build version of the ebuild --- profiles/package.mask | 2 +- ...3.9-r1.ebuild => ati-drivers-14.4_rc-r1.ebuild} | 98 +- ...3.2_beta7.ebuild => ati-drivers-14.4_rc.ebuild} | 141 +++-- .../files/ati-drivers-13.8-proc-permissions.diff | 13 -- .../files/ati-powermode-opt-path-2.patch | 42 -- 5 files changed, 138 insertions(+), 158 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 87cf4a1..71a5c73 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -128,5 +128,5 @@ =x11-proto/xproto- #mask until new multilib is enabled -=x11-drivers/ati-drivers-13.9-r1 =x11-drivers/ati-drivers-13.12-r1 +=x11-drivers/ati-drivers-14.4_rc-r1 diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild similarity index 86% rename from x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild index 0ea20da..3bf4b6b 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild @@ -8,9 +8,11 @@ inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator p DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" SLOT="1" -DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip"; +# Uses javascript for download YE +#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.4-rc-v1.0-apr17.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/" @@ -19,14 +21,36 @@ IUSE="debug +modules 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.14.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + virtual/glu + abi_x86_32? ( + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) + || ( + ( + 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 x11-libs/libSM @@ -89,6 +113,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=" @@ -129,40 +155,41 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -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: GP
[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
commit: 3e594905ea4fce9c4327dee6dbb7db16d23d0814 Author: Emil Karlson gmail com> AuthorDate: Wed Mar 26 05:40:49 2014 + Commit: Emil Karlson gmail com> CommitDate: Wed Mar 26 05:40:49 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3e594905 x11-drivers/ati-drivers: beta version bump --- ...rs-13.1.ebuild => ati-drivers-14.3_beta.ebuild} | 140 - 1 file changed, 84 insertions(+), 56 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild similarity index 82% rename from x11-drivers/ati-drivers/ati-drivers-13.1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.3_beta.ebuild index 138e3b0..92b54d9 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 YE +#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" + e