From 39219f64b7dc7d2c45196cae30b106870de72097 Mon Sep 17 00:00:00 2001 From: ahze Date: Fri, 2 Mar 2007 15:36:06 +0000 Subject: - multimedia/totem is now gstreamer based - add multimedia/totem-xine for people who want to use the xine backend - remove gecko plugin, git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8452 df743ca5-7f9a-e211-a948-0013205c9059 --- multimedia/totem/Makefile | 18 ++-- .../totem/files/patch-browser-plugin_Makefile.in | 110 +++++++++++++++++++++ multimedia/totem/pkg-plist | 27 ----- 3 files changed, 117 insertions(+), 38 deletions(-) create mode 100644 multimedia/totem/files/patch-browser-plugin_Makefile.in (limited to 'multimedia/totem') diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 69d134e50..d55d26156 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -3,7 +3,7 @@ # Whom: Hendrik Scholz # # $FreeBSD$ -# $MCom: ports/multimedia/totem/Makefile,v 1.74 2007/02/09 16:22:41 ahze Exp $ +# $MCom: ports/multimedia/totem/Makefile,v 1.75 2007/02/20 23:14:23 marcus Exp $ # PORTNAME= totem @@ -14,7 +14,7 @@ MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org -COMMENT?= A Xine-based video player for the GNOME 2 Desktop +COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ @@ -37,27 +37,23 @@ PKGMESSAGE= ${WRKDIR}/pkg-message CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr" -OPTIONS?= DVDNAV "Enable DVD support" on \ - GSTREAMER "Use Gstreamer instead of Xine" off \ - MOZILLA_PLUGIN "Totem mozilla plugin" off - MAN1= totem.1 totem-video-thumbnailer.1 GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ totem.schemas -CONFLICTS?= totem-gstreamer-[0-9]* +CONFLICTS?= totem-gstreamer-[0-9]* totem-xine-[0-9]* .include -.if defined(WITH_MOZILLA_PLUGIN) +.if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes" USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -PLIST_SUB+= MOZILLA="" CONFIGURE_ARGS+=--with-mozilla=${GECKO} \ --enable-gmp-plugin \ --enable-complex-plugin \ --enable-narrowspace-plugin +BUILD_WRKSRC= ${WRKSRC}/browser-plugin +INSTALL_WRKSRC= ${WRKSRC}/browser-plugin .else -PLIST_SUB+= MOZILLA="@comment " CONFIGURE_ARGS+=--without-mozilla \ --disable-browser-plugins \ --disable-mozilla \ @@ -67,7 +63,7 @@ CONFIGURE_ARGS+=--without-mozilla \ --disable-narrowspace-plugin .endif -.if defined(WITH_GSTREAMER) +.if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no" CONFIGURE_ARGS+=--enable-gstreamer=yes USE_GSTREAMER+= gnomevfs core gconf hal good mpeg2dec ugly WITHOUT_DVDNAV= yes diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in new file mode 100644 index 000000000..2dd84be05 --- /dev/null +++ b/multimedia/totem/files/patch-browser-plugin_Makefile.in @@ -0,0 +1,110 @@ +--- browser-plugin/Makefile.in.orig Fri Mar 2 07:22:29 2007 ++++ browser-plugin/Makefile.in Fri Mar 2 07:24:05 2007 +@@ -72,7 +72,7 @@ + pluginLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \ + @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) +@@ -88,7 +88,7 @@ + $(am_libtotem_basic_plugin_la_OBJECTS) + @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \ + @ENABLE_BASIC_PLUGIN_TRUE@ $(plugindir) +-@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) +@@ -104,7 +104,7 @@ + $(am_libtotem_complex_plugin_la_OBJECTS) + @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath = \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ -rpath $(plugindir) +-@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \ + @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) +@@ -124,7 +124,7 @@ + libtotem_gmp_plugin_la_OBJECTS = $(am_libtotem_gmp_plugin_la_OBJECTS) + @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \ + @ENABLE_GMP_PLUGIN_TRUE@ $(plugindir) +-@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \ + @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) +@@ -140,7 +140,7 @@ + $(am_libtotem_mully_plugin_la_OBJECTS) + @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(plugindir) +-@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) +@@ -360,7 +360,7 @@ + MOZILLA_LIBDIR = @MOZILLA_LIBDIR@ + MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@ + MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@ +-MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@ ++MOZILLA_PLUGINDIR = /var/tmp/totem/lib/browser_plugins + MOZILLA_PREFIX = @MOZILLA_PREFIX@ + MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@ + MOZILLA_XPIDL = @MOZILLA_XPIDL@ +@@ -464,7 +464,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUBDIRS = idl +-plugindir = $(libdir)/mozilla/plugins ++plugindir = $(libdir)/browser_plugins + plugin_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) + BUILT_SOURCES = $(libtotempluginviewer_marshal_la_SOURCES) \ +@@ -581,7 +581,7 @@ + @ENABLE_BASIC_PLUGIN_TRUE@ $(AM_CXXFLAGS) + + @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \ +-@ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_BASIC_PLUGIN_TRUE@ -ltotem-plparser \ + @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \ + @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -641,7 +641,7 @@ + @ENABLE_GMP_PLUGIN_TRUE@ $(AM_CXXFLAGS) + + @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \ +-@ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_GMP_PLUGIN_TRUE@ -ltotem-plparser \ + @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \ + @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -695,7 +695,7 @@ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(AM_CXXFLAGS) + + @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \ +-@ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_COMPLEX_PLUGIN_TRUE@ -ltotem-plparser \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -749,7 +749,7 @@ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(AM_CXXFLAGS) + + @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \ +-@ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_NARROWSPACE_PLUGIN_TRUE@ -ltotem-plparser \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -803,7 +803,7 @@ + @ENABLE_MULLY_PLUGIN_TRUE@ $(AM_CXXFLAGS) + + @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \ +-@ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ ++@ENABLE_MULLY_PLUGIN_TRUE@ -ltotem-plparser \ + @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 58e8f2e52..a0e9701a7 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -5,26 +5,6 @@ include/totem/1/plparser/totem-disc.h include/totem/1/plparser/totem-pl-parser-builtins.h include/totem/1/plparser/totem-pl-parser-features.h include/totem/1/plparser/totem-pl-parser.h -%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a -%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la -%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so -%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt -%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a -%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la -%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so -%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt -%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a -%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la -%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so -%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt -%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.a -%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.la -%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.so -%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.xpt -%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a -%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la -%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so -%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt lib/libtotem-plparser.a lib/libtotem-plparser.la lib/libtotem-plparser.so @@ -33,7 +13,6 @@ lib/nautilus/extensions-1.0/libtotem-properties-page.a lib/nautilus/extensions-1.0/libtotem-properties-page.la lib/nautilus/extensions-1.0/libtotem-properties-page.so libdata/pkgconfig/totem-plparser.pc -%%MOZILLA%%libexec/totem-mozilla-viewer share/gnome/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png share/gnome/help/totem/C/figures/totem_pause_button.png @@ -132,12 +111,6 @@ share/gnome/omf/totem/totem-ru.omf share/gnome/omf/totem/totem-sv.omf share/gnome/omf/totem/totem-uk.omf share/gnome/pixmaps/vanity.png -%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html -%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html -%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html -%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html -%%MOZILLA%%share/gnome/totem/doc/totemIMullYPlayer.html -%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html share/gnome/totem/filmholes-big-left.png share/gnome/totem/filmholes-big-right.png share/gnome/totem/filmholes.png -- cgit v1.2.3