pkg-config: add girdir and typelibdir variables to .pc files

We need them when building gir and typelib files for
libraries that depend on these, such as gst-rtsp-server
for example, in an uninstalled setup.

diff --git a/pkgconfig/gstreamer-app-uninstalled.pc.in b/pkgconfig/gstreamer-app-uninstalled.pc.in
index 015bedcd8b613c2a18091c508690d430427a9f61..b989798ee73642b2ec58f8c037456e7760978700 100644 (file)
--- a/pkgconfig/gstreamer-app-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-app-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/app
+typelibdir=@abs_top_builddir@/gst-libs/gst/app
 
 Name: GStreamer Application Library, Uninstalled
 Description: Helper functions and base classes for application integration, uninstalled

diff --git a/pkgconfig/gstreamer-app.pc.in b/pkgconfig/gstreamer-app.pc.in
index ef3d27c38b2365aa19d05316f6a3690526495df0..8152effe5f852b3c0dc840a886f1291eb38d8978 100644 (file)
--- a/pkgconfig/gstreamer-app.pc.in
+++ b/pkgconfig/gstreamer-app.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Application Library
 Description: Helper functions and base classes for application integration

diff --git a/pkgconfig/gstreamer-audio-uninstalled.pc.in b/pkgconfig/gstreamer-audio-uninstalled.pc.in
index da927d3fefc68e7548fea26f1136f36a5fd24f81..ce55cf94bc169ea584730b5d905dd8312b4d1dee 100644 (file)
--- a/pkgconfig/gstreamer-audio-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-audio-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/audio
+typelibdir=@abs_top_builddir@/gst-libs/gst/audio
 
 Name: GStreamer Audio Library, Uninstalled
 Description: Audio helper functions and base classes, uninstalled

diff --git a/pkgconfig/gstreamer-audio.pc.in b/pkgconfig/gstreamer-audio.pc.in
index 623638144f150c63f182d9e92f75de61793a8223..5743ccf9596f56329d7ee93bc8ba83922e32988a 100644 (file)
--- a/pkgconfig/gstreamer-audio.pc.in
+++ b/pkgconfig/gstreamer-audio.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Audio library
 Description: Audio helper functions and base classes

diff --git a/pkgconfig/gstreamer-cdda-uninstalled.pc.in b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
index b3fa27d003257139365a35810914e34ad5513ad3..15773e8de332ec0e7ddca7e98751b0f369505aa3 100644 (file)
--- a/pkgconfig/gstreamer-cdda-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/cdda
+typelibdir=@abs_top_builddir@/gst-libs/gst/cdda
 
 Name: GStreamer CDDA Library, Uninstalled
 Description: CDDA base classes, uninstalled

diff --git a/pkgconfig/gstreamer-cdda.pc.in b/pkgconfig/gstreamer-cdda.pc.in
index b67eac169fa08e0e3930b2adba8ddd7bb3d9d582..86f4a2bf0be690f5d1bb23bdae6ad0e34bb64d89 100644 (file)
--- a/pkgconfig/gstreamer-cdda.pc.in
+++ b/pkgconfig/gstreamer-cdda.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer CDDA Library
 Description: CDDA base classes

diff --git a/pkgconfig/gstreamer-fft-uninstalled.pc.in b/pkgconfig/gstreamer-fft-uninstalled.pc.in
index 67b0fff9d7627308ca59f38911f30765e116f608..163f3f0653b65883691ecdbe007d1c08849ab073 100644 (file)
--- a/pkgconfig/gstreamer-fft-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-fft-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/fft
+typelibdir=@abs_top_builddir@/gst-libs/gst/fft
 
 Name: GStreamer FFT Library, Uninstalled
 Description: FFT implementation, uninstalled

diff --git a/pkgconfig/gstreamer-fft.pc.in b/pkgconfig/gstreamer-fft.pc.in
index 20ffdd667f1758a3d5ce3d1e37c9b56620c00a1c..5680a0c6dfa83583e5d7df1ff229ea56c5f05c03 100644 (file)
--- a/pkgconfig/gstreamer-fft.pc.in
+++ b/pkgconfig/gstreamer-fft.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer FFT Library
 Description: FFT implementation

