here's a go at updates for graphics/swfdec and www/swfdec-plugin. also
adds sndio support.
sndio backend already submitted upstream:
https://bugs.freedesktop.org/show_bug.cgi?id=20535
these patches are meant for inclusion upstream. specifically, the audio
backend files have code that is not specific to the API of the audio
backend, so there is a bunch of GPL code in the new backend ...
but please test if you want current and future swfdec to be usable on
OpenBSD.
also, swfdec passes most of it's regress tests, but there are some errors
early and the bulk of the tests don't get run because of this. is it
worth it to try to reorder the tests so more of them run?
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
? files/swfdec_playback_sndio.c.save
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/swfdec/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 20 Aug 2008 15:55:15 -0000 1.20
+++ Makefile 8 Mar 2009 09:46:11 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.20 2008/08/20 15:55:15 jasper Exp $
COMMENT= flash rendering library
-DISTNAME= swfdec-0.6.8
-SHARED_LIBS += swfdec-0.6 0.0 # .90.0
-SHARED_LIBS += swfdec-gtk-0.6 0.0 # .90.0
+DISTNAME= swfdec-0.8.4
+SHARED_LIBS += swfdec-0.8 0.0 # .90.0
+SHARED_LIBS += swfdec-gtk-0.8 0.0 # .90.0
CATEGORIES= graphics
-HOMEPAGE= http://swfdec.sourceforge.net/
+HOMEPAGE= http://swfdec.freedesktop.org/
# LGPLv2.1
PERMIT_DISTFILES_CDROM= Yes
@@ -14,30 +14,39 @@
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}/download/swfdec/0.6/
+MASTER_SITES= ${HOMEPAGE}download/swfdec/0.8/
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
- freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
- gstreamer-0.10 gthread-2.0 m oil-0.3 pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pcre pixman-1 png xml2 z
+ freetype gcrypt gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls \
+ gobject-2.0 gpg-error gstreamer-0.10 gthread-2.0 m oil-0.3 \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \
+ sndio tasn1 xml2 z
+
+LIB_DEPENDS= soup-2.4::devel/libsoup \
+ gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base \
+ gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
-LIB_DEPENDS= mad::audio/libmad \
- soup-2.4::devel/libsoup \
- gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base
\
- gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
-
-
-MODULES= devel/gettext
+MODULES= devel/gettext
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-audio=oss \
- --enable-mad \
+CONFIGURE_ARGS+= --with-audio=sndio \
+ --enable-gtk \
--enable-gstreamer
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig"
+
+AUTOCONF_VERSION= 2.61
+AUTOMAKE_VERSION= 1.9
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+
+post-patch:
+ cp ${FILESDIR}/swfdec_playback_sndio.c ${WRKSRC}/swfdec-gtk/
+ cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -i -f
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/swfdec/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 20 Aug 2008 15:55:15 -0000 1.4
+++ distinfo 8 Mar 2009 09:46:11 -0000
@@ -1,5 +1,5 @@
-MD5 (swfdec-0.6.8.tar.gz) = dAyvUgaFVv/hUXAzQvtjSw==
-RMD160 (swfdec-0.6.8.tar.gz) = tYEx/5LLnzFG0AhxPvizmwpRMhE=
-SHA1 (swfdec-0.6.8.tar.gz) = tSUzBZIkGvxFDRxxYlIrzP0v12M=
-SHA256 (swfdec-0.6.8.tar.gz) = 3L6jAwtv05OSVvvuS41c8JM5n/hZdwGruSy3XnTVc/0=
-SIZE (swfdec-0.6.8.tar.gz) = 8775082
+MD5 (swfdec-0.8.4.tar.gz) = rs5QHQ5z8+VkIApE7APDhQ==
+RMD160 (swfdec-0.8.4.tar.gz) = GTGyyLDtVCEuQ/yGOLEYxrxVndo=
+SHA1 (swfdec-0.8.4.tar.gz) = z5WTDM0LZhRsl9bhEbHifsDYAtw=
+SHA256 (swfdec-0.8.4.tar.gz) = eg/GPyWmyFWI/AlN00M/u0NjTYGnAWSzOQ+470DL2AI=
+SIZE (swfdec-0.8.4.tar.gz) = 9958443
Index: files/swfdec_playback_sndio.c
===================================================================
RCS file: files/swfdec_playback_sndio.c
diff -N files/swfdec_playback_sndio.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/swfdec_playback_sndio.c 8 Mar 2009 09:46:11 -0000
@@ -0,0 +1,317 @@
+/* Swfdec
+ * Copyright (C) 2006 Benjamin Otte <o...@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <poll.h>
+#include <errno.h>
+#include <sndio.h>
+#include <unistd.h>
+#include "swfdec_playback.h"
+
+/*** DEFINITIONS ***/
+
+struct _SwfdecPlayback {
+ SwfdecPlayer * player;
+ GList * streams; /* all Stream objects */
+ GMainContext * context; /* context we work in */
+};
+
+typedef struct _Stream Stream;
+struct _Stream {
+ SwfdecPlayback * sound; /* reference to sound object */
+ SwfdecAudio * audio; /* the audio we play back */
+ struct sio_hdl * hdl; /* the sndio handle we play back to */
+ struct sio_par par; /* sndio audio parameters */
+ guint source; /* timeout source ID */
+ gsize offset; /* offset into sound */
+ gboolean (* write) (Stream *);
+ gboolean started; /* sndio "started state" */
+ guint f_written; /* number of frames written to
h/w */
+ guint f_played; /* number of frames played by
h/w */
+};
+
+static void
+sndio_movecb (void *addr, int delta)
+{
+ Stream *stream = addr;
+
+ stream->f_played += delta;
+}
+
+
+/*** STREAMS ***/
+
+static void
+swfdec_playback_stream_remove_handlers (Stream *stream)
+{
+ g_source_remove (stream->source);
+}
+
+static void swfdec_playback_stream_start (Stream *stream);
+
+static int
+swfdec_playback_stream_avail_update (Stream *stream)
+{
+ struct pollfd pfd;
+ int n, revents, used, avail;
+
+ n = sio_pollfd (stream->hdl, &pfd, POLLOUT);
+ while (poll (&pfd, n, 0) < 0 && errno == EINTR)
+ ;
+ revents = sio_revents (stream->hdl, &pfd);
+
+ used = (stream->f_played < 0) ?
+ stream->f_written : stream->f_written - stream->f_played;
+ avail = stream->par.bufsz - used;
+
+ return avail;
+}
+
+static gboolean
+try_write (Stream *stream)
+{
+#define STEP 1024
+ int avail, step, rendered, written, bpf;
+ gboolean finish = FALSE;
+
+ avail = swfdec_playback_stream_avail_update (stream);
+
+ bpf = stream->par.bps * stream->par.pchan;
+
+ while (avail > 0 && !finish) {
+ gint16 data[2 * STEP];
+
+ step = MIN (avail, STEP);
+ rendered = swfdec_audio_render (stream->audio, data, stream->offset, step);
+ if (rendered < step) {
+ finish = TRUE;
+ }
+ written = sio_write (stream->hdl, data, rendered * bpf) / bpf;
+ avail -= written;
+ stream->offset += rendered;
+ stream->f_written += written;
+ }
+
+ if (finish) {
+ swfdec_playback_stream_remove_handlers (stream);
+ }
+ return TRUE;
+#undef STEP
+}
+
+static gboolean
+handle_stream (gpointer data)
+{
+ Stream *stream = data;
+
+ if (!stream->started) {
+ swfdec_playback_stream_start (stream);
+ return TRUE;
+ } else {
+ return try_write (stream);
+ }
+}
+
+static void
+swfdec_playback_stream_install_handlers (Stream *stream)
+{
+ guint timeo = (stream->par.bufsz * 125) / stream->par.rate;
+
+ stream->source = g_timeout_add (timeo, (GSourceFunc) handle_stream, stream);
+}
+
+static void
+swfdec_playback_stream_start (Stream *stream)
+{
+ if (!stream->started) {
+ stream->offset = 0;
+
+ if (!sio_start (stream->hdl)) {
+ g_printerr("Could not start sndio\n");
+ return;
+ }
+ stream->started = 1;
+
+ swfdec_playback_stream_install_handlers (stream);
+ } else {
+ g_printerr("Called _stream_start but already started\n");
+ }
+}
+
+static void
+swfdec_playback_stream_changed (SwfdecAudio *audio, Stream *stream)
+{
+}
+
+static void
+swfdec_playback_stream_new_data (SwfdecAudio *audio, Stream *stream)
+{
+ swfdec_playback_stream_install_handlers (stream);
+}
+
+static void
+swfdec_playback_stream_open (SwfdecPlayback *sound, SwfdecAudio *audio)
+{
+ Stream *stream;
+ struct sio_hdl *hdl;
+ struct sio_par par;
+
+ hdl = sio_open (NULL, SIO_PLAY, 0);
+ if (hdl == NULL) {
+ g_printerr ("Could not open sndio\n");
+ return;
+ }
+
+ sio_initpar (&par);
+
+ par.bits = 16;
+ par.sig = 1;
+ par.pchan = 2;
+ par.rate = 44100;
+ par.appbufsz = 8192;
+
+ if (!sio_setpar (hdl, &par)) {
+ g_printerr ("\n\nCould not set sndio hardware parameters\n");
+ goto fail;
+ }
+ if (!sio_getpar (hdl, &par)) {
+ g_printerr ("\n\nCould not get sndio hardware parameters\n");
+ goto fail;
+ }
+
+ stream = g_new0 (Stream, 1);
+ stream->write = try_write;
+ stream->sound = sound;
+ stream->audio = g_object_ref (audio);
+ stream->hdl = hdl;
+ stream->par = par;
+ sound->streams = g_list_prepend (sound->streams, stream);
+
+ sio_onmove (hdl, sndio_movecb, stream);
+ stream->f_written = stream->f_played = 0;
+
+ g_signal_connect (stream->audio, "changed",
+ G_CALLBACK (swfdec_playback_stream_changed), stream);
+ g_signal_connect (stream->audio, "new-data",
+ G_CALLBACK (swfdec_playback_stream_new_data), stream);
+ swfdec_playback_stream_start (stream);
+ return;
+
+fail:
+ sio_close (hdl);
+}
+
+static void
+swfdec_playback_stream_close (Stream *stream)
+{
+ sio_close (stream->hdl);
+
+ swfdec_playback_stream_remove_handlers (stream);
+ stream->sound->streams = g_list_remove (stream->sound->streams, stream);
+ g_signal_handlers_disconnect_by_func (stream->audio,
+ swfdec_playback_stream_changed, stream);
+ g_signal_handlers_disconnect_by_func (stream->audio,
+ swfdec_playback_stream_new_data, stream);
+ g_object_unref (stream->audio);
+ g_free (stream);
+}
+
+/*** SOUND ***/
+
+static void
+advance_before (SwfdecPlayer *player, guint msecs, guint audio_samples,
gpointer data)
+{
+ SwfdecPlayback *sound = data;
+ GList *walk;
+
+ for (walk = sound->streams; walk; walk = walk->next) {
+ Stream *stream = walk->data;
+ if (audio_samples >= stream->offset) {
+ stream->offset = 0;
+ } else {
+ stream->offset -= audio_samples;
+ }
+ }
+}
+
+static void
+audio_added (SwfdecPlayer *player, SwfdecAudio *audio, SwfdecPlayback *sound)
+{
+ swfdec_playback_stream_open (sound, audio);
+}
+
+static void
+audio_removed (SwfdecPlayer *player, SwfdecAudio *audio, SwfdecPlayback *sound)
+{
+ GList *walk;
+
+ for (walk = sound->streams; walk; walk = walk->next) {
+ Stream *stream = walk->data;
+ if (stream->audio == audio) {
+ swfdec_playback_stream_close (stream);
+ return;
+ }
+ }
+}
+
+SwfdecPlayback *
+swfdec_playback_open (SwfdecPlayer *player, GMainContext *context)
+{
+ SwfdecPlayback *sound;
+ const GList *walk;
+
+ g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL);
+ g_return_val_if_fail (context != NULL, NULL);
+
+ sound = g_new0 (SwfdecPlayback, 1);
+ sound->player = player;
+ g_signal_connect (player, "advance", G_CALLBACK (advance_before), sound);
+ g_signal_connect (player, "audio-added", G_CALLBACK (audio_added), sound);
+ g_signal_connect (player, "audio-removed", G_CALLBACK (audio_removed),
sound);
+ for (walk = swfdec_player_get_audio (player); walk; walk = walk->next) {
+ swfdec_playback_stream_open (sound, walk->data);
+ }
+ g_main_context_ref (context);
+ sound->context = context;
+
+ return sound;
+}
+
+void
+swfdec_playback_close (SwfdecPlayback *sound)
+{
+#define REMOVE_HANDLER_FULL(obj,func,data,count) G_STMT_START {\
+ if (g_signal_handlers_disconnect_by_func ((obj), \
+ G_CALLBACK (func), (data)) != (count)) { \
+ g_assert_not_reached (); \
+ } \
+} G_STMT_END
+#define REMOVE_HANDLER(obj,func,data) REMOVE_HANDLER_FULL (obj, func, data, 1)
+
+ while (sound->streams)
+ swfdec_playback_stream_close (sound->streams->data);
+ REMOVE_HANDLER (sound->player, advance_before, sound);
+ REMOVE_HANDLER (sound->player, audio_added, sound);
+ REMOVE_HANDLER (sound->player, audio_removed, sound);
+ g_main_context_unref (sound->context);
+ g_free (sound);
+}
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 8 Mar 2009 09:46:11 -0000
@@ -0,0 +1,35 @@
+$OpenBSD$
+--- configure.ac.orig Fri Mar 6 22:37:45 2009
++++ configure.ac Fri Mar 6 22:44:26 2009
+@@ -155,7 +155,7 @@ dnl
+ dnl audio backend
+ dnl
+ AC_ARG_WITH(audio,
+- [AC_HELP_STRING([--with-audio=@<:@auto/pulse/none@:>@],
++ [AC_HELP_STRING([--with-audio=@<:@auto/pulse/sndio/none@:>@],
+ [audio backend to use])],,
+ [with_audio=alsa])
+
+@@ -170,6 +170,22 @@ if test "$with_audio" = "alsa"; then
+ AC_MSG_ERROR([no alsa audio support])
+ else
+ AC_MSG_WARN([no alsa audio support])
++ fi
++ fi
++fi
++
++if test "$with_audio" = "sndio"; then
++ AC_CHECK_HEADERS([sndio.h], [AUDIO_TYPE=sndio])
++ if test "$AUDIO_TYPE" = "sndio"; then
++ SNDIO_CFLAGS=""
++ SNDIO_LIBS="-lsndio"
++ AUDIO_CFLAGS=$SNDIO_CFLAGS
++ AUDIO_LIBS=$SNDIO_LIBS
++ else
++ if test "$with_audio" = "sndio"; then
++ AC_MSG_ERROR([no sndio audio support])
++ else
++ AC_MSG_WARN([no sndio audio support])
+ fi
+ fi
+ fi
Index: patches/patch-player_Makefile_in
===================================================================
RCS file: patches/patch-player_Makefile_in
diff -N patches/patch-player_Makefile_in
--- patches/patch-player_Makefile_in 20 Aug 2008 15:55:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-player_Makefile_in,v 1.1 2008/08/20 15:55:15 jasper Exp $
---- player/Makefile.in.orig Thu Aug 14 12:16:48 2008
-+++ player/Makefile.in Thu Aug 14 12:17:01 2008
-@@ -126,7 +126,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lossaudio
- LIBOBJS = @LIBOBJS@
- LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
- LIBOIL_LIBS = @LIBOIL_LIBS@
Index: patches/patch-swfdec-gtk_Makefile_am
===================================================================
RCS file: patches/patch-swfdec-gtk_Makefile_am
diff -N patches/patch-swfdec-gtk_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-swfdec-gtk_Makefile_am 8 Mar 2009 09:46:11 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- swfdec-gtk/Makefile.am.orig Fri Mar 6 21:53:44 2009
++++ swfdec-gtk/Makefile.am Fri Mar 6 21:53:58 2009
+@@ -43,4 +43,5 @@ libswfd...@swfdec_majorminor@include_HEADERS = \
+ EXTRA_DIST = \
+ swfdec_playback_alsa.c \
+ swfdec_playback_pulse.c \
++ swfdec_playback_sndio.c \
+ swfdec_playback_none.c
Index: patches/patch-swfdec-gtk_swfdec_playback_oss_c
===================================================================
RCS file: patches/patch-swfdec-gtk_swfdec_playback_oss_c
diff -N patches/patch-swfdec-gtk_swfdec_playback_oss_c
--- patches/patch-swfdec-gtk_swfdec_playback_oss_c 20 Aug 2008 15:55:15
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-swfdec-gtk_swfdec_playback_oss_c,v 1.1 2008/08/20 15:55:15
jasper Exp $
---- swfdec-gtk/swfdec_playback_oss.c.orig Tue Jul 29 11:52:44 2008
-+++ swfdec-gtk/swfdec_playback_oss.c Thu Aug 14 13:42:00 2008
-@@ -23,7 +23,11 @@
- #endif
-
- #include <sys/ioctl.h>
-+#if defined(__OpenBSD__)
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif /* __OpenBSD__ */
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -31,10 +35,10 @@
-
- #include "swfdec_playback.h"
-
--/** @file Implements swfdec audio playback by opening /dev/dsp per stream
-+/** @file Implements swfdec audio playback by opening /dev/audio per stream
- * and playing out through that.
- *
-- * Allowing multiple access to /dev/dsp is not required by the OSS API spec,
-+ * Allowing multiple access to /dev/audio is not required by the OSS API spec,
- * but FreeBSD's sound system lets you, which is what this file was written
- * for.
- */
-@@ -115,11 +119,19 @@ swfdec_playback_stream_open (SwfdecPlayback *sound, Sw
- guint rate;
- int dsp_fd, ret, format, channels, fragsize;
-
-+#if defined(__OpenBSD__)
-+ dsp_fd = open("/dev/audio", O_WRONLY);
-+ if (dsp_fd == -1) {
-+ g_printerr ("Failed to open /dev/audio\n");
-+ return;
-+ }
-+#else
- dsp_fd = open("/dev/dsp", O_WRONLY);
- if (dsp_fd == -1) {
- g_printerr ("Failed to open /dev/dsp\n");
- return;
- }
-+#endif
-
- format = AFMT_S16_LE;
- ret = ioctl(dsp_fd, SNDCTL_DSP_SETFMT, &format);
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/swfdec/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -r1.4 PFRAG.shared
--- pkg/PFRAG.shared 20 Aug 2008 15:55:15 -0000 1.4
+++ pkg/PFRAG.shared 8 Mar 2009 09:46:11 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2008/08/20 15:55:15 jasper Exp $
-...@lib lib/libswfdec-0.6.so.${LIBswfdec-0.6_VERSION}
-...@lib lib/libswfdec-gtk-0.6.so.${LIBswfdec-gtk-0.6_VERSION}
+...@lib lib/libswfdec-0.8.so.${LIBswfdec-0.8_VERSION}
+...@lib lib/libswfdec-gtk-0.8.so.${LIBswfdec-gtk-0.8_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/swfdec/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 20 Aug 2008 15:55:15 -0000 1.4
+++ pkg/PLIST 8 Mar 2009 09:46:11 -0000
@@ -1,52 +1,54 @@
@comment $OpenBSD: PLIST,v 1.4 2008/08/20 15:55:15 jasper Exp $
%%SHARED%%
-include/swfdec-0.6/
-include/swfdec-0.6/swfdec/
-include/swfdec-0.6/swfdec-gtk/
-include/swfdec-0.6/swfdec-gtk/swfdec-gtk.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_keys.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_loader.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_player.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_socket.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_system.h
-include/swfdec-0.6/swfdec-gtk/swfdec_gtk_widget.h
-include/swfdec-0.6/swfdec/swfdec.h
-include/swfdec-0.6/swfdec/swfdec_as_array.h
-include/swfdec-0.6/swfdec/swfdec_as_context.h
-include/swfdec-0.6/swfdec/swfdec_as_debugger.h
-include/swfdec-0.6/swfdec/swfdec_as_frame.h
-include/swfdec-0.6/swfdec/swfdec_as_function.h
-include/swfdec-0.6/swfdec/swfdec_as_native_function.h
-include/swfdec-0.6/swfdec/swfdec_as_object.h
-include/swfdec-0.6/swfdec/swfdec_as_types.h
-include/swfdec-0.6/swfdec/swfdec_audio.h
-include/swfdec-0.6/swfdec/swfdec_buffer.h
-include/swfdec-0.6/swfdec/swfdec_enums.h
-include/swfdec-0.6/swfdec/swfdec_file_loader.h
-include/swfdec-0.6/swfdec/swfdec_keys.h
-include/swfdec-0.6/swfdec/swfdec_loader.h
-include/swfdec-0.6/swfdec/swfdec_player.h
-include/swfdec-0.6/swfdec/swfdec_player_scripting.h
-include/swfdec-0.6/swfdec/swfdec_rectangle.h
-include/swfdec-0.6/swfdec/swfdec_script.h
-include/swfdec-0.6/swfdec/swfdec_socket.h
-include/swfdec-0.6/swfdec/swfdec_stream.h
-include/swfdec-0.6/swfdec/swfdec_system.h
-include/swfdec-0.6/swfdec/swfdec_url.h
-lib/libswfdec-0.6.a
-lib/libswfdec-0.6.la
-lib/libswfdec-gtk-0.6.a
-lib/libswfdec-gtk-0.6.la
+include/swfdec-0.8/
+include/swfdec-0.8/swfdec/
+include/swfdec-0.8/swfdec-gtk/
+include/swfdec-0.8/swfdec-gtk/swfdec-gtk.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_keys.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_loader.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_player.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_socket.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_system.h
+include/swfdec-0.8/swfdec-gtk/swfdec_gtk_widget.h
+include/swfdec-0.8/swfdec/swfdec.h
+include/swfdec-0.8/swfdec/swfdec_as_array.h
+include/swfdec-0.8/swfdec/swfdec_as_context.h
+include/swfdec-0.8/swfdec/swfdec_as_debugger.h
+include/swfdec-0.8/swfdec/swfdec_as_frame.h
+include/swfdec-0.8/swfdec/swfdec_as_function.h
+include/swfdec-0.8/swfdec/swfdec_as_native_function.h
+include/swfdec-0.8/swfdec/swfdec_as_object.h
+include/swfdec-0.8/swfdec/swfdec_as_types.h
+include/swfdec-0.8/swfdec/swfdec_audio.h
+include/swfdec-0.8/swfdec/swfdec_buffer.h
+include/swfdec-0.8/swfdec/swfdec_enums.h
+include/swfdec-0.8/swfdec/swfdec_file_loader.h
+include/swfdec-0.8/swfdec/swfdec_gc_object.h
+include/swfdec-0.8/swfdec/swfdec_keys.h
+include/swfdec-0.8/swfdec/swfdec_loader.h
+include/swfdec-0.8/swfdec/swfdec_player.h
+include/swfdec-0.8/swfdec/swfdec_player_scripting.h
+include/swfdec-0.8/swfdec/swfdec_rectangle.h
+include/swfdec-0.8/swfdec/swfdec_renderer.h
+include/swfdec-0.8/swfdec/swfdec_script.h
+include/swfdec-0.8/swfdec/swfdec_socket.h
+include/swfdec-0.8/swfdec/swfdec_stream.h
+include/swfdec-0.8/swfdec/swfdec_system.h
+include/swfdec-0.8/swfdec/swfdec_url.h
+include/swfdec-0.8/swfdec/swfdec_version.h
+lib/libswfdec-0.8.a
+lib/libswfdec-0.8.la
+lib/libswfdec-gtk-0.8.a
+lib/libswfdec-gtk-0.8.la
lib/pkgconfig/
-lib/pkgconfig/swfdec-0.6.pc
-lib/pkgconfig/swfdec-gtk-0.6.pc
+lib/pkgconfig/swfdec-0.8.pc
+lib/pkgconfig/swfdec-gtk-0.8.pc
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/swfdec/
share/gtk-doc/html/swfdec/SwfdecAsArray.html
share/gtk-doc/html/swfdec/SwfdecAsContext.html
share/gtk-doc/html/swfdec/SwfdecAsDebugger.html
-share/gtk-doc/html/swfdec/SwfdecAsFrame.html
share/gtk-doc/html/swfdec/SwfdecAsFunction.html
share/gtk-doc/html/swfdec/SwfdecAsObject.html
share/gtk-doc/html/swfdec/SwfdecAudio.html
@@ -55,6 +57,7 @@
share/gtk-doc/html/swfdec/SwfdecLoader.html
share/gtk-doc/html/swfdec/SwfdecPlayer.html
share/gtk-doc/html/swfdec/SwfdecPlayerScripting.html
+share/gtk-doc/html/swfdec/SwfdecRenderer.html
share/gtk-doc/html/swfdec/SwfdecSocket.html
share/gtk-doc/html/swfdec/SwfdecStream.html
share/gtk-doc/html/swfdec/SwfdecSystem.html
@@ -65,38 +68,19 @@
share/gtk-doc/html/swfdec/home.png
share/gtk-doc/html/swfdec/index.html
share/gtk-doc/html/swfdec/index.sgml
+share/gtk-doc/html/swfdec/ix01.html
share/gtk-doc/html/swfdec/left.png
share/gtk-doc/html/swfdec/right.png
share/gtk-doc/html/swfdec/style.css
share/gtk-doc/html/swfdec/swfdec-Enumerations-and-Types.html
share/gtk-doc/html/swfdec/swfdec-Gtk-extension-objects.html
share/gtk-doc/html/swfdec/swfdec-Internals.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html
share/gtk-doc/html/swfdec/swfdec-SwfdecAsValue.html
share/gtk-doc/html/swfdec/swfdec-SwfdecBuffer.html
share/gtk-doc/html/swfdec/swfdec-SwfdecRectangle.html
share/gtk-doc/html/swfdec/swfdec-SwfdecURL.html
+share/gtk-doc/html/swfdec/swfdec-Version-Information.html
share/gtk-doc/html/swfdec/swfdec.devhelp
share/gtk-doc/html/swfdec/swfdec.devhelp2
share/gtk-doc/html/swfdec/up.png
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/swfdec.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
-share/icons/hicolor/22x22/apps/swfdec.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/swfdec.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/swfdec.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/swfdec.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/swfdec.svg
-...@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
-...@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/swfdec-plugin/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 20 Aug 2008 15:57:04 -0000 1.1.1.1
+++ Makefile 9 Mar 2009 00:18:40 -0000
@@ -4,7 +4,7 @@
COMMENT= Flash plugin for Mozilla browsers
-V= 0.6.0
+V= 0.8.2
DISTNAME= swfdec-mozilla-$V
PKGNAME= swfdec-plugin-$V
CATEGORIES= graphics www
@@ -23,12 +23,13 @@
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
- freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
- glitz gmodule-2.0 gobject-2.0 gstpbutils-0.10 gstreamer-0.10 \
- gthread-2.0 gtk-x11-2.0 m mad oil-0.3 pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pcre pixman-1 png soup-2.4 xml2 z
+ freetype gdk-x11-2.0 gdk_pixbuf-2.0 gcrypt gio-2.0 glib-2.0 \
+ glitz gmodule-2.0 gnutls gobject-2.0 gpg-error gstpbutils-0.10 \
+ gstreamer-0.10 gthread-2.0 gtk-x11-2.0 m oil-0.3 pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png soup-2.4 tasn1 \
+ xml2 z
-LIB_DEPENDS= swfdec-0.6,swfdec-gtk-0.6::graphics/swfdec
+LIB_DEPENDS= swfdec-0.8,swfdec-gtk-0.8::graphics/swfdec
USE_X11= Yes
USE_LIBTOOL= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/swfdec-plugin/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 20 Aug 2008 15:57:04 -0000 1.1.1.1
+++ distinfo 9 Mar 2009 00:18:40 -0000
@@ -1,5 +1,5 @@
-MD5 (swfdec-mozilla-0.6.0.tar.gz) = 3A+4S15cdUCuEjHrBBCfDg==
-RMD160 (swfdec-mozilla-0.6.0.tar.gz) = KHmVSuP93e6qBLHrfotzvusephQ=
-SHA1 (swfdec-mozilla-0.6.0.tar.gz) = ft788Vd8ECkWNiNojR38EsAOME4=
-SHA256 (swfdec-mozilla-0.6.0.tar.gz) =
Bek7Q0OZiv0ksLqHniXvTwjIevavtR+wzFoDYsP+/zQ=
-SIZE (swfdec-mozilla-0.6.0.tar.gz) = 399937
+MD5 (swfdec-mozilla-0.8.2.tar.gz) = cWYy4NNbPBWCwYBWm6MDRg==
+RMD160 (swfdec-mozilla-0.8.2.tar.gz) = xq71FwoGR31bt3IMiBSzTXcRuLk=
+SHA1 (swfdec-mozilla-0.8.2.tar.gz) = Mw/DBKzI7mP06a+ZPL+Hwl2Czr8=
+SHA256 (swfdec-mozilla-0.8.2.tar.gz) =
Sf2QX0G2eDLnss+iz2ZGV6sI+P70ojJOdCAvyVE5bNU=
+SIZE (swfdec-mozilla-0.8.2.tar.gz) = 381148
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/swfdec-plugin/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 20 Aug 2008 15:57:04 -0000 1.1.1.1
+++ pkg/PLIST 9 Mar 2009 00:18:40 -0000
@@ -4,3 +4,11 @@
lib/mozilla-plugins/libswfdecmozilla.a
lib/mozilla-plugins/libswfdecmozilla.la
lib/mozilla-plugins/libswfdecmozilla.so
+share/icons/hicolor/16x16/apps/swfdec-mozilla.png
+share/icons/hicolor/22x22/apps/swfdec-mozilla.png
+share/icons/hicolor/24x24/apps/swfdec-mozilla.png
+share/icons/hicolor/32x32/apps/swfdec-mozilla.png
+share/icons/hicolor/48x48/apps/swfdec-mozilla.png
+share/icons/hicolor/scalable/apps/swfdec-mozilla.svg
+...@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
+...@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
