releasing 0.6.5

Original commit message from CVS:
releasing 0.6.5

13 files changed, 132 insertions, 223 deletions

diff --git a/ChangeLog b/ChangeLog
index 13df84a44..f9da6c42e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+=== release 0.6.5 ===
+
+2004-03-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* RELEASE:
+          release notes
+	* configure.ac:
+          release 0.6.5, "FLUSH"
+	* gconf/Makefile.am:
+	* gconf/gstreamer.schemas:
+	* gconf/gstreamer.schemas.in:
+	* gst-libs/gst/gconf/Makefile.am:
+	* gst-libs/gst/gconf/gconf.c:
+	* gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc.in:
+	* gst-libs/gst/gconf/test-gconf.c: (main):
+          version gconf path
+	* gst-plugins.spec.in:
+          small fixes
+	* pkgconfig/gstreamer-libs-uninstalled.pc.in:
+	* pkgconfig/gstreamer-play-uninstalled.pc.in:
+          fix uninstalled pc files
+	* testsuite/Makefile.am:
+	* testsuite/autoplug/autoplug.c: (main):
+	* testsuite/spider/spider1.c: (main):
+	* testsuite/spider/spider2.c: (main):
+	* testsuite/spider/spider3.c: (main):
+          update to use _link over _connect
+	* tools/Makefile.am:
+	* tools/gst-launch-ext:
+	* tools/gst-launch-ext.1:
+	* tools/gst-launch-ext.1.in:
+	* tools/gst-visualise:
+	* tools/gst-visualise.1:
+	* tools/gst-visualise.1.in:
+          version tools
+
 2004-03-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* common/gst-autogen.sh:
diff --git a/NEWS b/NEWS
index e69de29bb..7b4e326f7 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,9 @@
+This is GStreamer Plugins 0.6.5
+
+Changes since 0.6.4:
+
+      * Provides versioned binaries
+      * Provides versioned GConf installation
+      * compile fixes for mpeg2dec 0.4.0
+      * compile fixes for ALSA 1.0.x
+      * fixes for uninstalled pkg-config files
diff --git a/RELEASE b/RELEASE
index ea1e93a18..437fdb4aa 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,195 +1,50 @@
 
-                        GStreamer "Moo" 0.6.4 released
+GStreamer: Release notes for GStreamer Plugins 0.6.5 "FLUSH"
+        
 
-   The  GStreamer  team  is  proud  to  announce  a  new  version  in the
-   ABI-stable 0.6.x series.
+The GStreamer team is proud to announce a new release in the
+ABI-stable 0.6.x series.
 
-   At  this  point  in  time  GStreamer  is fully functional for creating
-   audio-based   applications,   as   shown   by   applications  such  as
-   gnome-sound-recorder,      [1]rhythmbox,      [2]sound-juicer      and
-   nautilus-media.
 
-   The  video part is known to be somewhat less functional than the audio
-   part, but applications such as [3]gst-player work very well.
+This release is a service release, fixing some small outstanding issues
+and versioning the binaries so that parallel
+installability of the 0.6.x with future series is fixed.
 
-   We  will  also be releasing a development 0.7 release series, in which
-   we  will  work  on  the  remaining  issues,  such as the interactivity
-   support  which  is  needed  for  DVD menus and SWF (Flash). This means
-   developers  working  on  apps  needing  these services can use the 0.7
-   series  for development and then enable 0.6 support as these additions
-   optionally get backported to 0.6 once they are stable and work well.
+  
+Features of this release
+    
+      * Provides versioned binaries
+      * Provides versioned GConf installation
+      * compile fixes for mpeg2dec 0.4.0
+      * compile fixes for ALSA 1.0.x
+      * fixes for uninstalled pkg-config files
 
-   The  GStreamer  applications we ship all check for both gstreamer-0.6,
-   gstreamer-libs-0.6  and  gstreamer-play-0.6; if those aren't found the
-   0.7  version  of those files are checked for. We suggest anyone making
-   GStreamer-based apps do the same.
+Known issues
+    
+      * You need to manually migrate your GConf settings from /system/gstreamer to /system/gstreamer/0.6
 
