mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

- Update to 0.4.0

Browse Source 
- Convert Makefile headers to new style

Approved by:	rene, miwi (mentors, implicit)
This commit is contained in:
Olivier Duchateau 2013-01-12 11:51:03 +00:00
parent 7ba8ac7910
commit c61f836636
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=310266
7 changed files with 139 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
multimedia/xfce4-parole/Makefile
View File

@ -1,18 +1,15 @@
# New ports collection makefile for: Xfce4-parole
# Date created: 26 December 2009
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# Created by: Martin Wilke <miwi@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@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

4
multimedia/xfce4-parole/distinfo
View File

@ -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

9
multimedia/xfce4-parole/files/patch-configure
View File

@ -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

11
multimedia/xfce4-parole/files/patch-data__interfaces__playlist.ui Normal file
View File

@ -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>

112
multimedia/xfce4-parole/files/patch-src_gst_parole-gst.c → multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c
View File

@ -1,103 +1,153 @@
--- src/gst/parole-gst.c.orig 2012-08-08 19:34:30.000000000 +0000
+++ src/gst/parole-gst.c 2012-08-10 22:16:18.000000000 +0000
@@ -84,7 +84,7 @@
--- ./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;
- GMutex lock;
-
+
+#if GLIB_CHECK_VERSION (2, 32, 0)
GMutex lock;
+#else
+ GMutex *lock;
+#endif
GstState state;
GstState target;
ParoleState media_state;
@@ -166,7 +166,7 @@
@@ -184,8 +188,12 @@
if ( gst->priv->device )
g_free (gst->priv->device);
- g_mutex_clear (&gst->priv->lock);
-
+
+#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);
}
@@ -1515,10 +1515,10 @@
@@ -1876,11 +1884,19 @@
g_object_get (G_OBJECT (gst->priv->stream),
"has-video", &playing_video,
NULL);
- g_mutex_lock (&gst->priv->lock);
-
+
+#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);
- g_mutex_unlock (&gst->priv->lock);
+#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);
@@ -1844,7 +1844,7 @@
@@ -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;
- g_mutex_init (&gst->priv->lock);
+#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 ();
@@ -1921,7 +1921,7 @@
@@ -2330,7 +2350,11 @@
void parole_gst_play_uri (ParoleGst *gst, const gchar *uri, const gchar *subtitles)
{
- g_mutex_lock (&gst->priv->lock);
+#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);
@@ -1931,7 +1931,7 @@
@@ -2339,8 +2363,12 @@
"uri", uri,
"subtitles", subtitles,
NULL);
- g_mutex_unlock (&gst->priv->lock);
-
+
+#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,
@@ -1972,11 +1972,11 @@
@@ -2381,11 +2409,19 @@
void parole_gst_pause (ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+#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;
- g_mutex_unlock (&gst->priv->lock);
-
+
+#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);
@@ -1984,11 +1984,11 @@
@@ -2393,11 +2429,19 @@
void parole_gst_resume (ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+#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;
- g_mutex_unlock (&gst->priv->lock);
-
+
+#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);
@@ -2008,12 +2008,12 @@
@@ -2417,12 +2461,20 @@
void parole_gst_stop (ParoleGst *gst)
{
- g_mutex_lock (&gst->priv->lock);
+#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;
- g_mutex_unlock (&gst->priv->lock);
-
+
+#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);

26
multimedia/xfce4-parole/files/patch-src__misc__parole-file.c Normal file
View File

@ -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);

8
multimedia/xfce4-parole/pkg-plist
View File

@ -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.svg
%%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