debian: split libva packages based on the implemented API.

Align with OSVs (Ubuntu, Debian) for libva package names. i.e. split
the main libva1 package into Core (libva1) and as many packages as
there are backends enabled configure/dist time.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

10 files changed, 106 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index fd8ac05..30af177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,12 @@ config.sub
 configure
 debian.upstream/changelog
 debian.upstream/control
+debian.upstream/libva-drm*.install
+debian.upstream/libva-egl*.install
+debian.upstream/libva-glx*.install
+debian.upstream/libva-wayland*.install
+debian.upstream/libva-x11*.install
+debian.upstream/libva[0-9]*.install
 depcomp
 install-sh
 libtool
diff --git a/configure.ac b/configure.ac
index 287fd6e..da98f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,9 @@ m4_define([libva_lt_age],
 # libdrm minimun version requirement
 m4_define([libdrm_version], [2.4])
 
+# Wayland minimum version number
+m4_define([wayland_api_version], [0.95.0])
+
 AC_PREREQ(2.57)
 AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -259,9 +262,13 @@ fi
 AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
 
 # Check for Wayland
+WAYLAND_API_VERSION=wayland_api_version
+AC_SUBST(WAYLAND_API_VERSION)
+
 USE_WAYLAND="no"
 if test "$enable_wayland" = "yes"; then
-    PKG_CHECK_MODULES([WAYLAND], [wayland-client], [USE_WAYLAND="yes"], [:])
+    PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
+        [USE_WAYLAND="yes"], [:])
     if test "$USE_WAYLAND" = "yes"; then
         AC_DEFINE([HAVE_VA_WAYLAND], [1],
                   [Defined to 1 if VA/Wayland API is built])
