summaryrefslogtreecommitdiff
path: root/multimedia/gstreamer
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/gstreamer')
-rw-r--r--multimedia/gstreamer/Makefile16
-rw-r--r--multimedia/gstreamer/PLIST12
-rw-r--r--multimedia/gstreamer/distinfo6
-rw-r--r--multimedia/gstreamer/files/plugins.tmpl17
-rw-r--r--multimedia/gstreamer/plugins.mk8
5 files changed, 30 insertions, 29 deletions
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 775952f3ad2..5f9fc6d473b 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/12/26 06:32:47 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/06 11:23:44 jmmv Exp $
#
-DISTNAME= gstreamer-0.8.7
-PKGREVISION= 1
+DISTNAME= gstreamer-0.8.8
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
EXTRACT_SUFX= .tar.bz2
@@ -31,6 +30,8 @@ CONFIGURE_ARGS+= HAVE_GTK_DOC=no
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-control.pc.in
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer.pc.in
+MAKE_DIRS+= ${GST_DBDIR}
+
PYTHON_VERSIONS_ACCEPTED= 24 24pth 23 23pth 22 22pth
.include "../../mk/bsd.prefs.mk"
@@ -40,15 +41,6 @@ PYTHON_VERSIONS_ACCEPTED= 24 24pth 23 23pth 22 22pth
# won't work at all.
BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb1
.endif
-
-# XXX: Set up compatibility links for gstreamer-0.8.3; this is just a
-# workaround for our broken libtool naming, and it should be removed when
-# our libtool is fixed.
-post-install:
-.for f in gstcontrol gstreamer
- cd ${PREFIX}/lib && ${LN} -fs lib${f}-0.8.so.5 lib${f}-0.8.so.3
- cd ${PREFIX}/lib && ${LN} -fs lib${f}-0.8.so.5.0 lib${f}-0.8.so.3.0
-.endfor
.undef f
.include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/gstreamer/PLIST b/multimedia/gstreamer/PLIST
index 86d8936b202..2a55d0fc383 100644
--- a/multimedia/gstreamer/PLIST
+++ b/multimedia/gstreamer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/11/02 21:20:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/01/06 11:23:44 jmmv Exp $
bin/gst-complete
bin/gst-complete-0.8
bin/gst-compprep
@@ -87,6 +87,7 @@ lib/gstreamer-0.8/libgstdataprotocol.la
lib/gstreamer-0.8/libgstelements.la
lib/gstreamer-0.8/libgstentrygthreadscheduler.la
lib/gstreamer-0.8/libgstentryomegascheduler.la
+lib/gstreamer-0.8/libgstfairgthreadscheduler.la
lib/gstreamer-0.8/libgstgetbits.la
lib/gstreamer-0.8/libgstindexers.la
lib/gstreamer-0.8/libgstoptgthreadscheduler.la
@@ -94,15 +95,9 @@ lib/gstreamer-0.8/libgstoptomegascheduler.la
lib/gstreamer-0.8/libgstoptscheduler.la
lib/gstreamer-0.8/libgstspider.la
lib/libgstcontrol-0.8.la
-lib/libgstcontrol-0.8.so.3
-lib/libgstcontrol-0.8.so.3.0
lib/libgstreamer-0.8.la
-lib/libgstreamer-0.8.so.3
-lib/libgstreamer-0.8.so.3.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
@@ -192,6 +187,8 @@ ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gstreamer-0.8.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gstreamer-0.8.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gstreamer-0.8.mo
${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gstreamer-0.8.mo
@@ -207,7 +204,6 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gstreamer-0.8.mo
@dirrm share/doc/${PKGNAME}/faq
@dirrm share/doc/${PKGNAME}
@dirrm share/doc/gstreamer-0.8
-@dirrm libdata/gstreamer-0.8
@dirrm lib/gstreamer-0.8
@dirrm include/gstreamer-0.8/gst/getbits
@dirrm include/gstreamer-0.8/gst/dataprotocol
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 4a2271ee6c8..6d9334c60cc 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/10/28 14:21:52 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2005/01/06 11:23:44 jmmv Exp $
-SHA1 (gstreamer-0.8.7.tar.bz2) = 93c1aa423bceed8e7fe03d20f699749771517f2c
-Size (gstreamer-0.8.7.tar.bz2) = 1385405 bytes
+SHA1 (gstreamer-0.8.8.tar.bz2) = 01c5c420167d1238ecf5323bb418b02061a628ff
+Size (gstreamer-0.8.8.tar.bz2) = 1408026 bytes
SHA1 (patch-aa) = 749f788b2639bdffb48cf937aae0520db2ba864f
diff --git a/multimedia/gstreamer/files/plugins.tmpl b/multimedia/gstreamer/files/plugins.tmpl
index 0ef4cacd46e..db60367b239 100644
--- a/multimedia/gstreamer/files/plugins.tmpl
+++ b/multimedia/gstreamer/files/plugins.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.tmpl,v 1.1 2004/04/06 09:30:01 jmmv Exp $
+# $NetBSD: plugins.tmpl,v 1.2 2005/01/06 11:23:44 jmmv Exp $
#
# Handle registration of GStreamer plugins into the global plugin registry.
#
@@ -8,10 +8,23 @@ GST_REGISTER="@GST_REGISTER@"
GST_DBDIR="@GST_DBDIR@"
case ${STAGE} in
-DEINSTALL|POST-INSTALL)
+POST-INSTALL)
${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
;;
+DEINSTALL)
+ if [ "${PKGBASE}" = gstreamer ]; then
+ ${RM} -f ${GST_DBDIR}/compreg.xml ${GST_DBDIR}/registry.xml
+ fi
+ ;;
+POST-DEINSTALL)
+ if [ "${PKGBASE}" != gstreamer ]; then
+ ${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml \
+ >/dev/null
+ ${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml \
+ >/dev/null
+ fi
+ ;;
*)
;;
esac
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
index 07a94fe29bf..9366f51c653 100644
--- a/multimedia/gstreamer/plugins.mk
+++ b/multimedia/gstreamer/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.3 2004/04/15 21:20:32 jmmv Exp $
+# $NetBSD: plugins.mk,v 1.4 2005/01/06 11:23:44 jmmv Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GStreamer modules. It takes care of rebuilding the corresponding databases
@@ -19,14 +19,14 @@ INSTALL_EXTRA_TMPL+= ../../multimedia/gstreamer/files/plugins.tmpl
DEINSTALL_EXTRA_TMPL+= ../../multimedia/gstreamer/files/plugins.tmpl
USE_PKGINSTALL= YES
+PRINT_PLIST_AWK+= /^libdata\/gstreamer-0.8/ { next; }
+PRINT_PLIST_AWK+= /^@dirrm libdata\/gstreamer-0.8/ { next; }
+
.if defined(_GSTREAMER_NO_DEPEND)
BUILDLINK_PREFIX.gstreamer= ${LOCALBASE}
.else
USE_BUILDLINK3= YES
-PRINT_PLIST_AWK+= /^libdata\/gstreamer-0.8/ { next; }
-PRINT_PLIST_AWK+= /^@dirrm libdata\/gstreamer-0.8/ { next; }
-
BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.1
. include "../../multimedia/gstreamer/buildlink3.mk"
.endif