[GLC_lib] Update to 2.2.0

Mon Jul 25 10:04:51 UTC 2011

commit 490d72f26f3f2275eea466525de54ff7fddd95b0
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Jul 25 12:04:35 2011 +0200

    Update to 2.2.0

 .gitignore                                         |    1 +
 GLC_lib.spec                                       |    7 ++-
 ...nal.patch => GLC_lib_src_2.2.0-nointernal.patch |   60 ++++++++++----------
 sources                                            |    2 +-
 4 files changed, 36 insertions(+), 34 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index be1078b..6c9a4e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 GLC_lib_src_1.1.0.zip
 /GLC_lib_src_2.0.0.zip
 /GLC_lib_src_2.1.0.zip
+/GLC_lib_src_2.2.0.zip
diff --git a/GLC_lib.spec b/GLC_lib.spec
index c5f258a..5e2d79e 100644
--- a/GLC_lib.spec
+++ b/GLC_lib.spec
@@ -1,5 +1,5 @@
 Name:           GLC_lib
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        C++ class library for OpenGL application based on Qt 4
 
@@ -7,7 +7,7 @@ Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.glc-lib.net/
 Source0:        http://downloads.sourceforge.net/glc-lib/GLC_lib_src_%{version}.zip
-Patch0:         GLC_lib_src_2.0.0-nointernal.patch
+Patch0:         GLC_lib_src_2.2.0-nointernal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 25 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-1
+- Update to 2.2.0
+
 * Tue Mar 15 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.1.0-1
 - Update to 2.1.0
 
diff --git a/GLC_lib_src_2.0.0-nointernal.patch b/GLC_lib_src_2.2.0-nointernal.patch
similarity index 67%
rename from GLC_lib_src_2.0.0-nointernal.patch
rename to GLC_lib_src_2.2.0-nointernal.patch
index f79f08b..1455f57 100644
--- a/GLC_lib_src_2.0.0-nointernal.patch
+++ b/GLC_lib_src_2.2.0-nointernal.patch
@@ -1,7 +1,7 @@
-diff -up GLC_lib_src_2.0.0/glc_lib/glc_ext.h.nointernal GLC_lib_src_2.0.0/glc_lib/glc_ext.h
---- GLC_lib_src_2.0.0/glc_lib/glc_ext.h.nointernal	2010-07-01 12:00:18.000000000 +0200
-+++ GLC_lib_src_2.0.0/glc_lib/glc_ext.h	2010-12-09 15:59:34.025542000 +0100
-@@ -27,7 +27,7 @@
+diff -up GLC_lib-2.2.0/glc_lib/glc_ext.h.nointernal GLC_lib-2.2.0/glc_lib/glc_ext.h
+--- GLC_lib-2.2.0/glc_lib/glc_ext.h.nointernal	2011-06-19 17:16:30.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/glc_ext.h	2011-07-25 11:57:00.855774006 +0200
+@@ -25,7 +25,7 @@
  #define GLC_EXT_H_
  
  #include <QtOpenGL>
@@ -10,28 +10,31 @@ diff -up GLC_lib_src_2.0.0/glc_lib/glc_ext.h.nointernal GLC_lib_src_2.0.0/glc_li
  
  // Buffer offset used by VBO
  #define BUFFER_OFFSET(i) ((char*)NULL + (i))
-diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro
---- GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal	2010-07-01 12:00:18.000000000 +0200
-+++ GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro	2010-12-09 16:06:28.472542000 +0100
-@@ -6,13 +6,16 @@ QT += opengl \
+diff -up GLC_lib-2.2.0/glc_lib/GLC_lib.pro.nointernal GLC_lib-2.2.0/glc_lib/GLC_lib.pro
+--- GLC_lib-2.2.0/glc_lib/GLC_lib.pro.nointernal	2011-06-19 17:16:28.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/GLC_lib.pro	2011-07-25 11:59:13.591774007 +0200
+@@ -5,7 +5,9 @@ QT += opengl \
+ 
  
  CONFIG += exceptions \
-     release \
 -    warn_on
 +    warn_on \
 +    link_pkgconfig
++
  TARGET = GLC_lib
- VERSION = 2.1.0
+ VERSION = 2.2.0
  
- DEFINES += CREATE_GLC_LIB_DLL
- DEFINES += LIB3DS_EXPORTS
+@@ -14,6 +16,9 @@ DEFINES += LIB3DS_EXPORTS
  
-+PKGCONFIG = lib3ds minizip
-+LIBS += -lquazip
  DEFINES += _CRT_SECURE_NO_WARNINGS
  
++PKGCONFIG = lib3ds minizip
++LIBS += -lquazip
++
  unix:OBJECTS_DIR = ./Build
