[Pkg-voip-commits] r867 - in twinkle/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Sat Oct 29 15:36:27 UTC 2005
Author: msp
Date: 2005-10-29 15:36:26 +0000 (Sat, 29 Oct 2005)
New Revision: 867
Added:
twinkle/trunk/debian/patches/ppc-build.patch
twinkle/trunk/debian/patches/twinkle_thread_timings.patch
Modified:
twinkle/trunk/debian/changelog
Log:
* FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
(Closes: #324395)
* Patch from Guido Guenther
- fix ppc build (Closes: #325057)
* Patch from Mikael Magnusson
- Thread creation timing bug causes crashes (Closes: #329433)
Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog 2005-10-29 15:19:07 UTC (rev 866)
+++ twinkle/trunk/debian/changelog 2005-10-29 15:36:26 UTC (rev 867)
@@ -2,8 +2,14 @@
* New upstream release
- New upstream version available (Closes: #334615)
+ * FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
+ (Closes: #324395)
+ * Patch from Guido Guenther
+ - fix ppc build (Closes: #325057)
+ * Patch from Mikael Magnusson
+ - Thread creation timing bug causes crashes (Closes: #329433)
- -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 15:23:18 +0100
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 16:34:36 +0100
twinkle (0.3-1) unstable; urgency=low
Added: twinkle/trunk/debian/patches/ppc-build.patch
===================================================================
--- twinkle/trunk/debian/patches/ppc-build.patch 2005-10-29 15:19:07 UTC (rev 866)
+++ twinkle/trunk/debian/patches/ppc-build.patch 2005-10-29 15:36:26 UTC (rev 867)
@@ -0,0 +1,115 @@
+From agx at sigxcpu.org Thu Aug 25 20:51:21 2005
+Return-path: <debbugs at bugs.debian.org>
+Envelope-to: debian at purcell.id.au
+Delivery-date: Thu, 25 Aug 2005 21:39:04 +0100
+Received: from spohr.debian.org ([140.211.166.43] ident=mail)
+ by bristol.purcell.id.au with esmtp (Exim 4.52)
+ id 1E8OUV-0003nS-49
+ for debian at purcell.id.au; Thu, 25 Aug 2005 21:39:01 +0100
+Received: from debbugs by spohr.debian.org with local (Exim 3.36 1 (Debian))
+ id 1E8OPH-00058X-00; Thu, 25 Aug 2005 13:33:03 -0700
+X-Loop: owner at bugs.debian.org
+Reply-To: Guido Guenther <agx at sigxcpu.org>,
+ 325057 at bugs.debian.org
+Resent-From: Guido Guenther <agx at sigxcpu.org>
+Resent-To: debian-bugs-dist at lists.debian.org
+Resent-CC: Mark Purcell <msp at debian.org>
+Resent-Date: Thu, 25 Aug 2005 20:33:02 UTC
+Resent-Message-ID: <handler.325057.B.1125000999855 at bugs.debian.org>
+X-Debian-PR-Message: report 325057
+X-Debian-PR-Package: twinkle
+X-Debian-PR-Keywords: patch
+Received: via spool by submit at bugs.debian.org id=B.1125000999855
+ (code B ref -1); Thu, 25 Aug 2005 20:33:02 UTC
+Received: (at submit) by bugs.debian.org; 25 Aug 2005 20:16:39 +0000
+Received: from honk1.physik.uni-konstanz.de [134.34.140.224]
+ by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
+ id 1E8O9P-0000De-00; Thu, 25 Aug 2005 13:16:39 -0700
+Received: from localhost (localhost.localnet [127.0.0.1])
+ by honk1.physik.uni-konstanz.de (Postfix) with ESMTP id F005C2BBE3;
+ Thu, 25 Aug 2005 22:16:36 +0200 (CEST)
+Received: from honk1.physik.uni-konstanz.de ([127.0.0.1])
+ by localhost (honk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
+ id 24613-13; Thu, 25 Aug 2005 22:16:32 +0200 (CEST)
+Received: from bogon.sigxcpu.org (xdsl-213-168-120-51.netcologne.de [213.168.120.51])
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
+ (No client certificate requested)
+ by honk1.physik.uni-konstanz.de (Postfix) with ESMTP id DB9C42BBE2;
+ Thu, 25 Aug 2005 22:16:31 +0200 (CEST)
+Received: by bogon.sigxcpu.org (Postfix, from userid 1000)
+ id D08C811E5F8; Thu, 25 Aug 2005 21:51:22 +0200 (CEST)
+Date: Thu, 25 Aug 2005 21:51:21 +0200
+From: Guido Guenther <agx at sigxcpu.org>
+To: Debian Bug Tracking System <submit at bugs.debian.org>
+Message-ID: <20050825195121.GA27379 at bogon.ms20.nix>
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=us-ascii
+Content-Disposition: inline
+X-Reportbug-Version: 3.16
+User-Agent: Mutt/1.5.10i
+X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at honk.physik.uni-konstanz.de
+Delivered-To: submit at bugs.debian.org
+Resent-Sender: Debian BTS <debbugs at bugs.debian.org>
+X-SA-Exim-Connect-IP: 140.211.166.43
+X-SA-Exim-Rcpt-To: debian at purcell.id.au
+X-SA-Exim-Mail-From: debbugs at bugs.debian.org
+Subject: Bug#325057: twinkle: fix ppc build
+X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on debian
+X-Spam-Level:
+X-Spam-Status: No, score=-2.6 required=0.0 tests=BAYES_00 autolearn=ham
+ version=3.0.4
+X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100)
+X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au)
+X-Length: 4477
+X-KMail-EncryptionState:
+X-KMail-SignatureState:
+X-KMail-MDN-Sent:
+Status: RO
+Content-Length: 1185
+X-UID: 72
+X-Keywords:
+X-Status: OC
+
+Package: twinkle
+Version: fix build on 32 bit arches
+Severity: wishlist
+Tags: patch
+
+Hi,
+this patch fixes the ppc build...
+
+--- tmp/twinkle-0.2.1/src/stun/stun.cxx 2005-07-28 22:46:57.000000000 +0200
++++ twinkle-0.2.1/src/stun/stun.cxx 2005-08-25 21:42:52.000000000 +0200
+@@ -676,10 +676,14 @@
+ asm("rdtsc" : "=A" (tick));
+ #elif defined (__SUNPRO_CC) || defined( __sparc__ )
+ tick = gethrtime();
+-#elif defined(__MACH__)
++#elif defined(__MACH__)
+ int fd=open("/dev/random",O_RDONLY);
+ read(fd,&tick,sizeof(tick));
+ closesocket(fd);
++#elif defined (__linux__)
++ int fd=open("/dev/urandom",O_RDONLY);
++ read(fd,&tick,sizeof(tick));
++ close(fd);
+ #else
+ # error Need some way to seed the random number generator
+ #endif
+
+...it should also fix the build for other 32bit linux architectures.
+Please enable these for future builds.
+Cheers,
+ -- Guido
+
+-- System Information:
+Debian Release: testing/unstable
+ APT prefers unstable
+ APT policy: (500, 'unstable'), (500, 'stable')
+Architecture: powerpc (ppc)
+Shell: /bin/sh linked to /bin/bash
+Kernel: Linux 2.6.13-rc3-agx0
+Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
+
+
Added: twinkle/trunk/debian/patches/twinkle_thread_timings.patch
===================================================================
--- twinkle/trunk/debian/patches/twinkle_thread_timings.patch 2005-10-29 15:19:07 UTC (rev 866)
+++ twinkle/trunk/debian/patches/twinkle_thread_timings.patch 2005-10-29 15:36:26 UTC (rev 867)
@@ -0,0 +1,88 @@
+only in patch2:
+unchanged:
+--- twinkle-0.2.1.orig/src/audio/audio_session.cpp
++++ twinkle-0.2.1/src/audio/audio_session.cpp
+@@ -672,11 +672,13 @@
+
+ if (audio_rx) {
+ try {
++ audio_rx->set_running(true);
+ thr_audio_rx = new t_thread(main_audio_rx, NULL);
+ MEMMAN_NEW(thr_audio_rx);
+ // thr_audio_rx->set_sched_fifo(90);
+ thr_audio_rx->detach();
+ } catch (int) {
++ audio_rx->set_running(false);
+ string msg("Failed to create audio_rx thread.");
+ log_file->write_report(msg, "t_audio_session::run",
+ LOG_NORMAL, LOG_CRITICAL);
+@@ -688,11 +690,13 @@
+
+ if (audio_tx) {
+ try {
++ audio_tx->set_running(true);
+ thr_audio_tx = new t_thread(main_audio_tx, NULL);
+ MEMMAN_NEW(thr_audio_tx);
+ // thr_audio_tx->set_sched_fifo(90);
+ thr_audio_tx->detach();
+ } catch (int) {
++ audio_tx->set_running(false);
+ string msg("Failed to create audio_tx thread.");
+ log_file->write_report(msg, "t_audio_session::run",
+ LOG_NORMAL, LOG_CRITICAL);
+only in patch2:
+unchanged:
+--- twinkle-0.2.1.orig/src/audio/audio_rx.cpp
++++ twinkle-0.2.1/src/audio/audio_rx.cpp
+@@ -397,6 +397,10 @@
+ }
+ }
+
++void t_audio_rx::set_running(bool _is_running) {
++ is_running = _is_running;
++}
++
+ void t_audio_rx::run(void) {
+ int status;
+ audio_buf_info dsp_info;
+only in patch2:
+unchanged:
+--- twinkle-0.2.1.orig/src/audio/audio_rx.h
++++ twinkle-0.2.1/src/audio/audio_rx.h
+@@ -156,6 +156,8 @@
+
+ ~t_audio_rx();
+
++ void set_running(bool is_running);
++
+ void run(void);
+
+ // Set the dynamic payload type for telephone events
+only in patch2:
+unchanged:
+--- twinkle-0.2.1.orig/src/audio/audio_tx.h
++++ twinkle-0.2.1/src/audio/audio_tx.h
+@@ -148,6 +148,8 @@
+
+ ~t_audio_tx();
+
++ void set_running(bool is_running);
++
+ void run(void);
+
+ // Set the dynamic payload type for telephone events
+only in patch2:
+unchanged:
+--- twinkle-0.2.1.orig/src/audio/audio_tx.cpp
++++ twinkle-0.2.1/src/audio/audio_tx.cpp
+@@ -330,6 +330,10 @@
+ }
+ }
+
++void t_audio_tx::set_running(bool _is_running) {
++ is_running = _is_running;
++}
++
+ void t_audio_tx::run(void) {
+ const AppDataUnit* adu;
+ struct timespec sleeptimer;
More information about the Pkg-voip-commits
mailing list