Skip site navigation (1)Skip section navigation (2)

ports/163635: [PATCH] net/opal3: Fix build on 10-CURRENT

From: Steve Wills <swills@freebsd.org>
Date: Mon, 26 Dec 2011 16:55:27 -0500 (EST)
Subject: [PATCH] net/opal3: Fix build on 10-CURRENT
Send-pr version: 3.113
Number: 163635
Category: ports
Synopsis: [PATCH] net/opal3: Fix build on 10-CURRENT
Severity: serious
Priority: medium
Responsible: swills
State: closed
Class: sw-bug
Arrival-Date: Mon Dec 26 22:00:20 UTC 2011
Closed-Date: Thu Dec 29 23:26:58 UTC 2011
Last-Modified: Thu Dec 29 23:30:22 UTC 2011
Originator: Steve Wills
Release: FreeBSD 10.0-CURRENT amd64
Organization
Environment
System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #8: Mon Dec 19 15:53:28 EST 2011
Description
The attached patch fixes the issue with building net/opal3 on 10-CURRENT. It's
basically just a more correct version of the existing patch. This is marked
serious since it blocks building x11/gnome2 on 10-CURRENT. Also pet portlint
while here. Not PORTREVISION bump since the build output remains the same.

Added file(s):
- files/patch-spandsp_fax.cpp
- files/patch-spandsp_if.cpp

Removed file(s):
- files/patch-spandsp_if.h

