[SCM] puredata-import/master: patched Makefile to build on kFreeBSD and Hurd
eighthave-guest at users.alioth.debian.org
eighthave-guest at users.alioth.debian.org
Tue Dec 21 01:30:03 UTC 2010
The following commit has been merged in the master branch:
commit 0ce13237146b7ad1427410ffb08795c607454511
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Mon Dec 20 20:20:23 2010 -0500
patched Makefile to build on kFreeBSD and Hurd
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..ed97981
--- /dev/null
+++ b/debian/patches/makefile_update_for_kfreebsd_and_hurd
@@ -0,0 +1,116 @@
+Description: Upstream changes introduced in version 1.3-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ puredata-import (1.3-1) unstable; urgency=low
+ .
+ * Initial release (Closes: #596718)
+ * Fixed puredata Depends.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Hans-Christoph Steiner <hans at eds.org>
+Bug-Debian: http://bugs.debian.org/596718
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- puredata-import-1.3.orig/Makefile
++++ puredata-import-1.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 = import
+@@ -31,7 +31,8 @@ EXTRA_DIST =
+ #
+ #------------------------------------------------------------------------------#
+
+-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
+@@ -62,7 +63,7 @@ ALLSOURCES := $(SOURCES) $(SOURCES_andro
+ $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
+
+ DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+-ORIGDIR=puredata-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
++ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
+
+ UNAME := $(shell uname -s)
+ ifeq ($(UNAME),Darwin)
+@@ -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
index 5389e8d..a30215d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
add_required_headers.patch
+makefile_update_for_kfreebsd_and_hurd
--
puredata-import packaging
More information about the pkg-multimedia-commits
mailing list