[packages/vsxu] - updated to 0.5.1 - updated glfw3,system-ftgl patches
qboosh
qboosh at pld-linux.org
Fri Mar 4 22:35:35 CET 2016
commit 43efdf4b74dcf4c4ebc74912c5ba1a46109bd2b0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 4 22:39:07 2016 +0100
- updated to 0.5.1
- updated glfw3,system-ftgl patches
vsxu-glfw3.patch | 706 ++++++++++++++++++++++++++++++++++---------------
vsxu-system-ftgl.patch | 124 +++++++--
vsxu.spec | 17 +-
3 files changed, 604 insertions(+), 243 deletions(-)
---
diff --git a/vsxu.spec b/vsxu.spec
index a75dfa3..8396637 100644
--- a/vsxu.spec
+++ b/vsxu.spec
@@ -6,12 +6,13 @@
Summary: VSXu Music Visualizer
Summary(pl.UTF-8): VSXu - wizualizacja muzyki
Name: vsxu
-Version: 0.4.2
-Release: 5
-License: GPL v2
+Version: 0.5.1
+Release: 1
+License: GPL v3
Group: Libraries
-Source0: https://github.com/vovoid/vsxu/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bbd73438386aa3eede5c3b104d706104
+#Source0Download: https://github.com/vovoid/vsxu/releases
+Source0: https://github.com/vovoid/vsxu/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: b4c31f1b0e9def4fa4920341cda3708f
Patch0: %{name}-glfw3.patch
Patch1: %{name}-icons.patch
Patch2: %{name}-desktop.patch
@@ -112,9 +113,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
# COPYING contains copyright notes, not only GPL text
-%doc CHANGELOG COPYING README.md TODO
+%doc AUTHORS CHANGELOG COPYING README.md
+%attr(755,root,root) %{_bindir}/obj2vxm
+%attr(755,root,root) %{_bindir}/vsxl
%attr(755,root,root) %{_bindir}/vsxu_artiste
%attr(755,root,root) %{_bindir}/vsxu_player
+%attr(755,root,root) %{_bindir}/vsxu_profiler
%attr(755,root,root) %{_bindir}/vsxu_server
%attr(755,root,root) %{_bindir}/vsxz
%dir %{_libdir}/vsxu
@@ -135,6 +139,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libvsxu_engine.so
%attr(755,root,root) %{_libdir}/libvsxu_engine_audiovisual.so
%attr(755,root,root) %{_libdir}/libvsxu_engine_graphics.so
+%attr(755,root,root) %{_libdir}/libvsx_widget.so
%files devel
%defattr(644,root,root,755)
diff --git a/vsxu-glfw3.patch b/vsxu-glfw3.patch
index cf9eff5..3da5811 100644
--- a/vsxu-glfw3.patch
+++ b/vsxu-glfw3.patch
@@ -9,25 +9,18 @@
HINTS
$ENV{GLFW_ROOT}
PATH_SUFFIX include #For finding the include file under the root of the glfw expanded archive, typically on Windows.
-@@ -46,4 +46,4 @@
- )
-
- INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)
-\ Brak znaku nowej linii na ko�cu pliku
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)
---- vsxu-0.4.2/artiste/src/vsx_widget/server/vsx_widget_comp.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/artiste/src/vsx_widget/server/vsx_widget_comp.cpp 2014-01-01 18:11:47.472199591 +0100
-@@ -47,7 +47,7 @@
- #include "controllers/vsx_widget_base_controller.h"
- #include "controllers/vsx_widget_editor.h"
-
+--- vsxu-0.5.1/artiste/src/vsx_widget/server/vsx_widget_comp.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/artiste/src/vsx_widget/server/vsx_widget_comp.cpp 2016-03-02 17:54:59.490833843 +0100
+@@ -45,7 +45,7 @@
+ #include "widgets/vsx_widget_popup_menu.h"
+ #include "vsx_data_path.h"
+ #include <gl_helper.h>
-#include <GL/glfw.h>
+#include <GLFW/glfw3.h>
- using namespace std;
- // VSX_WIDGET_COMPONENT **************************************************************************************************>
-@@ -1677,7 +1677,7 @@
+ // widget
+ #include <dialogs/dialog_query_string.h>
+@@ -1680,7 +1680,7 @@
VSX_UNUSED(alt);
VSX_UNUSED(ctrl);
VSX_UNUSED(shift);
@@ -36,98 +29,18 @@
{
if (((vsx_widget_server*)(this->server))->selected_list.size())
for (std::list<vsx_widget*>::iterator itx = ((vsx_widget_server*)server)->selected_list.begin(); itx != ((vsx_widget_server*)server)->selected_list.end(); ++itx) {
---- vsxu-0.4.2/artiste/src/vsx_widget/lib/vsx_widget_base_edit.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/artiste/src/vsx_widget/lib/vsx_widget_base_edit.cpp 2014-01-01 18:57:50.892083624 +0100
-@@ -35,7 +35,7 @@
- #include "vsx_widget_panel.h"
- #include "vsx_widget_base_edit.h"
- #include <stdlib.h>
--#include "GL/glfw.h"
-+#include <GLFW/glfw3.h>
-
-
- vsx_widget_base_edit::vsx_widget_base_edit() {
-@@ -663,7 +663,7 @@
- }
- break;
- // page up
-- case -GLFW_KEY_PAGEUP:
-+ case -GLFW_KEY_PAGE_UP:
- if (!single_row) {
- for (int zz = 0; zz < characters_height*0.95; ++zz) {
- event_key_down(-GLFW_KEY_UP);
-@@ -684,7 +684,7 @@
- }
- break;
- // page down
-- case -GLFW_KEY_PAGEDOWN:
-+ case -GLFW_KEY_PAGE_DOWN:
- if (!single_row) {
- for (int zz = 0; zz < characters_height*0.95; ++zz) {
- event_key_down(-GLFW_KEY_DOWN,false,false,false);
-@@ -741,7 +741,7 @@
- if (mirror_keystrokes_object) mirror_keystrokes_object->event_key_down(key, alt, ctrl, shift);
- break;
- // delete
-- case -GLFW_KEY_DEL:
-+ case -GLFW_KEY_DELETE:
- event_key_down(-GLFW_KEY_RIGHT,false,false,false);
- event_key_down(-GLFW_KEY_BACKSPACE,false,false,false);
- process_line(carety+(int)scroll_y);
-@@ -779,7 +779,7 @@
- if (mirror_keystrokes_object) mirror_keystrokes_object->event_key_down(key, alt, ctrl, shift);
- break;
- // esc
-- case -GLFW_KEY_ESC:
-+ case -GLFW_KEY_ESCAPE:
- // da rest:
- if (single_row) {
- command_q_b.add_raw("cancel");
---- vsxu-0.4.2/artiste/src/vsx_widget/vsx_widget_desktop.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/artiste/src/vsx_widget/vsx_widget_desktop.cpp 2014-01-01 19:43:16.708635899 +0100
-@@ -60,7 +60,7 @@
- #include "lib/vsx_widget_base_edit.h"
-
- #include "vsx_widget_desktop.h"
--#include "GL/glfw.h"
-+#include <GLFW/glfw3.h>
-
- // VSX_WIDGET_DESKTOP **************************************************************************************************
- // VSX_WIDGET_DESKTOP **************************************************************************************************
-@@ -192,8 +192,8 @@
- case -GLFW_KEY_DOWN: case -'D': case -'d':{ interpolating = false;ypd=-1.0;} break;
- case -GLFW_KEY_LEFT: case -'s': case -'S':{ interpolating = false;xpd=-1.0;} break;
- case -GLFW_KEY_RIGHT: case -'F': case -'f':{ interpolating = false;xpd=1.0;} break;
-- case -GLFW_KEY_PAGEUP: case -'R': case -'r':{ interpolating = false;zpd=-1.0;} break;
-- case -GLFW_KEY_PAGEDOWN: case -'W': case -'w':{ interpolating = false;zpd=1.0;} break;
-+ case -GLFW_KEY_PAGE_UP: case -'R': case -'r':{ interpolating = false;zpd=-1.0;} break;
-+ case -GLFW_KEY_PAGE_DOWN: case -'W': case -'w':{ interpolating = false;zpd=1.0;} break;
- } // switch
- } else {
- return true;
-@@ -213,8 +213,8 @@
- case GLFW_KEY_DOWN: case 'D': case 'd': ypd=0.0; break;
- case GLFW_KEY_LEFT: case 'S': case 's': xpd=0.0; break;
- case GLFW_KEY_RIGHT: case 'F': case 'f': xpd=0.0; break;
-- case GLFW_KEY_PAGEUP: case 'R': case 'r': zpd=0.0; break;
-- case GLFW_KEY_PAGEDOWN: case 'W': case 'w': zpd=0.0; break;
-+ case GLFW_KEY_PAGE_UP: case 'R': case 'r': zpd=0.0; break;
-+ case GLFW_KEY_PAGE_DOWN: case 'W': case 'w': zpd=0.0; break;
- case GLFW_KEY_TAB: ((vsxu_assistant*)assistant)->toggle_size(); break;
- }
- } else {
---- vsxu-0.4.2/artiste/src/artiste_main.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/artiste/src/artiste_main.cpp 2014-01-01 19:53:05.085277871 +0100
-@@ -26,7 +26,7 @@
- #include "vsx_string.h"
+--- vsxu-0.5.1/artiste/src/artiste_main.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/artiste/src/artiste_main.cpp 2016-03-02 18:31:13.680742600 +0100
+@@ -27,7 +27,7 @@
+ #include <vsx_string_helper.h>
#include <vsx_argvector.h>
#include <GL/glew.h>
-#include "GL/glfw.h"
+#include <GLFW/glfw3.h>
- #include "application.h"
+ #include "artiste_application.h"
#include "vsxfst.h"
#include "vsx_version.h"
-@@ -73,9 +73,9 @@
+@@ -70,9 +70,9 @@
void set_modifiers()
{
@@ -140,7 +53,7 @@
}
long key_pressed = -1;
-@@ -84,18 +84,14 @@
+@@ -81,14 +81,10 @@
float key_repeat_time;
float initial_key_delay = 0.04f;
@@ -155,13 +68,21 @@
- }
}
+ void app_close_window()
+@@ -93,10 +89,10 @@
+
+ void app_close_window()
+ {
+- glfwCloseWindow();
++ glfwDestroyWindow(glfwGetCurrentContext());
+ }
-void GLFWCALL key_event(int key, int action)
+void key_event(GLFWwindow *window, int key, int scancode, int action, int mods)
{
set_modifiers();
if (action == GLFW_PRESS)
-@@ -110,12 +110,12 @@
+@@ -115,12 +111,12 @@
}
}
@@ -177,7 +98,7 @@
set_modifiers();
unsigned long i_but = 0;
switch (button)
-@@ -141,12 +137,12 @@
+@@ -142,26 +138,26 @@
int mouse_pos_type = 0;
@@ -192,9 +113,9 @@
if (mouse_state) mouse_pos_type = 1;
else mouse_pos_type = 2;
}
-@@ -153,14 +149,14 @@
- int mousewheel_prev_pos = 0;
+-int mousewheel_prev_pos = 0;
++double mousewheel_prev_pos = 0;
-void GLFWCALL mouse_wheel(int pos)
+void mouse_wheel(GLFWwindow *window, double xoffset, double yoffset)
@@ -209,19 +130,19 @@
-void GLFWCALL window_size( int width, int height )
+void window_size( GLFWwindow *window, int width, int height )
{
- vsx_printf("change viewport %d %d\n", width, height);
- gl_state.viewport_change(0,0,width, height);
-@@ -207,7 +207,8 @@
+ vsx_gl_state::get_instance()->viewport_change(0,0,width, height);
+ }
+@@ -206,7 +202,8 @@
+ glfwInit();
set_modifiers();
-
- int width, height, running, frames, x, y;
+ int width, height, running, frames;
+ double x, y;
double t, t1;
- unsigned long usleep_framelimit;
char titlestr[ 200 ];
-@@ -256,35 +257,33 @@
+
+@@ -249,24 +246,24 @@
if (start_fullscreen && !manual_resolution_set)
{
// try to get the resolution from the desktop for fullscreen
@@ -235,7 +156,7 @@
}
- if (app_argv.has_param("gl_debug"))
+ if (vsx_argvector::get_instance()->has_param("gl_debug"))
{
printf("enabling GL DEBUG\n");
- glfwOpenWindowHint( GLFW_OPENGL_DEBUG_CONTEXT , GL_TRUE );
@@ -250,28 +171,30 @@
+ glfwWindowHint(GLFW_DEPTH_BITS, 16);
- if( !glfwOpenWindow( x_res, y_res, 0,0,0,0,16,0, start_fullscreen?GLFW_FULLSCREEN:GLFW_WINDOW ) ) // GLFW_FULLSCREEN
-+ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) ) // GLFW_FULLSCREEN
++ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) )
{
printf("Error! Could not create an OpenGL context. Please check your GPU drivers...\n");
glfwTerminate();
- return 0;
- }
+@@ -277,12 +274,10 @@
-- if (start_fullscreen) glfwEnable( GLFW_MOUSE_CURSOR );
-+ if (start_fullscreen) glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
- app_init(0);
+
+ if (start_fullscreen)
+- glfwEnable( GLFW_MOUSE_CURSOR );
++ glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+
+ app_load(0);
- glfwEnable(GLFW_AUTO_POLL_EVENTS);
-
for (int i = 1; i < argc; i++)
{
vsx_string arg1 = argv[i];
-@@ -296,20 +295,20 @@
+@@ -294,20 +289,20 @@
vsx_avector<vsx_string> parts;
vsx_string deli = ",";
explode(arg2, deli, parts);
-- glfwSetWindowPos(s2i(parts[0]), s2i(parts[1]));
-+ glfwSetWindowPos(glfwGetCurrentContext(), s2i(parts[0]), s2i(parts[1]));
+- glfwSetWindowPos( vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]) );
++ glfwSetWindowPos(glfwGetCurrentContext(), vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]));
}
}
}
@@ -291,11 +214,11 @@
+ glfwSetWindowSizeCallback(glfwGetCurrentContext(), &window_size);
// Enable sticky keys
- glfwEnable( GLFW_STICKY_KEYS );
-+ glfwSetInputMode( glfwGetCurrentContext(), GLFW_STICKY_KEYS, GL_TRUE );
++ glfwSetInputMode(glfwGetCurrentContext(), GLFW_STICKY_KEYS, GL_TRUE);
// vsync handling
-@@ -358,7 +357,7 @@
+@@ -356,7 +351,7 @@
#if PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS
sprintf( titlestr, "Vovoid VSXu Artiste %s [Windows %d-bit]", vsxu_ver, PLATFORM_BITS);
#endif
@@ -304,7 +227,7 @@
vsx_timer frame_delay;
-@@ -412,7 +411,7 @@
+@@ -409,7 +404,7 @@
// Get time and mouse position
t = glfwGetTime();
@@ -313,66 +236,44 @@
float delta = t-t1;
t1 = t;
if (key_pressed != -1)
-@@ -438,7 +437,7 @@
+@@ -435,7 +430,7 @@
+ frames ++;
- tm->e("window_management");
// Get window size (may be different than the requested size)
- glfwGetWindowSize( &width, &height );
+ glfwGetWindowSize( glfwGetCurrentContext(), &width, &height );
height = height > 0 ? height : 1;
- tm->e("viewport");
-@@ -464,7 +463,7 @@
- tm->l();
+ // Set viewport
+@@ -451,7 +446,7 @@
+
+ app_draw(0);
- tm->e("swapbuffers");
- glfwSwapBuffers();
+ glfwSwapBuffers(glfwGetCurrentContext());
- tm->l();
- #if (PLATFORM != PLATFORM_WINDOWS)
-@@ -490,8 +490,8 @@
- tm->t();
+ //#if (PLATFORM != PLATFORM_WINDOWS)
+ // if (!vsync)
+@@ -467,7 +462,7 @@
+ //#endif
- // Check if the ESC key was pressed or the window was closed
-- running = /*!glfwGetKey( GLFW_KEY_ESC ) &&*/
-- glfwGetWindowParam( GLFW_OPENED );
-+ running = /*!glfwGetKey( glfwGetCurrentContext(), GLFW_KEY_ESCAPE ) &&*/
-+ !glfwWindowShouldClose( glfwGetCurrentContext() );
+
+- running = glfwGetWindowParam( GLFW_OPENED );
++ running = !glfwWindowShouldClose(glfwGetCurrentContext());
}
- // Close OpenGL window and terminate GLFW
---- vsxu-0.4.2/artiste/src/vsx_mouse.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/artiste/src/vsx_mouse.cpp 2014-01-02 19:07:25.615100306 +0100
-@@ -22,7 +22,7 @@
- */
-
- #include "vsx_mouse.h"
--#include "GL/glfw.h"
-+#include <GLFW/glfw3.h>
-
- #ifdef _WIN32
- #include <windows.h>
-@@ -136,7 +136,7 @@
- //SetCursorPos((int)position.x + window_pos.left, (int)position.y + window_pos.top);
- //glutWarpPointer((int)position.x,(int)position.y);
- //printf("set mouse pos: %f, %f\n",x,y);
-- glfwSetMousePos((int)(position.x), (int)(position.y));
-+ glfwSetCursorPos(glfwGetCurrentContext(), (int)(position.x), (int)(position.y));
- #endif
- }
-
---- vsxu-0.4.2/player/src/main.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/player/src/main.cpp 2014-01-02 19:52:50.664985946 +0100
+ app_unload();
+--- vsxu-0.5.1/player/src/main.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/player/src/main.cpp 2016-03-02 18:37:43.074059591 +0100
@@ -24,7 +24,7 @@
#include <stdio.h>
#include "application.h"
#include <GL/glew.h>
-#include <GL/glfw.h>
+#include <GLFW/glfw3.h>
- #include <vsx_avector.h>
+ #include <container/vsx_avector.h>
#include <vsx_string.h>
- #include <vsxfst.h>
+ #include <vsx_string_helper.h>
@@ -48,9 +48,9 @@
void set_modifiers()
@@ -454,9 +355,9 @@
-void GLFWCALL window_size( int width, int height )
+void window_size( GLFWwindow *window, int width, int height )
{
- vsx_printf("change viewport %d %d\n", width, height);
- gl_state.viewport_change(0,0,width, height);
-@@ -150,7 +147,8 @@
+ vsx_gl_state::get_instance()->viewport_change(0,0,width, height);
+ }
+@@ -149,7 +146,8 @@
{
app_argc = argc;
app_argv = argv;
@@ -466,7 +367,7 @@
double t, t1;
char titlestr[ 200 ];
-@@ -221,25 +219,23 @@
+@@ -220,15 +218,15 @@
if (start_fullscreen && !manual_resolution_set)
{
// try to get the resolution from the desktop for fullscreen
@@ -484,27 +385,32 @@
- if( !glfwOpenWindow( x_res, y_res, 0,0,0,0,16,0, start_fullscreen?GLFW_FULLSCREEN:GLFW_WINDOW ) ) // GLFW_FULLSCREEN
+ glfwWindowHint(GLFW_SAMPLES, 4);
+ glfwWindowHint(GLFW_DEPTH_BITS, 16);
-+ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) ) // GLFW_FULLSCREEN
++ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) )
{
printf("Error! Could not create an OpenGL context. Please check your GPU drivers...\n");
glfwTerminate();
- return 0;
- }
+@@ -237,14 +235,12 @@
+
+ glewInit();
+
- if (start_fullscreen) glfwEnable( GLFW_MOUSE_CURSOR );
-+ if (start_fullscreen) glfwSetInputMode( glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL );
++ if (start_fullscreen) glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+
+ printf("INFO: app_init\n");
app_init(0);
+ printf("INFO: app_init done\n");
- glfwEnable(GLFW_AUTO_POLL_EVENTS);
-
for (int i = 1; i < argc; i++) {
vsx_string arg1 = argv[i];
if (arg1 == "-p") {
-@@ -250,21 +246,21 @@
+@@ -255,21 +251,21 @@
vsx_avector<vsx_string> parts;
vsx_string deli = ",";
explode(arg2, deli, parts);
-- glfwSetWindowPos(s2i(parts[0]), s2i(parts[1]));
-+ glfwSetWindowPos(glfwGetCurrentContext(), s2i(parts[0]), s2i(parts[1]));
+- glfwSetWindowPos( vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]) );
++ glfwSetWindowPos(glfwGetCurrentContext(), vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]));
}
}
}
@@ -525,11 +431,11 @@
// Enable sticky keys
- glfwEnable( GLFW_STICKY_KEYS );
-+ glfwSetInputMode( glfwGetCurrentContext(), GLFW_STICKY_KEYS, GL_TRUE );
++ glfwSetInputMode(glfwGetCurrentContext(), GLFW_STICKY_KEYS, GL_TRUE);
glfwSwapInterval(1);
// Main loop
-@@ -277,7 +273,7 @@
+@@ -282,7 +278,7 @@
#if PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS
sprintf( titlestr, "Vovoid VSXu Player %s [Windows %d-bit]", vsxu_ver, PLATFORM_BITS);
#endif
@@ -538,7 +444,7 @@
while( running )
-@@ -293,7 +289,7 @@
+@@ -299,7 +295,7 @@
// Get time and mouse position
t = glfwGetTime();
@@ -547,7 +453,7 @@
float delta = t-t1;
t1 = t;
if (key_pressed != -1)
-@@ -317,7 +313,7 @@
+@@ -323,7 +319,7 @@
frames ++;
// Get window size (may be different than the requested size)
@@ -556,7 +462,7 @@
height = height > 0 ? height : 1;
// Set viewport
-@@ -333,11 +329,11 @@
+@@ -339,11 +335,11 @@
app_draw(0);
@@ -599,10 +505,10 @@
manager->dec_speed();
break;
case GLFW_KEY_UP:
---- vsxu-0.4.2/server/src/main/linux-opengl/main.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/server/src/main/linux-opengl/main.cpp 2014-01-02 20:28:20.244896567 +0100
-@@ -26,7 +26,7 @@
- #include "vsx_string.h"
+--- vsxu-0.5.1/server/src/main/linux-opengl/main.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/server/src/main/linux-opengl/main.cpp 2016-03-02 20:21:33.300464802 +0100
+@@ -27,7 +27,7 @@
+ #include <vsx_string_helper.h>
#include <vsx_argvector.h>
#include <GL/glew.h>
-#include "GL/glfw.h"
@@ -610,7 +516,7 @@
#include "application.h"
#include "vsxfst.h"
#include "vsx_version.h"
-@@ -73,9 +73,9 @@
+@@ -67,9 +67,9 @@
void set_modifiers()
{
@@ -623,7 +529,7 @@
}
long key_pressed = -1;
-@@ -84,18 +84,14 @@
+@@ -78,18 +78,14 @@
float key_repeat_time;
float initial_key_delay = 0.04f;
@@ -644,7 +550,7 @@
{
set_modifiers();
if (action == GLFW_PRESS)
-@@ -114,12 +110,12 @@
+@@ -108,12 +104,12 @@
}
}
@@ -660,7 +566,7 @@
set_modifiers();
unsigned long i_but = 0;
switch (button)
-@@ -141,26 +137,26 @@
+@@ -135,26 +131,26 @@
int mouse_pos_type = 0;
@@ -692,9 +598,9 @@
-void GLFWCALL window_size( int width, int height )
+void window_size( GLFWwindow *window, int width, int height )
{
- vsx_printf("change viewport %d %d\n", width, height);
- gl_state.viewport_change(0,0,width, height);
-@@ -211,7 +207,8 @@
+ vsx_gl_state::get_instance()->viewport_change(0,0,width, height);
+ }
+@@ -203,7 +199,8 @@
set_modifiers();
@@ -702,9 +608,9 @@
+ int width, height, running, frames;
+ double x, y;
double t, t1;
- unsigned long usleep_framelimit;
+ // unsigned long usleep_framelimit;
char titlestr[ 200 ];
-@@ -260,35 +257,33 @@
+@@ -252,24 +249,24 @@
if (start_fullscreen && !manual_resolution_set)
{
// try to get the resolution from the desktop for fullscreen
@@ -718,7 +624,7 @@
}
- if (app_argv.has_param("gl_debug"))
+ if (vsx_argvector::get_instance()->has_param("gl_debug"))
{
printf("enabling GL DEBUG\n");
- glfwOpenWindowHint( GLFW_OPENGL_DEBUG_CONTEXT , GL_TRUE );
@@ -733,15 +639,16 @@
+ glfwWindowHint(GLFW_DEPTH_BITS, 16);
- if( !glfwOpenWindow( x_res, y_res, 0,0,0,0,16,0, start_fullscreen?GLFW_FULLSCREEN:GLFW_WINDOW ) ) // GLFW_FULLSCREEN
-+ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) ) // GLFW_FULLSCREEN
++ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) )
{
printf("Error! Could not create an OpenGL context. Please check your GPU drivers...\n");
glfwTerminate();
- return 0;
- }
+@@ -278,11 +275,9 @@
+
+ glewInit();
- if (start_fullscreen) glfwEnable( GLFW_MOUSE_CURSOR );
-+ if (start_fullscreen) glfwSetInputMode( glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL );
++ if (start_fullscreen) glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
app_init(0);
- glfwEnable(GLFW_AUTO_POLL_EVENTS);
@@ -749,12 +656,12 @@
for (int i = 1; i < argc; i++)
{
vsx_string arg1 = argv[i];
-@@ -300,20 +295,20 @@
+@@ -294,20 +289,20 @@
vsx_avector<vsx_string> parts;
vsx_string deli = ",";
explode(arg2, deli, parts);
-- glfwSetWindowPos(s2i(parts[0]), s2i(parts[1]));
-+ glfwSetWindowPos(glfwGetCurrentContext(), s2i(parts[0]), s2i(parts[1]));
+- glfwSetWindowPos( vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]) );
++ glfwSetWindowPos(glfwGetCurrentContext(), vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]));
}
}
}
@@ -778,7 +685,7 @@
// vsync handling
-@@ -362,7 +357,7 @@
+@@ -356,7 +351,7 @@
#if PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS
sprintf( titlestr, "Vovoid VSXu Artiste %s [Windows %d-bit]", vsxu_ver, PLATFORM_BITS);
#endif
@@ -786,8 +693,8 @@
+ glfwSetWindowTitle( glfwGetCurrentContext(), titlestr );
- vsx_timer frame_delay;
-@@ -416,7 +411,7 @@
+ int initial_vram_free = 0;
+@@ -403,7 +398,7 @@
// Get time and mouse position
t = glfwGetTime();
@@ -796,26 +703,22 @@
float delta = t-t1;
t1 = t;
if (key_pressed != -1)
-@@ -442,7 +437,7 @@
+@@ -428,7 +423,7 @@
+ frames ++;
- tm->e("window_management");
// Get window size (may be different than the requested size)
- glfwGetWindowSize( &width, &height );
+ glfwGetWindowSize( glfwGetCurrentContext(), &width, &height );
height = height > 0 ? height : 1;
- tm->e("viewport");
-@@ -468,7 +463,7 @@
- tm->l();
+ // Set viewport
+@@ -439,12 +434,12 @@
+
+ app_draw(0);
- tm->e("swapbuffers");
- glfwSwapBuffers();
+ glfwSwapBuffers(glfwGetCurrentContext());
- tm->l();
- if (!vsync)
-@@ -488,8 +483,8 @@
- tm->t();
// Check if the ESC key was pressed or the window was closed
- running = /*!glfwGetKey( GLFW_KEY_ESC ) &&*/
@@ -825,3 +728,374 @@
}
// Close OpenGL window and terminate GLFW
+--- vsxu-0.5.1/widget/src/widgets/vsx_widget_base_edit.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/widget/src/widgets/vsx_widget_base_edit.cpp 2016-03-02 17:57:55.150826469 +0100
+@@ -36,7 +36,7 @@
+ #include "vsx_widget_popup_menu.h"
+ #include <stdlib.h>
+ #include "vsx_widget_button.h"
+-#include "GL/glfw.h"
++#include <GLFW/glfw3.h>
+ #include <gl_helper.h>
+
+ vsx_widget_base_edit::vsx_widget_base_edit() {
+@@ -679,7 +679,7 @@
+ }
+ break;
+ // page up
+- case -GLFW_KEY_PAGEUP:
++ case -GLFW_KEY_PAGE_UP:
+ if (!single_row) {
+ for (int zz = 0; zz < characters_height*0.95; ++zz) {
+ event_key_down(-GLFW_KEY_UP);
+@@ -700,7 +700,7 @@
+ }
+ break;
+ // page down
+- case -GLFW_KEY_PAGEDOWN:
++ case -GLFW_KEY_PAGE_DOWN:
+ if (!single_row) {
+ for (int zz = 0; zz < characters_height*0.95; ++zz) {
+ event_key_down(-GLFW_KEY_DOWN,false,false,false);
+@@ -757,7 +757,7 @@
+ if (mirror_keystrokes_object) mirror_keystrokes_object->event_key_down(key, alt, ctrl, shift);
+ break;
+ // delete
+- case -GLFW_KEY_DEL:
++ case -GLFW_KEY_DELETE:
+ event_key_down(-GLFW_KEY_RIGHT,false,false,false);
+ event_key_down(-GLFW_KEY_BACKSPACE,false,false,false);
+ process_line(carety+(int)scroll_y);
+@@ -795,7 +795,7 @@
+ if (mirror_keystrokes_object) mirror_keystrokes_object->event_key_down(key, alt, ctrl, shift);
+ break;
+ // esc
+- case -GLFW_KEY_ESC:
++ case -GLFW_KEY_ESCAPE:
+ // da rest:
+ if (single_row) {
+ command_q_b.add_raw("cancel");
+--- vsxu-0.5.1/widget/src/vsx_mouse.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/widget/src/vsx_mouse.cpp 2016-03-02 18:33:29.197403578 +0100
+@@ -22,7 +22,7 @@
+ */
+
+ #include "vsx_mouse.h"
+-#include "GL/glfw.h"
++#include <GLFW/glfw3.h>
+
+ void vsx_mouse::set_cursor(int id)
+ {
+@@ -37,7 +37,7 @@
+ {
+ // This causes problems with knobs & arcballs, mouse visibility is disabled for now
+ //glfwEnable(GLFW_MOUSE_CURSOR);
+- //glfwSetMousePos((int)(position.x), (int)(position.y));
++ //glfwSetCursorPos(glfwGetCurrentContext(), (int)(position.x), (int)(position.y));
+ }
+
+ void vsx_mouse::hide_cursor()
+@@ -50,7 +50,7 @@
+ void vsx_mouse::set_cursor_pos(float x, float y)
+ {
+ position.set(x,y);
+- glfwSetMousePos((int)(position.x), (int)(position.y));
++ glfwSetCursorPos(glfwGetCurrentContext(), (int)(position.x), (int)(position.y));
+ }
+
+ vsx_mouse::vsx_mouse()
+--- vsxu-0.5.1/artiste/src/artiste_desktop.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/artiste/src/artiste_desktop.cpp 2016-03-02 22:09:12.080193754 +0100
+@@ -50,7 +50,7 @@
+ #include "widgets/vsx_widget_base_edit.h"
+
+ #include "artiste_desktop.h"
+-#include "GL/glfw.h"
++#include <GLFW/glfw3.h>
+
+ // VSX_WIDGET_DESKTOP **************************************************************************************************
+ // VSX_WIDGET_DESKTOP **************************************************************************************************
+@@ -202,10 +202,10 @@
+ case -GLFW_KEY_RIGHT: case -'F': case -'f':
+ camera.set_movement_x( 1.0 );
+ break;
+- case -GLFW_KEY_PAGEUP: case -'R': case -'r':
++ case -GLFW_KEY_PAGE_UP: case -'R': case -'r':
+ camera.set_movement_z( -1.0 );
+ break;
+- case -GLFW_KEY_PAGEDOWN: case -'W': case -'w':
++ case -GLFW_KEY_PAGE_DOWN: case -'W': case -'w':
+ camera.set_movement_z( 1.0 );
+ break;
+ } // switch
+@@ -235,8 +235,8 @@
+ camera.set_movement_x( 0.0 );
+ break;
+
+- case GLFW_KEY_PAGEUP: case 'R': case 'r':
+- case GLFW_KEY_PAGEDOWN: case 'W': case 'w':
++ case GLFW_KEY_PAGE_UP: case 'R': case 'r':
++ case GLFW_KEY_PAGE_DOWN: case 'W': case 'w':
+ camera.set_movement_z( 0.0 );
+ break;
+
+--- vsxu-0.5.1/profiler/src/profiler_main.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/profiler/src/profiler_main.cpp 2016-03-04 16:55:06.153732911 +0100
+@@ -27,7 +27,7 @@
+ #include <vsx_string_helper.h>
+ #include <vsx_argvector.h>
+ #include <GL/glew.h>
+-#include "GL/glfw.h"
++#include <GLFW/glfw3.h>
+ #include "profiler_application.h"
+ #include "vsxfst.h"
+ #include "vsx_version.h"
+@@ -69,9 +69,9 @@
+
+ void set_modifiers()
+ {
+- app_ctrl = (bool)glfwGetKey(GLFW_KEY_LCTRL);
+- app_shift = (bool)glfwGetKey(GLFW_KEY_LSHIFT);
+- app_alt = (bool)glfwGetKey(GLFW_KEY_LALT);
++ app_ctrl = (bool)glfwGetKey(glfwGetCurrentContext(), GLFW_KEY_LEFT_CONTROL);
++ app_shift = (bool)glfwGetKey(glfwGetCurrentContext(), GLFW_KEY_LEFT_SHIFT);
++ app_alt = (bool)glfwGetKey(glfwGetCurrentContext(), GLFW_KEY_LEFT_ALT);
+ }
+
+ long key_pressed = -1;
+@@ -80,18 +80,14 @@
+ float key_repeat_time;
+ float initial_key_delay = 0.04f;
+
+-void GLFWCALL key_char_event( int character, int action )
++void key_char_event(GLFWwindow *window, int character)
+ {
+- if (action == GLFW_PRESS)
+- {
+ app_char(character);
+ key_character = character;
+-
+- }
+ }
+
+
+-void GLFWCALL key_event(int key, int action)
++void key_event(GLFWwindow *window, int key, int scancode, int action, int mods)
+ {
+ set_modifiers();
+ if (action == GLFW_PRESS)
+@@ -110,12 +106,12 @@
+ }
+ }
+
+-int last_x = 0, last_y = 0;
++double last_x = 0, last_y = 0;
+ int mouse_state = 0;
+
+-void GLFWCALL mouse_button_event(int button, int action)
++void mouse_button_event(GLFWwindow *window, int button, int action, int mods)
+ {
+- glfwGetMousePos(&last_x, &last_y);
++ glfwGetCursorPos(glfwGetCurrentContext(), &last_x, &last_y);
+ set_modifiers();
+ unsigned long i_but = 0;
+ switch (button)
+@@ -137,26 +133,26 @@
+
+ int mouse_pos_type = 0;
+
+-void GLFWCALL mouse_pos_event(int x, int y)
++void mouse_pos_event(GLFWwindow *window, double x, double y)
+ {
+ VSX_UNUSED(x);
+ VSX_UNUSED(y);
+ set_modifiers();
+- glfwGetMousePos(&last_x, &last_y);
++ glfwGetCursorPos(glfwGetCurrentContext(), &last_x, &last_y);
+ if (mouse_state) mouse_pos_type = 1;
+ else mouse_pos_type = 2;
+ }
+
+-int mousewheel_prev_pos = 0;
++double mousewheel_prev_pos = 0;
+
+-void GLFWCALL mouse_wheel(int pos)
++void mouse_wheel(GLFWwindow *window, double xoffset, double yoffset)
+ {
+ set_modifiers();
+- app_mousewheel((float)(pos-mousewheel_prev_pos),last_x,last_y);
+- mousewheel_prev_pos = pos;
++ app_mousewheel((float)(yoffset-mousewheel_prev_pos),last_x,last_y);
++ mousewheel_prev_pos = yoffset;
+ }
+
+-void GLFWCALL window_size( int width, int height )
++void window_size(GLFWwindow *window, int width, int height)
+ {
+ vsx_gl_state::get_instance()->viewport_change(0,0,width, height);
+ }
+@@ -210,7 +206,8 @@
+ glfwInit();
+ set_modifiers();
+
+- int width, height, running, frames, x, y;
++ int width, height, running, frames;
++ double x, y;
+ double t, t1;
+ char titlestr[ 200 ];
+
+@@ -253,24 +250,24 @@
+ if (start_fullscreen && !manual_resolution_set)
+ {
+ // try to get the resolution from the desktop for fullscreen
+- GLFWvidmode video_mode;
+- glfwGetDesktopMode(&video_mode);
+- x_res = video_mode.Height;
+- y_res = video_mode.Width;
++ GLFWvidmode video_mode = * glfwGetVideoMode(glfwGetPrimaryMonitor());
++ x_res = video_mode.height;
++ y_res = video_mode.width;
+ }
+
+
+ if (vsx_argvector::get_instance()->has_param("gl_debug"))
+ {
+ printf("enabling GL DEBUG\n");
+- glfwOpenWindowHint( GLFW_OPENGL_DEBUG_CONTEXT , GL_TRUE );
++ glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT , GL_TRUE );
+ }
+
+ // OpenGL version
+- glfwOpenWindowHint(GLFW_OPENGL_VERSION_MAJOR, 2);
+- glfwOpenWindowHint(GLFW_OPENGL_VERSION_MINOR, 1);
++ glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
++ glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
++ glfwWindowHint(GLFW_DEPTH_BITS, 16);
+
+- if( !glfwOpenWindow( x_res, y_res, 0,0,0,0,16,0, start_fullscreen?GLFW_FULLSCREEN:GLFW_WINDOW ) ) // GLFW_FULLSCREEN
++ if( !glfwCreateWindow( x_res, y_res, "", start_fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL ) )
+ {
+ printf("Error! Could not create an OpenGL context. Please check your GPU drivers...\n");
+ glfwTerminate();
+@@ -280,11 +277,9 @@
+ glewInit();
+
+
+- if (start_fullscreen) glfwEnable( GLFW_MOUSE_CURSOR );
++ if (start_fullscreen) glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+ app_init();
+
+- glfwEnable(GLFW_AUTO_POLL_EVENTS);
+-
+ for (int i = 1; i < argc; i++)
+ {
+ vsx_string arg1 = argv[i];
+@@ -296,20 +291,20 @@
+ vsx_avector<vsx_string> parts;
+ vsx_string deli = ",";
+ explode(arg2, deli, parts);
+- glfwSetWindowPos( vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]) );
++ glfwSetWindowPos(glfwGetCurrentContext(), vsx_string_helper::s2i(parts[0]), vsx_string_helper::s2i(parts[1]));
+ }
+ }
+ }
+
+- glfwSetKeyCallback(&key_event);
+- glfwSetMouseButtonCallback(&mouse_button_event);
+- glfwSetMousePosCallback(&mouse_pos_event);
+- glfwSetCharCallback(&key_char_event);
+- glfwSetMouseWheelCallback(&mouse_wheel);
++ glfwSetKeyCallback(glfwGetCurrentContext(), &key_event);
++ glfwSetMouseButtonCallback(glfwGetCurrentContext(), &mouse_button_event);
++ glfwSetCursorPosCallback(glfwGetCurrentContext(), &mouse_pos_event);
++ glfwSetCharCallback(glfwGetCurrentContext(), &key_char_event);
++ glfwSetScrollCallback(glfwGetCurrentContext(), &mouse_wheel);
+ // set window size callback function
+- glfwSetWindowSizeCallback(window_size);
++ glfwSetWindowSizeCallback(glfwGetCurrentContext(), &window_size);
+ // Enable sticky keys
+- glfwEnable( GLFW_STICKY_KEYS );
++ glfwSetInputMode(glfwGetCurrentContext(), GLFW_STICKY_KEYS, GL_TRUE);
+
+
+ // vsync handling
+@@ -354,7 +349,7 @@
+
+ sprintf( titlestr, "Vovoid VSXu Profiler %s [GNU/Linux %d-bit]", vsxu_ver, PLATFORM_BITS);
+
+- glfwSetWindowTitle( titlestr );
++ glfwSetWindowTitle(glfwGetCurrentContext(), titlestr);
+
+
+ vsx_timer frame_delay;
+@@ -376,7 +371,7 @@
+
+ // Get time and mouse position
+ t = glfwGetTime();
+- glfwGetMousePos( &x, &y );
++ glfwGetCursorPos(glfwGetCurrentContext(), &x, &y);
+ float delta = t-t1;
+ t1 = t;
+ if (key_pressed != -1)
+@@ -401,7 +396,7 @@
+ frames ++;
+
+ // Get window size (may be different than the requested size)
+- glfwGetWindowSize( &width, &height );
++ glfwGetWindowSize(glfwGetCurrentContext(), &width, &height);
+ height = height > 0 ? height : 1;
+
+ // Set viewport
+@@ -419,7 +414,7 @@
+
+ profiler->sub_begin("swapbuffers");
+
+- glfwSwapBuffers();
++ glfwSwapBuffers(glfwGetCurrentContext());
+ profiler->sub_end();
+
+
+@@ -440,7 +435,7 @@
+
+ // Check if the ESC key was pressed or the window was closed
+ running = /*!glfwGetKey( GLFW_KEY_ESC ) &&*/
+- glfwGetWindowParam( GLFW_OPENED );
++ !glfwWindowShouldClose(glfwGetCurrentContext());
+ profiler->maj_end();
+
+ }
+--- vsxu-0.5.1/profiler/src/profiler_desktop.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/profiler/src/profiler_desktop.cpp 2016-03-04 16:59:50.213720990 +0100
+@@ -30,7 +30,7 @@
+ #include "profiler_desktop.h"
+
+ #include <vsx_gl_global.h>
+-#include <GL/glfw.h>
++#include <GLFW/glfw3.h>
+
+ void vsx_widget_desktop::init()
+ {
+@@ -116,10 +116,10 @@
+ case -GLFW_KEY_RIGHT: case -'F': case -'f':
+ camera.set_movement_x( 1.0 );
+ break;
+- case -GLFW_KEY_PAGEUP: case -'R': case -'r':
++ case -GLFW_KEY_PAGE_UP: case -'R': case -'r':
+ camera.set_movement_z( -1.0 );
+ break;
+- case -GLFW_KEY_PAGEDOWN: case -'W': case -'w':
++ case -GLFW_KEY_PAGE_DOWN: case -'W': case -'w':
+ camera.set_movement_z( 1.0 );
+ break;
+ } // switch
+@@ -149,8 +149,8 @@
+ camera.set_movement_x( 0.0 );
+ break;
+
+- case GLFW_KEY_PAGEUP: case 'R': case 'r':
+- case GLFW_KEY_PAGEDOWN: case 'W': case 'w':
++ case GLFW_KEY_PAGE_UP: case 'R': case 'r':
++ case GLFW_KEY_PAGE_DOWN: case 'W': case 'w':
+ camera.set_movement_z( 0.0 );
+ break;
+ }
diff --git a/vsxu-system-ftgl.patch b/vsxu-system-ftgl.patch
index 0ab890a..1a9a74a 100644
--- a/vsxu-system-ftgl.patch
+++ b/vsxu-system-ftgl.patch
@@ -1,34 +1,116 @@
---- vsxu-0.4.2/plugins/src/render.text/CMakeLists.txt.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/plugins/src/render.text/CMakeLists.txt 2014-01-05 09:01:09.322415946 +0100
-@@ -7,14 +7,14 @@ message("configuring vsxu module
+--- vsxu-0.5.1/plugins/src/render.text/render_text.cpp.orig 2016-03-02 21:11:01.120340252 +0100
++++ vsxu-0.5.1/plugins/src/render.text/render_text.cpp 2016-03-02 21:12:44.310335922 +0100
+@@ -26,10 +26,7 @@
+ #include "vsx_param.h"
+ #include "vsx_module.h"
+ #include <vsx_font.h>
+-#include "ftgl/FTGLPolygonFont.h"
+-#include "ftgl/FTGLBitmapFont.h"
+-#include "ftgl/FTGLOutlineFont.h"
+-#include "ftgl/FTGLTextureFont.h"
++#include <FTGL/ftgl.h>
+
+ typedef struct
+ {
+--- vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt 2016-03-02 21:07:10.127016617 +0100
+@@ -12,7 +12,7 @@
+ CREATE_STATIC_GLUE(${module_id})
+ # find the local source files
+-file(GLOB SOURCES "*.cpp" "ftgl/*.cpp")
++file(GLOB SOURCES "*.cpp")
+ if(WIN32)
+ include_directories(lib/win32/include)
+--- vsxu-0.5.1/engine_graphics/CMakeLists.txt.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/engine_graphics/CMakeLists.txt 2016-03-02 21:10:07.443675839 +0100
+@@ -14,6 +14,7 @@
+ find_package(PNG REQUIRED)
+ find_package(JPEG REQUIRED)
find_package(Freetype REQUIRED)
--include_directories(${FREETYPE_INCLUDE_DIRS})
+find_package(FTGL REQUIRED)
+
+
+ ################################################################################
+@@ -26,12 +27,11 @@
+ ${JPEG_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/
+ ${CMAKE_SOURCE_DIR}/engine_graphics/include
+- ${CMAKE_SOURCE_DIR}/engine_graphics/include/ftgl
+ ${CMAKE_SOURCE_DIR}/engine/include
+ ${CMAKE_SOURCE_DIR}/profiler/include
+ )
+
+-include_directories(${FREETYPE_INCLUDE_DIRS})
+include_directories(${FREETYPE_INCLUDE_DIRS} ${FTGL_INCLUDE_DIR})
- file(GLOB LOCAL_SOURCES "*.cpp")
- file(GLOB API_STUBS "api_stubs/*.cpp")
-
- project (${module_id})
- include (../cmake_globals.txt)
--include(./_sources)
- add_library(${module_id} MODULE ${LOCAL_SOURCES} ${API_STUBS} ${SOURCES})
- include(../cmake_suffix.txt)
-
--target_link_libraries(${module_id} vsxu_engine ${FREETYPE_LIBRARIES})
-+target_link_libraries(${module_id} vsxu_engine ${FREETYPE_LIBRARIES} ${FTGL_LIBRARY})
---- vsxu-0.4.2/plugins/src/render.text/main.cpp.orig 2013-11-24 11:00:51.000000000 +0100
-+++ vsxu-0.4.2/plugins/src/render.text/main.cpp 2014-01-05 08:59:45.182419478 +0100
-@@ -26,10 +26,7 @@
- #include "vsx_param.h"
- #include "vsx_module.h"
+ if(WIN32)
+ include_directories(lib/win32/include)
+@@ -72,30 +72,6 @@
+ src/vsx_texture.cpp
+ src/vsx_gl_state.cpp
+ src/gl_helper.cpp
+- src/ftgl/FTBitmapGlyph.cpp
+- src/ftgl/FTBufferGlyph.cpp
+- src/ftgl/FTCharmap.cpp
+- src/ftgl/FTContour.cpp
+- src/ftgl/FTExtrdGlyph.cpp
+- src/ftgl/FTFace.cpp
+- src/ftgl/FTFont.cpp
+- src/ftgl/FTGLBitmapFont.cpp
+- src/ftgl/FTGLBufferFont.cpp
+- src/ftgl/FTGLExtrdFont.cpp
+- src/ftgl/FTGLGlyph.cpp
+- src/ftgl/FTGLOutlineFont.cpp
+- src/ftgl/FTGLPixmapFont.cpp
+- src/ftgl/FTGLPolygonFont.cpp
+- src/ftgl/FTGLTextureFont.cpp
+- src/ftgl/FTGlyphContainer.cpp
+- src/ftgl/FTLibrary.cpp
+- src/ftgl/FTOutlineGlyph.cpp
+- src/ftgl/FTPixmapGlyph.cpp
+- src/ftgl/FTPoint.cpp
+- src/ftgl/FTPolyGlyph.cpp
+- src/ftgl/FTSize.cpp
+- src/ftgl/FTTextureGlyph.cpp
+- src/ftgl/FTVectoriser.cpp
+ )
+
+ if (VSXU_OPENGL_ES_2_0 EQUAL 1)
+@@ -159,6 +135,7 @@
+ ${OPENGL_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${GLEW_LIBRARY}
++ ${FTGL_LIBRARY}
+ vsxu_engine
+ )
+
+--- vsxu-0.5.1/engine_graphics/src/vsx_font.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/engine_graphics/src/vsx_font.cpp 2016-03-03 22:15:32.323218595 +0100
+@@ -30,10 +30,7 @@
+ #include "vsx_font.h"
+
+ #ifndef VSX_FONT_NO_FT
+-#include "ftgl/FTGLPolygonFont.h"
+-#include "ftgl/FTGLBitmapFont.h"
+-#include "ftgl/FTGLOutlineFont.h"
+-#include "ftgl/FTGLTextureFont.h"
++#include <FTGL/ftgl.h>
+ #endif
+
+
+--- vsxu-0.5.1/engine_graphics/src/vsx_font_outline.cpp.orig 2014-12-14 14:01:04.000000000 +0100
++++ vsxu-0.5.1/engine_graphics/src/vsx_font_outline.cpp 2016-03-03 22:15:52.329884424 +0100
+@@ -1,10 +1,7 @@
+ #include "vsx_gl_global.h"
+ #include "vsx_gl_state.h"
+ #include "vsx_font_outline.h"
-#include "ftgl/FTGLPolygonFont.h"
-#include "ftgl/FTGLBitmapFont.h"
-#include "ftgl/FTGLOutlineFont.h"
-#include "ftgl/FTGLTextureFont.h"
+#include <FTGL/ftgl.h>
- #include "vsx_math_3d.h"
+ class font_outline_holder
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vsxu.git/commitdiff/43efdf4b74dcf4c4ebc74912c5ba1a46109bd2b0
More information about the pld-cvs-commit
mailing list