[Libreoffice-commits] core.git: external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk     |    1 +
 external/libgltf/patches/fix_package_file.patch |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 4bdbc1c93bb3b7e6b1f2fc9a700977ccfa3daae4
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Jun 27 19:19:46 2014 +0200

    libgltf: make 'Requires' valid in libgltf-0.0.pc file
    
    Thanks to Rene Engelhard for help to make it valid.
    
    Plus glu is not used, so remove it.
    
    Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 175fe43..174e719 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch \
 	external/libgltf/patches/move_fps_closer_to_the_corner.patch \
 	external/libgltf/patches/compiler_error_fixes.patch \
+	external/libgltf/patches/fix_package_file.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/fix_package_file.patch b/external/libgltf/patches/fix_package_file.patch
new file mode 100644
index 0000000..509634d
--- /dev/null
+++ b/external/libgltf/patches/fix_package_file.patch
@@ -0,0 +1,13 @@
+diff -ur libgltf.org/libgltf.pc.in libgltf/libgltf.pc.in
+--- libgltf.org/libgltf.pc.in	2014-06-27 18:52:24.323562505 +0200
++++ libgltf/libgltf.pc.in	2014-06-27 18:52:48.423561484 +0200
+@@ -6,8 +6,7 @@
+ Name: libgltf- at GLTF_MAJOR_VERSION@. at GLTF_MINOR_VERSION@
+ Description: Library for rendering glTF models.
+ Version: @VERSION@
+-Requires: glew-1.10.0 glm glu
++Requires: glew
+ Libs: -L${libdir} -lgltf- at GLTF_MAJOR_VERSION@. at GLTF_MINOR_VERSION@
+ Cflags: -I${includedir}/libgltf- at GLTF_MAJOR_VERSION@. at GLTF_MINOR_VERSION@
+ 
+-Requires.private: boost