Hello, list!

Here is update of swfdec-mozilla/swfdec.
Attached gzip of new swfdec-mozilla and patch against in-tree version of swfdec.

Regards Valery


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/swfdec/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile    13 Nov 2007 17:10:25 -0000      1.18
+++ Makefile    24 Jun 2008 14:59:37 -0000
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.18 2007/11/13 17:10:25 steven Exp $
+# $OpenBSD$

 COMMENT=       flash rendering library
-DISTNAME=      swfdec-0.2.2
-PKGNAME=       ${DISTNAME}p5
-SHARED_LIBS=   swfdec  0.0
+DISTNAME=      swfdec-0.6.6
+PKGNAME=       ${DISTNAME}
+SHARED_LIBS=   swfdec-0.6      1.1 \
+               swfdec-gtk-0.6  1.1
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=swfdec/}
+MASTER_SITES=  http://swfdec.freedesktop.org/download/swfdec/0.6/

-HOMEPAGE=      http://swfdec.sourceforge.net/
+HOMEPAGE=      http://swfdec.freedesktop.org/

 MAINTAINER=    Jolan Luff <[EMAIL PROTECTED]>

@@ -16,35 +17,45 @@ PERMIT_DISTFILES_CDROM=     Yes
 PERMIT_DISTFILES_FTP=  Yes
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
-WANTLIB=       X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
-               Xcomposite Xdamage pcre \
-               Xrender atk-1.0 c cairo expat fontconfig freetype glib-2.0 \
-               glitz gmodule-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 \
-               pangoft2-1.0 png pthread usbhid z

-MODULES=       devel/gettext
-LIB_DEPENDS=   SDL::devel/sdl \
+WANTLIB=       z m expat ossaudio \
+               X11 Xau Xdmcp Xext Xfixes Xcursor Xrandr Xi \
+               Xinerama Xfixes Xrender fontconfig freetype  \
+               a52 atk-1.0 faac faad glitz mp3lame ogg \
+               vorbis theora x264 png gdk_pixbuf-2.0 iconv intl xml2\
+               Xcomposite Xdamage pcre pixman-1 vorbisenc
+
+LIB_DEPENDS=   avcodec.>=10,avutil.>=4::graphics/ffmpeg \
+               cairo.>=7::graphics/cairo \
+               gmodule-2.0.>=1200,gobject-2.0.>=1200::devel/glib2 \
+               gthread-2.0.>=1200,glib-2.0.>=1200,gio-2.0.>=1600::devel/glib2 \
+               gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \
                mad.>=2::audio/libmad \
-               art_lgpl_2.>=5::graphics/libart \
-               
gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
+               oil-0.3.>=2::devel/liboil \
+               
pangocairo-1.0.>=1300,pangoft2-1.0.>=1300,pango-1.0.>=1300::devel/pango \
+               soup-2.4.>=0::devel/libsoup
+
+AUTOCONF_VERSION=      2.61
+AUTOMAKE_VERSION=      1.9
+
+BUILD_DEPENDS=         
:automake-${AUTOMAKE_VERSION}*:devel/automake/${AUTOMAKE_VERSION}
+               
+
+USE_X11=               Yes
+USE_LIBTOOL=           Yes
+CONFIGURE_STYLE=       gnu
+
+CONFIGURE_ARGS+=       --with-audio=oss --disable-gtk-doc --disable-vivified \
+                       --enable-ffmpeg --disable-gstreamer --enable-mad
+CONFIGURE_ENV=  PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig"
+
+pre-configure:
+       cd ${WRKBUILD};\
+       AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
+       AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
+       autoreconf -f -i

