summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-02-22 22:08:57 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-02-22 22:08:57 +0000
commita6d3e7f073a23667a161245b23ef2d6093c092da (patch)
tree2b67b4006769c1f84b480628b5f15556c1ad2787 /media-libs
parentFix bug #259210. (diff)
downloadhistorical-a6d3e7f073a23667a161245b23ef2d6093c092da.tar.gz
historical-a6d3e7f073a23667a161245b23ef2d6093c092da.tar.bz2
historical-a6d3e7f073a23667a161245b23ef2d6093c092da.zip
EAPI=2; call get_libdir; install pkgconfig file; patch submitted by Nathan Brink via bug #259780
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/glfw/ChangeLog8
-rw-r--r--media-libs/glfw/Manifest4
-rw-r--r--media-libs/glfw/glfw-2.6.ebuild16
3 files changed, 17 insertions, 11 deletions
diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 73765f11614e..66edc05b544d 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,10 @@
# 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.8 2007/11/11 07:34:19 tupone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.9 2009/02/22 22:08:57 mr_bones_ Exp $
+
+ 22 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> glfw-2.6.ebuild:
+ EAPI=2; call get_libdir; install pkgconfig file; patch submitted by Nathan
+ Brink via bug #259780
*glfw-2.6 (11 Nov 2007)
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index a97fbc103ac4..5ef33adac040 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -4,6 +4,6 @@ DIST glfw-2.5.0.tar.bz2 645993 RMD160 4666e88285a20a74e1cbfecd1e6a918dbe88b817 S
DIST glfw-2.6.tar.bz2 886843 RMD160 71c767e16167e8460fbfb01391614b2501247c7e SHA1 7b11e5a9d923c9826d4cc6eeeb441dc6940109c8 SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca
EBUILD glfw-2.5.0-r1.ebuild 1719 RMD160 6c67e44f84ec5adbe91b9325f4c261c71a050472 SHA1 0f5a9dd807ff6b3b309e42663ceee3e2e46ff74c SHA256 1226ccb609876cb9d1f9ff4bae4997dfa1ab66b5629fe84dcbf719a55eb20359
EBUILD glfw-2.5.0.ebuild 1564 RMD160 a4cee06d36dd22227f86cc10a17f183d6a2af5ef SHA1 ab4f8e38b3e1acd18e385b5b9503e8b44cd910b8 SHA256 402a9dac1d9984fe8bc842bf8b6162872225dbdf3cb31effa1a2e75899a437c9
-EBUILD glfw-2.6.ebuild 1660 RMD160 9751830d9528cd56b5aae6cb77e9cd4166b8b5bc SHA1 c9108c66b32199720a0105f2b76d1296bf765e05 SHA256 84982f127050e0cbaa11bb82f71a75af8a4cf0a4df9e1c78ff7e0d0e0afb38e5
-MISC ChangeLog 1306 RMD160 d2748497fced06b665699a0a100462c62a8c7466 SHA1 e64b4903a48b4136c89384643a5c480c87e599a1 SHA256 7dbcb27a89821fa30b18df40ecb47a76786fbb5e70651a5711fb81a64b5df207
+EBUILD glfw-2.6.ebuild 1849 RMD160 b1d758e0abcd64d3069da15e527a24fa1014c1f5 SHA1 fffc5aa4cb3bb05b6931f5be1213cf1048e65784 SHA256 a4f04e2581e25ee81c4c87d5e7c3b644f07a3a55a96b4f5c8f67471a06d753b9
+MISC ChangeLog 1483 RMD160 fb9658bd63cce40b894269edb3c7663e481306a4 SHA1 512a5b96c0cc5fb774a85bfc33424f8b99e69486 SHA256 3806a7a7543899b92c011641102a16cefd36bec089038f2393ef37318a437d01
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild
index c2a7b323a2a4..e6bf9ad0a65f 100644
--- a/media-libs/glfw/glfw-2.6.ebuild
+++ b/media-libs/glfw/glfw-2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.2 2009/02/22 22:08:57 mr_bones_ Exp $
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
DESCRIPTION="The Portable OpenGL FrameWork"
HOMEPAGE="http://glfw.sourceforge.net/"
@@ -18,9 +19,7 @@ DEPEND="x11-libs/libXrandr
S=${WORKDIR}/${PN}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
sed -i \
-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
readme.html \
@@ -30,13 +29,16 @@ src_unpack() {
src_compile() {
emake x11 || die "emake failed"
+ emake -C lib/x11 PREFIX=/usr -f Makefile.x11 libglfw.pc || die "emake libglfw.pc 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
+ dosym libglfw.so.2.6 /usr/$(get_libdir)/libglfw.so
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins lib/x11/libglfw.pc || die "doins failed"
insinto /usr/include/GL
doins include/GL/glfw.h || die "doins failed"
dohtml -r readme.html