[gentoo-commits] repo/gentoo:master commit in: x11-drivers/ati-drivers/

[Ian Delaney]

commit:     3ee13140db47e37adf0a0c7fb88c094a39cf1a83
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 09:20:32 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 09:21:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee13140

x11-drivers/ati-drivers: revbump required to ati-drivers-15.9-r1

of the ati-drivers-15.9.ebuild prepared by fernando-rodriguez
in /gentoo/pull/98

Package-Manager: portage-2.2.20.1

 ...vers-15.9.ebuild => ati-drivers-15.9-r1.ebuild} |  0
 x11-drivers/ati-drivers/ati-drivers-15.9.ebuild    | 56 +++++++---------------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-15.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild
similarity index 100%
copy from x11-drivers/ati-drivers/ati-drivers-15.9.ebuild
copy to x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild

diff --git a/x11-drivers/ati-drivers/ati-drivers-15.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.9.ebuild
index 9bc5788..0d90755 100644
--- a/x11-drivers/ati-drivers/ati-drivers-15.9.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-15.9.ebuild
@@ -13,10 +13,8 @@ RUN="${WORKDIR}/AMD-Catalyst-15.9-Linux-installer-15.201.1151-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"
-DRV_VER="amd-catalyst-${PV}-linux-installer-15.201.1151-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/${DRV_VER}"
-SDK_VER="xvba-sdk-0.74-404001.tar.gz"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/${SDK_VER}"
+DRIVERS_URI="mirror://gentoo/amd-catalyst-${PV}-linux-installer-15.201.1151-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 qt4 static-libs pax_kernel gdm-hack"
@@ -151,21 +149,19 @@ 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+x86"
+	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"
+	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
 	use amd64 && CONFIG_CHECK+=" COMPAT"
 
 	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a
-		module and not loaded for direct rendering to work."
-	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports
-		the symbol lock_acquire as GPL-only. This prevents ${P} from
-		compiling with an error like this:
+	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
+		rendering to work."
+	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
+		as GPL-only. This prevents ${P} from compiling with an error like this:
 		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
 	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
 		kernel to reject loading the fglrx module with
@@ -195,18 +191,15 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use modules; then
-		MODULE_PATH="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x"
-		MODULE_NAMES="fglrx(video:${MODULE_PATH})"
+		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_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"
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
 		else
-			BUILD_PARAMS="${BUILD_PARAMS} \
-				CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
 		fi
 	fi
 	# Define module dir.
@@ -317,16 +310,6 @@ src_prepare() {
 	# Compile fix, #526602
 	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
 
-	# Fix #542320
-	epatch "${FILESDIR}/15.9-preempt.patch"
-
-	# Compile fixes, #548118
-	epatch "${FILESDIR}/15.9-remove-gpl-symbols.patch"
-	epatch "${FILESDIR}/15.9-fpu.patch"
-	epatch "${FILESDIR}/15.9-kcl_str.patch"
-	epatch "${FILESDIR}/15.9-sep_printf.patch"
-	epatch "${FILESDIR}/15.9-mtrr.patch"
-
 	epatch_user
 
 	cd "${MODULE_DIR}"
@@ -410,9 +393,7 @@ src_install() {
 
 	#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"
+		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.
@@ -519,9 +500,7 @@ src_install-libs() {
 
 		#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"
+			sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/${ATI_ROOT}/extensions/libglx.so" || die "Applying gdm-hack failed"
 		fi
 	fi
 
@@ -606,11 +585,10 @@ pkg_postinst() {
 	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
 
 	if has_version "x11-drivers/xf86-video-intel[sna]"; then
-		ewarn "It is reported that xf86-video-intel built with USE=\"sna\""
-		ewarn "causes the X server to crash on systems that use hybrid"
-		ewarn "AMD/Intel graphics. If you experience this crash, downgrade"
-		ewarn "to xf86-video-intel-2.20.2 or earlier or try disabling sna"
-		ewarn "for xf86-video-intel."
+		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
+		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
+		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
+		ewarn "try disabling sna for xf86-video-intel."
 		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
 	fi