[SCM] pd-bassemu/master: patched Makefile to build on kFreeBSD and Hurd (Closes: #605821)

[eighthave-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 196ddfcee1741e2dd2fd7c4474ca7a49c2a712e2
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Dec 20 19:41:13 2010 -0500

    patched Makefile to build on kFreeBSD and Hurd (Closes: #605821)

diff --git a/debian/control b/debian/control
index a957167..42e29cf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Hans-Christoph Steiner <hans at eds.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
  puredata
 Standards-Version: 3.9.1
 Homepage: http://puredata.info
diff --git a/debian/patches/makefile_update_for_kfreebsd_and_hurd b/debian/patches/makefile_update_for_kfreebsd_and_hurd
new file mode 100644
index 0000000..0feb98c
--- /dev/null
+++ b/debian/patches/makefile_update_for_kfreebsd_and_hurd
@@ -0,0 +1,91 @@
+Description: updated Makefile to build on kFreeBSD and Hurd
+ This patch takes the upstream template Makefile with new code for handling
+ building using kFreeBSD and Hurd kernels.  This Makefile is already included
+ in the upstream SVN repository, but there is no new release yet.
+
+Author: Hans-Christoph Steiner <hans at eds.org>
+Bug-Debian: http://bugs.debian.org/605821
+Forwarded: not-needed
+Reviewed-By: Hans-Christoph Steiner <hans at eds.org>
+Last-Update: <2010-12-19>
+
+--- pd-bassemu-0.3.orig/Makefile
++++ pd-bassemu-0.3/Makefile
+@@ -1,4 +1,4 @@
+-## Pd library template version 1.0.4
++## Pd library template version 1.0.6
+ # For instructions on how to use this template, see:
+ #  http://puredata.info/docs/developer/MakefileTemplate
+ LIBRARY_NAME = bassemu~
+@@ -31,7 +31,8 @@ EXTRA_DIST = miniseq.pd Makefile.nt
+ #
+ #------------------------------------------------------------------------------#
+ 
+-CFLAGS = -DPD -I"$(PD_INCLUDE)" -Wall -W -g
++# -I"$(PD_INCLUDE)/pd" supports the header location for 0.43
++CFLAGS = -I"$(PD_INCLUDE)/pd" -Wall -W -g
+ LDFLAGS =  
+ LIBS = 
+ 
+@@ -44,7 +45,7 @@ LIBS =
+ # get library version from meta file
+ LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
+ 
+-CFLAGS += -DVERSION='"$(LIBRARY_VERSION)"'
++CFLAGS += -DPD -DVERSION='"$(LIBRARY_VERSION)"'
+ 
+ PD_INCLUDE = $(PD_PATH)/include
+ # where to install the library, overridden below depending on platform
+@@ -121,6 +122,34 @@ ifeq ($(UNAME),Linux)
+   STRIP = strip --strip-unneeded -R .note -R .comment
+   DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
+ endif
++ifeq ($(UNAME),GNU)
++  # GNU/Hurd, should work like GNU/Linux for basically all externals
++  CPU := $(shell uname -m)
++  SOURCES += $(SOURCES_linux)
++  EXTENSION = pd_linux
++  OS = linux
++  PD_PATH = /usr
++  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
++  CFLAGS += -fPIC
++  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
++  LIBS += -lc
++  STRIP = strip --strip-unneeded -R .note -R .comment
++  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
++endif
++ifeq ($(UNAME),GNU/kFreeBSD)
++  # Debian GNU/kFreeBSD, should work like GNU/Linux for basically all externals
++  CPU := $(shell uname -m)
++  SOURCES += $(SOURCES_linux)
++  EXTENSION = pd_linux
++  OS = linux
++  PD_PATH = /usr
++  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
++  CFLAGS += -fPIC
++  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
++  LIBS += -lc
++  STRIP = strip --strip-unneeded -R .note -R .comment
++  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
++endif
+ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+   CPU := $(shell uname -m)
+   SOURCES += $(SOURCES_cygwin)
+@@ -140,7 +169,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))
+   EXTENSION = dll
+   OS = windows
+   PD_PATH = $(shell cd "$(PROGRAMFILES)"/pd && pwd)
+-  OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4
++  OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
+   CFLAGS += -mms-bitfields
+   LDFLAGS += -s -shared -Wl,--enable-auto-import
+   LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32
+@@ -149,7 +178,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))
+ endif
+ 
+ # in case somebody manually set the HELPPATCHES above
+-HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.c=-help.pd)
++HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.pd=-help.pd)
+ 
+ CFLAGS += $(OPT_CFLAGS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..661cce5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile_update_for_kfreebsd_and_hurd
diff --git a/debian/rules b/debian/rules
index cfcaea0..3972528 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ PACKAGE = pd-bassemu
 pkglibdir = /usr/lib/pd/extra
 
 %:
-	dh $@ --buildsystem=makefile
+	dh --with quilt $@ --buildsystem=makefile
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr pkglibdir=$(pkglibdir)

-- 
pd-bassemu packaging