* [gentoo-commits] dev/xmw:master commit in: app-misc/info-beamer/, app-misc/info-beamer/files/
@ 2014-02-12 23:33 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2014-02-12 23:33 UTC (permalink / raw
To: gentoo-commits
commit: cadf8d8f202c7d0b88b9748756a17afced31d00d
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Feb 12 23:30:46 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:30:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=cadf8d8f
Initial import
Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: 62EEF090
---
app-misc/info-beamer/ChangeLog | 7 ++++
app-misc/info-beamer/Manifest | 11 ++++++
.../files/info-beamer-1.0_pre3-pkgconfig.patch | 34 ++++++++++++++++
app-misc/info-beamer/info-beamer-1.0_pre3.ebuild | 45 ++++++++++++++++++++++
app-misc/info-beamer/info-beamer-9999.ebuild | 45 ++++++++++++++++++++++
app-misc/info-beamer/metadata.xml | 11 ++++++
6 files changed, 153 insertions(+)
diff --git a/app-misc/info-beamer/ChangeLog b/app-misc/info-beamer/ChangeLog
new file mode 100644
index 0000000..c2d7953
--- /dev/null
+++ b/app-misc/info-beamer/ChangeLog
@@ -0,0 +1,7 @@
+*info-beamer-1.0_pre3 (12 Feb 2014)
+*info-beamer-9999 (12 Feb 2014)
+
+ 12 Feb 2014; Michael Weber <xmw@gentoo.org>
+ +files/info-beamer-1.0_pre3-pkgconfig.patch, +info-beamer-1.0_pre3.ebuild,
+ +info-beamer-9999.ebuild, +metadata.xml:
+ Initial import
diff --git a/app-misc/info-beamer/Manifest b/app-misc/info-beamer/Manifest
new file mode 100644
index 0000000..6eb6c0f
--- /dev/null
+++ b/app-misc/info-beamer/Manifest
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST info-beamer-1.0_pre3.tar.gz 202355 SHA256 c6d3e2cc95c0159f5c33ee75af574d0b6944c56c68f87b18b38c641d3fbd157d SHA512 370842d94aa1787a593851496e91606c33da07a5071e2f59f8b7329c08fa839f09e948514bd3a097ea21c673f5a4ef9774bd79d245486701c8ef1ac2ca7ef61c WHIRLPOOL 36ff633a9cb82c8f42e39030aeca7ee9a875e7a4a0fd5c3da4c3119dd4775c85f8c3f9fc4959150ddcac86a55da3d9061aa2abd44094656b770203c7f0cff532
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlL8BCYACgkQknrdDGLu8JBMcgD/eC5265Hel1zYb5H/hgqP4p0b
++/c0IY5o7sm3ZxvC+y0A+wdTkxHZRkXiQBrSf63yM5aW4R4XbVJ79Ss56XU8CwEe
+=3t/d
+-----END PGP SIGNATURE-----
diff --git a/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
new file mode 100644
index 0000000..3d8dfab
--- /dev/null
+++ b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
@@ -0,0 +1,34 @@
+--- info-beamer-9999/Makefile
++++ info-beamer-9999/Makefile
+@@ -11,9 +11,9 @@
+ endif
+
+ ifdef USE_LUAJIT
+-LUA_CFLAGS ?= -I/usr/include/luajit-2.0
+-LUA_LDFLAGS ?= -lluajit-5.1
+-LUA_LUAC ?= luac
++LUA_CFLAGS ?= $(shell pkg-config --cflags luajit)
++LUA_LDFLAGS ?= $(shell pkg-config --libs luajit)
++LUA_LUAC ?= luac
+ CFLAGS += -DUSE_LUAJIT=1
+ else
+ #################################################
+@@ -24,14 +24,14 @@
+ # $ LUA_LDFLAGS=-llua make
+ #
+ #################################################
+-LUA_CFLAGS ?= -I/usr/include/lua5.1
+-LUA_LDFLAGS ?= -L/usr/lib -llua5.1
++LUA_CFLAGS ?= $(shell pkg-config --cflags lua)
++LUA_LDFLAGS ?= $(shell pkg-config --libs lua)
+ LUA_LUAC ?= luac
+ endif
+
+ CFLAGS += -DVERSION='"$(VERSION)"'
+-CFLAGS += $(LUA_CFLAGS) -I/usr/include/freetype2/ -I/usr/include/ffmpeg -std=c99 -Wall
+-LDFLAGS += $(LUA_LDFLAGS) -levent -lglfw -lGL -lGLU -lGLEW -lftgl -lIL -lILU -lavformat -lavcodec -lavutil -lswscale -lz
++CFLAGS += $(LUA_CFLAGS) $(shell pkg-config --cflags libevent libglfw gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale) -std=c99 -Wall
++LDFLAGS += $(LUA_LDFLAGS) $(shell pkg-config --libs libevent libglfw gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale)
+
+ prefix ?= /usr/local
+ exec_prefix ?= $(prefix)
diff --git a/app-misc/info-beamer/info-beamer-1.0_pre3.ebuild b/app-misc/info-beamer/info-beamer-1.0_pre3.ebuild
new file mode 100644
index 0000000..a06515d
--- /dev/null
+++ b/app-misc/info-beamer/info-beamer-1.0_pre3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils toolchain-funcs vcs-snapshot
+
+DESCRIPTION="allows to rapidly prototype interactive multimedia presentations using Lua"
+HOMEPAGE="http://info-beamer.org/"
+SRC_URI="https://github.com/dividuum/${PN}/archive/v-${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples luajit"
+
+RDEPEND="
+ dev-libs/libevent
+ media-libs/devil
+ media-libs/ftgl
+ media-libs/glew
+ media-libs/glfw
+ media-libs/glu
+ media-video/ffmpeg
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( <dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+ <dev-lang/lua-5.2
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-pkgconfig.patch
+}
+
+src_compile() {
+ emake $(usex luajit USE_LUAJIT=1 "") \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc ChangeLog README.{md,tlsf.txt}
+ use examples && dodoc -r samples/* contrib/remote
+}
diff --git a/app-misc/info-beamer/info-beamer-9999.ebuild b/app-misc/info-beamer/info-beamer-9999.ebuild
new file mode 100644
index 0000000..02221ac
--- /dev/null
+++ b/app-misc/info-beamer/info-beamer-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils git-r3 toolchain-funcs
+
+DESCRIPTION="allows to rapidly prototype interactive multimedia presentations using Lua"
+HOMEPAGE="http://info-beamer.org/"
+EGIT_REPO_URI="https://github.com/dividuum/info-beamer.git"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples luajit"
+
+RDEPEND="
+ dev-libs/libevent
+ media-libs/devil
+ media-libs/ftgl
+ media-libs/glew
+ media-libs/glfw
+ media-libs/glu
+ media-video/ffmpeg
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( <dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+ <dev-lang/lua-5.2
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0_pre3-pkgconfig.patch
+}
+
+src_compile() {
+ emake $(usex luajit USE_LUAJIT=1 "") \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc ChangeLog README.{md,tlsf.txt}
+ use examples && dodoc -r samples/* contrib/remote
+}
diff --git a/app-misc/info-beamer/metadata.xml b/app-misc/info-beamer/metadata.xml
new file mode 100644
index 0000000..064ba1a
--- /dev/null
+++ b/app-misc/info-beamer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+ <flag name="luajit">Use the lua just-in-time compiler dev-lang/luajit instead of dev-lang/lua</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] dev/xmw:master commit in: app-misc/info-beamer/, app-misc/info-beamer/files/
@ 2014-02-12 23:36 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2014-02-12 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 31de815f6420ad8cca476f0ac1af87e6b0c12b91
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Feb 12 23:36:40 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:36:40 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=31de815f
shorter patch
Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: 62EEF090
---
app-misc/info-beamer/ChangeLog | 4 ++++
app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app-misc/info-beamer/ChangeLog b/app-misc/info-beamer/ChangeLog
index c2d7953..b22cb01 100644
--- a/app-misc/info-beamer/ChangeLog
+++ b/app-misc/info-beamer/ChangeLog
@@ -1,3 +1,7 @@
+ 12 Feb 2014; Michael Weber <xmw@gentoo.org>
+ files/info-beamer-1.0_pre3-pkgconfig.patch:
+ shorter patch
+
*info-beamer-1.0_pre3 (12 Feb 2014)
*info-beamer-9999 (12 Feb 2014)
diff --git a/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
index 3d8dfab..c448580 100644
--- a/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
+++ b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
@@ -1,18 +1,16 @@
--- info-beamer-9999/Makefile
+++ info-beamer-9999/Makefile
-@@ -11,9 +11,9 @@
+@@ -11,8 +11,8 @@
endif
ifdef USE_LUAJIT
-LUA_CFLAGS ?= -I/usr/include/luajit-2.0
-LUA_LDFLAGS ?= -lluajit-5.1
--LUA_LUAC ?= luac
+LUA_CFLAGS ?= $(shell pkg-config --cflags luajit)
+LUA_LDFLAGS ?= $(shell pkg-config --libs luajit)
-+LUA_LUAC ?= luac
+ LUA_LUAC ?= luac
CFLAGS += -DUSE_LUAJIT=1
else
- #################################################
@@ -24,14 +24,14 @@
# $ LUA_LDFLAGS=-llua make
#
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: app-misc/info-beamer/, app-misc/info-beamer/files/
@ 2014-02-13 9:42 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2014-02-13 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 374824cb1573ca7bb03fc8c718ad7ef882c6bf3b
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu Feb 13 09:39:57 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 09:39:57 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=374824cb
Add glfw3 support
Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: 62EEF090
---
app-misc/info-beamer/ChangeLog | 7 +
app-misc/info-beamer/Manifest | 7 +-
.../info-beamer-1.0_pre3_p20140107-glfw3.patch | 163 +++++++++++++++++++++
...build => info-beamer-1.0_pre3_p20140107.ebuild} | 12 +-
app-misc/info-beamer/info-beamer-9999.ebuild | 6 +-
app-misc/info-beamer/metadata.xml | 1 +
6 files changed, 186 insertions(+), 10 deletions(-)
diff --git a/app-misc/info-beamer/ChangeLog b/app-misc/info-beamer/ChangeLog
index b22cb01..2c86a28 100644
--- a/app-misc/info-beamer/ChangeLog
+++ b/app-misc/info-beamer/ChangeLog
@@ -1,3 +1,10 @@
+*info-beamer-1.0_pre3_p20140107 (13 Feb 2014)
+
+ 13 Feb 2014; Michael Weber <xmw@gentoo.org>
+ +files/info-beamer-1.0_pre3_p20140107-glfw3.patch,
+ +info-beamer-1.0_pre3_p20140107.ebuild, info-beamer-9999.ebuild, metadata.xml:
+ Add glfw3 support
+
12 Feb 2014; Michael Weber <xmw@gentoo.org>
files/info-beamer-1.0_pre3-pkgconfig.patch:
shorter patch
diff --git a/app-misc/info-beamer/Manifest b/app-misc/info-beamer/Manifest
index 6eb6c0f..c5f9761 100644
--- a/app-misc/info-beamer/Manifest
+++ b/app-misc/info-beamer/Manifest
@@ -2,10 +2,11 @@
Hash: SHA256
DIST info-beamer-1.0_pre3.tar.gz 202355 SHA256 c6d3e2cc95c0159f5c33ee75af574d0b6944c56c68f87b18b38c641d3fbd157d SHA512 370842d94aa1787a593851496e91606c33da07a5071e2f59f8b7329c08fa839f09e948514bd3a097ea21c673f5a4ef9774bd79d245486701c8ef1ac2ca7ef61c WHIRLPOOL 36ff633a9cb82c8f42e39030aeca7ee9a875e7a4a0fd5c3da4c3119dd4775c85f8c3f9fc4959150ddcac86a55da3d9061aa2abd44094656b770203c7f0cff532
+DIST info-beamer-1.0_pre3_p20140107.tar.gz 203589 SHA256 83b5b1b10f03cc16092b6f2c19060546a1d4a05a67a1b8413f85fc8cc7557581 SHA512 0f40e82c3605f4fee1fc20785711fb2ef06740e6fc6591df747abaf35e20e376c0d846d495bd94ccc8ee56ff589f2e1f132b8cdee19bcecc72964756c754575a WHIRLPOOL fe6cc1ec8f197dc182d4077d62756464ae8ff972939454b2782bb5e35456afd960a4c91ea75ee9ec99e86c2197fee108652c2a9d5e7ba0a23bcb9d8257d0b0a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iF4EAREIAAYFAlL8BCYACgkQknrdDGLu8JBMcgD/eC5265Hel1zYb5H/hgqP4p0b
-+/c0IY5o7sm3ZxvC+y0A+wdTkxHZRkXiQBrSf63yM5aW4R4XbVJ79Ss56XU8CwEe
-=3t/d
+iF4EAREIAAYFAlL8ku0ACgkQknrdDGLu8JCbFwD/cYMVQAE3iCLn85fFpdfQ/CBL
+SIKlZ56KjYi1SJgQi/MA/1wdG1dW2rspzojBCKQsSU7hWI5wxiFOC1yMnnG5kP3C
+=iaYb
-----END PGP SIGNATURE-----
diff --git a/app-misc/info-beamer/files/info-beamer-1.0_pre3_p20140107-glfw3.patch b/app-misc/info-beamer/files/info-beamer-1.0_pre3_p20140107-glfw3.patch
new file mode 100644
index 0000000..7de6aa9
--- /dev/null
+++ b/app-misc/info-beamer/files/info-beamer-1.0_pre3_p20140107-glfw3.patch
@@ -0,0 +1,163 @@
+From 6b8bd1724df451f3b67f8eafd3d60338ef91752f Mon Sep 17 00:00:00 2001
+From: Florian Wesch <fw@dividuum.de>
+Date: Wed, 5 Feb 2014 15:33:21 +0100
+Subject: [PATCH] glfw3 support
+
+--- a/main.c
++++ b/main.c
+@@ -23,7 +23,7 @@
+ #include <GL/glew.h>
+ #include <GL/gl.h>
+ #include <GL/glext.h>
+-#include <GL/glfw.h>
++#include <GLFW/glfw3.h>
+ #include <IL/il.h>
+ #include <IL/ilu.h>
+ #include <libavformat/avformat.h>
+@@ -1079,23 +1079,25 @@ static void check_inotify() {
+ /*============ GUI ===========*/
+
+ static int win_w, win_h;
++static GLFWwindow *window;
+
+-static void GLFWCALL reshape(int width, int height) {
++static void reshape(GLFWwindow* window, int width, int height) {
+ win_w = width;
+ win_h = height;
+ fprintf(stderr, INFO("resized to %dx%d\n"), width, height);
+ }
+
+-static void GLFWCALL keypressed(int key, int action) {
+- if (action == GLFW_PRESS) {
+- switch (key) {
+- case GLFW_KEY_SPACE:
+- node_profiler();
+- break;
+- case GLFW_KEY_ESC:
+- running = 0;
+- break;
+- }
++static void keypressed(GLFWwindow* window, int key, int scancode, int action, int mods) {
++ if (action != GLFW_PRESS)
++ return;
++
++ switch (key) {
++ case GLFW_KEY_SPACE:
++ node_profiler();
++ break;
++ case GLFW_KEY_ESCAPE:
++ running = 0;
++ break;
+ }
+ }
+
+@@ -1359,11 +1361,12 @@ static void tick() {
+ glClear(GL_COLOR_BUFFER_BIT);
+ node_render_self(&root, win_w, win_h);
+
+- glfwSwapBuffers();
++ glfwSwapBuffers(window);
++ glfwPollEvents();
+
+ node_tree_gc(&root);
+
+- if (!glfwGetWindowParam(GLFW_OPENED))
++ if (glfwWindowShouldClose(window))
+ running = 0;
+ }
+
+@@ -1377,7 +1380,7 @@ static void init_default_texture() {
+
+ int main(int argc, char *argv[]) {
+ fprintf(stdout, VERSION_STRING " (" INFO_URL ")\n");
+- fprintf(stdout, "Copyright (c) 2013, Florian Wesch <fw@dividuum.de>\n\n");
++ fprintf(stdout, "Copyright (c) 2014, Florian Wesch <fw@dividuum.de>\n\n");
+
+ if (argc != 2 || (argc == 2 && !strcmp(argv[1], "-h"))) {
+ fprintf(stderr,
+@@ -1437,9 +1440,8 @@ int main(int argc, char *argv[]) {
+ open_tcp(&tcp_event);
+
+ glfwInit();
+- glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
+
+- int mode = getenv("INFOBEAMER_FULLSCREEN") ? GLFW_FULLSCREEN : GLFW_WINDOW;
++ int fullscreen = getenv("INFOBEAMER_FULLSCREEN") != NULL;
+ int width = 1024;
+ int height = 768;
+
+@@ -1453,22 +1455,30 @@ int main(int argc, char *argv[]) {
+
+ fprintf(stderr, INFO("initial size is %dx%d\n"), width, height);
+
+- if(!glfwOpenWindow(width, height, 8,8,8,8, 0,0, mode))
++ GLFWmonitor* monitor = glfwGetPrimaryMonitor();
++ if (!fullscreen)
++ monitor = NULL;
++
++ window = glfwCreateWindow(width, height, VERSION_STRING, monitor, NULL);
++ if (!window)
+ die("cannot open window");
+
++ glfwSetFramebufferSizeCallback(window, reshape);
++ glfwSetKeyCallback(window, keypressed);
++
++ glfwMakeContextCurrent(window);
++ glfwSwapInterval(1);
++
++ glfwGetFramebufferSize(window, &win_w, &win_h);
++
+ GLenum err = glewInit();
+ if (err != GLEW_OK)
+ die("cannot initialize glew");
+ if (!glewIsSupported("GL_VERSION_2_0"))
+ die("need opengl 2.0 support\n");
+
+- glfwSetWindowTitle(VERSION_STRING);
+- glfwSwapInterval(1);
+- glfwSetWindowSizeCallback(reshape);
+- glfwSetKeyCallback(keypressed);
+-
+- if (mode == GLFW_FULLSCREEN)
+- glfwDisable(GLFW_MOUSE_CURSOR);
++ if (fullscreen)
++ glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+
+ ilInit();
+ iluInit();
+--
+1.8.5.1
+
+--- info-beamer-1.0_pr3/Makefile
++++ info-beamer-1.0_pr3/Makefile
+@@ -30,8 +30,8 @@ LUA_LUAC ?= luac
+ endif
+
+ CFLAGS += -DVERSION='"$(VERSION)"'
+-CFLAGS += $(LUA_CFLAGS) $(shell pkg-config --cflags libevent libglfw gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale) -std=c99 -Wall
+-LDFLAGS += $(LUA_LDFLAGS) $(shell pkg-config --libs libevent libglfw gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale)
++CFLAGS += $(LUA_CFLAGS) $(shell pkg-config --cflags libevent glfw3 gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale) -std=c99 -Wall
++LDFLAGS += $(LUA_LDFLAGS) $(shell pkg-config --libs libevent glfw3 gl glu glew ftgl IL ILU libavformat libavcodec libavutil libswscale)
+
+ prefix ?= /usr/local
+ exec_prefix ?= $(prefix)
+--- info-beamer-9999/font.c
++++ info-beamer-9999/font.c
+@@ -5,7 +5,6 @@
+ #include <unistd.h>
+
+ #include <GL/gl.h>
+-#include <GL/glfw.h>
+ #include <FTGL/ftgl.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
+--- info-beamer-9999/shader.c
++++ info-beamer-9999/shader.c
+@@ -6,7 +6,6 @@
+
+ #include <GL/glew.h>
+ #include <GL/gl.h>
+-#include <GL/glfw.h>
+ #include <FTGL/ftgl.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
diff --git a/app-misc/info-beamer/info-beamer-9999.ebuild b/app-misc/info-beamer/info-beamer-1.0_pre3_p20140107.ebuild
similarity index 73%
copy from app-misc/info-beamer/info-beamer-9999.ebuild
copy to app-misc/info-beamer/info-beamer-1.0_pre3_p20140107.ebuild
index 02221ac..6f0298e 100644
--- a/app-misc/info-beamer/info-beamer-9999.ebuild
+++ b/app-misc/info-beamer/info-beamer-1.0_pre3_p20140107.ebuild
@@ -4,25 +4,26 @@
EAPI=5
-inherit eutils git-r3 toolchain-funcs
+inherit eutils toolchain-funcs vcs-snapshot
DESCRIPTION="allows to rapidly prototype interactive multimedia presentations using Lua"
HOMEPAGE="http://info-beamer.org/"
-EGIT_REPO_URI="https://github.com/dividuum/info-beamer.git"
+SRC_URI="https://github.com/dividuum/${PN}/tarball/8309433 -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS=""
-IUSE="examples luajit"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples glfw2 luajit"
RDEPEND="
dev-libs/libevent
media-libs/devil
media-libs/ftgl
media-libs/glew
- media-libs/glfw
media-libs/glu
media-video/ffmpeg
+ glfw2? ( <media-libs/glfw-3 )
+ !glfw2? ( >media-libs/glfw-3 )
luajit? ( dev-lang/luajit:2 )
!luajit? ( <dev-lang/lua-5.2 )"
DEPEND="${RDEPEND}
@@ -31,6 +32,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0_pre3-pkgconfig.patch
+ use glfw2 || epatch "${FILESDIR}"/${P}-glfw3.patch
}
src_compile() {
diff --git a/app-misc/info-beamer/info-beamer-9999.ebuild b/app-misc/info-beamer/info-beamer-9999.ebuild
index 02221ac..d735f89 100644
--- a/app-misc/info-beamer/info-beamer-9999.ebuild
+++ b/app-misc/info-beamer/info-beamer-9999.ebuild
@@ -13,16 +13,17 @@ EGIT_REPO_URI="https://github.com/dividuum/info-beamer.git"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS=""
-IUSE="examples luajit"
+IUSE="examples glfw2 luajit"
RDEPEND="
dev-libs/libevent
media-libs/devil
media-libs/ftgl
media-libs/glew
- media-libs/glfw
media-libs/glu
media-video/ffmpeg
+ glfw2? ( <media-libs/glfw-3 )
+ !glfw2? ( >media-libs/glfw-3 )
luajit? ( dev-lang/luajit:2 )
!luajit? ( <dev-lang/lua-5.2 )"
DEPEND="${RDEPEND}
@@ -31,6 +32,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0_pre3-pkgconfig.patch
+ use glfw2 || epatch "${FILESDIR}"/${PN}-1.0_pre3_p20140107-glfw3.patch
}
src_compile() {
diff --git a/app-misc/info-beamer/metadata.xml b/app-misc/info-beamer/metadata.xml
index 064ba1a..d574e03 100644
--- a/app-misc/info-beamer/metadata.xml
+++ b/app-misc/info-beamer/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<use>
<flag name="luajit">Use the lua just-in-time compiler dev-lang/luajit instead of dev-lang/lua</flag>
+ <flag name="glfw2">Use do not patch for glfw3 support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-13 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-12 23:33 [gentoo-commits] dev/xmw:master commit in: app-misc/info-beamer/, app-misc/info-beamer/files/ Michael Weber
-- strict thread matches above, loose matches on Subject: below --
2014-02-12 23:36 Michael Weber
2014-02-13 9:42 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox