Index: head/multimedia/gstreamer-player/Makefile =================================================================== --- head/multimedia/gstreamer-player/Makefile (revision 93274) +++ head/multimedia/gstreamer-player/Makefile (revision 93275) @@ -1,62 +1,80 @@ # New ports collection makefile for: gstreamer player # Date created: Fri Jul 12 06:02:42 UTC 2002 # Whom: Mario Sergio Fujikawa Ferreira # # $FreeBSD$ # 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} PKGNAMESUFFIX= -player 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 USE_X_PREFIX= yes 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}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes MAN1= gst-player.1 -PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" - # library minor number SHLIB_VERSION= 0 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 .if ${HAVE_GNOME:Mnautilus2}!="" USE_GNOME+= nautilus2 PLIST_SUB+= GST_PLAYER_VIEW="" .else PLIST_SUB+= GST_PLAYER_VIEW="@comment " .endif .include Property changes on: head/multimedia/gstreamer-player/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/multimedia/gstreamer-player/distinfo =================================================================== --- head/multimedia/gstreamer-player/distinfo (revision 93274) +++ head/multimedia/gstreamer-player/distinfo (revision 93275) @@ -1 +1 @@ -MD5 (gst-player-0.5.1.tar.gz) = ff48e6ad2331899a60fab822d908b0bd +MD5 (gst-player-0.6.0.tar.gz) = 2a2aae160c7b07c12fc54a067e013d55 Property changes on: head/multimedia/gstreamer-player/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/multimedia/gstreamer-player/files/patch-configure =================================================================== --- head/multimedia/gstreamer-player/files/patch-configure (revision 93274) +++ head/multimedia/gstreamer-player/files/patch-configure (revision 93275) @@ -1,22 +1,33 @@ ---- 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 + if test "x$prefix" = "xNONE"; then exec_prefix=/usr/local + else + exec_prefix=${prefix} + fi 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" + + Property changes on: head/multimedia/gstreamer-player/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in =================================================================== --- head/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in (nonexistent) +++ head/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in (revision 93275) @@ -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 Property changes on: head/multimedia/gstreamer-player/files/patch-mozilla::Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/multimedia/gstreamer-player/files/patch-mozilla::plugin.c =================================================================== --- head/multimedia/gstreamer-player/files/patch-mozilla::plugin.c (nonexistent) +++ head/multimedia/gstreamer-player/files/patch-mozilla::plugin.c (revision 93275) @@ -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 + #include ++#include + #include + #include + #include +@@ -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); + } + Property changes on: head/multimedia/gstreamer-player/files/patch-mozilla::plugin.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/multimedia/gstreamer-player/pkg-plist =================================================================== --- head/multimedia/gstreamer-player/pkg-plist (revision 93274) +++ head/multimedia/gstreamer-player/pkg-plist (revision 93275) @@ -1,44 +1,50 @@ bin/gst-player bin/gst-player-gtk etc/gconf/gconf.xml.defaults/apps/gst-player/%gconf.xml 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 share/gnome/gst-player/ui/pause.png share/gnome/gst-player/ui/play.png share/gnome/gst-player/ui/playlist.glade share/gnome/gst-player/ui/playlist.png share/gnome/gst-player/ui/previous.png share/gnome/gst-player/ui/stop.png share/gnome/gst-player/ui/volume-max.png share/gnome/gst-player/ui/volume-medium.png share/gnome/gst-player/ui/volume-min.png share/gnome/gst-player/ui/volume-zero.png share/gnome/gst-player/ui/volume.png share/gnome/gst-player/ui/volume_mute.png share/gnome/mime-info/gst-player.keys share/gnome/pixmaps/gst-player-48.png @dirrm share/gnome/gst-player/ui @dirrm share/gnome/gst-player @unexec rmdir %D/share/gnome/applications 2>/dev/null || true @unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true @dirrm include/gst-player-%%VERSION%%/gst @dirrm include/gst-player-%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gst-player @dirrm etc/gconf/gconf.xml.defaults/apps/gst-player Property changes on: head/multimedia/gstreamer-player/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property