commit c8ae4da801ab7747b89a9da1908ad5d183123fa1
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 5 10:19:20 2014 +0100
- more BRs, added system-ftgl patch (use system ftgl)
vsxu-system-ftgl.patch | 34 ++++++++++++++++++++++++++++++++++
vsxu.spec | 5 +++++
2 files changed, 39 insertions(+)
---
diff --git a/vsxu.spec b/vsxu.spec
index 8356d01..5b40323 100644
--- a/vsxu.spec
+++ b/vsxu.spec
@@ -15,10 +15,13 @@ Source0:
https://github.com/vovoid/vsxu/archive/%{version}/%{name}-%{version}.ta
Patch0: %{name}-glfw3.patch
Patch1: %{name}-icons.patch
Patch2: %{name}-desktop.patch
+Patch3: %{name}-system-ftgl.patch
URL: http://www.vsxu.com/
BuildRequires: OpenGL-devel
+BuildRequires: OpenGL-GLU-devel
BuildRequires: alsa-lib-devel
BuildRequires: cmake >= 2.8
+BuildRequires: ftgl-devel
BuildRequires: glew-devel >= 1.6.0
BuildRequires: glfw-devel >= 3
BuildRequires: jack-audio-connection-kit-devel
@@ -27,6 +30,7 @@ BuildRequires: libjpeg-devel >= 6b
BuildRequires: libstdc++-devel
BuildRequires: opencv-devel
BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
BuildRequires: xorg-lib-libXrandr >= 1.3.0
Requires: OpenGL >= 2.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,6 +88,7 @@ Pliki nagłówkowe bibliotek VSXu.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
install -d build
diff --git a/vsxu-system-ftgl.patch b/vsxu-system-ftgl.patch
new file mode 100644
index 0000000..0ab890a
--- /dev/null
+++ b/vsxu-system-ftgl.patch
@@ -0,0 +1,34 @@
+--- 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
+
+
+ find_package(Freetype REQUIRED)
+-include_directories(${FREETYPE_INCLUDE_DIRS})
++find_package(FTGL REQUIRED)
++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"
+
+-#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"
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vsxu.git/commitdiff/c8ae4da801ab7747b89a9da1908ad5d183123fa1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
