Skip to content

Commit 94df29e

Browse files
jef-njef-n
committed
debian packaging: include Qt53DExtra headers removed on debian/ubuntu
(cherry picked from commit 1f91858)
1 parent 4bf5d4d commit 94df29e

File tree

90 files changed

+4035
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+4035
-19
lines changed

‎debian/control.in

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ Build-Depends:
3939
graphviz,
4040
xvfb, xauth,
4141
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
42-
#sid buster bionic cosmic# libosgearth-dev,
43-
#bionic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
42+
#sid buster bionic cosmic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
4443
#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite,
4544
locales, ca-certificates, ninja-build
4645
Build-Conflicts: libqgis-dev, qgis-dev
@@ -147,19 +146,19 @@ Description: QGIS - shared native gui library
147146
.
148147
This package contains the shared native gui library.
149148

150-
#bionic#Package: libqgis-3d{QGIS_ABI}
151-
#bionic#Architecture: any
152-
#bionic#Section: libs
153-
#bionic#Depends:
154-
#bionic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
155-
#bionic# ${shlibs:Depends},
156-
#bionic# ${misc:Depends}
157-
#bionic#Description: QGIS - shared 3d library
158-
#bionic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
159-
#bionic# display databases of geographic information.
160-
#bionic# .
161-
#bionic# This package contains the shared 3d library.
162-
#bionic#
149+
#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI}
150+
#sid buster bionic cosmic#Architecture: any
151+
#sid buster bionic cosmic#Section: libs
152+
#sid buster bionic cosmic#Depends:
153+
#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
154+
#sid buster bionic cosmic# ${shlibs:Depends},
155+
#sid buster bionic cosmic# ${misc:Depends}
156+
#sid buster bionic cosmic#Description: QGIS - shared 3d library
157+
#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
158+
#sid buster bionic cosmic# display databases of geographic information.
159+
#sid buster bionic cosmic# .
160+
#sid buster bionic cosmic# This package contains the shared 3d library.
161+
#sid buster bionic cosmic#
163162
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
164163
Architecture: any
165164
Section: libs

‎debian/libqgis-dev.install.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ usr/lib/libqgis_server.so
88
usr/lib/libqgisgrass{GRASSVER}.so
99
usr/lib/libqgispython.so
1010
usr/share/qgis/FindQGIS.cmake
11-
#bionic#usr/lib/libqgis_3d.so
11+
#sid buster bionic cosmic#usr/lib/libqgis_3d.so

‎debian/rules

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,18 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
104104
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
105105
endif
106106

107-
ifneq (,$(findstring $(DISTRIBUTION),"bionic"))
108-
# Only on bionic - Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
107+
ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic cosmic"))
109108
CMAKE_OPTS += \
110109
-DWITH_3D=TRUE \
111110
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
111+
112+
ifneq (,$(findstring $(DISTRIBUTION),"sid buster cosmic"))
113+
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
114+
CMAKE_OPTS += \
115+
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
116+
-DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \
117+
-DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so
118+
endif
112119
endif
113120

114121
ifneq (,$(WITH_ORACLE))

‎external/qt3dextra-headers/Qt3DExtras/QAbstractCameraController

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qabstractcameracontroller.h"

‎external/qt3dextra-headers/Qt3DExtras/QAbstractSpriteSheet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qabstractspritesheet.h"

‎external/qt3dextra-headers/Qt3DExtras/QConeGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qconegeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QConeMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qconemesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QCuboidGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qcuboidgeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QCuboidMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qcuboidmesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QCylinderGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qcylindergeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QCylinderMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qcylindermesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QDiffuseMapMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qdiffusemapmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QDiffuseSpecularMapMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qdiffusespecularmapmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QDiffuseSpecularMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qdiffusespecularmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QExtrudedTextGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qextrudedtextgeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QExtrudedTextMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qextrudedtextmesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QFirstPersonCameraController

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qfirstpersoncameracontroller.h"

‎external/qt3dextra-headers/Qt3DExtras/QForwardRenderer

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qforwardrenderer.h"

‎external/qt3dextra-headers/Qt3DExtras/QGoochMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qgoochmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QMetalRoughMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qmetalroughmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QMorphPhongMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qmorphphongmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QNormalDiffuseMapAlphaMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qnormaldiffusemapalphamaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QNormalDiffuseMapMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qnormaldiffusemapmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QNormalDiffuseSpecularMapMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qnormaldiffusespecularmapmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QOrbitCameraController

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qorbitcameracontroller.h"

‎external/qt3dextra-headers/Qt3DExtras/QPerVertexColorMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qpervertexcolormaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QPhongAlphaMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qphongalphamaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QPhongMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qphongmaterial.h"

‎external/qt3dextra-headers/Qt3DExtras/QPlaneGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qplanegeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QPlaneMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qplanemesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QSkyboxEntity

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qskyboxentity.h"

‎external/qt3dextra-headers/Qt3DExtras/QSphereGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qspheregeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QSphereMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qspheremesh.h"

‎external/qt3dextra-headers/Qt3DExtras/QSpriteGrid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qspritegrid.h"

‎external/qt3dextra-headers/Qt3DExtras/QSpriteSheet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qspritesheet.h"

‎external/qt3dextra-headers/Qt3DExtras/QSpriteSheetItem

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qspritesheetitem.h"

‎external/qt3dextra-headers/Qt3DExtras/QText2DEntity

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qtext2dentity.h"

‎external/qt3dextra-headers/Qt3DExtras/QTextureMaterial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qtexturematerial.h"

‎external/qt3dextra-headers/Qt3DExtras/QTorusGeometry

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qtorusgeometry.h"

‎external/qt3dextra-headers/Qt3DExtras/QTorusMesh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qtorusmesh.h"

‎external/qt3dextra-headers/Qt3DExtras/Qt3DExtras

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#ifndef QT_QT3DEXTRAS_MODULE_H
2+
#define QT_QT3DEXTRAS_MODULE_H
3+
#include <Qt3DExtras/Qt3DExtrasDepends>
4+
#include "qabstractcameracontroller.h"
5+
#include "qabstractspritesheet.h"
6+
#include "qconegeometry.h"
7+
#include "qconemesh.h"
8+
#include "qcuboidgeometry.h"
9+
#include "qcuboidmesh.h"
10+
#include "qcylindergeometry.h"
11+
#include "qcylindermesh.h"
12+
#include "qdiffusemapmaterial.h"
13+
#include "qdiffusespecularmapmaterial.h"
14+
#include "qdiffusespecularmaterial.h"
15+
#include "qextrudedtextgeometry.h"
16+
#include "qextrudedtextmesh.h"
17+
#include "qfirstpersoncameracontroller.h"
18+
#include "qforwardrenderer.h"
19+
#include "qgoochmaterial.h"
20+
#include "qmetalroughmaterial.h"
21+
#include "qmorphphongmaterial.h"
22+
#include "qnormaldiffusemapalphamaterial.h"
23+
#include "qnormaldiffusemapmaterial.h"
24+
#include "qnormaldiffusespecularmapmaterial.h"
25+
#include "qorbitcameracontroller.h"
26+
#include "qpervertexcolormaterial.h"
27+
#include "qphongalphamaterial.h"
28+
#include "qphongmaterial.h"
29+
#include "qplanegeometry.h"
30+
#include "qplanemesh.h"
31+
#include "qskyboxentity.h"
32+
#include "qspheregeometry.h"
33+
#include "qspheremesh.h"
34+
#include "qspritegrid.h"
35+
#include "qspritesheet.h"
36+
#include "qspritesheetitem.h"
37+
#include "qt3dwindow.h"
38+
#include "qtext2dentity.h"
39+
#include "qtexturedmetalroughmaterial.h"
40+
#include "qtexturematerial.h"
41+
#include "qtorusgeometry.h"
42+
#include "qtorusmesh.h"
43+
#include "qt3dextrasversion.h"
44+
#endif

‎external/qt3dextra-headers/Qt3DExtras/Qt3DExtrasDepends

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* This file was generated by qmake with the info from <root>/src/extras/extras.pro. */
2+
#ifdef __cplusplus /* create empty PCH in C mode */
3+
#include <QtCore/QtCore>
4+
#include <QtGui/QtGui>
5+
#include <Qt3DCore/Qt3DCore>
6+
#include <Qt3DRender/Qt3DRender>
7+
#include <Qt3DInput/Qt3DInput>
8+
#include <Qt3DLogic/Qt3DLogic>
9+
#endif

‎external/qt3dextra-headers/Qt3DExtras/Qt3DExtrasVersion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qt3dextrasversion.h"

‎external/qt3dextra-headers/Qt3DExtras/Qt3DWindow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "qt3dwindow.h"

