svn commit: r310266 - in head/multimedia/xfce4-parole: . files
Olivier Duchateau
olivierd at FreeBSD.org
Sat Jan 12 11:51:05 UTC 2013
Author: olivierd
Date: Sat Jan 12 11:51:03 2013
New Revision: 310266
URL: http://svnweb.freebsd.org/changeset/ports/310266
Log:
- Update to 0.4.0
- Convert Makefile headers to new style
Approved by: rene, miwi (mentors, implicit)
Added:
head/multimedia/xfce4-parole/files/patch-data__interfaces__playlist.ui (contents, props changed)
head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c (contents, props changed)
head/multimedia/xfce4-parole/files/patch-src__misc__parole-file.c (contents, props changed)
Deleted:
head/multimedia/xfce4-parole/files/patch-src_gst_parole-gst.c
Modified:
head/multimedia/xfce4-parole/Makefile
head/multimedia/xfce4-parole/distinfo (contents, props changed)
head/multimedia/xfce4-parole/files/patch-configure (contents, props changed)
head/multimedia/xfce4-parole/pkg-plist (contents, props changed)
Modified: head/multimedia/xfce4-parole/Makefile
==============================================================================
--- head/multimedia/xfce4-parole/Makefile Sat Jan 12 11:04:47 2013 (r310265)
+++ head/multimedia/xfce4-parole/Makefile Sat Jan 12 11:51:03 2013 (r310266)
@@ -1,18 +1,15 @@
-# New ports collection makefile for: Xfce4-parole
-# Date created: 26 December 2009
-# Whom: Martin Wilke <miwi at FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi at FreeBSD.org>
# $FreeBSD$
#
PORTNAME= parole
-PORTVERSION= 0.3.0.3
+PORTVERSION= 0.4.0
CATEGORIES= multimedia xfce
-MASTER_SITES= XFCE/src/apps/${PORTNAME}/0.3/
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
DIST_SUBDIR= xfce4
MAINTAINER= xfce at FreeBSD.org
-COMMENT= Lightweight media player for Xfce4 based on gstreamer
+COMMENT= Lightweight media player for Xfce4 based on GStreamer
LICENSE= GPLv2
@@ -26,6 +23,7 @@ USE_BZIP2= yes
USE_GSTREAMER= core faad flac wavpack
USE_GMAKE= yes
CONFIGURE_ARGS= --disable-power-manager-plugin \
+ --enable-maintainer-mode \
--enable-libnotify \
--enable-taglib \
--without-html-dir
@@ -64,9 +62,11 @@ PLIST_SUB+= NLS="@comment "
post-patch:
# Downgrade Glib version
@${REINPLACE_CMD} -e 's|2\.32|2\.28|g' ${WRKSRC}/configure
-# Fix .rc file path
+# Fix .rc files path
@${REINPLACE_CMD} -e 's|xfce4/src/misc|${PORTNAME}|g' \
- ${WRKSRC}/src/common/parole-rc-utils.h
+ ${WRKSRC}/src/common/parole-rc-utils.h \
+ ${WRKSRC}/src/plugins/notify/notify-provider.c \
+ ${WRKSRC}/src/plugins/tray/tray-provider.c
post-install:
@-update-desktop-database
Modified: head/multimedia/xfce4-parole/distinfo
==============================================================================
--- head/multimedia/xfce4-parole/distinfo Sat Jan 12 11:04:47 2013 (r310265)
+++ head/multimedia/xfce4-parole/distinfo Sat Jan 12 11:51:03 2013 (r310266)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/parole-0.3.0.3.tar.bz2) = e02925a51321f6e413d608d36aa1a886d78938967664c178386c4c618e883661
-SIZE (xfce4/parole-0.3.0.3.tar.bz2) = 622735
+SHA256 (xfce4/parole-0.4.0.tar.bz2) = 79463fa3652bdeee20ed763afe551affb5c888d40d483fe3b23e1419554574aa
+SIZE (xfce4/parole-0.4.0.tar.bz2) = 653805
Modified: head/multimedia/xfce4-parole/files/patch-configure
==============================================================================
--- head/multimedia/xfce4-parole/files/patch-configure Sat Jan 12 11:04:47 2013 (r310265)
+++ head/multimedia/xfce4-parole/files/patch-configure Sat Jan 12 11:51:03 2013 (r310266)
@@ -1,14 +1,15 @@
---- configure.orig 2012-08-18 13:14:45.000000000 +0000
-+++ configure 2012-08-18 16:12:17.000000000 +0000
-@@ -18761,7 +18761,6 @@
+--- ./configure.orig 2013-01-07 10:17:14.000000000 +0000
++++ ./configure 2013-01-08 20:20:14.000000000 +0000
+@@ -18772,7 +18772,7 @@
fi
fi
- USE_NLS=yes
++ #USE_NLS=yes
gt_cv_have_gettext=no
-@@ -23214,10 +23213,10 @@
+@@ -23621,10 +23621,10 @@
else
cat >>confdefs.h <<_ACEOF
Added: head/multimedia/xfce4-parole/files/patch-data__interfaces__playlist.ui
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xfce4-parole/files/patch-data__interfaces__playlist.ui Sat Jan 12 11:51:03 2013 (r310266)
@@ -0,0 +1,11 @@
+--- ./data/interfaces/playlist.ui.orig 2013-01-07 10:15:53.000000000 +0000
++++ ./data/interfaces/playlist.ui 2013-01-09 22:15:33.000000000 +0000
+@@ -5,7 +5,7 @@
+ <object class="GtkMenu" id="dvd-menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="ubuntu_local">True</property>
++ <!-- <property name="ubuntu_local">True</property> -->
+ <child>
+ <object class="GtkMenuItem" id="dvd-menu-menu">
+ <property name="visible">True</property>
Added: head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c Sat Jan 12 11:51:03 2013 (r310266)
@@ -0,0 +1,153 @@
+--- ./src/gst/parole-gst.c.orig 2013-01-07 10:15:53.000000000 +0000
++++ ./src/gst/parole-gst.c 2013-01-08 21:36:35.000000000 +0000
+@@ -97,8 +97,12 @@
+ GstElement *video_sink;
+
+ GstBus *bus;
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ GMutex lock;
++#else
++ GMutex *lock;
++#endif
+ GstState state;
+ GstState target;
+ ParoleState media_state;
+@@ -184,8 +188,12 @@
+
+ if ( gst->priv->device )
+ g_free (gst->priv->device);
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_clear (&gst->priv->lock);
++#else
++ g_mutex_free (gst->priv->lock);
++#endif
+
+ G_OBJECT_CLASS (parole_gst_parent_class)->finalize (object);
+ }
+@@ -1876,11 +1884,19 @@
+ g_object_get (G_OBJECT (gst->priv->stream),
+ "has-video", &playing_video,
+ NULL);
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_lock (&gst->priv->lock);
++#else
++ g_mutex_lock (gst->priv->lock);
++#endif
+ gst->priv->target = GST_STATE_NULL;
+ parole_stream_init_properties (gst->priv->stream);
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_unlock (&gst->priv->lock);
++#else
++ g_mutex_unlock (gst->priv->lock);
++#endif
+
+ parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+
+@@ -2226,7 +2242,11 @@
+ gst->priv->target = GST_STATE_VOID_PENDING;
+ gst->priv->media_state = PAROLE_STATE_STOPPED;
+ gst->priv->aspect_ratio = PAROLE_ASPECT_RATIO_NONE;
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_init (&gst->priv->lock);
++#else
++ gst->priv->lock = g_mutex_new ();
++#endif
+ gst->priv->stream = parole_stream_new ();
+ gst->priv->tick_id = 0;
+ gst->priv->hidecursor_timer = g_timer_new ();
+@@ -2330,7 +2350,11 @@
+
+ void parole_gst_play_uri (ParoleGst *gst, const gchar *uri, const gchar *subtitles)
+ {
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_lock (&gst->priv->lock);
++#else
++ g_mutex_lock (gst->priv->lock);
++#endif
+
+ gst->priv->target = GST_STATE_PLAYING;
+ parole_stream_init_properties (gst->priv->stream);
+@@ -2339,8 +2363,12 @@
+ "uri", uri,
+ "subtitles", subtitles,
+ NULL);
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_unlock (&gst->priv->lock);
++#else
++ g_mutex_unlock (gst->priv->lock);
++#endif
+
+ if ( gst->priv->state_change_id == 0 )
+ gst->priv->state_change_id = g_timeout_add_seconds (20,
+@@ -2381,11 +2409,19 @@
+
+ void parole_gst_pause (ParoleGst *gst)
+ {
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_lock (&gst->priv->lock);
++#else
++ g_mutex_lock (gst->priv->lock);
++#endif
+
+ gst->priv->target = GST_STATE_PAUSED;
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_unlock (&gst->priv->lock);
++#else
++ g_mutex_unlock (gst->priv->lock);
++#endif
+
+ parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+ parole_gst_change_state (gst, GST_STATE_PAUSED);
+@@ -2393,11 +2429,19 @@
+
+ void parole_gst_resume (ParoleGst *gst)
+ {
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_lock (&gst->priv->lock);
++#else
++ g_mutex_lock (gst->priv->lock);
++#endif
+
+ gst->priv->target = GST_STATE_PLAYING;
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_unlock (&gst->priv->lock);
++#else
++ g_mutex_unlock (gst->priv->lock);
++#endif
+
+ parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+ parole_gst_change_state (gst, GST_STATE_PLAYING);
+@@ -2417,12 +2461,20 @@
+
+ void parole_gst_stop (ParoleGst *gst)
+ {
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_lock (&gst->priv->lock);
++#else
++ g_mutex_lock (gst->priv->lock);
++#endif
+
+ parole_stream_init_properties (gst->priv->stream);
+ gst->priv->target = GST_STATE_NULL;
+-
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
+ g_mutex_unlock (&gst->priv->lock);
++#else
++ g_mutex_unlock (gst->priv->lock);
++#endif
+
+ parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+
Added: head/multimedia/xfce4-parole/files/patch-src__misc__parole-file.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xfce4-parole/files/patch-src__misc__parole-file.c Sat Jan 12 11:51:03 2013 (r310266)
@@ -0,0 +1,26 @@
+--- ./src/misc/parole-file.c.orig 2013-01-07 10:15:53.000000000 +0000
++++ ./src/misc/parole-file.c 2013-01-08 21:14:23.000000000 +0000
+@@ -610,7 +610,11 @@
+ void
+ parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi)
+ {
++#if GLIB_CHECK_VERSION (2, 30, 0)
+ GValue value = G_VALUE_INIT;
++#else
++ GValue value;
++#endif
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_static_string (&value, suburi);
+
+@@ -643,7 +647,11 @@
+ void
+ parole_file_set_dvd_chapter (const ParoleFile *file, gint dvd_chapter)
+ {
++#if GLIB_CHECK_VERSION (2, 30, 0)
+ GValue value = G_VALUE_INIT;
++#else
++ GValue value;
++#endif
+ g_value_init (&value, G_TYPE_INT);
+ g_value_set_int (&value, dvd_chapter);
+
Modified: head/multimedia/xfce4-parole/pkg-plist
==============================================================================
--- head/multimedia/xfce4-parole/pkg-plist Sat Jan 12 11:04:47 2013 (r310265)
+++ head/multimedia/xfce4-parole/pkg-plist Sat Jan 12 11:51:03 2013 (r310266)
@@ -7,14 +7,16 @@ include/parole/parole-provider-player.h
include/parole/parole-provider-plugin.h
include/parole/parole-stream.h
include/parole/parole.h
-lib/parole-0/stream-properties.la
-lib/parole-0/stream-properties.so
+lib/parole-0/parole-notify.la
+lib/parole-0/parole-notify.so
lib/parole-0/tray-icon.la
lib/parole-0/tray-icon.so
share/applications/parole.desktop
+share/icons/hicolor/16x16/apps/extension.png
share/icons/hicolor/16x16/apps/parole.png
share/icons/hicolor/24x24/apps/parole.png
share/icons/hicolor/32x32/apps/parole.png
+share/icons/hicolor/48x48/apps/extension.png
share/icons/hicolor/48x48/apps/parole.png
share/icons/hicolor/scalable/apps/parole.svg
%%NLS%%share/locale/ar/LC_MESSAGES/parole.mo
@@ -55,7 +57,7 @@ share/icons/hicolor/scalable/apps/parole
%%NLS%%share/locale/uk/LC_MESSAGES/parole.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/parole.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/parole.mo
-%%DATADIR%%/parole-plugins-0/stream-properties.desktop
+%%DATADIR%%/parole-plugins-0/notify.desktop
%%DATADIR%%/parole-plugins-0/system-tray.desktop
share/pixmaps/parole.png
@dirrm %%DATADIR%%/parole-plugins-0
More information about the svn-ports-all
mailing list