Update to totem-3.4.3.

This commit is contained in:
ajacoutot 2012-07-07 16:43:10 +00:00
parent 2c2b1c6e28
commit 1283bd224c
6 changed files with 151 additions and 90 deletions

View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.81 2012/06/15 08:30:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.82 2012/07/07 16:43:10 ajacoutot Exp $
COMMENT-main= official media player for GNOME
COMMENT-nautilus= totem properties plugin for nautilus
GNOME_PROJECT= totem
GNOME_VERSION= 3.0.1
GNOME_VERSION= 3.4.3
PKGNAME-main= ${DISTNAME}
PKGNAME-nautilus= nautilus-${DISTNAME}
REVISION-main= 16
REVISION-nautilus= 5
SHARED_LIBS += totem 0.0 # 0.0
CATEGORIES= multimedia
@ -24,8 +21,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -nautilus
MODULES= devel/dconf \
@ -33,39 +28,54 @@ MODULES= devel/dconf \
lang/python \
x11/gnome
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm archive atk-1.0
WANTLIB += bz2 cairo cairo-gobject dbus-1 drm expat fontconfig
WANTLIB += freetype gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmime-2.6 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
WANTLIB += gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10
WANTLIB += GL X11 X11-xcb Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm archive
WANTLIB += atk-1.0 bz2 cairo cairo-gobject clutter-1.0 clutter-gst-1.0
WANTLIB += clutter-gtk-1.0 cogl cogl-pango crypto curl dbus-1
WANTLIB += dbus-glib-1 drm expat ffi fontconfig freetype gcrypt
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0
WANTLIB += gnome-keyring gobject-2.0 gpg-error gstaudio-0.10 gstbase-0.10
WANTLIB += gstbasevideo-0.10 gstinterfaces-0.10 gstpbutils-0.10
WANTLIB += gstreamer-0.10 gsttag-0.10 gstvideo-0.10 gthread-2.0
WANTLIB += gtk-3 lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread-stubs soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 totem-plparser xcb xcb-render xcb-shm xml2
WANTLIB += z ffi stdc++
WANTLIB += gtk-3 idn json-glib-1.0 lua lzma m mx-1.0 orc-0.4 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += quvi soup-2.4 soup-gnome-2.4 sqlite3 ssl startup-notification-1
WANTLIB += stdc++ totem-plparser xcb xcb-aux xcb-render xcb-shm
WANTLIB += xml2 z
WANTLIB-main += ${WANTLIB} ICE SM Xtst c dbus-glib-1 ffi girepository-1.0
WANTLIB-main += peas-1.0 peas-gtk-1.0 pthread
WANTLIB-main += ${WANTLIB}
WANTLIB-main += ICE SM Xtst avahi-client avahi-common avahi-glib c
WANTLIB-main += e2fs-uuid epc-1.0 epc-ui-1.0 girepository-1.0 gmp gnutls
WANTLIB-main += grilo-0.1 hogweed nettle p11-kit peas-1.0 peas-gtk-1.0
WANTLIB-main += pthread tasn1
WANTLIB-nautilus += ${WANTLIB} nautilus-extension
WANTLIB-nautilus += ${WANTLIB}
WANTLIB-nautilus += nautilus-extension
BUILD_DEPENDS+= devel/iso-codes \
BUILD_DEPENDS= devel/iso-codes \
multimedia/gstreamer-0.10/plugins-good>=0.10.30 \
devel/py-gobject
devel/py-gobject \
devel/pylint
RUN_DEPENDS-main+= devel/iso-codes \
RUN_DEPENDS-main= devel/iso-codes \
devel/py-xdg \
x11/dbus-python \
x11/gnome/settings-daemon \
devel/py-gobject \
www/py-httplib2 \
www/py-beautifulsoup \
${RUN_DEPENDS}
LIB_DEPENDS-main+= ${MODGETTEXT_LIB_DEPENDS} \
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
multimedia/gstreamer-0.10/plugins-base>=0.10.30 \
x11/gnome/totem-pl-parser>=2.32.4 \
devel/gobject-introspection \
devel/libpeas
devel/libpeas \
net/libepc \
graphics/clutter/clutter-gst>=1.6.0 \
graphics/clutter/clutter-gtk \
graphics/clutter/mx \
x11/gnome/grilo
RUN_DEPENDS-nautilus= x11/gnome/totem,-main
LIB_DEPENDS-nautilus= x11/gnome/nautilus \
@ -84,21 +94,13 @@ MODGNOME_ICON_CACHE= Yes
MODGNOME_TOOLS= goi vala yelp
USE_GROFF= Yes
# im-status gromit iplayer jamendo lirc media-player-keys ontop opensubtitles
# properties publish pythonconsole save-file sample-python sample-vala
# screensaver screenshot sidebar-test skipto thumbnail tracker youtube
# zeitgeist-dp
TOTEM_PLUGINS= "media-player-keys ontop properties \
screensaver skipto thumbnail \
opensubtitles jamendo screenshot dbus-service"
MODGNOME_CPPFLAGS= -I${X11BASE}/include
MODGNOME_LDFLAGS= -L${X11BASE}/lib
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include " \
GST_REGISTRY=${WRKDIR}/registry.${MACHINE_ARCH}.bin
CONFIGURE_ARGS= --with-plugins=${TOTEM_PLUGINS} \
--with-dbus \
--enable-nautilus \
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
# Prevent gst-inspect from writing to ${HOME}/.gstreamer-0.10/ at configure stage
CONFIGURE_ENV += GST_REGISTRY=${WRKDIR}/registry.${MACHINE_ARCH}.bin
CONFIGURE_ARGS= --enable-nautilus \
--enable-python \
--disable-easy-codec-installation \
--disable-browser-plugins \

