summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-05-16 16:16:56 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-05-16 16:16:56 +0000
commitae4eb09a069d0221926d9cd9e29c571474a1eadc (patch)
tree5eada58c65c64a3fbef135a439aaf7775c1527c0 /media-libs/glut
parentRemove old ebuild that fails with python 2.4 and up. (diff)
downloadhistorical-ae4eb09a069d0221926d9cd9e29c571474a1eadc.tar.gz
historical-ae4eb09a069d0221926d9cd9e29c571474a1eadc.tar.bz2
historical-ae4eb09a069d0221926d9cd9e29c571474a1eadc.zip
--as-needed-patch thanks to TGL <degrenier@easyconnect.fr> in bug 131837, add metadata, games herd
Package-Manager: portage-2.1_rc1-r2
Diffstat (limited to 'media-libs/glut')
-rw-r--r--media-libs/glut/ChangeLog7
-rw-r--r--media-libs/glut/Manifest34
-rw-r--r--media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch24
-rw-r--r--media-libs/glut/glut-3.7.1.ebuild7
-rw-r--r--media-libs/glut/metadata.xml5
5 files changed, 65 insertions, 12 deletions
diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog
index 8f593538420c..d5647477082e 100644
--- a/media-libs/glut/ChangeLog
+++ b/media-libs/glut/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/glut
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.23 2006/05/14 23:00:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.24 2006/05/16 16:16:56 genstef Exp $
+
+ 16 May 2006; Stefan Schweizer <genstef@gentoo.org>
+ +files/glut-3.7.1-fix-GLU-linking.patch, +metadata.xml, glut-3.7.1.ebuild:
+ --as-needed-patch thanks to TGL <degrenier@easyconnect.fr> in bug 131837,
+ add metadata, games herd
14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
files/digest-glut-3.7-r2, files/digest-glut-3.7.1, Manifest:
diff --git a/media-libs/glut/Manifest b/media-libs/glut/Manifest
index f753bea827a9..2592a01bac90 100644
--- a/media-libs/glut/Manifest
+++ b/media-libs/glut/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX glut-3.7.1-fix-GLU-linking.patch 793 RMD160 031f5f95876ef2a9bed63fd20c08ba20efff3b62 SHA1 1ef65be16e4d6de36f351bab28e3fb5e13d70e1b SHA256 0f2241ebfbff02fd5cf116a39a0d49180f77d72b9c6d8dc880c1fc5ebf03c69e size 793
+MD5 131cf67a22642ad25df5dd8971fad6a5 files/glut-3.7.1-fix-GLU-linking.patch 793
+RMD160 031f5f95876ef2a9bed63fd20c08ba20efff3b62 files/glut-3.7.1-fix-GLU-linking.patch 793
+SHA256 0f2241ebfbff02fd5cf116a39a0d49180f77d72b9c6d8dc880c1fc5ebf03c69e files/glut-3.7.1-fix-GLU-linking.patch 793
AUX glutscript.sh 978 RMD160 a698d827cd21569ac43ccf123a017d50c059e6f9 SHA1 7b52660a694ac2bb0e61318c4c6e155e34c0a634 SHA256 f7f65bce3aa8a17bc00a39cd7735962bd885db06e879396c2b919537d4d3560e size 978
MD5 e721299e4a30ba46f1edcd8b8510bcb6 files/glutscript.sh 978
RMD160 a698d827cd21569ac43ccf123a017d50c059e6f9 files/glutscript.sh 978
@@ -10,17 +17,28 @@ EBUILD glut-3.7-r2.ebuild 1201 RMD160 8e082bb5f1f4cc0fad7e3f1903aff1ce17237516 S
MD5 9941ce4e5acc520adfe3e2ed0dacb29c glut-3.7-r2.ebuild 1201
RMD160 8e082bb5f1f4cc0fad7e3f1903aff1ce17237516 glut-3.7-r2.ebuild 1201
SHA256 8256e09504e5779edf9eda0099536c66e2ffb3aeb59e1e78cc31c3609b4d78a5 glut-3.7-r2.ebuild 1201
-EBUILD glut-3.7.1.ebuild 1206 RMD160 18069503236300a806c3b583239fbc63a0430112 SHA1 9328c19bfeaee24aa8a9c5314ae32ef5d4ddf024 SHA256 8b1c1d1e92d41eff0360600e00ea6a8d778b13f855812db010f9c2bb4f5b6c08 size 1206
-MD5 9df42dbb854453e3df9e1c1754b72b87 glut-3.7.1.ebuild 1206
-RMD160 18069503236300a806c3b583239fbc63a0430112 glut-3.7.1.ebuild 1206
-SHA256 8b1c1d1e92d41eff0360600e00ea6a8d778b13f855812db010f9c2bb4f5b6c08 glut-3.7.1.ebuild 1206
-MISC ChangeLog 3041 RMD160 8abc86413c94566569848cd839fbee22ba48939a SHA1 c015c6393fe25df6521ab29ffe1a83192ee4f0b9 SHA256 5bb536a53c0b97988b5573986ca44b116a56b37a8f23b470d1010356e711b733 size 3041
-MD5 c616060ee35990bf3ffc879e2a38e613 ChangeLog 3041
-RMD160 8abc86413c94566569848cd839fbee22ba48939a ChangeLog 3041
-SHA256 5bb536a53c0b97988b5573986ca44b116a56b37a8f23b470d1010356e711b733 ChangeLog 3041
+EBUILD glut-3.7.1.ebuild 1255 RMD160 9d401375257eace6842aa348a91712e101150393 SHA1 8f4e81e3226d15df7c03d9d5701e5841cc00ea66 SHA256 32db676718d315ee461b5a4b2de2cbd141363e2bf1568432032c27becd233470 size 1255
+MD5 2738cb680a11465afa9eca83fe071f4c glut-3.7.1.ebuild 1255
+RMD160 9d401375257eace6842aa348a91712e101150393 glut-3.7.1.ebuild 1255
+SHA256 32db676718d315ee461b5a4b2de2cbd141363e2bf1568432032c27becd233470 glut-3.7.1.ebuild 1255
+MISC ChangeLog 3273 RMD160 137ad165c3446143ea61e7ba61e42b3e17413adf SHA1 972e918648a925dbc82d0d912d6337a0a3a56ec9 SHA256 7dbbc4d6ba7d631f3710b7a1d0a785bee82e52ba889462fe2f29120201c910c1 size 3273
+MD5 e1e8bd66f7202e809c98f8e42c3fdcbf ChangeLog 3273
+RMD160 137ad165c3446143ea61e7ba61e42b3e17413adf ChangeLog 3273
+SHA256 7dbbc4d6ba7d631f3710b7a1d0a785bee82e52ba889462fe2f29120201c910c1 ChangeLog 3273
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
MD5 b353f913ae05d962cbc64a58f4c8cb0b files/digest-glut-3.7-r2 497
RMD160 cd123061ae3f3f47b7dc125468228a719ed8296e files/digest-glut-3.7-r2 497
SHA256 9fe3044c01aa1d4b077ab3647fd3f201cd9817674768b9d4fea0c55b369db1e7 files/digest-glut-3.7-r2 497
MD5 a3bd3de99794ec2f9bf65e228042f68a files/digest-glut-3.7.1 485
RMD160 d4fd1028fc23c4ff4a169f53d67ab91e2584e887 files/digest-glut-3.7.1 485
SHA256 235b9e4e6628f2171c55cf8867277800f454f94481d9374d4a1cb7d42dc32625 files/digest-glut-3.7.1 485
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEafroNJowsmZ/PzARAhDtAKDZbTa0xiaVwfaRMSg9fq98P2NPPACggJFJ
+C+BINjirSE8KyElln+LQ768=
+=E1Gy
+-----END PGP SIGNATURE-----
diff --git a/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch b/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch
new file mode 100644
index 000000000000..ec32462a53ed
--- /dev/null
+++ b/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch
@@ -0,0 +1,24 @@
+Thanks to TGL <degrenier@easyconnect.fr> in http://bugs.gentoo.org/131837
+
+already in upstream cvs:
+http://webcvs.freedesktop.org/mesa/Mesa-oldtree/src-glut/Makefile.am?r1=1.19&r2=1.20
+
+--- Mesa-5.0/src-glut/Makefile.am.orig 2006-04-30 15:39:32.000000000 +0200
++++ Mesa-5.0/src-glut/Makefile.am 2006-04-30 15:39:47.000000000 +0200
+@@ -9,7 +9,6 @@
+ EXTRA_PROGRAMS = capturexfont
+
+ libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LIBADD = -lGLU
+ libglut_la_SOURCES = \
+ glutwin32.h \
+ win32_glx.h \
+@@ -67,7 +66,7 @@
+ layerutil.h \
+ stroke.h
+
+-libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
++libglut_la_LIBADD = -lGLU $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
+ capturexfont_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
+
+ EXTRA_DIST = descript.mms
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index 00ac21abc9c1..d607dad5dd38 100644
--- a/media-libs/glut/glut-3.7.1.ebuild
+++ b/media-libs/glut/glut-3.7.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.28 2006/05/13 20:19:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.29 2006/05/16 16:16:56 genstef Exp $
-inherit libtool eutils
+inherit autotools eutils
MESA_VER="5.0"
DESCRIPTION="The OpenGL Utility Toolkit (GLUT)"
@@ -23,7 +23,8 @@ S="${WORKDIR}/Mesa-${MESA_VER}"
src_unpack() {
unpack ${A}
cd "${S}"
- elibtoolize
+ epatch "${FILESDIR}/${P}-fix-GLU-linking.patch"
+ eautoreconf
}
src_compile() {
diff --git a/media-libs/glut/metadata.xml b/media-libs/glut/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/media-libs/glut/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>