From c8111904304a878a3d5831b453255f04e1ddcf56 Mon Sep 17 00:00:00 2001 From: Jon Severinsson Date: Fri, 23 Aug 2013 11:18:59 +0200 Subject: [PATCH] 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" Reviewed-by: Matt Turner --- configure.ac | 1 + src/gallium/targets/osmesa/Makefile.am | 5 ++--- src/gallium/targets/osmesa/osmesa.pc.in | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/gallium/targets/osmesa/osmesa.pc.in diff --git a/configure.ac b/configure.ac index 7a89591a15f..40e052c626a 100644 --- 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 38dbeb85f25..de78d8cc0f3 100644 --- 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 index 00000000000..cd77fd7656f --- /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} -- 2.30.2