diff options
| author | marcus <marcus@FreeBSD.org> | 2008-03-24 11:52:36 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2008-03-24 11:52:36 +0800 |
| commit | 7f7d1cea729a5815af0f4db6edfc5ba0f62a57e3 (patch) | |
| tree | 862f96db414616c771eb64412d27d795591004f0 /multimedia | |
| parent | 6c3349d5db64bb9ea320c30d23ba353e2f013754 (diff) | |
| download | freebsd-ports-gnome-7f7d1cea729a5815af0f4db6edfc5ba0f62a57e3.tar.gz freebsd-ports-gnome-7f7d1cea729a5815af0f4db6edfc5ba0f62a57e3.tar.zst freebsd-ports-gnome-7f7d1cea729a5815af0f4db6edfc5ba0f62a57e3.zip | |
The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD. The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media. Work
is also underway to tie webkit more closely into GNOME. As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.
This release would not have been possible without the contributions and
testing efforts of the following people:
Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon
Diffstat (limited to 'multimedia')
61 files changed, 1265 insertions, 1354 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index 638f5a081671..92a32511163e 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -15,6 +15,7 @@ SUBDIR += bsdbktr_tvtune SUBDIR += camserv SUBDIR += castpodder + SUBDIR += cheese SUBDIR += clive SUBDIR += devede SUBDIR += dirac @@ -78,6 +79,7 @@ SUBDIR += gstreamer-plugins-ugly SUBDIR += gstreamer-plugins-x264 SUBDIR += gstreamer-plugins-xvid + SUBDIR += gstreamermm SUBDIR += gsubedit SUBDIR += gtksubtitler SUBDIR += gxanim @@ -215,11 +217,13 @@ SUBDIR += subtitleoffsetmodifier SUBDIR += subtitleripper SUBDIR += subtools + SUBDIR += swfdec-gnome SUBDIR += tcmplex-panteltje SUBDIR += tivodecode SUBDIR += tkxanim SUBDIR += tosvcd SUBDIR += totem + SUBDIR += totem-pl-parser SUBDIR += totem-xine SUBDIR += tovid SUBDIR += toxine diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 3e77335d2027..87663411f5a4 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.40.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://files.backtrace.info/releases/0.40/ @@ -25,7 +25,7 @@ LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexymm.2:${PORTSDIR}/x11-toolkits/libsexymm \ ofa.0:${PORTSDIR}/audio/libofa \ - soup-2.2.8:${PORTSDIR}/devel/libsoup + soup-2.2.8:${PORTSDIR}/devel/libsoup22 CONFLICTS= bmpx-devel-[0-9]* diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile new file mode 100644 index 000000000000..f50fa467a6fa --- /dev/null +++ b/multimedia/cheese/Makefile @@ -0,0 +1,46 @@ +# New ports collection makefile for: cheese +# Date created: 13 January 2008 +# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/cheese/Makefile,v 1.9 2008/03/10 21:10:13 mezz Exp $ +# + +PORTNAME= cheese +PORTVERSION= 2.22.0 +CATEGORIES= multimedia gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam + +USE_XORG= xxf86vm +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack evolutiondataserver \ + librsvg2 gnomedocutils +USE_GETTEXT= yes +USE_GSTREAMER= good +INSTALLS_OMF= yes +INSTALLS_ICONS= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +DOCS= AUTHORS COPYING ChangeLog NEWS README +GCONF_SCHEMAS= cheese.schemas + +post-patch: + @${REINPLACE_CMD} -e 's|[$$]GMSGFMT[$$]|$$MSGFMT$$|g' \ + ${WRKSRC}/configure + +.ifndef (NOPORTDOCS) +post-install: + @${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif + +.include <bsd.port.mk> diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo new file mode 100644 index 000000000000..eda11e9f23aa --- /dev/null +++ b/multimedia/cheese/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/cheese-2.22.0.tar.bz2) = 94aa1c9837d011c94e4c44d922cd4ea7 +SHA256 (gnome2/cheese-2.22.0.tar.bz2) = a406feaf742f42c8318a3442a25d6d4a6dc04bcbb6f3c20120417f4b43025223 +SIZE (gnome2/cheese-2.22.0.tar.bz2) = 1520881 diff --git a/multimedia/cheese/pkg-descr b/multimedia/cheese/pkg-descr new file mode 100644 index 000000000000..51402b10aa2e --- /dev/null +++ b/multimedia/cheese/pkg-descr @@ -0,0 +1,5 @@ +Cheese is a Photobooth-inspired GNOME application for taking pictures and +videos from a webcam. It also includes fancy graphical effects based on the +gstreamer-backend. + +WWW: http://www.gnome.org/projects/cheese/ diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist new file mode 100644 index 000000000000..f66210cc2734 --- /dev/null +++ b/multimedia/cheese/pkg-plist @@ -0,0 +1,134 @@ +bin/cheese +libexec/cheese/cheese-bugreport.sh +share/applications/cheese.desktop +%%DATADIR%%/cheese-ui.xml +%%DATADIR%%/cheese.ui +%%DATADIR%%/effects/Hulk.png +%%DATADIR%%/effects/Mauve.png +%%DATADIR%%/effects/NoirBlanc.png +%%DATADIR%%/effects/Saturation.png +%%DATADIR%%/effects/dicetv.png +%%DATADIR%%/effects/edgetv.png +%%DATADIR%%/effects/identity.png +%%DATADIR%%/effects/shagadelictv.png +%%DATADIR%%/effects/vertigotv.png +%%DATADIR%%/effects/videoflip_h.png +%%DATADIR%%/effects/videoflip_v.png +%%DATADIR%%/effects/warptv.png +%%DATADIR%%/pixmaps/camera-icon.svg +%%DATADIR%%/pixmaps/thumbnail-frame.png +%%DATADIR%%/sounds/shutter0.ogg +%%DATADIR%%/sounds/shutter1.ogg +%%DATADIR%%/sounds/shutter2.ogg +%%DATADIR%%/sounds/shutter3.ogg +%%DATADIR%%/sounds/shutter4.ogg +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +share/gnome/help/cheese/C/cheese.xml +share/gnome/help/cheese/C/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/C/figures/cheese-screenshot.jpg +share/gnome/help/cheese/C/legal.xml +share/gnome/help/cheese/es/cheese.xml +share/gnome/help/cheese/es/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/es/figures/cheese-screenshot.jpg +share/gnome/help/cheese/fr/cheese.xml +share/gnome/help/cheese/fr/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/fr/figures/cheese-screenshot.jpg +share/gnome/help/cheese/oc/cheese.xml +share/gnome/help/cheese/oc/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/oc/figures/cheese-screenshot.jpg +share/gnome/help/cheese/ru/cheese.xml +share/gnome/help/cheese/ru/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/ru/figures/cheese-screenshot.jpg +share/gnome/help/cheese/sv/cheese.xml +share/gnome/help/cheese/sv/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/sv/figures/cheese-screenshot.jpg +share/icons/hicolor/16x16/apps/cheese.png +share/icons/hicolor/22x22/apps/cheese.png +share/icons/hicolor/24x24/apps/cheese.png +share/icons/hicolor/32x32/apps/cheese.png +share/icons/hicolor/48x48/apps/cheese.png +share/icons/hicolor/scalable/apps/cheese.svg +share/locale/ar/LC_MESSAGES/cheese.mo +share/locale/be@latin/LC_MESSAGES/cheese.mo +share/locale/bn_IN/LC_MESSAGES/cheese.mo +share/locale/ca/LC_MESSAGES/cheese.mo +share/locale/cs/LC_MESSAGES/cheese.mo +share/locale/da/LC_MESSAGES/cheese.mo +share/locale/de/LC_MESSAGES/cheese.mo +share/locale/el/LC_MESSAGES/cheese.mo +share/locale/en_GB/LC_MESSAGES/cheese.mo +share/locale/es/LC_MESSAGES/cheese.mo +share/locale/et/LC_MESSAGES/cheese.mo +share/locale/eu/LC_MESSAGES/cheese.mo +share/locale/fi/LC_MESSAGES/cheese.mo +share/locale/fr/LC_MESSAGES/cheese.mo +share/locale/ga/LC_MESSAGES/cheese.mo +share/locale/gl/LC_MESSAGES/cheese.mo +share/locale/gu/LC_MESSAGES/cheese.mo +share/locale/he/LC_MESSAGES/cheese.mo +share/locale/hu/LC_MESSAGES/cheese.mo +share/locale/it/LC_MESSAGES/cheese.mo +share/locale/ja/LC_MESSAGES/cheese.mo +share/locale/ko/LC_MESSAGES/cheese.mo +share/locale/lt/LC_MESSAGES/cheese.mo +share/locale/mk/LC_MESSAGES/cheese.mo +share/locale/ml/LC_MESSAGES/cheese.mo +share/locale/mr/LC_MESSAGES/cheese.mo +share/locale/nb/LC_MESSAGES/cheese.mo +share/locale/nl/LC_MESSAGES/cheese.mo +share/locale/oc/LC_MESSAGES/cheese.mo +share/locale/pa/LC_MESSAGES/cheese.mo +share/locale/pl/LC_MESSAGES/cheese.mo +share/locale/pt/LC_MESSAGES/cheese.mo +share/locale/pt_BR/LC_MESSAGES/cheese.mo +share/locale/ro/LC_MESSAGES/cheese.mo +share/locale/ru/LC_MESSAGES/cheese.mo +share/locale/sl/LC_MESSAGES/cheese.mo +share/locale/sv/LC_MESSAGES/cheese.mo +share/locale/th/LC_MESSAGES/cheese.mo +share/locale/tr/LC_MESSAGES/cheese.mo +share/locale/uk/LC_MESSAGES/cheese.mo +share/locale/zh_CN/LC_MESSAGES/cheese.mo +share/locale/zh_HK/LC_MESSAGES/cheese.mo +share/locale/zh_TW/LC_MESSAGES/cheese.mo +share/omf/cheese/cheese-C.omf +share/omf/cheese/cheese-es.omf +share/omf/cheese/cheese-fr.omf +share/omf/cheese/cheese-oc.omf +share/omf/cheese/cheese-ru.omf +share/omf/cheese/cheese-sv.omf +@dirrm share/omf/cheese +@dirrm share/gnome/help/cheese/sv/figures +@dirrm share/gnome/help/cheese/sv +@dirrm share/gnome/help/cheese/ru/figures +@dirrm share/gnome/help/cheese/ru +@dirrm share/gnome/help/cheese/oc/figures +@dirrm share/gnome/help/cheese/oc +@dirrm share/gnome/help/cheese/fr/figures +@dirrm share/gnome/help/cheese/fr +@dirrm share/gnome/help/cheese/es/figures +@dirrm share/gnome/help/cheese/es +@dirrm share/gnome/help/cheese/C/figures +@dirrm share/gnome/help/cheese/C +@dirrm share/gnome/help/cheese +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/sounds +@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/effects +@dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrm libexec/cheese +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile index aeeb5bf4112e..e9451e173993 100644 --- a/multimedia/gstreamer-plugins-bad/Makefile +++ b/multimedia/gstreamer-plugins-bad/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.7 2006/09/14 21:25:16 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.11 2008/03/19 14:05:35 ahze Exp $ # PORTREVISION= 2 @@ -25,8 +25,6 @@ PLIST_SUB= VERSION="${GST_VERSION}" NO_GSTREAMER_COMMON= yes PLIST= ${.CURDIR}/pkg-plist -USE_GL= yes - do-build: .for dir in ${BAD_GST_DIRS} @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) diff --git a/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files b/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files deleted file mode 100644 index 89a06596412d..000000000000 --- a/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files +++ /dev/null @@ -1,195 +0,0 @@ -diff -urN /dev/null ext/ivorbis/vorbisdec.h ---- /dev/null Wed Dec 31 18:00:00 1969 -+++ ext/ivorbis/vorbisdec.h Thu Jul 5 14:49:17 2007 -@@ -0,0 +1,87 @@ -+/* -*- c-basic-offset: 2 -*- -+ * GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * -+ * Tremor modifications <2006>: -+ * Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/ -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __GST_IVORBIS_DEC_H__ -+#define __GST_IVORBIS_DEC_H__ -+ -+ -+#include <gst/gst.h> -+#include <tremor/ivorbiscodec.h> -+ -+G_BEGIN_DECLS -+ -+#define GST_TYPE_IVORBIS_DEC \ -+ (gst_ivorbis_dec_get_type()) -+#define GST_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec)) -+#define GST_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass)) -+#define GST_IS_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC)) -+#define GST_IS_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC)) -+ -+typedef struct _GstIVorbisDec GstIVorbisDec; -+typedef struct _GstIVorbisDecClass GstIVorbisDecClass; -+ -+/** -+ * GstIVorbisDec: -+ * -+ * Opaque data structure. -+ */ -+struct _GstIVorbisDec { -+ GstElement element; -+ -+ GstPad * sinkpad; -+ GstPad * srcpad; -+ -+ vorbis_dsp_state vd; -+ vorbis_info vi; -+ vorbis_comment vc; -+ vorbis_block vb; -+ guint64 granulepos; -+ -+ gboolean initialized; -+ -+ GList *queued; -+ -+ GstSegment segment; -+ gboolean discont; -+ -+ GstClockTime cur_timestamp; /* only used with non-ogg container formats */ -+ GstClockTime prev_timestamp; /* only used with non-ogg container formats */ -+ -+ GList *pendingevents; -+ GstTagList *taglist; -+}; -+ -+struct _GstIVorbisDecClass { -+ GstElementClass parent_class; -+}; -+ -+GType gst_ivorbis_dec_get_type(void); -+ -+G_END_DECLS -+ -+#endif /* __GST_IVORBIS_DEC_H__ */ -diff -urN /dev/null ext/ivorbis/vorbisenc.h ---- /dev/null Wed Dec 31 18:00:00 1969 -+++ ext/ivorbis/vorbisenc.h Thu Jul 5 14:49:43 2007 -@@ -0,0 +1,100 @@ -+/* GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __VORBISENC_H__ -+#define __VORBISENC_H__ -+ -+ -+#include <gst/gst.h> -+ -+#include <tremor/ivorbiscodec.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#define GST_TYPE_VORBISENC \ -+ (vorbisenc_get_type()) -+#define GST_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) -+#define GST_VORBISENC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) -+#define GST_IS_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) -+#define GST_IS_VORBISENC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) -+ -+typedef struct _VorbisEnc VorbisEnc; -+typedef struct _VorbisEncClass VorbisEncClass; -+ -+struct _VorbisEnc { -+ GstElement element; -+ -+ GstPad *sinkpad, -+ *srcpad; -+ -+ ogg_stream_state os; /* take physical pages, weld into a logical -+ stream of packets */ -+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ -+ ogg_packet op; /* one raw packet of data for decode */ -+ -+ vorbis_info vi; /* struct that stores all the static vorbis bitstream -+ settings */ -+ vorbis_comment vc; /* struct that stores all the user comments */ -+ -+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ -+ vorbis_block vb; /* local working space for packet->PCM decode */ -+ -+ gboolean eos; -+ -+ gboolean managed; -+ gint bitrate; -+ gint min_bitrate; -+ gint max_bitrate; -+ gfloat quality; -+ gboolean quality_set; -+ gint serial; -+ -+ gint channels; -+ gint frequency; -+ -+ guint64 samples_in; -+ guint64 bytes_out; -+ -+ GstCaps *metadata; -+ -+ gboolean setup; -+ gboolean flush_header; -+ gchar *last_message; -+}; -+ -+struct _VorbisEncClass { -+ GstElementClass parent_class; -+}; -+ -+GType vorbisenc_get_type(void); -+ -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+ -+#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h b/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h deleted file mode 100644 index 3badde73c573..000000000000 --- a/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/spc/gstspc.h.orig Fri Dec 22 18:28:46 2006 -+++ ext/spc/gstspc.h Fri Dec 22 18:28:15 2006 -@@ -22,7 +22,7 @@ - - #include <gst/gst.h> - --#include <openspc.h> -+#include <OpenSPC.h> - - G_BEGIN_DECLS - diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist index 7c5297596d0c..01f03630769f 100644 --- a/multimedia/gstreamer-plugins-bad/pkg-plist +++ b/multimedia/gstreamer-plugins-bad/pkg-plist @@ -13,18 +13,21 @@ lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstdeinterlace.a lib/gstreamer-%%VERSION%%/libgstdeinterlace.la lib/gstreamer-%%VERSION%%/libgstdeinterlace.so -lib/gstreamer-%%VERSION%%/libgstequalizer.a -lib/gstreamer-%%VERSION%%/libgstequalizer.la -lib/gstreamer-%%VERSION%%/libgstequalizer.so +lib/gstreamer-%%VERSION%%/libgstdvdspu.a +lib/gstreamer-%%VERSION%%/libgstdvdspu.la +lib/gstreamer-%%VERSION%%/libgstdvdspu.so +lib/gstreamer-%%VERSION%%/libgstfestival.a +lib/gstreamer-%%VERSION%%/libgstfestival.la +lib/gstreamer-%%VERSION%%/libgstfestival.so lib/gstreamer-%%VERSION%%/libgstfilter.a lib/gstreamer-%%VERSION%%/libgstfilter.la lib/gstreamer-%%VERSION%%/libgstfilter.so +lib/gstreamer-%%VERSION%%/libgstflvdemux.a +lib/gstreamer-%%VERSION%%/libgstflvdemux.la +lib/gstreamer-%%VERSION%%/libgstflvdemux.so lib/gstreamer-%%VERSION%%/libgstfreeze.a lib/gstreamer-%%VERSION%%/libgstfreeze.la lib/gstreamer-%%VERSION%%/libgstfreeze.so -lib/gstreamer-%%VERSION%%/libgstglimagesink.a -lib/gstreamer-%%VERSION%%/libgstglimagesink.la -lib/gstreamer-%%VERSION%%/libgstglimagesink.so lib/gstreamer-%%VERSION%%/libgsth264parse.a lib/gstreamer-%%VERSION%%/libgsth264parse.la lib/gstreamer-%%VERSION%%/libgsth264parse.so @@ -34,12 +37,15 @@ lib/gstreamer-%%VERSION%%/libgstinterleave.so lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.la lib/gstreamer-%%VERSION%%/libgstmodplug.so +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.a +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.la +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.so +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.a +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.la +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.so lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.a lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.la lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.so -lib/gstreamer-%%VERSION%%/libgstmultifile.a -lib/gstreamer-%%VERSION%%/libgstmultifile.la -lib/gstreamer-%%VERSION%%/libgstmultifile.so lib/gstreamer-%%VERSION%%/libgstmve.a lib/gstreamer-%%VERSION%%/libgstmve.la lib/gstreamer-%%VERSION%%/libgstmve.so @@ -49,6 +55,9 @@ lib/gstreamer-%%VERSION%%/libgstnsf.so lib/gstreamer-%%VERSION%%/libgstnuvdemux.a lib/gstreamer-%%VERSION%%/libgstnuvdemux.la lib/gstreamer-%%VERSION%%/libgstnuvdemux.so +lib/gstreamer-%%VERSION%%/libgstrawparse.a +lib/gstreamer-%%VERSION%%/libgstrawparse.la +lib/gstreamer-%%VERSION%%/libgstrawparse.so %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.a %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.la %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.so @@ -61,30 +70,30 @@ lib/gstreamer-%%VERSION%%/libgstrfbsrc.so lib/gstreamer-%%VERSION%%/libgstrtpmanager.a lib/gstreamer-%%VERSION%%/libgstrtpmanager.la lib/gstreamer-%%VERSION%%/libgstrtpmanager.so -lib/gstreamer-%%VERSION%%/libgstspectrum.a -lib/gstreamer-%%VERSION%%/libgstspectrum.la -lib/gstreamer-%%VERSION%%/libgstspectrum.so +lib/gstreamer-%%VERSION%%/libgstsdpelem.a +lib/gstreamer-%%VERSION%%/libgstsdpelem.la +lib/gstreamer-%%VERSION%%/libgstsdpelem.so +lib/gstreamer-%%VERSION%%/libgstselector.a +lib/gstreamer-%%VERSION%%/libgstselector.la +lib/gstreamer-%%VERSION%%/libgstselector.so lib/gstreamer-%%VERSION%%/libgstspeed.a lib/gstreamer-%%VERSION%%/libgstspeed.la lib/gstreamer-%%VERSION%%/libgstspeed.so -lib/gstreamer-%%VERSION%%/libgstswitch.a -lib/gstreamer-%%VERSION%%/libgstswitch.la -lib/gstreamer-%%VERSION%%/libgstswitch.so +lib/gstreamer-%%VERSION%%/libgstspeexresample.a +lib/gstreamer-%%VERSION%%/libgstspeexresample.la +lib/gstreamer-%%VERSION%%/libgstspeexresample.so +lib/gstreamer-%%VERSION%%/libgststereo.a +lib/gstreamer-%%VERSION%%/libgststereo.la +lib/gstreamer-%%VERSION%%/libgststereo.so lib/gstreamer-%%VERSION%%/libgsttta.a lib/gstreamer-%%VERSION%%/libgsttta.la lib/gstreamer-%%VERSION%%/libgsttta.so -lib/gstreamer-%%VERSION%%/libgstvideoparse.a -lib/gstreamer-%%VERSION%%/libgstvideoparse.la -lib/gstreamer-%%VERSION%%/libgstvideoparse.so lib/gstreamer-%%VERSION%%/libgstvideosignal.a lib/gstreamer-%%VERSION%%/libgstvideosignal.la lib/gstreamer-%%VERSION%%/libgstvideosignal.so lib/gstreamer-%%VERSION%%/libgstvmnc.a lib/gstreamer-%%VERSION%%/libgstvmnc.la lib/gstreamer-%%VERSION%%/libgstvmnc.so -lib/gstreamer-%%VERSION%%/libgstxingheader.a -lib/gstreamer-%%VERSION%%/libgstxingheader.la -lib/gstreamer-%%VERSION%%/libgstxingheader.so lib/gstreamer-%%VERSION%%/libgsty4menc.a lib/gstreamer-%%VERSION%%/libgsty4menc.la lib/gstreamer-%%VERSION%%/libgsty4menc.so @@ -94,20 +103,27 @@ lib/libgstapp-%%VERSION%%.so lib/libgstapp-%%VERSION%%.so.0 share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/fi/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/ky/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/pl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/sk/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 +share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo @dirrmtry include/gstreamer-%%VERSION%%/gst/app -@dirrmtry include/gstreamer-%%VERSION%%/gst -@dirrmtry include/gstreamer-%%VERSION%% -@dirrm lib/gstreamer-%%VERSION%% +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile index 1f04b3c4c4b5..10f12f9782ce 100644 --- a/multimedia/gstreamer-plugins-bz2/Makefile +++ b/multimedia/gstreamer-plugins-bz2/Makefile @@ -3,9 +3,10 @@ # 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 $ +# $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.6 2008/03/19 14:05:35 ahze Exp $ +# -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer bz2 plugin diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile index 75012a6e880c..57c2abda7f9a 100644 --- a/multimedia/gstreamer-plugins-dts/Makefile +++ b/multimedia/gstreamer-plugins-dts/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dts/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer dts plugin diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile index e55f4a6cc5bd..4d436592279b 100644 --- a/multimedia/gstreamer-plugins-dv/Makefile +++ b/multimedia/gstreamer-plugins-dv/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dv/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # PORTREVISION= 2 diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile index adff7a3134ee..ff6e2fd8094b 100644 --- a/multimedia/gstreamer-plugins-dvd/Makefile +++ b/multimedia/gstreamer-plugins-dvd/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dvd/Makefile,v 1.7 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer dvd plugin set diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile index 5947d34bf29d..7b1bf5a45e91 100644 --- a/multimedia/gstreamer-plugins-good/Makefile +++ b/multimedia/gstreamer-plugins-good/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.14 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Good gstreamer-plugins diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist index a1b519d512b0..a08ab8bb882e 100644 --- a/multimedia/gstreamer-plugins-good/pkg-plist +++ b/multimedia/gstreamer-plugins-good/pkg-plist @@ -31,6 +31,9 @@ lib/gstreamer-%%VERSION%%/libgstdebug.so lib/gstreamer-%%VERSION%%/libgsteffectv.a lib/gstreamer-%%VERSION%%/libgsteffectv.la lib/gstreamer-%%VERSION%%/libgsteffectv.so +lib/gstreamer-%%VERSION%%/libgstequalizer.a +lib/gstreamer-%%VERSION%%/libgstequalizer.la +lib/gstreamer-%%VERSION%%/libgstequalizer.so lib/gstreamer-%%VERSION%%/libgstflxdec.a lib/gstreamer-%%VERSION%%/libgstflxdec.la lib/gstreamer-%%VERSION%%/libgstflxdec.so @@ -55,6 +58,9 @@ lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmulaw.a lib/gstreamer-%%VERSION%%/libgstmulaw.la lib/gstreamer-%%VERSION%%/libgstmulaw.so +lib/gstreamer-%%VERSION%%/libgstmultifile.a +lib/gstreamer-%%VERSION%%/libgstmultifile.la +lib/gstreamer-%%VERSION%%/libgstmultifile.so lib/gstreamer-%%VERSION%%/libgstmultipart.a lib/gstreamer-%%VERSION%%/libgstmultipart.la lib/gstreamer-%%VERSION%%/libgstmultipart.so @@ -76,6 +82,9 @@ lib/gstreamer-%%VERSION%%/libgstrtsp.so lib/gstreamer-%%VERSION%%/libgstsmpte.a lib/gstreamer-%%VERSION%%/libgstsmpte.la lib/gstreamer-%%VERSION%%/libgstsmpte.so +lib/gstreamer-%%VERSION%%/libgstspectrum.a +lib/gstreamer-%%VERSION%%/libgstspectrum.la +lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstudp.a lib/gstreamer-%%VERSION%%/libgstudp.la lib/gstreamer-%%VERSION%%/libgstudp.so @@ -105,16 +114,28 @@ 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/bg/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/fi/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/ja/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/pl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/sk/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 +share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK diff --git a/multimedia/gstreamer-plugins-mpeg2dec/Makefile b/multimedia/gstreamer-plugins-mpeg2dec/Makefile index 14f61a5b88d4..a053b34637af 100644 --- a/multimedia/gstreamer-plugins-mpeg2dec/Makefile +++ b/multimedia/gstreamer-plugins-mpeg2dec/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-mpeg2dec/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # PORTREVISION= 2 diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile index 6a328baccede..3333a6d274ba 100644 --- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile +++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $ # PORTREVISION= 2 @@ -12,8 +13,6 @@ COMMENT= Gstreamer mpeg encoder plugin GST_PLUGIN= mpeg2enc -BROKEN= Does not build - MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins .include "${MASTERDIR}/Makefile" diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile index 86917cce6a64..49999ebc7791 100644 --- a/multimedia/gstreamer-plugins-theora/Makefile +++ b/multimedia/gstreamer-plugins-theora/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-theora/Makefile,v 1.4 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer theora plugin diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile index 06025445ed23..5e3f327029ac 100644 --- a/multimedia/gstreamer-plugins-ugly/Makefile +++ b/multimedia/gstreamer-plugins-ugly/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.8 2006/09/14 21:20:43 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.13 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= multimedia COMMENT= Ugly gstreamer-plugins diff --git a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c b/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c deleted file mode 100644 index 6c1d5b594cd0..000000000000 --- a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c +++ /dev/null @@ -1,733 +0,0 @@ ---- gst/mpegaudioparse/gstmpegaudioparse.c.orig 2007-12-17 00:16:51.000000000 -0500 -+++ gst/mpegaudioparse/gstmpegaudioparse.c 2007-12-17 00:17:13.000000000 -0500 -@@ -29,6 +29,7 @@ - GST_DEBUG_CATEGORY_STATIC (mp3parse_debug); - #define GST_CAT_DEFAULT mp3parse_debug - -+ - /* elementfactory information */ - static GstElementDetails mp3parse_details = { - "MPEG1 Audio Parser", -@@ -71,8 +72,9 @@ enum - - - static void gst_mp3parse_class_init (GstMPEGAudioParseClass * klass); --static void gst_mp3parse_base_init (GstMPEGAudioParseClass * klass); --static void gst_mp3parse_init (GstMPEGAudioParse * mp3parse); -+static void gst_mp3parse_base_init (gpointer klass); -+static void gst_mp3parse_init (GstMPEGAudioParse * mp3parse, -+ GstMPEGAudioParseClass * klass); - - static gboolean gst_mp3parse_sink_event (GstPad * pad, GstEvent * event); - static GstFlowReturn gst_mp3parse_chain (GstPad * pad, GstBuffer * buffer); -@@ -95,35 +97,11 @@ static gboolean mp3parse_bytepos_to_time - static gboolean - mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total); - --static GstElementClass *parent_class = NULL; -- - /*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */ - --GType --gst_mp3parse_get_type (void) --{ -- static GType mp3parse_type = 0; -- -- if (!mp3parse_type) { -- static const GTypeInfo mp3parse_info = { -- sizeof (GstMPEGAudioParseClass), -- (GBaseInitFunc) gst_mp3parse_base_init, -- NULL, -- (GClassInitFunc) gst_mp3parse_class_init, -- NULL, -- NULL, -- sizeof (GstMPEGAudioParse), -- 0, -- (GInstanceInitFunc) gst_mp3parse_init, -- }; -+GST_BOILERPLATE (GstMPEGAudioParse, gst_mp3parse, GstElement, GST_TYPE_ELEMENT); - -- mp3parse_type = g_type_register_static (GST_TYPE_ELEMENT, -- "GstMPEGAudioParse", &mp3parse_info, 0); -- } -- return mp3parse_type; --} -- --static guint mp3types_bitrates[2][3][16] = { -+static const guint mp3types_bitrates[2][3][16] = { - { - {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,}, - {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,}, -@@ -136,7 +114,7 @@ static guint mp3types_bitrates[2][3][16] - }, - }; - --static guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, -+static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, - {22050, 24000, 16000}, - {11025, 12000, 8000} - }; -@@ -218,13 +196,14 @@ mp3_caps_create (guint layer, guint chan - new = gst_caps_new_simple ("audio/mpeg", - "mpegversion", G_TYPE_INT, 1, - "layer", G_TYPE_INT, layer, -- "rate", G_TYPE_INT, samplerate, "channels", G_TYPE_INT, channels, NULL); -+ "rate", G_TYPE_INT, samplerate, -+ "channels", G_TYPE_INT, channels, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); - - return new; - } - - static void --gst_mp3parse_base_init (GstMPEGAudioParseClass * klass) -+gst_mp3parse_base_init (gpointer klass) - { - GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - -@@ -265,8 +244,8 @@ gst_mp3parse_reset (GstMPEGAudioParse * - { - mp3parse->skip = 0; - mp3parse->resyncing = TRUE; -- mp3parse->cur_offset = -1; - mp3parse->next_ts = GST_CLOCK_TIME_NONE; -+ mp3parse->cur_offset = -1; - - mp3parse->tracked_offset = 0; - mp3parse->pending_ts = GST_CLOCK_TIME_NONE; -@@ -276,6 +255,7 @@ gst_mp3parse_reset (GstMPEGAudioParse * - - mp3parse->rate = mp3parse->channels = mp3parse->layer = -1; - mp3parse->version = 1; -+ mp3parse->max_bitreservoir = GST_CLOCK_TIME_NONE; - - mp3parse->avg_bitrate = 0; - mp3parse->bitrate_sum = 0; -@@ -285,21 +265,42 @@ gst_mp3parse_reset (GstMPEGAudioParse * - - mp3parse->xing_flags = 0; - mp3parse->xing_bitrate = 0; -+ -+ if (mp3parse->seek_table) { -+ g_list_foreach (mp3parse->seek_table, (GFunc) g_free, NULL); -+ g_list_free (mp3parse->seek_table); -+ mp3parse->seek_table = NULL; -+ } -+ -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ if (mp3parse->pending_accurate_seeks) { -+ g_slist_foreach (mp3parse->pending_accurate_seeks, (GFunc) g_free, NULL); -+ g_slist_free (mp3parse->pending_accurate_seeks); -+ mp3parse->pending_accurate_seeks = NULL; -+ } -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ -+ if (mp3parse->pending_segment) { -+ GstEvent **eventp = &mp3parse->pending_segment; -+ -+ gst_event_replace (eventp, NULL); -+ } -+ -+ mp3parse->exact_position = FALSE; -+ gst_segment_init (&mp3parse->segment, GST_FORMAT_TIME); - } - - static void --gst_mp3parse_init (GstMPEGAudioParse * mp3parse) -+gst_mp3parse_init (GstMPEGAudioParse * mp3parse, GstMPEGAudioParseClass * klass) - { - mp3parse->sinkpad = -- gst_pad_new_from_template (gst_static_pad_template_get -- (&mp3_sink_template), "sink"); -+ gst_pad_new_from_static_template (&mp3_sink_template, "sink"); - gst_pad_set_event_function (mp3parse->sinkpad, gst_mp3parse_sink_event); - gst_pad_set_chain_function (mp3parse->sinkpad, gst_mp3parse_chain); - gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->sinkpad); - - mp3parse->srcpad = -- gst_pad_new_from_template (gst_static_pad_template_get -- (&mp3_src_template), "src"); -+ gst_pad_new_from_static_template (&mp3_src_template, "src"); - gst_pad_use_fixed_caps (mp3parse->srcpad); - gst_pad_set_event_function (mp3parse->srcpad, mp3parse_src_event); - gst_pad_set_query_function (mp3parse->srcpad, mp3parse_src_query); -@@ -307,6 +308,7 @@ gst_mp3parse_init (GstMPEGAudioParse * m - gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->srcpad); - - mp3parse->adapter = gst_adapter_new (); -+ mp3parse->pending_accurate_seeks_lock = g_mutex_new (); - - gst_mp3parse_reset (mp3parse); - } -@@ -316,10 +318,14 @@ gst_mp3parse_dispose (GObject * object) - { - GstMPEGAudioParse *mp3parse = GST_MP3PARSE (object); - -+ gst_mp3parse_reset (mp3parse); -+ - if (mp3parse->adapter) { - g_object_unref (mp3parse->adapter); - mp3parse->adapter = NULL; - } -+ g_mutex_free (mp3parse->pending_accurate_seeks_lock); -+ mp3parse->pending_accurate_seeks_lock = NULL; - - G_OBJECT_CLASS (parent_class)->dispose (object); - } -@@ -329,6 +335,7 @@ gst_mp3parse_sink_event (GstPad * pad, G - { - gboolean res; - GstMPEGAudioParse *mp3parse; -+ GstEvent **eventp; - - mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); - -@@ -343,6 +350,59 @@ gst_mp3parse_sink_event (GstPad * pad, G - gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate, - &format, &start, &stop, &pos); - -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ if (format == GST_FORMAT_BYTES && mp3parse->pending_accurate_seeks) { -+ MPEGAudioPendingAccurateSeek *seek = NULL; -+ GSList *node; -+ -+ for (node = mp3parse->pending_accurate_seeks; node; node = node->next) { -+ MPEGAudioPendingAccurateSeek *tmp = node->data; -+ -+ if (tmp->upstream_start == pos) { -+ seek = tmp; -+ break; -+ } -+ } -+ if (seek) { -+ GstSegment *s = &seek->segment; -+ -+ event = -+ gst_event_new_new_segment_full (FALSE, s->rate, s->applied_rate, -+ GST_FORMAT_TIME, s->start, s->stop, s->last_stop); -+ -+ mp3parse->segment = seek->segment; -+ -+ mp3parse->resyncing = FALSE; -+ mp3parse->cur_offset = pos; -+ mp3parse->next_ts = seek->timestamp_start; -+ mp3parse->pending_ts = GST_CLOCK_TIME_NONE; -+ mp3parse->tracked_offset = 0; -+ -+ gst_event_parse_new_segment_full (event, &update, &rate, -+ &applied_rate, &format, &start, &stop, &pos); -+ -+ GST_DEBUG_OBJECT (mp3parse, -+ "Pushing accurate newseg rate %g, applied rate %g, " -+ "format %d, start %lld, stop %lld, pos %lld\n", rate, -+ applied_rate, format, start, stop, pos); -+ -+ g_free (seek); -+ mp3parse->pending_accurate_seeks = -+ g_slist_delete_link (mp3parse->pending_accurate_seeks, node); -+ -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ res = gst_pad_push_event (mp3parse->srcpad, event); -+ -+ return res; -+ } else { -+ GST_WARNING_OBJECT (mp3parse, -+ "Accurate seek not possible, didn't get an appropiate upstream segment"); -+ } -+ } -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ -+ mp3parse->exact_position = FALSE; -+ - if (format == GST_FORMAT_BYTES) { - GstClockTime seg_start, seg_stop, seg_pos; - -@@ -356,8 +416,9 @@ gst_mp3parse_sink_event (GstPad * pad, G - GST_FORMAT_TIME, seg_start, seg_stop, seg_pos); - format = GST_FORMAT_TIME; - GST_DEBUG_OBJECT (mp3parse, "Converted incoming segment to TIME. " -- "start = %" G_GINT64_FORMAT ", stop = %" G_GINT64_FORMAT -- "pos = %" G_GINT64_FORMAT, seg_start, seg_stop, seg_pos); -+ "start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT -+ ", pos = %" GST_TIME_FORMAT, GST_TIME_ARGS (seg_start), -+ GST_TIME_ARGS (seg_stop), GST_TIME_ARGS (seg_pos)); - } - } - -@@ -368,6 +429,7 @@ gst_mp3parse_sink_event (GstPad * pad, G - event = gst_event_new_new_segment_full (update, rate, applied_rate, - GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0); - } -+ - mp3parse->resyncing = TRUE; - mp3parse->cur_offset = -1; - mp3parse->next_ts = GST_CLOCK_TIME_NONE; -@@ -379,12 +441,23 @@ gst_mp3parse_sink_event (GstPad * pad, G - GST_DEBUG_OBJECT (mp3parse, "Pushing newseg rate %g, applied rate %g, " - "format %d, start %lld, stop %lld, pos %lld\n", - rate, applied_rate, format, start, stop, pos); -- res = gst_pad_push_event (mp3parse->srcpad, event); -+ -+ gst_segment_set_newsegment_full (&mp3parse->segment, update, rate, -+ applied_rate, format, start, stop, pos); -+ -+ /* save the segment for later, right before we push a new buffer so that -+ * the caps are fixed and the next linked element can receive the segment. */ -+ eventp = &mp3parse->pending_segment; -+ gst_event_replace (eventp, event); -+ gst_event_unref (event); -+ res = TRUE; - break; - } - case GST_EVENT_FLUSH_STOP: - /* Clear our adapter and set up for a new position */ - gst_adapter_clear (mp3parse->adapter); -+ eventp = &mp3parse->pending_segment; -+ gst_event_replace (eventp, NULL); - res = gst_pad_push_event (mp3parse->srcpad, event); - break; - default: -@@ -397,14 +470,26 @@ gst_mp3parse_sink_event (GstPad * pad, G - return res; - } - -+static MPEGAudioSeekEntry * -+mp3parse_seek_table_last_entry (GstMPEGAudioParse * mp3parse) -+{ -+ MPEGAudioSeekEntry *ret = NULL; -+ -+ if (mp3parse->seek_table) { -+ ret = mp3parse->seek_table->data; -+ } -+ -+ return ret; -+} -+ - /* Prepare a buffer of the indicated size, timestamp it and output */ - static GstFlowReturn - gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size) - { - GstBuffer *outbuf; - guint bitrate; -- -- GST_DEBUG_OBJECT (mp3parse, "pushing buffer of %d bytes", size); -+ GstFlowReturn ret = GST_FLOW_OK; -+ GstClockTime push_start; - - outbuf = gst_adapter_take_buffer (mp3parse->adapter, size); - -@@ -456,6 +541,22 @@ gst_mp3parse_emit_frame (GstMPEGAudioPar - } - } - -+ if (GST_BUFFER_TIMESTAMP (outbuf) == 0) -+ mp3parse->exact_position = TRUE; -+ -+ if (mp3parse->exact_position && (!mp3parse->seek_table || -+ (mp3parse_seek_table_last_entry (mp3parse))->byte < -+ GST_BUFFER_OFFSET (outbuf))) { -+ MPEGAudioSeekEntry *entry = g_new0 (MPEGAudioSeekEntry, 1); -+ -+ entry->byte = mp3parse->cur_offset; -+ entry->timestamp = GST_BUFFER_TIMESTAMP (outbuf); -+ mp3parse->seek_table = g_list_prepend (mp3parse->seek_table, entry); -+ GST_DEBUG_OBJECT (mp3parse, "Adding index entry %" GST_TIME_FORMAT -+ " @ offset 0x%08" G_GINT64_MODIFIER "x", -+ GST_TIME_ARGS (entry->timestamp), entry->byte); -+ } -+ - /* Update our byte offset tracking */ - if (mp3parse->cur_offset != -1) { - mp3parse->cur_offset += size; -@@ -483,7 +584,53 @@ gst_mp3parse_emit_frame (GstMPEGAudioPar - mp3parse->srcpad, taglist); - } - -- return gst_pad_push (mp3parse->srcpad, outbuf); -+ /* We start pushing 9 frames earlier (29 frames for MPEG2) than -+ * segment start to be able to decode the first frame we want. -+ * 9 (29) frames are the theoretical maximum of frames that contain -+ * data for the current frame (bit reservoir). -+ */ -+ -+ if (mp3parse->segment.start == 0) { -+ push_start = 0; -+ } else if (GST_CLOCK_TIME_IS_VALID (mp3parse->max_bitreservoir)) { -+ if (mp3parse->segment.start > mp3parse->max_bitreservoir) -+ push_start = mp3parse->segment.start - mp3parse->max_bitreservoir; -+ else -+ push_start = 0; -+ } else { -+ push_start = mp3parse->segment.start; -+ } -+ -+ if (G_UNLIKELY ((GST_CLOCK_TIME_IS_VALID (push_start) && -+ GST_BUFFER_TIMESTAMP (outbuf) + GST_BUFFER_DURATION (outbuf) -+ < push_start) -+ || (GST_CLOCK_TIME_IS_VALID (mp3parse->segment.stop) -+ && GST_BUFFER_TIMESTAMP (outbuf) >= mp3parse->segment.stop))) { -+ GST_DEBUG_OBJECT (mp3parse, -+ "Buffer outside of configured segment range %" GST_TIME_FORMAT -+ " to %" GST_TIME_FORMAT ", dropping, timestamp %" -+ GST_TIME_FORMAT ", offset 0x%08" G_GINT64_MODIFIER "x", -+ GST_TIME_ARGS (push_start), GST_TIME_ARGS (mp3parse->segment.stop), -+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), -+ GST_BUFFER_OFFSET (outbuf)); -+ gst_buffer_unref (outbuf); -+ ret = GST_FLOW_OK; -+ } else { -+ GST_DEBUG_OBJECT (mp3parse, -+ "pushing buffer of %d bytes, timestamp %" GST_TIME_FORMAT -+ ", offset 0x%08" G_GINT64_MODIFIER "x", size, -+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), -+ GST_BUFFER_OFFSET (outbuf)); -+ mp3parse->segment.last_stop = GST_BUFFER_TIMESTAMP (outbuf); -+ /* push any pending segment now */ -+ if (mp3parse->pending_segment) { -+ gst_pad_push_event (mp3parse->srcpad, mp3parse->pending_segment); -+ mp3parse->pending_segment = NULL; -+ } -+ ret = gst_pad_push (mp3parse->srcpad, outbuf); -+ } -+ -+ return ret; - } - - #define XING_FRAMES_FLAG 0x0001 -@@ -610,14 +757,41 @@ gst_mp3parse_handle_first_frame (GstMPEG - mp3parse->xing_bytes = 0; - - if (xing_flags & XING_TOC_FLAG) { -- gint i; -+ int i, percent = 0; -+ guchar *table = mp3parse->xing_seek_table; -+ -+ /* xing seek table: percent time -> 1/256 bytepos */ -+ memcpy (mp3parse->xing_seek_table, data, 100); - -- for (i = 0; i < 100; i++) { -- mp3parse->xing_seek_table[i] = data[0]; -- data++; -+ /* build inverse table: 1/256 bytepos -> 1/100 percent time */ -+ for (i = 0; i < 256; i++) { -+ while (percent < 99 && table[percent + 1] <= i) -+ percent++; -+ -+ if (table[percent] == i) { -+ mp3parse->xing_seek_table_inverse[i] = percent * 100; -+ } else if (table[percent] < i && percent < 99) { -+ gdouble fa, fb, fx; -+ gint a = percent, b = percent + 1; -+ -+ fa = table[a]; -+ fb = table[b]; -+ fx = (b - a) / (fb - fa) * (i - fa) + a; -+ mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); -+ } else if (percent == 98 && table[percent + 1] <= i) { -+ gdouble fa, fb, fx; -+ gint a = percent + 1, b = 100; -+ -+ fa = table[a]; -+ fb = 256.0; -+ fx = (b - a) / (fb - fa) * (i - fa) + a; -+ mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); -+ } - } -+ data += 100; - } else { - memset (mp3parse->xing_seek_table, 0, 100); -+ memset (mp3parse->xing_seek_table_inverse, 0, 256); - } - - if (xing_flags & XING_VBR_SCALE_FLAG) { -@@ -777,6 +951,9 @@ gst_mp3parse_chain (GstPad * pad, GstBuf - mp3parse->spf = 1152; - } - -+ mp3parse->max_bitreservoir = gst_util_uint64_scale (GST_SECOND, -+ ((version == 1) ? 10 : 30) * mp3parse->spf, mp3parse->rate); -+ - /* Check the first frame for a Xing header to get our total length */ - if (mp3parse->frame_count == 0) { - /* For the first frame in the file, look for a Xing frame after -@@ -930,6 +1107,45 @@ gst_mp3parse_change_state (GstElement * - return result; - } - -+static gboolean -+mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total) -+{ -+ GstFormat fmt = GST_FORMAT_BYTES; -+ -+ if (gst_pad_query_peer_duration (mp3parse->sinkpad, &fmt, total)) -+ return TRUE; -+ -+ if (mp3parse->xing_flags & XING_BYTES_FLAG) { -+ *total = mp3parse->xing_bytes; -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total) -+{ -+ gint64 total_bytes; -+ -+ *total = GST_CLOCK_TIME_NONE; -+ -+ if (mp3parse->xing_flags & XING_FRAMES_FLAG) { -+ *total = mp3parse->xing_total_time; -+ return TRUE; -+ } -+ -+ /* Calculate time from the measured bitrate */ -+ if (!mp3parse_total_bytes (mp3parse, &total_bytes)) -+ return FALSE; -+ -+ if (total_bytes != -1 -+ && !mp3parse_bytepos_to_time (mp3parse, total_bytes, total)) -+ return FALSE; -+ -+ return TRUE; -+} -+ - /* Convert a timestamp to the file position required to start decoding that - * timestamp. For now, this just uses the avg bitrate. Later, use an - * incrementally accumulated seek table */ -@@ -937,12 +1153,38 @@ static gboolean - mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts, - gint64 * bytepos) - { -+ gint64 total_bytes; -+ GstClockTime total_time; -+ - /* -1 always maps to -1 */ - if (ts == -1) { - *bytepos = -1; - return TRUE; - } - -+ /* If XING seek table exists use this for time->byte conversion */ -+ if ((mp3parse->xing_flags & XING_TOC_FLAG) && -+ mp3parse_total_bytes (mp3parse, &total_bytes) && -+ mp3parse_total_time (mp3parse, &total_time)) { -+ gdouble fa, fb, fx; -+ gdouble percent = -+ CLAMP ((100.0 * gst_util_guint64_to_gdouble (ts)) / -+ gst_util_guint64_to_gdouble (total_time), 0.0, 100.0); -+ gint index = CLAMP (percent, 0, 99); -+ -+ fa = mp3parse->xing_seek_table[index]; -+ if (index < 99) -+ fb = mp3parse->xing_seek_table[index + 1]; -+ else -+ fb = 256.0; -+ -+ fx = fa + (fb - fa) * (percent - index); -+ -+ *bytepos = (1.0 / 256.0) * fx * total_bytes; -+ -+ return TRUE; -+ } -+ - if (mp3parse->avg_bitrate == 0) - goto no_bitrate; - -@@ -958,6 +1200,9 @@ static gboolean - mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse, - gint64 bytepos, GstClockTime * ts) - { -+ gint64 total_bytes; -+ GstClockTime total_time; -+ - if (bytepos == -1) { - *ts = GST_CLOCK_TIME_NONE; - return TRUE; -@@ -968,61 +1213,33 @@ mp3parse_bytepos_to_time (GstMPEGAudioPa - return TRUE; - } - -- /* Cannot convert anything except 0 if we don't have a bitrate yet */ -- if (mp3parse->avg_bitrate == 0) -- return FALSE; -- -- *ts = (GstClockTime) gst_util_uint64_scale (GST_SECOND, bytepos * 8, -- mp3parse->avg_bitrate); -- return TRUE; --} -- --static gboolean --mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total) --{ -- GstQuery *query; -- GstPad *peer; -- -- if ((peer = gst_pad_get_peer (mp3parse->sinkpad)) != NULL) { -- query = gst_query_new_duration (GST_FORMAT_BYTES); -- gst_query_set_duration (query, GST_FORMAT_BYTES, -1); -- -- if (gst_pad_query (peer, query)) { -- gst_object_unref (peer); -- gst_query_parse_duration (query, NULL, total); -- return TRUE; -- } -- gst_object_unref (peer); -- } -- -- if (mp3parse->xing_flags & XING_BYTES_FLAG) { -- *total = mp3parse->xing_bytes; -- return TRUE; -- } -- -- return FALSE; --} -+ /* If XING seek table exists use this for byte->time conversion */ -+ if ((mp3parse->xing_flags & XING_TOC_FLAG) && -+ mp3parse_total_bytes (mp3parse, &total_bytes) && -+ mp3parse_total_time (mp3parse, &total_time)) { -+ gdouble fa, fb, fx; -+ gdouble pos = CLAMP ((bytepos * 256.0) / total_bytes, 0.0, 256.0); -+ gint index = CLAMP (pos, 0, 255); -+ -+ fa = mp3parse->xing_seek_table_inverse[index]; -+ if (index < 255) -+ fb = mp3parse->xing_seek_table_inverse[index + 1]; -+ else -+ fb = 10000.0; - --static gboolean --mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total) --{ -- gint64 total_bytes; -+ fx = fa + (fb - fa) * (pos - index); - -- *total = GST_CLOCK_TIME_NONE; -+ *ts = (1.0 / 10000.0) * fx * gst_util_guint64_to_gdouble (total_time); - -- if (mp3parse->xing_flags & XING_FRAMES_FLAG) { -- *total = mp3parse->xing_total_time; - return TRUE; - } - -- /* Calculate time from the measured bitrate */ -- if (!mp3parse_total_bytes (mp3parse, &total_bytes)) -- return FALSE; -- -- if (total_bytes != -1 -- && !mp3parse_bytepos_to_time (mp3parse, total_bytes, total)) -+ /* Cannot convert anything except 0 if we don't have a bitrate yet */ -+ if (mp3parse->avg_bitrate == 0) - return FALSE; - -+ *ts = (GstClockTime) gst_util_uint64_scale (GST_SECOND, bytepos * 8, -+ mp3parse->avg_bitrate); - return TRUE; - } - -@@ -1036,11 +1253,12 @@ mp3parse_handle_seek (GstMPEGAudioParse - gint64 cur, stop; - gint64 byte_cur, byte_stop; - -- /* FIXME: Use GstSegment for tracking our position */ -- - gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, - &stop_type, &stop); - -+ GST_DEBUG_OBJECT (mp3parse, "Performing seek to %" GST_TIME_FORMAT, -+ GST_TIME_ARGS (cur)); -+ - /* For any format other than TIME, see if upstream handles - * it directly or fail. For TIME, try upstream, but do it ourselves if - * it fails upstream */ -@@ -1055,6 +1273,90 @@ mp3parse_handle_seek (GstMPEGAudioParse - - /* Handle TIME based seeks by converting to a BYTE position */ - -+ /* For accurate seeking get the frame 9 (MPEG1) or 29 (MPEG2) frames -+ * before the one we want to seek to and push them all to the decoder. -+ * -+ * This is necessary because of the bit reservoir. See -+ * http://www.mars.org/mailman/public/mad-dev/2002-May/000634.html -+ * -+ */ -+ -+ if (flags & GST_SEEK_FLAG_ACCURATE) { -+ MPEGAudioPendingAccurateSeek *seek = -+ g_new0 (MPEGAudioPendingAccurateSeek, 1); -+ GstClockTime start; -+ -+ seek->segment = mp3parse->segment; -+ -+ gst_segment_set_seek (&seek->segment, rate, GST_FORMAT_TIME, -+ flags, cur_type, cur, stop_type, stop, NULL); -+ -+ if (!mp3parse->seek_table) { -+ byte_cur = 0; -+ byte_stop = -1; -+ start = 0; -+ } else { -+ MPEGAudioSeekEntry *entry = NULL, *start_entry = NULL, *stop_entry = NULL; -+ GList *start_node, *stop_node; -+ -+ for (start_node = mp3parse->seek_table; start_node; -+ start_node = start_node->next) { -+ entry = start_node->data; -+ -+ if (cur - mp3parse->max_bitreservoir >= entry->timestamp) { -+ start_entry = entry; -+ break; -+ } -+ } -+ -+ if (!start_entry) { -+ start_entry = mp3parse->seek_table->data; -+ start = start_entry->timestamp; -+ byte_cur = start_entry->byte; -+ } else { -+ start = start_entry->timestamp; -+ byte_cur = start_entry->byte; -+ } -+ -+ for (stop_node = mp3parse->seek_table; stop_node; -+ stop_node = stop_node->next) { -+ entry = stop_node->data; -+ -+ if (stop >= entry->timestamp) { -+ stop_node = stop_node->prev; -+ stop_entry = (stop_node) ? stop_node->data : NULL; -+ break; -+ } -+ } -+ -+ if (!stop_entry) { -+ byte_stop = -1; -+ } else { -+ byte_stop = stop_entry->byte; -+ } -+ -+ } -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type, -+ byte_cur, stop_type, byte_stop); -+ if (gst_pad_push_event (mp3parse->sinkpad, event)) { -+ mp3parse->exact_position = TRUE; -+ seek->upstream_start = byte_cur; -+ seek->timestamp_start = start; -+ mp3parse->pending_accurate_seeks = -+ g_slist_prepend (mp3parse->pending_accurate_seeks, seek); -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ return TRUE; -+ } else { -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ mp3parse->exact_position = TRUE; -+ g_free (seek); -+ return TRUE; -+ } -+ } -+ -+ mp3parse->exact_position = FALSE; -+ - /* Convert the TIME to the appropriate BYTE position at which to resume - * decoding. */ - if (!mp3parse_time_to_bytepos (mp3parse, (GstClockTime) cur, &byte_cur)) diff --git a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h b/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h deleted file mode 100644 index 38c08d75e6c8..000000000000 --- a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h +++ /dev/null @@ -1,62 +0,0 @@ ---- gst/mpegaudioparse/gstmpegaudioparse.h.orig 2007-12-17 00:16:56.000000000 -0500 -+++ gst/mpegaudioparse/gstmpegaudioparse.h 2007-12-17 00:17:15.000000000 -0500 -@@ -40,13 +40,29 @@ G_BEGIN_DECLS - - typedef struct _GstMPEGAudioParse GstMPEGAudioParse; - typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass; -+typedef struct _MPEGAudioSeekEntry MPEGAudioSeekEntry; -+typedef struct _MPEGAudioPendingAccurateSeek MPEGAudioPendingAccurateSeek; -+ -+ -+struct _MPEGAudioSeekEntry { -+ gint64 byte; -+ GstClockTime timestamp; -+}; -+ -+struct _MPEGAudioPendingAccurateSeek { -+ GstSegment segment; -+ gint64 upstream_start; -+ GstClockTime timestamp_start; -+}; - - struct _GstMPEGAudioParse { - GstElement element; - - GstPad *sinkpad, *srcpad; - -+ GstSegment segment; - GstClockTime next_ts; -+ - /* Offset as supplied by incoming buffers */ - gint64 cur_offset; - -@@ -62,6 +78,7 @@ struct _GstMPEGAudioParse { - guint skip; /* number of frames to skip */ - guint bit_rate; /* in kbps */ - gint channels, rate, layer, version; -+ GstClockTime max_bitreservoir; - gint spf; /* Samples per frame */ - - gboolean resyncing; /* True when attempting to resync (stricter checks are -@@ -79,9 +96,21 @@ struct _GstMPEGAudioParse { - guint32 xing_frames; - GstClockTime xing_total_time; - guint32 xing_bytes; -+ /* percent -> filepos mapping */ - guchar xing_seek_table[100]; -+ /* filepos -> percent mapping */ -+ guint16 xing_seek_table_inverse[256]; - guint32 xing_vbr_scale; - guint xing_bitrate; -+ -+ /* Accurate seeking */ -+ GList *seek_table; -+ GMutex *pending_accurate_seeks_lock; -+ GSList *pending_accurate_seeks; -+ gboolean exact_position; -+ -+ /* pending segment */ -+ GstEvent *pending_segment; - }; - - struct _GstMPEGAudioParseClass { diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist index e863d396c202..30cd85adf58b 100644 --- a/multimedia/gstreamer-plugins-ugly/pkg-plist +++ b/multimedia/gstreamer-plugins-ugly/pkg-plist @@ -21,16 +21,35 @@ 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/bg/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/fi/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/pl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/sk/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 +share/locale/zh_CN/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +@dirrmtry share/local/zh_CN/LC_MESSAGES +@dirrmtry share/local/zh_CN +@dirrmtry share/local/uk/LC_MESSAGES +@dirrmtry share/local/uk +@dirrmtry share/local/sr/LC_MESSAGES +@dirrmtry share/local/sr +@dirrmtry share/local/pl/LC_MESSAGES +@dirrmtry share/local/pl +@dirrmtry share/local/fi/LC_MESSAGES +@dirrmtry share/local/fi +@dirrmtry share/local/cs/LC_MESSAGES +@dirrmtry share/local/cs diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile index a18ea8a366ac..ed588934bd16 100644 --- a/multimedia/gstreamer-plugins-x264/Makefile +++ b/multimedia/gstreamer-plugins-x264/Makefile @@ -3,10 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ # CATEGORIES= multimedia -PORTREVISION= 0 +PORTREVISION= 2 COMMENT= Gstreamer x264 plugin diff --git a/multimedia/gstreamer-plugins-xvid/Makefile b/multimedia/gstreamer-plugins-xvid/Makefile index c205f8625c93..ad4818a73fa1 100644 --- a/multimedia/gstreamer-plugins-xvid/Makefile +++ b/multimedia/gstreamer-plugins-xvid/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-xvid80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-xvid/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer xvid plugin diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index b054ca3600c9..2b19734025df 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -3,7 +3,7 @@ # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer-plugins/Makefile,v 1.1 2007/12/02 17:08:48 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.111 2008/03/21 04:01:30 ahze Exp $ # PORTNAME= gstreamer @@ -27,20 +27,20 @@ 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 + oil-0.3.0:${PORTSDIR}/devel/liboil CFLAGS:= ${CFLAGS} -O2 -BASE_PORTVERSION= 0.10.15 +BASE_PORTVERSION= 0.10.18 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 0.10.5 +BAD_PORTVERSION= 0.10.6 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 0.10.6 +GOOD_PORTVERSION= 0.10.7 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 0.10.6 +UGLY_PORTVERSION= 0.10.7 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= good @@ -51,7 +51,7 @@ VERSION= ${GST_VERSION} WANT_GSTREAMER= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack +USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack ltasneededhack USE_AUTOTOOLS= libtool:15 GST_PLUGIN?= base diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index 2a6dcb0c9fc7..14937ec39de9 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -1,9 +1,10 @@ # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer-plugins/Makefile.common,v 1.1 2007/12/02 17:08:48 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.68 2008/03/21 04:14:19 ahze Exp $ # base BASE_GST_ALL_PLUGINS= \ alsa \ cdparanoia \ + gio \ gnomevfs \ libvisual \ ogg \ @@ -12,19 +13,21 @@ BASE_GST_ALL_PLUGINS= \ vorbis # bad BAD_GST_ALL_PLUGINS+= \ - alsaspdif \ + alsa \ amrwb \ bz2 \ cdaudio \ directfb \ divx \ dts \ + dvb \ faac \ faad \ gsm \ ivorbis \ jack \ libmms \ + metadata \ mpeg2enc \ musepack \ musicbrainz \ @@ -34,9 +37,11 @@ BAD_GST_ALL_PLUGINS+= \ sdl \ sndfile \ soundtouch \ + soup \ spc \ swfdec \ timidity \ + wildmidi \ x264 \ xvid # ladspa \ @@ -58,6 +63,7 @@ GOOD_GST_ALL_PLUGINS+= \ ladspa \ libcaca \ libpng \ + taglib \ raw1394 \ shout2 \ speex \ @@ -93,6 +99,7 @@ CONFIGURE_ARGS+= --enable-${GST_PLUGIN} CONFIGURE_ARGS+=--disable-tests \ --disable-examples \ + --disable-1394 \ --disable-amrnb \ --disable-alsa \ --disable-http \ @@ -103,6 +110,9 @@ CONFIGURE_ARGS+=--disable-tests \ --enable-oss \ --disable-osx_audio \ --disable-osx_video \ + --disable-directdrawsink \ + --disable-directsoundsink \ + --disable-v4l2src \ --disable-tarkin \ --enable-static \ --disable-sunaudio \ @@ -134,6 +144,7 @@ gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \ ${GST_LIB_DIR}/libgstaasink.la # annodex +gst_annodex_LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 # bz2 gst_bz2_DIST= bad @@ -150,6 +161,9 @@ gst_cdparanoia_LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia gst_cdparanoia_EXTRA_LIBS+= -lgstcdda-${VERSION} gst_cdparanoia_DIST= base +# cdio +gst_cdio_LIB_DEPENDS+= cdio.7:${PORTSDIR}/sysutils/libcdio + # dts gst_dts_LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \ @@ -206,6 +220,16 @@ gst_gconf_PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \ ${GST_LIB_DIR}/libgstgconfelements.a \ ${GST_LIB_DIR}/libgstgconfelements.la +# gdk_pixbuf +gst_gdk_pixbuf_USE_GNOME+= gtk20 +gst_gdk_pixbuf_GST_PLUGIN_DIR= ext/gdk_pixbuf +gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.a \ + ${GST_LIB_DIR}/libgstgdkpixbuf.la \ + ${GST_LIB_DIR}/libgstgdkpixbuf.so +# gio +gst_gio_USE_GNOME+= glib20 +gst_gio_DIST= base + # gnomevfs gst_gnomevfs_USE_GNOME+= gnomevfs2 gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs @@ -224,6 +248,7 @@ 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 + # jack gst_jack_LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack gst_jack_DIST= bad @@ -328,6 +353,18 @@ gst_sidplay_DIST= ugly gst_sndfile_LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile gst_sndfile_DIST= bad +# soundtouch +gst_soundtouch_LIB_DEPENDS+= SoundTouch.0:${PORTSDIR}/audio/soundtouch +gst_soundtouch_DIST= bad + +# souphttpsrc +gst_soup_LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup +gst_soup_GST_PLUGIN_DIR=ext/soup +gst_soup_PLIST_FILES= ${GST_LIB_DIR}/libgstsouphttpsrc.a \ + ${GST_LIB_DIR}/libgstsouphttpsrc.la \ + ${GST_LIB_DIR}/libgstsouphttpsrc.so +gst_soup_DIST= bad + # spc gst_spc_LIB_DEPENDS+= OpenSPC.3:${PORTSDIR}/audio/openspc gst_spc_DIST= bad @@ -338,6 +375,10 @@ gst_speex_LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex # swfdec gst_swfdec_LIB_DEPENDS+=swfdec-0.4.1:${PORTSDIR}/graphics/swfdec gst_swfdec_DIST= bad + +# taglib +gst_taglib_LIB_DEPENDS+= tag.5:${PORTSDIR}audio/taglib + # theora gst_theora_LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora gst_theora_DIST= base diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index f2349f2eb0ea..b2538abda856 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,12 +1,12 @@ -MD5 (gst-plugins-base-0.10.15.tar.bz2) = 8449359b465074433fec626778bcf36f -SHA256 (gst-plugins-base-0.10.15.tar.bz2) = 143a0fa2c0afffdca6b4707af8cf4cac15b405656272fd1e37db19fdc408fd16 -SIZE (gst-plugins-base-0.10.15.tar.bz2) = 1783866 -MD5 (gst-plugins-bad-0.10.5.tar.bz2) = 395f3ed705928e77e5620cccf11a8cff -SHA256 (gst-plugins-bad-0.10.5.tar.bz2) = 9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed -SIZE (gst-plugins-bad-0.10.5.tar.bz2) = 1402345 -MD5 (gst-plugins-ugly-0.10.6.tar.bz2) = f1016148ecbfba968c0ef1773066988b -SHA256 (gst-plugins-ugly-0.10.6.tar.bz2) = 9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62 -SIZE (gst-plugins-ugly-0.10.6.tar.bz2) = 773777 -MD5 (gst-plugins-good-0.10.6.tar.bz2) = 25f111360c2930705b91b4fcf93ae5c5 -SHA256 (gst-plugins-good-0.10.6.tar.bz2) = 9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66 -SIZE (gst-plugins-good-0.10.6.tar.bz2) = 1576121 +MD5 (gst-plugins-base-0.10.18.tar.bz2) = 422e654b049dedef6fdbf4456f2259d1 +SHA256 (gst-plugins-base-0.10.18.tar.bz2) = 72298b2d2ecd989c273f3952d534139b018beb1a4d2ce15c74cbdfe48ed15757 +SIZE (gst-plugins-base-0.10.18.tar.bz2) = 1911898 +MD5 (gst-plugins-bad-0.10.6.tar.bz2) = fb47838aa0ccef52683cea5d89364053 +SHA256 (gst-plugins-bad-0.10.6.tar.bz2) = c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6 +SIZE (gst-plugins-bad-0.10.6.tar.bz2) = 1776962 +MD5 (gst-plugins-ugly-0.10.7.tar.bz2) = cff4f55138d12152cf580a3ee71c2519 +SHA256 (gst-plugins-ugly-0.10.7.tar.bz2) = 556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35 +SIZE (gst-plugins-ugly-0.10.7.tar.bz2) = 868172 +MD5 (gst-plugins-good-0.10.7.tar.bz2) = e02d729b22451f75414a27456ae5c16a +SHA256 (gst-plugins-good-0.10.7.tar.bz2) = 9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d +SIZE (gst-plugins-good-0.10.7.tar.bz2) = 1746120 diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h b/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h new file mode 100644 index 000000000000..d2f6ac436908 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h @@ -0,0 +1,11 @@ +--- sys/v4l/gstv4lelement.h.orig 2008-02-23 15:31:39.000000000 -0500 ++++ sys/v4l/gstv4lelement.h 2008-02-23 15:32:00.000000000 -0500 +@@ -91,6 +91,8 @@ struct _GstV4lElement { + /* X-overlay */ + GstV4lXv *xv; + gulong xwindow_id; ++ ++ gboolean use_read; + }; + + struct _GstV4lElementClass { diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c new file mode 100644 index 000000000000..24088dc9fee4 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c @@ -0,0 +1,261 @@ +--- sys/v4l/v4lsrc_calls.c.orig 2008-03-03 17:29:52.000000000 -0500 ++++ sys/v4l/v4lsrc_calls.c 2008-03-20 23:50:39.000000000 -0400 +@@ -26,12 +26,14 @@ + + #include <stdlib.h> + #include <sys/types.h> ++#include <sys/uio.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <string.h> + #include <errno.h> ++#include <unistd.h> + #include "v4lsrc_calls.h" + #include <sys/time.h> + +@@ -87,6 +89,51 @@ + return FALSE; + } + ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ struct video_picture vp; ++ struct video_window vw; ++ ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error getting current picture info for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ vp.palette = v4lsrc->mmap.format; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error setting picture info for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error getting current window properties for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ vw.width = v4lsrc->mmap.width; ++ vw.height = v4lsrc->mmap.height; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ vw.flags &= (0x3F00 - 1); ++ vw.flags |= 15 << 16; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error setting window properties for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ } ++ ++ ++ if (read(GST_V4LELEMENT (v4lsrc)->video_fd, GST_V4LELEMENT (v4lsrc)->buffer + (1024 * 768 * 3 * num), v4lsrc->mmap.width * v4lsrc->mmap.height * 3/2) < 0) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ goto done; ++ } ++ + /* instruct the driver to prepare capture using buffer frame num */ + v4lsrc->mmap.frame = num; + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, +@@ -95,6 +142,7 @@ + ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); + return FALSE; + } ++done: + + v4lsrc->frame_queue_state[num] = QUEUE_STATE_QUEUED; + v4lsrc->num_queued++; +@@ -117,6 +165,10 @@ + return FALSE; + } + ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ goto done; ++ } ++ + while (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSYNC, &num) < 0) { + /* if the sync() got interrupted, we can retry */ + if (errno != EINTR) { +@@ -126,6 +178,7 @@ + } + GST_DEBUG_OBJECT (v4lsrc, "Sync got interrupted"); + } ++done: + GST_LOG_OBJECT (v4lsrc, "VIOIOCSYNC on frame %d done", num); + + v4lsrc->frame_queue_state[num] = QUEUE_STATE_SYNCED; +@@ -168,13 +221,28 @@ + GST_V4L_CHECK_OPEN (GST_V4LELEMENT (v4lsrc)); + GST_V4L_CHECK_NOT_ACTIVE (GST_V4LELEMENT (v4lsrc)); + ++ GST_V4LELEMENT (v4lsrc)->use_read = FALSE; ++ + /* request the mmap buffer info: + * total size of mmap buffer, number of frames, offsets of frames */ + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, + &(v4lsrc->mbuf)) < 0) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), +- ("Error getting buffer information: %s", g_strerror (errno))); +- return FALSE; ++ int i; ++ ++ GST_V4LELEMENT (v4lsrc)->buffer = (guint8 *) g_malloc0 (sizeof (guint8) * 1024 * 768 * 3 * MIN_BUFFERS_QUEUED); ++ GST_V4LELEMENT (v4lsrc)->use_read = TRUE; ++ ++ v4lsrc->frame_queue_state = (gint8 *) g_malloc (sizeof (gint8) * MIN_BUFFERS_QUEUED); ++ ++ v4lsrc->mbuf.frames = MIN_BUFFERS_QUEUED; ++ for (i = 0; i < MIN_BUFFERS_QUEUED; i++) { ++ v4lsrc->mbuf.offsets[i] = (1024 * 768 * 3 * i); ++ } ++ ++ /* lock for the frame_state */ ++ v4lsrc->mutex_queue_state = g_mutex_new (); ++ v4lsrc->cond_queue_state = g_cond_new (); ++ goto done; + } + + if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) { +@@ -205,6 +273,7 @@ + GST_V4LELEMENT (v4lsrc)->buffer = NULL; + return FALSE; + } ++done: + + return TRUE; + } +@@ -413,10 +482,14 @@ + v4lsrc->frame_queue_state = NULL; + + /* unmap the buffer */ +- if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), +- ("error munmap'ing capture buffer: %s", g_strerror (errno))); +- return FALSE; ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ g_free (GST_V4LELEMENT (v4lsrc)->buffer); ++ } else { ++ if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), ++ ("error munmap'ing capture buffer: %s", g_strerror (errno))); ++ return FALSE; ++ } + } + GST_V4LELEMENT (v4lsrc)->buffer = NULL; + +@@ -446,6 +519,7 @@ + /* so, we need a buffer and some more stuff */ + int frame = 0; + guint8 *buffer; ++ gboolean use_read = FALSE; + struct video_mbuf vmbuf; + struct video_mmap vmmap; + +@@ -456,24 +530,72 @@ + + /* let's start by requesting a buffer and mmap()'ing it */ + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), +- ("Error getting buffer information: %s", g_strerror (errno))); +- return FALSE; +- } +- /* Map the buffers */ +- buffer = mmap (NULL, vmbuf.size, PROT_READ | PROT_WRITE, +- MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); +- if (buffer == MAP_FAILED) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), +- ("Error mapping our try-out buffer: %s", g_strerror (errno))); +- return FALSE; +- } ++ buffer = (gint8 *) g_malloc0 (sizeof (gint8) * 1024 * 768 * 3); ++ use_read = TRUE; ++ } else { ++ /* Map the buffers */ ++ buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, ++ MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); ++ if (buffer == MAP_FAILED) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), ++ ("Error mapping our try-out buffer: %s", g_strerror (errno))); ++ return FALSE; ++ } ++ } + + /* now that we have a buffer, let's try out our format */ + vmmap.width = width; + vmmap.height = height; + vmmap.format = palette; + vmmap.frame = frame; ++ if (use_read) { ++ struct video_picture vp; ++ struct video_window vw; ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error getting current window properties: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ vw.width = width; ++ vw.height = height; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ vw.flags &= (0x3F00 - 1); ++ vw.flags |= 15 << 16; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error setting window properties: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ } ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error getting current picture info: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ vp.palette = palette; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error setting picture info: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ ++ if (read (GST_V4LELEMENT (v4lsrc)->video_fd, buffer, width * height * 3/2) < 0) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error reading into our try-out buffer: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ goto done; ++ } + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) { + if (errno != EINVAL) /* our format failed! */ + GST_ERROR_OBJECT (v4lsrc, +@@ -488,7 +610,11 @@ + return FALSE; + } + +- munmap (buffer, vmbuf.size); ++done: ++ if (use_read) ++ g_free (buffer); ++ else ++ munmap (buffer, vmbuf.size); + + /* if we got here, it worked! woohoo, the format is supported! */ + return TRUE; diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index 9604abee98fb..4d856ec048cc 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -34,6 +34,7 @@ include/gstreamer-%%VERSION%%/gst/netbuffer/gstnetbuffer.h include/gstreamer-%%VERSION%%/gst/pbutils/descriptions.h include/gstreamer-%%VERSION%%/gst/pbutils/install-plugins.h include/gstreamer-%%VERSION%%/gst/pbutils/missing-plugins.h +include/gstreamer-%%VERSION%%/gst/pbutils/pbutils-enumtypes.h include/gstreamer-%%VERSION%%/gst/pbutils/pbutils.h include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h include/gstreamer-%%VERSION%%/gst/riff/riff-media.h @@ -102,9 +103,6 @@ lib/gstreamer-%%VERSION%%/libgsttcp.so lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.a lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so -lib/gstreamer-%%VERSION%%/libgsturidecodebin.a -lib/gstreamer-%%VERSION%%/libgsturidecodebin.la -lib/gstreamer-%%VERSION%%/libgsturidecodebin.so lib/gstreamer-%%VERSION%%/libgstvideo4linux.a lib/gstreamer-%%VERSION%%/libgstvideo4linux.la lib/gstreamer-%%VERSION%%/libgstvideo4linux.so @@ -174,10 +172,24 @@ lib/libgstvideo-%%VERSION%%.a lib/libgstvideo-%%VERSION%%.la lib/libgstvideo-%%VERSION%%.so lib/libgstvideo-%%VERSION%%.so.0 +libdata/pkgconfig/gstreamer-audio-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-cdda-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-fft-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-floatcast-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-netbuffer-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-pbutils-%%VERSION%%.pc libdata/pkgconfig/gstreamer-plugins-base-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-riff-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-rtp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -186,10 +198,12 @@ share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 64969c21a115..f4152e378d9b 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -3,11 +3,11 @@ # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer/Makefile,v 1.1 2007/12/02 16:39:58 ahze Exp $ +# $MCom: ports/multimedia/gstreamer/Makefile,v 1.59 2008/03/21 03:53:00 ahze Exp $ # PORTNAME= gstreamer -PORTVERSION= 0.10.15 +PORTVERSION= 0.10.18 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \ ${MASTER_SITE_LOCAL} @@ -19,12 +19,12 @@ COMMENT= Development framework for creating media applications LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt CFLAGS:= ${CFLAGS} -O2 -USE_XLIB= yes USE_BISON= build +USE_XORG= x11 xv xext videoproto xextproto USE_BZIP2= yes USE_GMAKE= yes WANT_GNOME= yes -USE_GNOME= gnomehack glib20 libxml2 ltverhack +USE_GNOME= gnomehack glib20 libxml2 ltverhack ltasneededhack USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --disable-tests \ @@ -44,4 +44,14 @@ MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \ gst-xmllaunch-${GST_VERSION}.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if (exists(${LOCALBASE}/lib/libcheck.a) || defined(WITH_CHECK)) +LIB_DEPENDS+= check.0:${PORTSDIR}/devel/libcheck +PLIST_SUB+= CHECK="" +.else +CONFIGURE_ARGS+=--without-check +PLIST_SUB+= CHECK="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index bc1ab4a6dc29..2fc189436e8e 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1,3 +1,3 @@ -MD5 (gstreamer-0.10.15.tar.bz2) = 09f1c4ea025faef88b566fa26ec24ae0 -SHA256 (gstreamer-0.10.15.tar.bz2) = 581bc480fadeace5be05291dae634065e56986d13037fbcee0ba126cb9435abb -SIZE (gstreamer-0.10.15.tar.bz2) = 2158226 +MD5 (gstreamer-0.10.18.tar.bz2) = 3b2f9b2b50f7265bbaac8ea10a8279b8 +SHA256 (gstreamer-0.10.18.tar.bz2) = c07249bb07cf3be4c6c83c0f2cc65f8d9d163777d873d142e84e57645435fb5d +SIZE (gstreamer-0.10.18.tar.bz2) = 2221787 diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist index 95f5d7ef3653..915cc9b2c609 100644 --- a/multimedia/gstreamer/pkg-plist +++ b/multimedia/gstreamer/pkg-plist @@ -16,8 +16,11 @@ include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h +include/gstreamer-%%VERSION%%/gst/gstpoll.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h +%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h +%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h include/gstreamer-%%VERSION%%/gst/controller/gstcontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h @@ -89,6 +92,10 @@ lib/libgstbase-%%VERSION%%.a lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so lib/libgstbase-%%VERSION%%.so.0 +%%CHECK%%lib/libgstcheck-%%VERSION%%.a +%%CHECK%%lib/libgstcheck-%%VERSION%%.la +%%CHECK%%lib/libgstcheck-%%VERSION%%.so +%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0 lib/libgstcontroller-%%VERSION%%.a lib/libgstcontroller-%%VERSION%%.la lib/libgstcontroller-%%VERSION%%.so @@ -107,6 +114,7 @@ lib/libgstreamer-%%VERSION%%.so lib/libgstreamer-%%VERSION%%.so.0 libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc +%%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc @@ -139,12 +147,13 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrm lib/gstreamer-%%VERSION%% @dirrm include/gstreamer-%%VERSION%%/gst/net @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol @dirrm include/gstreamer-%%VERSION%%/gst/controller +%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check @dirrm include/gstreamer-%%VERSION%%/gst/base @dirrm include/gstreamer-%%VERSION%%/gst @dirrm include/gstreamer-%%VERSION%% +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile new file mode 100644 index 000000000000..2cafd84e220c --- /dev/null +++ b/multimedia/gstreamermm/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: gstreamermm +# Date created: 2008-02-23 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/gstreamermm/Makefile,v 1.2 2008/03/15 21:09:37 ahze Exp $ + +PORTNAME= gstreamermm +PORTVERSION= 0.9.4 +PORTREVISION= 1 +CATEGORIES= multimedia +MASTER_SITES= GNOME + +MAINTAINER= multimedia@FreeBSD.org +COMMENT= C++ wrapper library for the multimedia library GStreamer + +LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 + +USE_BZIP2= yes +USE_GSTREAMER= yes +USE_GNOME= pkgconfig gnomeprefix gnomehack +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs +CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags gtkmm-2.4 glibmm-2.4 gstreamer-${GST_VERSION}` -I${WRKSRC}/gstreamer" +USE_LDCONFIG= yes +PLIST_SUB= GST_VERSION="${GST_VERSION}" + +.include <bsd.port.mk> diff --git a/multimedia/gstreamermm/distinfo b/multimedia/gstreamermm/distinfo new file mode 100644 index 000000000000..ee90b6a96d55 --- /dev/null +++ b/multimedia/gstreamermm/distinfo @@ -0,0 +1,3 @@ +MD5 (gstreamermm-0.9.4.tar.bz2) = f0a72d27b1307e4f5aea295d74c8c4a1 +SHA256 (gstreamermm-0.9.4.tar.bz2) = 3320fd1260756a272b870efb1866d3bea7454457826346555f5344a0f0e440df +SIZE (gstreamermm-0.9.4.tar.bz2) = 672971 diff --git a/multimedia/gstreamermm/pkg-descr b/multimedia/gstreamermm/pkg-descr new file mode 100644 index 000000000000..ea4fe6cbe884 --- /dev/null +++ b/multimedia/gstreamermm/pkg-descr @@ -0,0 +1 @@ +C++ wrapper library for the multimedia library GStreamer diff --git a/multimedia/gstreamermm/pkg-plist b/multimedia/gstreamermm/pkg-plist new file mode 100644 index 000000000000..d24d44d61aa9 --- /dev/null +++ b/multimedia/gstreamermm/pkg-plist @@ -0,0 +1,97 @@ +include/gstreamermm-%%GST_VERSION%%/gstreamermm.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/bin.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/buffer.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/bus.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/caps.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/childproxy.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/clock.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/element.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/elementfactory.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/enums.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/error.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/event.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/filter.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/format.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/gst_wrap_init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/index.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/indexfactory.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/iterator.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/message.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/miniobject.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/object.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pad.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/padtemplate.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/parse.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pipeline.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/plugin.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pluginfeature.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bin_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/buffer_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bus_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/caps_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/childproxy_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clock_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/element_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/elementfactory_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/enums_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/error_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/event_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/filter_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/format_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/index_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/indexfactory_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/iterator_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/message_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/miniobject_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/object_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pad_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/padtemplate_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/parse_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pipeline_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/plugin_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pluginfeature_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/query_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/structure_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/systemclock_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/task_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/urihandler_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/value_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/xml_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/query.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/structure.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/systemclock.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/task.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/urihandler.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/value.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/version.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap_init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/xml.h +lib/gstreamermm-%%GST_VERSION%%/include/gstreamermmconfig.h +lib/gstreamermm-%%GST_VERSION%%/proc/m4/convert_gst.m4 +lib/libgstreamermm-%%GST_VERSION%%.la +lib/libgstreamermm-%%GST_VERSION%%.so +lib/libgstreamermm-%%GST_VERSION%%.so.2 +libdata/pkgconfig/gstreamermm-%%GST_VERSION%%.pc +share/doc/gstreamermm-%%GST_VERSION%%/examples/element_link/element_link.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/init/init.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player/main.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/PlayerWindow.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/PlayerWindow.h +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/main.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/optiongroup/optiongroup.cc +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/optiongroup +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/init +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/element_link +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples +@dirrm share/doc/gstreamermm-%%GST_VERSION%% +@dirrm lib/gstreamermm-%%GST_VERSION%%/proc/m4 +@dirrm lib/gstreamermm-%%GST_VERSION%%/proc +@dirrm lib/gstreamermm-%%GST_VERSION%%/include +@dirrm lib/gstreamermm-%%GST_VERSION%% +@dirrm include/gstreamermm-%%GST_VERSION%%/gstreamermm/private +@dirrm include/gstreamermm-%%GST_VERSION%%/gstreamermm +@dirrm include/gstreamermm-%%GST_VERSION%% diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index f7df28e0b339..926ce3855ab4 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -7,7 +7,7 @@ PORTNAME= lives DISTVERSION= 0.9.8.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES DISTNAME= LiVES-${DISTVERSION} @@ -24,7 +24,7 @@ LIB_DEPENDS= Magick.10:${PORTSDIR}/graphics/ImageMagick \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ dv.4:${PORTSDIR}/multimedia/libdv \ matroska.0:${PORTSDIR}/multimedia/libmatroska \ - oil-0.3.1:${PORTSDIR}/devel/liboil \ + oil-0.3.0:${PORTSDIR}/devel/liboil \ mjpegutils-1.9.1:${PORTSDIR}/multimedia/mjpegtools \ x264.50:${PORTSDIR}/multimedia/x264 BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 0ac76f6ecf1c..58843ab18ec2 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 $ +# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.17 2008/03/21 04:06:13 ahze Exp $ # PORTNAME= gstreamer -PORTVERSION= 0.10.8 +PORTVERSION= 0.10.11 +PORTREVISION= 0 CATEGORIES= multimedia python gnome MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,11 +26,16 @@ USE_GMAKE= yes USE_GNOME= pygtk2 gnomehack pkgconfig USE_GSTREAMER= yes GNU_CONFIGURE= yes +PLIST_SUB= VERSION="${GST_VERSION}" CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}" post-patch: @${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py +.for d in audio-controller.py decodebin.py pipeline-tester mixer.py vumeter.py + @${REINPLACE_CMD} -e 's|alsasink|osssink|g' -e 's|alsasrc|osssink|g' \ + ${WRKSRC}/examples/${d} +.endfor post-install: @cd ${PYTHONPREFIX_SITELIBDIR} && ${PYTHON_CMD} -OOOO -c 'import pygst' && \ diff --git a/multimedia/py-gstreamer/distinfo b/multimedia/py-gstreamer/distinfo index 4938257d418b..dc45c066e69c 100644 --- a/multimedia/py-gstreamer/distinfo +++ b/multimedia/py-gstreamer/distinfo @@ -1,3 +1,3 @@ -MD5 (gst-python-0.10.8.tar.bz2) = c9a7a6324104dc84502fc066c4fc4220 -SHA256 (gst-python-0.10.8.tar.bz2) = f1aeb28d27ea4078467125e7eb5ee2b16b08443c9f5f3aa1010d262c37aacc0b -SIZE (gst-python-0.10.8.tar.bz2) = 444134 +MD5 (gst-python-0.10.11.tar.bz2) = 357105974cc0fcdc6eabba446452168a +SHA256 (gst-python-0.10.11.tar.bz2) = 946d12f5daa2268bcf5ea2bcc1d14cca0c58a870405393175274c9bf4f2eb9e7 +SIZE (gst-python-0.10.11.tar.bz2) = 469359 diff --git a/multimedia/py-gstreamer/pkg-plist b/multimedia/py-gstreamer/pkg-plist index e744e5c551a8..617a43e82cad 100644 --- a/multimedia/py-gstreamer/pkg-plist +++ b/multimedia/py-gstreamer/pkg-plist @@ -1,61 +1,64 @@ -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.la -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.so -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.la -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/_gst.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/_gst.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/interfaces.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/interfaces.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.so %%PYTHON_SITELIBDIR%%/pygst.pth %%PYTHON_SITELIBDIR%%/pygst.py %%PYTHON_SITELIBDIR%%/pygst.pyc %%PYTHON_SITELIBDIR%%/pygst.pyo -libdata/pkgconfig/gst-python-0.10.pc -share/gst-python/0.10/defs/base.defs -share/gst-python/0.10/defs/gst-extrafuncs.defs -share/gst-python/0.10/defs/gst-types.defs -share/gst-python/0.10/defs/libs.defs -share/gst-python/0.10/examples/audio-controller.py -share/gst-python/0.10/examples/audioconcat.py -share/gst-python/0.10/examples/bps.py -share/gst-python/0.10/examples/cp.py -share/gst-python/0.10/examples/debugslider.py -share/gst-python/0.10/examples/decodebin.py -share/gst-python/0.10/examples/f2f.py -share/gst-python/0.10/examples/filesrc.py -share/gst-python/0.10/examples/fvumeter.py -share/gst-python/0.10/examples/gst-discover -share/gst-python/0.10/examples/gstfile.py -share/gst-python/0.10/examples/mixer.py -share/gst-python/0.10/examples/pipeline-tester -share/gst-python/0.10/examples/play.py -share/gst-python/0.10/examples/remuxer.py -share/gst-python/0.10/examples/sinkelement.py -share/gst-python/0.10/examples/vumeter.py -@dirrm share/gst-python/0.10/examples -@dirrm share/gst-python/0.10/defs -@dirrm share/gst-python/0.10 +libdata/pkgconfig/gst-python-%%VERSION%%.pc +share/gst-python/%%VERSION%%/defs/base.defs +share/gst-python/%%VERSION%%/defs/gst-extrafuncs.defs +share/gst-python/%%VERSION%%/defs/pbutils.defs +share/gst-python/%%VERSION%%/defs/gst-types.defs +share/gst-python/%%VERSION%%/defs/libs.defs +share/gst-python/%%VERSION%%/examples/audio-controller.py +share/gst-python/%%VERSION%%/examples/audioconcat.py +share/gst-python/%%VERSION%%/examples/bps.py +share/gst-python/%%VERSION%%/examples/cp.py +share/gst-python/%%VERSION%%/examples/debugslider.py +share/gst-python/%%VERSION%%/examples/decodebin.py +share/gst-python/%%VERSION%%/examples/f2f.py +share/gst-python/%%VERSION%%/examples/filesrc.py +share/gst-python/%%VERSION%%/examples/fvumeter.py +share/gst-python/%%VERSION%%/examples/gst-discover +share/gst-python/%%VERSION%%/examples/gstfile.py +share/gst-python/%%VERSION%%/examples/mixer.py +share/gst-python/%%VERSION%%/examples/pipeline-tester +share/gst-python/%%VERSION%%/examples/play.py +share/gst-python/%%VERSION%%/examples/remuxer.py +share/gst-python/%%VERSION%%/examples/sinkelement.py +share/gst-python/%%VERSION%%/examples/vumeter.py +@dirrm share/gst-python/%%VERSION%%/examples +@dirrm share/gst-python/%%VERSION%%/defs +@dirrm share/gst-python/%%VERSION%% @dirrmtry share/gst-python -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10 +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%% diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile new file mode 100644 index 000000000000..0733e5397161 --- /dev/null +++ b/multimedia/swfdec-gnome/Makefile @@ -0,0 +1,34 @@ +# Ports collection makefile for: swfdec-gnome +# Date created: 2008 01 10 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.7 2008/03/10 21:53:57 mezz Exp $ +# + +PORTNAME= swfdec-gnome +PORTVERSION= 2.22.0 +CATEGORIES= multimedia +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Gtk flash player and thumbnailer + +LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec + +USE_GNOME= gnomehack gnomeprefix gtk20 intlhack gconf2 +USE_GMAKE= yes +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= swfdec-thumbnailer.schemas + +MAN1= swfdec-player.1 swfdec-thumbnailer.1 + +post-install: + @-update-desktop-database + +.include <bsd.port.mk> diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo new file mode 100644 index 000000000000..fd05b01f3c27 --- /dev/null +++ b/multimedia/swfdec-gnome/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/swfdec-gnome-2.22.0.tar.gz) = ce53113d79a7e17e5a9e31ef56daab19 +SHA256 (gnome2/swfdec-gnome-2.22.0.tar.gz) = 6411ebe3c892a594ce5fb895f968e828e30fcb5aa6221fd67dc6250ecfd645b8 +SIZE (gnome2/swfdec-gnome-2.22.0.tar.gz) = 204156 diff --git a/multimedia/swfdec-gnome/pkg-descr b/multimedia/swfdec-gnome/pkg-descr new file mode 100644 index 000000000000..7e094c545d9c --- /dev/null +++ b/multimedia/swfdec-gnome/pkg-descr @@ -0,0 +1,6 @@ +Swfdec is a library for rendering Flash animations and games. It was +originally designed as a basis library for creating Flash plugins for +GStreamer, but it is a fully standalone library which only use the +libart library for drawing. + +WWW: http://www.schleef.org/swfdec/ diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist new file mode 100644 index 000000000000..961d96d21ce8 --- /dev/null +++ b/multimedia/swfdec-gnome/pkg-plist @@ -0,0 +1,56 @@ +bin/swfdec-player +bin/swfdec-thumbnailer +share/applications/swfdec-player.desktop +share/locale/ar/LC_MESSAGES/swfdec-gnome.mo +share/locale/be@latin/LC_MESSAGES/swfdec-gnome.mo +share/locale/bn_IN/LC_MESSAGES/swfdec-gnome.mo +share/locale/ca/LC_MESSAGES/swfdec-gnome.mo +share/locale/cs/LC_MESSAGES/swfdec-gnome.mo +share/locale/da/LC_MESSAGES/swfdec-gnome.mo +share/locale/de/LC_MESSAGES/swfdec-gnome.mo +share/locale/el/LC_MESSAGES/swfdec-gnome.mo +share/locale/en_GB/LC_MESSAGES/swfdec-gnome.mo +share/locale/es/LC_MESSAGES/swfdec-gnome.mo +share/locale/et/LC_MESSAGES/swfdec-gnome.mo +share/locale/eu/LC_MESSAGES/swfdec-gnome.mo +share/locale/fi/LC_MESSAGES/swfdec-gnome.mo +share/locale/fr/LC_MESSAGES/swfdec-gnome.mo +share/locale/gl/LC_MESSAGES/swfdec-gnome.mo +share/locale/he/LC_MESSAGES/swfdec-gnome.mo +share/locale/hi/LC_MESSAGES/swfdec-gnome.mo +share/locale/hu/LC_MESSAGES/swfdec-gnome.mo +share/locale/it/LC_MESSAGES/swfdec-gnome.mo +share/locale/ja/LC_MESSAGES/swfdec-gnome.mo +share/locale/ko/LC_MESSAGES/swfdec-gnome.mo +share/locale/lt/LC_MESSAGES/swfdec-gnome.mo +share/locale/mk/LC_MESSAGES/swfdec-gnome.mo +share/locale/mr/LC_MESSAGES/swfdec-gnome.mo +share/locale/nb/LC_MESSAGES/swfdec-gnome.mo +share/locale/nl/LC_MESSAGES/swfdec-gnome.mo +share/locale/pa/LC_MESSAGES/swfdec-gnome.mo +share/locale/pl/LC_MESSAGES/swfdec-gnome.mo +share/locale/pt/LC_MESSAGES/swfdec-gnome.mo +share/locale/pt_BR/LC_MESSAGES/swfdec-gnome.mo +share/locale/ru/LC_MESSAGES/swfdec-gnome.mo +share/locale/sl/LC_MESSAGES/swfdec-gnome.mo +share/locale/sv/LC_MESSAGES/swfdec-gnome.mo +share/locale/ta/LC_MESSAGES/swfdec-gnome.mo +share/locale/th/LC_MESSAGES/swfdec-gnome.mo +share/locale/tr/LC_MESSAGES/swfdec-gnome.mo +share/locale/uk/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_CN/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_HK/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo +%%DATADIR%%/swfdec-player.ui +@dirrm %%DATADIR%% +@dirrmtry share/applications +@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_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile new file mode 100644 index 000000000000..9368540d1cf2 --- /dev/null +++ b/multimedia/totem-pl-parser/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: totem-pl-parser +# Date created: 2007-12-04 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.8 2008/03/10 15:04:41 ahze Exp $ +# + +PORTNAME= totem-pl-parser +PORTVERSION= 2.22.1 +CATEGORIES= multimedia gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GObject-based library to parse a host of playlist formats + +LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack evolutiondataserver \ + ltverhack +USE_GETTEXT= yes +USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo new file mode 100644 index 000000000000..cd108c84ebb3 --- /dev/null +++ b/multimedia/totem-pl-parser/distinfo @@ -0,0 +1,3 @@ +MD5 (totem-pl-parser-2.22.1.tar.bz2) = 6a43a727205ae0a379e325c50ace0a40 +SHA256 (totem-pl-parser-2.22.1.tar.bz2) = c82c130f1924828afc4a66156383e208ae8e05ef7ccad6cea4c355f2945f8f74 +SIZE (totem-pl-parser-2.22.1.tar.bz2) = 848040 diff --git a/multimedia/totem-pl-parser/files/patch-lib_memmem.c b/multimedia/totem-pl-parser/files/patch-lib_memmem.c new file mode 100644 index 000000000000..8684ae9ceec8 --- /dev/null +++ b/multimedia/totem-pl-parser/files/patch-lib_memmem.c @@ -0,0 +1,14 @@ +--- lib/memmem.c.orig 2008-02-07 07:24:38.000000000 -0500 ++++ lib/memmem.c 2008-02-24 15:13:50.000000000 -0500 +@@ -31,8 +31,10 @@ + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +-#ifndef __sun ++#if !defined(__sun) && !defined(__FreeBSD__) + #include "bbs.h" ++#endif ++#ifndef __sun + #include <sys/cdefs.h> + #endif + diff --git a/multimedia/totem-pl-parser/pkg-descr b/multimedia/totem-pl-parser/pkg-descr new file mode 100644 index 000000000000..90b17c4f2c03 --- /dev/null +++ b/multimedia/totem-pl-parser/pkg-descr @@ -0,0 +1 @@ +A simple GObject-based library to parse a host of playlist formats diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist new file mode 100644 index 000000000000..5b430b2837be --- /dev/null +++ b/multimedia/totem-pl-parser/pkg-plist @@ -0,0 +1,134 @@ +include/totem-pl-parser/1/plparser/totem-disc.h +include/totem-pl-parser/1/plparser/totem-pl-parser-builtins.h +include/totem-pl-parser/1/plparser/totem-pl-parser-features.h +include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h +include/totem-pl-parser/1/plparser/totem-pl-parser.h +lib/libtotem-plparser-mini.a +lib/libtotem-plparser-mini.la +lib/libtotem-plparser-mini.so +lib/libtotem-plparser-mini.so.10 +lib/libtotem-plparser.a +lib/libtotem-plparser.la +lib/libtotem-plparser.so +lib/libtotem-plparser.so.10 +libdata/pkgconfig/totem-plparser-mini.pc +libdata/pkgconfig/totem-plparser.pc +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/totem-pl-parser-totem-disc.html +%%DOCSDIR%%/totem-pl-parser-totem-pl-parser.html +%%DOCSDIR%%/totem-pl-parser.devhelp +%%DOCSDIR%%/totem-pl-parser.devhelp2 +%%DOCSDIR%%/up.png +share/locale/am/LC_MESSAGES/totem-pl-parser.mo +share/locale/ar/LC_MESSAGES/totem-pl-parser.mo +share/locale/az/LC_MESSAGES/totem-pl-parser.mo +share/locale/be/LC_MESSAGES/totem-pl-parser.mo +share/locale/be@latin/LC_MESSAGES/totem-pl-parser.mo +share/locale/bg/LC_MESSAGES/totem-pl-parser.mo +share/locale/bn/LC_MESSAGES/totem-pl-parser.mo +share/locale/bn_IN/LC_MESSAGES/totem-pl-parser.mo +share/locale/br/LC_MESSAGES/totem-pl-parser.mo +share/locale/ca/LC_MESSAGES/totem-pl-parser.mo +share/locale/cs/LC_MESSAGES/totem-pl-parser.mo +share/locale/cy/LC_MESSAGES/totem-pl-parser.mo +share/locale/da/LC_MESSAGES/totem-pl-parser.mo +share/locale/de/LC_MESSAGES/totem-pl-parser.mo +share/locale/dz/LC_MESSAGES/totem-pl-parser.mo +share/locale/el/LC_MESSAGES/totem-pl-parser.mo +share/locale/en_CA/LC_MESSAGES/totem-pl-parser.mo +share/locale/en_GB/LC_MESSAGES/totem-pl-parser.mo +share/locale/es/LC_MESSAGES/totem-pl-parser.mo +share/locale/et/LC_MESSAGES/totem-pl-parser.mo +share/locale/eu/LC_MESSAGES/totem-pl-parser.mo +share/locale/fa/LC_MESSAGES/totem-pl-parser.mo +share/locale/fi/LC_MESSAGES/totem-pl-parser.mo +share/locale/fr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ga/LC_MESSAGES/totem-pl-parser.mo +share/locale/gl/LC_MESSAGES/totem-pl-parser.mo +share/locale/gu/LC_MESSAGES/totem-pl-parser.mo +share/locale/he/LC_MESSAGES/totem-pl-parser.mo +share/locale/hi/LC_MESSAGES/totem-pl-parser.mo +share/locale/hr/LC_MESSAGES/totem-pl-parser.mo +share/locale/hu/LC_MESSAGES/totem-pl-parser.mo +share/locale/id/LC_MESSAGES/totem-pl-parser.mo +share/locale/is/LC_MESSAGES/totem-pl-parser.mo +share/locale/it/LC_MESSAGES/totem-pl-parser.mo +share/locale/ja/LC_MESSAGES/totem-pl-parser.mo +share/locale/ka/LC_MESSAGES/totem-pl-parser.mo +share/locale/ko/LC_MESSAGES/totem-pl-parser.mo +share/locale/ku/LC_MESSAGES/totem-pl-parser.mo +share/locale/lt/LC_MESSAGES/totem-pl-parser.mo +share/locale/lv/LC_MESSAGES/totem-pl-parser.mo +share/locale/mg/LC_MESSAGES/totem-pl-parser.mo +share/locale/mk/LC_MESSAGES/totem-pl-parser.mo +share/locale/ml/LC_MESSAGES/totem-pl-parser.mo +share/locale/mr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ms/LC_MESSAGES/totem-pl-parser.mo +share/locale/nb/LC_MESSAGES/totem-pl-parser.mo +share/locale/ne/LC_MESSAGES/totem-pl-parser.mo +share/locale/nl/LC_MESSAGES/totem-pl-parser.mo +share/locale/nn/LC_MESSAGES/totem-pl-parser.mo +share/locale/oc/LC_MESSAGES/totem-pl-parser.mo +share/locale/or/LC_MESSAGES/totem-pl-parser.mo +share/locale/pa/LC_MESSAGES/totem-pl-parser.mo +share/locale/pl/LC_MESSAGES/totem-pl-parser.mo +share/locale/pt/LC_MESSAGES/totem-pl-parser.mo +share/locale/pt_BR/LC_MESSAGES/totem-pl-parser.mo +share/locale/ro/LC_MESSAGES/totem-pl-parser.mo +share/locale/ru/LC_MESSAGES/totem-pl-parser.mo +share/locale/rw/LC_MESSAGES/totem-pl-parser.mo +share/locale/si/LC_MESSAGES/totem-pl-parser.mo +share/locale/sk/LC_MESSAGES/totem-pl-parser.mo +share/locale/sl/LC_MESSAGES/totem-pl-parser.mo +share/locale/sq/LC_MESSAGES/totem-pl-parser.mo +share/locale/sr/LC_MESSAGES/totem-pl-parser.mo +share/locale/sr@Latn/LC_MESSAGES/totem-pl-parser.mo +share/locale/sv/LC_MESSAGES/totem-pl-parser.mo +share/locale/ta/LC_MESSAGES/totem-pl-parser.mo +share/locale/te/LC_MESSAGES/totem-pl-parser.mo +share/locale/th/LC_MESSAGES/totem-pl-parser.mo +share/locale/tr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ug/LC_MESSAGES/totem-pl-parser.mo +share/locale/uk/LC_MESSAGES/totem-pl-parser.mo +share/locale/vi/LC_MESSAGES/totem-pl-parser.mo +share/locale/wa/LC_MESSAGES/totem-pl-parser.mo +share/locale/xh/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_CN/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_HK/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo +@dirrm %%DOCSDIR%% +@dirrm include/totem-pl-parser/1/plparser +@dirrm include/totem-pl-parser/1 +@dirrm include/totem-pl-parser +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@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/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index b9e298cac084..8cecbf0f9cb7 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -3,12 +3,12 @@ # Whom: Hendrik Scholz <hendrik@scholz.net> # # $FreeBSD$ -# $MCom: ports/multimedia/totem/Makefile,v 1.89 2007/10/17 17:22:32 mezz Exp $ +# $MCom: ports/multimedia/totem/Makefile,v 1.102 2008/03/16 06:11:13 mezz Exp $ # PORTNAME= totem -PORTVERSION= 2.20.3 -PORTREVISION?= 0 +PORTVERSION= 2.22.0 +PORTREVISION?= 1 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,14 +18,15 @@ COMMENT?= A gstreamer-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 \ - hal.1:${PORTSDIR}/sysutils/hal -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes + totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \ - nautiluscdburner ltverhack gnomecontrolcenter2 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ + nautiluscdburner ltverhack pygtk2 GNOME_DESKTOP_VERSION=2 WANT_GSTREAMER= yes INSTALLS_ICONS= yes @@ -44,7 +45,8 @@ GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ CONFLICTS?= totem-gstreamer-[0-9]* totem-xine-[0-9]* OPTIONS= LIRC "Enable lirc support" off \ - GALAGO "Enable Galago support" off + GALAGO "Enable Galago support" off \ + GECKO_PLUGINS "Enable install plugins for gecko browser" on TOTEM_PLUGINS= screensaver ontop gromit media-player-keys properties sidebar-test skipto @@ -66,15 +68,15 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} galago PLIST_SUB+= GALAGO="@comment " .endif -.if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes" +.if !defined(WITHOUT_GECKO_PLUGINS) USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" CONFIGURE_ARGS+=--with-mozilla=${GECKO} \ + --enable-browser-plugins \ --enable-gmp-plugin \ --enable-complex-plugin \ --enable-narrowspace-plugin -BUILD_WRKSRC= ${WRKSRC}/browser-plugin -INSTALL_WRKSRC= ${WRKSRC}/browser-plugin +PLIST_SUB+= GECKO_PLUGINS="" .else CONFIGURE_ARGS+=--without-mozilla \ --disable-browser-plugins \ @@ -83,6 +85,7 @@ CONFIGURE_ARGS+=--without-mozilla \ --disable-gmp-plugin \ --disable-complex-plugin \ --disable-narrowspace-plugin +PLIST_SUB+= GECKO_PLUGINS="@comment " .endif .if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no" @@ -125,7 +128,7 @@ post-patch: post-install: @-update-desktop-database ${MKDIR} ${PREFIX}/share/vala/vapi - ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vala ${PREFIX}/share/vala/vapi + ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vapi ${PREFIX}/share/vala/vapi ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi .include <bsd.port.post.mk> diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index dd21349ccd2b..8be34337d3d9 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/totem-2.20.3.tar.bz2) = 7360e0856042615c7c1c3baf03d50bbf -SHA256 (gnome2/totem-2.20.3.tar.bz2) = 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897 -SIZE (gnome2/totem-2.20.3.tar.bz2) = 2194842 +MD5 (gnome2/totem-2.22.0.tar.bz2) = 21a3f983e762b34db035edbaaba9dd63 +SHA256 (gnome2/totem-2.22.0.tar.bz2) = b0f9dd826089fc976ed4e57723613fb518f84e79c3f7cc7a0814b7254911f351 +SIZE (gnome2/totem-2.22.0.tar.bz2) = 2321288 diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in deleted file mode 100644 index df0d82b25039..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- browser-plugin/Makefile.in.orig 2007-09-16 18:59:35.000000000 -0400 -+++ browser-plugin/Makefile.in 2007-09-16 19:00:59.000000000 -0400 -@@ -69,7 +69,7 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = --@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \ - @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -89,7 +89,7 @@ - $(libtotem_basic_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(plugindir) --@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -109,7 +109,7 @@ - $(libtotem_complex_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath = \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ -rpath $(plugindir) --@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \ - @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -133,7 +133,7 @@ - $(libtotem_gmp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \ - @ENABLE_GMP_PLUGIN_TRUE@ $(plugindir) --@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \ - @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -153,7 +153,7 @@ - $(libtotem_mully_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(plugindir) --@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -198,10 +198,6 @@ - totem_plugin_viewer-totem-plugin-viewer.$(OBJEXT) - totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS) - totem_plugin_viewer_DEPENDENCIES = \ -- $(top_builddir)/src/backend/libbaconvideowidget.la \ -- $(top_builddir)/src/libtotem_player.la \ -- $(top_builddir)/src/plparse/libtotem-plparser.la \ -- $(top_builddir)/lib/libtotemscrsaver.la \ - libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@@ -381,7 +377,7 @@ - MOZILLA_LIBDIR = @MOZILLA_LIBDIR@ - MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@ - MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@ --MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@ -+MOZILLA_PLUGINDIR = $(libdir)/browser_plugins - MOZILLA_PREFIX = @MOZILLA_PREFIX@ - MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@ - MOZILLA_XPIDL = @MOZILLA_XPIDL@ -@@ -599,10 +595,7 @@ - $(AM_CFLAGS) - - totem_plugin_viewer_LDADD = \ -- $(top_builddir)/src/backend/libbaconvideowidget.la \ -- $(top_builddir)/src/libtotem_player.la \ -- $(top_builddir)/src/plparse/libtotem-plparser.la \ -- $(top_builddir)/lib/libtotemscrsaver.la \ -+ -ltotem-plparser \ - libtotempluginviewer_helper.la \ - $(EXTRA_GNOME_LIBS) \ - $(XVIDMODE_LIBS) \ -@@ -654,7 +647,7 @@ - @ENABLE_BASIC_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \ --@ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_BASIC_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -715,7 +708,7 @@ - @ENABLE_GMP_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \ --@ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_GMP_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -770,7 +763,7 @@ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \ --@ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_COMPLEX_PLUGIN_TRUE@ -ltotem-plparser - @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -825,7 +818,7 @@ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \ --@ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_NARROWSPACE_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -880,7 +873,7 @@ - @ENABLE_MULLY_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \ --@ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_MULLY_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ diff --git a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in new file mode 100644 index 000000000000..238b32c3263a --- /dev/null +++ b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in @@ -0,0 +1,11 @@ +--- browser-plugin/idl/Makefile.in.orig 2008-03-15 20:31:26.000000000 -0500 ++++ browser-plugin/idl/Makefile.in 2008-03-15 20:31:34.000000000 -0500 +@@ -532,7 +532,7 @@ + + info-am: + +-install-data-am: install-docDATA install-xptDATA ++install-data-am: install-xptDATA + + install-dvi: install-dvi-am + diff --git a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp deleted file mode 100644 index 9a16349f4b0a..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-browser-plugin_totemPluginGlue.cpp b/multimedia/totem/files/patch-browser-plugin_totemPluginGlue.cpp new file mode 100644 index 000000000000..6e697364da2d --- /dev/null +++ b/multimedia/totem/files/patch-browser-plugin_totemPluginGlue.cpp @@ -0,0 +1,20 @@ +--- browser-plugin/totemPluginGlue.cpp.orig 2008-03-15 18:00:23.000000000 -0500 ++++ browser-plugin/totemPluginGlue.cpp 2008-03-15 18:01:54.000000000 -0500 +@@ -356,7 +356,7 @@ + user_ini_file = g_build_filename (g_get_user_config_dir (), + "totem", + "browser-plugins.ini", +- NULL); ++ (char *)NULL); + if (g_key_file_load_from_file (user, + user_ini_file, + G_KEY_FILE_NONE, +@@ -439,7 +439,7 @@ + /* we want to open libdbus-glib-1.so.2 in such a way + * in such a way that it becomes permanentely resident */ + void *handle; +- handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW | RTLD_NODELETE); ++ handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW); + if (!handle) { + fprintf (stderr, "%s\n", dlerror()); + return NPERR_MODULE_LOAD_FAILED_ERROR; diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure deleted file mode 100644 index 1fab81f6ed98..000000000000 --- a/multimedia/totem/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig Fri May 25 00:24:10 2007 -+++ configure Fri May 25 00:24:23 2007 -@@ -22960,7 +22960,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" - - plugin_error_or_ignore() - { -- if test "${error_on_bad_plugin}" == "1" ; then -+ if test "${error_on_bad_plugin}" = "1" ; then - { { echo "$as_me:$LINENO: error: $1" >&5 - echo "$as_me: error: $1" >&2;} - { (exit 1); exit 1; }; } -@@ -22982,7 +22982,7 @@ fi - used_plugins="" - used_plugins2="" - --if test "x${with_plugins}" == "xautodetect" ; then -+if test "x${with_plugins}" = "xautodetect" ; then - # Default to all plugins and just ignore them if they won't compile - with_plugins="all" - error_on_bad_plugin="0" -@@ -23384,7 +23384,7 @@ fi - esac - - # Add the specified plugin -- if test "${add_plugin}" == "1" ; then -+ if test "${add_plugin}" = "1" ; then - used_plugins2="${used_plugins2} ${plugin}" - fi - done diff --git a/multimedia/totem/files/patch-src_totem.c b/multimedia/totem/files/patch-src_totem.c deleted file mode 100644 index da8b5dc31a1e..000000000000 --- a/multimedia/totem/files/patch-src_totem.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/totem.c.orig Sat Oct 21 22:10:07 2006 -+++ src/totem.c Sat Oct 21 22:11:56 2006 -@@ -339,7 +339,11 @@ - - g_object_get (G_OBJECT (totem->bvw), - "mediadev", &device, NULL); -+#if defined (__FreeBSD__) -+ cmd = g_strdup_printf ("cdcontrol -f %s eject", device); -+#else - cmd = g_strdup_printf ("eject %s", device); -+#endif - g_free (device); - - if (g_spawn_command_line_sync (cmd, NULL, NULL, NULL, &err) == FALSE) diff --git a/multimedia/totem/pkg-descr b/multimedia/totem/pkg-descr index 404246e58ab1..3f33f1f5f682 100644 --- a/multimedia/totem/pkg-descr +++ b/multimedia/totem/pkg-descr @@ -2,6 +2,6 @@ Totem is simple movie player for the Gnome 2 desktop based on xine. It features a simple playlist, a full-screen mode, seek and volume controls, as well as a pretty complete keyboard navigation. -WWW: http://www.hadess.net/totem.php3 +WWW: http://www.gnome.org/projects/totem/ -- Hendrik Scholz <hendrik@scholz.net> diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 4124fd04a080..1d3ca28dc8f0 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -1,17 +1,34 @@ bin/totem +bin/totem-audio-preview bin/totem-video-indexer bin/totem-video-thumbnailer -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 -lib/libtotem-plparser.a -lib/libtotem-plparser.la -lib/libtotem-plparser.so -lib/libtotem-plparser.so.7 -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 +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt +lib/nautilus/extensions-2.0/libtotem-properties-page.a +lib/nautilus/extensions-2.0/libtotem-properties-page.la +lib/nautilus/extensions-2.0/libtotem-properties-page.so %%GALAGO%%lib/totem/plugins/galago/galago.totem-plugin %%GALAGO%%lib/totem/plugins/galago/libtgp.a %%GALAGO%%lib/totem/plugins/galago/libtgp.la @@ -45,7 +62,11 @@ lib/totem/plugins/skipto/libskipto.la lib/totem/plugins/skipto/libskipto.so lib/totem/plugins/skipto/skipto.totem-plugin lib/totem/plugins/skipto/skipto.ui -libdata/pkgconfig/totem-plparser.pc +lib/totem/plugins/totem/__init__.py +lib/totem/plugins/totem/__init__.pyc +lib/totem/plugins/totem/__init__.pyo +%%GECKO_PLUGINS%%libexec/totem-plugin-viewer +libexec/totem/totem-bugreport.py share/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png share/gnome/help/totem/C/figures/totem_pause_button.png @@ -105,6 +126,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png share/gnome/help/totem/fr/figures/totem_volume_mute_button.png share/gnome/help/totem/fr/totem.xml +share/gnome/help/totem/it/figures/totem_next_button.png +share/gnome/help/totem/it/figures/totem_pause_button.png +share/gnome/help/totem/it/figures/totem_play_button.png +share/gnome/help/totem/it/figures/totem_previous_button.png +share/gnome/help/totem/it/figures/totem_show_playlist_button.png +share/gnome/help/totem/it/figures/totem_start_window.png +share/gnome/help/totem/it/figures/totem_volume_maximum_button.png +share/gnome/help/totem/it/figures/totem_volume_mute_button.png +share/gnome/help/totem/it/totem.xml share/gnome/help/totem/oc/figures/totem_next_button.png share/gnome/help/totem/oc/figures/totem_pause_button.png share/gnome/help/totem/oc/figures/totem_play_button.png @@ -163,9 +193,11 @@ 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/48x48/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/as/LC_MESSAGES/totem.mo share/locale/az/LC_MESSAGES/totem.mo share/locale/be/LC_MESSAGES/totem.mo share/locale/be@latin/LC_MESSAGES/totem.mo @@ -200,6 +232,7 @@ 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/kn/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 @@ -222,6 +255,7 @@ share/locale/pt_BR/LC_MESSAGES/totem.mo share/locale/ro/LC_MESSAGES/totem.mo share/locale/ru/LC_MESSAGES/totem.mo share/locale/rw/LC_MESSAGES/totem.mo +share/locale/si/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 @@ -247,6 +281,7 @@ share/omf/totem/totem-de.omf share/omf/totem/totem-en_GB.omf share/omf/totem/totem-es.omf share/omf/totem/totem-fr.omf +share/omf/totem/totem-it.omf share/omf/totem/totem-oc.omf share/omf/totem/totem-pa.omf share/omf/totem/totem-pt_BR.omf @@ -258,16 +293,15 @@ share/omf/totem/totem-uk.omf %%DATADIR%%/filmholes.png %%DATADIR%%/fullscreen.ui %%DATADIR%%/mozilla-viewer.ui -%%DATADIR%%/playlist-ui.xml %%DATADIR%%/playlist.ui %%DATADIR%%/plugins.ui %%DATADIR%%/properties.ui -%%DATADIR%%/totem-ui.xml %%DATADIR%%/totem.ui %%DATADIR%%/totem_logo.png %%DATADIR%%/uri.ui +%%DATADIR%%/video-list.ui share/vala/vapi/totem.deps -share/vala/vapi/totem.vala +share/vala/vapi/totem.vapi @dirrm %%DATADIR%% @dirrm share/omf/totem @dirrm share/gnome/help/totem/uk/figures @@ -282,6 +316,8 @@ share/vala/vapi/totem.vala @dirrm share/gnome/help/totem/pa @dirrm share/gnome/help/totem/oc/figures @dirrm share/gnome/help/totem/oc +@dirrm share/gnome/help/totem/it/figures +@dirrm share/gnome/help/totem/it @dirrm share/gnome/help/totem/fr/figures @dirrm share/gnome/help/totem/fr @dirrm share/gnome/help/totem/es/figures @@ -297,6 +333,8 @@ share/vala/vapi/totem.vala @dirrm share/gnome/help/totem/C/figures @dirrm share/gnome/help/totem/C @dirrm share/gnome/help/totem +@dirrm libexec/totem +@dirrm lib/totem/plugins/totem @dirrm lib/totem/plugins/skipto @dirrm lib/totem/plugins/screensaver @dirrm lib/totem/plugins/properties @@ -307,12 +345,10 @@ share/vala/vapi/totem.vala %%GALAGO%%@dirrm lib/totem/plugins/galago @dirrm lib/totem/plugins @dirrm lib/totem -@dirrmtry lib/browser_plugins -@dirrm include/totem/1/plparser -@dirrm include/totem/1 -@dirrm include/totem +%%GECKO_PLUGINS%%@dirrmtry lib/browser_plugins @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -321,6 +357,8 @@ share/vala/vapi/totem.vala @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @@ -337,4 +375,5 @@ share/vala/vapi/totem.vala @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as |