-   We are starting to have a really nice collection of applications under
-   development using GStreamer. If you are looking for something specific
-   check out our [4]applications status page.
+Download
 
-Features
-
-     * Pipeline based media architecture
-     * Over 130 plugins
-     * All parts interchangeable
-     * Few  dependencies,  only  glib,  popt  and libxml for core (libxml
-       optional)
-     * Python Language bindings
-     * Good documentation
-     * Widely deployed through bundling with GNOME 2.2/2.4
-     * Design catering also for applications needing low-latency
-     * Highly portable, already running on most mainstream CPU's
-     * Modular  design and use of 3rd party best of breed libraries means
-       no bloat
-     * LGPL  licensing  lays  no  restrictions  on application developers
-       licensing.
-     * Easy  for  applications  to  ship their own plugins to the core as
-       needed
-     * Compiles with both GCC and Forte compilers
-     * Tested to run on Linux, FreeBSD and Solaris
-
-Updates since 0.6.4
-
-     * gstreamer (core)
-          + #119456:   [5][PATCH]  assertion  `GST_IS_SCHEDULER  (sched)'
-            failed
-          + #90471:  [6][0.6.x/patch]  Autoplug  functions only available
-            with varargs
-          + #114252:  [7][PATCH]  opt scheduler: implement unlinking pads
-            in different
-          + #115005: [8][PATCH] Fails to compile on OpenBSD
-          + #119155: [9]rhythmbox head fails to play a second song in the
-            playlist.
-          + #119770: [10]FreeBSD names libtool 1.4 libtool14
-          + #120345: [11][PATCH] backport of --gst-disable-cpu-opt
-          + #120785:  [12][PATCH]  bison  and yacc generated files aren't
-            disted
-          + #120960: [13]Failed to compile gstreamer 0.6.3 with gcc 3.3.1
-          + #121311: [14][PATCH] Compilation Error
-          + #122272:  [15][PATCH] [0.6.4] GST_CAPS_IS_FIXED is broken, as
-            well as prop
-          + #123137:  [16][PATCH] Compilation fails when size_t is not an
-            unsigned int
-          + #123518: [17][PATCH] opt shouldn't add groups to run queue if
-            they're alr
-          + #123542: [18]inactive pads should be able to push a buffer if
-            their peer
-          + #124124: [19]docbook docs don't build properly
-          + #122059: [20]gst-md5sink needs a way to handle threads
-          + #123417: [21][PATCH] fix popt default scheduler description
-          + #123517: [22]more opt scheduler debug info
-     * gst-plugins
-          + #116077: [23][PATCH] sinesrc has problems in waveform
-          + #121165: [24]Compilation errors due to invalid -Wall option
-          + #121174:  [25]Compiler  error in gst-libs/gst/riff/riffutil.c
-            #define and v
-          + #121175: [26]Compiler error in
-            gst-libs/gst/media-info/media-info.c with
-          + #121184: [27][PATCH] ffmpeg requires gcc on x86 (at least)
-          + #121872:    [28]gst-plugins    fails   to   compile   against
-            libmpeg2-0.3.2_pre20030
-          + #122458:  [29]Adding  a  visualisation  video  size signal to
-            libgstplay
-          + #122481: [30][PATCH] wavenc is somehow broken
-          + #123306: [31]Add error messages to cdparanoia plugin
-          + #123896:  [32]xvideosink  does  too little parameter checking
-            and uses wrong
-          + #123939: [33]libgstplay : small fixes
-          + #123946: [34][PATCH] mpeg2dec-0.3.2-cvs run failure
-          + #121143:  [35][PATCH]  FLAC  files with id3 tags fail to play
-            (can't find me
-          + #122031: [36]mpeg2dec plugin breaks against 0.3.2 cvs
-          + #123516: [37]adder unrefs the bufferpool wrongly
+You find source releases of gst-plugins in the download directory:
+http://gstreamer.freedesktop.org/src/gst-plugins/
 
 GStreamer Homepage
 
-   More  details on these features can be found on the project's website,
-   [38]http://gstreamer.net/.
+More details can be found on the project's website:
+http://gstreamer.freedesktop.org/
 
 Support and Bugs
 
-   We  use [39]Gnome's Bugzilla for bug reports and feature requests. The
-   "product  name"  is  GStreamer  (capital  G).  Please do the following
-   before writing a bug report :
-gst-feedback &> feedback 2>&1
-
-   and  attach  the  file  "feedback" to your bug report, so that we have
-   some information useful in the debugging process.
+We use GNOME's bugzilla for bug reports and feature requests:
+http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer
 
 Developers
 
-   GStreamer  is [40]hosted on SourceForge. All code is in CVS and can be
-   checked  out  from  there.  Interested developers of the core library,
-   plug-ins,  and  applications  should  subscribe to the gstreamer-devel
-   list.  If  there  is  sufficient interest we will create more lists as
-   necessary.
-
-   We  are  still  looking  for  people  with access to FreeBSD, Solaris,
-   HP-UX,  Irix  and  True64  that  would  be willing to try building and
-   testing  GStreamer.  Patches  fixing  such problems are also more than
-   welcome.
-
-Contributors to this release
-
-  Patches to the core of GStreamer
-
-     * Brett Kosinski
-     * David Schleef
-     * Thomas Vander Stichele
-     * Jerry Talkington
-
-  Plugins and Sample Applications
-
-     * Damien Carbery
-     * Ronald Bultje
-     * Julien Moutte
-     * Jérémy Simon
-     * Ross Burton
-
-  Misc
-
-     * Christian Fredrik Kalager Schaller
-
-References
+CVS is hosted on cvs.freedesktop.org.
+All code is in CVS and can be checked out from there.
+Interested developers of the core library, plug-ins, and applications should
+subscribe to the gstreamer-devel list. If there is sufficient interest we
+will create more lists as necessary.
 
-   1. http://www.rhythmbox.org/
-   2. http://mail.gnome.org/archives/gnome-announce-list/2003-April/msg00046.html
-   3. http://gstreamer.net/releases/gst-player/0.5.0/
-   4. http://www.gstreamer.net/status/?category=2
-   5. http://bugzilla.gnome.org/show_bug.cgi?id=119456
-   6. http://bugzilla.gnome.org/show_bug.cgi?id=90471
-   7. http://bugzilla.gnome.org/show_bug.cgi?id=114252
-   8. http://bugzilla.gnome.org/show_bug.cgi?id=115005
-   9. http://bugzilla.gnome.org/show_bug.cgi?id=119155
-  10. http://bugzilla.gnome.org/show_bug.cgi?id=119770
-  11. http://bugzilla.gnome.org/show_bug.cgi?id=120345
-  12. http://bugzilla.gnome.org/show_bug.cgi?id=120785
-  13. http://bugzilla.gnome.org/show_bug.cgi?id=120960
-  14. http://bugzilla.gnome.org/show_bug.cgi?id=121311
-  15. http://bugzilla.gnome.org/show_bug.cgi?id=122272
-  16. http://bugzilla.gnome.org/show_bug.cgi?id=123137
-  17. http://bugzilla.gnome.org/show_bug.cgi?id=123518
-  18. http://bugzilla.gnome.org/show_bug.cgi?id=123542
-  19. http://bugzilla.gnome.org/show_bug.cgi?id=124124
-  20. http://bugzilla.gnome.org/show_bug.cgi?id=122059
-  21. http://bugzilla.gnome.org/show_bug.cgi?id=123417
-  22. http://bugzilla.gnome.org/show_bug.cgi?id=123517
-  23. http://bugzilla.gnome.org/show_bug.cgi?id=116077
-  24. http://bugzilla.gnome.org/show_bug.cgi?id=121165
-  25. http://bugzilla.gnome.org/show_bug.cgi?id=121174
-  26. http://bugzilla.gnome.org/show_bug.cgi?id=121175
-  27. http://bugzilla.gnome.org/show_bug.cgi?id=121184
-  28. http://bugzilla.gnome.org/show_bug.cgi?id=121872
-  29. http://bugzilla.gnome.org/show_bug.cgi?id=122458
-  30. http://bugzilla.gnome.org/show_bug.cgi?id=122481
-  31. http://bugzilla.gnome.org/show_bug.cgi?id=123306
-  32. http://bugzilla.gnome.org/show_bug.cgi?id=123896
-  33. http://bugzilla.gnome.org/show_bug.cgi?id=123939
-  34. http://bugzilla.gnome.org/show_bug.cgi?id=123946
-  35. http://bugzilla.gnome.org/show_bug.cgi?id=121143
-  36. http://bugzilla.gnome.org/show_bug.cgi?id=122031
-  37. http://bugzilla.gnome.org/show_bug.cgi?id=123516
-  38. http://gstreamer.net/
-  39. http://bugzilla.gnome.org/
-  40. http://gstreamer.sf.net/
+        
+ 
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 3e9ed79d0..027fab71b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 6, 4, 1, GST_CVS="no", GST_CVS="yes")
+AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 6, 5, 0, GST_CVS="no", GST_CVS="yes")
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
 dnl our libraries and install dirs use major.minor as a version
