Update to 0.6.0 and add support for the Mozilla plug-in.

Submitted by:	bland
Approved by:	maintainer (implicit)

6 files changed, 97 insertions, 14 deletions

diff --git a/multimedia/gstreamer-player/Makefile b/multimedia/gstreamer-player/Makefile
index 1399ce303fc2..b11a0aecdd2b 100644
--- a/multimedia/gstreamer-player/Makefile
+++ b/multimedia/gstreamer-player/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +16,6 @@ DISTNAME=	gst-player-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Simple yet functional mediaplayer written with GStreamer
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \
 		gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins \
 		popt.0:${PORTSDIR}/devel/popt
@@ -27,12 +25,11 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
 		gnomeprefix \
+		pkgconfig \
 		gconf2 \
 		libglade2 \
 		libgnomeui
 USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
-CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG}
 WANT_GNOME=	yes
 PLIST_SUB=	\
 	VERSION="${PORTVERSION}" \
@@ -41,8 +38,6 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		gst-player.1
 
-PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-
 # library minor number
 SHLIB_VERSION=	0
 
@@ -50,6 +45,29 @@ pre-install:
 # required for PREFIX safeness, the dir might not exist under PREFIX
 	@${MKDIR} ${PREFIX}/etc/gconf/
 
+.if defined(WITH_MOZILLA_PLUGIN)
+BUILD_DEPENDS+=	${X11BASE}/include/mozilla${HEADERS_SUFX}/plugin/npapi.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX}
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+MOZILLA=	${WITH_MOZILLA}
+HEADERS_SUFX=	-devel
+.else
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
+.endif
+.endif
+
+CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/lib/${MOZILLA}/mozilla-config"
+PLIST_SUB+=	MOZILLA_PLUGIN=""
+.else
+CONFIGURE_ENV+=	MOZILLA_CONFIG="${FALSE}"
+PLIST_SUB+=	MOZILLA_PLUGIN="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mnautilus2}!=""
diff --git a/multimedia/gstreamer-player/distinfo b/multimedia/gstreamer-player/distinfo
index 4202d46f6409..2439faa3587a 100644
--- a/multimedia/gstreamer-player/distinfo
+++ b/multimedia/gstreamer-player/distinfo
@@ -1 +1 @@
-MD5 (gst-player-0.5.1.tar.gz) = ff48e6ad2331899a60fab822d908b0bd
+MD5 (gst-player-0.6.0.tar.gz) = 2a2aae160c7b07c12fc54a067e013d55
diff --git a/multimedia/gstreamer-player/files/patch-configure b/multimedia/gstreamer-player/files/patch-configure
index df5c83c216a5..b4052b2665d9 100644
--- a/multimedia/gstreamer-player/files/patch-configure
+++ b/multimedia/gstreamer-player/files/patch-configure
@@ -1,14 +1,16 @@
---- configure.orig	Mon Apr 21 06:01:46 2003
-+++ configure	Sat May 10 23:21:51 2003
-@@ -7814,6 +7814,7 @@
+--- configure.orig	Tue Oct  7 15:28:39 2003
++++ configure	Tue Oct  7 15:30:47 2003
+@@ -18452,7 +18452,8 @@
+ 
  
  # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
++/usr/local/share/libtool13/ltconfig13 $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9305,7 +9306,11 @@
+@@ -20126,7 +20127,11 @@
    fi
    exec_prefix_save=$exec_prefix
    if test "x$exec_prefix" = "xNONE"; then
@@ -20,3 +22,12 @@
    fi
  
    full_var="$FROM_VAR"
