[csw-devel] SF.net SVN: gar:[21419] csw/mgar/pkg/gstplugins_bad/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Mon Jul 1 10:05:57 CEST 2013


Revision: 21419
          http://gar.svn.sourceforge.net/gar/?rev=21419&view=rev
Author:   cgrzemba
Date:     2013-07-01 08:05:51 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
gstplugins_bad/trunk: update version and build recipe

Modified Paths:
--------------
    csw/mgar/pkg/gstplugins_bad/trunk/Makefile
    csw/mgar/pkg/gstplugins_bad/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch

Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gstplugins_bad/trunk/Makefile	2013-07-01 07:59:05 UTC (rev 21418)
+++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile	2013-07-01 08:05:51 UTC (rev 21419)
@@ -1,5 +1,5 @@
 NAME = gst-plugins-bad
-VERSION = 0.10.20
+VERSION = 0.10.21
 CATEGORIES = gnome
 GARTYPE = v2
 
@@ -13,17 +13,39 @@
 
 MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-bad/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PACKAGES = CSWgstpluginsbad
-CATALOGNAME = gstplugins_bad
+PACKAGES = CSWgstplugins-bad
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+BUILD_DEP_PKGS += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm
+BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo
+BUILD_DEP_PKGS += CSWbzip2 CSWfaac CSWlibfaad-dev CSWggettextrt CSWjasper CSWliboil
+BUILD_DEP_PKGS += CSWfconfig CSWftype2
 
-DEP_PKGS += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm
-DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo
-DEP_PKGS += CSWbzip2 CSWfaac CSWfaad2 CSWggettextrt CSWjasper CSWliboil
-DEP_PKGS += CSWfconfig CSWftype2
+GARCOMPILER = GCC4
 
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstsdp0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstrtp0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibsndfile1
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgsttag0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWfaac
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstvideo0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstaudio0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstbase0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstcontroller0-10-0
+RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgcc-s1
+
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --disable-debug
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
@@ -37,8 +59,12 @@
 TEST_SCRIPTS =
 
 PATCHFILES = patch-gstvideomeasure_collector.h patch-gstvideomeasure_ssim.h
+# see: GStreamer (bugzilla.gnome.org) 
+# [Bug 645053] shm: multiple compile failures on Solaris 10
+PATCHFILES = 0001-fix-solaris10-compiler-errors.patch
 
 include gar/category.mk
+
 post-configure-modulated:
 	perl -pi -e 's,(LIBS = -lnsl -lsocket),$$1 -lresolv,' \
 		$(WORKSRC)/gst/dccp/Makefile

Modified: csw/mgar/pkg/gstplugins_bad/trunk/checksums
===================================================================
--- csw/mgar/pkg/gstplugins_bad/trunk/checksums	2013-07-01 07:59:05 UTC (rev 21418)
+++ csw/mgar/pkg/gstplugins_bad/trunk/checksums	2013-07-01 08:05:51 UTC (rev 21419)
@@ -1,3 +1 @@
-454f1bfaa9a1dff48d7a1df2fbf5b3c3  gst-plugins-bad-0.10.17.tar.gz
-4f8db8228a9066d3a68501dfc2202d59  patch-gstvideomeasure_collector.h
-5f7b6d332bb6e70488e8ae8043cdf0dc  patch-gstvideomeasure_ssim.h
+d19af641ab0b9a5c6cbb66ba19c35b16  gst-plugins-bad-0.10.21.tar.gz

Added: csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch
===================================================================
--- csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch	                        (rev 0)
+++ csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch	2013-07-01 08:05:51 UTC (rev 21419)
@@ -0,0 +1,87 @@
+From 9c192361f6b43ef872ffa98229c188b62bb1ca9f Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 28 Jun 2013 11:27:49 +0200
+Subject: [PATCH] fix solaris10 compiler errors
+
+---
+ sys/shm/shmpipe.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/sys/shm/shmpipe.c b/sys/shm/shmpipe.c
+index 9d1ab56..b19fd0f 100644
+--- a/sys/shm/shmpipe.c
++++ b/sys/shm/shmpipe.c
+@@ -69,6 +69,10 @@
+ 
+ #define LISTEN_BACKLOG 10
+ 
++#if ! defined(MSG_NOSIGNAL)
++#define MSG_NOSIGNAL 0
++#endif
++
+ enum
+ {
+   COMMAND_NEW_SHM_AREA = 1,
+@@ -190,7 +194,7 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
+ {
+   ShmPipe *self = spalloc_new (ShmPipe);
+   int flags;
+-  struct sockaddr_un sun;
++  struct sockaddr_un sock_un;
+   int i = 0;
+ 
+   memset (self, 0, sizeof (ShmPipe));
+@@ -208,10 +212,10 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
+   if (fcntl (self->main_socket, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC) < 0)
+     RETURN_ERROR ("fcntl(F_SETFL) failed (%d): %s\n", errno, strerror (errno));
+ 
+-  sun.sun_family = AF_UNIX;
+-  strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1);
++  sock_un.sun_family = AF_UNIX;
++  strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1);
+ 
+-  while (bind (self->main_socket, (struct sockaddr *) &sun,
++  while (bind (self->main_socket, (struct sockaddr *) &sock_un,
+           sizeof (struct sockaddr_un)) < 0) {
+     if (errno != EADDRINUSE)
+       RETURN_ERROR ("bind() failed (%d): %s\n", errno, strerror (errno));
+@@ -219,11 +223,11 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
+     if (i > 256)
+       RETURN_ERROR ("Could not find a free socket name for %s", path);
+ 
+-    snprintf (sun.sun_path, sizeof (sun.sun_path), "%s.%d", path, i);
++    snprintf (sock_un.sun_path, sizeof (sock_un.sun_path), "%s.%d", path, i);
+     i++;
+   }
+ 
+-  self->socket_path = strdup (sun.sun_path);
++  self->socket_path = strdup (sock_un.sun_path);
+ 
+   if (listen (self->main_socket, LISTEN_BACKLOG) < 0)
+     RETURN_ERROR ("listen() failed (%d): %s\n", errno, strerror (errno));
+@@ -704,7 +708,7 @@ ShmPipe *
+ sp_client_open (const char *path)
+ {
+   ShmPipe *self = spalloc_new (ShmPipe);
+-  struct sockaddr_un sun;
++  struct sockaddr_un sock_un;
+ 
+   memset (self, 0, sizeof (ShmPipe));
+ 
+@@ -712,10 +716,10 @@ sp_client_open (const char *path)
+   if (self->main_socket < 0)
+     goto error;
+ 
+-  sun.sun_family = AF_UNIX;
+-  strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1);
++  sock_un.sun_family = AF_UNIX;
++  strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1);
+ 
+-  if (connect (self->main_socket, (struct sockaddr *) &sun,
++  if (connect (self->main_socket, (struct sockaddr *) &sock_un,
+           sizeof (struct sockaddr_un)) < 0)
+     goto error;
+ 
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list