[SCM] pd-wiimote.git/master: removed all patches
rdz-guest at users.alioth.debian.org
rdz-guest at users.alioth.debian.org
Fri Sep 3 15:29:43 UTC 2010
The following commit has been merged in the master branch:
commit da00213bc8399a1bf2bce39c861e0063270e932f
Author: reduzent <reduzierer at yahoo.de>
Date: Fri Sep 3 17:10:21 2010 +0200
removed all patches
diff --git a/debian/patches/add-license.patch b/debian/patches/add-license.patch
deleted file mode 100644
index 2881f9f..0000000
--- a/debian/patches/add-license.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-* add LICENSE in order to comply with the libdir format for Pd libraries
- proposed by Hans-Christoph Steiner.
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,339 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users. This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it. (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.) You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have. You must make sure that they, too, receive or can get the
-+source code. And you must show them these terms so they know their
-+rights.
-+
-+ We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+ Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software. If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+ Finally, any free program is threatened constantly by software
-+patents. We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary. To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ GNU GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License. The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language. (Hereinafter, translation is included without limitation in
-+the term "modification".) Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+ 1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+ 2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) You must cause the modified files to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ b) You must cause any work that you distribute or publish, that in
-+ whole or in part contains or is derived from the Program or any
-+ part thereof, to be licensed as a whole at no charge to all third
-+ parties under the terms of this License.
-+
-+ c) If the modified program normally reads commands interactively
-+ when run, you must cause it, when started running for such
-+ interactive use in the most ordinary way, to print or display an
-+ announcement including an appropriate copyright notice and a
-+ notice that there is no warranty (or else, saying that you provide
-+ a warranty) and that users may redistribute the program under
-+ these conditions, and telling the user how to view a copy of this
-+ License. (Exception: if the Program itself is interactive but
-+ does not normally print such an announcement, your work based on
-+ the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+ a) Accompany it with the complete corresponding machine-readable
-+ source code, which must be distributed under the terms of Sections
-+ 1 and 2 above on a medium customarily used for software interchange; or,
-+
-+ b) Accompany it with a written offer, valid for at least three
-+ years, to give any third party, for a charge no more than your
-+ cost of physically performing source distribution, a complete
-+ machine-readable copy of the corresponding source code, to be
-+ distributed under the terms of Sections 1 and 2 above on a medium
-+ customarily used for software interchange; or,
-+
-+ c) Accompany it with the information you received as to the offer
-+ to distribute corresponding source code. (This alternative is
-+ allowed only for noncommercial distribution and only if you
-+ received the program in object code or executable form with such
-+ an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it. For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable. However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License. Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+ 5. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+ 6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+ 7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded. In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+ 9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation. If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+ 10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission. For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this. Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+ Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1989
-+ Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs. If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
diff --git a/debian/patches/fix-makefile.patch b/debian/patches/fix-makefile.patch
deleted file mode 100644
index ceaa389..0000000
--- a/debian/patches/fix-makefile.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-* 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
deleted file mode 100644
index 2acf6a1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-makefile.patch
-add-license.patch
--
pd-wiimote packaging
More information about the pkg-multimedia-commits
mailing list