From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C96DA1381F3 for ; Fri, 23 Aug 2013 18:13:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64F59E0C67; Fri, 23 Aug 2013 18:13:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECC36E0C67 for ; Fri, 23 Aug 2013 18:13:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12E6A33EB60 for ; Fri, 23 Aug 2013 18:13:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BA6DAE468F for ; Fri, 23 Aug 2013 18:13:49 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1377281587.890dbd8801bd004a966048fe38f2dadae0e05bd8.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 890dbd8801bd004a966048fe38f2dadae0e05bd8 X-VCS-Branch: master Date: Fri, 23 Aug 2013 18:13:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d1859677-e4e4-485a-9819-2e0b9b6d6565 X-Archives-Hash: a950935b9ad175403df1a0348eae7796 commit: 890dbd8801bd004a966048fe38f2dadae0e05bd8 Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Fri Aug 23 18:13:07 2013 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Fri Aug 23 18:13:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=890dbd88 x11-drivers/ati-drivers: drop watermark removal code The watermark no longer exists according to upstream release notes: http://support.amd.com/us/kbarticles/Pages/AMDCatalyst13-8LINBetaDriver.aspx --- x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild index 7c5fb36..bc8437c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild @@ -14,7 +14,7 @@ DRIVERS_URI="https://www2.ati.com/drivers/beta/amd-catalyst-13.8-beta2-linux-x86 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" @@ -326,17 +326,6 @@ src_prepare() { mkdir extra || die "mkdir extra failed" cd extra unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz - - # Get rid of watermark. Oldest known reference: - # http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark - if use disable-watermark; then - ebegin "Disabling watermark" - driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do - sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1 - done - eend $? || die "Disabling watermark failed" - fi } src_compile() {