[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_CHECK+=" COMPAT"
@@ -193,7 +194,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) K
[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/, 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/, 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: 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
