[SCM] pd-wiimote packaging branch, master, updated. upstream/0.3.1-8-gfb436ab
rdz-guest at users.alioth.debian.org
rdz-guest at users.alioth.debian.org
Wed Sep 1 14:55:45 UTC 2010
The following commit has been merged in the master branch:
commit fa5923bd1811702db1f7e40e543146360d445f9c
Author: Roman Haefeli <reduzent at gmail.com>
Date: Wed Sep 1 14:29:57 2010 +0200
added fix-makefile patch
diff --git a/debian/patches/fix-makefile.patch b/debian/patches/fix-makefile.patch
new file mode 100644
index 0000000..ceaa389
--- /dev/null
+++ b/debian/patches/fix-makefile.patch
@@ -0,0 +1,368 @@
+* replaced Makefile based on old template by new template of Makefile in order
+ to comply with the libdir format for Pd libraries proposed by Hans-Christoph
+ Steiner
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,39 @@
+-# To use this Makefile for your project, first put the name of your library in
+-# LIBRARY_NAME variable. The folder for your project should have the same name
+-# as your library.
++## Pd library template version 1.0.2
++# For instructions on how to use this template, see:
++# http://puredata.info/docs/developer/MakefileTemplate
+ LIBRARY_NAME = wiimote
+
+-# Next, add your source files to the SOURCES variable.
++# add your .c source files, one object per file, to the SOURCES
++# variable, help files will be included automatically
+ SOURCES = wiimote.c
+
+-# For objects that only build on certain platforms, add those to the SOURCES
+-# line for the right platforms.
+-SOURCES_Darwin =
+-SOURCES_Linux =
+-SOURCES_Windows =
++# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
++# be included automatically
++#PDOBJECTS = mypdobject.pd
++
++# example patches and related files, in the 'examples' subfolder
++#EXAMPLES = bothtogether.pd
++
++# manuals and related files, in the 'manual' subfolder
++#MANUAL = manual.txt
++
++# if you want to include any other files in the source and binary tarballs,
++# list them here. This can be anything from header files, test patches,
++# documentation, etc. README.txt and LICENSE.txt are required and therefore
++# automatically included
++EXTRA_DIST =
++
++
++
++#------------------------------------------------------------------------------#
++#
++# things you might need to edit if you are using other C libraries
++#
++#------------------------------------------------------------------------------#
++
++CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g
++LDFLAGS =
++LIBS =
+
+ #------------------------------------------------------------------------------#
+ #
+@@ -18,31 +41,76 @@
+ #
+ #------------------------------------------------------------------------------#
+
+-VERSION=0.3.1
++# 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)"'
+
+ # where Pd lives
+ PD_PATH = ../../pd
+ # where to install the library
+-objectsdir = $(PD_PATH)/extra
++prefix = /usr
++libdir = $(prefix)/lib
++pkglibdir = $(libdir)/pd/extra
++objectsdir = $(pkglibdir)
++
++INSTALL = install
++INSTALL_FILE = $(INSTALL) -p -m 644
++INSTALL_DIR = $(INSTALL) -p -m 755 -d
+
+-CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g -DVERSION=\"$(VERSION)\"
+-LDFLAGS =
+-LIBS = -lcwiid -lbluetooth -lpthread
++ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \
++ $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
++
++DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
++ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
+
+ UNAME := $(shell uname -s)
+ ifeq ($(UNAME),Darwin)
+- SOURCES += $(SOURCES_Darwin)
+- EXTENSION = pd_darwin
+- OS = macosx
+- OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
+- FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4
+- CFLAGS += -fPIC $(FAT_FLAGS)
+- LDFLAGS += -bundle -undefined dynamic_lookup $(FAT_FLAGS)
+- LIBS += -lc
+- STRIP = strip -x
+- endif
++ CPU := $(shell uname -p)
++ ifeq ($(CPU),arm) # iPhone/iPod Touch
++ SOURCES += $(SOURCES_iphoneos)
++ EXTENSION = pd_darwin
++ OS = iphoneos
++ IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
++ CC=$(IPHONE_BASE)/gcc
++ CPP=$(IPHONE_BASE)/cpp
++ CXX=$(IPHONE_BASE)/g++
++ ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk
++ IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6
++ OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer
++ CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) \
++ -I/Applications/Pd-extended.app/Contents/Resources/include
++ LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT)
++ LIBS += -lc
++ STRIP = strip -x
++ DISTBINDIR=$(DISTDIR)-$(OS)
++ else # Mac OS X
++ SOURCES += $(SOURCES_macosx)
++ EXTENSION = pd_darwin
++ OS = macosx
++ OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
++# build universal 32-bit on 10.4 and 32/64 on newer
++ ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8)
++ FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=10.4
++ else
++ FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
++ SOURCES += $(SOURCES_iphoneos)
++ endif
++ CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \
++ -I/Applications/Pd-extended.app/Contents/Resources/include
++ LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
++ # if the 'pd' binary exists, check the linking against it to aid with stripping
++ LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
++ LIBS += -lc
++ STRIP = strip -x
++ DISTBINDIR=$(DISTDIR)-$(OS)
++# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much
++ pkglibdir=$(HOME)/Library/Pd
++ endif
++endif
+ ifeq ($(UNAME),Linux)
+- SOURCES += $(SOURCES_Linux)
++ CPU := $(shell uname -m)
++ SOURCES += $(SOURCES_linux)
+ EXTENSION = pd_linux
+ OS = linux
+ OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+@@ -50,25 +118,40 @@
+ 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)
++ EXTENSION = dll
++ OS = cygwin
++ OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
++ CFLAGS +=
++ LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src
++ LIBS += -lc -lpd
++ STRIP = strip --strip-unneeded -R .note -R .comment
++ DISTBINDIR=$(DISTDIR)-$(OS)
+ endif
+ ifeq (MINGW,$(findstring MINGW,$(UNAME)))
+- SOURCES += $(SOURCES_Windows)
++ CPU := $(shell uname -m)
++ SOURCES += $(SOURCES_windows)
+ EXTENSION = dll
+ OS = windows
+ OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4
+- WINDOWS_HACKS = -D'O_NONBLOCK=1'
+- CFLAGS += -mms-bitfields $(WINDOWS_HACKS)
++ CFLAGS += -mms-bitfields
+ LDFLAGS += -s -shared -Wl,--enable-auto-import
+- LIBS += -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32
++ LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32
+ STRIP = strip --strip-unneeded -R .note -R .comment
++ DISTBINDIR=$(DISTDIR)-$(OS)
+ endif
+
+-CFLAGS += $(OPT_CFLAGS)
++# in case somebody manually set the HELPPATCHES above
++HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.c=-help.pd)
+
+--include Make.local
++CFLAGS += $(OPT_CFLAGS)
+
+
+-.PHONY = install libdir_install single_install install-doc install-exec clean dist etags
++.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags $(LIBRARY_NAME)
+
+ all: $(SOURCES:.c=.$(EXTENSION))
+
+@@ -78,69 +161,136 @@
+ %.$(EXTENSION): %.o
+ $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS)
+ chmod a-x "$*.$(EXTENSION)"
+- rm -f -- $*.o
+
+ # this links everything into a single binary file
+ $(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o
+ $(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS)
+ chmod a-x $(LIBRARY_NAME).$(EXTENSION)
+
+-
+ install: libdir_install
+
+ # The meta and help files are explicitly installed to make sure they are
+ # actually there. Those files are not optional, then need to be there.
+-libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-exec
+- install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p $(LIBRARY_NAME)-meta.pd $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))
++libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual
++ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd \
++ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ test -z "$(strip $(SOURCES))" || (\
++ $(INSTALL_FILE) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \
++ $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION))))
++ test -z "$(strip $(PDOBJECTS))" || \
++ $(INSTALL_FILE) $(PDOBJECTS) \
++ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+
+ # install library linked as single binary
+ single_install: $(LIBRARY_NAME) install-doc install-exec
+- install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ $(INSTALL_FILE) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+ $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
+
+ install-doc:
+- install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+-# install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
+- install -m644 -p VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt
+- install -m644 -p CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt
+-
+-install-exec:
+- install -d $(objectsdir)/$(LIBRARY_NAME)
+- install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \
++ $(INSTALL_FILE) $(HELPPATCHES) \
++ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
++ $(INSTALL_FILE) README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
++ $(INSTALL_FILE) LICENSE $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt
++
++install-examples:
++ test -z "$(strip $(EXAMPLES))" || \
++ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \
++ for file in $(EXAMPLES); do \
++ $(INSTALL_FILE) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \
++ done
++
++install-manual:
++ test -z "$(strip $(MANUAL))" || \
++ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \
++ for file in $(MANUAL); do \
++ $(INSTALL_FILE) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \
++ done
+
+
+ clean:
+- -rm -f -- $(SOURCES:.c=.o)
++ -rm -f -- $(SOURCES:.c=.o) $(SOURCES_LIB:.c=.o)
+ -rm -f -- $(SOURCES:.c=.$(EXTENSION))
++ -rm -f -- $(LIBRARY_NAME).o
+ -rm -f -- $(LIBRARY_NAME).$(EXTENSION)
+
+ distclean: clean
+- -rm -f -- ../$(LIBRARY_NAME)-$(OS)-$(shell uname -m).tar.bz2
+- -rm -f -- ../$(LIBRARY_NAME)-$(OS).tar.bz2
+-
+-dist: all dist_$(OS)
+-
+-dist_linux:
+- cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS)-$(shell uname -m).tar.bz2 $(LIBRARY_NAME)
+-
+-dist_macosx:
+- cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS).tar.bz2 $(LIBRARY_NAME)
+-
+-dist_windows:
+- cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS).tar.bz2 $(LIBRARY_NAME)
+-
++ -rm -f -- $(DISTBINDIR).tar.gz
++ -rm -rf -- $(DISTBINDIR)
++ -rm -f -- $(DISTDIR).tar.gz
++ -rm -rf -- $(DISTDIR)
++ -rm -f -- $(ORIGDIR).tar.gz
++ -rm -rf -- $(ORIGDIR)
++
++
++$(DISTBINDIR):
++ $(INSTALL_DIR) $(DISTBINDIR)
++
++libdir: all $(DISTBINDIR)
++ $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR)
++ $(INSTALL_FILE) $(SOURCES) $(DISTBINDIR)
++ $(INSTALL_FILE) $(HELPPATCHES) $(DISTBINDIR)
++ test -z "$(strip $(EXTRA_DIST))" || \
++ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTBINDIR)
++# tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR)
++
++$(DISTDIR):
++ $(INSTALL_DIR) $(DISTDIR)
++
++$(ORIGDIR):
++ $(INSTALL_DIR) $(ORIGDIR)
++
++dist: $(DISTDIR)
++ $(INSTALL_FILE) Makefile $(DISTDIR)
++ $(INSTALL_FILE) README.txt $(DISTDIR)
++ $(INSTALL_FILE) LICENSE.txt $(DISTDIR)
++ $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTDIR)
++ test -z "$(strip $(ALLSOURCES))" || \
++ $(INSTALL_FILE) $(ALLSOURCES) $(DISTDIR)
++ test -z "$(strip $(PDOBJECTS))" || \
++ $(INSTALL_FILE) $(PDOBJECTS) $(DISTDIR)
++ test -z "$(strip $(HELPPATCHES))" || \
++ $(INSTALL_FILE) $(HELPPATCHES) $(DISTDIR)
++ test -z "$(strip $(EXTRA_DIST))" || \
++ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTDIR)
++ test -z "$(strip $(EXAMPLES))" || \
++ $(INSTALL_DIR) $(DISTDIR)/examples && \
++ for file in $(EXAMPLES); do \
++ $(INSTALL_FILE) examples/$$file $(DISTDIR)/examples; \
++ done
++ test -z "$(strip $(MANUAL))" || \
++ $(INSTALL_DIR) $(DISTDIR)/manual && \
++ for file in $(MANUAL); do \
++ $(INSTALL_FILE) manual/$$file $(DISTDIR)/manual; \
++ done
++ tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR)
++
++# make a Debian source package
++dpkg-source:
++ debclean
++ make distclean dist
++ mv $(DISTDIR) $(ORIGDIR)
++ tar --exclude-vcs -czpf ../$(ORIGDIR).orig.tar.gz $(ORIGDIR)
++ rm -f -- $(DISTDIR).tar.gz
++ rm -rf -- $(DISTDIR) $(ORIGDIR)
++ cd .. && dpkg-source -b $(LIBRARY_NAME)
+
+ etags:
+- etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h
++ etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h
+
+-showpaths:
++showsetup:
+ @echo "PD_PATH: $(PD_PATH)"
+ @echo "objectsdir: $(objectsdir)"
+ @echo "LIBRARY_NAME: $(LIBRARY_NAME)"
++ @echo "LIBRARY_VERSION: $(LIBRARY_VERSION)"
+ @echo "SOURCES: $(SOURCES)"
++ @echo "PDOBJECTS: $(PDOBJECTS)"
++ @echo "ALLSOURCES: $(ALLSOURCES)"
++ @echo "UNAME: $(UNAME)"
++ @echo "CPU: $(CPU)"
++ @echo "pkglibdir: $(pkglibdir)"
++ @echo "DISTDIR: $(DISTDIR)"
++ @echo "ORIGDIR: $(ORIGDIR)"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c6d2ef7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-makefile.patch
--
pd-wiimote packaging
More information about the pkg-multimedia-commits
mailing list