version bump wrt #405555

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 166 insertions, 1 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 0d3437c929b2..8c71e767d470 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glfw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.14 2012/11/14 23:31:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.15 2012/11/19 20:48:37 hasufell Exp $
+
+*glfw-2.7.7 (19 Nov 2012)
+
+  19 Nov 2012; Julian Ospald <hasufell@gentoo.org> +glfw-2.7.7.ebuild,
+  +files/glfw-2.7.7-dyn.patch, +files/glfw-2.7.7-pkgconfig.patch:
+  version bump wrt #405555
 
   14 Nov 2012; Julian Ospald <hasufell@gentoo.org> glfw-2.6.ebuild:
   respect CFLAGS, CC, AR and whatnot wrt #442740
diff --git a/media-libs/glfw/files/glfw-2.7.7-dyn.patch b/media-libs/glfw/files/glfw-2.7.7-dyn.patch
new file mode 100644
index 000000000000..4dc4cc242ee7
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.7-dyn.patch
@@ -0,0 +1,31 @@
+--- lib/x11/Makefile.x11.in
++++ lib/x11/Makefile.x11.in
+@@ -8,7 +8,7 @@
+ ##########################################################################
+ # Default: Build GLFW static library
+ ##########################################################################
+-all: libglfw.a libglfw.so
++all: libglfw.a libglfw.so.2.7.7
+ 
+ 
+ ##########################################################################
+@@ -112,7 +112,7 @@
+ ##########################################################################
+ # Rule for building shared library
+ ##########################################################################
+-libglfw.so: $(SHARED_OBJS)
++libglfw.so.2.7.7: $(SHARED_OBJS)
+ 	$(CC) $(SOFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+ 
+ 
+--- compile.sh
++++ compile.sh
+@@ -88,7 +88,7 @@
+ case "x`uname 2> /dev/null`" in
+ xLinux)
+   GLFW_LIB_CFLAGS="$GLFW_LIB_CFLAGS -D_GLFW_USE_LINUX_JOYSTICKS"
+-  SOFLAGS="-shared -Wl,-soname,libglfw.so"
++  SOFLAGS="-shared -Wl,-soname,libglfw.so.2.7.7"
+   echo "Linux" 1>&6
+   ;;
+ xDarwin)
diff --git a/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch b/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
new file mode 100644
index 000000000000..e880995c1a6b
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
@@ -0,0 +1,37 @@
+support libsuffix, fix version
+
+--- lib/x11/Makefile.x11.in
++++ lib/x11/Makefile.x11.in
+@@ -3,6 +3,7 @@
+ # Installation prefix (default to /usr/local)
+ ##########################################################################
+ PREFIX ?= /usr/local
++LIBDIR ?= lib
+ 
+ 
+ ##########################################################################
+@@ -99,7 +100,7 @@
+ # Rule for building libglfw.pc
+ ##########################################################################
+ libglfw.pc: libglfw.pc.in
+-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
++	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' -e 's,\@LIBDIR@,$(LIBDIR),' libglfw.pc.in > libglfw.pc
+ 
+ 
+ ##########################################################################
+--- compile.sh
++++ compile.sh
+@@ -734,11 +734,11 @@
+ prefix=@PREFIX@
+ exec_prefix=\${prefix}
+ includedir=\${prefix}/include
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/@LIBDIR@
+ 
+ Name: GLFW
+ Description: A portable framework for OpenGL development
+-Version: 2.7.4
++Version: 2.7.7
+ URL: http://www.glfw.org/
+ Requires.private: gl x11 $PKG_LIBS
+ Libs: -L\${libdir} -lglfw $LFLAGS_THREAD $LFLAGS_CLOCK
diff --git a/media-libs/glfw/glfw-2.7.7.ebuild b/media-libs/glfw/glfw-2.7.7.ebuild
new file mode 100644
index 000000000000..97548e8931b4
--- /dev/null
+++ b/media-libs/glfw/glfw-2.7.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v 1.1 2012/11/19 20:48:37 hasufell Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+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/libX11
+	x11-libs/libXrandr
+	virtual/glu
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
+		readme.html \
+		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-{dyn,pkgconfig}.patch
+
+	# respect ldflags
+	sed -i \
+		-e "s/\$(LFLAGS)/\$(LDFLAGS) \$(LFLAGS)/" \
+		{lib/x11,examples}/Makefile.x11.in || die "sed Makefile.x11.in failed"
+
+	# respect cflags in linking command
+	# build system is messing up CFLAGS variable, so sed is the easy way to go
+	sed -i \
+		-e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \
+		lib/x11/Makefile.x11.in \
+		|| die "sed Makefile.x11.in failed"
+}
+
+src_configure() {
+	sh ./compile.sh
+}
+
+src_compile() {
+	emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr LIBDIR=$(get_libdir) -f Makefile.x11 all libglfw.pc
+	use examples && emake -C examples CC=$(tc-getCC) -f Makefile.x11 all
+}
+
+src_install() {
+	dolib.a lib/x11/libglfw.a
+	dolib.so lib/x11/libglfw.so.2.7.7
+	dosym libglfw.so.2.7.7 /usr/$(get_libdir)/libglfw.so
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins lib/x11/libglfw.pc
+	doheader -r include/GL
+	dohtml -r readme.html
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/*.pdf
+	dodoc docs/readme.txt
+
+	if use examples; then
+		local f
+		local MY_EXAMPLES="boing gears 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"
+
+		docompress -x /usr/share/doc/${PF}/examples
+		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
+}