diff options
| -rw-r--r-- | media-libs/glew/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/glew/Manifest | 15 | ||||
| -rw-r--r-- | media-libs/glew/files/glew-1.3.3-multilib.patch | 73 | ||||
| -rw-r--r-- | media-libs/glew/glew-1.3.3.ebuild | 7 |
4 files changed, 86 insertions, 15 deletions
diff --git a/media-libs/glew/ChangeLog b/media-libs/glew/ChangeLog index 2be966f35b57..03ea5a63f579 100644 --- a/media-libs/glew/ChangeLog +++ b/media-libs/glew/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/glew # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.7 2005/09/03 05:42:39 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/ChangeLog,v 1.8 2005/09/08 09:55:31 blubb Exp $ + + 04 Sep 2005; Simon Stelling <blubb@gentoo.org> + +files/glew-1.3.3-multilib.patch, glew-1.3.3.ebuild: + made glew multilib-strict aware 03 Sep 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> glew-1.3.3.ebuild: marked stable on ppc - bug #104320 diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest index 79872666d527..8b4a943074ee 100644 --- a/media-libs/glew/Manifest +++ b/media-libs/glew/Manifest @@ -1,14 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 094c31ae9f25e4bf660b45a3f3931235 ChangeLog 1142 -MD5 038fa21c56209d7833b357ef74ce1486 glew-1.3.3.ebuild 917 +MD5 436aa20115eb10f7f241ae3fef9b48d4 ChangeLog 1281 +MD5 d3fa0d84ba7a8aca3317080a4e895bcf glew-1.3.3.ebuild 1014 MD5 1114056da482209c3a0672f9b2c163a4 metadata.xml 225 MD5 d1b3573a4d45551973bf2131a3537a41 files/digest-glew-1.3.3 63 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFDGgMd/NoSW7FuNV8RAqPVAKCFBp9pgFBe57ibx08Ga8/fQnJyWACfX19y -Q6uokjKoaHSpiDluAhhAvhw= -=eV6O ------END PGP SIGNATURE----- +MD5 f5ffff1cf39720762bd6cb9f3ed3ee24 files/glew-1.3.3-multilib.patch 2593 diff --git a/media-libs/glew/files/glew-1.3.3-multilib.patch b/media-libs/glew/files/glew-1.3.3-multilib.patch new file mode 100644 index 000000000000..2bb56b087fc0 --- /dev/null +++ b/media-libs/glew/files/glew-1.3.3-multilib.patch @@ -0,0 +1,73 @@ +--- Makefile.old 2005-09-04 16:39:47.000000000 +0200 ++++ Makefile 2005-09-04 16:40:37.000000000 +0200 +@@ -29,6 +29,7 @@ + ## THE POSSIBILITY OF SUCH DAMAGE. + + GLEW_DEST ?= /usr ++LIBDIR = $(GLEW_DEST)/lib + + include config/version + +@@ -112,18 +113,18 @@ + # directories + $(INSTALL) -d -m 0755 $(GLEW_DEST)/bin + $(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL +- $(INSTALL) -d -m 0755 $(GLEW_DEST)/lib ++ $(INSTALL) -d -m 0755 $(LIBDIR) + # runtime + ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) + $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/ + else + ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin) + strip -x lib/$(LIB.SHARED) +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/lib/ +- $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.SONAME) ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + else +- $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/lib/ +- $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.SONAME) ++ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + endif + endif + # development files +@@ -131,15 +132,15 @@ + $(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL + $(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL + ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(GLEW_DEST)/lib/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ + else + ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin) + strip -x lib/$(LIB.STATIC) +- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(GLEW_DEST)/lib/ +- $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.DEVLNK) ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) + else +- $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(GLEW_DEST)/lib/ +- $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.DEVLNK) ++ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) + endif + endif + # utilities +@@ -149,13 +150,13 @@ + $(RM) $(GLEW_DEST)/include/GL/wglew.h + $(RM) $(GLEW_DEST)/include/GL/glew.h + $(RM) $(GLEW_DEST)/include/GL/glxew.h +- $(RM) $(GLEW_DEST)/lib/$(LIB.DEVLNK) ++ $(RM) $(LIBDIR)/$(LIB.DEVLNK) + ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) + $(RM) $(GLEW_DEST)/bin/$(LIB.SHARED) + else +- $(RM) $(GLEW_DEST)/lib/$(LIB.SONAME) +- $(RM) $(GLEW_DEST)/lib/$(LIB.SHARED) +- $(RM) $(GLEW_DEST)/lib/$(LIB.STATIC) ++ $(RM) $(LIBDIR)/$(LIB.SONAME) ++ $(RM) $(LIBDIR)/$(LIB.SHARED) ++ $(RM) $(LIBDIR)/$(LIB.STATIC) + endif + $(RM) $(GLEW_DEST)/bin/$(GLEWINFO.BIN) $(GLEW_DEST)/bin/$(VISUALINFO.BIN) + diff --git a/media-libs/glew/glew-1.3.3.ebuild b/media-libs/glew/glew-1.3.3.ebuild index dcb2c9c18f01..be7ab1ce3a51 100644 --- a/media-libs/glew/glew-1.3.3.ebuild +++ b/media-libs/glew/glew-1.3.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.3.3.ebuild,v 1.7 2005/09/03 05:42:39 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.3.3.ebuild,v 1.8 2005/09/08 09:55:31 blubb Exp $ + +inherit eutils multilib DESCRIPTION="The OpenGL Extension Wrangler Library" HOMEPAGE="http://glew.sourceforge.net/" @@ -22,12 +24,13 @@ S=${WORKDIR}/${PN} src_compile(){ # Add system's CFLAGS and compile cd ${S} + epatch ${FILESDIR}/${P}-multilib.patch sed -i "s/OPT = \$(POPT)/OPT = ${CFLAGS}/" Makefile emake -j1 || die "emake failed" } src_install() { - make GLEW_DEST="${D}/usr" install || die "Install failed!" + make GLEW_DEST="${D}/usr" LIBDIR="${D}/usr/$(get_libdir)" install || die "Install failed!" dodoc README.txt ChangeLog cd ${S}/doc |