Update to 0.8.0nb1:

- Require glib2>=2.4.0nb1 to get the RTLD_GLOBAL fix.
- Move the plugins database from /var/cache/gstreamer-0.8 to
  ${PREFIX}/libdata/gstreamer-0.8, because it's intended to be updated
  after (de)installation of plugins only.
- Implement a framework to automatically rebuild the plugins database at
  (de)install time.  This is handled by the simple inclusion of plugins.mk
  in package makefiles.

7 files changed, 79 insertions, 7 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 1433bb58f4f..555df06fe0f 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/04/01 19:05:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/06 09:30:01 jmmv Exp $
 #
 
 DISTNAME=		gstreamer-0.8.0
+PKGREVISION=		1
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,7 +23,7 @@ USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
-CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
 CONFIGURE_ENV+=		ac_cv_path_PYTHON="${PYTHONBIN}"
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-control.pc.in
@@ -30,13 +31,21 @@ PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
 
 PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth
 
-OWN_DIRS_PERMS=		/var/cache/gstreamer-0.8 ${ROOT_USER} ${ROOT_GROUP} 1777
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
+# won't work at all.
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
+.endif
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../lang/python/application.mk"
+_GSTREAMER_NO_DEPEND=		# defined
+.include "../../multimedia/gstreamer/plugins.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gstreamer/PLIST b/multimedia/gstreamer/PLIST
index 4442483a2c1..68bcff3c3ad 100644
--- a/multimedia/gstreamer/PLIST
+++ b/multimedia/gstreamer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/01 19:05:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/06 09:30:01 jmmv Exp $
 bin/gst-complete
 bin/gst-complete-0.8
 bin/gst-compprep
@@ -120,6 +120,8 @@ lib/libgstreamer-0.8.so.1
 lib/libgstreamer-0.8.so.1.0
 lib/pkgconfig/gstreamer-0.8.pc
 lib/pkgconfig/gstreamer-control-0.8.pc
+libdata/gstreamer-0.8/compreg.xml
+libdata/gstreamer-0.8/registry.xml
 man/man1/gst-complete-0.8.1
 man/man1/gst-compprep-0.8.1
 man/man1/gst-feedback-0.8.1
@@ -140,6 +142,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gstreamer-0.8.mo
 @exec ${MKDIR} %D/share/doc/${PKGNAME}/faq
 @dirrm share/doc/${PKGNAME}/faq
 @dirrm share/doc/${PKGNAME}
+@dirrm libdata/gstreamer-0.8
 @dirrm lib/gstreamer-0.8
 @dirrm include/gstreamer-0.8/gst/getbits
 @dirrm include/gstreamer-0.8/gst/control
diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
index 30f19113693..23f0c291fb3 100644
--- a/multimedia/gstreamer/buildlink3.mk
+++ b/multimedia/gstreamer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 19:05:43 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/06 09:30:01 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GSTREAMER_BUILDLINK3_MK:=	${GSTREAMER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer}
 BUILDLINK_PACKAGES+=	gstreamer
 
 .if !empty(GSTREAMER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.0
+BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.0nb1
 BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
 .endif	# GSTREAMER_BUILDLINK3_MK
 
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index bb5194ff57e..db5d7f3d21b 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/04/01 19:05:43 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/04/06 09:30:01 jmmv Exp $
 
 SHA1 (gstreamer-0.8.0.tar.bz2) = bdbc340d4896a2b1c5aee02339bed52ecde61283
 Size (gstreamer-0.8.0.tar.bz2) = 1120465 bytes
+SHA1 (patch-aa) = 749f788b2639bdffb48cf937aae0520db2ba864f
diff --git a/multimedia/gstreamer/files/plugins.tmpl b/multimedia/gstreamer/files/plugins.tmpl
new file mode 100644
index 00000000000..0ef4cacd46e
--- /dev/null
+++ b/multimedia/gstreamer/files/plugins.tmpl
@@ -0,0 +1,17 @@
+# $NetBSD: plugins.tmpl,v 1.1 2004/04/06 09:30:01 jmmv Exp $
+#
+# Handle registration of GStreamer plugins into the global plugin registry.
+#
+
+GST_COMPPREP="@GST_COMPPREP@"
+GST_REGISTER="@GST_REGISTER@"
+GST_DBDIR="@GST_DBDIR@"
+
+case ${STAGE} in
+DEINSTALL|POST-INSTALL)
+	${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
+	${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
+	;;
+*)
+	;;
+esac
diff --git a/multimedia/gstreamer/patches/patch-aa b/multimedia/gstreamer/patches/patch-aa
new file mode 100644
index 00000000000..599f09951c6
--- /dev/null
+++ b/multimedia/gstreamer/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2004/04/06 09:30:01 jmmv Exp $
+
+--- configure.orig	2004-03-16 12:31:54.000000000 +0100
++++ configure
+@@ -24079,7 +24079,7 @@ fi;
+ if test "x$PLUGINS_USE_BUILDDIR" = "xyes"; then
+   GST_CACHE_DIR=`pwd`
+ else
+-    GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR
++    GST_CACHE_DIR=${localstatedir}
+ fi
+ 
+ # Check whether --with-cachedir or --without-cachedir was given.
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
new file mode 100644
index 00000000000..f003976a0a6
--- /dev/null
+++ b/multimedia/gstreamer/plugins.mk
@@ -0,0 +1,29 @@
+# $NetBSD: plugins.mk,v 1.1 2004/04/06 09:30:01 jmmv Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# GStreamer modules.  It takes care of rebuilding the corresponding databases
+# at (de)installation time.
+#
+
+.if !defined(GSTREAMER_PLUGINS_MK)
+GSTREAMER_PLUGINS_MK=	# defined
+
+GST_DBDIR=		${BUILDLINK_PREFIX.gstreamer}/libdata/gstreamer-0.8
+GST_COMPPREP=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-compprep
+GST_REGISTER=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-register
+
+FILES_SUBST+=		GST_DBDIR="${GST_DBDIR}"
+FILES_SUBST+=		GST_COMPPREP="${GST_COMPPREP}"
+FILES_SUBST+=		GST_REGISTER="${GST_REGISTER}"
+INSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
+DEINSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
+USE_PKGINSTALL=		YES
+
+.if defined(_GSTREAMER_NO_DEPEND)
+BUILDLINK_PREFIX.gstreamer=	${LOCALBASE}
+.else
+USE_BUILDLINK3=		YES
+.  include "../../multimedia/gstreamer/buildlink3.mk"
+.endif
+
+.endif			# GSTREAMER_PLUGINS_MK