From 496e7b45689edd7f0ee49ab89d62d6afd4c58391 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Thu, 18 Feb 2016 14:32:23 +0000 Subject: [PATCH] uninstalled.pc: add support for non libtool build systems Currently the .la path is provided which requires to use libtool as mentioned in the GStreamer manual section-helloworld-compilerun.html. It is fine as long as the application is built using libtool. So currently it is not possible to compile a GStreamer application within gst-uninstalled with CMake or other build system different than autotools. This patch allows to do the following in gst-uninstalled env: gcc test.c -o test $(pkg-config --cflags --libs gstreamer-1.0 \ gstreamer-gl-1.0) Previously it required to prepend libtool --mode=link https://bugzilla.gnome.org/show_bug.cgi?id=720778 --- pkgconfig/gstreamer-bad-audio-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-bad-base-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-bad-video-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-codecparsers-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-gl-uninstalled.pc.in | 5 +++-- pkgconfig/gstreamer-insertbin-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-mpegts-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-player-uninstalled.pc.in | 4 ++-- pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in | 2 +- pkgconfig/gstreamer-wayland-uninstalled.pc.in | 4 ++-- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in b/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in index 4053f69..6b95364 100644 --- a/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in @@ -1,6 +1,6 @@ prefix= exec_prefix= -libdir=@abs_top_builddir@/gst-libs/gst/audio +libdir=@abs_top_builddir@/gst-libs/gst/audio/.libs includedir=@abs_top_srcdir@/gst-libs Name: GStreamer bad audio library, uninstalled @@ -8,5 +8,5 @@ Description: Bad audio library for GStreamer, Not Installed Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: @abs_top_builddir@/gst-libs/gst/audio/libgstbadaudio-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstbadaudio-@GST_API_VERSION@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in b/pkgconfig/gstreamer-bad-base-uninstalled.pc.in index bec40f4..e11a01b 100644 --- a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-base-uninstalled.pc.in @@ -1,6 +1,6 @@ prefix= exec_prefix= -libdir= +libdir=@abs_top_builddir@/gst-libs/gst/base/.libs includedir=@abs_top_builddir@/gst-libs girdir=@abs_top_builddir@/gst-libs/gst/base typelibdir=@abs_top_builddir@/gst-libs/gst/base @@ -10,5 +10,5 @@ Description: Bad base classes for GStreamer elements, Not Installed Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ -Libs: @abs_top_builddir@/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstbadbase-@GST_API_VERSION@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in b/pkgconfig/gstreamer-bad-video-uninstalled.pc.in index c2aa907..f9ae7bf 100644 --- a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-video-uninstalled.pc.in @@ -1,6 +1,6 @@ prefix= exec_prefix= -libdir= +libdir=@abs_top_builddir@/gst-libs/gst/video/.libs includedir=@abs_top_builddir@/gst-libs girdir=@abs_top_builddir@/gst-libs/gst/video typelibdir=@abs_top_builddir@/gst-libs/gst/video @@ -10,5 +10,5 @@ Description: Bad video library for GStreamer elements, Not Installed Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: @abs_top_builddir@/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstbadvideo-@GST_API_VERSION@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in b/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in index d1bb9b0..71ed771 100644 --- a/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in +++ b/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in @@ -1,12 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/codecparsers +libdir=${pcfiledir}/../gst-libs/gst/codecparsers/.libs includedir=${pcfiledir}/../gst-libs Name: GStreamer codec parsers, Uninstalled Description: Bitstream parsers for GStreamer elements, uninstalled Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstcodecparsers-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstcodecparsers-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-gl-uninstalled.pc.in b/pkgconfig/gstreamer-gl-uninstalled.pc.in index 5049f4e..dac4cda 100644 --- a/pkgconfig/gstreamer-gl-uninstalled.pc.in +++ b/pkgconfig/gstreamer-gl-uninstalled.pc.in @@ -1,6 +1,6 @@ prefix= exec_prefix= -libdir= +libdir=@abs_top_builddir@/gst-libs/gst/gl/.libs includedir=@abs_top_builddir@/gst-libs girdir=@abs_top_builddir@/gst-libs/gst/base typelibdir=@abs_top_builddir@/gst-libs/gst/base @@ -10,5 +10,6 @@ Description: Streaming media framework, OpenGL plugins libraries, uninstalled Version: @VERSION@ Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ -Libs: @abs_top_builddir@/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs + diff --git a/pkgconfig/gstreamer-insertbin-uninstalled.pc.in b/pkgconfig/gstreamer-insertbin-uninstalled.pc.in index 0a01e79..1a535aa 100644 --- a/pkgconfig/gstreamer-insertbin-uninstalled.pc.in +++ b/pkgconfig/gstreamer-insertbin-uninstalled.pc.in @@ -1,12 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/insertbin +libdir=${pcfiledir}/../gst-libs/gst/insertbin/.libs includedir=${pcfiledir}/../gst-libs Name: GStreamer Insert Bin, Uninstalled Description: Bin to automatically and insertally link elements, uninstalled Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstinsertbin-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstinsertbin-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-mpegts-uninstalled.pc.in b/pkgconfig/gstreamer-mpegts-uninstalled.pc.in index e9aa261..179996c 100644 --- a/pkgconfig/gstreamer-mpegts-uninstalled.pc.in +++ b/pkgconfig/gstreamer-mpegts-uninstalled.pc.in @@ -1,12 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/mpegts +libdir=${pcfiledir}/../gst-libs/gst/mpegts/.libs includedir=${pcfiledir}/../gst-libs Name: GStreamer MPEG-TS, Uninstalled Description: GStreamer MPEG-TS support, uninstalled Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstmpegts-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstmpegts-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-player-uninstalled.pc.in b/pkgconfig/gstreamer-player-uninstalled.pc.in index 82e6ee6..5a495f4 100644 --- a/pkgconfig/gstreamer-player-uninstalled.pc.in +++ b/pkgconfig/gstreamer-player-uninstalled.pc.in @@ -1,12 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/player +libdir=${pcfiledir}/../gst-libs/gst/player/.libs includedir=${pcfiledir}/../gst-libs Name: GStreamer Player, Uninstalled Description: GStreamer Player convenience library, uninstalled Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstplayer-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstplayer-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in index 6fcf773..df9a9c5 100644 --- a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in +++ b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in @@ -10,5 +10,5 @@ Name: GStreamer Bad Plugin libraries, Uninstalled Description: Streaming media framework, bad plugins libraries, uninstalled Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ -Libs: -L@abs_top_builddir@/gst-libs/gst/basecamerabinsrc -L@abs_top_builddir@/gst-libs/gst/codecparsers -L@abs_top_builddir@/gst-libs/gst/egl -L@abs_top_builddir@/gst-libs/gst/insertbin -L@abs_top_builddir@/gst-libs/gst/interfaces -L@abs_top_builddir@/gst-libs/gst/mpegts -L@abs_top_builddir@/gst-libs/gst/signalprocessor -L@abs_top_builddir@/gst-libs/gst/video +Libs: -L@abs_top_builddir@/gst-libs/gst/audio/.libs -L@abs_top_builddir@/gst-libs/gst/basecamerabinsrc/.libs -L@abs_top_builddir@/gst-libs/gst/codecparsers/.libs -L@abs_top_builddir@/gst-libs/gst/gl/.libs -L@abs_top_builddir@/gst-libs/gst/insertbin/.libs -L@abs_top_builddir@/gst-libs/gst/interfaces/.libs -L@abs_top_builddir@/gst-libs/gst/mpegts/.libs -L@abs_top_builddir@/gst-libs/gst/player/.libs -L@abs_top_builddir@/gst-libs/gst/signalprocessor/.libs -L@abs_top_builddir@/gst-libs/gst/video/.libs -L@abs_top_builddir@/gst-libs/gst/wayland/.libs Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-wayland-uninstalled.pc.in b/pkgconfig/gstreamer-wayland-uninstalled.pc.in index fe01de6..80d6e1b 100644 --- a/pkgconfig/gstreamer-wayland-uninstalled.pc.in +++ b/pkgconfig/gstreamer-wayland-uninstalled.pc.in @@ -1,12 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/wayland +libdir=${pcfiledir}/../gst-libs/gst/wayland/.libs includedir=${pcfiledir}/../gst-libs Name: GStreamer Wayland, Uninstalled Description: GStreamer Wayland support, uninstalled Requires: gstreamer-@GST_API_VERSION@ gstreamer-video-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstwayland-@GST_API_VERSION@.la +Libs: -L${libdir} -lgstwayland-@GST_API_VERSION@ Cflags: -I${includedir} -- 2.7.4