Skip to content

Commit

Permalink
Disable wayland related build options by default, remove debian rules to
Browse files Browse the repository at this point in the history
explicitly disable them.

There is no point in this stuff ever trying to build, since we don't
support it.
  • Loading branch information
mtwebster committed Jan 31, 2020
1 parent bd0d772 commit f78bf5b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion clutter/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ AC_ARG_ENABLE(
[wayland-egl-server],
[AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
[],
enable_wayland_egl_server=yes
enable_wayland_egl_server=no
)

AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
Expand Down
2 changes: 0 additions & 2 deletions cogl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,5 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-gles2 \
--enable-gl \
--enable-xlib-egl-platform \
--enable-wayland-egl-platform \
--enable-glx \
--enable-wayland-egl-server \
--enable-cogl-gst
4 changes: 2 additions & 2 deletions cogl/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ AC_ARG_ENABLE(
[kms-egl-platform],
[AC_HELP_STRING([--enable-kms-egl-platform=@<:@no/yes@:>@], [Enable support for the KMS egl platform @<:@default=no@:>@])],
[],
enable_kms_egl_platform=yes
enable_kms_egl_platform=no
)
AS_IF([test "x$enable_kms_egl_platform" = "xyes"],
[
Expand Down Expand Up @@ -700,7 +700,7 @@ AC_ARG_ENABLE(
[wayland-egl-server],
[AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
[],
enable_wayland_egl_server=yes
enable_wayland_egl_server=no
)
AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
[
Expand Down
5 changes: 0 additions & 5 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ override_dh_auto_configure:
--disable-silent-rules \
--enable-gtk-doc \
--disable-clutter-doc \
--disable-wayland-egl-platform \
--disable-wayland-egl-server \
--disable-kms-egl-platform \
--disable-wayland \
--disable-native-backend

override_dh_girepository:
dh_girepository /usr/lib/$(DEB_HOST_MULTIARCH)/muffin
Expand Down

0 comments on commit f78bf5b

Please sign in to comment.