[glfw3] 01/04: Add libglfw3-wayland package

James Cowgill jcowgill at moszumanska.debian.org
Fri Jun 17 23:31:47 UTC 2016


This is an automated email from the git hooks/post-receive script.

jcowgill pushed a commit to branch wayland
in repository glfw3.

commit d7ac61201bb7cb84caba8b7db3a1018591ec8668
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jun 18 00:24:34 2016 +0100

    Add libglfw3-wayland package
---
 debian/control                                     | 26 +++++-
 debian/libglfw3-doc.docs                           |  2 +-
 debian/libglfw3-wayland.install                    |  2 +
 debian/libglfw3-wayland.lintian-overrides          |  3 +
 debian/libglfw3-wayland.symbols                    | 14 +++
 debian/libglfw3.symbols                            | 99 +---------------------
 .../{libglfw3.symbols => libglfw3.symbols.common}  |  7 --
 debian/rules                                       | 21 ++++-
 8 files changed, 62 insertions(+), 112 deletions(-)

diff --git a/debian/control b/debian/control
index fe43446..d9d9bb8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,17 @@ Uploaders: Mahyuddin Susanto <udienz at ubuntu.com>,
 Build-Depends:
  cmake,
  debhelper (>= 9),
+ dh-exec,
+ extra-cmake-modules,
  libgl1-mesa-dev | libgl-dev,
  libvulkan-dev,
+ libwayland-dev,
  libx11-dev,
  libxcursor-dev,
  libxinerama-dev,
  libxrandr-dev,
- libxxf86vm-dev
+ libxxf86vm-dev,
+ wayland-protocols,
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.8
 Homepage: http://www.glfw.org/
@@ -33,7 +37,22 @@ Description: portable library for OpenGL, window and input (libraries)
  It is easy to integrate into existing applications and does
  not lay claim to the main loop.
  .
- This package provides shared libraries.
+ This package provides the shared library built with the X11 backend.
+
+Package: libglfw3-wayland
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libglfw3
+Description: portable library for OpenGL, window and input (libraries)
+ GLFW is an Open Source, multi-platform library for creating
+ windows with OpenGL contexts and managing input and events.
+ It is easy to integrate into existing applications and does
+ not lay claim to the main loop.
+ .
+ This package provides the shared library built with the Wayland backend.
 
 Package: libglfw3-dev
 Section: libdevel
@@ -41,12 +60,13 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- libglfw3 (= ${binary:Version}),
+ libglfw3 (= ${binary:Version}) | libglfw3-wayland (= ${binary:Version}),
  libgl1-mesa-dev | libgl-dev,
  ${misc:Depends},
 Recommends:
  libegl1-mesa-dev,
  libvulkan-dev,
+ libwayland-dev,
  libx11-dev,
  libxrandr-dev,
 Conflicts: libglfw-dev
diff --git a/debian/libglfw3-doc.docs b/debian/libglfw3-doc.docs
index 0483a01..6517032 100644
--- a/debian/libglfw3-doc.docs
+++ b/debian/libglfw3-doc.docs
@@ -1,2 +1,2 @@
-obj-*/docs/html
+build-x11/docs/html
 README.md