@@ -288,6 +295,16 @@ AC_OUTPUT([
     debian.upstream/control
     debian.upstream/libva$LIBVA_MAJOR_VERSION.install:\
 debian.upstream/libva.install.in
+    debian.upstream/libva-drm$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-drm.install.in
+    debian.upstream/libva-egl$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-egl.install.in
+    debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-glx.install.in
+    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-wayland.install.in
+    debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-x11.install.in
     doc/Makefile
     dummy_drv_video/Makefile
     pkgconfig/Makefile
@@ -304,10 +321,10 @@ debian.upstream/libva.install.in
     test/decode/Makefile
     test/encode/Makefile
     test/putsurface/Makefile
-    test/vainfo/Makefile
     test/v4l_h264/Makefile
-    test/v4l_h264/encode/Makefile
     test/v4l_h264/decode/Makefile
+    test/v4l_h264/encode/Makefile
+    test/vainfo/Makefile
     va/Makefile
     va/drm/Makefile
     va/egl/Makefile
diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am
index 46accc4..3e0dd23 100644
--- a/debian.upstream/Makefile.am
+++ b/debian.upstream/Makefile.am
@@ -5,6 +5,11 @@ DEBIANFILES = \
 	control.in					\
 	copyright					\
 	libva-dev.install				\
+	libva-drm.install.in				\
+	libva-egl.install.in				\
+	libva-glx.install.in				\
+	libva-wayland.install.in			\
+	libva-x11.install.in				\
 	libva.install.in	 			\
 	rules						\
 	vainfo.install					\
@@ -14,6 +19,11 @@ DEBIANGENFILES = \
 	changelog					\
 	control						\
 	libva$(LIBVA_MAJOR_VERSION).install		\
+	libva-drm$(LIBVA_MAJOR_VERSION).install		\
+	libva-egl$(LIBVA_MAJOR_VERSION).install		\
+	libva-glx$(LIBVA_MAJOR_VERSION).install		\
+	libva-wayland$(LIBVA_MAJOR_VERSION).install	\
+	libva-x11-$(LIBVA_MAJOR_VERSION).install	\
 	$(NULL)
 
 EXTRA_DIST = $(DEBIANFILES)
diff --git a/debian.upstream/control.in b/debian.upstream/control.in
index 54555a0..6d7d82c 100644
--- a/debian.upstream/control.in
+++ b/debian.upstream/control.in
@@ -6,21 +6,24 @@ Build-Depends: automake,
                cdbs,
                debhelper (>= 5),
                libdrm-dev (>= @LIBDRM_VERSION@),
-               libgl-dev,
+@USE_X11_TRUE@               libx11-dev, libxext-dev, libxfixes-dev,
+@USE_GLX_TRUE@               libgl-dev,
+@USE_WAYLAND_TRUE@               libwayland-dev (>= @WAYLAND_API_VERSION@),
                libtool,
-               libxext-dev,
-               libxfixes-dev,
-               pkg-config,
-               x11proto-xext-dev
+               pkg-config
 Standards-Version: 3.7.2
 Section: libs
 
 Package: libva-dev
 Section: libdevel
 Architecture: any
-Depends: libva@LIBVA_MAJOR_VERSION@ (= ${binary:Version}),
-         libdrm-dev (>= @LIBDRM_VERSION@),
-         libgl-dev,
+Depends: libdrm-dev (>= @LIBDRM_VERSION@),
+@USE_DRM_TRUE@         libva-drm@LIBVA_MAJOR_VERSION@,
+@USE_X11_TRUE@         libva-x11-@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libx11-dev,
+@USE_GLX_TRUE@         libva-glx@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libgl-dev,
+@USE_EGL_TRUE@         libva-egl@LIBVA_MAJOR_VERSION@ (= ${binary:Version}),
+@USE_WAYLAND_TRUE@         libva-wayland@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libwayland-dev (>= @WAYLAND_API_VERSION@),
+         libva@LIBVA_MAJOR_VERSION@ (= ${binary:Version}),
          pkg-config
 Description: Video Acceleration (VA) API for Linux -- development files
  The libva library implements the Video Acceleration (VA) API for Linux.
@@ -32,9 +35,61 @@ Package: libva@LIBVA_MAJOR_VERSION@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Video Acceleration (VA) API for Linux -- runtime
+Description: Video Acceleration (VA) API for Linux -- Core runtime
  The libva library implements the Video Acceleration (VA) API for Linux.
  The library loads a hardware dependendent driver.
+ .
+ This package contains the Core runtime library.
+
+@USE_DRM_TRUE@Package: libva-drm@LIBVA_MAJOR_VERSION@
+@USE_DRM_TRUE@Section: libs
+@USE_DRM_TRUE@Architecture: any
+@USE_DRM_TRUE@Depends: ${shlibs:Depends}
+@USE_DRM_TRUE@Description: Video Acceleration (VA) API for Linux -- DRM runtime
+@USE_DRM_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux.
+@USE_DRM_TRUE@ The library loads a hardware dependendent driver.
+@USE_DRM_TRUE@ .
+@USE_DRM_TRUE@ This package contains the VA/DRM runtime library.
+
+@USE_X11_TRUE@Package: libva-x11-@LIBVA_MAJOR_VERSION@
+@USE_X11_TRUE@Section: libs
+@USE_X11_TRUE@Architecture: any
+@USE_X11_TRUE@Depends: ${shlibs:Depends}
+@USE_X11_TRUE@Description: Video Acceleration (VA) API for Linux -- X11 runtime
+@USE_X11_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux.
+@USE_X11_TRUE@ The library loads a hardware dependendent driver.
+@USE_X11_TRUE@ .
+@USE_X11_TRUE@ This package contains the VA/X11 runtime library.
+
+@USE_GLX_TRUE@Package: libva-glx@LIBVA_MAJOR_VERSION@
+@USE_GLX_TRUE@Section: libs
+@USE_GLX_TRUE@Architecture: any
+@USE_GLX_TRUE@Depends: ${shlibs:Depends}
+@USE_GLX_TRUE@Description: Video Acceleration (VA) API for Linux -- GLX runtime
+@USE_GLX_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux.
+@USE_GLX_TRUE@ The library loads a hardware dependendent driver.
+@USE_GLX_TRUE@ .
+@USE_GLX_TRUE@ This package contains the VA/GLX runtime library.
+
+@USE_EGL_TRUE@Package: libva-egl@LIBVA_MAJOR_VERSION@
+@USE_EGL_TRUE@Section: libs
+@USE_EGL_TRUE@Architecture: any
+@USE_EGL_TRUE@Depends: ${shlibs:Depends}
+@USE_EGL_TRUE@Description: Video Acceleration (VA) API for Linux -- EGL runtime
+@USE_EGL_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux.
+@USE_EGL_TRUE@ The library loads a hardware dependendent driver.
+@USE_EGL_TRUE@ .
+@USE_EGL_TRUE@ This package contains the VA/EGL runtime library.
+
+@USE_WAYLAND_TRUE@Package: libva-wayland@LIBVA_MAJOR_VERSION@
+@USE_WAYLAND_TRUE@Section: libs
+@USE_WAYLAND_TRUE@Architecture: any
+@USE_WAYLAND_TRUE@Depends: ${shlibs:Depends}
+@USE_WAYLAND_TRUE@Description: Video Acceleration (VA) API for Linux -- Wayland runtime
+@USE_WAYLAND_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux.
+@USE_WAYLAND_TRUE@ The library loads a hardware dependendent driver.
+@USE_WAYLAND_TRUE@ .
+@USE_WAYLAND_TRUE@ This package contains the VA/Wayland runtime library.
 
 Package: libva@LIBVA_MAJOR_VERSION@-dbg
 Section: libdevel
@@ -44,7 +99,7 @@ Description: Video Acceleration (VA) API for Linux -- runtime
  The libva library implements the Video Acceleration (VA) API for Linux.
  The library loads a hardware dependendent driver.
  .
- This package contains the debug files.
+ This package contains the debug info files.
 
 Package: vainfo
 Architecture: any
diff --git a/debian.upstream/libva-drm.install.in b/debian.upstream/libva-drm.install.in
new file mode 100644
index 0000000..7a9b5f2
--- /dev/null
+++ b/debian.upstream/libva-drm.install.in
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libva-drm.so.*
diff --git a/debian.upstream/libva-egl.install.in b/debian.upstream/libva-egl.install.in
new file mode 100644
index 0000000..5554b69
--- /dev/null
+++ b/debian.upstream/libva-egl.install.in
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libva-egl.so.*
diff --git a/debian.upstream/libva-glx.install.in b/debian.upstream/libva-glx.install.in
new file mode 100644
index 0000000..2d33032
--- /dev/null
+++ b/debian.upstream/libva-glx.install.in
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libva-glx.so.*
diff --git a/debian.upstream/libva-wayland.install.in b/debian.upstream/libva-wayland.install.in
new file mode 100644
index 0000000..2563fea
--- /dev/null
+++ b/debian.upstream/libva-wayland.install.in
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libva-wayland.so.*
diff --git a/debian.upstream/libva-x11.install.in b/debian.upstream/libva-x11.install.in
new file mode 100644
index 0000000..461d7bd
--- /dev/null
+++ b/debian.upstream/libva-x11.install.in
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libva-x11.so.*
diff --git a/debian.upstream/libva.install.in b/debian.upstream/libva.install.in
index ddfd8ed..bad195c 100644
--- a/debian.upstream/libva.install.in
+++ b/debian.upstream/libva.install.in
@@ -1,2 +1 @@
 debian/tmp/usr/lib/libva.so.*
-debian/tmp/usr/lib/libva-*.so.*