From f977c7b5a874a62b80ab23296eeb50abec662f0c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 25 Dec 2018 18:51:23 +0100 Subject: [PATCH] fix build on MIPS --- debian/changelog | 6 +++ ...pilation-with-Werror-format-security.patch | 4 +- debian/patches/0002-honor-CPPFLAGS.patch | 2 +- ...ers-not-to-be-in-the-audio-group-so-.patch | 6 +-- ...ve-installation-path-during-compilat.patch | 4 +- ...Add-pthread-compiler-and-linker-flag.patch | 2 +- debian/patches/0006-cross.patch | 50 ------------------- debian/patches/0006-fix-build-on-MIPS.patch | 20 ++++++++ debian/patches/series | 2 +- 9 files changed, 36 insertions(+), 60 deletions(-) delete mode 100644 debian/patches/0006-cross.patch create mode 100644 debian/patches/0006-fix-build-on-MIPS.patch diff --git a/debian/changelog b/debian/changelog index c0871f5..7e0c7ae 100644 --- 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 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 e27423d..085274f 100644 --- 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 e020aa6..e073ad9 100644 --- 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 be450d2..4844721 100644 --- 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 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 a2195a3..59425c9 100644 --- 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 79f815a..a45fb88 100644 --- 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 ) 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 index f30844e..0000000 --- a/debian/patches/0006-cross.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Helmut Grohne -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 index 0000000..9f72c3d --- /dev/null +++ b/debian/patches/0006-fix-build-on-MIPS.patch @@ -0,0 +1,20 @@ +From: Ralf Jung +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 + #include + #include ++#include + #include + #include + #include diff --git a/debian/patches/series b/debian/patches/series index b6c45ca..cefd5f4 100644 --- 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 -- 2.30.2