summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-14 08:35:50 +0000
committermarcus <marcus@FreeBSD.org>2006-10-14 08:35:50 +0000
commit9b9c902909a87b589432804ec4e8a7fa23943ff4 (patch)
treeaa2e443568b953ce772558b2be74a8451e38ec3d /multimedia
parentf5a682ff4e0a5d73ce8bffeb88c799eb8ef0e816 (diff)
downloadFreeBSD-ports-9b9c902909a87b589432804ec4e8a7fa23943ff4.zip
FreeBSD-ports-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.gz
Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive
amount of work by the FreeBSD GNOME Team and our testers. On top of the usual GNOME update, we have taken this opportunity to move GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of the GNOME Desktop also need to be changed. The bulk of the move was carried out by ahze, mezz, and pav, but it would not have been possible without cooperation from the FreeBSD KDE team who worked with us to make sure GNOME and KDE can still coexist happily. We would also like to send a shout out to kris and pointyhat for putting up with multiple test runs until we got something that was solid. Back to GNOME 2.16. This release brings a huge amount of new functionality to FreeBSD. The standard release notes can be read at http://www.gnome.org/start/2.16/ . But on top of what you will read there, jylefort and marcus have completed work on a port of HAL to FreeBSD. This will allow FreeBSD to take advantage of closer hardware interaction such as auto-mounting CD-ROMs, USB drives, and music players; auto-playing audio CDs; and managing laptop power consumption. But where would this all be without our loyal testers and contributors? Therefore, the FreeBSD GNOME team would like to thank the following users: Phillip Neumann <pneumann@gmail.com> tmclaugh mux Yuri Pankov <yuri.pankov@gmail.com> chinsan Thomas <freebsdlists@bsdunix.ch> Brian Gruber <knightbg@yahoo.com> Franz Klammer <klammer@webonaut.com> Dominique Goncalves <dominique.goncalves@gmail.com> Pascal Hofstee <caelian@gmail.com> Yasuda Keisuke <kysd@po.harenet.ne.jp> backyard <backyard1454-bsd@yahoo.com> Andris Raugulis <endrju@null.lv> <endrju@null.lv> Eric L. Chen <d9364104@mail.nchu.edu.tw> Pawel Worach <pawel.worach@gmail.com> QuiRK on #freebsd-gnome Shane Bell <decept0@gmail.com> luigi sajd on #freebsd-gnome sat Chris Coleman <chrisc@vmunix.com> kaeru on #freebsd-gnome crsd_ via irc.freenode.org/#FreeBSD-GNOME Joel Diaz <joeldiaz@mac.com> Enjoy! Approved by: portmgr (implicit, kris)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer-editor/Makefile12
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile5
-rw-r--r--multimedia/gstreamer-ffmpeg80/Makefile7
-rw-r--r--multimedia/gstreamer-pitfdll/Makefile7
-rw-r--r--multimedia/gstreamer-pitfdll/pkg-plist4
-rw-r--r--multimedia/gstreamer-plugins-annodex/Makefile17
-rw-r--r--multimedia/gstreamer-plugins-bad/Makefile8
-rw-r--r--multimedia/gstreamer-plugins-bad/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins-bz2/Makefile17
-rw-r--r--multimedia/gstreamer-plugins-core/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-core80/Makefile5
-rw-r--r--multimedia/gstreamer-plugins-gnonlin/Makefile4
-rw-r--r--multimedia/gstreamer-plugins-good/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c174
-rw-r--r--multimedia/gstreamer-plugins-good/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins-ugly/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-ugly/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins/Makefile64
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common354
-rw-r--r--multimedia/gstreamer-plugins/distinfo18
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist12
-rw-r--r--multimedia/gstreamer-plugins80/Makefile11
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common5
-rw-r--r--multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c (renamed from multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c)0
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist8
-rw-r--r--multimedia/gstreamer/Makefile12
-rw-r--r--multimedia/gstreamer/distinfo6
-rw-r--r--multimedia/gstreamer/pkg-plist12
-rw-r--r--multimedia/gstreamer80/Makefile8
-rw-r--r--multimedia/gstreamer80/pkg-plist10
-rw-r--r--multimedia/py-gstreamer/Makefile3
-rw-r--r--multimedia/py-gstreamer80/Makefile2
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_arg-types.py11
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_gst.override17
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_gstpad.override24
-rw-r--r--multimedia/totem/Makefile68
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp10
-rw-r--r--multimedia/totem/files/patch-src_totem-disk.c32
-rw-r--r--multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp10
-rw-r--r--multimedia/totem/files/pkg-message-mozilla.in8
-rw-r--r--multimedia/totem/pkg-plist109
42 files changed, 579 insertions, 579 deletions
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index bf1f3f7..3ac34e1 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -3,11 +3,11 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-editor/Makefile,v 1.7 2006/09/10 00:52:59 mezz Exp $
PORTNAME= gstreamer
PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-editor/
PKGNAMESUFFIX= -editor
@@ -16,12 +16,10 @@ DISTNAME= gst-editor-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Provide View and Controller counterparts to GStreamer's Model
-LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80 \
- popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS= gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins80
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+USE_GSTREAMER80= core
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack \
@@ -33,7 +31,7 @@ USE_GNOME= gnomehack \
libgnomeui
PLIST_SUB= \
VERSION="${PORTVERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
INSTALLS_OMF= yes
MAN1= gst-editor.1 gst-inspect-gui.1 gst-launch-gui.1
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index c013fbc..d277c5b 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -3,10 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $
PORTNAME= gstreamer
PORTVERSION= 0.10.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg
@@ -15,7 +16,7 @@ DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer plug-in for manipulating MPEG video streams
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index 9ddf248..3b3b645 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-ffmpeg80/Makefile,v 1.9 2006/07/23 18:28:35 marcus Exp $
PORTNAME= gstreamer
PORTVERSION= 0.8.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg80
@@ -16,7 +16,6 @@ DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer plug-in for manipulating MPEG video streams
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
@@ -45,7 +44,7 @@ post-patch:
post-install:
# register plugins
- -@${X11BASE}/bin/gst-register-${GST80_VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${GST80_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST80_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index 1a03f82..8fe6d19 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-pitfdll/Makefile,v 1.7 2006/07/23 18:28:35 marcus Exp $
PORTNAME= gstreamer-pitfdll
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pitfdll
@@ -18,7 +18,6 @@ COMMENT= GStreamer DLL loader plugin
RUN_DEPENDS= ${LOCALBASE}/lib/win32/wmv8ds32.ax:${PORTSDIR}/multimedia/win32-codecs
-USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
@@ -36,7 +35,7 @@ post-patch:
post-install:
# register plugins
- -@${X11BASE}/bin/gst-register-${GST_VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${GST_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.mk>
diff --git a/multimedia/gstreamer-pitfdll/pkg-plist b/multimedia/gstreamer-pitfdll/pkg-plist
index ad0f269..3348748 100644
--- a/multimedia/gstreamer-pitfdll/pkg-plist
+++ b/multimedia/gstreamer-pitfdll/pkg-plist
@@ -1,4 +1,4 @@
lib/gstreamer-%%VERSION%%/libpitfdll.la
lib/gstreamer-%%VERSION%%/libpitfdll.so
-@exec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@exec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins-annodex/Makefile b/multimedia/gstreamer-plugins-annodex/Makefile
new file mode 100644
index 0000000..616754b
--- /dev/null
+++ b/multimedia/gstreamer-plugins-annodex/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: gstreamer-plugins-annodex
+# Date created: 6 July 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-annodex/Makefile,v 1.1 2006/07/06 19:48:44 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= multimedia
+
+COMMENT= Gstreamer annodex CMML plugin
+
+GST_PLUGIN= annodex
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index c264d0f..3d598ea 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.4 2006/06/08 01:14:30 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.7 2006/09/14 21:25:16 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Bad gstreamer-plugins
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= bad
-BAD_GST_DIRS= gst sys
+gst_bad_DIST= bad
+BAD_GST_DIRS= gst sys gst-libs po
PLIST_SUB= VERSION="${GST_VERSION}"
NO_GSTREAMER_COMMON= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index 4bc24ea..a58856b 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -22,3 +22,23 @@ lib/gstreamer-%%VERSION%%/libgsttta.so
lib/gstreamer-%%VERSION%%/libgstxingheader.a
lib/gstreamer-%%VERSION%%/libgstxingheader.la
lib/gstreamer-%%VERSION%%/libgstxingheader.so
+share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile
new file mode 100644
index 0000000..3253ba3
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bz2/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: gstreamer-plugins-bz2
+# Date created: 6 July 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.2 2006/07/06 19:32:35 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= multimedia
+
+COMMENT= Gstreamer bz2 plugin
+
+GST_PLUGIN= bz2
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index 9b2a815..67e9c8c 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.14 2006/01/21 21:22:18 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.17 2006/07/17 01:39:57 ahze Exp $
PORTNAME= gstreamer-plugins-core
PORTVERSION= 0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Core set of typical audio and video gstreamer-plugins
-USE_X_PREFIX= yes
NO_BUILD= yes
-
GST_DIR= lib/gstreamer-${PORTVERSION}
PLIST_FILES= ${GST_DIR}/.gstreamer-plugins-core.keep
diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile
index 69bbc90..2fbf96b 100644
--- a/multimedia/gstreamer-plugins-core80/Makefile
+++ b/multimedia/gstreamer-plugins-core80/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core80/Makefile,v 1.4 2006/01/24 18:49:48 marcus Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-core80/Makefile,v 1.6 2006/07/21 19:25:28 ahze Exp $
PORTNAME= gstreamer-plugins-core80
PORTVERSION= 0.8.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -16,7 +16,6 @@ EXTRACT_ONLY= # empty
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Core set of typical audio and video gstreamer-plugins
-USE_X_PREFIX= yes
NO_BUILD= yes
GST_DIR= lib/gstreamer-${GST80_VERSION}
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 23af14b..148f221 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.2 2006/04/25 20:54:56 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.7 2006/07/21 16:39:31 ahze Exp $
PORTNAME= gstreamer-plugins-gnonlin
PORTVERSION= 0.10.5
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gnonlin/
DISTNAME= gnonlin-${PORTVERSION}
@@ -14,7 +15,6 @@ DISTNAME= gnonlin-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Gstreamer lib for writing non-linear audio and video
-USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GSTREAMER= yes
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 83df947..8133176 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.7 2006/06/08 01:14:31 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $
#
PORTREVISION= 4
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= good
-GOOD_GST_DIRS= gst sys
+gst_good_DIST= good
+GOOD_GST_DIRS= gst sys po
PLIST_SUB= VERSION="${GST_VERSION}"
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c b/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c
deleted file mode 100644
index acdb3db..0000000
--- a/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -u -r1.16 id3v2frames.c
---- gst/id3demux/id3v2frames.c 10 May 2006 13:51:01 -0000 1.16
-+++ gst/id3demux/id3v2frames.c 15 May 2006 09:48:46 -0000
-@@ -667,33 +667,21 @@
- return result;
- }
-
--static void
--parse_insert_string_field (const gchar * encoding, gchar * data, gint data_size,
-- GArray * fields)
--{
-- gchar *field;
--
-- field = g_convert (data, data_size, "UTF-8", encoding, NULL, NULL, NULL);
-- if (field && !g_utf8_validate (field, -1, NULL)) {
-- GST_DEBUG ("%s was bad UTF-8. Ignoring", field);
-- g_free (field);
-- field = NULL;
-- }
-- if (field)
-- g_array_append_val (fields, field);
--}
-+static const gchar utf16enc[] = "UTF-16";
-+static const gchar utf16leenc[] = "UTF-16LE";
-+static const gchar utf16beenc[] = "UTF-16BE";
-
- static gboolean
--has_utf16_bom (gchar * data, const gchar ** p_in_encoding)
-+find_utf16_bom (gchar * data, const gchar ** p_in_encoding)
- {
- guint16 marker = (GST_READ_UINT8 (data) << 8) | GST_READ_UINT8 (data + 1);
-
- switch (marker) {
- case 0xFFFE:
-- *p_in_encoding = "UTF16LE";
-+ *p_in_encoding = utf16leenc;
- return TRUE;
- case 0xFEFF:
-- *p_in_encoding = "UTF16BE";
-+ *p_in_encoding = utf16beenc;
- return TRUE;
- default:
- break;
-@@ -702,6 +690,63 @@
- }
-
- static void
-+parse_insert_string_field (guint8 encoding, gchar * data, gint data_size,
-+ GArray * fields)
-+{
-+ gchar *field = NULL;
-+
-+ switch (encoding) {
-+ case ID3V2_ENCODING_UTF16:
-+ case ID3V2_ENCODING_UTF16BE:
-+ {
-+ const gchar *in_encode;
-+
-+ if (encoding == ID3V2_ENCODING_UTF16)
-+ in_encode = utf16enc;
-+ else
-+ in_encode = utf16beenc;
-+
-+ /* Sometimes we see strings with multiple BOM markers at the start.
-+ * In that case, we assume the innermost one is correct. If that fails
-+ * to produce valid UTF-8, we try the other endianness anyway */
-+ while (data_size > 2 && find_utf16_bom (data, &in_encode)) {
-+ data += 2; /* skip BOM */
-+ data_size -= 2;
-+ }
-+
-+ field = g_convert (data, data_size, "UTF-8", in_encode, NULL, NULL, NULL);
-+
-+ if (field == NULL || g_utf8_validate (field, -1, NULL) == FALSE) {
-+ /* As a fallback, try interpreting UTF-16 in the other endianness */
-+ if (in_encode == utf16beenc)
-+ field = g_convert (data, data_size, "UTF-8", utf16leenc,
-+ NULL, NULL, NULL);
-+ }
-+ }
-+
-+ break;
-+ case ID3V2_ENCODING_ISO8859:
-+ field = g_convert (data, data_size, "UTF-8", "ISO-8859-1",
-+ NULL, NULL, NULL);
-+ break;
-+ default:
-+ field = g_strndup (data, data_size);
-+ break;
-+ }
-+
-+ if (field) {
-+ if (g_utf8_validate (field, -1, NULL)) {
-+ g_array_append_val (fields, field);
-+ return;
-+ }
-+
-+ GST_DEBUG ("%s was bad UTF-8 after conversion from encoding %d. Ignoring",
-+ field, encoding);
-+ g_free (field);
-+ }
-+}
-+
-+static void
- parse_split_strings (guint8 encoding, gchar * data, gint data_size,
- GArray ** out_fields)
- {
-@@ -715,13 +760,13 @@
- case ID3V2_ENCODING_ISO8859:
- for (text_pos = 0; text_pos < data_size; text_pos++) {
- if (data[text_pos] == 0) {
-- parse_insert_string_field ("ISO-8859-1", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 1, fields);
- prev = text_pos + 1;
- }
- }
- if (data_size - prev > 0 && data[prev] != 0x00) {
-- parse_insert_string_field ("ISO-8859-1", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
-
-@@ -729,34 +774,24 @@
- case ID3V2_ENCODING_UTF8:
- for (prev = 0, text_pos = 0; text_pos < data_size; text_pos++) {
- if (data[text_pos] == '\0') {
-- parse_insert_string_field ("UTF-8", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 1, fields);
- prev = text_pos + 1;
- }
- }
- if (data_size - prev > 0 && data[prev] != 0x00) {
-- parse_insert_string_field ("UTF-8", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
- break;
- case ID3V2_ENCODING_UTF16:
- case ID3V2_ENCODING_UTF16BE:
- {
-- const gchar *in_encode;
--
-- if (encoding == ID3V2_ENCODING_UTF16)
-- in_encode = "UTF-16";
-- else
-- in_encode = "UTF-16BE";
--
- /* Find '\0\0' terminator */
- for (text_pos = 0; text_pos < data_size - 1; text_pos += 2) {
- if (data[text_pos] == '\0' && data[text_pos + 1] == '\0') {
-- if (has_utf16_bom (data + prev, &in_encode)) {
-- prev += 2; /* skip BOM */
-- }
- /* found a delimiter */
-- parse_insert_string_field (in_encode, data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 2, fields);
- text_pos++; /* Advance to the 2nd NULL terminator */
- prev = text_pos + 1;
-@@ -765,11 +800,8 @@
- }
- if (data_size - prev > 1 &&
- (data[prev] != 0x00 || data[prev + 1] != 0x00)) {
-- if (has_utf16_bom (data + prev, &in_encode)) {
-- prev += 2; /* skip BOM */
-- }
- /* There were 2 or more non-null chars left, convert those too */
-- parse_insert_string_field (in_encode, data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
- break;
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index 88a6c92..51ed562 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -91,3 +91,23 @@ lib/gstreamer-%%VERSION%%/libgstwavparse.so
lib/gstreamer-%%VERSION%%/libgstximagesrc.a
lib/gstreamer-%%VERSION%%/libgstximagesrc.la
lib/gstreamer-%%VERSION%%/libgstximagesrc.so
+share/locale/af/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index 0d36fc9..6c8c2ea 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.5 2006/06/08 01:14:31 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.8 2006/09/14 21:20:43 ahze Exp $
#
PORTREVISION= 2
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= ugly
-UGLY_GST_DIRS= gst
+gst_ugly_DIST= ugly
+UGLY_GST_DIRS= gst po gst-libs
PLIST_SUB= VERSION="${GST_VERSION}"
NO_GSTREAMER_COMMON= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
index 40aadb6..5c14161 100644
--- a/multimedia/gstreamer-plugins-ugly/pkg-plist
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -19,3 +19,23 @@ lib/gstreamer-%%VERSION%%/libgstmpegstream.so
lib/gstreamer-%%VERSION%%/libgstrmdemux.a
lib/gstreamer-%%VERSION%%/libgstrmdemux.la
lib/gstreamer-%%VERSION%%/libgstrmdemux.so
+share/locale/af/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 17e1666..b3ab71d 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,13 +3,13 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.86 2006/06/09 18:13:48 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.100 2006/09/14 21:02:22 ahze Exp $
#
PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
PORTREVISION?= 0
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
@@ -24,20 +24,21 @@ PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX}
MAINTAINER= multimedia@FreeBSD.org
COMMENT?= GStreamer written collection of plugins handling several media types
+BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
popt.0:${PORTSDIR}/devel/popt \
oil-0.3.1:${PORTSDIR}/devel/liboil
-BASE_PORTVERSION= 0.10.9
+BASE_PORTVERSION= 0.10.10
BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
BAD_PORTVERSION= 0.10.3
BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION}
BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION= 0.10.3
+GOOD_PORTVERSION= 0.10.4
GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION}
GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION= 0.10.3
+UGLY_PORTVERSION= 0.10.4
UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?= good
@@ -46,7 +47,6 @@ SHLIB_VERSION= 1
USE_GETTEXT= yes
VERSION= ${GST_VERSION}
WANT_GSTREAMER= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack
@@ -67,9 +67,9 @@ IGNORE= many plugins don't build or even work on 4.x
.endif
.if ${GST_PLUGIN} == "base"
-DIST= base
+gst_base_DIST= base
NO_GSTREAMER_COMMON= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= gst-visualise-0.10.1
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
@@ -79,6 +79,34 @@ USE_GSTREAMER= yes
.include "${MASTERDIR}/Makefile.common"
+.if ${DIST}=="base"
+EXTRACT_ONLY=${BASE_DISTFILE}
+WRKSRC=${WRKDIR}/${BASE_DISTNAME}
+PORTVERSION= ${BASE_PORTVERSION}
+DISTFILES+= ${BASE_DISTFILE}:base
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins/files
+.elif ${DIST}=="bad"
+EXTRACT_ONLY=${BAD_DISTFILE}
+WRKSRC=${WRKDIR}/${BAD_DISTNAME}
+PORTVERSION= ${BAD_PORTVERSION}
+DISTFILES+= ${BAD_DISTFILE}:bad
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files
+.elif ${DIST}=="ugly"
+EXTRACT_ONLY=${UGLY_DISTFILE}
+WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
+PORTVERSION= ${UGLY_PORTVERSION}
+DISTFILES+= ${UGLY_DISTFILE}:ugly
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files
+.elif ${DIST}=="makesum"
+DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
+ ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
+.else
+EXTRACT_ONLY=${GOOD_DISTFILE}
+WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
+PORTVERSION= ${GOOD_PORTVERSION}
+DISTFILES+= ${GOOD_DISTFILE}:good
+.endif
+
# cdrom default device
.ifdef(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
@@ -102,23 +130,23 @@ DEFAULT_DVD_DEVICE=/dev/acd0
.endif
post-patch:
+ @${FIND} ${WRKSRC}/ext -name Makefile.in | \
+ ${XARGS} -n 10 ${REINPLACE_CMD} -e \
+ 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|; \
s|stdint\.h|inttypes.h|; \
s|%%VERSION%%|${VERSION}|'
- @${FIND} ${WRKSRC}/ext -name Makefile.in | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${FIND} ${WRKSRC}/ext -name Makefile.in | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
+ 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
${WRKSRC}/configure
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d2973c0..0e8d970 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.47 2006/06/08 20:53:40 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.63 2006/09/29 23:22:28 ahze Exp $
# base
BASE_GST_ALL_PLUGINS= \
alsa \
@@ -89,339 +89,271 @@ CONFIGURE_ARGS+=--disable-tests \
--disable-tarkin \
--enable-static \
--disable-sunaudio \
- --disable-gst_v4l \
- --disable-gst_v4l2 \
--disable-xine \
--enable-x \
--enable-xshm \
--enable-xvideo
-# spc is broken a the moment
-#.if (${ARCH} == "i386")
-#BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
-#CONFIGURE_ARGS+=--enable-spc
-#PLIST_SUB+= SPC=""
-#.else
-CONFIGURE_ARGS+=--disable-spc
-PLIST_SUB+= SPC="@comment "
-#.endif
-
.if !defined(NO_GSTREAMER_COMMON)
GST_PLUGIN_SUFFIX?= -${GST_PLUGIN}
-COMMENT= Gstreamer ${GST_PLUGIN} plugin
-
# Enable the right plugin
CONFIGURE_ARGS:=${CONFIGURE_ARGS:S|--disable-${GST_PLUGIN}|--enable-${GST_PLUGIN}|}
-# Build/Install directory. defaults to ext/${GST_PLUGIN}
-# few plugins are in sys/
-GST_PLUGIN_DIR?= ext/${GST_PLUGIN}
-
-#
GST_LIB_DIR= lib/gstreamer-${VERSION}
# Auto create PLIST
PLIST= ${NONEXISTENT}
-PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
# a52dec
-.if ${GST_PLUGIN}=="a52dec"
-LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
-DIST= ugly
-.endif
+gst_a52dec_LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
+gst_a52dec_DIST= ugly
# aalib
-.if ${GST_PLUGIN}=="aalib"
-LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
+gst_aalib_LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
+gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
${GST_LIB_DIR}/libgstaasink.a \
${GST_LIB_DIR}/libgstaasink.la
-.endif
+
+# annodex
+
+# bz2
+gst_bz2_DIST= bad
# cairo
-.if ${GST_PLUGIN}=="cairo"
-LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
-.endif
+gst_cairo_LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
# cdparanoia
-.if ${GST_PLUGIN}=="cdparanoia"
-LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-EXTRA_LIBS+= -lgstcdda-${VERSION}
-DIST= base
-.endif
+gst_cdparanoia_LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_EXTRA_LIBS+= -lgstcdda-${VERSION}
+gst_cdparanoia_DIST= base
# dts
-.if ${GST_PLUGIN}=="dts"
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
-PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \
+gst_dts_BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \
${GST_LIB_DIR}/libgstdtsdec.la \
${GST_LIB_DIR}/libgstdtsdec.so
-DIST= bad
-.endif
+gst_dts_DIST= bad
# dv
-.if ${GST_PLUGIN}=="dv"
-LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-.endif
+gst_dv_LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-.if ${GST_PLUGIN}=="dvd"
-EXTRA_LIBS+= -ldvdnav
-LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
-GST_PLUGIN_DIR= ext/dvdnav \
+# dvd
+gst_dvd_EXTRA_LIBS+= -ldvdnav
+gst_dvd_LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
+gst_dvd_GST_PLUGIN_DIR= ext/dvdnav \
ext/dvdread
-PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnav.a \
+gst_dvd_PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnav.a \
${GST_LIB_DIR}/libgstdvdnav.la \
${GST_LIB_DIR}/libgstdvdnav.so \
${GST_LIB_DIR}/libgstdvdread.a \
${GST_LIB_DIR}/libgstdvdread.la \
${GST_LIB_DIR}/libgstdvdread.so
-DIST= ugly
-.endif
+gst_dvd_DIST= ugly
# esound
-.if ${GST_PLUGIN}=="esound"
-USE_GNOME+= esound
-GST_PLUGIN_DIR= ext/esd
-CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
+gst_esound_USE_GNOME+= esound
+gst_esound_GST_PLUGIN_DIR= ext/esd
+gst_esound_CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
ESD_LIBS="`pkg-config --libs esound`"
-PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
+gst_esound_PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
${GST_LIB_DIR}/libgstesd.a \
${GST_LIB_DIR}/libgstesd.la
-.endif
# faac
-.if ${GST_PLUGIN}=="faac"
-LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
-DIST= bad
-.endif
+gst_faac_LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
+gst_faac_DIST= bad
# faad
-.if ${GST_PLUGIN}=="faad"
-LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
-DIST= bad
-.endif
+gst_faad_LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
+gst_faad_DIST= bad
# flac
-.if ${GST_PLUGIN}=="flac"
-LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
-.endif
+gst_flac_LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
# gconf
-.if ${GST_PLUGIN}=="gconf"
-USE_GNOME+= gconf2
-GST_PLUGIN_DIR= ext/gconf \
+gst_gconf_USE_GNOME+= gnomeprefix gconf2
+gst_gconf_GST_PLUGIN_DIR= ext/gconf \
gconf
-GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas
-PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \
+gst_gconf_CONFIGURE_ARGS+= --enable-schemas-install
+gst_gconf_GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas
+gst_gconf_PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \
${GST_LIB_DIR}/libgstgconfelements.a \
${GST_LIB_DIR}/libgstgconfelements.la
-.endif
# gnomevfs
-.if ${GST_PLUGIN}=="gnomevfs"
-USE_GNOME+= gnomevfs2
-CONFIGURE_ARGS+=--enable-gnome_vfs
-DIST= base
-.endif
+gst_gnomevfs_USE_GNOME+= gnomevfs2
+gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs
+gst_gnomevfs_DIST= base
# gsm
-.if ${GST_PLUGIN}=="gsm"
-LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
-DIST= bad
-.endif
+gst_gsm_LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
+gst_gsm_DIST= bad
# ivorbis
-.if ${GST_PLUGIN}=="ivorbis"
-LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
-DIST= bad
-.endif
+gst_ivorbis_LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
+gst_ivorbis_DIST= bad
# hal
-.if ${GST_PLUGIN}=="hal"
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.a \
+gst_hal_LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+gst_hal_PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.a \
${GST_LIB_DIR}/libgsthalelements.la \
${GST_LIB_DIR}/libgsthalelements.so
-.endif
-
# jpeg
-.if ${GST_PLUGIN}=="jpeg"
-LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-.endif
+gst_jpeg_LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
# ladspa
-.if ${GST_PLUGIN}=="ladspa"
-BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-.endif
+gst_ladspa_BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
# lame
-.if ${GST_PLUGIN}=="lame"
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-DIST= ugly
-.endif
+gst_lame_LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
+gst_lame_DIST= ugly
# libcaca
-.if ${GST_PLUGIN}=="libcaca"
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
+gst_libcaca_BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
${GST_LIB_DIR}/libgstcacasink.a \
${GST_LIB_DIR}/libgstcacasink.la
-.endif
# libmms
-.if ${GST_PLUGIN}=="libmms"
-LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
-PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
+gst_libmms_LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
+gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
${GST_LIB_DIR}/libgstmms.a \
${GST_LIB_DIR}/libgstmms.la
-DIST= bad
-.endif
+gst_libmms_DIST= bad
# libpng and the snapshot plugin
-.if ${GST_PLUGIN}=="libpng"
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
-GST_PLUGIN_DIR= ext/libpng
-PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
+gst_libpng_LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
+gst_libpng_GST_PLUGIN_DIR= ext/libpng
+gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
${GST_LIB_DIR}/libgstpng.a \
${GST_LIB_DIR}/libgstpng.la
-.endif
# libvisual
-.if ${GST_PLUGIN}=="libvisual"
-LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
-DIST= base
-.endif
+gst_libvisual_LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
+gst_libvisual_DIST= base
# mad
-.if ${GST_PLUGIN}=="mad"
-LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
+gst_mad_LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
id3tag.0:${PORTSDIR}/audio/libid3tag
-DIST= ugly
-.endif
+gst_mad_DIST= ugly
# mpeg2dec
-.if ${GST_PLUGIN}=="mpeg2dec"
-LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-DIST= ugly
-.endif
+gst_mpeg2dec_LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_DIST= ugly
# musepack
-.if ${GST_PLUGIN}=="musepack"
-LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
-DIST= bad
-.endif
+gst_musepack_LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
+gst_musepack_DIST= bad
# musicbrainz
-.if ${GST_PLUGIN}=="musicbrainz"
-LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_FILES= ${GST_LIB_DIR}/libgsttrm.so \
+gst_musicbrainz_LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+gst_musicbrainz_PLIST_FILES= ${GST_LIB_DIR}/libgsttrm.so \
${GST_LIB_DIR}/libgsttrm.a \
${GST_LIB_DIR}/libgsttrm.la
-DIST= bad
-.endif
+gst_musicbrainz_DIST= bad
+
+# neon
+gst_neon_LIB_DEPENDS+= neon.25:${PORTSDIR}/www/neon
+gst_neon_CONFIGURE_ENV+= NEON_CFLAGS="-I${LOCALBASE}/include/neon"
+gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.a \
+ ${GST_LIB_DIR}/libgstneonhttpsrc.la \
+ ${GST_LIB_DIR}/libgstneonhttpsrc.so
+gst_neon_DIST= bad
# ogg
-.if ${GST_PLUGIN}=="ogg"
-LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
-EXTRA_LIBS+= -lgstriff-${VERSION}
-DIST= base
-.endif
+gst_ogg_LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
+gst_ogg_EXTRA_LIBS+= -lgstriff-${VERSION}
+gst_ogg_DIST= base
# pango
-.if ${GST_PLUGIN}=="pango"
-USE_GNOME+= pango
-DIST= base
-.endif
+gst_pango_USE_GNOME+= pango
+gst_pango_DIST= base
# sdl
-.if ${GST_PLUGIN}=="sdl"
-USE_SDL+= sdl
-GST_PLIST_SUFFIX= videosink
-DIST= bad
-.endif
+gst_sdl_USE_SDL+= sdl
+gst_sdl_PLIST_FILES= ${GST_LIB_DIR}/libgstsdlvideosink.a \
+ ${GST_LIB_DIR}/libgstsdlvideosink.la \
+ ${GST_LIB_DIR}/libgstsdlvideosink.so
+gst_sdl_GST_PLIST_SUFFIX= videosink
+gst_sdl_DIST= bad
# shout2
-.if ${GST_PLUGIN}=="shout2"
-LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
-.endif
+gst_shout2_LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
# sidplay
-.if ${GST_PLUGIN}=="sidplay"
-LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
-PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
+gst_sidplay_LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
+gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
${GST_LIB_DIR}/libgstsid.a \
${GST_LIB_DIR}/libgstsid.la
-DIST= ugly
-.endif
+gst_sidplay_DIST= ugly
# speex
-.if ${GST_PLUGIN}=="speex"
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
-.endif
+gst_speex_LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
# theora
-.if ${GST_PLUGIN}=="theora"
-LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
-DIST= base
-.endif
+gst_theora_LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
+gst_theora_DIST= base
# vorbis
-.if ${GST_PLUGIN}=="vorbis"
-USE_GSTREAMER+= ogg
-LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION}
-DIST= base
-.endif
+gst_vorbis_USE_GSTREAMER+= ogg
+gst_vorbis_LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
+gst_vorbis_EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION}
+gst_vorbis_DIST= base
# xvid
-.if ${GST_PLUGIN}=="xvid"
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-DIST= bad
-.endif
+gst_xvid_LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
+gst_xvid_DIST= bad
# wavpack
-.if ${GST_PLUGIN}=="wavpack"
-LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
-DIST= bad
-.endif
+gst_wavpack_LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
+gst_wavpack_DIST= bad
+
.endif # NO_GSTREAMER_COMMON
-.if ${DIST}=="base"
-EXTRACT_ONLY=${BASE_DISTFILE}
-WRKSRC=${WRKDIR}/${BASE_DISTNAME}
-PORTVERSION= ${BASE_PORTVERSION}
-DISTFILES+= ${BASE_DISTFILE}:base
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins/files
-.elif ${DIST}=="bad"
-EXTRACT_ONLY=${BAD_DISTFILE}
-WRKSRC=${WRKDIR}/${BAD_DISTNAME}
-PORTVERSION= ${BAD_PORTVERSION}
-DISTFILES+= ${BAD_DISTFILE}:bad
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files
-.elif ${DIST}=="ugly"
-EXTRACT_ONLY=${UGLY_DISTFILE}
-WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
-PORTVERSION= ${UGLY_PORTVERSION}
-DISTFILES+= ${UGLY_DISTFILE}:ugly
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files
-.elif ${DIST}=="makesum"
-DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
- ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
-.else
-EXTRACT_ONLY=${GOOD_DISTFILE}
-WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
-PORTVERSION= ${GOOD_PORTVERSION}
-DISTFILES+= ${GOOD_DISTFILE}:good
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-good/files
-.endif
+gst_${GST_PLUGIN}_DIST?= good
+DIST= ${gst_${GST_PLUGIN}_DIST}
.if !defined(NO_GSTREAMER_COMMON)
+gst_${GST_PLUGIN}_BUILD_DEPENDS?=
+gst_${GST_PLUGIN}_LIB_DEPENDS?=
+gst_${GST_PLUGIN}_RUN_DEPENDS?=
+gst_${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
+gst_${GST_PLUGIN}_EXTRA_LIBS?=
+gst_${GST_PLUGIN}_PREBUILD_DIR?=
+gst_${GST_PLUGIN}_GST_PLUGIN_DIR?= ext/${GST_PLUGIN}
+gst_${GST_PLUGIN}_POSTBUILD_DIR?=
+gst_${GST_PLUGIN}_USE_GNOME?=
+gst_${GST_PLUGIN}_CONFIGURE_ENV?=
+gst_${GST_PLUGIN}_GCONF_SCHEMAS?=
+gst_${GST_PLUGIN}_CONFIGURE_ARGS?=
+gst_${GST_PLUGIN}_USE_SDL?=
+gst_${GST_PLUGIN}_USE_GSTREAMER?=
+
+BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS}
+LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS}
+RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS}
+PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES}
+EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS}
+USE_GNOME+= ${gst_${GST_PLUGIN}_USE_GNOME}
+CONFIGURE_ENV+= ${gst_${GST_PLUGIN}_CONFIGURE_ENV}
+.if ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}!=""
+GCONF_SCHEMAS= ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}
+.endif
+CONFIGURE_ARGS+=${gst_${GST_PLUGIN}_CONFIGURE_ARGS}
+.if ${gst_${GST_PLUGIN}_USE_SDL}!=""
+USE_SDL= ${gst_${GST_PLUGIN}_USE_SDL}
+.endif
+USE_GSTREAMER+= ${gst_${GST_PLUGIN}_USE_GSTREAMER}
+GST_PREBUILD_DIR=${gst_${GST_PLUGIN}_GST_PREBUILD_DIR}
+GST_PLUGIN_DIR= ${gst_${GST_PLUGIN}_GST_PLUGIN_DIR}
+GST_POSTBUILD_DIR=${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR}
+
.if !target(do-build)
do-build:
.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 6d4db1b..165d6d0 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,12 +1,12 @@
-MD5 (gst-plugins-base-0.10.9.tar.bz2) = cf0aa58f066c3a0e0258909b3ad9d4ad
-SHA256 (gst-plugins-base-0.10.9.tar.bz2) = 81906ea7471212bc376d509a843f113913618c2c93e352a0b5d890f69e1d35f7
-SIZE (gst-plugins-base-0.10.9.tar.bz2) = 1261167
+MD5 (gst-plugins-base-0.10.10.tar.bz2) = 7a51a3fabebe5f77235926ad65ba9593
+SHA256 (gst-plugins-base-0.10.10.tar.bz2) = 2246a5921ad060e86acd81cabec17a5022d1997849f950ac2c8f6f14f9291d3e
+SIZE (gst-plugins-base-0.10.10.tar.bz2) = 1333651
MD5 (gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
SHA256 (gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
SIZE (gst-plugins-bad-0.10.3.tar.bz2) = 953949
-MD5 (gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
-SHA256 (gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
-SIZE (gst-plugins-ugly-0.10.3.tar.bz2) = 605833
-MD5 (gst-plugins-good-0.10.3.tar.bz2) = a58bb825bd4b22412764f2a8d2f98b1c
-SHA256 (gst-plugins-good-0.10.3.tar.bz2) = 8c09374656aca4b8ffbe109a24dcdb98c5d519c4b05bf9eeeb3a34f16b26eaf5
-SIZE (gst-plugins-good-0.10.3.tar.bz2) = 1165391
+MD5 (gst-plugins-ugly-0.10.4.tar.bz2) = c10f40e3641d827ca7853b0a3d560257
+SHA256 (gst-plugins-ugly-0.10.4.tar.bz2) = 4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
+SIZE (gst-plugins-ugly-0.10.4.tar.bz2) = 720893
+MD5 (gst-plugins-good-0.10.4.tar.bz2) = e189496e7987898823d28d26b79f63dc
+SHA256 (gst-plugins-good-0.10.4.tar.bz2) = f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b
+SIZE (gst-plugins-good-0.10.4.tar.bz2) = 1225739
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index f4720a0..a732d89 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -56,6 +56,9 @@ lib/gstreamer-%%VERSION%%/libgstdecodebin.so
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.a
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.la
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstgdp.a
+lib/gstreamer-%%VERSION%%/libgstgdp.la
+lib/gstreamer-%%VERSION%%/libgstgdp.so
lib/gstreamer-%%VERSION%%/libgstplaybin.a
lib/gstreamer-%%VERSION%%/libgstplaybin.la
lib/gstreamer-%%VERSION%%/libgstplaybin.so
@@ -68,6 +71,9 @@ lib/gstreamer-%%VERSION%%/libgsttcp.so
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.a
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.a
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.la
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.so
lib/gstreamer-%%VERSION%%/libgstvideorate.a
lib/gstreamer-%%VERSION%%/libgstvideorate.la
lib/gstreamer-%%VERSION%%/libgstvideorate.so
@@ -142,3 +148,9 @@ share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
@dirrm include/gstreamer-%%VERSION%%/gst/cdda
@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 69ecd08..6d7c74b 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -3,12 +3,13 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins80/Makefile,v 1.60 2006/04/23 22:55:30 mezz Exp $
+# $MCom: ports/multimedia/gstreamer-plugins80/Makefile,v 1.63 2006/09/10 00:52:59 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.8.12
-PORTREVISION?= 3
+PORTREVISION?= 2
+PORTEPOCH= 1
CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://gstreamer.freedesktop.org/src/gst-plugins/
@@ -27,7 +28,7 @@ SHLIB_VERSION= 1
VERSION= 0.8
WANT_GSTREAMER= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -52,7 +53,7 @@ WITHOUT_CPU_CFLAGS= yes
.if ${GST_PLUGIN} == "base"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
@@ -158,7 +159,7 @@ post-install:
. endfor
.endif
# register plugins
- -@${X11BASE}/bin/gst-register-${VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 49e3569..16f212d 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins80/Makefile.common,v 1.33 2006/07/17 05:15:45 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins80/Makefile.common,v 1.35 2006/10/07 19:23:51 ahze Exp $
GST_ALL_PLUGINS= \
a52dec \
aalib \
@@ -259,9 +259,6 @@ PLIST_FILES= ${GST_LIB_DIR}/libgstcddasrc.so \
# libvisual
.if ${GST_PLUGIN}=="libvisual"
LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
-.if ${OSVERSION} < 500000
-IGNORE= Does not build
-.endif
.endif
# musepack
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c b/multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c
index 4d994dd..4d994dd 100644
--- a/multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index f13b40e..c6f619f 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -398,3 +398,11 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
@dirrmtry include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index cf351a2..0ced973 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,21 +3,21 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer/Makefile,v 1.45 2006/04/28 11:44:33 ahze Exp $
+# $MCom: ports/multimedia/gstreamer/Makefile,v 1.52 2006/09/14 20:51:42 ahze Exp $
PORTNAME= gstreamer
-PORTVERSION= 0.10.9
+PORTVERSION= 0.10.10
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \
- ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ahze
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Development framework for creating media applications
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -33,7 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
ac_cv_func_register_printf_function="no"
PLIST_SUB= VERSION="${GST_VERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GST_VERSION= 0.10
MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index bda9d10..1fb90fc 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gstreamer-0.10.9.tar.bz2) = e59aaced7000ddfdaa81c52b9a238786
-SHA256 (gstreamer-0.10.9.tar.bz2) = 370e7cef8206522a4a8a80a05e935d6627c7381867e533b872f917d031a47e67
-SIZE (gstreamer-0.10.9.tar.bz2) = 1719970
+MD5 (gstreamer-0.10.10.tar.bz2) = 6875bf0bd3cf38b9ae1362b9e644e6fc
+SHA256 (gstreamer-0.10.10.tar.bz2) = d31981baee6a59ea87086f3bec19d2ab3e14f2ea75e47e70e39ca8acf4e87e59
+SIZE (gstreamer-0.10.10.tar.bz2) = 1794450
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index caaa89e..d785bf3 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -132,3 +132,15 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@dirrm lib/gstreamer-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index 038b6dd..eefb8fa 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -3,12 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer80/Makefile,v 1.40 2006/04/23 22:58:42 mezz Exp $
+# $MCom: ports/multimedia/gstreamer80/Makefile,v 1.43 2006/09/10 00:53:00 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.8.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
@@ -21,7 +21,7 @@ COMMENT= Development framework for creating media applications
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -42,7 +42,7 @@ PLIST_SUB= \
VERSION="${GST_VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}" \
PORTVERSION="${PORTVERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 638edaee..ba4ae6a 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -153,3 +153,13 @@ share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 5318740..d27f928 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -3,11 +3,12 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
+# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.13 2006/10/05 19:34:49 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.10.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia python gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 40960c2..6887c37 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia python gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ \
${MASTER_SITE_LOCAL}
diff --git a/multimedia/py-gstreamer80/files/patch-gst_arg-types.py b/multimedia/py-gstreamer80/files/patch-gst_arg-types.py
new file mode 100644
index 0000000..4711c7d
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_arg-types.py
@@ -0,0 +1,11 @@
+--- gst/arg-types.py.orig Fri Oct 13 12:08:08 2006
++++ gst/arg-types.py Fri Oct 13 12:16:20 2006
+@@ -49,6 +49,8 @@ class GstDataPtrArg(ArgType):
+ info.add_parselist('O', ['&py_' + pname], [pname])
+ info.arglist.append(pname)
+ info.codebefore.append(self.normal % {'name': pname})
++ def write_return(self, ptype, ownsreturn, info):
++ return
+
+ class XmlNodeArg(ArgType):
+ """libxml2 node generator"""
diff --git a/multimedia/py-gstreamer80/files/patch-gst_gst.override b/multimedia/py-gstreamer80/files/patch-gst_gst.override
new file mode 100644
index 0000000..bf9073c
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_gst.override
@@ -0,0 +1,17 @@
+--- gst/gst.override.orig Fri Oct 13 12:03:56 2006
++++ gst/gst.override Fri Oct 13 12:03:42 2006
+@@ -570,14 +570,6 @@ _wrap_gst_type_find_factory_get_caps(PyG
+ return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
+ }
+ %%
+-override gst_type_find_factory_get_caps noargs
+-static PyObject *
+-_wrap_gst_type_find_factory_get_caps(PyGObject *self)
+-{
+- GstCaps *ret = (GstCaps*)gst_type_find_factory_get_caps(GST_TYPE_FIND_FACTORY(self->obj));
+- return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
+-}
+-%%
+ override-attr GError.domain
+ static PyObject *
+ _wrap_gst_g_error__get_domain(PyGObject *self, void *closure)
diff --git a/multimedia/py-gstreamer80/files/patch-gst_gstpad.override b/multimedia/py-gstreamer80/files/patch-gst_gstpad.override
new file mode 100644
index 0000000..9ab49dc
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_gstpad.override
@@ -0,0 +1,24 @@
+--- gst/gstpad.override.orig Wed May 4 06:59:39 2005
++++ gst/gstpad.override Fri Oct 13 12:40:22 2006
+@@ -443,16 +443,15 @@ _wrap_gst_pad_link_filtered(PyGObject *s
+ }
+
+ %%
+-override gst_pad_get_negotiated_caps
++override gst_pad_pull noargs
+ static PyObject *
+-_wrap_gst_pad_get_negotiated_caps(PyGObject *self)
++_wrap_gst_pad_pull(PyGObject *self)
+ {
+- const GstCaps *ret;
++ GstData *ret = (GstData*)gst_pad_pull(GST_PAD(self->obj));
+
+- ret = gst_pad_get_negotiated_caps(GST_PAD(self->obj));
+- /* pyg_boxed_new handles NULL checking */
+- return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
++ return pyg_boxed_new(GST_TYPE_DATA, ret, TRUE, TRUE);
+ }
++
+ %%
+ override gst_pad_get_negotiated_caps noargs
+ static PyObject *
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index e21f473..b4d52e8 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,29 +6,30 @@
#
PORTNAME= totem
-PORTVERSION= 1.4.5
+PORTVERSION= 2.16.2
CATEGORIES= multimedia gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER?= hendrik@scholz.net
COMMENT?= A Xine-based video player for the Gnome 2 Desktop
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz
+LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
+ hal.1:${PORTSDIR}/sysutils/hal
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
- nautiluscdburner
+ nautiluscdburner ltverhack
GNOME_DESKTOP_VERSION=2
WANT_GSTREAMER= yes
+INSTALLS_ICONS= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
INSTALLS_OMF= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -46,19 +47,27 @@ CONFLICTS?= totem-gstreamer-[0-9]*
.include <bsd.port.pre.mk>
.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO= firefox mozilla seamonkey
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
PLIST_SUB+= MOZILLA=""
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=--with-mozilla=${GECKO}
+CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
+ --enable-gmp-plugin \
+ --enable-complex-plugin \
+ --enable-narrowspace-plugin
.else
PLIST_SUB+= MOZILLA="@comment "
-CONFIGURE_ARGS+=--disable-mozilla
+CONFIGURE_ARGS+=--without-mozilla \
+ --disable-browser-plugins \
+ --disable-mozilla \
+ --disable-basic-plugin \
+ --disable-gmp-plugin \
+ --disable-complex-plugin \
+ --disable-narrowspace-plugin
.endif
.if defined(WITH_GSTREAMER)
-CONFIGURE_ARGS+=--enable-gstreamer=0.10
-USE_GSTREAMER+= gnomevfs core gconf
+CONFIGURE_ARGS+=--enable-gstreamer=yes
+USE_GSTREAMER+= gnomevfs core gconf hal good
WITHOUT_DVDNAV= yes
PLIST_SUB+= GSTREAMER=""
.else
@@ -70,16 +79,6 @@ PLIST_SUB+= GSTREAMER="@comment "
LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
.endif
-.if defined(WITH_CDROM_DEVICE)
-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
-.else
-.if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
-DEFAULT_CDROM_DEVICE=/dev/acd0
-.endif
-.endif
-
.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
@@ -91,29 +90,18 @@ DEFAULT_DVD_DEVICE=/dev/acd0
.endif
pre-everything::
- @${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
- @${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
- @${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
- @${ECHO_MSG} "===>"
@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
post-patch:
@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-.if defined(WITH_MOZILLA_PLUGIN)
- @${ECHO} "" >> ${PKGMESSAGE}
- @${CAT} ${FILESDIR}/pkg-message-mozilla.in >> ${PKGMESSAGE}
-.endif
- @${REINPLACE_CMD} -e 's|/plugins||; \
- s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|' \
- ${WRKSRC}/src/Makefile.in
- @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
- ${WRKSRC}/src/totem-preferences.c \
- ${WRKSRC}/src/backend/bacon-video-widget-gst.c
+ @${REINPLACE_CMD} -e ' s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|; \
+ s|mozilla/plugins|browser_plugins|' \
+ ${WRKSRC}/browser-plugin/Makefile.in \
+ ${WRKSRC}/browser-plugin/idl/Makefile.in
.if defined(WITH_GSTREAMER)
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
- ${WRKSRC}/src/backend/bacon-video-widget-gst.c \
${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
.endif
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index e966b00..7530eb6 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-1.4.5.tar.bz2) = 215861d6276b77ac4ad871abb18aa10c
-SHA256 (gnome2/totem-1.4.5.tar.bz2) = 9c6440b8fd1c4f8b1668c6a0f2946db06e641456e8b86b612275784eaccc5be1
-SIZE (gnome2/totem-1.4.5.tar.bz2) = 1720059
+MD5 (gnome2/totem-2.16.2.tar.bz2) = 6e98e3bc2b8531611906bd2bca73f743
+SHA256 (gnome2/totem-2.16.2.tar.bz2) = 7f088dc3630d040b44a5ddb84d07baae6fb5593d6fa6fd25b86bd9c46e82101d
+SIZE (gnome2/totem-2.16.2.tar.bz2) = 1831393
diff --git a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
new file mode 100644
index 0000000..9a16349
--- /dev/null
+++ b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
@@ -0,0 +1,10 @@
+--- browser-plugin/totemPlugin.cpp.orig Mon Aug 14 17:01:14 2006
++++ browser-plugin/totemPlugin.cpp Mon Aug 14 17:01:24 2006
+@@ -27,6 +27,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <string.h>
diff --git a/multimedia/totem/files/patch-src_totem-disk.c b/multimedia/totem/files/patch-src_totem-disk.c
deleted file mode 100644
index 6b6ef56..0000000
--- a/multimedia/totem/files/patch-src_totem-disk.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/plparse/totem-disc.c.orig Thu Nov 24 16:53:02 2005
-+++ src/plparse/totem-disc.c Sun Dec 18 13:34:12 2005
-@@ -43,7 +43,29 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/cdio.h>
-+#include <sys/disklabel.h>
-+
-+#define CDROM_DRIVE_STATUS 0x5326
-+#define CDROM_DISC_STATUS 0x5327
-+#define CDS_AUDIO 100
-+#define CDS_MIXED 105
-+#define CDS_DATA_1 101
-+#define CDS_DATA_2 102
-+#define CDS_NO_INFO 0 /* if not implemented */
-+#define CDS_NO_DISC 1
-+#define CDS_TRAY_OPEN 2
-+#define CDS_DRIVE_NOT_READY 3
-+#define CDS_DISC_OK 4
-+#define CDS_XA_2_1 103
-+#define CDS_XA_2_2 104
-+#define CDC_DVD 0x8000
-+#define ENOMEDIUM ENODEV
-+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-+#else
- #include <linux/cdrom.h>
-+#endif
-
- #include "totem-disc.h"
-
diff --git a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp b/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
deleted file mode 100644
index 2c34077..0000000
--- a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/totem-mozilla-plugin.cpp.orig Tue Nov 8 21:50:10 2005
-+++ src/totem-mozilla-plugin.cpp Tue Nov 8 21:50:27 2005
-@@ -27,6 +27,7 @@
- #include <stdint.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <signal.h>
- #include <sys/wait.h>
- #include <string.h>
-
diff --git a/multimedia/totem/files/pkg-message-mozilla.in b/multimedia/totem/files/pkg-message-mozilla.in
deleted file mode 100644
index ddbbe4e..0000000
--- a/multimedia/totem/files/pkg-message-mozilla.in
+++ /dev/null
@@ -1,8 +0,0 @@
-**************************************************************************
-The totem mozilla plugin requires a D-BUS-enabled desktop session. Consult
-the FreeBSD GNOME FAQ for instructions on setting up your desktop session
-through D-BUS:
-
- http://www.freebsd.org/gnome/docs/faq2.html#q25
-
-**************************************************************************
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index a9174c8..47b223c 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -4,14 +4,30 @@ include/totem/1/plparser/totem-disc.h
include/totem/1/plparser/totem-pl-parser-builtins.h
include/totem/1/plparser/totem-pl-parser-features.h
include/totem/1/plparser/totem-pl-parser.h
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.a
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.la
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.so
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
lib/libtotem-plparser.a
lib/libtotem-plparser.la
lib/libtotem-plparser.so
-lib/libtotem-plparser.so.2
+lib/libtotem-plparser.so.1
lib/nautilus/extensions-1.0/libtotem-properties-page.a
lib/nautilus/extensions-1.0/libtotem-properties-page.la
lib/nautilus/extensions-1.0/libtotem-properties-page.so
@@ -82,12 +98,16 @@ share/gnome/omf/totem/totem-es.omf
share/gnome/omf/totem/totem-fr.omf
share/gnome/omf/totem/totem-ru.omf
share/gnome/omf/totem/totem-uk.omf
-share/gnome/pixmaps/media-player-48.png
share/gnome/pixmaps/vanity.png
+%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIMullYPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html
share/gnome/totem/filmholes-big-left.png
share/gnome/totem/filmholes-big-right.png
share/gnome/totem/filmholes.png
-share/gnome/totem/media-player-48.png
share/gnome/totem/mozilla-viewer.glade
share/gnome/totem/playlist-playing.png
share/gnome/totem/playlist.glade
@@ -107,18 +127,25 @@ share/gnome/totem/totem_logo.png
share/gnome/totem/uri.glade
share/gnome/totem/vanity.glade
share/gnome/totem/vanity.png
+share/icons/hicolor/16x16/apps/totem.png
+share/icons/hicolor/22x22/apps/totem.png
+share/icons/hicolor/24x24/apps/totem.png
+share/icons/hicolor/32x32/apps/totem.png
+share/icons/hicolor/scalable/apps/totem.svg
share/locale/am/LC_MESSAGES/totem.mo
share/locale/ar/LC_MESSAGES/totem.mo
share/locale/az/LC_MESSAGES/totem.mo
share/locale/be/LC_MESSAGES/totem.mo
share/locale/bg/LC_MESSAGES/totem.mo
share/locale/bn/LC_MESSAGES/totem.mo
+share/locale/bn_IN/LC_MESSAGES/totem.mo
share/locale/br/LC_MESSAGES/totem.mo
share/locale/ca/LC_MESSAGES/totem.mo
share/locale/cs/LC_MESSAGES/totem.mo
share/locale/cy/LC_MESSAGES/totem.mo
share/locale/da/LC_MESSAGES/totem.mo
share/locale/de/LC_MESSAGES/totem.mo
+share/locale/dz/LC_MESSAGES/totem.mo
share/locale/el/LC_MESSAGES/totem.mo
share/locale/en_CA/LC_MESSAGES/totem.mo
share/locale/en_GB/LC_MESSAGES/totem.mo
@@ -139,19 +166,21 @@ share/locale/id/LC_MESSAGES/totem.mo
share/locale/is/LC_MESSAGES/totem.mo
share/locale/it/LC_MESSAGES/totem.mo
share/locale/ja/LC_MESSAGES/totem.mo
-share/locale/ka/LC_MESSAGES/totem.mo
share/locale/ko/LC_MESSAGES/totem.mo
share/locale/ku/LC_MESSAGES/totem.mo
share/locale/lt/LC_MESSAGES/totem.mo
share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/ka/LC_MESSAGES/totem.mo
share/locale/mg/LC_MESSAGES/totem.mo
share/locale/mk/LC_MESSAGES/totem.mo
share/locale/ml/LC_MESSAGES/totem.mo
+share/locale/mr/LC_MESSAGES/totem.mo
share/locale/ms/LC_MESSAGES/totem.mo
share/locale/nb/LC_MESSAGES/totem.mo
share/locale/ne/LC_MESSAGES/totem.mo
share/locale/nl/LC_MESSAGES/totem.mo
share/locale/nn/LC_MESSAGES/totem.mo
+share/locale/or/LC_MESSAGES/totem.mo
share/locale/pa/LC_MESSAGES/totem.mo
share/locale/pl/LC_MESSAGES/totem.mo
share/locale/pt/LC_MESSAGES/totem.mo
@@ -160,10 +189,12 @@ share/locale/ro/LC_MESSAGES/totem.mo
share/locale/ru/LC_MESSAGES/totem.mo
share/locale/rw/LC_MESSAGES/totem.mo
share/locale/sk/LC_MESSAGES/totem.mo
+share/locale/sl/LC_MESSAGES/totem.mo
share/locale/sq/LC_MESSAGES/totem.mo
share/locale/sr/LC_MESSAGES/totem.mo
share/locale/sr@Latn/LC_MESSAGES/totem.mo
share/locale/sv/LC_MESSAGES/totem.mo
+share/locale/ta/LC_MESSAGES/totem.mo
share/locale/te/LC_MESSAGES/totem.mo
share/locale/th/LC_MESSAGES/totem.mo
share/locale/tr/LC_MESSAGES/totem.mo
@@ -175,10 +206,7 @@ share/locale/xh/LC_MESSAGES/totem.mo
share/locale/zh_CN/LC_MESSAGES/totem.mo
share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
+@dirrm share/gnome/totem/doc
@dirrm share/gnome/totem
@dirrm share/gnome/omf/totem
@dirrm share/gnome/help/totem/uk/figures
@@ -196,8 +224,65 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
@dirrm share/gnome/help/totem/C/figures
@dirrm share/gnome/help/totem/C
@dirrm share/gnome/help/totem
+@dirrmtry lib/browser_plugins
@dirrm include/totem/1/plparser
@dirrm include/totem/1
@dirrm include/totem
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
OpenPOWER on IntegriCloud