adding gstreamer-plugins.pc fixes #126999

Original commit message from CVS:
adding gstreamer-plugins.pc
fixes #126999

diff --git a/ChangeLog b/ChangeLog
index 25ce4fef75425fa09f5106f40afa27a3f0f69359..fb2b6c89f848add37046bf3937d1fee6482a95a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * configure.ac:
+       * gst-plugins.spec.in:
+       * pkgconfig/Makefile.am:
+       * pkgconfig/gstreamer-gconf-uninstalled.pc.in:
+       * pkgconfig/gstreamer-interfaces-uninstalled.pc.in:
+       * pkgconfig/gstreamer-libs-uninstalled.pc.in:
+       * pkgconfig/gstreamer-libs.pc.in:
+       * pkgconfig/gstreamer-media-info-uninstalled.pc.in:
+       * pkgconfig/gstreamer-play-uninstalled.pc.in:
+       * pkgconfig/gstreamer-plugins-uninstalled.pc.in:
+       * pkgconfig/gstreamer-plugins.pc.in:
+          remove @VERSION@ from some of the pc files since core and plugins
+          are decoupled.
+          created gstreamer-plugins.pc as it's a better name, but keeping
+          -libs around for now to get fixes upstream done first.
+
 2004-03-15  Julien MOUTTE <julien@moutte.net>
 
        * gst-libs/gst/play/play.c: (gst_play_get_framerate),

diff --git a/configure.ac b/configure.ac
index fc8b285724a01e21ba3080d3926b4b8f0ddd3d64..387103c20dc5d11b904a969332946df9dac5ffe8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1756,6 +1756,8 @@ pkgconfig/gstreamer-media-info.pc
 pkgconfig/gstreamer-media-info-uninstalled.pc
 pkgconfig/gstreamer-play.pc
 pkgconfig/gstreamer-play-uninstalled.pc
+pkgconfig/gstreamer-plugins.pc
+pkgconfig/gstreamer-plugins-uninstalled.pc
 po/Makefile.in
 )
 AC_OUTPUT

diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 6c6843c79aa3808d1961f5f3bb486d392856b0f0..8309a6c2446faea3730a2be25393b602dfbc528d 100644 (file)
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -294,6 +294,7 @@ GStreamer support libraries header files.
 %{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-media-info-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-plugins-%{majorminor}.pc
 # .so files
 @USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so
 %{_libdir}/libgstmedia-info-%{majorminor}.so

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index bd93f27c82e3e1deb1d86168d4a70f36ee82f8b0..893aca0d3ede99b0f9f2e1b68f4fe72be4cb9e76 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -12,13 +12,15 @@ pcverfiles =  \
        gstreamer-interfaces-@GST_MAJORMINOR@.pc \
        gstreamer-libs-@GST_MAJORMINOR@.pc \
        gstreamer-media-info-@GST_MAJORMINOR@.pc \
-       gstreamer-play-@GST_MAJORMINOR@.pc
+       gstreamer-play-@GST_MAJORMINOR@.pc \
+       gstreamer-plugins-@GST_MAJORMINOR@.pc
 pcverfiles_uninstalled = \
        $(GCONF_PC_UNINSTALLED) \
        gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc \
        gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
        gstreamer-media-info-@GST_MAJORMINOR@-uninstalled.pc \
-       gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc \
+       gstreamer-plugins-@GST_MAJORMINOR@-uninstalled.pc
 
 pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
 all-local: $(pcverfiles) $(pcverfiles_uninstalled)
@@ -38,7 +40,8 @@ pcinfiles = \
            gstreamer-interfaces.pc.in gstreamer-interfaces-uninstalled.pc.in \
            gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
            gstreamer-media-info.pc.in gstreamer-media-info-uninstalled.pc.in \
-           gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in
+           gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \
+           gstreamer-plugins.pc.in gstreamer-plugins-uninstalled.pc.in
 
 DISTCLEANFILES = $(pcinfiles:.in=)
 EXTRA_DIST = $(pcinfiles)

diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index 0d4d5cb33ba3efa9bbdc3a55ed9a01404440c365..a7b8e7afc02cd035720853da4a9d23f96ce8c4a5 100644 (file)
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -6,7 +6,7 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer GConf Library, uninstalled
 Description: Streaming media framework, GConf support library, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ gconf-2.0
+Requires: gstreamer-@GST_MAJORMINOR@ gconf-2.0
 Version: @VERSION@
 
 Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la

diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index ae346b76c8698792abd9f6e13e692ceb4dfd09e4..732e0c2c76c42370195f7cf93c75570ca4159b92 100644 (file)
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -5,7 +5,7 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Interfaces library, uninstalled
 Description: Streaming-media framework, interfaces library, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@
 Version: @VERSION@
 
 Libs: ${libdir}/libgstinterfaces-@GST_MAJORMINOR@.la

diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 46161505dcd86cb0eccce08ed7f560f85d658fba..78eaf9821285c2a2429323abaae8885c27228825 100644 (file)
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -6,7 +6,7 @@ includedir=${pcfiledir}/../gst-libs
 Name: GStreamer Uninstalled Media-Specific Libraries
 Description: Streaming-media framework media-specific libraries, not installed
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@
 
 Libs: -L${libdir}/audio -L${libdir}/video
 Cflags: -I${includedir}

diff --git a/pkgconfig/gstreamer-libs.pc.in b/pkgconfig/gstreamer-libs.pc.in
index e4eb15976025369a6a199c3d1cc3220c9b070049..21862f918a78f804ad749afae931f3d29d7c2d5c 100644 (file)
--- a/pkgconfig/gstreamer-libs.pc.in
+++ b/pkgconfig/gstreamer-libs.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
 
-Name: GStreamer Media-Specific Libraries
-Description: Streaming-media framework, media-specific libraries
+Name: GStreamer Plugin Libraries
+Description: Streaming-media framework, plugin libraries
 Requires: gstreamer-@GST_MAJORMINOR@
 Version: @VERSION@
 Libs: 

diff --git a/pkgconfig/gstreamer-media-info-uninstalled.pc.in b/pkgconfig/gstreamer-media-info-uninstalled.pc.in
index 3cdd941a4be309e982e487a42ad34471440aebba..055e9c9dfa6bc0546c7be27490b08a5c803f83db 100644 (file)
--- a/pkgconfig/gstreamer-media-info-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-media-info-uninstalled.pc.in
@@ -5,7 +5,7 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Media Info Library, uninstalled
 Description: Streaming-media framework, media info libraries, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@
 Version: @VERSION@
 
 Libs: ${libdir}/libgstmedia-info-@GST_MAJORMINOR@.la

diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 9c693938ff8466813e7c5bd12450b93013921aae..0d044a7da65fa86e34fd5620ca7c159f9e98b93b 100644 (file)
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -5,7 +5,7 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Play Library, uninstalled
 Description: Streaming-media framework, play libraries, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ \
+Requires: gstreamer-@GST_MAJORMINOR@ \
           gstreamer-interfaces-@GST_MAJORMINOR@ >= @VERSION@
           gstreamer-control-@GST_MAJORMINOR@ >= @VERSION@
 Version: @VERSION@

diff --git a/pkgconfig/gstreamer-plugins-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..be53bf4
--- /dev/null
+++ b/pkgconfig/gstreamer-plugins-uninstalled.pc.in
@@ -0,0 +1,12 @@
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
+
+Name: GStreamer Uninstalled Plugin Libraries
+Description: Streaming-media framework plugin libraries, not installed
+Version: @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@
+
+Libs: -L${libdir}/audio -L${libdir}/video
+Cflags: -I${includedir}

diff --git a/pkgconfig/gstreamer-plugins.pc.in b/pkgconfig/gstreamer-plugins.pc.in
new file mode 100644 (file)
index 0000000..f003002
--- /dev/null
+++ b/pkgconfig/gstreamer-plugins.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+
+Name: GStreamer Plugin Libraries
+Description: Streaming-media framework, plugin libraries
+Requires: gstreamer-@GST_MAJORMINOR@ 
+Version: @VERSION@
+Libs: 
+Cflags: -I${includedir}