[118928] trunk/dports/net/rygel

[devans at macports.org]

Revision: 118928
          https://trac.macports.org/changeset/118928
Author:   devans at macports.org
Date:     2014-04-13 18:58:47 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
rygel: update to version 0.22.0.

Modified Paths:
--------------
    trunk/dports/net/rygel/Portfile
    trunk/dports/net/rygel/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/net/rygel/files/patch-return.diff

Property Changed:
----------------
    trunk/dports/net/rygel/


Property changes on: trunk/dports/net/rygel
___________________________________________________________________
Added: svn:mergeinfo
   + /users/devans/GNOME-3/stable/dports/net/rygel:113175-118732
/users/devans/GNOME-3/unstable/dports/net/rygel:116416-118154

Modified: trunk/dports/net/rygel/Portfile
===================================================================
--- trunk/dports/net/rygel/Portfile	2014-04-14 01:58:38 UTC (rev 118927)
+++ trunk/dports/net/rygel/Portfile	2014-04-14 01:58:47 UTC (rev 118928)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            rygel
-version         0.20.3
+version         0.22.0
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Rygel DLNA media server, renderer
@@ -19,8 +19,8 @@
 
 use_xz          yes
 
-checksums       rmd160  ed387b49a5941dcab43b935d5524cb814711678f \
-                sha256  4e7e3105a1d27d126938b7530f60bd7867121188651cee806f36694fbd7dd349
+checksums       rmd160  d1402d0078df128f6cd8375478c6c2ea058b77f0 \
+                sha256  b70fcfc361c3cb6624b15f1acfd8b77d47628d0efd7cba8c5059c4a85ae6882c
 
 depends_build   port:pkgconfig \
                 port:intltool
@@ -38,8 +38,7 @@
 
 depends_run     port:gnome-settings-daemon
 
-patchfiles      patch-configure.ac.diff \
-                patch-return.diff
+patchfiles      patch-configure.ac.diff
 
 # update m4/intltool.m4 and autoreconf
 

Modified: trunk/dports/net/rygel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/net/rygel/files/patch-configure.ac.diff	2014-04-14 01:58:38 UTC (rev 118927)
+++ trunk/dports/net/rygel/files/patch-configure.ac.diff	2014-04-14 01:58:47 UTC (rev 118928)
@@ -1,20 +1,20 @@
---- configure.ac.orig	2013-12-22 03:32:37.000000000 -0800
-+++ configure.ac	2014-02-26 00:43:42.000000000 -0800
+--- configure.ac.orig	2014-03-06 12:39:24.000000000 -0800
++++ configure.ac	2014-03-14 15:55:49.000000000 -0700
 @@ -43,7 +43,7 @@
  GSTPBU_REQUIRED=1.0
  GIO_REQUIRED=2.26
  GEE_REQUIRED=0.8.0
 -UUID_REQUIRED=1.41.3
 +UUID_REQUIRED=1.6.2
- LIBSOUP_REQUIRED=2.34.0
+ LIBSOUP_REQUIRED=2.42.0
  GTK_REQUIRED=3.0
  
-@@ -387,7 +387,7 @@
+@@ -399,7 +399,7 @@
  AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
  
  AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
 -         ["-module -avoid-version -Wl,-z,defs"])
 +         ["-module -avoid-version"])
  AC_SUBST([RYGEL_PLUGIN_DIR],
-          [${libdir}/rygel-2.0/plugins])
+          [${libdir}/rygel-2.2/plugins])
  AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],

Deleted: trunk/dports/net/rygel/files/patch-return.diff
===================================================================
--- trunk/dports/net/rygel/files/patch-return.diff	2014-04-14 01:58:38 UTC (rev 118927)
+++ trunk/dports/net/rygel/files/patch-return.diff	2014-04-14 01:58:47 UTC (rev 118928)
@@ -1,16 +0,0 @@
---- src/librygel-renderer-gst/rygel-playbin-player.c.orig	2013-11-16 12:15:11.000000000 -0800
-+++ src/librygel-renderer-gst/rygel-playbin-player.c	2013-11-16 12:16:52.000000000 -0800
-@@ -192,11 +192,11 @@
- 	g_return_val_if_fail (playbin != NULL, NULL);
- 	self = (RygelPlaybinPlayer*) g_object_new (object_type, NULL);
- 	_tmp0_ = playbin;
--	g_return_if_fail (_tmp0_ != NULL);
-+	g_return_val_if_fail (_tmp0_ != NULL, NULL);
- 	_tmp1_ = playbin;
- 	_tmp2_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp1_);
- 	_tmp3_ = g_type_name (_tmp2_);
--	g_return_if_fail (g_strcmp0 (_tmp3_, "GstPlayBin") == 0);
-+	g_return_val_if_fail (g_strcmp0 (_tmp3_, "GstPlayBin") == 0, NULL);
- 	_tmp4_ = playbin;
- 	rygel_playbin_player_set_playbin (self, _tmp4_);
- 	self->priv->foreign = TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/c5f683dd/attachment.html>