‎external/qt3dextra-headers/Qt3DExtras/qabstractcameracontroller.h

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
4+
** Contact: http://www.qt-project.org/legal
5+
**
6+
** This file is part of the Qt3D module of the Qt Toolkit.
7+
**
8+
** $QT_BEGIN_LICENSE:LGPL3$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** Software or, alternatively, in accordance with the terms contained in
13+
** a written agreement between you and The Qt Company. For licensing terms
14+
** and conditions see http://www.qt.io/terms-conditions. For further
15+
** information use the contact form at http://www.qt.io/contact-us.
16+
**
17+
** GNU Lesser General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU Lesser
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
21+
** packaging of this file. Please review the following information to
22+
** ensure the GNU Lesser General Public License version 3 requirements
23+
** will be met: https://www.gnu.org/licenses/lgpl.html.
24+
**
25+
** GNU General Public License Usage
26+
** Alternatively, this file may be used under the terms of the GNU
27+
** General Public License version 2.0 or later as published by the Free
28+
** Software Foundation and appearing in the file LICENSE.GPL included in
29+
** the packaging of this file. Please review the following information to
30+
** ensure the GNU General Public License version 2.0 requirements will be
31+
** met: http://www.gnu.org/licenses/gpl-2.0.html.
32+
**
33+
** $QT_END_LICENSE$
34+
**
35+
****************************************************************************/
36+
37+
#ifndef QT3DEXTRAS_QABSTRACTCAMERACONTROLLER_H
38+
#define QT3DEXTRAS_QABSTRACTCAMERACONTROLLER_H
39+
40+
#include <Qt3DCore/QEntity>
41+
#include <Qt3DExtras/qt3dextras_global.h>
42+
43+
QT_BEGIN_NAMESPACE
44+
45+
namespace Qt3DInput {
46+
class QKeyboardDevice;
47+
class QMouseDevice;
48+
}
49+
50+
namespace Qt3DRender {
51+
class QCamera;
52+
}
53+
54+
namespace Qt3DExtras {
55+
56+
class QAbstractCameraControllerPrivate;
57+
58+
class QT3DEXTRASSHARED_EXPORT QAbstractCameraController : public Qt3DCore::QEntity
59+
{
60+
Q_OBJECT
61+
Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
62+
Q_PROPERTY(float linearSpeed READ linearSpeed WRITE setLinearSpeed NOTIFY linearSpeedChanged)
63+
Q_PROPERTY(float lookSpeed READ lookSpeed WRITE setLookSpeed NOTIFY lookSpeedChanged)
64+
Q_PROPERTY(float acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
65+
Q_PROPERTY(float deceleration READ deceleration WRITE setDeceleration NOTIFY decelerationChanged)
66+
67+
public:
68+
~QAbstractCameraController();
69+
70+
Qt3DRender::QCamera *camera() const;
71+
float linearSpeed() const;
72+
float lookSpeed() const;
73+
74+
float acceleration() const;
75+
float deceleration() const;
76+
77+
void setCamera(Qt3DRender::QCamera *camera);
78+
void setLinearSpeed(float linearSpeed);
79+
void setLookSpeed(float lookSpeed);
80+
81+
void setAcceleration(float acceleration);
82+
void setDeceleration(float deceleration);
83+
84+
Q_SIGNALS:
85+
void cameraChanged();
86+
void linearSpeedChanged();
87+
void lookSpeedChanged();
88+
89+
void accelerationChanged(float acceleration);
90+
void decelerationChanged(float deceleration);
91+
92+
protected:
93+
explicit QAbstractCameraController(Qt3DCore::QNode *parent = nullptr);
94+
QAbstractCameraController(QAbstractCameraControllerPrivate &dd, Qt3DCore::QNode *parent = nullptr);
95+
96+
Qt3DInput::QKeyboardDevice *keyboardDevice() const;
97+
Qt3DInput::QMouseDevice *mouseDevice() const;
98+
99+
public:
100+
struct InputState
101+
{
102+
float rxAxisValue;
103+
float ryAxisValue;
104+
float txAxisValue;
105+
float tyAxisValue;
106+
float tzAxisValue;
107+
108+
bool leftMouseButtonActive;
109+
bool middleMouseButtonActive;
110+
bool rightMouseButtonActive;
111+
112+
bool altKeyActive;
113+
bool shiftKeyActive;
114+
};
115+
116+
private:
117+
virtual void moveCamera(const InputState &state, float dt) = 0;
118+
119+
private:
120+
Q_DECLARE_PRIVATE(QAbstractCameraController)
121+
};
122+
123+
} // Qt3DExtras
124+
125+
QT_END_NAMESPACE
126+
127+
#endif // QT3DEXTRAS_QABSTRACTCAMERACONTROLLER_H

0 commit comments

Comments
 (0)