Version bump. Request bug #195262

(Portage version: 2.1.3.16)

4 files changed, 104 insertions, 1 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index c4f9a008c9ae..73765f11614e 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glfw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.7 2007/07/22 09:39:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.8 2007/11/11 07:34:19 tupone Exp $
+
+*glfw-2.6 (11 Nov 2007)
+
+  11 Nov 2007; Tupone Alfredo <tupone@gentoo.org> +files/glfw-2.6-dyn.patch,
+  +glfw-2.6.ebuild:
+  Version bump. Request bug #195262 by Peter Koeleman
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; glfw-2.5.0.ebuild:
   Drop virtual/x11 references.
diff --git a/media-libs/glfw/files/digest-glfw-2.6 b/media-libs/glfw/files/digest-glfw-2.6
new file mode 100644
index 000000000000..5b3be1f41ee2
--- /dev/null
+++ b/media-libs/glfw/files/digest-glfw-2.6
@@ -0,0 +1,3 @@
+MD5 0d9b93e6194c3805be9e1c855a985a24 glfw-2.6.tar.bz2 886843
+RMD160 71c767e16167e8460fbfb01391614b2501247c7e glfw-2.6.tar.bz2 886843
+SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca glfw-2.6.tar.bz2 886843
diff --git a/media-libs/glfw/files/glfw-2.6-dyn.patch b/media-libs/glfw/files/glfw-2.6-dyn.patch
new file mode 100644
index 000000000000..d816f9f59536
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.6-dyn.patch
@@ -0,0 +1,22 @@
+--- lib/x11/Makefile.x11.in.old	2007-11-11 07:56:34.000000000 +0100
++++ lib/x11/Makefile.x11.in	2007-11-11 08:00:22.000000000 +0100
+@@ -8,7 +8,7 @@
+ ##########################################################################
+ # Default: Build GLFW static library
+ ##########################################################################
+-default: libglfw.a libglfw.so
++default: libglfw.a libglfw.so.2.6
+ 
+ 
+ ##########################################################################
+@@ -104,8 +104,8 @@
+ ##########################################################################
+ # Rule for building shared library
+ ##########################################################################
+-libglfw.so: $(SHARED_OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
++libglfw.so.2.6: $(SHARED_OBJS)
++	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS) -Wl,-soname=$@
+ 
+ 
+ ##########################################################################
diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild
new file mode 100644
index 000000000000..c2a7b323a2a4
--- /dev/null
+++ b/media-libs/glfw/glfw-2.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.1 2007/11/11 07:34:19 tupone Exp $
+
+inherit eutils
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="http://glfw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="x11-libs/libXrandr
+	virtual/opengl"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
+		readme.html \
+		|| die "sed failed"
+	epatch "${FILESDIR}/${P}"-dyn.patch
+}
+
+src_compile() {
+	emake x11 || die "emake failed"
+}
+
+src_install() {
+	dolib.a lib/x11/libglfw.a || die "dolib.a failed"
+	dolib.so lib/x11/libglfw.so.2.6 || die "dolib.so failed"
+	dosym libglfw.so.2.6 /usr/lib/libglfw.so
+
+	insinto /usr/include/GL
+	doins include/GL/glfw.h || die "doins failed"
+	dohtml -r readme.html
+	insinto /usr/share/doc/${PF}/html/images
+	doins images/*
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/*.pdf
+
+	if use examples; then
+		local f
+		local MY_EXAMPLES="boing gears keytest listmodes mipmaps
+			mtbench mthello particles pong3d splitview
+			triangle wave"
+		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
+			pong3d_menu.tga pong3d_title.tga
+			pong3d_winner1.tga pong3d_winner2.tga"
+
+		insinto /usr/share/doc/${PF}/examples
+
+		doins examples/Makefile.x11
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}.c
+		done
+		for f in $MY_PICS; do
+			doins examples/${f}
+		done
+
+		insopts -m0755
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}
+		done
+	fi
+}