[deng] 04/06: import upstream 1.15.3
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Sep 5 23:29:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit be6d3c52bc07bf3d6a470d7b9b66185f35f9202d
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Sep 5 18:13:46 2015 +0000
import upstream 1.15.3
---
doomsday/api/dd_version.h | 4 +--
doomsday/client/client.pro | 6 ++--
doomsday/client/include/macx/cursor_macx.h | 30 ++++++++++++++++++++
doomsday/client/net.dengine.client.pack/Info.dei | 2 +-
.../net.dengine.client.pack/defaultstyle.pack/Info | 2 +-
.../net.dengine.client.pack/renderer.pack/Info | 2 +-
.../renderer.pack/lensflares.pack/Info | 2 +-
doomsday/client/src/macx/cursor_macx.mm | 32 ++++++++++++++++++++++
doomsday/client/src/ui/mouse_qt.cpp | 14 ++++++++++
doomsday/config_unix.pri | 4 ++-
doomsday/config_unix_any.pri | 4 +++
doomsday/dep_assimp.pri | 6 ++--
doomsday/dep_curses.pri | 6 ++--
doomsday/dep_fluidsynth.pri | 6 ++--
doomsday/dep_glib.pri | 6 ++--
doomsday/dep_openal.pri | 6 ++--
doomsday/dep_opengl.pri | 4 +--
doomsday/dep_sdl.pri | 4 +--
doomsday/dep_sdl2.pri | 10 +++----
doomsday/dep_zlib.pri | 4 +--
doomsday/doc/output/doomsday.6 | 2 +-
doomsday/doc/readme/readme.ame | 2 +-
doomsday/doc/server/server.ame | 2 +-
doomsday/doc/shell-text/shell-text.ame | 2 +-
doomsday/libappfw/appfw.doxy | 2 +-
doomsday/libcore/net.dengine.stdlib.pack/Info | 2 +-
doomsday/libgui/gui.doxy | 2 +-
doomsday/libgui/libgui.pro | 8 +++---
doomsday/libgui/net.dengine.stdlib.gui.pack/Info | 2 +-
doomsday/net.dengine.base.pack/Info | 2 +-
doomsday/sdk-qch.doxy | 4 +--
31 files changed, 134 insertions(+), 50 deletions(-)
diff --git a/doomsday/api/dd_version.h b/doomsday/api/dd_version.h
index ea24c91..0f4c64b 100644
--- a/doomsday/api/dd_version.h
+++ b/doomsday/api/dd_version.h
@@ -51,8 +51,8 @@ extern "C" {
* Revision number increases with each small (maintenance) release.
*/
-#define DOOMSDAY_VERSION_BASE "1.15.2"
-#define DOOMSDAY_VERSION_NUMBER 1,15,2,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.15.3"
+#define DOOMSDAY_VERSION_NUMBER 1,15,3,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
index 69ab085..542890a 100644
--- a/doomsday/client/client.pro
+++ b/doomsday/client/client.pro
@@ -517,10 +517,12 @@ else:unix {
macx {
# Mac OS X only.
HEADERS += \
- $$DENG_MAC_INCLUDE_DIR/MusicPlayer.h
+ $$DENG_MAC_INCLUDE_DIR/MusicPlayer.h \
+ $$DENG_MAC_INCLUDE_DIR/cursor_macx.h
OBJECTIVE_SOURCES += \
- src/macx/MusicPlayer.mm
+ src/macx/MusicPlayer.mm \
+ src/macx/cursor_macx.mm
INCLUDEPATH += $$DENG_MAC_INCLUDE_DIR
}
diff --git a/doomsday/client/include/macx/cursor_macx.h b/doomsday/client/include/macx/cursor_macx.h
new file mode 100644
index 0000000..e2dfcf9
--- /dev/null
+++ b/doomsday/client/include/macx/cursor_macx.h
@@ -0,0 +1,30 @@
+/** @file cursor_macx.h Native OS X mouse cursor functions.
+ * @ingroup ui
+ *
+ * @authors Copyright © 2015 Jaakko Keränen <jaakko.keranen at iki.fi>
+ *
+ * @par License
+ * GPL: http://www.gnu.org/licenses/gpl.html
+ *
+ * <small>This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. This program is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details. You should have received a copy of the GNU
+ * General Public License along with this program; if not, see:
+ * http://www.gnu.org/licenses</small>
+ */
+
+#ifndef CLIENT_MACX_CURSOR_H
+#define CLIENT_MACX_CURSOR_H
+
+/**
+ * Show or hide the mouse cursor.
+ *
+ * @param show @c true to show, @c false to hide.
+ */
+void Cursor_Show(bool show);
+
+#endif // CLIENT_MACX_CURSOR_H
diff --git a/doomsday/client/net.dengine.client.pack/Info.dei b/doomsday/client/net.dengine.client.pack/Info.dei
index cda5078..f8023e0 100644
--- a/doomsday/client/net.dengine.client.pack/Info.dei
+++ b/doomsday/client/net.dengine.client.pack/Info.dei
@@ -1,7 +1,7 @@
# Client's primary resources
title: Doomsday Client
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core client
diff --git a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
index ab79a3f..4a1168f 100644
--- a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
@@ -1,4 +1,4 @@
title: Doomsday Default UI Style
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: ui style
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
index 2f1a516..c8ca563 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
@@ -1,6 +1,6 @@
# General resources for the renderer
title: Doomsday Renderer
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
index 0c7e3db..f544a04 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Default Lens Flares
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core fx
diff --git a/doomsday/client/src/macx/cursor_macx.mm b/doomsday/client/src/macx/cursor_macx.mm
new file mode 100644
index 0000000..9256024
--- /dev/null
+++ b/doomsday/client/src/macx/cursor_macx.mm
@@ -0,0 +1,32 @@
+/** @file cursor_macx.mm Native OS X mouse cursor functions.
+ * @ingroup ui
+ *
+ * @authors Copyright © 2015 Jaakko Keränen <jaakko.keranen at iki.fi>
+ *
+ * @par License
+ * GPL: http://www.gnu.org/licenses/gpl.html
+ *
+ * <small>This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. This program is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details. You should have received a copy of the GNU
+ * General Public License along with this program; if not, see:
+ * http://www.gnu.org/licenses</small>
+ */
+
+#include <AppKit/AppKit.h>
+
+void Cursor_Show(bool show)
+{
+ if(show)
+ {
+ [NSCursor unhide];
+ }
+ else
+ {
+ [NSCursor hide];
+ }
+}
diff --git a/doomsday/client/src/ui/mouse_qt.cpp b/doomsday/client/src/ui/mouse_qt.cpp
index b40fc35..dbc2417 100644
--- a/doomsday/client/src/ui/mouse_qt.cpp
+++ b/doomsday/client/src/ui/mouse_qt.cpp
@@ -34,6 +34,10 @@
#include <QCursor>
#include <de/Canvas>
+#ifdef MACOSX
+# include "cursor_macx.h"
+#endif
+
typedef struct clicker_s {
int down; // Count for down events.
int up; // Count for up events.
@@ -120,7 +124,9 @@ static void Mouse_Qt_GetState(mousestate_t *state)
static void Mouse_Qt_ShowCursor(bool yes)
{
+#ifndef MACOSX
de::Canvas &canvas = ClientWindowSystem::main().canvas();
+#endif
LOG_INPUT_VERBOSE("%s cursor (presently visible? %b)")
<< (yes? "showing" : "hiding") << !cursorHidden;
@@ -128,14 +134,22 @@ static void Mouse_Qt_ShowCursor(bool yes)
if(!yes && !cursorHidden)
{
cursorHidden = true;
+#ifdef MACOSX
+ Cursor_Show(false);
+#else
canvas.setCursor(QCursor(Qt::BlankCursor));
qApp->setOverrideCursor(QCursor(Qt::BlankCursor));
+#endif
}
else if(yes && cursorHidden)
{
cursorHidden = false;
+#ifdef MACOSX
+ Cursor_Show(true);
+#else
qApp->restoreOverrideCursor();
canvas.setCursor(QCursor(Qt::ArrowCursor)); // Default cursor.
+#endif
}
}
diff --git a/doomsday/config_unix.pri b/doomsday/config_unix.pri
index 73aca06..324236a 100644
--- a/doomsday/config_unix.pri
+++ b/doomsday/config_unix.pri
@@ -43,7 +43,9 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doomsday
# the linker where to find them.
!contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
-DENG_BASE_DIR = $$PREFIX/share/doomsday
+isEmpty(DENG_BASE_DIR) {
+ DENG_BASE_DIR = $$PREFIX/share/doomsday
+}
DENG_DATA_DIR = $$DENG_BASE_DIR/data
DEFINES += DENG_BASE_DIR=\"\\\"$${DENG_BASE_DIR}/\\\"\"
diff --git a/doomsday/config_unix_any.pri b/doomsday/config_unix_any.pri
index 83a390f..8de52d6 100644
--- a/doomsday/config_unix_any.pri
+++ b/doomsday/config_unix_any.pri
@@ -36,6 +36,10 @@ deng_c++11|c++11 {
# Unix System Tools ----------------------------------------------------------
+isEmpty(PKG_CONFIG) {
+ PKG_CONFIG = pkg-config
+}
+
# Python 2 to be used in generated scripts.
isEmpty(SCRIPT_PYTHON) {
exists(/usr/bin/python2.7): SCRIPT_PYTHON = /usr/bin/python2.7
diff --git a/doomsday/dep_assimp.pri b/doomsday/dep_assimp.pri
index 21078f8..bf5efb3 100644
--- a/doomsday/dep_assimp.pri
+++ b/doomsday/dep_assimp.pri
@@ -61,12 +61,12 @@ deng_extassimp {
}
else:!macx:!win32 {
# Are the development files installed?
- !system(pkg-config --exists assimp) {
+ !system($$PKG_CONFIG --exists assimp) {
error(Missing dependency: Open Asset Import Library)
}
- aiOpts = $$system(pkg-config --cflags assimp)
- aiLibs = $$system(pkg-config --libs assimp)
+ aiOpts = $$system($$PKG_CONFIG --cflags assimp)
+ aiLibs = $$system($$PKG_CONFIG --libs assimp)
}
else {
error(Open Asset Import Library location not defined (ASSIMP_DIR))
diff --git a/doomsday/dep_curses.pri b/doomsday/dep_curses.pri
index ea98ed7..d63047a 100644
--- a/doomsday/dep_curses.pri
+++ b/doomsday/dep_curses.pri
@@ -7,9 +7,9 @@ else:win32 {
}
else {
# Generic Unix.
- !system(pkg-config --exists ncurses) {
+ !system($$PKG_CONFIG --exists ncurses) {
error(Missing dependency: ncurses)
}
- QMAKE_CXXFLAGS += $$system(pkg-config --cflags ncurses)
- LIBS += $$system(pkg-config --libs ncurses)
+ QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags ncurses)
+ LIBS += $$system($$PKG_CONFIG --libs ncurses)
}
diff --git a/doomsday/dep_fluidsynth.pri b/doomsday/dep_fluidsynth.pri
index 68fcf78..8415e3b 100644
--- a/doomsday/dep_fluidsynth.pri
+++ b/doomsday/dep_fluidsynth.pri
@@ -1,10 +1,10 @@
# Build configuration for libfluidsynth.
unix {
# Is the FluidSynth development files installed?
- system(pkg-config --exists fluidsynth) {
- flags = $$system(pkg-config --cflags fluidsynth)
+ system($$PKG_CONFIG --exists fluidsynth) {
+ flags = $$system($$PKG_CONFIG --cflags fluidsynth)
QMAKE_CFLAGS += $$flags
QMAKE_CXXFLAGS += $$flags
- LIBS += $$system(pkg-config --libs fluidsynth)
+ LIBS += $$system($$PKG_CONFIG --libs fluidsynth)
}
}
diff --git a/doomsday/dep_glib.pri b/doomsday/dep_glib.pri
index 8d73aa7..e149578 100644
--- a/doomsday/dep_glib.pri
+++ b/doomsday/dep_glib.pri
@@ -1,7 +1,7 @@
# Build configuration for glib.
unix {
# Is the GLib development files installed?
- !system(pkg-config --exists gthread-2.0) {
+ !system($$PKG_CONFIG --exists gthread-2.0) {
error(Missing dependency: FluidSynth requires GLib 2.0 development files)
}
@@ -11,6 +11,6 @@ unix {
LIBS += -L/usr/local/Cellar/gettext/$$GETTEXT_VERSION/lib/
}
- QMAKE_CFLAGS += $$system(pkg-config --cflags gthread-2.0 glib-2.0)
- LIBS += $$system(pkg-config --libs gthread-2.0 glib-2.0)
+ QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags gthread-2.0 glib-2.0)
+ LIBS += $$system($$PKG_CONFIG --libs gthread-2.0 glib-2.0)
}
diff --git a/doomsday/dep_openal.pri b/doomsday/dep_openal.pri
index d12f082..40ed62b 100644
--- a/doomsday/dep_openal.pri
+++ b/doomsday/dep_openal.pri
@@ -19,11 +19,11 @@ else:macx {
else {
# Generic Unix.
# Check that the dev library is installed.
- !system(pkg-config --exists openal) {
+ !system($$PKG_CONFIG --exists openal) {
error(Missing dependency: OpenAL library (development headers). Alternatively disable the OpenAL plugin by removing deng_openal from CONFIG.)
}
- oalFlags = $$system(pkg-config --cflags openal)
+ oalFlags = $$system($$PKG_CONFIG --cflags openal)
QMAKE_CFLAGS += $$oalFlags
QMAKE_CXXFLAGS += $$oalFlags
- LIBS += $$system(pkg-config --libs openal)
+ LIBS += $$system($$PKG_CONFIG --libs openal)
}
diff --git a/doomsday/dep_opengl.pri b/doomsday/dep_opengl.pri
index 57709a4..9bb498c 100644
--- a/doomsday/dep_opengl.pri
+++ b/doomsday/dep_opengl.pri
@@ -18,8 +18,8 @@ else:macx {
}
else {
# Generic Unix.
- LIBS += $$system(pkg-config --libs gl)
- INCLUDEPATH += $$system(pkg-config --cflags gl)
+ LIBS += $$system($$PKG_CONFIG --libs gl)
+ INCLUDEPATH += $$system($$PKG_CONFIG --cflags gl)
# An additional include path for user's GL headers.
!isEmpty(OPENGL_DIR): INCLUDEPATH = $$OPENGL_DIR $$INCLUDEPATH
diff --git a/doomsday/dep_sdl.pri b/doomsday/dep_sdl.pri
index 197e08e..2ac2366 100644
--- a/doomsday/dep_sdl.pri
+++ b/doomsday/dep_sdl.pri
@@ -29,10 +29,10 @@ else:macx {
}
else {
# Generic Unix.
- sdlflags = $$system(pkg-config sdl --cflags)
+ sdlflags = $$system($$PKG_CONFIG sdl --cflags)
QMAKE_CFLAGS += $$sdlflags
QMAKE_CXXFLAGS += $$sdlflags
- LIBS += $$system(pkg-config sdl --libs)
+ LIBS += $$system($$PKG_CONFIG sdl --libs)
}
# Should we include SDL_mixer in the build, too?
diff --git a/doomsday/dep_sdl2.pri b/doomsday/dep_sdl2.pri
index bf124a9..c6ac24f 100644
--- a/doomsday/dep_sdl2.pri
+++ b/doomsday/dep_sdl2.pri
@@ -30,13 +30,13 @@ else:macx:!isEmpty(SDL2_FRAMEWORK_DIR) {
}
else {
# Generic setup via pkg-config.
- !system(pkg-config --exists sdl2) {
+ !system($$PKG_CONFIG --exists sdl2) {
error(Missing dependency: SDL2)
}
- sdlflags = $$system(pkg-config sdl2 --cflags)
+ sdlflags = $$system($$PKG_CONFIG sdl2 --cflags)
QMAKE_CFLAGS += $$sdlflags
QMAKE_CXXFLAGS += $$sdlflags
- LIBS += $$system(pkg-config sdl2 --libs)
+ LIBS += $$system($$PKG_CONFIG sdl2 --libs)
}
# Should we include SDL2_mixer in the build, too?
@@ -70,10 +70,10 @@ else {
LIBS += -framework SDL2_mixer
}
else {
- !system(pkg-config --exists SDL2_mixer) {
+ !system($$PKG_CONFIG --exists SDL2_mixer) {
error(Missing dependency: SDL2_mixer)
}
- LIBS += $$system(pkg-config --libs SDL2_mixer)
+ LIBS += $$system($$PKG_CONFIG --libs SDL2_mixer)
}
}
diff --git a/doomsday/dep_zlib.pri b/doomsday/dep_zlib.pri
index c0857d5..960a68c 100644
--- a/doomsday/dep_zlib.pri
+++ b/doomsday/dep_zlib.pri
@@ -16,6 +16,6 @@ else:macx {
}
else {
# Generic Unix.
- QMAKE_CFLAGS += $$system(pkg-config zlib --cflags)
- LIBS += $$system(pkg-config zlib --libs)
+ QMAKE_CFLAGS += $$system($$PKG_CONFIG zlib --cflags)
+ LIBS += $$system($$PKG_CONFIG zlib --libs)
}
diff --git a/doomsday/doc/output/doomsday.6 b/doomsday/doc/output/doomsday.6
index 4be0cb5..f369932 100644
--- a/doomsday/doc/output/doomsday.6
+++ b/doomsday/doc/output/doomsday.6
@@ -1,5 +1,5 @@
.\" manual page generated by Amethyst (mdoc+tbl)
-.Dd August 1, 2015
+.Dd September 1, 2015
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
diff --git a/doomsday/doc/readme/readme.ame b/doomsday/doc/readme/readme.ame
index fb99cc9..a3df40d 100644
--- a/doomsday/doc/readme/readme.ame
+++ b/doomsday/doc/readme/readme.ame
@@ -5,7 +5,7 @@
@macro{TITLE}{ doomsday }
}
@macro{ONELINER}{ Enhanced source port of Doom, Heretic and Hexen }
- at macro{VERSION}{ Version 1.15.2 }
+ at macro{VERSION}{ Version 1.15.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/server/server.ame b/doomsday/doc/server/server.ame
index 823c8ee..34b0109 100644
--- a/doomsday/doc/server/server.ame
+++ b/doomsday/doc/server/server.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-server
@macro{TITLE}{ doomsday-server }
@macro{ONELINER}{ Doomsday Engine multiplayer daemon }
- at macro{VERSION}{ Version 1.15.2 }
+ at macro{VERSION}{ Version 1.15.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/shell-text/shell-text.ame b/doomsday/doc/shell-text/shell-text.ame
index 9ee13c9..2960869 100644
--- a/doomsday/doc/shell-text/shell-text.ame
+++ b/doomsday/doc/shell-text/shell-text.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-shell-text
@macro{TITLE}{ doomsday-shell-text }
@macro{ONELINER}{ Utility for controlling and monitoring Doomsday servers }
- at macro{VERSION}{ Version 1.15.2 }
+ at macro{VERSION}{ Version 1.15.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/libappfw/appfw.doxy b/doomsday/libappfw/appfw.doxy
index e99371a..aed9357 100644
--- a/doomsday/libappfw/appfw.doxy
+++ b/doomsday/libappfw/appfw.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libappfw"
-PROJECT_NUMBER = 1.15.2
+PROJECT_NUMBER = 1.15.3
PROJECT_BRIEF = "Application Framework"
OUTPUT_DIRECTORY = ../apidoc/appfw/
diff --git a/doomsday/libcore/net.dengine.stdlib.pack/Info b/doomsday/libcore/net.dengine.stdlib.pack/Info
index 707e1f5..fc5e268 100644
--- a/doomsday/libcore/net.dengine.stdlib.pack/Info
+++ b/doomsday/libcore/net.dengine.stdlib.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core script
diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy
index e24e5d2..5aa6078 100644
--- a/doomsday/libgui/gui.doxy
+++ b/doomsday/libgui/gui.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libgui"
-PROJECT_NUMBER = 1.15.2
+PROJECT_NUMBER = 1.15.3
PROJECT_BRIEF = "Graphics, Audio and Input Library"
OUTPUT_DIRECTORY = ../apidoc/gui/
diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro
index 7254ace..6d4cfa6 100644
--- a/doomsday/libgui/libgui.pro
+++ b/doomsday/libgui/libgui.pro
@@ -35,15 +35,15 @@ else:unix {
# DisplayMode uses the Xrandr and XFree86-VideoMode extensions.
!deng_nodisplaymode {
# Check that the X11 extensions exist.
- !system(pkg-config --exists xxf86vm) {
+ !system($$PKG_CONFIG --exists xxf86vm) {
error(Missing dependency: X11 XFree86 video mode extension library (development headers). Alternatively disable display mode functionality with: CONFIG+=deng_nodisplaymode)
}
- !system(pkg-config --exists xrandr) {
+ !system($$PKG_CONFIG --exists xrandr) {
error(Missing dependency: X11 RandR extension library (development headers). Alternatively disable display mode functionality with: CONFIG+=deng_nodisplaymode)
}
- QMAKE_CXXFLAGS += $$system(pkg-config xrandr xxf86vm --cflags)
- LIBS += $$system(pkg-config xrandr xxf86vm --libs)
+ QMAKE_CXXFLAGS += $$system($$PKG_CONFIG xrandr xxf86vm --cflags)
+ LIBS += $$system($$PKG_CONFIG xrandr xxf86vm --libs)
}
}
diff --git a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
index 0b9c37d..27917ef 100644
--- a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
+++ b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library: GUI
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core script gui
diff --git a/doomsday/net.dengine.base.pack/Info b/doomsday/net.dengine.base.pack/Info
index b022dc3..974769b 100644
--- a/doomsday/net.dengine.base.pack/Info
+++ b/doomsday/net.dengine.base.pack/Info
@@ -1,6 +1,6 @@
# Shared resources for all Doomsday applications
title: Doomsday Base
-version: 1.15.2
+version: 1.15.3
license: GPL 3+
tags: core
diff --git a/doomsday/sdk-qch.doxy b/doomsday/sdk-qch.doxy
index 4ee077e..f6d4139 100644
--- a/doomsday/sdk-qch.doxy
+++ b/doomsday/sdk-qch.doxy
@@ -5,8 +5,8 @@ OUTPUT_DIRECTORY = apidoc-qch/
# Also generate help files for Qt Creator
GENERATE_QHP = YES
QCH_FILE = "doomsday.qch"
-QHP_NAMESPACE = "net.dengine.sdk.1152"
-QHP_VIRTUAL_FOLDER = "doomsday-1.15.2"
+QHP_NAMESPACE = "net.dengine.sdk.1153"
+QHP_VIRTUAL_FOLDER = "doomsday-1.15.3"
QHG_LOCATION = "../build/scripts/qhelp.py"
# Dynamic HTML doesn't work inside Qt Creator
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list