mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

pkgconfig: plugin dir should use PKG version not API version.

Browse source 
Fix the pluginsdir and includedir variables in the generated pkgconfig
(.pc) files. The location needs to be built with the PKG version in
mind instead of the API version.

While we are at it, also fix the PKG version for GStreamer >= 1.3.

https://bugzilla.gnome.org/show_bug.cgi?id=720820

[additional fixes for includedir and pkg requirements]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Lionel Landwerlin 2013-12-20 12:05:42 +00:00 committed by Gwenole Beauchesne
parent f8666e2cae
commit e66179dffb
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -447,10 +447,9 @@ dnl Check for the GStreamer plugins directory
AC_ARG_VAR([GST_PLUGIN_PATH], [installation path for gstreamer-vaapi plugin elements for GStreamer 0.10])
AC_ARG_VAR([GST_PLUGIN_PATH_1_0], [installation path for gstreamer-vaapi plugin elements for GStreamer 1.0])
AC_MSG_CHECKING([for GStreamer plugins directory])
case $GST_API_VERSION in
case $GST_PKG_VERSION in
0.10) _gst_plugin_path="$GST_PLUGIN_PATH";;
1.0) _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
1.2) _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
esac
if test -d "$_gst_plugin_path"; then
GST_PLUGINS_DIR="$_gst_plugin_path"

4
pkgconfig/gstreamer-vaapi-drm.pc.in
View file

@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (DRM) Plugins Libraries
Description: Streaming media framework, VA-API (DRM) plugins libraries

4
pkgconfig/gstreamer-vaapi-glx.pc.in
View file

@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (GLX) Plugins Libraries
Description: Streaming media framework, VA-API (GLX) plugins libraries

4
pkgconfig/gstreamer-vaapi-wayland.pc.in
View file

@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (Wayland) Plugins Libraries
Description: Streaming media framework, VA-API (Wayland) plugins libraries

4
pkgconfig/gstreamer-vaapi-x11.pc.in
View file

@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API (X11) Plugins Libraries
Description: Streaming media framework, VA-API (X11) plugins libraries

6
pkgconfig/gstreamer-vaapi.pc.in
View file

@ -1,12 +1,12 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
Name: GStreamer VA-API Plugins Libraries
Description: Streaming media framework, VA-API plugins libraries
Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ @LIBVA_PKGNAME@
Requires: gstreamer-@GST_PKG_VERSION@ gstreamer-base-@GST_PKG_VERSION@ @LIBVA_PKGNAME@
Version: @VERSION@
Libs: -L${libdir} -lgstvaapi-@GST_API_VERSION@
Cflags: -I${includedir}