[csw-devel] SF.net SVN: gar:[21218] csw/mgar/pkg/fluidsynth/trunk

[lblume at users.sourceforge.net]

Revision: 21218
          http://gar.svn.sourceforge.net/gar/?rev=21218&view=rev
Author:   lblume
Date:     2013-05-28 13:26:05 +0000 (Tue, 28 May 2013)
Log Message:
-----------
fluidsynth/trunk: Include official patches to fix the Solaris build

Modified Paths:
--------------
    csw/mgar/pkg/fluidsynth/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch
    csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch

Removed Paths:
-------------
    csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch

Modified: csw/mgar/pkg/fluidsynth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fluidsynth/trunk/Makefile	2013-05-28 11:34:36 UTC (rev 21217)
+++ csw/mgar/pkg/fluidsynth/trunk/Makefile	2013-05-28 13:26:05 UTC (rev 21218)
@@ -12,7 +12,9 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-translate_error-is-not-on-solaris.patch
+# Official patches to fix the Solaris build - included upstream
+PATCHFILES += 0002-fix-solaris-build.patch
+PATCHFILES += 0003-fix-previous.patch
 
 BUILD64_LIBS_ONLY = 1
 

Deleted: csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch
===================================================================
--- csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch	2013-05-28 11:34:36 UTC (rev 21217)
+++ csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch	2013-05-28 13:26:05 UTC (rev 21218)
@@ -1,29 +0,0 @@
---- a/src/bindings/fluid_rtkit.c.original	Thu Aug 16 06:01:13 2012
-+++ b/src/bindings/fluid_rtkit.c	Mon May 27 17:45:27 2013
-@@ -34,7 +34,7 @@
- #include "fluid_rtkit.h"
- 
- 
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__APPLE__) 
- 
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
-@@ -47,7 +47,6 @@
- #include <sys/syscall.h>
- #include <sys/resource.h>
- 
--
- static pid_t _gettid(void) {
-         return (pid_t) syscall(SYS_gettid);
- }
-@@ -342,7 +341,9 @@
- 	dbus_error_init(&error);
- 	conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- 	if (conn == NULL) {
-+#if defined(__linux__) || defined(__APPLE__) 
- 		res = translate_error(error.name);
-+#endif
-         	dbus_error_free(&error);
- 		return res;
- 	}

Added: csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch
===================================================================
--- csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch	                        (rev 0)
+++ csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch	2013-05-28 13:26:05 UTC (rev 21218)
@@ -0,0 +1,63 @@
+--- a/src/bindings/fluid_rtkit.c
++++ b/src/bindings/fluid_rtkit.c
+@@ -290,28 +290,6 @@
+         dbus_error_free(&error);
+ 
+         return ret;
+-}
+-
+-#else
+-
+-int rtkit_make_realtime(DBusConnection *connection, pid_t thread, int priority) {
+-        return -ENOTSUP;
+-}
+-
+-int rtkit_make_high_priority(DBusConnection *connection, pid_t thread, int nice_level) {
+-        return -ENOTSUP;
+-}
+-
+-int rtkit_get_max_realtime_priority(DBusConnection *connection) {
+-        return -ENOTSUP;
+-}
+-
+-int rtkit_get_min_nice_level(DBusConnection *connection, int* min_nice_level) {
+-        return -ENOTSUP;
+-}
+-
+-long long rtkit_get_rttime_nsec_max(DBusConnection *connection) {
+-        return -ENOTSUP;
+ }
+ 
+ #endif
+@@ -375,4 +353,31 @@
+ 	
+ }
+ 
++
++#else
++
++int rtkit_make_realtime(DBusConnection *connection, pid_t thread, int priority) {
++        return -ENOTSUP;
++}
++
++int rtkit_make_high_priority(DBusConnection *connection, pid_t thread, int nice_level) {
++        return -ENOTSUP;
++}
++
++int rtkit_get_max_realtime_priority(DBusConnection *connection) {
++        return -ENOTSUP;
++}
++
++int rtkit_get_min_nice_level(DBusConnection *connection, int* min_nice_level) {
++        return -ENOTSUP;
++}
++
++long long rtkit_get_rttime_nsec_max(DBusConnection *connection) {
++        return -ENOTSUP;
++}
++
++int fluid_rtkit_make_realtime(pid_t thread, int priority) {
++        return -ENOTSUP;
++}
++
+ #endif

Added: csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch
===================================================================
--- csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch	                        (rev 0)
+++ csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch	2013-05-28 13:26:05 UTC (rev 21218)
@@ -0,0 +1,20 @@
+--- a/src/bindings/fluid_rtkit.c
++++ b/src/bindings/fluid_rtkit.c
+@@ -291,8 +291,6 @@
+ 
+         return ret;
+ }
+-
+-#endif
+ 
+ #ifndef RLIMIT_RTTIME
+ #  define RLIMIT_RTTIME 15
+@@ -380,4 +378,6 @@
+         return -ENOTSUP;
+ }
+ 
+-#endif
++#endif /* defined(__linux__) || defined(__APPLE__) */
++
++#endif /* DBUS_SUPPORT */
+

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