+@@ -21793,7 +21798,7 @@
+ else
+   HAVE_MOZILLA="yes"
+ fi
+-_mozilla_include_dir=`mozilla-config --cflags|sed 's/-I\(.*\) .*/\1/'`
++_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"
+ 
+ 
diff --git a/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in b/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in
new file mode 100644
index 000000000000..bbdf61f6e328
--- /dev/null
+++ b/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in
@@ -0,0 +1,18 @@
+--- mozilla/Makefile.in.orig	Thu Nov  6 16:55:28 2003
++++ mozilla/Makefile.in	Thu Nov  6 16:56:31 2003
+@@ -215,13 +215,13 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-plugindir = $(libdir)/mozilla/plugins/
++plugindir = $(libdir)/browser_plugins/
+ 
+ plugin_LTLIBRARIES = libmozstreamer.la
+ 
+ libmozstreamer_la_SOURCES = plugin.c
+ libmozstreamer_la_CFLAGS = $(MOZILLA_CFLAGS) $(X_CFLAGS) -DBINDIR=\"$(bindir)\"
+-libmozstreamer_la_LDFLAGS = $(X_LIBS)
++libmozstreamer_la_LDFLAGS = -module -avoid-version $(X_LIBS)
+ libmozstreamer_la_LIBADD = -lXt
+ subdir = mozilla
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/multimedia/gstreamer-player/files/patch-mozilla::plugin.c b/multimedia/gstreamer-player/files/patch-mozilla::plugin.c
new file mode 100644
index 000000000000..d64bf2dc85f4
--- /dev/null
+++ b/multimedia/gstreamer-player/files/patch-mozilla::plugin.c
@@ -0,0 +1,30 @@
+--- mozilla/plugin.c.orig	Sat Jul 12 05:27:40 2003
++++ mozilla/plugin.c	Thu Nov  6 19:43:19 2003
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <stdint.h>
++#include <signal.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/wait.h>
+@@ -76,7 +77,7 @@
+ 		dup2(fds[2],0);
+ 		//dup2(fds[1],1);
+ 		
+-		argv[argc++] = "gst-player";
++		argv[argc++] = "gst-player-gtk";
+ 		argv[argc++] = "--xid";
+ 		argv[argc++] = xid_str;
+ 		if(plugin->width){
+@@ -92,8 +93,8 @@
+ 		argv[argc++] = "fd://0";
+ 		argv[argc] = NULL;
+ 
+-		execvp("gst-player",argv);
+-		execv(BINDIR "gst-player",argv);
++		execvp("gst-player-gtk",argv);
++		execv(BINDIR "gst-player-gtk",argv);
+ 		_exit(255);
+ 	}
+ 
diff --git a/multimedia/gstreamer-player/pkg-plist b/multimedia/gstreamer-player/pkg-plist
index 11af30795458..51bcff65a762 100644
--- a/multimedia/gstreamer-player/pkg-plist
+++ b/multimedia/gstreamer-player/pkg-plist
@@ -5,18 +5,24 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gst-player/%gconf.xml
 etc/gconf/schemas/gst-player.schemas
 include/gst-player-%%VERSION%%/gst/gstvideowidget.h
 include/gst-player-%%VERSION%%/gst/gtk-playlist.h
+%%MOZILLA_PLUGIN%%lib/browser_plugins/libmozstreamer.so
 lib/libgstplayer.a
 lib/libgstplayer.so
 lib/libgstplayer.so.%%SHLIB_VERSION%%
 libdata/bonobo/servers/Gst-Player-Control.server
+%%GST_PLAYER_VIEW%%libdata/bonobo/servers/Gst-Player-View.server
 libexec/gst-player-control
 %%GST_PLAYER_VIEW%%libexec/gst-player-view
 share/gnome/application-registry/gst-player.applications
 share/gnome/applications/gst-player.desktop
+%%GST_PLAYER_VIEW%%share/gnome/gnome-2.0/ui/gst-player-view-ui.xml
+share/gnome/gst-player/ui/about-logo.png
 share/gnome/gst-player/ui/demaximize.png
 share/gnome/gst-player/ui/forward.png
+share/gnome/gst-player/ui/gst-player-48.png
 share/gnome/gst-player/ui/gst-player-logo.png
 share/gnome/gst-player/ui/gst-player-playing.png
+share/gnome/gst-player/ui/gst-player.glade
 share/gnome/gst-player/ui/maximize.png
 share/gnome/gst-player/ui/mediacontrol.glade
 share/gnome/gst-player/ui/next.png