@@ -1179,6 +1179,7 @@ ext/swfdec/Makefile
 ext/vorbis/Makefile
 ext/tarkin/Makefile
 ext/xmms/Makefile
+gconf/gstreamer.schemas
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index b3ca1fad6..8fa37fbc2 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -1,5 +1,8 @@
 schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = gstreamer.schemas
+schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas
+
+gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
+	cp $< $@
 
 install-data-local:
 	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
@@ -10,4 +13,5 @@ install-data-local:
 		echo "*****************************************************";) 
 	@true
 
-EXTRA_DIST = gstreamer.schemas
+CLEANFILES = $(schema_DATA)
+EXTRA_DIST = $(schema_DATA)
diff --git a/gconf/gstreamer.schemas b/gconf/gstreamer.schemas.in
index 776f3072a..2218a7729 100644
--- a/gconf/gstreamer.schemas
+++ b/gconf/gstreamer.schemas.in
@@ -1,8 +1,8 @@
 <gconfschemafile>
   <schemalist>
     <schema>
-      <key>/schemas/system/gstreamer/default/audiosink</key>
-      <applyto>/system/gstreamer/default/audiosink</applyto>
+      <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</key>
+      <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</applyto>
       <owner>gstreamer</owner>
       <type>string</type>
       <default>osssink sync=false</default>