-@@ -160,11 +162,11 @@ HEADERS_GLC_3DWIDGET += 3DWidget/glc_3dw
+ unix:MOC_DIR = ./Build
+ unix:UI_DIR = ./Build
+@@ -171,11 +176,11 @@ HEADERS_GLC_3DWIDGET += 3DWidget/glc_3dw
  						3DWidget/glc_axis.h
  
  
@@ -46,7 +49,7 @@ diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_
             3rdparty/zlib/compress.c \
             3rdparty/zlib/crc32.c \
             3rdparty/zlib/deflate.c \
-@@ -176,14 +178,14 @@ SOURCES += 3rdparty/zlib/adler32.c \
+@@ -187,14 +192,14 @@ SOURCES += 3rdparty/zlib/adler32.c \
             3rdparty/zlib/uncompr.c \
             3rdparty/zlib/zutil.c
  
@@ -63,12 +66,7 @@ diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_
             3rdparty/lib3ds/background.c \
             3rdparty/lib3ds/camera.c \
             3rdparty/lib3ds/chunk.c \
-@@ -392,14 +394,11 @@ HEADERS_INST = include/GLC_BoundingBox \
- # Linux and macx install configuration
- unix {
-     # Location of HEADERS and library
--    LIB_DIR = /usr/local/lib
-+    LIB_DIR = /usr/local/lib
+@@ -428,10 +433,7 @@ unix {
      INCLUDE_DIR = /usr/local/include
      # Adds a -P to preserve link
  	QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
@@ -80,7 +78,7 @@ diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_
  	include_glc_maths.path = $${INCLUDE_DIR}/GLC_lib/maths
  	include_glc_io.path = $${INCLUDE_DIR}/GLC_lib/io
  	include_glc_scengraph.path = $${INCLUDE_DIR}/GLC_lib/sceneGraph
-@@ -428,9 +427,6 @@ win32 { 
+@@ -460,9 +462,6 @@ win32 { 
  }    
  
  include.files = $${HEADERS_GLC} $${HEADERS_INST}
@@ -90,7 +88,7 @@ diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_
  include_glc_maths.files= $${HEADERS_GLC_MATHS}
  include_glc_io.files= $${HEADERS_GLC_IO}
  include_glc_scengraph.files= $${HEADERS_GLC_SCENEGRAPH}
-@@ -443,7 +439,7 @@ include_glc_3dwidget.files = $${HEADERS_
+@@ -475,7 +474,7 @@ include_glc_3dwidget.files = $${HEADERS_
  target.path = $${LIB_DIR}
     
  # "make install" configuration options
@@ -99,10 +97,10 @@ diff -up GLC_lib_src_2.0.0/glc_lib/GLC_lib.pro.nointernal GLC_lib_src_2.0.0/glc_
  INSTALLS += include_glc_scengraph include_glc_geometry include_glc_shading include_glc_viewport
  INSTALLS += include_glc_3dwidget
  
-diff -up GLC_lib_src_2.0.0/glc_lib/io/glc_3dstoworld.cpp.nointernal GLC_lib_src_2.0.0/glc_lib/io/glc_3dstoworld.cpp
---- GLC_lib_src_2.0.0/glc_lib/io/glc_3dstoworld.cpp.nointernal	2010-07-01 12:00:18.000000000 +0200
-+++ GLC_lib_src_2.0.0/glc_lib/io/glc_3dstoworld.cpp	2010-12-09 15:59:34.026542000 +0100
-@@ -38,11 +38,11 @@
+diff -up GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp.nointernal GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp
+--- GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp.nointernal	2011-06-19 17:16:30.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp	2011-07-25 11:57:00.856774006 +0200
+@@ -36,11 +36,11 @@
  #include "../sceneGraph/glc_structoccurence.h"
  
  // Lib3ds Header
@@ -119,9 +117,9 @@ diff -up GLC_lib_src_2.0.0/glc_lib/io/glc_3dstoworld.cpp.nointernal GLC_lib_src_
  
  #include <QFileInfo>
  #include <QGLContext>
-diff -up GLC_lib_src_2.0.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal GLC_lib_src_2.0.0/glc_lib/io/glc_3dxmltoworld.cpp
---- GLC_lib_src_2.0.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal	2010-07-01 12:00:18.000000000 +0200
-+++ GLC_lib_src_2.0.0/glc_lib/io/glc_3dxmltoworld.cpp	2010-12-09 15:59:34.028542000 +0100
+diff -up GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp
+--- GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal	2011-06-20 14:01:36.000000000 +0200
++++ GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp	2011-07-25 11:57:00.858774006 +0200
 @@ -30,8 +30,8 @@
  #include "glc_xmlutil.h"
  
diff --git a/sources b/sources
index 5ebbc3d..3b869c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb5a083ef3550bec03bbe4d8c6d34dd3  GLC_lib_src_2.1.0.zip
+1a32baf0568e751ffef10f8279502107  GLC_lib_src_2.2.0.zip
