build: fix pkgconfig file names (again).

It turns out it is more convenient to have only pkgconfig files named
after the installed GStreamer API version (1.0) instead of using all
possible subsequent names from that (1.0, 1.2, 1.4). i.e. they conflict
altogether anyway, so align pkgconfig file names to that.
This commit is contained in:
Gwenole Beauchesne 2014-02-18 06:56:51 +01:00
parent 6e621413ab
commit b024e6940b
6 changed files with 11 additions and 11 deletions

View file

@ -793,15 +793,15 @@ debian.upstream/libgstvaapi-x11.install.in
gst/Makefile
gst/vaapi/Makefile
pkgconfig/Makefile
pkgconfig/gstreamer-vaapi-$GST_API_VERSION.pc:\
pkgconfig/gstreamer-vaapi-$GST_PKG_VERSION.pc:\
pkgconfig/gstreamer-vaapi.pc.in
pkgconfig/gstreamer-vaapi-drm-$GST_API_VERSION.pc:\
pkgconfig/gstreamer-vaapi-drm-$GST_PKG_VERSION.pc:\
pkgconfig/gstreamer-vaapi-drm.pc.in
pkgconfig/gstreamer-vaapi-glx-$GST_API_VERSION.pc:\
pkgconfig/gstreamer-vaapi-glx-$GST_PKG_VERSION.pc:\
pkgconfig/gstreamer-vaapi-glx.pc.in
pkgconfig/gstreamer-vaapi-wayland-$GST_API_VERSION.pc:\
pkgconfig/gstreamer-vaapi-wayland-$GST_PKG_VERSION.pc:\
pkgconfig/gstreamer-vaapi-wayland.pc.in
pkgconfig/gstreamer-vaapi-x11-$GST_API_VERSION.pc:\
pkgconfig/gstreamer-vaapi-x11-$GST_PKG_VERSION.pc:\
pkgconfig/gstreamer-vaapi-x11.pc.in
tests/Makefile
])

View file

@ -12,7 +12,7 @@ if USE_WAYLAND
pcfiles_in += gstreamer-vaapi-wayland.pc.in
endif
pcfiles = $(pcfiles_in:%.pc.in=%-$(GST_API_VERSION).pc)
pcfiles = $(pcfiles_in:%.pc.in=%-$(GST_PKG_VERSION).pc)
all_pcfiles_in = gstreamer-vaapi.pc.in
all_pcfiles_in += gstreamer-vaapi-drm.pc.in
@ -20,7 +20,7 @@ all_pcfiles_in += gstreamer-vaapi-x11.pc.in
all_pcfiles_in += gstreamer-vaapi-glx.pc.in
all_pcfiles_in += gstreamer-vaapi-wayland.pc.in
all_pcfiles = $(all_pcfiles_in:%.pc.in=%-$(GST_API_VERSION).pc)
all_pcfiles = $(all_pcfiles_in:%.pc.in=%-$(GST_PKG_VERSION).pc)
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = $(pcfiles)

View file

@ -6,7 +6,7 @@ pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (DRM) Plugins Libraries
Description: Streaming media framework, VA-API (DRM) plugins libraries
Requires: gstreamer-vaapi-@GST_API_VERSION@ libva-drm
Requires: gstreamer-vaapi-@GST_PKG_VERSION@ libva-drm
Version: @VERSION@
Libs: -L${libdir} -lgstvaapi-drm-@GST_API_VERSION@
Cflags: -I${includedir}

View file

@ -6,7 +6,7 @@ pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (GLX) Plugins Libraries
Description: Streaming media framework, VA-API (GLX) plugins libraries
Requires: gstreamer-vaapi-@GST_API_VERSION@ @LIBVA_GLX_PKGNAME@
Requires: gstreamer-vaapi-@GST_PKG_VERSION@ @LIBVA_GLX_PKGNAME@
Version: @VERSION@
Libs: -L${libdir} -lgstvaapi-glx-@GST_API_VERSION@
Cflags: -I${includedir}

View file

@ -6,7 +6,7 @@ pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (Wayland) Plugins Libraries
Description: Streaming media framework, VA-API (Wayland) plugins libraries
Requires: gstreamer-vaapi-@GST_API_VERSION@ libva-wayland
Requires: gstreamer-vaapi-@GST_PKG_VERSION@ libva-wayland
Version: @VERSION@
Libs: -L${libdir} -lgstvaapi-wayland-@GST_API_VERSION@
Cflags: -I${includedir}

View file

@ -6,7 +6,7 @@ pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (X11) Plugins Libraries
Description: Streaming media framework, VA-API (X11) plugins libraries
Requires: gstreamer-vaapi-@GST_API_VERSION@ @LIBVA_X11_PKGNAME@
Requires: gstreamer-vaapi-@GST_PKG_VERSION@ @LIBVA_X11_PKGNAME@
Version: @VERSION@
Libs: -L${libdir} -lgstvaapi-x11-@GST_API_VERSION@
Cflags: -I${includedir}