View File

@ -1,5 +1,5 @@
MD5 (gnome/totem-3.0.1.tar.bz2) = TeGWUkPMPVMk39sBHLueOA==
RMD160 (gnome/totem-3.0.1.tar.bz2) = YVESTJZngSVjpUt1FRh0rXGA8oo=
SHA1 (gnome/totem-3.0.1.tar.bz2) = NKouO/8HFWL3YD4acsttplzguos=
SHA256 (gnome/totem-3.0.1.tar.bz2) = ATts/trG/yZKon3nNGWX0Ljaf07R+RsslmoT0/3/Z5o=
SIZE (gnome/totem-3.0.1.tar.bz2) = 3730880
MD5 (gnome/totem-3.4.3.tar.xz) = 9UXUkim6N3nstUIeXfPOuw==
RMD160 (gnome/totem-3.4.3.tar.xz) = te2L9dXIb7k2H22RqPq6QghhJYA=
SHA1 (gnome/totem-3.4.3.tar.xz) = ghrVPllU7t2BXy5DUJJkWusfaEU=
SHA256 (gnome/totem-3.4.3.tar.xz) = /OduPJJND/09Tu8uaa9MRLNTeybC34Z0XpALTIKbONs=
SIZE (gnome/totem-3.4.3.tar.xz) = 3163404

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-browser-plugin_totemPluginGlue_cpp,v 1.5 2011/12/01 11:15:02 ajacoutot Exp $
From d3d467a49fa828f1b6bb5d999c97158bd736785e Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Wed, 05 Oct 2011 08:16:30 +0000
Subject: Fix dlopening libdbus-glib-1 on OpenBSD.
--- browser-plugin/totemPluginGlue.cpp.orig Mon Oct 18 15:19:58 2010
+++ browser-plugin/totemPluginGlue.cpp Wed Oct 5 10:24:35 2011
@@ -434,7 +434,11 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
/* we want to open libdbus-glib-1.so.2 in such a way
* in such a way that it becomes permanentely resident */
void *handle;
+#if defined(__OpenBSD__)
+ handle = dlopen ("libdbus-glib-1.so", RTLD_NOW | RTLD_NODELETE);
+#else
handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW | RTLD_NODELETE);
+#endif
if (!handle) {
fprintf (stderr, "%s\n", dlerror());
return NPERR_MODULE_LOAD_FAILED_ERROR;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_backend_bacon-video-widget-gst-0_10_c,v 1.8 2011/09/12 07:28:54 jasper Exp $
--- src/backend/bacon-video-widget-gst-0.10.c.orig Thu May 19 21:08:49 2011
+++ src/backend/bacon-video-widget-gst-0.10.c Thu May 19 21:08:59 2011
@@ -6878,7 +6878,7 @@ bacon_video_widget_new (int width, int height,
$OpenBSD: patch-src_backend_bacon-video-widget-gst-0_10_c,v 1.9 2012/07/07 16:43:10 ajacoutot Exp $
--- src/backend/bacon-video-widget-gst-0.10.c.orig Wed Jul 4 11:52:29 2012
+++ src/backend/bacon-video-widget-gst-0.10.c Sat Jul 7 15:04:20 2012
@@ -6075,7 +6075,7 @@ bacon_video_widget_new (GError ** error)
bvw);
bvw->priv->speakersetup = BVW_AUDIO_SOUND_STEREO;

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.4 2012/06/15 08:30:21 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2012/07/07 16:43:10 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath x11/gnome/totem,xine
@bin bin/totem
@bin bin/totem-audio-preview
@bin bin/totem-video-indexer
@bin bin/totem-video-thumbnailer
include/totem/
include/totem/1.0/
@ -20,17 +19,52 @@ lib/libtotem.la
lib/pkgconfig/totem.pc
lib/totem/
lib/totem/plugins/
lib/totem/plugins/brasero-disc-recorder/
lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin
@comment lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a
@comment lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.la
lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so
lib/totem/plugins/chapters/
lib/totem/plugins/chapters/chapters-edit.ui
lib/totem/plugins/chapters/chapters-list.ui
lib/totem/plugins/chapters/chapters.plugin
@comment lib/totem/plugins/chapters/libchapters.a
@comment lib/totem/plugins/chapters/libchapters.la
lib/totem/plugins/chapters/libchapters.so
lib/totem/plugins/dbus/
lib/totem/plugins/dbus/dbus-service.plugin
lib/totem/plugins/dbus/dbus-service.py
lib/totem/plugins/dbus/dbus-service.pyc
lib/totem/plugins/dbus/dbus-service.pyo
lib/totem/plugins/jamendo/
lib/totem/plugins/jamendo/jamendo.plugin
lib/totem/plugins/jamendo/jamendo.py
lib/totem/plugins/jamendo/jamendo.pyc
lib/totem/plugins/jamendo/jamendo.pyo
lib/totem/plugins/jamendo/jamendo.ui
lib/totem/plugins/dbus/dbusservice.plugin
lib/totem/plugins/dbus/dbusservice.py
lib/totem/plugins/dbus/dbusservice.pyc
lib/totem/plugins/dbus/dbusservice.pyo
lib/totem/plugins/grilo/
lib/totem/plugins/grilo/grilo.plugin
lib/totem/plugins/grilo/grilo.ui
@comment lib/totem/plugins/grilo/libgrilo.a
@comment lib/totem/plugins/grilo/libgrilo.la
lib/totem/plugins/grilo/libgrilo.so
lib/totem/plugins/grilo/totem-grilo.conf
lib/totem/plugins/gromit/
lib/totem/plugins/gromit/gromit.plugin
@comment lib/totem/plugins/gromit/libgromit.a
@comment lib/totem/plugins/gromit/libgromit.la
lib/totem/plugins/gromit/libgromit.so
lib/totem/plugins/im-status/
@comment lib/totem/plugins/im-status/libtotem-im-status.a
@comment lib/totem/plugins/im-status/libtotem-im-status.la
lib/totem/plugins/im-status/libtotem-im-status.so
lib/totem/plugins/im-status/totem-im-status.plugin
lib/totem/plugins/iplayer/
lib/totem/plugins/iplayer/iplayer.plugin
lib/totem/plugins/iplayer/iplayer.py
lib/totem/plugins/iplayer/iplayer.pyc
lib/totem/plugins/iplayer/iplayer.pyo
lib/totem/plugins/iplayer/iplayer.ui
lib/totem/plugins/iplayer/iplayer2.py
lib/totem/plugins/iplayer/iplayer2.pyc
lib/totem/plugins/iplayer/iplayer2.pyo
lib/totem/plugins/iplayer/listparser.py
lib/totem/plugins/iplayer/listparser.pyc
lib/totem/plugins/iplayer/listparser.pyo
lib/totem/plugins/media-player-keys/
@comment lib/totem/plugins/media-player-keys/libmedia_player_keys.a
@comment lib/totem/plugins/media-player-keys/libmedia_player_keys.la
@ -55,6 +89,30 @@ lib/totem/plugins/properties/
@comment lib/totem/plugins/properties/libmovie-properties.la
lib/totem/plugins/properties/libmovie-properties.so
lib/totem/plugins/properties/movie-properties.plugin
lib/totem/plugins/publish/
@comment lib/totem/plugins/publish/libpublish.a
@comment lib/totem/plugins/publish/libpublish.la
lib/totem/plugins/publish/libpublish.so
lib/totem/plugins/publish/publish-plugin.ui
lib/totem/plugins/publish/publish.plugin
lib/totem/plugins/pythonconsole/
lib/totem/plugins/pythonconsole/console.py
lib/totem/plugins/pythonconsole/console.pyc
lib/totem/plugins/pythonconsole/console.pyo
lib/totem/plugins/pythonconsole/pythonconsole.plugin
lib/totem/plugins/pythonconsole/pythonconsole.py
lib/totem/plugins/pythonconsole/pythonconsole.pyc
lib/totem/plugins/pythonconsole/pythonconsole.pyo
lib/totem/plugins/rotation/
@comment lib/totem/plugins/rotation/librotation.a
@comment lib/totem/plugins/rotation/librotation.la
lib/totem/plugins/rotation/librotation.so
lib/totem/plugins/rotation/rotation.plugin
lib/totem/plugins/save-file/
@comment lib/totem/plugins/save-file/libsave-file.a
@comment lib/totem/plugins/save-file/libsave-file.la
lib/totem/plugins/save-file/libsave-file.so
lib/totem/plugins/save-file/save-file.plugin
lib/totem/plugins/screensaver/
@comment lib/totem/plugins/screensaver/libscreensaver.a
@comment lib/totem/plugins/screensaver/libscreensaver.la
@ -73,24 +131,23 @@ lib/totem/plugins/skipto/
lib/totem/plugins/skipto/libskipto.so
lib/totem/plugins/skipto/skipto.plugin
lib/totem/plugins/skipto/skipto.ui
lib/totem/plugins/thumbnail/
@comment lib/totem/plugins/thumbnail/libthumbnail.a
@comment lib/totem/plugins/thumbnail/libthumbnail.la
lib/totem/plugins/thumbnail/libthumbnail.so
lib/totem/plugins/thumbnail/thumbnail.plugin
libexec/totem/
libexec/totem/totem-bugreport.py
@man man/man1/totem-video-thumbnailer.1
@man man/man1/totem.1
share/GConf/gsettings/jamendo.convert
share/GConf/gsettings/opensubtitles.convert
share/GConf/gsettings/publish.convert
share/GConf/gsettings/pythonconsole.convert
share/GConf/gsettings/totem.convert
share/applications/totem.desktop
share/gir-1.0/Totem-1.0.gir
share/glib-2.0/schemas/org.gnome.totem.enums.xml
share/glib-2.0/schemas/org.gnome.totem.gschema.xml
share/glib-2.0/schemas/org.gnome.totem.plugins.jamendo.gschema.xml
share/glib-2.0/schemas/org.gnome.totem.plugins.opensubtitles.gschema.xml
share/glib-2.0/schemas/org.gnome.totem.plugins.publish.gschema.xml
share/glib-2.0/schemas/org.gnome.totem.plugins.pythonconsole.gschema.xml
share/gnome/help/totem/
share/gnome/help/totem/C/
share/gnome/help/totem/C/figures/
@ -225,6 +282,17 @@ share/gnome/help/totem/fr/figures/totem_start_window.png
share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
share/gnome/help/totem/fr/totem.xml
share/gnome/help/totem/gl/
share/gnome/help/totem/gl/figures/
share/gnome/help/totem/gl/figures/totem_next_button.png
share/gnome/help/totem/gl/figures/totem_pause_button.png
share/gnome/help/totem/gl/figures/totem_play_button.png
share/gnome/help/totem/gl/figures/totem_previous_button.png
share/gnome/help/totem/gl/figures/totem_show_playlist_button.png
share/gnome/help/totem/gl/figures/totem_start_window.png
share/gnome/help/totem/gl/figures/totem_volume_maximum_button.png
share/gnome/help/totem/gl/figures/totem_volume_mute_button.png
share/gnome/help/totem/gl/totem.xml
share/gnome/help/totem/it/
share/gnome/help/totem/it/figures/
share/gnome/help/totem/it/figures/totem_next_button.png
@ -335,6 +403,17 @@ share/gnome/help/totem/sv/figures/totem_start_window.png
share/gnome/help/totem/sv/figures/totem_volume_maximum_button.png
share/gnome/help/totem/sv/figures/totem_volume_mute_button.png
share/gnome/help/totem/sv/totem.xml
share/gnome/help/totem/te/
share/gnome/help/totem/te/figures/
share/gnome/help/totem/te/figures/totem_next_button.png
share/gnome/help/totem/te/figures/totem_pause_button.png
share/gnome/help/totem/te/figures/totem_play_button.png
share/gnome/help/totem/te/figures/totem_previous_button.png
share/gnome/help/totem/te/figures/totem_show_playlist_button.png
share/gnome/help/totem/te/figures/totem_start_window.png
share/gnome/help/totem/te/figures/totem_volume_maximum_button.png
share/gnome/help/totem/te/figures/totem_volume_mute_button.png
share/gnome/help/totem/te/totem.xml
share/gnome/help/totem/uk/
share/gnome/help/totem/uk/figures/
share/gnome/help/totem/uk/figures/totem_next_button.png
@ -394,13 +473,13 @@ share/gtk-doc/html/totem/index.sgml
share/gtk-doc/html/totem/ix02.html
share/gtk-doc/html/totem/ix03.html
share/gtk-doc/html/totem/ix04.html
share/gtk-doc/html/totem/ix05.html
share/gtk-doc/html/totem/left.png
share/gtk-doc/html/totem/right.png
share/gtk-doc/html/totem/style.css
share/gtk-doc/html/totem/totem-Interface.html
share/gtk-doc/html/totem/totem-TotemPlugin.html
share/gtk-doc/html/totem/totem-plugins.html
share/gtk-doc/html/totem/totem.devhelp
share/gtk-doc/html/totem/totem.devhelp2
share/gtk-doc/html/totem/tutorials.html
share/gtk-doc/html/totem/up.png
@ -476,6 +555,7 @@ share/locale/mk/LC_MESSAGES/totem.mo
share/locale/ml/LC_MESSAGES/totem.mo
share/locale/mr/LC_MESSAGES/totem.mo
share/locale/ms/LC_MESSAGES/totem.mo
share/locale/my/LC_MESSAGES/totem.mo
share/locale/nb/LC_MESSAGES/totem.mo
share/locale/ne/LC_MESSAGES/totem.mo
share/locale/nl/LC_MESSAGES/totem.mo
@ -508,7 +588,7 @@ share/locale/xh/LC_MESSAGES/totem.mo
share/locale/zh_CN/LC_MESSAGES/totem.mo
share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
share/omf/
share/locale/zu/LC_MESSAGES/totem.mo
share/omf/totem/
share/omf/totem/totem-C.omf
share/omf/totem/totem-bg.omf
@ -522,6 +602,7 @@ share/omf/totem/totem-es.omf
share/omf/totem/totem-eu.omf
share/omf/totem/totem-fi.omf
share/omf/totem/totem-fr.omf
share/omf/totem/totem-gl.omf
share/omf/totem/totem-it.omf
share/omf/totem/totem-ja.omf
share/omf/totem/totem-oc.omf
@ -532,6 +613,7 @@ share/omf/totem/totem-ro.omf
share/omf/totem/totem-ru.omf
share/omf/totem/totem-sl.omf
share/omf/totem/totem-sv.omf
share/omf/totem/totem-te.omf
share/omf/totem/totem-uk.omf
share/omf/totem/totem-zh_CN.omf
share/omf/totem/totem-zh_HK.omf

View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-nautilus,v 1.1 2011/09/12 07:28:55 jasper Exp $
lib/nautilus/
lib/nautilus/extensions-3.0/
@comment $OpenBSD: PLIST-nautilus,v 1.2 2012/07/07 16:43:10 ajacoutot Exp $
@comment lib/nautilus/extensions-3.0/libtotem-properties-page.a
@comment lib/nautilus/extensions-3.0/libtotem-properties-page.la
lib/nautilus/extensions-3.0/libtotem-properties-page.so