diff options
Diffstat (limited to 'multimedia/totem/files')
| -rw-r--r-- | multimedia/totem/files/patch-browser-plugin_Makefile.in | 100 | ||||
| -rw-r--r-- | multimedia/totem/files/patch-configure | 29 |
2 files changed, 86 insertions, 43 deletions
diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in index 2dd84be05bc8..df0d82b25039 100644 --- a/multimedia/totem/files/patch-browser-plugin_Makefile.in +++ b/multimedia/totem/files/patch-browser-plugin_Makefile.in @@ -1,110 +1,124 @@ ---- 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 @@ +--- browser-plugin/Makefile.in.orig 2007-09-16 18:59:35.000000000 -0400 ++++ browser-plugin/Makefile.in 2007-09-16 19:00:59.000000000 -0400 +@@ -69,7 +69,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@ libtotempluginviewer_helper.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) +@@ -89,7 +89,7 @@ + $(libtotem_basic_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @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@ libtotempluginviewer_helper.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) +@@ -109,7 +109,7 @@ + $(libtotem_complex_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @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@ libtotempluginviewer_helper.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) +@@ -133,7 +133,7 @@ + $(libtotem_gmp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @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@ libtotempluginviewer_helper.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) +@@ -153,7 +153,7 @@ + $(libtotem_mully_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @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@ libtotempluginviewer_helper.la \ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -360,7 +360,7 @@ +@@ -198,10 +198,6 @@ + totem_plugin_viewer-totem-plugin-viewer.$(OBJEXT) + totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS) + totem_plugin_viewer_DEPENDENCIES = \ +- $(top_builddir)/src/backend/libbaconvideowidget.la \ +- $(top_builddir)/src/libtotem_player.la \ +- $(top_builddir)/src/plparse/libtotem-plparser.la \ +- $(top_builddir)/lib/libtotemscrsaver.la \ + libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -381,7 +377,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_PLUGINDIR = $(libdir)/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 @@ +@@ -599,10 +595,7 @@ + $(AM_CFLAGS) + + totem_plugin_viewer_LDADD = \ +- $(top_builddir)/src/backend/libbaconvideowidget.la \ +- $(top_builddir)/src/libtotem_player.la \ +- $(top_builddir)/src/plparse/libtotem-plparser.la \ +- $(top_builddir)/lib/libtotemscrsaver.la \ ++ -ltotem-plparser \ + libtotempluginviewer_helper.la \ + $(EXTRA_GNOME_LIBS) \ + $(XVIDMODE_LIBS) \ +@@ -654,7 +647,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@ libtotempluginviewer_helper.la \ @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -641,7 +641,7 @@ + @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -715,7 +708,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@ libtotempluginviewer_helper.la \ @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -695,7 +695,7 @@ + @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -770,7 +763,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@ -ltotem-plparser + @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -749,7 +749,7 @@ + @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -825,7 +818,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@ libtotempluginviewer_helper.la \ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -803,7 +803,7 @@ + @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ +@@ -880,7 +873,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@ libtotempluginviewer_helper.la \ @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ + @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure new file mode 100644 index 000000000000..1fab81f6ed98 --- /dev/null +++ b/multimedia/totem/files/patch-configure @@ -0,0 +1,29 @@ +--- configure.orig Fri May 25 00:24:10 2007 ++++ configure Fri May 25 00:24:23 2007 +@@ -22960,7 +22960,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" + + plugin_error_or_ignore() + { +- if test "${error_on_bad_plugin}" == "1" ; then ++ if test "${error_on_bad_plugin}" = "1" ; then + { { echo "$as_me:$LINENO: error: $1" >&5 + echo "$as_me: error: $1" >&2;} + { (exit 1); exit 1; }; } +@@ -22982,7 +22982,7 @@ fi + used_plugins="" + used_plugins2="" + +-if test "x${with_plugins}" == "xautodetect" ; then ++if test "x${with_plugins}" = "xautodetect" ; then + # Default to all plugins and just ignore them if they won't compile + with_plugins="all" + error_on_bad_plugin="0" +@@ -23384,7 +23384,7 @@ fi + esac + + # Add the specified plugin +- if test "${add_plugin}" == "1" ; then ++ if test "${add_plugin}" = "1" ; then + used_plugins2="${used_plugins2} ${plugin}" + fi + done |