mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clients: rename simple-dmabuf into simple-dmabuf-intel 

This client was using an Intel-specific way to allocate a dmabuf, so it
makes sense to have that in its name.

Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>

Differential Revision: https://phabricator.freedesktop.org/D342
This commit is contained in:
Emmanuel Gil Peyrot 2016-01-11 19:04:36 +00:00 committed by Derek Foreman
parent bc35fdaed1
commit 3b65b0b38f
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -66,7 +66,7 @@ weston-nested-client
weston-presentation-shm weston-presentation-shm
weston-resizor weston-resizor
weston-scaler weston-scaler
weston-simple-dmabuf weston-simple-dmabuf-intel
weston-simple-egl weston-simple-egl
weston-simple-shm weston-simple-shm
weston-simple-touch weston-simple-touch

12
Makefile.am
View File

@ -523,18 +523,18 @@ weston_simple_egl_CFLAGS = $(AM_CFLAGS) $(SIMPLE_EGL_CLIENT_CFLAGS)
weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
endif endif
if BUILD_SIMPLE_INTEL_DMABUF_CLIENT if BUILD_SIMPLE_DMABUF_INTEL_CLIENT
demo_clients += weston-simple-dmabuf demo_clients += weston-simple-dmabuf-intel
weston_simple_dmabuf_SOURCES = clients/simple-dmabuf.c weston_simple_dmabuf_intel_SOURCES = clients/simple-dmabuf-intel.c
nodist_weston_simple_dmabuf_SOURCES = \ nodist_weston_simple_dmabuf_intel_SOURCES = \
protocol/xdg-shell-unstable-v5-protocol.c \ protocol/xdg-shell-unstable-v5-protocol.c \
protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/xdg-shell-unstable-v5-client-protocol.h \
protocol/fullscreen-shell-unstable-v1-protocol.c \ protocol/fullscreen-shell-unstable-v1-protocol.c \
protocol/fullscreen-shell-unstable-v1-client-protocol.h \ protocol/fullscreen-shell-unstable-v1-client-protocol.h \
protocol/linux-dmabuf-unstable-v1-protocol.c \ protocol/linux-dmabuf-unstable-v1-protocol.c \
protocol/linux-dmabuf-unstable-v1-client-protocol.h protocol/linux-dmabuf-unstable-v1-client-protocol.h
weston_simple_dmabuf_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_CLIENT_CFLAGS) weston_simple_dmabuf_intel_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_INTEL_CLIENT_CFLAGS)
weston_simple_dmabuf_LDADD = $(SIMPLE_DMABUF_CLIENT_LIBS) libshared.la weston_simple_dmabuf_intel_LDADD = $(SIMPLE_DMABUF_INTEL_CLIENT_LIBS) libshared.la
BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h
endif endif

0
clients/simple-dmabuf.c → clients/simple-dmabuf-intel.c
View File

20
configure.ac
View File

@ -342,19 +342,19 @@ if test x$enable_simple_egl_clients = xyes; then
[egl glesv2 wayland-client wayland-egl wayland-cursor]) [egl glesv2 wayland-client wayland-egl wayland-cursor])
fi fi
AC_ARG_ENABLE(simple-intel-dmabuf-client, AC_ARG_ENABLE(simple-dmabuf-intel-client,
AS_HELP_STRING([--disable-simple-intel-dmabuf-client], AS_HELP_STRING([--disable-simple-dmabuf-intel-client],
[do not build the simple intel dmabuf client]),, [do not build the simple dmabuf intel client]),,
enable_simple_intel_dmabuf_client="auto") enable_simple_dmabuf_intel_client="auto")
if ! test "x$enable_simple_intel_dmabuf_client" = "xno"; then if ! test "x$enable_simple_dmabuf_intel_client" = "xno"; then
PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel], PKG_CHECK_MODULES(SIMPLE_DMABUF_INTEL_CLIENT, [wayland-client libdrm libdrm_intel],
have_simple_dmabuf_client=yes, have_simple_dmabuf_client=no) have_simple_dmabuf_intel_client=yes, have_simple_dmabuf_intel_client=no)
if test "x$have_simple_dmabuf_client" = "xno" -a "x$enable_simple_intel_dmabuf_client" = "xyes"; then if test "x$have_simple_dmabuf_intel_client" = "xno" -a "x$enable_simple_dmabuf_intel_client" = "xyes"; then
AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found]) AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found])
fi fi
enable_simple_intel_dmabuf_client="$have_simple_dmabuf_client" enable_simple_dmabuf_intel_client="$have_simple_dmabuf_intel_client"
fi fi
AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test "x$enable_simple_intel_dmabuf_client" = "xyes") AM_CONDITIONAL(BUILD_SIMPLE_DMABUF_INTEL_CLIENT, test "x$enable_simple_dmabuf_intel_client" = "xyes")
AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes)
AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes)