[PATCH weston 0/3] Make libdrm a hard build-time dependency

[Pekka Paalanen]

On Thu,  6 Apr 2017 15:09:26 +0300
Pekka Paalanen <ppaalanen at gmail.com> wrote:

> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> Hi,
> 
> I wrote this for Daniel's atomic modesetting series which adds a pixel-formats
> database into libweston core. That database cannot exist without drm_foucc.h,
> and putting it into the modules would probably bring in another binary copy of
> it in gl-renderer.so - I assume gl-renderer might start using it in the future.
> Also linux-dmabuf.c could use the pixel-formats database.
> 
> Therefore to me it seems the easiest way forward is to make libdrm a mandatory
> dependency for building libweston.
> 
> This does not add runtime dependencies where they did not already exist. In
> fact, this series removes a couple libdrm dependencies for some rare
> configurations.
> 
> Pekka Paalanen (3):
>   configure: replace HAVE_LIBDRM with BUILD_DRM_COMPOSITOR
>   build: do not link libdrm without DRM backend
>   build: make libdrm a hard build-time dependency
> 
>  Makefile.am                        | 14 +++++++++++---
>  configure.ac                       | 13 +++++++++----
>  libweston/launcher-direct.c        |  2 +-
>  libweston/launcher-weston-launch.c |  2 +-
>  libweston/weston-launch.c          |  2 +-
>  5 files changed, 23 insertions(+), 10 deletions(-)
> 

Hi,

after this series, I only need the following changes in "[PATCH weston
v10 02/61] libweston: Add pixel-format helpers" to build:


--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,8 @@ install-libweston_moduleLTLIBRARIES install-moduleLTLIBRARIES: install-libLTLIBR
 
 lib_LTLIBRARIES = libweston- at LIBWESTON_MAJOR@.la
 libweston_ at LIBWESTON_MAJOR@_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON
-libweston_ at LIBWESTON_MAJOR@_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
+libweston_ at LIBWESTON_MAJOR@_la_CFLAGS = $(AM_CFLAGS) \
+	$(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) $(LIBDRM_CFLAGS)
 libweston_ at LIBWESTON_MAJOR@_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
 	$(DLOPEN_LIBS) -lm $(CLOCK_GETTIME_LIBS) \
 	$(LIBINPUT_BACKEND_LIBS) libshared.la
diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
index 2c58443..df84a9f 100644
--- a/libweston/pixel-formats.c
+++ b/libweston/pixel-formats.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <libdrm/drm_fourcc.h>
+#include <drm_fourcc.h>
 
 #include "helpers.h"
 #include "wayland-util.h"
diff --git a/libweston/pixel-formats.h b/libweston/pixel-formats.h
index 565fe62..b16aae3 100644
--- a/libweston/pixel-formats.h
+++ b/libweston/pixel-formats.h
@@ -179,13 +179,13 @@ pixel_format_width_for_plane(const struct pixel_format_info *format,
  *
  * When vertical subsampling is in effect, a sampler bound to a secondary
  * plane must bind the sampler with a smaller effective height. This function
- * returns the effective width to use for the sampler, i.e. dividing by vsub.
+ * returns the effective height to use for the sampler, i.e. dividing by vsub.
  *
  * If vertical subsampling is not in effect, this will be equal to the height.
  *
  * @param format Pixel format info structure
  * @param plane Zero-indexed plane number
- * @param width Height of the buffer
+ * @param height Height of the buffer
  * @returns Effective width for sampling
  */
 unsigned int


I can just push the pixel-formats patch with this after the
libdrm-dependency patches are reviewed and merged.


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20170406/bb303413/attachment.sig>