diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 1 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 9 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-gconf-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-interfaces-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-libs-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-libs.pc.in | 4 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-media-info-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-play-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-plugins-uninstalled.pc.in | 12 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-plugins.pc.in | 11 |
12 files changed, 57 insertions, 10 deletions
@@ -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 fc8b28572..387103c20 100644 --- 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 6c6843c79..8309a6c24 100644 --- 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 bd93f27c8..893aca0d3 100644 --- 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 0d4d5cb33..a7b8e7afc 100644 --- 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 ae346b76c..732e0c2c7 100644 --- 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 46161505d..78eaf9821 100644 --- 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 e4eb15976..21862f918 100644 --- 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 3cdd941a4..055e9c9df 100644 --- 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 9c693938f..0d044a7da 100644 --- 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 index 000000000..be53bf416 --- /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 index 000000000..f003002e1 --- /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} |