[SCM] pd-comport/master: remove patch, its been included in current v0.2 upstream release

eighthave at users.alioth.debian.org eighthave at users.alioth.debian.org
Wed Oct 17 14:51:53 UTC 2012


The following commit has been merged in the master branch:
commit e122bda2d76aef959491dffa3273b299d0cd3430
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Oct 17 09:48:23 2012 -0400

    remove patch, its been included in current v0.2 upstream release

diff --git a/debian/patches/makefile_update_for_kfreebsd_and_hurd b/debian/patches/makefile_update_for_kfreebsd_and_hurd
deleted file mode 100644
index 6f9c8b4..0000000
--- a/debian/patches/makefile_update_for_kfreebsd_and_hurd
+++ /dev/null
@@ -1,100 +0,0 @@
-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/605823
-Forwarded: not-needed
-Reviewed-By: Hans-Christoph Steiner <hans at eds.org>
-Last-Update: <2010-12-20>
-
---- pd-comport-0.1.orig/Makefile
-+++ pd-comport-0.1/Makefile
-@@ -1,4 +1,4 @@
--## Pd library template version 1.0.3
-+## Pd library template version 1.0.6
- # For instructions on how to use this template, see:
- #  http://puredata.info/docs/developer/MakefileTemplate
- LIBRARY_NAME = comport
-@@ -31,7 +31,8 @@ EXTRA_DIST = CHANGES.txt comport.dsp com
- #
- #------------------------------------------------------------------------------#
- 
--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=pd-$(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
deleted file mode 100644
index 661cce5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-makefile_update_for_kfreebsd_and_hurd

-- 
pd-comport packaging



More information about the pkg-multimedia-commits mailing list