Always include inttypes.h in glxext.h for programs that don't include it first.

(Portage version: 2.0.51.16)

5 files changed, 115 insertions, 11 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index f00bb5243d9b..8f67cfd455e0 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.74 2005/02/10 06:45:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.75 2005/02/12 05:25:16 eradicator Exp $
+
+*opengl-update-2.1.1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/glxext.h-inttypes.patch, +opengl-update-2.1.1-r1.ebuild:
+  Always #include <inttypes.h> regardless of C standard version requested.
+  Closes bug #81472.
 
 *opengl-update-2.1.1 (09 Feb 2005)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index cee8f863f1b9..6736f34818c5 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0775759c6f7daaa87f134e144963cd7a ChangeLog 14200
 MD5 f4a810bc95a74e27b27973e4e948a937 metadata.xml 358
 MD5 4e8eebd835dbf4f24182d7cce7af8ab7 opengl-update-1.7.2.ebuild 541
@@ -8,6 +5,7 @@ MD5 020171f71e450cf568dac04eabd695f4 opengl-update-1.8.2.ebuild 1594
 MD5 1a24f101a73042eef1bc8ded313b9984 opengl-update-2.0_pre4-r1.ebuild 1740
 MD5 c4bd3ca5f011edc8adfaff3f32c0babd opengl-update-2.0_pre5.ebuild 1741
 MD5 b16cb316fb077950f48c40992a10d2e3 opengl-update-2.1.1.ebuild 2422
+MD5 b16cb316fb077950f48c40992a10d2e3 opengl-update-2.1.1-r1.ebuild 2422
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.2 64
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre4-r1 64
@@ -18,10 +16,4 @@ MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre5 64
 MD5 f21996de10b91b58cced8fbcc6c44792 files/opengl-update-2.0_pre5 9738
 MD5 91d9c17541be018d065a7838d7149c86 files/opengl-update-2.1.1 9110
 MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1 116
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCCwM3ArHZZzCEUG0RAhPCAKCDBeuasMhZM0NIXzSEhBJMHtuBoACbBUN7
-fI7V9UBV8oVso4HIii+jI3U=
-=7KEG
------END PGP SIGNATURE-----
+MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1-r1 116
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1.1-r1 b/x11-base/opengl-update/files/digest-opengl-update-2.1.1-r1
new file mode 100644
index 000000000000..6a175f487f3b
--- /dev/null
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1.1-r1
@@ -0,0 +1,2 @@
+MD5 ad3eba2841c01c0a94b6477d11d5ac31 glext.h-26.bz2 32485
+MD5 3260a509b23a3519b8df335a4e8f5e1d glxext.h-10.bz2 5895
diff --git a/x11-base/opengl-update/files/glxext.h-inttypes.patch b/x11-base/opengl-update/files/glxext.h-inttypes.patch
new file mode 100644
index 000000000000..04a0e896347f
--- /dev/null
+++ b/x11-base/opengl-update/files/glxext.h-inttypes.patch
@@ -0,0 +1,21 @@
+--- glxext.h-10.orig	2005-01-20 00:38:56.000000000 -0800
++++ glxext.h-10	2005-02-11 02:42:53.221321671 -0800
+@@ -342,18 +342,7 @@ typedef struct {
+ 
+ /* Define int32_t and int64_t types for UST/MSC */
+ /* (as used in the GLX_OML_sync_control extension). */
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #include <inttypes.h>
+-#elif defined( __VMS )
+-#include <inttypes.h>
+-#elif defined(__SCO__) || defined(__USLC__)
+-#include <stdint.h>
+-#elif defined(__UNIXOS2__) || defined(__SOL64__)
+-typedef long int int32_t;
+-typedef long long int int64_t;
+-#else
+-#warn "int32_t and int64_t are undefined!"
+-#endif
+ 
+ #ifndef GLX_VERSION_1_3
+ #define GLX_VERSION_1_3 1
diff --git a/x11-base/opengl-update/opengl-update-2.1.1-r1.ebuild b/x11-base/opengl-update/opengl-update-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..9140a40fac39
--- /dev/null
+++ b/x11-base/opengl-update/opengl-update-2.1.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1.1-r1.ebuild,v 1.1 2005/02/12 05:25:16 eradicator Exp $
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
+
+GLEXT="26"
+GLXEXT="10"
+
+SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
+	 http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND="virtual/libc
+	app-arch/bzip2"
+
+RDEPEND="!x11-base/xfree86
+	 !<x11-base/xorg-x11-6.8.0-r4
+	 !<media-video/ati-drivers-8.8.25-r3"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Bugs #81199, #81472
+	epatch ${FILESDIR}/glxext.h-inttypes.patch
+}
+
+pkg_preinst() {
+	# It needs to be before 04multilib
+	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
+
+	OABI="${ABI}"
+	for ABI in $(get_install_abis); do
+		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
+			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
+		fi
+		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
+			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
+		fi
+	done
+	ABI="${OABI}"
+	unset OABI
+}
+
+src_install() {
+	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
+
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
+		OABI="${ABI}"
+		for ABI in $(get_install_abis); do
+			# Install default glext.h
+			insinto /usr/$(get_libdir)/opengl/global/include
+			newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
+			newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
+		done
+		ABI="${OABI}"
+		unset OABI
+	else
+		# Install default glext.h
+		insinto /usr/$(get_libdir)/opengl/global/include
+		newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
+		newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
+	fi
+}