@@ -12,8 +12,8 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/system/gstreamer/default/videosink</key>
-      <applyto>/system/gstreamer/default/videosink</applyto>
+      <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosink</key>
+      <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto>
       <owner>gstreamer</owner>
       <type>string</type>
       <default>xvideosink</default>
@@ -23,8 +23,8 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/system/gstreamer/default/audiosrc</key>
-      <applyto>/system/gstreamer/default/audiosrc</applyto>
+      <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</key>
+      <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</applyto>
       <owner>gstreamer</owner>
       <type>string</type>
       <default>osssrc</default>
@@ -34,8 +34,8 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/system/gstreamer/default/videosrc</key>
-      <applyto>/system/gstreamer/default/videosrc</applyto>
+      <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</key>
+      <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</applyto>
       <owner>gstreamer</owner>
       <type>string</type>
       <default>v4lsrc</default>
@@ -45,8 +45,8 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/system/gstreamer/default/visualisation</key>
-      <applyto>/system/gstreamer/default/visualisation</applyto>
+      <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/visualisation</key>
+      <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/visualisation</applyto>
       <owner>gstreamer</owner>
       <type>string</type>
       <default>goom</default>
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index faec62223..64bebf9fd 100644
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -9,11 +9,14 @@ libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
 
 noinst_PROGRAMS = test-gconf
 
-test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+# add define for GST_GCONF_DIR
+DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
+
+test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
 test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
 
-libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS)
-libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
+libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
 libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
 
 EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in
diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 494ca9f1e..792a80c4d 100644
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -4,7 +4,9 @@
 
 #include "gconf.h"
 
