Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/swfdec/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 13 Nov 2007 17:10:25 -0000 1.18 +++ Makefile 2 Dec 2007 00:12:15 -0000 @@ -1,13 +1,14 @@ # $OpenBSD: Makefile,v 1.18 2007/11/13 17:10:25 steven Exp $ COMMENT= flash rendering library -DISTNAME= swfdec-0.2.2 -PKGNAME= ${DISTNAME}p5 -SHARED_LIBS= swfdec 0.0 +DISTNAME= swfdec-0.5.4 +PKGNAME= ${DISTNAME} +SHARED_LIBS= swfdec-0.5 4.0 \ + swfdec-gtk-0.5 4.0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swfdec/} +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.5/ -HOMEPAGE= http://swfdec.sourceforge.net/ +HOMEPAGE= http://swfdec.freedesktop.org/ MAINTAINER= Jolan Luff @@ -16,35 +17,31 @@ 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 pthread 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 + +LIB_DEPENDS= avcodec.>=10,avutil.>=4::graphics/ffmpeg \ + cairo.>=7::graphics/cairo \ + gmodule-2.0.>=1200,gobject-2.0.>=1200,gthread-2.0.>=1200,glib-2.0.>=1200::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 - -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 + oil-0.3.>=2::devel/liboil \ + pangocairo-1.0.>=1300,pangoft2-1.0.>=1300,pango-1.0.>=1300::devel/pango \ + soup-2.2.>=13::devel/libsoup + + +USE_X11= Yes +USE_LIBTOOL= Yes +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.61 +CONFIGURE_ARGS+= --with-audio=oss --disable-gtk-doc --disable-vivified \ + --enable-ffmpeg --disable-gstreamer --enable-mad +CONFIGURE_ENV= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig" +post-install: + gtk-update-icon-cache -f -t ${LOCALBASE}/share/icons/hicolor .include Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/swfdec/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 5 Apr 2007 16:19:58 -0000 1.3 +++ distinfo 2 Dec 2007 00:12:15 -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.5.4.tar.gz) = UGsDIgS3H/rH0EJOr5YIxA== +RMD160 (swfdec-0.5.4.tar.gz) = Ece7zuS/+i6Cam1I4oy0ugl0nyk= +SHA1 (swfdec-0.5.4.tar.gz) = Cu2Vw8XYlKMjq+8rJSvcRzl7jfs= +SHA256 (swfdec-0.5.4.tar.gz) = tDJW1ViW1971pdQD8FM+CTfFEesyvMqXyybSKPLgyU4= +SIZE (swfdec-0.5.4.tar.gz) = 6857084 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-configure_ac =================================================================== RCS file: /cvs/ports/graphics/swfdec/patches/patch-configure_ac,v retrieving revision 1.1 diff -u -r1.1 patch-configure_ac --- patches/patch-configure_ac 25 May 2007 16:23:51 -0000 1.1 +++ patches/patch-configure_ac 2 Dec 2007 00:12:15 -0000 @@ -1,18 +1,178 @@ -$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 Thu Nov 15 11:51:46 2007 ++++ configure.ac Sat Dec 1 14:07:24 2007 +@@ -162,7 +162,11 @@ 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= ++ if test `uname` = "OpenBSD" ; then ++ AUDIO_LIBS=-lossaudio ++ else ++ AUDIO_LIBS= ++ fi + 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]) +@@ -205,7 +209,12 @@ AC_ARG_ENABLE(mad, + enable_mad="no") + + if test "$enable_mad" = "yes"; then +- AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad", HAVE_MAD="no") ++ PKG_CHECK_EXISTS([mad],[ ++ MAD_VER=0.15.0 ++ PKG_CHECK_MODULES(MAD, mad >= $MAD_VER mad >= $MAD_VER, HAVE_MAD=yes, HAVE_MAD=no) ++ ], [ ++ AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad", HAVE_MAD="no") ++ ]) + AC_SUBST(MAD_LIBS) + if test "x$HAVE_MAD" = xyes; then + AC_DEFINE(HAVE_MAD, 1, [Define if mad is enabled]) +@@ -320,6 +329,147 @@ else fi + AC_DEFINE_UNQUOTED(PACKAGE_PREFIX, "$PACKAGE_PREFIX", [Define the package prefix]) + AC_SUBST(PACKAGE_PREFIX) ++ ++dnl ####################### ++dnl # C99 related tests # ++dnl ####################### ++ ++AC_DEFUN([AC_C99_NAN], ++ AC_MSG_CHECKING([checking for c99 NAN]) ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++#ifdef NAN ++return 0; ++#endif ++return 1 ], ++ )],nan_defined=1,nan_defined=0)] ++ ++if test $nan_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE([NAN],[(0.0/atof("?"))], [Define NAN]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_DEFUN([AC_C99_ISFINITE], ++ AC_MSG_CHECKING([checking for c99 isfinite]) ++ [AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++isfinite(0) ++ ], ++ )],isfinite_defined=1,isfinite_defined=0)] ++ ++if test $isfinite_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE(isfinite(arg),[finite(arg)] , [Define isfinite]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_DEFUN([AC_C99_INFINITY], ++ AC_MSG_CHECKING([checking for c99 INFINITY]) ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++#ifdef INFINITY ++return 0; ++#endif ++return 1 ], ++ )],infinity_defined=1,infinity_defined=0)] ++ ++if test $infinity_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE(INFINITY, [atof("Infinity")], [Define INFINITY]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_DEFUN([AC_C99_FP_INFINITE], ++ AC_MSG_CHECKING([checking for c99 FP_INFINITE]) ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++#if FP_INFINITE ++return 0; ++#endif ++return 1 ], ++ )],fp_infinite_defined=1,fp_infinite_defined=0)] ++ ++if test $fp_infinite_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE(FP_INFINITE, 1, [Define FP_INFINITE]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_DEFUN([AC_C99_FP_NAN], ++ AC_MSG_CHECKING([checking for c99 FP_NAN]) ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++#if FP_NAN ++return 0; ++#endif ++return 1 ], ++ )],fp_nan_defined=1,fp_nan_defined=0)] ++ ++if test $fp_nan_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE(FP_NAN, 2, [Define FP_NAN]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_DEFUN([AC_C99_FP_ZERO], ++ AC_MSG_CHECKING([checking for c99 FP_ZERO]) ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [ ++#include ++ ], ++ [ ++#if FP_ZERO ++return 0; ++#endif ++return 1 ], ++ )],fp_zero_defined=1,fp_zero_defined=0)] ++ ++if test $fp_zero_defined -eq 0; then ++ AC_MSG_RESULT([missing - using our own]) ++ AC_DEFINE(FP_ZERO, 5, [Define FP_ZERO]) ++else ++ AC_MSG_RESULT([yes]) ++fi ++) ++ ++AC_C99_NAN ++AC_C99_ISFINITE ++AC_C99_INFINITY ++AC_C99_FP_INFINITE ++AC_C99_FP_NAN ++AC_C99_FP_ZERO + + dnl ######################### + dnl # Make the output files # Index: patches/patch-libswfdec-gtk_swfdec_gtk_widget_c =================================================================== RCS file: patches/patch-libswfdec-gtk_swfdec_gtk_widget_c diff -N patches/patch-libswfdec-gtk_swfdec_gtk_widget_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec-gtk_swfdec_gtk_widget_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +--- libswfdec-gtk/swfdec_gtk_widget.c.orig Fri Nov 9 19:07:32 2007 ++++ libswfdec-gtk/swfdec_gtk_widget.c Sat Dec 1 13:48:00 2007 +@@ -217,6 +217,7 @@ swfdec_gtk_widget_expose (GtkWidget *gtkwidget, GdkEve + (surface = swfdec_gtk_widget_create_renderer (priv->renderer, + event->area.width, event->area.height)) == NULL) { + cr = gdk_cairo_create (gtkwidget->window); ++ + } else { + cr = cairo_create (surface); + cairo_translate (cr, -event->area.x, -event->area.y); +@@ -626,6 +627,7 @@ void + swfdec_gtk_widget_set_renderer (SwfdecGtkWidget *widget, cairo_surface_type_t renderer) + { + g_return_if_fail (SWFDEC_IS_GTK_WIDGET (widget)); ++ renderer = FALSE; + + widget->priv->renderer = renderer; + if (widget->priv->renderer_set == FALSE) { Index: patches/patch-libswfdec-gtk_swfdec_playback_oss_c =================================================================== RCS file: patches/patch-libswfdec-gtk_swfdec_playback_oss_c diff -N patches/patch-libswfdec-gtk_swfdec_playback_oss_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec-gtk_swfdec_playback_oss_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,61 @@ +$OpenBSD$ +--- libswfdec-gtk/swfdec_playback_oss.c.orig Fri Aug 3 22:32:24 2007 ++++ libswfdec-gtk/swfdec_playback_oss.c Sat Dec 1 20:50:23 2007 +@@ -22,7 +22,12 @@ + #include "config.h" + #endif + ++#ifdef __OpenBSD__ ++#include ++#else + #include ++#endif ++ + #include + #include + #include +@@ -115,12 +120,19 @@ swfdec_stream_open (SwfdecPlayback *sound, SwfdecAudio + guint rate; + int dsp_fd, ret, format, channels, fragsize; + ++#ifdef __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); + if (ret == -1) { +@@ -209,13 +221,16 @@ 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_stream_close (stream); +- return; +- } ++ if (sound->streams ) { ++ for (walk = sound->streams; walk; walk = walk->next) { ++ Stream *stream = walk->data; ++ if (stream->audio == audio) { ++ swfdec_stream_close (stream); ++ return; ++ } ++ } ++ } { ++ return; + } + g_assert_not_reached (); + } 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 - //#include - --#include -+#include - - #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 - #define f32 float - #define s16 short --#define HAVE_IEEE754_H -+#undef HAVE_IEEE754_H - - - /* storage class */ Index: patches/patch-libswfdec_swfdec_as_date_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_date_c diff -N patches/patch-libswfdec_swfdec_as_date_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_date_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_date.c.orig Fri Nov 9 21:02:18 2007 ++++ libswfdec/swfdec_as_date.c Sat Dec 1 13:48:01 2007 +@@ -904,7 +904,7 @@ swfdec_as_date_UTC (SwfdecAsContext *cx, SwfdecAsObjec + SwfdecAsValue *argv, SwfdecAsValue *ret) + { + guint i; +- int year, num; ++ int year=NULL, num; + double d; + BrokenTime brokentime; + Index: patches/patch-libswfdec_swfdec_as_interpret_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_interpret_c diff -N patches/patch-libswfdec_swfdec_as_interpret_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_interpret_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_interpret.c.orig Wed Nov 14 18:45:05 2007 ++++ libswfdec/swfdec_as_interpret.c Sat Dec 1 13:48:01 2007 +@@ -46,7 +46,7 @@ + #include "swfdec_resource.h" + #include "swfdec_resource_request.h" + #include "swfdec_text_field_movie.h" // for typeof +- ++#include "stdlib.h" + /* Define this to get SWFDEC_WARN'd about missing properties of objects. + * This can be useful to find out about unimplemented native properties, + * but usually just causes a lot of spam. */ Index: patches/patch-libswfdec_swfdec_as_number_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_number_c diff -N patches/patch-libswfdec_swfdec_as_number_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_number_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_number.c.orig Thu Oct 18 20:05:48 2007 ++++ libswfdec/swfdec_as_number.c Sat Dec 1 13:48:01 2007 +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + + #include "swfdec_as_number.h" + #include "swfdec_as_context.h" Index: patches/patch-libswfdec_swfdec_as_object_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_object_c diff -N patches/patch-libswfdec_swfdec_as_object_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_object_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_object.c.orig Wed Nov 14 21:59:02 2007 ++++ libswfdec/swfdec_as_object.c Sat Dec 1 13:48:01 2007 +@@ -1230,7 +1230,7 @@ swfdec_as_object_create (SwfdecAsFunction *fun, guint + SwfdecAsContext *context; + SwfdecAsFunction *cur; + SwfdecAsFrame *frame; +- guint size; ++ guint size=0; + GType type = 0; + + g_return_if_fail (SWFDEC_IS_AS_FUNCTION (fun)); Index: patches/patch-libswfdec_swfdec_as_string_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_string_c diff -N patches/patch-libswfdec_swfdec_as_string_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_string_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_string.c.orig Wed Nov 14 21:59:02 2007 ++++ libswfdec/swfdec_as_string.c Sat Dec 1 13:48:01 2007 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "swfdec_as_string.h" + #include "swfdec_as_array.h" Index: patches/patch-libswfdec_swfdec_as_types_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_as_types_c diff -N patches/patch-libswfdec_swfdec_as_types_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_as_types_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,43 @@ +$OpenBSD$ +--- libswfdec/swfdec_as_types.c.orig Sat Nov 10 13:21:23 2007 ++++ libswfdec/swfdec_as_types.c Sat Dec 1 13:48:01 2007 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "swfdec_as_types.h" + #include "swfdec_as_object.h" +@@ -234,15 +235,13 @@ swfdec_as_double_to_string (SwfdecAsContext *context, + { + g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), SWFDEC_AS_STR_EMPTY); + +- switch (fpclassify (d)) { +- case FP_ZERO: +- return SWFDEC_AS_STR_0; +- case FP_INFINITE: +- return d < 0 ? SWFDEC_AS_STR__Infinity : SWFDEC_AS_STR_Infinity; +- case FP_NAN: +- return SWFDEC_AS_STR_NaN; +- default: +- { ++ if (d == 0) { ++ return SWFDEC_AS_STR_0; ++ } else if (isinf(d) == 1) { ++ return d < 0 ? SWFDEC_AS_STR__Infinity : SWFDEC_AS_STR_Infinity; ++ } else if (isnan(d) == 1) { ++ return SWFDEC_AS_STR_NaN; ++ } + gboolean found = FALSE, gotdot = FALSE; + guint digits = 15; + char tmp[50], *end, *start, *s; +@@ -329,8 +328,6 @@ swfdec_as_double_to_string (SwfdecAsContext *context, + /* end string */ + *start = 0; + return swfdec_as_context_get_string (context, s); +- } +- } + } + + /** Index: patches/patch-libswfdec_swfdec_bits_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_bits_c diff -N patches/patch-libswfdec_swfdec_bits_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_bits_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libswfdec/swfdec_bits.c.orig Thu Oct 18 20:05:48 2007 ++++ libswfdec/swfdec_bits.c Sat Dec 1 13:48:01 2007 +@@ -739,7 +739,7 @@ out: + } else { + if (buffer->length < z.total_out) { + SWFDEC_WARNING ("Not enough data decompressed: %lu instead of %u expected", +- z.total_out, buffer->length); ++ (long unsigned int) z.total_out, buffer->length); + memset (buffer->data + z.total_out, 0, buffer->length - z.total_out); + } + } Index: patches/patch-libswfdec_swfdec_codec_gst_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_codec_gst_c diff -N patches/patch-libswfdec_swfdec_codec_gst_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_codec_gst_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,30 @@ +$OpenBSD$ +--- libswfdec/swfdec_codec_gst.c.orig Fri Nov 9 19:07:32 2007 ++++ libswfdec/swfdec_codec_gst.c Sat Dec 1 13:48:01 2007 +@@ -492,7 +492,7 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *d + SwfdecVideoImage *image) + { + SwfdecGstVideo *player = (SwfdecGstVideo *) dec; +-#define ALIGN(x, n) (((x) + (n) - 1) & (~((n) - 1))) ++#define SWF_ALIGN(x, n) (((x) + (n) - 1) & (~((n) - 1))) + GstBuffer *buf; + GstCaps *caps; + GstStructure *structure; +@@ -542,12 +542,12 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *d + break; + case SWFDEC_VIDEO_FORMAT_I420: + image->plane[0] = buf->data; +- image->rowstride[0] = ALIGN (image->width, 4); +- image->plane[1] = image->plane[0] + image->rowstride[0] * ALIGN (image->height, 2); +- image->rowstride[1] = ALIGN (image->width, 8) / 2; +- image->plane[2] = image->plane[1] + image->rowstride[1] * ALIGN (image->height, 2) / 2; ++ image->rowstride[0] = SWF_ALIGN (image->width, 4); ++ image->plane[1] = image->plane[0] + image->rowstride[0] * SWF_ALIGN (image->height, 2); ++ image->rowstride[1] = SWF_ALIGN (image->width, 8) / 2; ++ image->plane[2] = image->plane[1] + image->rowstride[1] * SWF_ALIGN (image->height, 2) / 2; + image->rowstride[2] = image->rowstride[1]; +- g_assert (image->plane[2] + image->rowstride[2] * ALIGN (image->height, 2) / 2 == image->plane[0] + buf->size); ++ g_assert (image->plane[2] + image->rowstride[2] * SWF_ALIGN (image->height, 2) / 2 == image->plane[0] + buf->size); + break; + default: + g_return_val_if_reached (FALSE); Index: patches/patch-libswfdec_swfdec_text_field_movie_html_c =================================================================== RCS file: patches/patch-libswfdec_swfdec_text_field_movie_html_c diff -N patches/patch-libswfdec_swfdec_text_field_movie_html_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libswfdec_swfdec_text_field_movie_html_c 2 Dec 2007 00:12:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libswfdec/swfdec_text_field_movie_html.c.orig Fri Nov 9 19:05:52 2007 ++++ libswfdec/swfdec_text_field_movie_html.c Sat Dec 1 13:48:02 2007 +@@ -541,7 +541,7 @@ swfdec_text_field_movie_html_text_append_paragraph (Sw + SwfdecTextFormat *format, *format_prev, *format_font; + GSList *iter, *fonts, *iter_font; + guint index_, index_prev; +- gboolean textformat, bullet, font; ++ gboolean textformat, bullet, font=FALSE; + char *escaped; + + g_return_val_if_fail (SWFDEC_IS_TEXT_FIELD_MOVIE (text), string); 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/ - - @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozswfdec.la - @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = 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 --#include -+/* #include */ - #include -+#include - #include - #include - -@@ -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: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/graphics/swfdec/pkg/PFRAG.shared,v retrieving revision 1.3 diff -u -r1.3 PFRAG.shared --- pkg/PFRAG.shared 29 Dec 2005 12:57:59 -0000 1.3 +++ pkg/PFRAG.shared 2 Dec 2007 00:12:15 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/29 12:57:59 steven Exp $ -@lib lib/libswfdec.so.${LIBswfdec_VERSION} +@lib lib/libswfdec-0.5.so.${LIBswfdec-0.5_VERSION} +@lib lib/libswfdec-gtk-0.5.so.${LIBswfdec-gtk-0.5_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/swfdec/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 15 Sep 2004 00:50:11 -0000 1.3 +++ pkg/PLIST 2 Dec 2007 00:12:15 -0000 @@ -1,11 +1,91 @@ @comment $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%% %%SHARED%% +include/swfdec-0.5/ +include/swfdec-0.5/libswfdec/ +include/swfdec-0.5/libswfdec-gtk/ +include/swfdec-0.5/libswfdec-gtk/swfdec-gtk.h +include/swfdec-0.5/libswfdec-gtk/swfdec_gtk_keys.h +include/swfdec-0.5/libswfdec-gtk/swfdec_gtk_loader.h +include/swfdec-0.5/libswfdec-gtk/swfdec_gtk_player.h +include/swfdec-0.5/libswfdec-gtk/swfdec_gtk_widget.h +include/swfdec-0.5/libswfdec/swfdec.h +include/swfdec-0.5/libswfdec/swfdec_as_array.h +include/swfdec-0.5/libswfdec/swfdec_as_context.h +include/swfdec-0.5/libswfdec/swfdec_as_debugger.h +include/swfdec-0.5/libswfdec/swfdec_as_frame.h +include/swfdec-0.5/libswfdec/swfdec_as_function.h +include/swfdec-0.5/libswfdec/swfdec_as_native_function.h +include/swfdec-0.5/libswfdec/swfdec_as_object.h +include/swfdec-0.5/libswfdec/swfdec_as_types.h +include/swfdec-0.5/libswfdec/swfdec_audio.h +include/swfdec-0.5/libswfdec/swfdec_buffer.h +include/swfdec-0.5/libswfdec/swfdec_enums.h +include/swfdec-0.5/libswfdec/swfdec_file_loader.h +include/swfdec-0.5/libswfdec/swfdec_keys.h +include/swfdec-0.5/libswfdec/swfdec_loader.h +include/swfdec-0.5/libswfdec/swfdec_player.h +include/swfdec-0.5/libswfdec/swfdec_rectangle.h +include/swfdec-0.5/libswfdec/swfdec_script.h +include/swfdec-0.5/libswfdec/swfdec_system.h +include/swfdec-0.5/libswfdec/swfdec_url.h +lib/libswfdec-0.5.a +lib/libswfdec-0.5.la +lib/libswfdec-gtk-0.5.a +lib/libswfdec-gtk-0.5.la +lib/pkgconfig/ +lib/pkgconfig/swfdec-0.5.pc +lib/pkgconfig/swfdec-gtk-0.5.pc +share/gtk-doc/ +share/gtk-doc/html/ +share/gtk-doc/html/swfdec/ +share/gtk-doc/html/swfdec/SwfdecAsContext.html +share/gtk-doc/html/swfdec/SwfdecAsDebugger.html +share/gtk-doc/html/swfdec/SwfdecAudio.html +share/gtk-doc/html/swfdec/SwfdecGtkLoader.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/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/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.html +share/gtk-doc/html/swfdec/swfdec-Internals.html +share/gtk-doc/html/swfdec/swfdec-SwfdecAsArray.html +share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html +share/gtk-doc/html/swfdec/swfdec-SwfdecAsFunction.html +share/gtk-doc/html/swfdec/swfdec-SwfdecAsObject.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