diff --git a/pkgconfig/gstreamer-floatcast.pc.in b/pkgconfig/gstreamer-floatcast.pc.in
index 1714eaafa6eed710607979aa51fcb5d3a183f840..c54b098919e59105f59f136c4602de1975693198 100644 (file)
--- a/pkgconfig/gstreamer-floatcast.pc.in
+++ b/pkgconfig/gstreamer-floatcast.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Floatcast Library
 Description: Platform independent floating point macros

diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 90dd7405a5d4d4203db81be9ce899d96c874ecd7..676a23fbf04e262acaa92646f30f734710064430 100644 (file)
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/interfaces
+typelibdir=@abs_top_builddir@/gst-libs/gst/interfaces
 
 Name: GStreamer Interfaces Library, Uninstalled
 Description: Interfaces for GStreamer elements, uninstalled

diff --git a/pkgconfig/gstreamer-interfaces.pc.in b/pkgconfig/gstreamer-interfaces.pc.in
index 30828e4b4ee30eeb3bf21d263acbda6f9ad9b67b..24749be89f8dfeeee9c22aba846066fa259b521d 100644 (file)
--- a/pkgconfig/gstreamer-interfaces.pc.in
+++ b/pkgconfig/gstreamer-interfaces.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Interfaces Library
 Description: Interfaces for GStreamer elements

diff --git a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
index ecf84d026cca1d0602f69daf0995b66316fc3326..941c728ed1ed6b0017f8dc34b0b8b2343b78d5f3 100644 (file)
--- a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/netbuffer
+typelibdir=@abs_top_builddir@/gst-libs/gst/netbuffer
 
 Name: GStreamer Network Buffer Library, Uninstalled
 Description: Network buffer for use in network sources/sinks, uninstalled

diff --git a/pkgconfig/gstreamer-netbuffer.pc.in b/pkgconfig/gstreamer-netbuffer.pc.in
index 44809fb61ab72809dcbe8c1471dfbab8868c41c0..28d7ed27f2ac761c53ddd60886eec154fd027b2b 100644 (file)
--- a/pkgconfig/gstreamer-netbuffer.pc.in
+++ b/pkgconfig/gstreamer-netbuffer.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Network Buffer Library
 Description: Network buffer for use in network sources/sinks

diff --git a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
index 57258328a1c16d693477021ab12048900c21da08..e08758c97951738445d57f1971c8afb2452b9acd 100644 (file)
--- a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/pbutils
+typelibdir=@abs_top_builddir@/gst-libs/gst/pbutils
 
 Name: GStreamer Base Utils Library, Uninstalled
 Description: General utility functions, uninstalled

diff --git a/pkgconfig/gstreamer-pbutils.pc.in b/pkgconfig/gstreamer-pbutils.pc.in
index 59954240bf69a6c2799dc635760222806ebc05f9..e1626a454c2585fff797e48abdb2f39d849fcc5e 100644 (file)
--- a/pkgconfig/gstreamer-pbutils.pc.in
+++ b/pkgconfig/gstreamer-pbutils.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Base Utils Library
 Description: General utility functions

diff --git a/pkgconfig/gstreamer-riff-uninstalled.pc.in b/pkgconfig/gstreamer-riff-uninstalled.pc.in
index 490c0b02e42561c8a29f83545c5cf67e46c83924..2592ba14f9e5b2efb5f33acd431f90943d171c7f 100644 (file)
--- a/pkgconfig/gstreamer-riff-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-riff-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/riff
+typelibdir=@abs_top_builddir@/gst-libs/gst/riff
 
 Name: GStreamer RIFF Library, Uninstalled
 Description: RIFF helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-riff.pc.in b/pkgconfig/gstreamer-riff.pc.in
index 054d417ef946894de7d884f322867ba3936f3c07..0858276bf3090a936ca0e7afab210c6c0fbff415 100644 (file)
--- a/pkgconfig/gstreamer-riff.pc.in
+++ b/pkgconfig/gstreamer-riff.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer RIFF Library
 Description: RIFF helper functions

