diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/Makefile /var/tmp/ggyy/swfdec/Makefile --- /usr/ports/graphics/swfdec/Makefile Tue Nov 9 05:33:46 2004 +++ /var/tmp/ggyy/swfdec/Makefile Thu Nov 25 16:53:03 2004 @@ -7,33 +7,31 @@ # PORTNAME= swfdec -PORTVERSION= 0.2.2 -PORTREVISION= 6 +PORTVERSION= 0.3.2 +PORTREVISION= 0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://www.schleef.org/swfdec/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Flash Rendering Library -LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad +LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ + oil-0.2.0:${PORTSDIR}/devel/liboil +USE_REINPLACE= yes USE_X_PREFIX= yes USE_SDL= sdl USE_GNOME= gnomehack gtk20 libartlgpl2 USE_GETOPT_LONG= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib - -.include +PLIST_SUB= VERSION=${PORTVERSION:R} post-patch: - @${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG:T}|g" ${WRKSRC}/configure - @${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/libswfdec/jpeg/sl_types.h + @${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c -.include +.include diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/distinfo /var/tmp/ggyy/swfdec/distinfo --- /usr/ports/graphics/swfdec/distinfo Fri Jan 30 05:37:20 2004 +++ /var/tmp/ggyy/swfdec/distinfo Thu Nov 25 16:53:03 2004 @@ -1,2 +1,2 @@ -MD5 (swfdec-0.2.2.tar.gz) = 08c60d18f350c68c4b938dc29e9b1191 -SIZE (swfdec-0.2.2.tar.gz) = 332280 +MD5 (swfdec-0.3.2.tar.gz) = 8732cd3b96ab803ceb3e723b6dbf0493 +SIZE (swfdec-0.3.2.tar.gz) = 489855 diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/files/patch-clipconv_f32_s16.h /var/tmp/ggyy/swfdec/files/patch-clipconv_f32_s16.h --- /usr/ports/graphics/swfdec/files/patch-clipconv_f32_s16.h Sun Apr 6 15:45:30 2003 +++ /var/tmp/ggyy/swfdec/files/patch-clipconv_f32_s16.h Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- libswfdec/mpglib/clipconv_f32_s16.h.orig Sat Apr 5 15:54:30 2003 -+++ libswfdec/mpglib/clipconv_f32_s16.h Sat Apr 5 15:57:36 2003 -@@ -34,7 +34,7 @@ - //#include - #define f32 float - #define s16 short --#define HAVE_IEEE754_H -+#undef HAVE_IEEE754_H - - - /* storage class */ diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/files/patch-ltmain.sh /var/tmp/ggyy/swfdec/files/patch-ltmain.sh --- /usr/ports/graphics/swfdec/files/patch-ltmain.sh Tue May 20 05:31:17 2003 +++ /var/tmp/ggyy/swfdec/files/patch-ltmain.sh Thu Nov 25 16:53:02 2004 @@ -1,15 +1,6 @@ ---- ltmain.sh.orig Thu Feb 6 05:37:40 2003 -+++ ltmain.sh Tue May 13 06:48:33 2003 -@@ -1072,7 +1072,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -4325,10 +4325,12 @@ +--- ltmain.sh.orig Wed Nov 24 17:28:43 2004 ++++ ltmain.sh Wed Nov 24 17:28:55 2004 +@@ -5551,10 +5551,12 @@ fi # Install the pseudo-library for information purposes. diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/files/patch-player-swf_play.c /var/tmp/ggyy/swfdec/files/patch-player-swf_play.c --- /usr/ports/graphics/swfdec/files/patch-player-swf_play.c Sat Apr 3 05:32:35 2004 +++ /var/tmp/ggyy/swfdec/files/patch-player-swf_play.c Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- player/swf_play.c.orig Thu Apr 3 23:11:57 2003 -+++ player/swf_play.c Fri Apr 2 13:34:32 2004 -@@ -390,7 +390,7 @@ - static gboolean input(GIOChannel *chan, GIOCondition cond, gpointer ignored) - { - char *data; -- int bytes_read; -+ gsize bytes_read; - GError *error = NULL; - int ret; - diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/pkg-descr /var/tmp/ggyy/swfdec/pkg-descr --- /usr/ports/graphics/swfdec/pkg-descr Sun Apr 6 15:45:30 2003 +++ /var/tmp/ggyy/swfdec/pkg-descr Thu Nov 25 16:53:03 2004 @@ -3,4 +3,4 @@ GStreamer, but it is a fully standalone library which only use the libart library for drawing. -WWW: http://swfdec.sourceforge.net/ +WWW: http://www.schleef.org/swfdec/ diff -ruN --exclude=CVS /usr/ports/graphics/swfdec/pkg-plist /var/tmp/ggyy/swfdec/pkg-plist --- /usr/ports/graphics/swfdec/pkg-plist Tue Apr 6 05:32:17 2004 +++ /var/tmp/ggyy/swfdec/pkg-plist Thu Nov 25 16:53:03 2004 @@ -1,10 +1,33 @@ -bin/swf_play -include/swfdec/swf.h -include/swfdec/swfdec.h +include/swfdec-%%VERSION%%/art.h +include/swfdec-%%VERSION%%/color.h +include/swfdec-%%VERSION%%/proto.h +include/swfdec-%%VERSION%%/swfdec.h +include/swfdec-%%VERSION%%/swfdec_actions.h +include/swfdec-%%VERSION%%/swfdec_bits.h +include/swfdec-%%VERSION%%/swfdec_buffer.h +include/swfdec-%%VERSION%%/swfdec_button.h +include/swfdec-%%VERSION%%/swfdec_debug.h +include/swfdec-%%VERSION%%/swfdec_decoder.h +include/swfdec-%%VERSION%%/swfdec_display.h +include/swfdec-%%VERSION%%/swfdec_font.h +include/swfdec-%%VERSION%%/swfdec_image.h +include/swfdec-%%VERSION%%/swfdec_internal.h +include/swfdec-%%VERSION%%/swfdec_layer.h +include/swfdec-%%VERSION%%/swfdec_object.h +include/swfdec-%%VERSION%%/swfdec_rect.h +include/swfdec-%%VERSION%%/swfdec_render.h +include/swfdec-%%VERSION%%/swfdec_render_libart.h +include/swfdec-%%VERSION%%/swfdec_shape.h +include/swfdec-%%VERSION%%/swfdec_sound.h +include/swfdec-%%VERSION%%/swfdec_sprite.h +include/swfdec-%%VERSION%%/swfdec_text.h +include/swfdec-%%VERSION%%/swfdec_transform.h +include/swfdec-%%VERSION%%/swfdec_types.h +include/swfdec-%%VERSION%%/tags.h +@dirrm include/swfdec-%%VERSION%% lib/gtk-2.0/2.4.0/loaders/swf_loader.a lib/gtk-2.0/2.4.0/loaders/swf_loader.so -lib/libswfdec.a -lib/libswfdec.so -lib/libswfdec.so.0 -libdata/pkgconfig/swfdec.pc -@dirrm include/swfdec +lib/libswfdec-%%VERSION%%.a +lib/libswfdec-%%VERSION%%.so +lib/libswfdec-%%VERSION%%.so.0 +libdata/pkgconfig/swfdec-%%VERSION%%.pc