-USE_X11=       Yes
-USE_LIBTOOL=   Yes
-CONFIGURE_STYLE=autoconf
-AUTOCONF_VERSION=2.57
-CONFIGURE_ARGS+=--disable-pixbuf-loader
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-               LDFLAGS="-L${LOCALBASE}/lib" \
-               PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig"
-
-FLAVORS=       plugin
-FLAVOR?=
-
-.if ${FLAVOR:L:Mplugin}
-WANTLIB+=      ICE SM Xt
-BUILD_DEPENDS= :mozilla-firefox-devel->=2.0:www/mozilla-firefox,-devel
-CFLAGS+=       -DMOZ_X11
-CONFIGURE_ENV+=        ENABLE_PLUGIN=Yes
-.endif
+post-install:
+       gtk-update-icon-cache -f -t ${LOCALBASE}/share/icons/hicolor    

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/swfdec/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo    5 Apr 2007 16:19:58 -0000       1.3
+++ distinfo    24 Jun 2008 14:59:37 -0000
@@ -1,5 +1,5 @@
-MD5 (swfdec-0.2.2.tar.gz) = CMYNGPNQxoxLk43CnpsRkQ==
-RMD160 (swfdec-0.2.2.tar.gz) = 5E4dWJD9G45rc/oO1dZF27YgPIg=
-SHA1 (swfdec-0.2.2.tar.gz) = 88vD/sRVEX1VTTesTdodmftZJmE=
-SHA256 (swfdec-0.2.2.tar.gz) = Xuw1NYOTMwPGP4edwKZvOf0CeZkNUPNx1NfSey5ghf0=
-SIZE (swfdec-0.2.2.tar.gz) = 332280
+MD5 (swfdec-0.6.6.tar.gz) = PpHUjguLg54S/4+c7UtQQA==
+RMD160 (swfdec-0.6.6.tar.gz) = dA9XKD6Mr/S0q+E1UisQdpqPD3U=
+SHA1 (swfdec-0.6.6.tar.gz) = quLvEzAyHcdWU8n7OTydGGyDF6A=
+SHA256 (swfdec-0.6.6.tar.gz) = RtlbGfaoVe6VZxko8dI805kaFRExoT+onSw4itIOSoI=
+SIZE (swfdec-0.6.6.tar.gz) = 8773316
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   24 Jun 2003 08:11:14 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
---- Makefile.in.orig   Sun May 18 15:54:16 2003
-+++ Makefile.in        Fri Jun 13 03:29:42 2003
-@@ -112,7 +112,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
--SUBDIRS = libswfdec test player plugin pixbuf-loader
-+SUBDIRS = libswfdec test player plugin
-
- DIST_SUBDIRS = libswfdec test player plugin pixbuf-loader
-
Index: patches/patch-compat_c
===================================================================
RCS file: patches/patch-compat_c
diff -N patches/patch-compat_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-compat_c      24 Jun 2008 14:59:37 -0000
@@ -0,0 +1,56 @@
+$OpenBSD$
+--- compat.c.orig      Sun May 11 00:59:01 2008
++++ compat.c   Sun May 11 00:59:01 2008
+@@ -0,0 +1,52 @@
++#include <sys/cdefs.h>
++#include <sys/types.h>
++#include <math.h>
++#include <machine/ieee.h>
++
++/* This c99 stuff comes from NetBSD source tree */
++
++union ieee_single_u {
++      float                   sngu_f;
++      struct ieee_single      sngu_sng;
++};
++union ieee_double_u {
++      double                  dblu_d;
++      struct ieee_double      dblu_dbl;
++};
++
++int
++__isfinited(double x)
++{
++      union ieee_double_u u;
++      u.dblu_d = x;
++      if (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN)
++              return 0;
++      return 1;
++}
++
++int
++__isfinitef(float x)
++{
++      union ieee_single_u u;
++      u.sngu_f = x;
++      if (u.sngu_sng.sng_exp == DBL_EXP_INFNAN)
++              return 0;
++      return 1;
++}
++
++int
++__isnand(double x)
++{
++      union ieee_double_u u;
++    u.dblu_d = x;
++    return (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
++    (u.dblu_dbl.dbl_frach != 0 || u.dblu_dbl.dbl_fracl != 0));
++}
++int
++__isnanf(float x)
++{
++      union ieee_single_u u;
++      u.sngu_f = x;
++      return (u.sngu_sng.sng_exp == SNG_EXP_INFNAN &&
++      u.sngu_sng.sng_frac != 0);
++}
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/swfdec/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac  25 May 2007 16:23:51 -0000      1.1
+++ patches/patch-configure_ac  24 Jun 2008 14:59:37 -0000
@@ -1,18 +1,43 @@
-$OpenBSD: patch-configure_ac,v 1.1 2007/05/25 16:23:51 martynas Exp $
---- configure.ac.orig  Sun May 18 23:53:41 2003
-+++ configure.ac       Thu May 24 19:15:33 2007
-@@ -84,12 +84,8 @@ if test "x$HAVE_MAD" = xyes; then
+$OpenBSD$
+--- configure.ac.orig  Wed Apr 23 20:42:45 2008
++++ configure.ac       Sun May 11 00:01:04 2008
+@@ -177,7 +177,7 @@ dnl Assume OSS is available if ALSA wasn't found and w
+ if test "$with_audio" = "auto" -o "$with_audio" = "oss"; then
+   with_audio="oss"
+   AUDIO_CFLAGS=
+-  AUDIO_LIBS=
++  AUDIO_LIBS=-lossaudio
+   AUDIO_TYPE=oss
  fi

