Missing shared library. Bug #107459

(Portage version: 2.1.1-r2)

4 files changed, 154 insertions, 2 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 9504277577d7..bad5c868ee8e 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glfw
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.5 2006/08/01 20:11:29 chutzpah Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.6 2007/02/07 19:27:28 tupone Exp $
+
+*glfw-2.5.0-r1 (07 Feb 2007)
+
+  07 Feb 2007; <tupone@gentoo.org> +files/glfw-2.5.0-dyn.patch,
+  +glfw-2.5.0-r1.ebuild:
+  Missing shared library. Bug #107459 by Olaf Leidinger
 
   01 Aug 2006; Patrick McLean <chutzpah@gentoo.org> glfw-2.5.0.ebuild:
   Add ~amd64 (bug #133282)
diff --git a/media-libs/glfw/files/digest-glfw-2.5.0-r1 b/media-libs/glfw/files/digest-glfw-2.5.0-r1
new file mode 100644
index 000000000000..4a0869948ce9
--- /dev/null
+++ b/media-libs/glfw/files/digest-glfw-2.5.0-r1
@@ -0,0 +1,3 @@
+MD5 c6dffefbfbe4415c915851b09e76edd9 glfw-2.5.0.tar.bz2 645993
+RMD160 4666e88285a20a74e1cbfecd1e6a918dbe88b817 glfw-2.5.0.tar.bz2 645993
+SHA256 cbf1164baebb00cc27039a406c873794e2b70caa0af0ae3348ed5062ecc26816 glfw-2.5.0.tar.bz2 645993
diff --git a/media-libs/glfw/files/glfw-2.5.0-dyn.patch b/media-libs/glfw/files/glfw-2.5.0-dyn.patch
new file mode 100644
index 000000000000..6adb48f89307
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.5.0-dyn.patch
@@ -0,0 +1,69 @@
+diff -Nur glfw-2.5-orig/compile.sh glfw-2.5/compile.sh
+--- glfw-2.5-orig/compile.sh	2004-07-24 22:36:46.000000000 +0200
++++ glfw-2.5/compile.sh	2005-09-28 09:11:09.906189824 +0200
+@@ -429,9 +429,9 @@
+ # Post fixups
+ ##########################################################################
+ if [ "x$use_gcc" = xyes ]; then
+-  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall"
+-  CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall"
+-  CFLAGS_LINK="$INCS -O3 -ffast-math -Wall"
++  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall -fPIC"
++  CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall -fPIC"
++  CFLAGS_LINK="$INCS -O3 -ffast-math -Wall -fPIC"
+ else
+   CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O"
+   CFLAGS="-c -I. -I.. $CFLAGS -O"
+diff -Nur glfw-2.5-orig/lib/x11/Makefile.x11.in glfw-2.5/lib/x11/Makefile.x11.in
+--- glfw-2.5-orig/lib/x11/Makefile.x11.in	2003-01-31 22:52:48.000000000 +0100
++++ glfw-2.5/lib/x11/Makefile.x11.in	2005-09-28 09:08:18.955178328 +0200
+@@ -2,14 +2,20 @@
+ ##########################################################################
+ # Default: Build GLFW static library
+ ##########################################################################
+-default: libglfw.a
++default: libglfw.a libglfw.so.2.5
+ 
+ 
+ ##########################################################################
+ # Library builder settings
+ ##########################################################################
+ MKLIB    = ar
++MKLIB_SO = gcc
++
+ LIBFLAGS = -rcs
++LIBFLAGS_SO = -shared -Wall $(OBJS) -lc -Wl,-soname
++
++SONAME = libglfw.so.2.5
++SONAMEVERSION = libglfw.so.2.5
+ 
+ 
+ ##########################################################################
+@@ -44,6 +50,10 @@
+ libglfw.a: $(OBJS)
+ 	$(MKLIB) $(LIBFLAGS) $@ $(OBJS)
+ 
++$(SONAME): $(OBJS)
++	$(MKLIB_SO) $(LIBFLAGS_SO) -Wl,$(SONAMEVERSION) -lGLU \
++	-lGL -lX11 -lXxf86vm -lXext -o $(SONAME)
++
+ 
+ ##########################################################################
+ # Rules for building library object files
+diff -Nur glfw-2.5-orig/lib/x11/x11_time.c glfw-2.5/lib/x11/x11_time.c
+--- glfw-2.5-orig/lib/x11/x11_time.c	2005-01-01 18:49:56.000000000 +0100
++++ glfw-2.5/lib/x11/x11_time.c	2005-09-28 09:09:38.251123512 +0200
+@@ -71,10 +71,12 @@
+ #endif // __i386
+ 
+ // Should we use inline x86 assembler?
++/* Disable for shared build */
++/*
+ #if defined(__i386) && defined(__GNUC__)
+ #define _USE_X86_ASM
+ #endif
+-
++*/
+ 
+ 
+ //************************************************************************
diff --git a/media-libs/glfw/glfw-2.5.0-r1.ebuild b/media-libs/glfw/glfw-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..9ef8c4bfa8aa
--- /dev/null
+++ b/media-libs/glfw/glfw-2.5.0-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.5.0-r1.ebuild,v 1.1 2007/02/07 19:27:28 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"
+
+RDEPEND="x11-libs/libXxf86vm
+	virtual/opengl"
+DEPEND="${RDEPEND}
+		x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P/.0/}
+
+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.5 || die "dolib.so failed"
+	dosym libglfw.so.2.5 /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
+}