diff --git a/pkgconfig/gstreamer-rtp-uninstalled.pc.in b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
index f976829b88b5498d5e573ff10b00efeb1d3f68fb..96c66cd741638345e6e0a9f63d27b3f3d4606e72 100644 (file)
--- a/pkgconfig/gstreamer-rtp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/rtp
+typelibdir=@abs_top_builddir@/gst-libs/gst/rtp
 
 Name: GStreamer RTP Library, Uninstalled
 Description: RTP base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-rtp.pc.in b/pkgconfig/gstreamer-rtp.pc.in
index c7a3b15dd92184005fca992b9c1fce0ee5f828a5..ff74a9d126b3dcc9793d1b8309cedc1b95252a0f 100644 (file)
--- a/pkgconfig/gstreamer-rtp.pc.in
+++ b/pkgconfig/gstreamer-rtp.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer RTP Library
 Description: RTP base classes and helper functions

diff --git a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
index 3bf86b17165edb91b73a97a7e2dda2303f1c5805..53258ec0980cd0649a3943df3f42c2ff8e174162 100644 (file)
--- a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/rtsp
+typelibdir=@abs_top_builddir@/gst-libs/gst/rtsp
 
 Name: GStreamer RTSP Library, Uninstalled
 Description: RTSP base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-rtsp.pc.in b/pkgconfig/gstreamer-rtsp.pc.in
index b2ca7cf63e620f2aaed466ffc80604b2e97ab5ed..203e4002cbeeacef3e4c9013c74e9f30b9ae7613 100644 (file)
--- a/pkgconfig/gstreamer-rtsp.pc.in
+++ b/pkgconfig/gstreamer-rtsp.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer RTSP Library
 Description: RTSP base classes and helper functions

diff --git a/pkgconfig/gstreamer-sdp-uninstalled.pc.in b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
index d4591b5837d55ba69fbf6cb372cc69263eac7e88..bd1d89ddb2becbf8bd512a833da3b07ef84556d6 100644 (file)
--- a/pkgconfig/gstreamer-sdp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/sdp
+typelibdir=@abs_top_builddir@/gst-libs/gst/sdp
 
 Name: GStreamer SDP Library, Uninstalled
 Description: SDP helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-sdp.pc.in b/pkgconfig/gstreamer-sdp.pc.in
index bf9c56acc4e671f630b2f9d3c4c61fc3b617494e..9bb0f4044d2c8e2c8087262990094d0aa30a3697 100644 (file)
--- a/pkgconfig/gstreamer-sdp.pc.in
+++ b/pkgconfig/gstreamer-sdp.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer SDP Library
 Description: SDP helper functions

diff --git a/pkgconfig/gstreamer-tag-uninstalled.pc.in b/pkgconfig/gstreamer-tag-uninstalled.pc.in
index 5f2e791157810b72dbc5444fa6896b47a0124965..b953a4c1a7815e64aa1268bd54e6378c29d86ac6 100644 (file)
--- a/pkgconfig/gstreamer-tag-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-tag-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/tag
+typelibdir=@abs_top_builddir@/gst-libs/gst/tag
 
 Name: GStreamer Tag Library, Uninstalled
 Description: Tag base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-tag.pc.in b/pkgconfig/gstreamer-tag.pc.in
index 33c27b542ebdf96642569efe8810a05963cbe8bd..a7a564c3b4aa4b8bd61c5fd00295689d6fcd3cec 100644 (file)
--- a/pkgconfig/gstreamer-tag.pc.in
+++ b/pkgconfig/gstreamer-tag.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Tag Library
 Description: Tag base classes and helper functions

diff --git a/pkgconfig/gstreamer-video-uninstalled.pc.in b/pkgconfig/gstreamer-video-uninstalled.pc.in
index 63792967b6010c0dafec79234c345e955c6127c3..450be2bc2dc07e0542ad90805cd116322b654f7c 100644 (file)
--- a/pkgconfig/gstreamer-video-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-video-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/video
+typelibdir=@abs_top_builddir@/gst-libs/gst/video
 
 Name: GStreamer Video Library, Uninstalled
 Description: Video base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-video.pc.in b/pkgconfig/gstreamer-video.pc.in
index cdddeb31b8d1de05beff9a3cfc8364caae476eb5..59a217d74e7211111638e455259636248a2db49a 100644 (file)
--- a/pkgconfig/gstreamer-video.pc.in
+++ b/pkgconfig/gstreamer-video.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer Video Library
 Description: Video base classes and helper functions