From: Alfredo Tupone Date: Wed, 7 Feb 2007 19:27:28 +0000 (+0000) Subject: Missing shared library. Bug #107459 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b24a90c43d241ed7840544f32fae7ddccce49828;p=gentoo.git Missing shared library. Bug #107459 Package-Manager: portage-2.1.1-r2 --- 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; +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 glfw-2.5.0.ebuild: Add ~amd64 (bug #133282) diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest index 8a95c0822288..f7ed3113b306 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,12 +1,23 @@ -DIST glfw-2.5.0.tar.bz2 645993 RMD160 4666e88285a20a74e1cbfecd1e6a918dbe88b817 SHA256 cbf1164baebb00cc27039a406c873794e2b70caa0af0ae3348ed5062ecc26816 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX glfw-2.5.0-dyn.patch 2444 RMD160 c0585ca392f3d4be50734031c26d1d833a663e5a SHA1 1ab115228fb916167dfef148214e208d3bdcec17 SHA256 0f9a40a10fe9c123746a47db662c632639f6c6f4d223e826b0cb5232b5d8db90 +MD5 d4f714603a1c36bad83863e858ee6c54 files/glfw-2.5.0-dyn.patch 2444 +RMD160 c0585ca392f3d4be50734031c26d1d833a663e5a files/glfw-2.5.0-dyn.patch 2444 +SHA256 0f9a40a10fe9c123746a47db662c632639f6c6f4d223e826b0cb5232b5d8db90 files/glfw-2.5.0-dyn.patch 2444 +DIST glfw-2.5.0.tar.bz2 645993 RMD160 4666e88285a20a74e1cbfecd1e6a918dbe88b817 SHA1 53cb1ce1b6106f8d187c5dce8fc266d7ee44b87f SHA256 cbf1164baebb00cc27039a406c873794e2b70caa0af0ae3348ed5062ecc26816 +EBUILD glfw-2.5.0-r1.ebuild 1719 RMD160 6c67e44f84ec5adbe91b9325f4c261c71a050472 SHA1 0f5a9dd807ff6b3b309e42663ceee3e2e46ff74c SHA256 1226ccb609876cb9d1f9ff4bae4997dfa1ab66b5629fe84dcbf719a55eb20359 +MD5 12bd7afeb1b34e933ed92e4c41dfbc4c glfw-2.5.0-r1.ebuild 1719 +RMD160 6c67e44f84ec5adbe91b9325f4c261c71a050472 glfw-2.5.0-r1.ebuild 1719 +SHA256 1226ccb609876cb9d1f9ff4bae4997dfa1ab66b5629fe84dcbf719a55eb20359 glfw-2.5.0-r1.ebuild 1719 EBUILD glfw-2.5.0.ebuild 1611 RMD160 d7485b4b3c5a0792cba5e0238631c3228becefec SHA1 5b8399c3695bb466e77c5af9cbe8265b2076830a SHA256 71eaf0023c61d4ea94287a97029998f1154b78b9b707bb036c2b3df0e607580a MD5 869d52a59baae4a9fa5545259273773e glfw-2.5.0.ebuild 1611 RMD160 d7485b4b3c5a0792cba5e0238631c3228becefec glfw-2.5.0.ebuild 1611 SHA256 71eaf0023c61d4ea94287a97029998f1154b78b9b707bb036c2b3df0e607580a glfw-2.5.0.ebuild 1611 -MISC ChangeLog 849 RMD160 0424f30f953df6fb616e2c9ac3d0a5849bcacbf8 SHA1 eb93515df06a3fbc0e9ddb0eea282b1d55324c71 SHA256 36d034a5dcee502f7b6ed195de1c9568378e2669e70a02aa8159332aa54c65b7 -MD5 cdab24792d7c6ce882e63d98501c588b ChangeLog 849 -RMD160 0424f30f953df6fb616e2c9ac3d0a5849bcacbf8 ChangeLog 849 -SHA256 36d034a5dcee502f7b6ed195de1c9568378e2669e70a02aa8159332aa54c65b7 ChangeLog 849 +MISC ChangeLog 1023 RMD160 b18d9f50ed1082fb0891cba1285e3ef391dfa777 SHA1 78119533c480c9cdcc061381f3580c7ca13028dc SHA256 a4395f1f7258791e1985edda40cd3b81663a87b6b6a46ebde06ab3aa1baaf141 +MD5 4aa16412cd1fc9fd1b1fe87258e5d14e ChangeLog 1023 +RMD160 b18d9f50ed1082fb0891cba1285e3ef391dfa777 ChangeLog 1023 +SHA256 a4395f1f7258791e1985edda40cd3b81663a87b6b6a46ebde06ab3aa1baaf141 ChangeLog 1023 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -14,3 +25,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 bfddea95a1430fd89f791461dbc49fd9 files/digest-glfw-2.5.0 235 RMD160 b65c33155b66bd2e504539062db0cb4c436a34e6 files/digest-glfw-2.5.0 235 SHA256 401c6e83eeaf787a42b5723c0894d3849f3fc78e6a4dfb1112b6c68662fdb15b files/digest-glfw-2.5.0 235 +MD5 bfddea95a1430fd89f791461dbc49fd9 files/digest-glfw-2.5.0-r1 235 +RMD160 b65c33155b66bd2e504539062db0cb4c436a34e6 files/digest-glfw-2.5.0-r1 235 +SHA256 401c6e83eeaf787a42b5723c0894d3849f3fc78e6a4dfb1112b6c68662fdb15b files/digest-glfw-2.5.0-r1 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFyig/bfN2jvlVAhwRAkjKAJ9vbPU+/Pp9/4CbwgXRi0Tb2s9MjQCfdpkZ +i9GzS3j5LWz+njMmjedOhE0= +=ijPn +-----END PGP SIGNATURE----- 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 +}