[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.7-1-4-g983f273

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  983f27397eee01e356bae5c996cef17ac17a4e18 (commit)
       via  ae83538882d2b5ac765985c771bbc5640ff3bf1c (commit)
      from  9d264785ff25aba0998464e3e23bdb6323e21e60 (commit)


- Shortlog ------------------------------------------------------------
983f273 * deb/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
ae83538 Update patch (git really wants to)

Summary of changes:
 debian/changelog                                   |    6 +++-
 ...ocket-to-tmp-.esd-socket-to-match-up-with.patch |    2 +-
 ...R_eventfd-on-arm-if-it-wasn-t-defined-yet.patch |   27 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 983f27397eee01e356bae5c996cef17ac17a4e18
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sun Nov 4 13:36:54 2007 +0100

    * deb/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
      + Added. Define __NR_eventfd. Fixes FTBS on arm, because libc6-dev does
      define SYS_eventfd but older versions of linux-libc-dev don't define
      __NR_eventfd yet.

diff --git a/debian/changelog b/debian/changelog
index b39e8d5..5ccc505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ pulseaudio (0.9.7-2) UNRELEASED; urgency=low
   * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch:
     + Added. Fix pa_readlink to put a \0 directly after the link string. Fixes
     issues with clients using the alsa compatibility layer
+  * deb/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
+    + Added. Define __NR_eventfd. Fixes FTBS on arm, because libc6-dev does
+    define SYS_eventfd but older versions of linux-libc-dev don't define
+    __NR_eventfd yet.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 03 Nov 2007 21:16:49 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 04 Nov 2007 13:33:02 +0100
 
 pulseaudio (0.9.7-1) unstable; urgency=low
 
diff --git a/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch b/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch
new file mode 100644
index 0000000..d1b9ad9
--- /dev/null
+++ b/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch
@@ -0,0 +1,27 @@
+From 546cf4b92fa968d9a5242921272ad09c26cda049 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 4 Nov 2007 13:30:57 +0100
+Subject: [PATCH] Define __NR_eventfd on arm if it wasn't defined yet
+
+---
+ src/pulsecore/fdsem.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/pulsecore/fdsem.c b/src/pulsecore/fdsem.c
+index 927bf00..59eec18 100644
+--- a/src/pulsecore/fdsem.c
++++ b/src/pulsecore/fdsem.c
+@@ -53,6 +53,10 @@
+ #define __NR_eventfd 284
+ #endif
+ 
++#if !defined(__NR_eventfd) && defined(__arm__)
++#define __NR_eventfd (__NR_SYSCALL_BASE+351)
++#endif
++
+ #if !defined(SYS_eventfd) && defined(__NR_eventfd)
+ #define SYS_eventfd __NR_eventfd
+ #endif
+-- 
+1.5.3.5
+
diff --git a/debian/patches/series b/debian/patches/series
index d8f5413..fc25196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
 0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch
+0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch

commit ae83538882d2b5ac765985c771bbc5640ff3bf1c
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sun Nov 4 13:32:48 2007 +0100

    Update patch (git really wants to)

diff --git a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
index 1efaae9..f6bccd2 100644
--- a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+++ b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
@@ -21,5 +21,5 @@ index 597993c..b09d0f2 100755
  
  ### Network access (may be configured with paprefs, so leave this commented
 -- 
-1.5.3.4.8.g9de4b-dirty
+1.5.3.5
 

-- 
pulseaudio packaging