Update to 0.4.2. Now I can play Strindberg and Helium, but with no sound.

5 files changed, 11 insertions, 39 deletions

diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 653578efaa68..d3ad90c4e9d2 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	swfdec-plugin
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.schleef.org/swfdec/download/
-DISTNAME=	swfdec-${PORTVERSION}
+MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.4/
+DISTNAME=	swfdec-mozilla-${PORTVERSION}
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	Flash rendering plugin
 
-LIB_DEPENDS=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
+LIB_DEPENDS=	swfdec-0.4:${PORTSDIR}/graphics/swfdec
 .if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
@@ -24,11 +24,12 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${P
 .endif
 
 USE_SDL=	sdl
-USE_GNOME=	gnomehack gtk20 libartlgpl2
+USE_GNOME=	gnomehack gtk20
 USE_GSTREAMER=	yes
 USE_GETOPT_LONG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
+		--with-audio=none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -39,12 +40,10 @@ CONFIGURE_ENV+=	MOZILLA_CONFIG="${LOCALBASE}/lib/mozilla/mozilla-config"
 .endif
 
 INSTALLS_SHLIB=	yes
-INSTALL_WRKSRC=	${WRKSRC}/plugin
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c
-	@${REINPLACE_CMD} -e "s,mozilla/plugins/,browser_plugins/," ${WRKSRC}/plugin/Makefile.in
+	@${REINPLACE_CMD} -e "s|plugindir =.*|plugindir = $(PREFIX)/lib/browser_plugins|g" ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo
index ab85c3a16477..279cfce961c9 100644
--- a/www/swfdec-plugin/distinfo
+++ b/www/swfdec-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (swfdec-0.3.6.tar.gz) = bcfca3a8ce1d524ebf4d11fd511dedb8
-SHA256 (swfdec-0.3.6.tar.gz) = 6efdff894bd0833223f9ad2b7cf7ef227d0c6fa811d816dffd75e08c7654f56c
-SIZE (swfdec-0.3.6.tar.gz) = 1088131
+MD5 (swfdec-mozilla-0.4.2.tar.gz) = 55de4eb6d2b7820c56eac3520c8f1734
+SHA256 (swfdec-mozilla-0.4.2.tar.gz) = 2461d4646a89d53d8b4b56b8e28ddc0e71a1e4bb67f43beedd363263ea98b661
+SIZE (swfdec-mozilla-0.4.2.tar.gz) = 349372
diff --git a/www/swfdec-plugin/files/patch-Makefile.in b/www/swfdec-plugin/files/patch-Makefile.in
deleted file mode 100644
index dfdd107b6878..000000000000
--- a/www/swfdec-plugin/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Nov 15 13:16:09 2006
-+++ Makefile.in	Wed Nov 15 13:16:31 2006
-@@ -242,7 +242,7 @@
- @WITH_GLIB_COMPAT_TRUE@glib_compat_subdirs = glib-compat
- @WITH_GLIB_COMPAT_FALSE@no_glib_compat_subdirs = gimp-loader pixbuf-loader
- @WITH_GLIB_COMPAT_TRUE@no_glib_compat_subdirs = 
--SUBDIRS = $(glib_compat_subdirs) libswfdec test plugin $(no_glib_compat_subdirs)
-+SUBDIRS = $(glib_compat_subdirs) libswfdec plugin
- DIST_SUBDIRS = \
- 	gimp-loader \
- 	glib-compat \
diff --git a/www/swfdec-plugin/files/patch-ltmain.sh b/www/swfdec-plugin/files/patch-ltmain.sh
deleted file mode 100644
index b3c8af1df8e6..000000000000
--- a/www/swfdec-plugin/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/swfdec-plugin/pkg-plist b/www/swfdec-plugin/pkg-plist
index ba11f2a36958..12720c863111 100644
--- a/www/swfdec-plugin/pkg-plist
+++ b/www/swfdec-plugin/pkg-plist
@@ -1,4 +1,3 @@
-bin/swfdec-mozilla-player
 lib/browser_plugins/libswfdecmozilla.a
 lib/browser_plugins/libswfdecmozilla.la
 lib/browser_plugins/libswfdecmozilla.so