[SCM] jack-stdio/master: Drop patches, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Jun 8 08:18:16 UTC 2011
The following commit has been merged in the master branch:
commit 2016a5dedf0ed6e626b68e9e08a95666ceeabd06
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Jun 8 10:15:35 2011 +0200
Drop patches, applied upstream.
diff --git a/debian/patches/0001-makefile.patch b/debian/patches/0001-makefile.patch
deleted file mode 100644
index a5154e3..0000000
--- a/debian/patches/0001-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Override the PREFIX variable only if not set.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: Robin Gareus <robin at gareus.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- jack-stdio.orig/Makefile
-+++ jack-stdio/Makefile
-@@ -1,5 +1,5 @@
- # override e.g. `make install PREFIX=/usr`
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
-
- CFLAGS=-Wall `pkg-config --cflags jack` -O3
- LIBS=`pkg-config --libs jack` -lpthread -lm
diff --git a/debian/patches/0002-manpages.patch b/debian/patches/0002-manpages.patch
deleted file mode 100644
index c666d4c..0000000
--- a/debian/patches/0002-manpages.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: "-" must be escaped ("\-") to be interpreted as minus.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: Robin Gareus <robin at gareus.org>
----
- jack-stdin.1 | 6 +++---
- jack-stdout.1 | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
---- jack-stdio.orig/jack-stdin.1
-+++ jack-stdio/jack-stdin.1
-@@ -60,7 +60,7 @@ Print a brief usage information
- \fB-p\fR, \fB--prebuffer\fR \fIPERCENT\fR
- .RS
- Pre-fill the buffer before starting audio output to JACK (default 50.0%).
--NOTE: disable pre-buffering (-p 0) or use a small buffer size to play back
-+NOTE: disable pre-buffering (\-p 0) or use a small buffer size to play back
- very short samples.
- .RE
-
-@@ -95,8 +95,8 @@ Note: the buffersize must be larger than
- .SH EXAMPLES
- .nf
- jack-stdout vlc_31994:out_1 vlc_31994:out_2 \\
-- | sox -t raw -r 48k -e signed -b 16 -c 2 - \\
-- -t raw -r 48k -e signed -b 16 -c 2 - \\
-+ | sox \-t raw \-r 48k \-e signed \-b 16 \-c 2 \- \\
-+ \-t raw \-r 48k \-e signed \-b 16 \-c 2 \- \\
- tremolo 5 100 \\
- | ./jack-stdin system:playback_1 system:playback_2
-
---- jack-stdio.orig/jack-stdout.1
-+++ jack-stdio/jack-stdout.1
-@@ -80,16 +80,16 @@ to get the size of the ring-buffer.
- jack-stdout xmms_0:out_1 xmms_0:out_2 \\
- | mono ~/Desktop/Downloads/JustePort.exe - 10.0.1.6 0
-
-- jack-stdout -b 24 -e unsigned -B system:capture_1 system:capture_2 \\
-- | sox -t raw -r 48k -e unsigned -b 24 -B -c 2 - /tmp/recording.wav
-+ jack-stdout \-b 24 \-e unsigned \-B system:capture_1 system:capture_2 \\
-+ | sox \-t raw \-r 48k \-e unsigned \-b 24 \-B \-c 2 \- /tmp/recording.wav
-
- jack-stdout system:capture_1 system:capture_2 \\
-- | oggenc -r -R 48000 -B 16 -C 2 - \\
-+ | oggenc \-r \-R 48000 \-B 16 \-C 2 \- \\
- > /tmp/recording.ogg
-
- jack-stdout system:capture_1 \\
-- | oggenc -r -R 48000 -B 16 -C 1 - \\
-- | oggfwd -p -n "my live stream" localhost 5900 hackme live.ogg
-+ | oggenc \-r \-R 48000 \-B 16 \-C 1 \- \\
-+ | oggfwd \-p \-n "my live stream" localhost 5900 hackme live.ogg
- .fi
- .SH AUTHOR
- Robin Gareus <robin at gareus.org>.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3edbe29..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-makefile.patch
-0002-manpages.patch
--
jack-stdio packaging
More information about the pkg-multimedia-commits
mailing list