Port maintainer (melifaro@ipfw.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
How-To-Repeat
Fix
Download opal3-3.6.6_13.patch
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/opal3/Makefile,v
retrieving revision 1.109
diff -u -u -r1.109 Makefile
--- Makefile 21 Dec 2011 08:48:28 -0000 1.109
+++ Makefile 26 Dec 2011 21:50:49 -0000
@@ -11,11 +11,12 @@
 CATEGORIES= net
 MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Stable%205
 DISTNAME= opal-${PORTVERSION}
-LICENSE= MPL
 
 MAINTAINER= melifaro@ipfw.ru
 COMMENT= VoIP abstraction library
 
+LICENSE= MPL
+
 LIB_DEPENDS= pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26
 
 CONFLICTS= opal-2.*
Index: files/patch-spandsp_fax.cpp
===================================================================
RCS file: files/patch-spandsp_fax.cpp
diff -N files/patch-spandsp_fax.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-spandsp_fax.cpp 26 Dec 2011 21:50:49 -0000
@@ -0,0 +1,10 @@
+--- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig 2011-12-26 21:02:09.000000000 +0000
++++ plugins/fax/fax_spandsp/spandsp_fax.cpp 2011-12-26 21:01:38.000000000 +0000
+@@ -42,6 +42,7 @@
+ *
+ */
+
++#define __STDC_LIMIT_MACROS
+ #include <codec/opalplugin.h>
+
+ extern "C" {
Index: files/patch-spandsp_if.cpp
===================================================================
RCS file: files/patch-spandsp_if.cpp
diff -N files/patch-spandsp_if.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-spandsp_if.cpp 26 Dec 2011 21:50:49 -0000
@@ -0,0 +1,10 @@
+--- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp.orig 2011-12-26 21:04:48.000000000 +0000
++++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp 2011-12-26 21:05:21.000000000 +0000
+@@ -23,6 +23,7 @@
+ * $Id: spandsp_if.cpp,v 1.7 2007/07/24 04:39:44 csoutheren Exp $
+ */
+
++#define __STDC_LIMIT_MACROS
+ #include "spandsp_if.h"
+
+ #include <iostream>
Index: files/patch-spandsp_if.h
===================================================================
RCS file: files/patch-spandsp_if.h
diff -N files/patch-spandsp_if.h
--- files/patch-spandsp_if.h 27 Sep 2009 15:52:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h.orig 2009-08-30 02:52:53.000000000 +0400
-+++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h 2009-08-30 02:53:00.000000000 +0400
-@@ -24,6 +24,11 @@
- */
-
- extern "C" {
-+#undef __cplusplus
-+#undef _MACHINE__STDINT_H_
-+#include <machine/_stdint.h>
-+#define __cplusplus
-+
- #include "spandsp.h"
- };
-
Release-Note
Audit-Trail
Responsible Changed
From-To: freebsd-ports-bugs->swills
By: edwin
When: Mon Dec 26 22:00:34 UTC 2011
Why: Submitter has GNATS access (via the GNATS Auto Assign Tool)
State Changed
From-To: open->feedback
By: edwin
When: Mon Dec 26 22:00:40 UTC 2011
Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Reply via E-mail [Link]
From: Edwin Groothuis <edwin@FreeBSD.org>
To: melifaro@ipfw.ru
Date: Mon, 26 Dec 2011 22:00:37 UT
Maintainer of net/opal3,

Please note that PR ports/163635 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/163635

--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Reply via E-mail [Link]
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To: bug-followup@FreeBSD.org, swills@freebsd.org
Date: Tue, 27 Dec 2011 02:52:01 +0400
Please commit if this is needed.

I'm not related with voip now, so I can't update/test ptlib,opal, Ekiga
and spandsp. Feel free to take maintainership if you're interested.
Reply via E-mail [Link]
From: Steve Wills <swills@FreeBSD.org> [submitter]
To: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Wed, 28 Dec 2011 20:13:16 -0500
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/26/11 17:52, Alexander V. Chernikov wrote:
> Please commit if this is needed.
>
> I'm not related with voip now, so I can't update/test ptlib,opal, Ekiga
> and spandsp. Feel free to take maintainership if you're interested.

Ok, thanks. You have any thoughts on disabling ODBC in ptlib by default?
Any reason not to?

Steve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBAgAGBQJO+76sAAoJEPXPYrMgexuhLEoIAJ0n0VHZRt7sgyonwZonZjNw
0IdEtp7mojNS8DZJbfFqZcDBtjcu/se3v1Ey3NwO1zMIkpcGVi452r0H+ATzMc54
gdny8UZC9jZ7LH8/uuspl3AhwmLUF+xkiJFar8J8czslj7nKB0aasUB6fWLaJtTQ
rqD/SrijiI2XXaigXLIzw3SHsH7Z12dODY90fbKOIaDpITmMf0xfsS7AB5PAPy72
k5aTG6DbcEfM9ZCQe6l40wAoiDs3OAi70EsR31KpzgUZOqR23OZc2gWrRHJs/uN3
rAxSJTOUC4C/kKnQ9to2+JQfbwHv2b/f9GUkFpoTGwJo3Moe0iwbokqZJTA4GmA=
=hvpp
-----END PGP SIGNATURE-----
State Changed
From-To: feedback->closed
By: swills
When: Thu Dec 29 23:26:57 UTC 2011
Why: Committed.
Reply via E-mail [Link]
From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Date: Thu, 29 Dec 2011 23:24:44 +0000 (UTC)
swills 2011-12-29 23:24:35 UTC

FreeBSD ports repository

Modified files:
net/opal3 Makefile
Added files:
net/opal3/files patch-spandsp_fax.cpp
patch-spandsp_if.cpp
Removed files:
net/opal3/files patch-spandsp_if.h
Log:
- Fix build on 10-CURRENT
- Turn over to gnome team since it's used by Gnome ports

PR: ports/163635
Submitted by: swills (myself)
Approved by: melifaro (maintainer)

Revision Changes Path
1.110 +3 -2 ports/net/opal3/Makefile
1.1 +10 -0 ports/net/opal3/files/patch-spandsp_fax.cpp (new)
1.1 +10 -0 ports/net/opal3/files/patch-spandsp_if.cpp (new)
1.2 +0 -14 ports/net/opal3/files/patch-spandsp_if.h (dead)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Reply via E-mail [Link]
From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Date: Thu, 29 Dec 2011 23:25:56 +0000 (UTC)
swills 2011-12-29 23:25:39 UTC

FreeBSD ports repository

Modified files:
devel/ptlib26 Makefile
comms/spandsp-devel Makefile
net/ekiga3 Makefile
Log:
- Turn over to gnome team since it's used by Gnome ports

PR: ports/163635
Approved by: melifaro (maintainer)

Revision Changes Path
1.27 +1 -1 ports/comms/spandsp-devel/Makefile
1.15 +1 -1 ports/devel/ptlib26/Makefile
1.10 +1 -1 ports/net/ekiga3/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Unformatted