-#define GST_GCONF_DIR "/system/gstreamer"
+#ifndef GST_GCONF_DIR
+#error "GST_GCONF_DIR is not defined !"
+#endif
 
 static GConfClient *_gst_gconf_client = NULL; /* GConf connection */
 
diff --git a/gst-libs/gst/gconf/test-gconf.c b/gst-libs/gst/gconf/test-gconf.c
index 5f9c398ba..8c3b9c650 100644
--- a/gst-libs/gst/gconf/test-gconf.c
+++ b/gst-libs/gst/gconf/test-gconf.c
@@ -3,13 +3,14 @@
 int
 main (int argc, char *argv[])
 {
-  printf ("Default video sink : %s\n", 
+  gst_init (&argc, &argv);
+  printf ("Default video sink : %s\n",
           gst_gconf_get_string ("default/videosink"));
-  printf ("Default audio sink : %s\n", 
+  printf ("Default audio sink : %s\n",
           gst_gconf_get_string ("default/audiosink"));
-  printf ("Default video src : %s\n", 
+  printf ("Default video src : %s\n",
           gst_gconf_get_string ("default/videosrc"));
-  printf ("Default audio src : %s\n", 
+  printf ("Default audio src : %s\n",
           gst_gconf_get_string ("default/audiosrc"));
   return 0;
 }
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 4f41af2f3..e1dd1dda2 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -58,11 +58,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING README RELEASE REQUIREMENTS
-%{_bindir}/gst-launch-ext
-%{_bindir}/gst-visualise
-%{_mandir}/man1/gst-launch-ext.*
-%{_mandir}/man1/gst-visualise.1.*
+%doc AUTHORS ChangeLog COPYING README RELEASE REQUIREMENTS
+%{_bindir}/gst-launch-ext-@GST_MAJORMINOR@
+%{_bindir}/gst-visualise-@GST_MAJORMINOR@
+%{_mandir}/man1/gst-launch-ext-@GST_MAJORMINOR@.1.*
+%{_mandir}/man1/gst-visualise-@GST_MAJORMINOR@.1.*
 %{_libdir}/gstreamer-%{majorminor}/libgstaudioscale.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaudio.so
 %{_libdir}/gstreamer-%{majorminor}/libgstidct.so
diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index 04f8762b3..1255a6bfc 100644
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -1,13 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/..
-includedir=${pcfiledir}/..
+libdir=${pcfiledir}/../gst-libs/gst/gconf
+includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer GConf Library, uninstalled
 Description: Streaming media framework, GConf support library, not installed
-Requires: gstreamer >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
 Version: @VERSION@
 
-Libs: ${libdir}/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
-Cflags: -I${includedir}/gst-libs
+Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 637b83f07..8f90cb193 100644
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,15 +1,14 @@
-# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/..
-includedir=${pcfiledir}/..
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
 
-Name: GStreamer Uninstalled Media-Specific Libraries
+Name: GStreamer Media-Specific Libraries, uninstalled
 Description: Streaming-media framework media-specific libraries, not installed
-Version: @VERSION@
 Requires: gstreamer = @VERSION@
-Libs: -L${pcfiledir}/../gst-libs/gst/gconf \
-	-L${pcfiledir}/../gst-libs/gst/audio \
-	-L${pcfiledir}/../gst-libs/gst/video \
-	-L${pcfiledir}/../gst-libs/gst/play
-Cflags: -I${pcfiledir}/../gst-libs
+Version: @VERSION@
+Libs: -L${libdir}/gconf \
+	-L${libdir}/audio \
+	-L${libdir}/video \
+	-L${libdir}/play \
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index dc133f353..35b815b7d 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,13 +1,12 @@
-# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/..
-includedir=${pcfiledir}/..
+libdir=${pcfiledir}/../gst-libs/gst/play
+includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Play Library, uninstalled
 Description: Streaming-media framework, play libraries, not installed
 Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@
 Version: @VERSION@
 
-Libs: ${libdir}/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
-Cflags: -I${includedir}/gst-libs
+Libs: ${libdir}/libgstplay-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}