[SCM] milkytracker/master: Remove fix-libjack-loading-bug patch (merged upstream)
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Wed Dec 29 19:12:37 UTC 2010
The following commit has been merged in the master branch:
commit e5886b398b1e22219e790fc0ac838005d3268a66
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Wed Dec 29 18:09:12 2010 +0100
Remove fix-libjack-loading-bug patch (merged upstream)
diff --git a/debian/patches/0001-fix-libjack-loading-bug.patch b/debian/patches/0001-fix-libjack-loading-bug.patch
deleted file mode 100644
index c4bd796..0000000
--- a/debian/patches/0001-fix-libjack-loading-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Alessandro Ghedini <al3xbio at gmail.com>
-Date: Tue, 28 Dec 2010 18:34:46 +0100
-Subject: [PATCH] fix libjack loading bug
-
-Fix error on libjack load, which breaks jack support
----
- src/milkyplay/drivers/jack/AudioDriver_JACK.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp b/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
-index 364cd04..aed3af7 100644
---- a/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
-+++ b/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
-@@ -64,6 +64,7 @@ int AudioDriver_JACK::jackProcess(jack_nframes_t nframes, void *arg)
- leftBuffer[in] = audioDriver->rawStream[out++] * (1.0/32768.0);
- rightBuffer[in] = audioDriver->rawStream[out++] * (1.0/32768.0);
- }
-+ return 0;
- }
-
- AudioDriver_JACK::AudioDriver_JACK() :
---
diff --git a/debian/patches/series b/debian/patches/series
index 755a6ae..5885739 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-fix-libjack-loading-bug.patch
0002-remove-bundled-zziplib-and-zlib.patch
--
milkytracker packaging
More information about the pkg-multimedia-commits
mailing list