gallium/osmesa: Make and install an osmesa.pc.

As of "2f142d59 build: Add --enable-gallium-osmesa flag." the pkgconfig
file from classic osmesa is no longer installed when building gallium
osmesa, so copy it to gallium osmesa and install the copy instead.

CC: "9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/configure.ac b/configure.ac
index 7a89591a15fa5a99f7166052e88e5cd46e9acbf1..40e052c626a4093cd2a88fcc2b88395827e9a5f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2066,6 +2066,7 @@ AC_CONFIG_FILES([Makefile
                src/gallium/targets/gbm/Makefile
                src/gallium/targets/opencl/Makefile
                src/gallium/targets/osmesa/Makefile
+               src/gallium/targets/osmesa/osmesa.pc
                src/gallium/targets/pipe-loader/Makefile
                src/gallium/targets/libgl-xlib/Makefile
                src/gallium/targets/vdpau-nouveau/Makefile

diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index 38dbeb85f2572a8f8a01ad7d212c5493fc2c53f8..de78d8cc0f31e9644ca1cd3ae697235418c1914b 100644 (file)
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -85,6 +85,5 @@ all-local: lib@OSMESA_LIB@.la
        cp .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/gallium/
 endif
 
-# XXX fix-up?
-#pkgconfigdir = $(libdir)/pkgconfig
-#pkgconfig_DATA = osmesa.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = osmesa.pc

diff --git a/src/gallium/targets/osmesa/osmesa.pc.in b/src/gallium/targets/osmesa/osmesa.pc.in
new file mode 100644 (file)
index 0000000..cd77fd7
--- /dev/null
+++ b/src/gallium/targets/osmesa/osmesa.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=@includedir@
+
+Name: osmesa
+Description: Mesa Off-screen Rendering library
+Requires: @OSMESA_PC_REQ@
+Version: @OSMESA_VERSION@
+Libs: -L${libdir} -l@OSMESA_LIB@
+Libs.private: @OSMESA_PC_LIB_PRIV@
+Cflags: -I${includedir}