public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Emil Karlson" <jekarlson@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
Date: Tue,  6 Jan 2015 12:46:40 +0000 (UTC)	[thread overview]
Message-ID: <1420548067.9868cd5bfacf40afbdcfa216d6a83144536b5dcb.emil_karlson@gentoo> (raw)

commit:     9868cd5bfacf40afbdcfa216d6a83144536b5dcb
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Tue Jan  6 12:41:07 2015 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> 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 <abulak <AT> gmail.com>
534398, thanks to Dani Church <dani.church <AT> 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


             reply	other threads:[~2015-01-06 12:46 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-06 12:46 Emil Karlson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-09 17:46 [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ Emil Karlson
2015-04-01 19:04 Emil Karlson
2015-04-01 16:07 Emil Karlson
2015-02-12 18:20 Emil Karlson
2015-02-11 20:31 Emil Karlson
2015-01-06 18:10 Emil Karlson
2014-12-29 18:12 Emil Karlson
2014-12-10  7:30 Emil Karlson
2014-07-17 22:05 Emil Karlson
2014-06-03  4:49 Emil Karlson
2014-05-26 19:00 Emil Karlson
2014-04-29 17:34 Emil Karlson
2014-04-29  5:09 Emil Karlson
2014-04-27  7:41 Emil Karlson
2014-03-26  5:40 Emil Karlson
2014-02-27  5:34 Emil Karlson
2014-02-13  9:52 Emil Karlson
2014-02-08 22:07 Emil Karlson
2013-10-27  8:01 Emil Karlson
2013-10-09  7:29 Emil Karlson
2013-10-03  7:40 Emil Karlson
2013-09-24 10:25 Emil Karlson
2013-09-23 20:23 Emil Karlson
2013-09-19  7:54 Emil Karlson
2013-08-23 18:13 Chi-Thanh Christopher Nguyen
2013-08-22 22:55 Emil Karlson
2013-07-24  7:44 Emil Karlson
2013-06-03 16:11 Chi-Thanh Christopher Nguyen
2013-06-01  8:41 Emil Karlson
2013-05-31  6:34 Emil Karlson
2013-05-30  7:19 Emil Karlson
2013-05-20 21:29 Emil Karlson
2013-05-12 11:30 Emil Karlson
2013-05-11  2:34 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-07 18:01 Emil Karlson
2013-03-27 20:38 Emil Karlson
2013-03-19  9:50 Chi-Thanh Christopher Nguyen
2013-03-18 20:32 Emil Karlson
2013-03-16 19:29 Emil Karlson
2013-03-15 11:10 Emil Karlson
2013-03-15 11:10 Emil Karlson
2013-03-13  2:03 Chi-Thanh Christopher Nguyen
2013-03-03 21:47 Chi-Thanh Christopher Nguyen
2013-03-01  9:20 Emil Karlson
2013-02-18 21:21 Chi-Thanh Christopher Nguyen
2013-02-18 20:55 Chi-Thanh Christopher Nguyen
2013-02-17 19:32 Emil Karlson
2013-02-17 19:32 Emil Karlson
2013-02-02 15:15 Emil Karlson
2013-01-24 12:43 Emil Karlson
2013-01-24  0:40 Emil Karlson
2013-01-24  0:40 Emil Karlson
2013-01-24  0:40 Emil Karlson
2013-01-24  0:40 Emil Karlson
2013-01-21 23:29 Emil Karlson
2013-01-18 13:11 Emil Karlson
2013-01-07  5:56 Emil Karlson
2013-01-06 20:00 Emil Karlson
2013-01-06 19:15 Emil Karlson
2013-01-04 22:04 Chi-Thanh Christopher Nguyen
2012-12-30 15:55 Emil Karlson
2012-12-29  0:11 Chi-Thanh Christopher Nguyen
2012-12-27 12:26 Emil Karlson
2012-12-25 12:51 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 17:06 Emil Karlson
2012-12-04 14:59 Emil Karlson
2012-11-26 23:32 Emil Karlson
2012-11-22 15:17 Emil Karlson
2012-10-24 20:03 Emil Karlson
2012-10-14 20:19 Emil Karlson
2012-09-30 12:18 Chi-Thanh Christopher Nguyen
2012-09-28 12:29 Emil Karlson
2012-09-28 12:25 Emil Karlson
2012-09-10 21:50 Emil Karlson
2012-09-09  8:50 Emil Karlson
2012-07-21 21:23 Chi-Thanh Christopher Nguyen
2012-07-16 17:28 Enrico Tagliavini
2012-07-09 14:16 Enrico Tagliavini
2012-06-17 14:30 Enrico Tagliavini
2012-03-28 18:14 Enrico Tagliavini
2012-02-12 17:21 Enrico Tagliavini
2012-02-04 14:33 Enrico Tagliavini
2012-01-26 19:15 Enrico Tagliavini
2011-12-30 20:17 Enrico Tagliavini
2011-12-24 14:43 Enrico Tagliavini
2011-12-14 18:33 Enrico Tagliavini
2011-11-24 15:43 Chi-Thanh Christopher Nguyen
2011-11-21 15:27 Enrico Tagliavini
2011-11-20 11:02 Enrico Tagliavini
2011-11-19 13:35 Enrico Tagliavini
2011-10-31 18:51 Enrico Tagliavini
2011-07-30 10:45 Enrico Tagliavini
2011-07-30 10:39 Enrico Tagliavini
2011-06-17 11:14 Enrico Tagliavini
2011-06-09 17:45 Chi-Thanh Christopher Nguyen
2011-05-26 17:23 Enrico Tagliavini
2011-05-11 18:51 Enrico Tagliavini
2011-05-11 17:46 Enrico Tagliavini
2011-05-01 12:23 Enrico Tagliavini
2011-04-29 11:37 Tomas Chvatal
2011-04-28 16:06 Enrico Tagliavini
2011-04-28 16:02 Enrico Tagliavini
2011-04-02 13:12 Enrico Tagliavini
2011-04-02 12:52 Enrico Tagliavini
2011-03-31 21:37 Chi-Thanh Christopher Nguyen
2011-03-30 10:15 Enrico Tagliavini
2011-03-30  9:55 Enrico Tagliavini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420548067.9868cd5bfacf40afbdcfa216d6a83144536b5dcb.emil_karlson@gentoo \
    --to=jekarlson@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox