[patch] Patch with the libgii-1.0.1 ebuild

libgii-1.0.1.patch (text/plain), 8.13 KB, created by Andrzej Zaborowski on 2006-12-03 15:15:06 UTC

diff -pNaur libgii.orig/Manifest libgii/Manifest
--- libgii.orig/Manifest	2006-12-04 01:49:21.000000000 +0100
+++ libgii/Manifest	2006-12-04 00:29:33.000000000 +0100
@@ -10,12 +10,21 @@ AUX libgii-0.9.0-linux26-headers.patch 4
 MD5 87872067beb306c082b41bfb0d3b6163 files/libgii-0.9.0-linux26-headers.patch 419
 RMD160 24b4ea5258f3b10bc47447f57c24ed3bc433212e files/libgii-0.9.0-linux26-headers.patch 419
 SHA256 3b8219be83b51ec8d676cea2a677bc07f20b6aee788b3c7948d9dd9000829a7c files/libgii-0.9.0-linux26-headers.patch 419
+AUX libgii-1.0.1-configure-cpuid-pic.patch 460 RMD160 ef239efa31bcc0baf389dccb999ec65dce7b67e8 SHA1 a1f36e9ef791135488cfac8e5717152638081674 SHA256 f64714b13016af4e69c8bf1d3f9d61699b80ccbfc7f2b2d7c241db9d4fc97954
+MD5 c73b55a6073532b742a48de03a8dbdf4 files/libgii-1.0.1-configure-cpuid-pic.patch 460
+RMD160 ef239efa31bcc0baf389dccb999ec65dce7b67e8 files/libgii-1.0.1-configure-cpuid-pic.patch 460
+SHA256 f64714b13016af4e69c8bf1d3f9d61699b80ccbfc7f2b2d7c241db9d4fc97954 files/libgii-1.0.1-configure-cpuid-pic.patch 460
+AUX libgii-1.0.1-linux26-headers.patch 419 RMD160 24b4ea5258f3b10bc47447f57c24ed3bc433212e SHA1 dd3572db7b0e599073d9ca1375821ccaea769318 SHA256 3b8219be83b51ec8d676cea2a677bc07f20b6aee788b3c7948d9dd9000829a7c
+MD5 87872067beb306c082b41bfb0d3b6163 files/libgii-1.0.1-linux26-headers.patch 419
+RMD160 24b4ea5258f3b10bc47447f57c24ed3bc433212e files/libgii-1.0.1-linux26-headers.patch 419
+SHA256 3b8219be83b51ec8d676cea2a677bc07f20b6aee788b3c7948d9dd9000829a7c files/libgii-1.0.1-linux26-headers.patch 419
 AUX libgii-linux-headers-2.6.patch 1478 RMD160 cf539da8dedb9574b17ed42f0cd9f4e75412efa5 SHA1 abce53ca7df2c46187d9e07e10f7f91667e14d98 SHA256 152b55a2902ef48a119880b5a3d8c3af64c52e1584f8cf1551910af0929f3332
 MD5 3547639e381b37fef548f22dca2bd248 files/libgii-linux-headers-2.6.patch 1478
 RMD160 cf539da8dedb9574b17ed42f0cd9f4e75412efa5 files/libgii-linux-headers-2.6.patch 1478
 SHA256 152b55a2902ef48a119880b5a3d8c3af64c52e1584f8cf1551910af0929f3332 files/libgii-linux-headers-2.6.patch 1478
 DIST libgii-0.8.1.tar.bz2 296487 RMD160 5f6736c60d0d75a607bec3b85c45e2ab22c6bb4c SHA1 ca01ea98990712472d8ecca477645482883a9a9c SHA256 7772e5dc07a10c11d05a7f07f1a9b1ea3a098ce59247dad267e41bb358b8dcfd
 DIST libgii-0.9.0.src.tar.gz 733125 RMD160 c766b917e0e4c72fcc118a5264d1da683eb09102 SHA1 e051661374d1a2c615af4e1f06061d27c2d7036f SHA256 0c2050e2d9ada97a85edaf320a525d5de77e4fee4e6159f993bea2033d6a4d29
+DIST libgii-1.0.1.src.tar.gz 1023831 RMD160 a80aa8a172550c7df41d45fc9a9bff7a60fb6e73 SHA1 bf51e0b2fb34af138b37799ab4fd9302fce4330c SHA256 9677bdf5819af91281dcc1c49983cc04293ab0b823492cc269dd0d1cc75834fa
 EBUILD libgii-0.8.1.ebuild 1034 RMD160 6004e840ae7c4d655f7d7c1654be8570d95f5f72 SHA1 d55062246086d56e9adfe1cec322ed3068692c8c SHA256 ce8fdadcc3525fa275b8875a0fa0ae6cd1beb5384233c63cd7ba9791d68acb40
 MD5 9f61f32905ccbb22f01dfd83d4bc2a4f libgii-0.8.1.ebuild 1034
 RMD160 6004e840ae7c4d655f7d7c1654be8570d95f5f72 libgii-0.8.1.ebuild 1034
@@ -24,6 +33,10 @@ EBUILD libgii-0.9.0.ebuild 1454 RMD160 1
 MD5 963df3c58a1aef75d6d490626d31c697 libgii-0.9.0.ebuild 1454
 RMD160 19f77bb4bd80f60307b73c683fd643380fe0b032 libgii-0.9.0.ebuild 1454
 SHA256 7e7cae835b8a46d20ca4438164498b5391454f622f3bb120df4417d87049fe94 libgii-0.9.0.ebuild 1454
+EBUILD libgii-1.0.1.ebuild 1417 RMD160 13b6312548061670b7a08849eaf574bcb8ce439a SHA1 3430cfdedb53750f4620304bc6b91e5dce32909a SHA256 8472b8e34d933ac49774bd714bd669ef6a0a10a1311315721b5080ed77b7f243
+MD5 89cf046558d754123c84052d55cb7637 libgii-1.0.1.ebuild 1417
+RMD160 13b6312548061670b7a08849eaf574bcb8ce439a libgii-1.0.1.ebuild 1417
+SHA256 8472b8e34d933ac49774bd714bd669ef6a0a10a1311315721b5080ed77b7f243 libgii-1.0.1.ebuild 1417
 MISC ChangeLog 3431 RMD160 873a69c9d2f3bc6f19599cefcc6171da7ceef409 SHA1 fb79f0e72a3183f084b67bc1735ffd6353988ce2 SHA256 5436caa547174a6df91760843149f7a75f3dbfc765baf640728274e5e1b28368
 MD5 aa3b3688eff3233447dec4cd404e4246 ChangeLog 3431
 RMD160 873a69c9d2f3bc6f19599cefcc6171da7ceef409 ChangeLog 3431
@@ -38,3 +51,6 @@ SHA256 fb61332c616902a5404882a064647be4a
 MD5 3207726516ab5030d02cdd25fd4b9861 files/digest-libgii-0.9.0 250
 RMD160 b086f5b9dec88036969fd79df05b816faf2a80a4 files/digest-libgii-0.9.0 250
 SHA256 7c7c4465cf83750bb04b60b59c9d5b4fadb6a5492266acddb560e2b58d368b38 files/digest-libgii-0.9.0 250
+MD5 2c1caff3b5bb322b252f0714a43e4fb7 files/digest-libgii-1.0.1 253
+RMD160 c9b609758e0bb53d9bb184d65ce61d23d806ff0f files/digest-libgii-1.0.1 253
+SHA256 f30cbfe61ff31ba3fe8018b6ceb3b8742be518a65d2a036c259cc71b96eba176 files/digest-libgii-1.0.1 253
diff -pNaur libgii.orig/files/digest-libgii-1.0.1 libgii/files/digest-libgii-1.0.1
--- libgii.orig/files/digest-libgii-1.0.1	1970-01-01 01:00:00.000000000 +0100
+++ libgii/files/digest-libgii-1.0.1	2006-12-03 23:56:36.000000000 +0100
@@ -0,0 +1,3 @@
+MD5 6d19ef8723bd4b49baa37fa5f4d429b6 libgii-1.0.1.src.tar.gz 1023831
+RMD160 a80aa8a172550c7df41d45fc9a9bff7a60fb6e73 libgii-1.0.1.src.tar.gz 1023831
+SHA256 9677bdf5819af91281dcc1c49983cc04293ab0b823492cc269dd0d1cc75834fa libgii-1.0.1.src.tar.gz 1023831
diff -pNaur libgii.orig/files/libgii-1.0.1-configure-cpuid-pic.patch libgii/files/libgii-1.0.1-configure-cpuid-pic.patch
--- libgii.orig/files/libgii-1.0.1-configure-cpuid-pic.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgii/files/libgii-1.0.1-configure-cpuid-pic.patch	2006-12-04 00:28:38.000000000 +0100
@@ -0,0 +1,12 @@
+--- acinclude.m4.orig	2006-02-25 20:22:29.000000000 +0100
++++ acinclude.m4	2006-12-04 00:27:28.000000000 +0100
+@@ -8069,7 +8069,8 @@ AC_DEFUN([GGI_CC_CAN_CPUID],
+ 	#ifdef _MSC_VER
+ 	__asm cpuid
+ 	#else
+-	asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
++	asm("pushl %%ebx; cpuid; movl %%ebx,%2; popl %%ebx":
++			"=a" (a), "=r" (b), "=c" (c), "=d" (d) : "a" (in));
+ 	#endif
+ 	return d;],
+ 	ggi_cv_cc_can_cpuid="yes", ggi_cv_cc_can_cpuid="no")])
diff -pNaur libgii.orig/files/libgii-1.0.1-linux26-headers.patch libgii/files/libgii-1.0.1-linux26-headers.patch
--- libgii.orig/files/libgii-1.0.1-linux26-headers.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgii/files/libgii-1.0.1-linux26-headers.patch	2006-12-04 00:07:12.000000000 +0100
@@ -0,0 +1,12 @@
+--- input/linux_kbd/linkey.c~	2002-02-23 06:51:05.000000000 +0900
++++ input/linux_kbd/linkey.c	2005-03-28 12:05:43.000000000 +0900
+@@ -25,8 +25,8 @@
+ ******************************************************************************
+ */
+ #include "config.h"
+-#include "linkey.h"
+ #include <ctype.h>
++#include "linkey.h"
+ 
+ static uint32 basic_trans(int sym, int islabel, uint32 *modifiers,
+ 			  uint32 label, int keycode)
diff -pNaur libgii.orig/libgii-1.0.1.ebuild libgii/libgii-1.0.1.ebuild
--- libgii.orig/libgii-1.0.1.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ libgii/libgii-1.0.1.ebuild	2006-12-04 00:19:19.000000000 +0100
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-0.9.0.ebuild,v 1.17 2006/08/07 13:29:26 kevquinn Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
+HOMEPAGE="http://www.ggi-project.org/"
+SRC_URI="http://www.ggi-project.org/ftp/ggi/v2.2/${P}.src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="X"
+
+RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	ia64? ( >=sys-kernel/linux-headers-2.6.11 )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-linux26-headers.patch
+	# Modify configure check that tries to compile the cpuid
+	# instruction to work on hardened compiler.  Modified acinclude.m4.
+	epatch ${FILESDIR}/${P}-configure-cpuid-pic.patch
+
+	# Since acinclude.m4 is modified, need to autoreconf.
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	use X || myconf="--without-x --disable-x --disable-xwin"
+
+	econf ${myconf} || die
+	emake || die
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	cd "${D}/usr/share/man/man3"
+	for i in *.3gii
+	do
+		mv "${i}" "${i/3gii/3}"
+	done
+
+	cd "${S}"
+	dodoc ChangeLog* FAQ NEWS README
+	docinto txt
+	dodoc doc/*.txt
+	docinto docbook
+	dodoc doc/docbook/*.sgml
+}