[71129] trunk/dports/gnome/totem

devans at macports.org devans at macports.org
Thu Sep 2 02:06:21 PDT 2010


Revision: 71129
          http://trac.macports.org/changeset/71129
Author:   devans at macports.org
Date:     2010-09-02 02:06:20 -0700 (Thu, 02 Sep 2010)
Log Message:
-----------
totem: update to version 2.30.2, xine-lib no longer supported, use python26.

Modified Paths:
--------------
    trunk/dports/gnome/totem/Portfile
    trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff

Added Paths:
-----------
    trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff
    trunk/dports/gnome/totem/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff

Modified: trunk/dports/gnome/totem/Portfile
===================================================================
--- trunk/dports/gnome/totem/Portfile	2010-09-02 08:56:28 UTC (rev 71128)
+++ trunk/dports/gnome/totem/Portfile	2010-09-02 09:06:20 UTC (rev 71129)
@@ -4,14 +4,13 @@
 PortSystem      1.0
 
 name            totem
-version         2.26.3
-revision        1
+version         2.30.2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      gnome
 maintainers     devans openmaintainer
 description     Official movie player of the GNOME desktop environment
 long_description \
-        Totem is based on xine-lib or GStreamer. It features a \
+        Totem is based on GStreamer. It features a \
         playlist, a full-screen mode, seek and volume controls, \
         as well as keyboard navigation. It comes with added \
         functionality such as: \
@@ -25,15 +24,16 @@
 platforms       darwin
 master_sites    gnome:sources/${name}/${branch}/
 
-checksums      md5     f8f7390f5d93268cd200086a1b4f765a \
-               sha1    ea6fa7244eb993a3038bc76f5e561c8a0661466c \
-               rmd160  f265ec3997c130f28bf5e5455c0aef6921e71ece
+checksums       md5     4ff658d6178fdb57f310c54daf596de7 \
+                sha1    78b59e0e61a620718b2e87c82046ea1f1fe4607d \
+                rmd160  78ab8d58eb8e0349190042c34434c3ce8ac8f3e0
 
 use_bzip2       yes
 
-patchfiles      patch-bindings-python-totem.override.diff \
+patchfiles      patch-configure.diff \
                 patch-src-plugins-totem-python-module.c.diff \
-                patch-src-backend-Makefile.in.diff
+                patch-bindings-python-totem.override.diff \
+                patch-browser-plugin-totemPlugin.cpp.diff
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -42,42 +42,46 @@
                 port:gtk-doc
 
 depends_lib     port:gconf \
+                port:libgdata \
                 port:totem-pl-parser \
                 port:xorg-libXtst \
                 port:xorg-libXxf86vm \
-                port:py25-gtk \
+                port:py26-gtk \
                 port:gst-plugins-good \
                 port:gst-plugins-bad \
                 port:gst-plugins-ugly \
                 port:gst-ffmpeg \
                 port:nautilus
 
-configure.python  ${prefix}/bin/python2.5
+depends_run     port:gnome-settings-daemon
 
-configure.args  --with-plugins="thumbnail screensaver ontop gromit media-player-keys properties sidebar-test skipto youtube pythonconsole" \
+configure.args  --with-plugins="thumbnail ontop gromit media-player-keys properties sidebar-test skipto youtube pythonconsole dbus-service" \
                 --disable-static \
                 --enable-browser-plugins \
-                --enable-complex-plugin \
                 --enable-easy-codec-installation \
                 --enable-nautilus \
+                --disable-vala \
                 --disable-schemas-install \
                 --disable-scrollkeeper \
                 --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \
                 BROWSER_PLUGIN_DIR=${prefix}/lib/nsplugins
 
-variant xine description {Use xine-lib instead of gstreamer} {
-    depends_lib-delete port:gst-plugins-good
-    depends_lib-append port:xine-lib
-    configure.args-append --enable-xine
-    configure.args-delete --enable-easy-codec-installation
-    configure.args-append --disable-easy-codec-installation
-}
+set python_prefix          ${frameworks_dir}/Python.framework/Versions/2.6
+configure.python           ${prefix}/bin/python2.6
+configure.pkg_config_path  ${python_prefix}/lib/pkgconfig
+configure.env              PATH=${python_prefix}/bin:$env(PATH)
 
 post-patch {
     reinplace "s:libdbus-glib-1.so.2:${prefix}/lib/libdbus-glib-1.2.dylib:" ${worksrcpath}/browser-plugin/totemPluginGlue.cpp
 }
 
+#
+# atlas is not universal
+#
+
+universal_variant no
+
 post-destroot {
     eval delete [glob "${destroot}${prefix}/lib/nsplugins/*.la"]
 }

Added: trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff	                        (rev 0)
+++ trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff	2010-09-02 09:06:20 UTC (rev 71129)
@@ -0,0 +1,11 @@
+--- browser-plugin/totemPlugin.cpp.orig	2010-09-01 20:58:44.000000000 -0700
++++ browser-plugin/totemPlugin.cpp	2010-09-01 20:59:17.000000000 -0700
+@@ -277,7 +277,7 @@
+ }
+ 
+ void
+-totemPlugin::SetTime (guint64 aTime)
++totemPlugin::SetTime (uint64_t aTime)
+ {
+ 	D ("SetTime '%lu'", aTime);
+ 

Added: trunk/dports/gnome/totem/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/gnome/totem/files/patch-configure.diff	2010-09-02 09:06:20 UTC (rev 71129)
@@ -0,0 +1,14 @@
+--- configure.orig	2010-09-01 19:50:34.000000000 -0700
++++ configure	2010-09-01 19:53:08.000000000 -0700
+@@ -19531,9 +19531,9 @@
+ 
+ 
+ 
+-  PYTHON_PREFIX='${prefix}'
++  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+ 
+-  PYTHON_EXEC_PREFIX='${exec_prefix}'
++  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+ 
+ 
+ 

Deleted: trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff	2010-09-02 08:56:28 UTC (rev 71128)
+++ trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff	2010-09-02 09:06:20 UTC (rev 71129)
@@ -1,10 +0,0 @@
---- src/backend/Makefile.in.orig	2009-05-01 16:18:51.000000000 -0700
-+++ src/backend/Makefile.in	2009-05-01 16:25:16.000000000 -0700
-@@ -407,6 +407,7 @@
- 	$(MM_LIBS)		\
- 	$(GST_LIBS)		\
- 	$(EXTRA_BACKEND_LIBS)	\
-+        $(GTK_LIBS)             \
- 	$(X_LIBS)		\
- 	$(MISSING_PLUGINS_LIBS)
- 

Modified: trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff	2010-09-02 08:56:28 UTC (rev 71128)
+++ trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff	2010-09-02 09:06:20 UTC (rev 71129)
@@ -4,7 +4,7 @@
  #endif
  
  #include <Python.h>
-+#define NO_IMPORT_PYGOBJECT
++#define NO_IMPORT
  #include <pygobject.h>
  #include <pygtk/pygtk.h>
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100902/c5eb20d4/attachment.html>


More information about the macports-changes mailing list