[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.2' - 3 commits - configure.ac RepositoryExternal.mk Repository.mk

[Tor Lillqvist]

 Repository.mk         |    2 --
 RepositoryExternal.mk |    2 --
 configure.ac          |    2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b4967969b8892ee532dede7017e08029a01ed802
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 3 21:19:56 2016 +0300

    ENABLE_OPENGL does not mean whether to enable OpenGL use in general
    
    It refers to only the (old) OpenGL slideshow transition code. So no
    reason to have glew conditional on it.
    
    Change-Id: I13bc3e3c25fd7a33e05b39b405af0c85ab6a8e96

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 135cd7f..f3285ac 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,7 +183,6 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
 ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
@@ -229,7 +228,6 @@ $(call gb_ExternalProject_use_external_project,$(1),glew)
 endef
 
 endif # SYSTEM_GLEW
-endif # ENABLE_OPENGL
 
 ifneq ($(SYSTEM_GLYPHY),)
 
commit 1e9533363f44c7517c2ac1c861d3c817ebdd91b9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 3 21:17:34 2016 +0300

    ENABLE_OPENGL does not mean whether to enable OpenGL use in general
    
    It refers to only the OpenGL slideshow transitions. So no reason for
    avmediaogl to depend on it.
    
    Change-Id: If85ad6bcd077d9e753c259aa8dc6ad5629105136

diff --git a/Repository.mk b/Repository.mk
index 14a1c07..c37e31d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -605,13 +605,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 ))
 
-ifeq ($(ENABLE_OPENGL),TRUE)
 ifeq ($(ENABLE_GLTF),TRUE)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
     avmediaogl \
 ))
 endif
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
commit 1f47911b3125561490cb9656ef7d3d28f9c8efb1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 3 20:28:37 2016 +0300

    This is LibreOffice Vanilla

diff --git a/configure.ac b/configure.ac
index fc1e776..d4540f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[5.2.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice Vanilla],[5.2.1.0],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])