diff --git a/debian/libglfw3-wayland.install b/debian/libglfw3-wayland.install
new file mode 100755
index 0000000..087d103
--- /dev/null
+++ b/debian/libglfw3-wayland.install
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+wayland/usr/lib/*/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libglfw3-wayland.lintian-overrides b/debian/libglfw3-wayland.lintian-overrides
new file mode 100644
index 0000000..645ebdc
--- /dev/null
+++ b/debian/libglfw3-wayland.lintian-overrides
@@ -0,0 +1,3 @@
+# libglfw3-wayland provides an alternative implementation of libglfw3 whose
+# package name is clearly already taken.
+libglfw3-wayland: package-name-doesnt-match-sonames libglfw3
diff --git a/debian/libglfw3-wayland.symbols b/debian/libglfw3-wayland.symbols
new file mode 100644
index 0000000..d22ae1a
--- /dev/null
+++ b/debian/libglfw3-wayland.symbols
@@ -0,0 +1,14 @@
+libglfw.so.3 libglfw3-wayland #MINVER#
+#include "libglfw3.symbols.common"
+ glfwGetWaylandDisplay at Base 3.2
+ glfwGetWaylandMonitor at Base 3.2
+ glfwGetWaylandWindow at Base 3.2
+# Although not part of the glfw API, these objects must be exported because
+# Wayland expects them to always point to the same address within any executable
+# (among other libraries etc). They can be dropped without breaking the ABI
+# since noone else should be using them at all...
+ (optional=wayland)zwp_confined_pointer_v1_interface at Base 3.2
+ (optional=wayland)zwp_locked_pointer_v1_interface at Base 3.2
+ (optional=wayland)zwp_pointer_constraints_v1_interface at Base 3.2
+ (optional=wayland)zwp_relative_pointer_manager_v1_interface at Base 3.2
+ (optional=wayland)zwp_relative_pointer_v1_interface at Base 3.2
diff --git a/debian/libglfw3.symbols b/debian/libglfw3.symbols
index 99183d4..18bd8f0 100644
--- a/debian/libglfw3.symbols
+++ b/debian/libglfw3.symbols
@@ -1,105 +1,8 @@
 libglfw.so.3 libglfw3 #MINVER#
- glfwCreateCursor at Base 3.1
- glfwCreateStandardCursor at Base 3.1
- glfwCreateWindow at Base 3.0
- glfwCreateWindowSurface at Base 3.2
- glfwDefaultWindowHints at Base 3.0
- glfwDestroyCursor at Base 3.1
- glfwDestroyWindow at Base 3.0
- glfwExtensionSupported at Base 3.0
- glfwFocusWindow at Base 3.2
- glfwGetClipboardString at Base 3.0
- glfwGetCurrentContext at Base 3.0
- glfwGetCursorPos at Base 3.0
- glfwGetEGLContext at Base 3.2
- glfwGetEGLDisplay at Base 3.2
- glfwGetEGLSurface at Base 3.2
- glfwGetFramebufferSize at Base 3.0
+#include "libglfw3.symbols.common"
  glfwGetGLXContext at Base 3.0
  glfwGetGLXWindow at Base 3.2
- glfwGetGammaRamp at Base 3.0
- glfwGetInputMode at Base 3.0
- glfwGetInstanceProcAddress at Base 3.2
- glfwGetJoystickAxes at Base 3.0
- glfwGetJoystickButtons at Base 3.0
- glfwGetJoystickName at Base 3.0
- glfwGetKey at Base 3.0
- glfwGetKeyName at Base 3.2
- glfwGetMonitorName at Base 3.0
- glfwGetMonitorPhysicalSize at Base 3.0
- glfwGetMonitorPos at Base 3.0
- glfwGetMonitors at Base 3.0
- glfwGetMouseButton at Base 3.0
- glfwGetPhysicalDevicePresentationSupport at Base 3.2
- glfwGetPrimaryMonitor at Base 3.0
- glfwGetProcAddress at Base 3.0
- glfwGetRequiredInstanceExtensions at Base 3.2
- glfwGetTime at Base 3.0
- glfwGetTimerFrequency at Base 3.2
- glfwGetTimerValue at Base 3.2
- glfwGetVersion at Base 3.0
- glfwGetVersionString at Base 3.0
- glfwGetVideoMode at Base 3.0
- glfwGetVideoModes at Base 3.0
- glfwGetWindowAttrib at Base 3.0
- glfwGetWindowFrameSize at Base 3.1
- glfwGetWindowMonitor at Base 3.0
- glfwGetWindowPos at Base 3.0
- glfwGetWindowSize at Base 3.0
- glfwGetWindowUserPointer at Base 3.0
  glfwGetX11Adapter at Base 3.1
  glfwGetX11Display at Base 3.0
  glfwGetX11Monitor at Base 3.1
  glfwGetX11Window at Base 3.0
- glfwHideWindow at Base 3.0
- glfwIconifyWindow at Base 3.0
- glfwInit at Base 3.0
- glfwJoystickPresent at Base 3.0
- glfwMakeContextCurrent at Base 3.0
- glfwMaximizeWindow at Base 3.2
- glfwPollEvents at Base 3.0
- glfwPostEmptyEvent at Base 3.1
- glfwRestoreWindow at Base 3.0
- glfwSetCharCallback at Base 3.0
- glfwSetCharModsCallback at Base 3.1
- glfwSetClipboardString at Base 3.0
- glfwSetCursor at Base 3.1
- glfwSetCursorEnterCallback at Base 3.0
- glfwSetCursorPos at Base 3.0
- glfwSetCursorPosCallback at Base 3.0
- glfwSetDropCallback at Base 3.1
- glfwSetErrorCallback at Base 3.0
- glfwSetFramebufferSizeCallback at Base 3.0
- glfwSetGamma at Base 3.0
- glfwSetGammaRamp at Base 3.0
- glfwSetInputMode at Base 3.0
- glfwSetJoystickCallback at Base 3.2
- glfwSetKeyCallback at Base 3.0
- glfwSetMonitorCallback at Base 3.0
- glfwSetMouseButtonCallback at Base 3.0
- glfwSetScrollCallback at Base 3.0
- glfwSetTime at Base 3.0
- glfwSetWindowAspectRatio at Base 3.2
- glfwSetWindowCloseCallback at Base 3.0
- glfwSetWindowFocusCallback at Base 3.0
- glfwSetWindowIcon at Base 3.2
- glfwSetWindowIconifyCallback at Base 3.0
- glfwSetWindowMonitor at Base 3.2
- glfwSetWindowPos at Base 3.0
- glfwSetWindowPosCallback at Base 3.0
- glfwSetWindowRefreshCallback at Base 3.0
- glfwSetWindowShouldClose at Base 3.0
- glfwSetWindowSize at Base 3.0
- glfwSetWindowSizeCallback at Base 3.0
- glfwSetWindowSizeLimits at Base 3.2
- glfwSetWindowTitle at Base 3.0
- glfwSetWindowUserPointer at Base 3.0
- glfwShowWindow at Base 3.0
- glfwSwapBuffers at Base 3.0
- glfwSwapInterval at Base 3.0
- glfwTerminate at Base 3.0
- glfwVulkanSupported at Base 3.2
- glfwWaitEvents at Base 3.0
- glfwWaitEventsTimeout at Base 3.2
- glfwWindowHint at Base 3.0
- glfwWindowShouldClose at Base 3.0
diff --git a/debian/libglfw3.symbols b/debian/libglfw3.symbols.common
similarity index 93%
copy from debian/libglfw3.symbols
copy to debian/libglfw3.symbols.common
index 99183d4..12b6b5a 100644
--- a/debian/libglfw3.symbols
+++ b/debian/libglfw3.symbols.common
@@ -1,4 +1,3 @@
-libglfw.so.3 libglfw3 #MINVER#
  glfwCreateCursor at Base 3.1
  glfwCreateStandardCursor at Base 3.1
  glfwCreateWindow at Base 3.0
@@ -15,8 +14,6 @@ libglfw.so.3 libglfw3 #MINVER#
  glfwGetEGLDisplay at Base 3.2
  glfwGetEGLSurface at Base 3.2
  glfwGetFramebufferSize at Base 3.0
- glfwGetGLXContext at Base 3.0
- glfwGetGLXWindow at Base 3.2
  glfwGetGammaRamp at Base 3.0
  glfwGetInputMode at Base 3.0
  glfwGetInstanceProcAddress at Base 3.2
@@ -47,10 +44,6 @@ libglfw.so.3 libglfw3 #MINVER#
  glfwGetWindowPos at Base 3.0
  glfwGetWindowSize at Base 3.0
  glfwGetWindowUserPointer at Base 3.0
- glfwGetX11Adapter at Base 3.1
- glfwGetX11Display at Base 3.0
- glfwGetX11Monitor at Base 3.1
- glfwGetX11Window at Base 3.0
  glfwHideWindow at Base 3.0
  glfwIconifyWindow at Base 3.0
  glfwInit at Base 3.0
diff --git a/debian/rules b/debian/rules
index 2623f40..0e7bdee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,28 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+CONFIGURE_COMMON = -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+	-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF \
+	-DGLFW_BUILD_TESTS=OFF
+
 %:
 	dh $@ --parallel
 
+override_dh_auto_clean:
+	dh_auto_clean -Bbuild-x11
+	dh_auto_clean -Bbuild-wayland
+
 override_dh_auto_configure:
-	dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
-		-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF \
-		-DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=ON
+	dh_auto_configure -Bbuild-x11 -- $(CONFIGURE_COMMON) -DGLFW_BUILD_DOCS=ON
+	dh_auto_configure -Bbuild-wayland -- $(CONFIGURE_COMMON) -DGLFW_USE_WAYLAND=ON
+
+override_dh_auto_build:
+	dh_auto_build -Bbuild-x11
+	dh_auto_build -Bbuild-wayland
+
+override_dh_auto_install:
+	dh_auto_install -Bbuild-x11
+	dh_auto_install -Bbuild-wayland -- DESTDIR=$(CURDIR)/debian/tmp/wayland
 
 override_dh_installexamples:
 	dh_installexamples -XCMakeLists.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw3.git



More information about the Pkg-games-commits mailing list