Install header files and pkg-config file for external modules
This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
This commit is contained in:
@@ -2,6 +2,7 @@ bin_PROGRAMS = weston \
|
||||
$(weston_launch)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-DDATADIR='"$(datadir)"' \
|
||||
-DMODULEDIR='"$(moduledir)"' \
|
||||
-DLIBEXECDIR='"$(libexecdir)"' \
|
||||
@@ -78,6 +79,16 @@ endif
|
||||
|
||||
endif # BUILD_WESTON_LAUNCH
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = weston.pc
|
||||
|
||||
westonincludedir = $(includedir)/weston
|
||||
westoninclude_HEADERS = \
|
||||
version.h \
|
||||
compositor.h \
|
||||
../shared/matrix.h \
|
||||
../shared/config-parser.h
|
||||
|
||||
moduledir = @libdir@/weston
|
||||
module_LTLIBRARIES = \
|
||||
$(desktop_shell) \
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
#include "compositor.h"
|
||||
#include "../shared/os-compatibility.h"
|
||||
#include "git-version.h"
|
||||
#include "version.h"
|
||||
|
||||
static struct wl_list child_process_list;
|
||||
static struct weston_compositor *segv_compositor;
|
||||
@@ -3046,6 +3047,14 @@ weston_compositor_shutdown(struct weston_compositor *ec)
|
||||
wl_event_loop_destroy(ec->input_loop);
|
||||
}
|
||||
|
||||
WL_EXPORT void
|
||||
weston_version(int *major, int *minor, int *micro)
|
||||
{
|
||||
*major = WESTON_VERSION_MAJOR;
|
||||
*minor = WESTON_VERSION_MINOR;
|
||||
*micro = WESTON_VERSION_MICRO;
|
||||
}
|
||||
|
||||
static int on_term_signal(int signal_number, void *data)
|
||||
{
|
||||
struct wl_display *display = data;
|
||||
|
||||
+6
-2
@@ -28,8 +28,9 @@
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
#include <wayland-server.h>
|
||||
|
||||
#include "../shared/matrix.h"
|
||||
#include "../shared/config-parser.h"
|
||||
#include "version.h"
|
||||
#include "matrix.h"
|
||||
#include "config-parser.h"
|
||||
|
||||
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
|
||||
|
||||
@@ -495,6 +496,9 @@ enum weston_key_state_update {
|
||||
STATE_UPDATE_NONE,
|
||||
};
|
||||
|
||||
void
|
||||
weston_version(int *major, int *minor, int *micro);
|
||||
|
||||
void
|
||||
weston_surface_update_transform(struct weston_surface *surface);
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
* Copyright © 2013 Intel Corporation
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that copyright
|
||||
* notice and this permission notice appear in supporting documentation, and
|
||||
* that the name of the copyright holders not be used in advertising or
|
||||
* publicity pertaining to distribution of the software without specific,
|
||||
* written prior permission. The copyright holders make no representations
|
||||
* about the suitability of this software for any purpose. It is provided "as
|
||||
* is" without express or implied warranty.
|
||||
*
|
||||
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef WESTON_VERSION_H
|
||||
#define WESTON_VERSION_H
|
||||
|
||||
#define WESTON_VERSION_MAJOR @WESTON_VERSION_MAJOR@
|
||||
#define WESTON_VERSION_MINOR @WESTON_VERSION_MINOR@
|
||||
#define WESTON_VERSION_MICRO @WESTON_VERSION_MICRO@
|
||||
#define WESTON_VERSION "@WESTON_VERSION@"
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,9 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: Weston Plugin API
|
||||
Description: Header files for Weston plugin development
|
||||
Version: @WESTON_VERSION@
|
||||
Cflags: -I${includedir}
|
||||
@@ -1,4 +1,5 @@
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-DDATADIR='"$(datadir)"' \
|
||||
-DMODULEDIR='"$(moduledir)"' \
|
||||
-DLIBEXECDIR='"$(libexecdir)"' \
|
||||
|
||||
Reference in New Issue
Block a user