[forge] 01/07: Switch from git-dpm to gbp
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat May 20 13:23:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch experimental
in repository forge.
commit 0ad8f0bbb3000766a6529cc582ec2a0c1914bc59
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu May 18 15:27:36 2017 +0100
Switch from git-dpm to gbp
- Drop git-dpm configuration
- Unapply the patch queue
- Add gbp configuration
- Rebase the patch queue
---
CMakeLists.txt | 5 +++++
debian/.git-dpm | 11 ----------
debian/gbp.conf | 7 ++++++
debian/patches/0001-Use-system-MathJax.patch | 1 -
.../patches/0002-No-version-queries-with-Git.patch | 1 -
...definition-of-USE_SYSTEM-flags-for-glbind.patch | 5 ++---
debian/patches/0004-Fix-spelling-errors.patch | 1 -
docs/doxygen.mk | 4 ++--
src/backend/opengl/CMakeLists.txt | 25 +++++++++++++++-------
src/backend/opengl/font_impl.cpp | 2 +-
src/backend/opengl/glfw/window.cpp | 4 ++--
src/backend/opengl/sdl/window.cpp | 4 ++--
12 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c0c591..c3ef45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,11 @@ SET_PROPERTY(CACHE USE_WINDOW_TOOLKIT PROPERTY STRINGS "glfw3" "sdl2")
OPTION(BUILD_DOCUMENTATION "Build Documentation" OFF)
OPTION(BUILD_EXAMPLES "Build Examples" ON)
+OPTION(USE_LOCAL_GLM "Download and use local GLM" OFF)
+OPTION(USE_LOCAL_FREETYPE "Download and use local freetype" OFF)
+MARK_AS_ADVANCED(USE_LOCAL_GLM)
+MARK_AS_ADVANCED(USE_LOCAL_FREETYPE)
+
# Set a default build type if none was specified
IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index db223a3..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-60e7d97b365789f40cb22734e212ed745c0fd0c9
-60e7d97b365789f40cb22734e212ed745c0fd0c9
-d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
-d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
-forge_0.9.2.orig.tar.gz
-dfea07522a1c8fb622b83fd2bcfe5924f73bd90c
-735452
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f53906f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+sign-tags = True
+pristine-tar = True
diff --git a/debian/patches/0001-Use-system-MathJax.patch b/debian/patches/0001-Use-system-MathJax.patch
index 8dc6607..13b8a1c 100644
--- a/debian/patches/0001-Use-system-MathJax.patch
+++ b/debian/patches/0001-Use-system-MathJax.patch
@@ -1,4 +1,3 @@
-From 5a8c79948706034862341b2f1f7ef971075f8c93 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed, 24 Aug 2016 11:23:13 +0100
Subject: Use system MathJax
diff --git a/debian/patches/0002-No-version-queries-with-Git.patch b/debian/patches/0002-No-version-queries-with-Git.patch
index 257fd84..4692e6d 100644
--- a/debian/patches/0002-No-version-queries-with-Git.patch
+++ b/debian/patches/0002-No-version-queries-with-Git.patch
@@ -1,4 +1,3 @@
-From 9d545fd0f27ad2f403e2d1e2c55268cabf64f45d Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed, 21 Dec 2016 17:42:21 +0000
Subject: No version queries with Git
diff --git a/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch b/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
index a5af25c..74b4ba5 100644
--- a/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
+++ b/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
@@ -1,8 +1,7 @@
-From b8e7216e694ee86983f6a8760b7fffa592aed4c0 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed, 28 Dec 2016 17:06:02 +0000
-Subject: Consistent definition of USE_SYSTEM flags for glbinding, glm and
- freetype
+Subject: Consistent definition of USE_SYSTEM flags for glbinding,
+ glm and freetype
---
CMakeLists.txt | 5 -----
diff --git a/debian/patches/0004-Fix-spelling-errors.patch b/debian/patches/0004-Fix-spelling-errors.patch
index 50dad23..09101a6 100644
--- a/debian/patches/0004-Fix-spelling-errors.patch
+++ b/debian/patches/0004-Fix-spelling-errors.patch
@@ -1,4 +1,3 @@
-From 60e7d97b365789f40cb22734e212ed745c0fd0c9 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed, 4 Jan 2017 20:35:07 +0000
Subject: Fix spelling errors
diff --git a/docs/doxygen.mk b/docs/doxygen.mk
index 6dd5edd..44a5e8a 100644
--- a/docs/doxygen.mk
+++ b/docs/doxygen.mk
@@ -663,7 +663,7 @@ SHOW_NAMESPACES = YES
# by doxygen. Whatever the program writes to standard output is used as the file
# version. For an example see the documentation.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER = "/bin/sh -c 'git log --pretty=\"format:%ci, (build %h)\" -1' \"${1}\""
# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
# by doxygen. The layout file controls the global structure of the generated
@@ -1452,7 +1452,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = /usr/share/javascript/mathjax
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
index fb570ba..1dd851d 100755
--- a/src/backend/opengl/CMakeLists.txt
+++ b/src/backend/opengl/CMakeLists.txt
@@ -1,4 +1,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
+# Prior to GLM 0.9.7.0, the package is found by the FindGLM.cmake module.
+# This was removed with GLM 0.9.7.0, instead a glm-config.cmake configuration
+# file is provided. Therefore, both FIND_PACKAGE calls are necessary.
+FIND_PACKAGE(GLM QUIET)
+FIND_PACKAGE(glm QUIET)
OPTION(USE_SYSTEM_GLBINDING "Use system glbinding" OFF)
IF(USE_SYSTEM_GLBINDING)
@@ -12,18 +17,22 @@ ENDIF(USE_SYSTEM_GLBINDING)
INCLUDE(GLSLtoH)
-OPTION(USE_SYSTEM_GLM "Use the system GLM library" OFF)
-IF(USE_SYSTEM_GLM)
- FIND_PACKAGE(glm REQUIRED)
-ELSE()
+IF((NOT glm_FOUND AND NOT GLM_FOUND) OR (${USE_LOCAL_GLM}))
+ SET(USE_LOCAL_GLM ON)
+ MESSAGE(STATUS "Downloading GLM headers.")
INCLUDE(build_glm)
+ELSE()
+ MESSAGE(STATUS "Using System GLM")
ENDIF()
-OPTION(USE_SYSTEM_FREETYPE "Use the system Freetype library" OFF)
-IF(USE_SYSTEM_FREETYPE)
- FIND_PACKAGE(Freetype REQUIRED)
-ELSE()
+FIND_PACKAGE(Freetype QUIET)
+
+IF(NOT FREETYPE_FOUND OR ${USE_LOCAL_FREETYPE})
+ SET(USE_LOCAL_FREETYPE ON)
+ MESSAGE(STATUS "Downloading and building Freetype libraries.")
INCLUDE(build_freetype)
+ELSE()
+ MESSAGE(STATUS "Using System FreeType2")
ENDIF()
IF(UNIX)
diff --git a/src/backend/opengl/font_impl.cpp b/src/backend/opengl/font_impl.cpp
index b88ab3f..a1be645 100644
--- a/src/backend/opengl/font_impl.cpp
+++ b/src/backend/opengl/font_impl.cpp
@@ -87,7 +87,7 @@ void font_impl::loadAtlasWithGlyphs(const size_t pFontSize)
bError = FT_New_Face(library, mTTFfile.c_str(), 0, &face);
if (bError) {
FT_Done_FreeType(library);
- FT_THROW_ERROR("Freetype face initialization", FG_ERR_FREETYPE_ERROR);
+ FT_THROW_ERROR("Freetype face initilization", FG_ERR_FREETYPE_ERROR);
}
/* Select charmap */
bError = FT_Select_Charmap(face, FT_ENCODING_UNICODE);
diff --git a/src/backend/opengl/glfw/window.cpp b/src/backend/opengl/glfw/window.cpp
index 216b9e1..d358291 100644
--- a/src/backend/opengl/glfw/window.cpp
+++ b/src/backend/opengl/glfw/window.cpp
@@ -46,8 +46,8 @@ Widget::Widget(int pWidth, int pHeight, const char* pTitle, const Widget* pWindo
mFramePBO = 0;
if (!glfwInit()) {
- std::cerr << "ERROR: GLFW wasn't able to initialize\n";
- GLFW_THROW_ERROR("GLFW initialization failed", FG_ERR_GL_ERROR);
+ std::cerr << "ERROR: GLFW wasn't able to initalize\n";
+ GLFW_THROW_ERROR("GLFW initilization failed", FG_ERR_GL_ERROR);
}
auto wndErrCallback = [](int errCode, const char* pDescription)
diff --git a/src/backend/opengl/sdl/window.cpp b/src/backend/opengl/sdl/window.cpp
index 679cb77..d4f7b91 100644
--- a/src/backend/opengl/sdl/window.cpp
+++ b/src/backend/opengl/sdl/window.cpp
@@ -43,8 +43,8 @@ Widget::Widget(int pWidth, int pHeight, const char* pTitle, const Widget* pWindo
mFramePBO = 0;
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- std::cerr << "ERROR: SDL wasn't able to initialize\n";
- SDL_THROW_ERROR("SDL initialization failed", FG_ERR_GL_ERROR);
+ std::cerr << "ERROR: SDL wasn't able to initalize\n";
+ SDL_THROW_ERROR("SDL initilization failed", FG_ERR_GL_ERROR);
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/forge.git
More information about the debian-science-commits
mailing list