- MOZILLA_CFLAGS=
--if test -z "$MOZILLA_CONFIG"; then
--  AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
--fi
--if test "x$MOZILLA_CONFIG" != "xno"; then
--  _mozilla_include_dir=`mozilla-config --cflags|sed 's/-I\(.*\) .*/\1/'`
--  MOZILLA_CFLAGS="-I$_mozilla_include_dir/plugin
-I$_mozilla_include_dir/java -I$_mozilla_include_dir/nspr"
-+if test -n "$ENABLE_PLUGIN"; then
-+  MOZILLA_CFLAGS=`pkg-config firefox-plugin --cflags`
- else
-   AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin
will not be built])
- fi
+@@ -325,6 +325,9 @@ fi
+ AC_DEFINE_UNQUOTED(PACKAGE_PREFIX, "$PACKAGE_PREFIX", [Define the
package prefix])
+ AC_SUBST(PACKAGE_PREFIX)
+
++ dnl #########################
++ dnl # Make the output files #
++
+ dnl #########################
+ dnl # Make the output files #
+ dnl #########################
+@@ -360,6 +363,20 @@ vivified/core/Makefile
+ vivified/dock/Makefile
+ vivified/ui/Makefile
+ )
++#OpenBSD c99 compatibility stuff
++#Those macrosses, as well as functions in compat.c were taken from NetBSD
++#source tree
++
++AC_DEFINE(NAN, (0.0 / 0.0), [NAN ])
++AC_DEFINE(FP_INFINITE, 0x00, [FP_INFINITE ])
++AC_DEFINE(FP_NAN, 0x01, [FP_NAN ])
++AC_DEFINE(FP_ZERO, 0x01, [FP_ZERO ])
++AC_DEFINE(INFINITY, HUGE_VAL, [HUGE_VAL ])
++AC_DEFINE([__fpmacro_unary_floating(__name,__arg0)],[((sizeof
(__arg0) == sizeof (float))?    __ ## __name ## f (__arg0) : (sizeof
(__arg0) == sizeof (double)) ?  __ ## __name ## d (__arg0) :    __ ##
__name ## l (__arg0))], [HUGE_VAL ])
++
++AC_DEFINE([EXTRACT_WORDS(ix0,ix1,d)], [do { ieee_double_shape_type
ew_u; ew_u.value = (d); (ix0) = ew_u.parts.msw; (ix1) =
ew_u.parts.lsw; } while (/*CONSTCOND*/0)],[EXTRACT_WORDS ])
++
++AC_DEFINE(isfinite(__x),__fpmacro_unary_floating(isfinite, __x),[isfinite ])
+
+ AC_OUTPUT
+
Index: patches/patch-libswfdec_jpeg_sl_types_h
===================================================================
RCS file: patches/patch-libswfdec_jpeg_sl_types_h
diff -N patches/patch-libswfdec_jpeg_sl_types_h
--- patches/patch-libswfdec_jpeg_sl_types_h     24 Jun 2003 08:11:14 -0000      
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libswfdec_jpeg_sl_types_h,v 1.1.1.1 2003/06/24
08:11:14 jolan Exp $
---- libswfdec/jpeg/sl_types.h.orig     Fri Nov 29 22:51:49 2002
-+++ libswfdec/jpeg/sl_types.h  Fri Jun 13 17:55:09 2003
-@@ -5,7 +5,7 @@
- //#include <sl_profile.h>
- //#include <sl_palette.h>
-
--#include <malloc.h>
-+#include <stdlib.h>
-
- #define HAVE_IEEE754_H
-
Index: patches/patch-libswfdec_mpglib_clipconv_f32_s16_h
===================================================================
RCS file: patches/patch-libswfdec_mpglib_clipconv_f32_s16_h
diff -N patches/patch-libswfdec_mpglib_clipconv_f32_s16_h
--- patches/patch-libswfdec_mpglib_clipconv_f32_s16_h   25 May 2007
16:23:51 -0000  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libswfdec_mpglib_clipconv_f32_s16_h,v 1.2 2007/05/25
16:23:51 martynas Exp $
---- libswfdec/mpglib/clipconv_f32_s16.h.orig   Wed Nov  6 09:11:48 2002
-+++ libswfdec/mpglib/clipconv_f32_s16.h        Thu May 24 19:05:49 2007
-@@ -34,7 +34,7 @@ Half integers may be rounded to either nearby integer.
- //#include <sl_altivec.h>
- #define f32 float
- #define s16 short
--#define HAVE_IEEE754_H
-+#undef HAVE_IEEE754_H
-
-
- /* storage class */
Index: patches/patch-player_swf_play_c
===================================================================
RCS file: patches/patch-player_swf_play_c
diff -N patches/patch-player_swf_play_c
--- patches/patch-player_swf_play_c     25 May 2007 16:23:51 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-player_swf_play_c,v 1.2 2007/05/25 16:23:51 martynas Exp $
---- player/swf_play.c.orig     Fri Apr  4 07:11:57 2003
-+++ player/swf_play.c  Thu May 24 19:05:49 2007
-@@ -390,7 +390,7 @@ static void embedded (GtkPlug *plug, gpointer data)
- static gboolean input(GIOChannel *chan, GIOCondition cond, gpointer ignored)
- {
-       char *data;
--      int bytes_read;
-+      size_t bytes_read;
-       GError *error = NULL;
-       int ret;
-
Index: patches/patch-plugin_Makefile_in
===================================================================
RCS file: patches/patch-plugin_Makefile_in
diff -N patches/patch-plugin_Makefile_in
--- patches/patch-plugin_Makefile_in    24 Jun 2003 08:11:14 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugin_Makefile_in,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
---- plugin/Makefile.in.orig    Sun May 18 15:54:20 2003
-+++ plugin/Makefile.in Fri Jun 13 03:34:43 2003
-@@ -113,7 +113,7 @@ am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
-
--plugindir = $(libdir)/mozilla/plugins/
-+plugindir = $(libdir)/mozilla-plugins/
-
- @[EMAIL PROTECTED] = libmozswfdec.la
- @[EMAIL PROTECTED] =
Index: patches/patch-plugin_plugin_c
===================================================================
RCS file: patches/patch-plugin_plugin_c
diff -N patches/patch-plugin_plugin_c
--- patches/patch-plugin_plugin_c       25 May 2007 16:23:51 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-plugin_plugin_c,v 1.2 2007/05/25 16:23:51 martynas Exp $
---- plugin/plugin.c.orig       Thu Nov 21 10:51:38 2002
-+++ plugin/plugin.c    Thu May 24 19:05:49 2007
-@@ -1,8 +1,9 @@
-
-
- #include <stdio.h>
--#include <stdint.h>
-+/* #include <stdint.h> */
- #include <unistd.h>
-+#include <sys/signal.h>
- #include <sys/wait.h>
- #include <config.h>
-
-@@ -240,7 +241,7 @@ static void plugin_stream_as_file(NPP instance, NPStre
-
- /* exported functions */
-
--NPError NP_GetValue(NPP instance, NPPVariable variable, void *value)
-+NPError NP_GetValue(void* future, NPPVariable variable, void *value)
- {
-     NPError err = NPERR_NO_ERROR;
-
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        24 Jun 2008 14:59:37 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- swfdec-gtk/Makefile.am.orig        Mon Mar 17 23:05:54 2008
++++ swfdec-gtk/Makefile.am     Sun May 11 01:31:19 2008
+@@ -16,7 +16,8 @@ [EMAIL PROTECTED]@_la_SOURCES = \
+       swfdec_gtk_player.c \
+       swfdec_gtk_socket.c \
+       swfdec_gtk_system.c \
+-      swfdec_gtk_widget.c
++      swfdec_gtk_widget.c \
++      ../compat.c
+
+ noinst_HEADERS = \
+       swfdec_playback.h \
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
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-swfdec-gtk_swfdec_playback_oss_c      24 Jun 2008 14:59:37 
-0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- swfdec-gtk/swfdec_playback_oss.c.orig      Sat May 10 14:47:25 2008
++++ swfdec-gtk/swfdec_playback_oss.c   Sat May 10 14:48:19 2008
+@@ -23,7 +23,7 @@
+ #endif
+
+ #include <sys/ioctl.h>
+-#include <sys/soundcard.h>
++#include <soundcard.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -115,7 +115,7 @@ swfdec_playback_stream_open (SwfdecPlayback *sound, Sw
+   guint rate;
+   int dsp_fd, ret, format, channels, fragsize;
+
+-  dsp_fd = open("/dev/dsp", O_WRONLY);
++  dsp_fd = open("/dev/audio", O_WRONLY);
+   if (dsp_fd == -1) {
+     g_printerr ("Failed to open /dev/dsp\n");
+     return;
+@@ -217,7 +217,7 @@ audio_removed (SwfdecPlayer *player, SwfdecAudio *audi
+       return;
+     }
+   }
+-  g_assert_not_reached ();
++  return;
+ }
+
+ SwfdecPlayback *
Index: patches/patch-swfdec_Makefile_am
===================================================================
RCS file: patches/patch-swfdec_Makefile_am
diff -N patches/patch-swfdec_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-swfdec_Makefile_am    24 Jun 2008 14:59:37 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- swfdec/Makefile.am.orig    Wed Apr 23 19:45:54 2008
++++ swfdec/Makefile.am Sun May 11 01:14:22 2008
+@@ -155,7 +155,8 @@ libswfdec_source_files = \
+       swfdec_video_movie_as.c \
+       swfdec_xml_node.c \
+       swfdec_xml.c \
+-      swfdec_xml_socket.c
++      swfdec_xml_socket.c \
++      ../compat.c
+
+ [EMAIL PROTECTED]@_la_SOURCES = \
+       $(libswfdec_source_files) \
Index: patches/patch-swfdec_swfdec_button_c
===================================================================
RCS file: patches/patch-swfdec_swfdec_button_c
diff -N patches/patch-swfdec_swfdec_button_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-swfdec_swfdec_button_c        24 Jun 2008 14:59:37 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- swfdec/swfdec_button.c.orig        Sun May 11 05:35:17 2008
++++ swfdec/swfdec_button.c     Sun May 11 05:36:44 2008
+@@ -222,6 +222,8 @@ tag_func_define_button_2 (SwfdecSwfDecoder * s, guint
+     key = condition >> 9;
+     condition &= 0x1FF;
+     condition = swfdec_button_translate_conditions (condition,
button->menubutton);
++    if (key)
++      condition |= 1 << SWFDEC_EVENT_KEY_DOWN;
+
+     SWFDEC_LOG (" length = %d", length);
+
Index: patches/patch-swfdec_swfdec_event_c
===================================================================
RCS file: patches/patch-swfdec_swfdec_event_c
diff -N patches/patch-swfdec_swfdec_event_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-swfdec_swfdec_event_c 24 Jun 2008 14:59:37 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- swfdec/swfdec_event.c.orig Sun May 11 05:36:55 2008
++++ swfdec/swfdec_event.c      Sun May 11 05:37:50 2008
+@@ -186,7 +186,7 @@ swfdec_event_list_execute (SwfdecEventList *list, Swfd
+   for (i = 0; i < list->events->len; i++) {
+     SwfdecEvent *event = &g_array_index (list->events, SwfdecEvent, i);
+     if ((event->conditions & condition) &&
+-      event->key == key) {
++      (condition != 1 << SWFDEC_EVENT_KEY_DOWN || event->key == key)) {
+       SWFDEC_LOG ("executing script for event %u on scriptable %p",
condition, object);
+       swfdec_as_object_run (object, event->script);
+     }
Index: pkg/PFRAG.plugin
===================================================================
RCS file: pkg/PFRAG.plugin
diff -N pkg/PFRAG.plugin
--- pkg/PFRAG.plugin    25 May 2007 16:23:51 -0000      1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.plugin,v 1.4 2007/05/25 16:23:51 martynas Exp 
$
-lib/mozilla-plugins/
[EMAIL PROTECTED] lib/mozilla-plugins/libmozswfdec.a
[EMAIL PROTECTED] lib/mozilla-plugins/libmozswfdec.la
[EMAIL PROTECTED] lib/mozilla-plugins/libmozswfdec.so
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/swfdec/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.shared
--- pkg/PFRAG.shared    29 Dec 2005 12:57:59 -0000      1.3
+++ pkg/PFRAG.shared    24 Jun 2008 14:59:37 -0000
@@ -1,2 +1,3 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.3 2005/12/29 12:57:59 steven Exp $
[EMAIL PROTECTED] lib/libswfdec.so.${LIBswfdec_VERSION}
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/libswfdec-0.6.so.${LIBswfdec-0.6_VERSION}
[EMAIL PROTECTED] lib/libswfdec-gtk-0.6.so.${LIBswfdec-gtk-0.6_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/swfdec/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   15 Sep 2004 00:50:11 -0000      1.3
+++ pkg/PLIST   24 Jun 2008 14:59:37 -0000
@@ -1,11 +1,100 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:11 espie Exp $
-bin/swf_play
-include/swfdec/
-include/swfdec/swf.h
-include/swfdec/swfdec.h
-lib/libswfdec.a
-lib/libswfdec.la
-lib/pkgconfig/
-lib/pkgconfig/swfdec.pc
-%%plugin%%
[EMAIL PROTECTED] $OpenBSD$
 %%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
+lib/pkgconfig/
+lib/pkgconfig/swfdec-0.6.pc
+lib/pkgconfig/swfdec-gtk-0.6.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
+share/gtk-doc/html/swfdec/SwfdecGtkPlayer.html
+share/gtk-doc/html/swfdec/SwfdecGtkWidget.html
+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/SwfdecSocket.html
+share/gtk-doc/html/swfdec/SwfdecStream.html
+share/gtk-doc/html/swfdec/SwfdecSystem.html
+share/gtk-doc/html/swfdec/ch01.html
+share/gtk-doc/html/swfdec/ch02.html
+share/gtk-doc/html/swfdec/ch03.html
+share/gtk-doc/html/swfdec/ch04.html
+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/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-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.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

Attachment: swfdec-mozilla.tgz
Description: GNU Zip compressed data

Reply via email to