fix build on MIPS

diff --git a/debian/changelog b/debian/changelog
index c0871f54cf26f6d1c62216768abf14ad82925a61..7e0c7ae8f1107497b3a386025f4f2af89db42d09 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osspd (1.3.2-10) UNRELEASED; urgency=medium
+
+  * Fix build on MIPS.  (Closes: #916231)
+
+ -- Ralf Jung <post@ralfj.de>  Tue, 25 Dec 2018 18:51:35 +0100
+
 osspd (1.3.2-9) unstable; urgency=medium
 
   * Fix using target-architecture pkg-config. Patch by

diff --git a/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch b/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
index e27423d54ee1e3d5ca48d0b41e81934537d82778..085274f7ce60d0dabafe64b0fdf26dcb686da070 100644 (file)
--- a/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
+++ b/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
@@ -4,8 +4,8 @@ Subject: Fix compilation with -Werror=format-security
 
 Forwarded: Committed upstream as 097dc7b6
 ---
- ossp-slave.c |    4 ++--
- osspd.c      |    2 +-
+ ossp-slave.c | 4 ++--
+ osspd.c      | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/ossp-slave.c b/ossp-slave.c

diff --git a/debian/patches/0002-honor-CPPFLAGS.patch b/debian/patches/0002-honor-CPPFLAGS.patch
index e020aa63069a1cd185c822d9c6c8b246dff8a6e1..e073ad9789471bf2b172662eff8bb2acd467ce61 100644 (file)
--- a/debian/patches/0002-honor-CPPFLAGS.patch
+++ b/debian/patches/0002-honor-CPPFLAGS.patch
@@ -4,7 +4,7 @@ Subject: honor CPPFLAGS
 
 Forwarded: Committed upstream as 3a9a0196
 ---
- Makefile |    2 +-
+ Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile

diff --git a/debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch b/debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
index be450d24a811f10b179fc6abf48010f250536213..4844721f2dfd34e67ce22aba510b3c4569a14195 100644 (file)
--- a/debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
+++ b/debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
@@ -1,11 +1,11 @@
 From: Ralf Jung <post@ralfj.de>
 Date: Thu, 13 Sep 2012 19:13:25 +0200
-Subject: PA recommends users *not* to be in the audio group, so allow
- everyone to use these devices
+Subject: PA recommends users *not* to be in the audio group,
+ so allow everyone to use these devices
 
 Forwarded: not-needed
 ---
- 98-osscuse.rules |    9 ++++-----
+ 98-osscuse.rules | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/98-osscuse.rules b/98-osscuse.rules

diff --git a/debian/patches/0004-Allow-to-set-slave-installation-path-during-compilat.patch b/debian/patches/0004-Allow-to-set-slave-installation-path-during-compilat.patch
index a2195a3d5307bd34b91253da225c96e0201c42bc..59425c99cb7ad964d5f564b8b7eb186506b30ae3 100644 (file)
--- a/debian/patches/0004-Allow-to-set-slave-installation-path-during-compilat.patch
+++ b/debian/patches/0004-Allow-to-set-slave-installation-path-during-compilat.patch
@@ -4,8 +4,8 @@ Subject: Allow to set slave installation path during compilation
 
 Forwarded: not-needed
 ---
- Makefile |    8 +++++---
- osspd.c  |   12 ++----------
+ Makefile |  8 +++++---
+ osspd.c  | 12 ++----------
  2 files changed, 7 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile b/Makefile

diff --git a/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch b/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch
index 79f815abcadae604e20a445e23a2612fe1a816aa..a45fb884dcce79a224d5b44894668b760fd8a668 100644 (file)
--- a/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch
+++ b/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch
@@ -5,7 +5,7 @@ Subject: Add -pthread compiler and linker flag
 (based on patch in Ubuntu by Logan Rosen <logan@ubuntu.com>)
 Forwarded: http://sourceforge.net/mailarchive/forum.php?thread_name=518E3901.8050206%40ralfj.de&forum_name=osspd-users
 ---
- Makefile |    4 ++--
+ Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile

diff --git a/debian/patches/0006-cross.patch b/debian/patches/0006-cross.patch
deleted file mode 100644 (file)
index f30844e..0000000
--- a/debian/patches/0006-cross.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Helmut Grohne <helmut@subdivi.de>
-Date: Tue, 21 Nov 2017 21:20:20 +0100
-Subject: fix using target-architecture pkg-config
-
-Index: osspd-1.3.2/Makefile
-===================================================================
---- osspd-1.3.2.orig/Makefile
-+++ osspd-1.3.2/Makefile
-@@ -2,6 +2,7 @@
- # DESTDIR is completely respected
- CC := gcc
- AR := ar
-+PKG_CONFIG ?= pkg-config
- CFLAGS := -Wall -pthread $(CFLAGS) $(CPPFLAGS)
- XLDFLAGS := $(LDFLAGS)
- LDFLAGS := -L. -lossp -pthread $(LDFLAGS)
-@@ -11,27 +12,27 @@
- SLAVESDIR := $(prefix)/sbin
- 
- ifeq "$(origin OSSPD_CFLAGS)" "undefined"
--OSSPD_CFLAGS := $(shell pkg-config --cflags fuse)
-+OSSPD_CFLAGS := $(shell $(PKG_CONFIG) --cflags fuse)
- endif
- 
- ifeq "$(origin OSSPD_LDFLAGS)" "undefined"
--OSSPD_LDFLAGS := $(shell pkg-config --libs fuse)
-+OSSPD_LDFLAGS := $(shell $(PKG_CONFIG) --libs fuse)
- endif
- 
- ifeq "$(origin OSSP_PADSP_CFLAGS)" "undefined"
--OSSP_PADSP_CFLAGS := $(shell pkg-config --cflags libpulse)
-+OSSP_PADSP_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpulse)
- endif
- 
- ifeq "$(origin OSSP_PADSP_LDFLAGS)" "undefined"
--OSSP_PADSP_LDFLAGS := $(shell pkg-config --libs libpulse)
-+OSSP_PADSP_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpulse)
- endif
- 
- ifeq "$(origin OSSP_ALSAP_CFLAGS)" "undefined"
--OSSP_ALSAP_CFLAGS := $(shell pkg-config --libs alsa)
-+OSSP_ALSAP_CFLAGS := $(shell $(PKG_CONFIG) --libs alsa)
- endif
- 
- ifeq "$(origin OSSP_ALSAP_LDFLAGS)" "undefined"
--OSSP_ALSAP_LDFLAGS := $(shell pkg-config --libs alsa)
-+OSSP_ALSAP_LDFLAGS := $(shell $(PKG_CONFIG) --libs alsa)
- endif
- 
- headers := ossp.h ossp-util.h ossp-slave.h

diff --git a/debian/patches/0006-fix-build-on-MIPS.patch b/debian/patches/0006-fix-build-on-MIPS.patch
new file mode 100644 (file)
index 0000000..9f72c3d
--- /dev/null
+++ b/debian/patches/0006-fix-build-on-MIPS.patch
@@ -0,0 +1,20 @@
+From: Ralf Jung <post@ralfj.de>
+Date: Tue, 25 Dec 2018 18:51:01 +0100
+Subject: fix build on MIPS
+
+---
+ osspd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/osspd.c b/osspd.c
+index 6b63c07..70eff98 100644
+--- a/osspd.c
++++ b/osspd.c
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/epoll.h>

diff --git a/debian/patches/series b/debian/patches/series
index b6c45ca616c535da7b6dd81cae55f00ee2fa79ad..cefd5f4b834f511159c95f43d42e746a87dd17e7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
 0004-Allow-to-set-slave-installation-path-during-compilat.patch
 0005-Add-pthread-compiler-and-linker-flag.patch
-0006-cross.patch
+0006-fix-build-on-MIPS.patch