← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/301_libsalsa_fixes.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL
  • Date: 2012-11-19 11:47:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121119114724-svu8mq7x3pk64nez
Tags: 4.2-build2007-1
http://bugs.debian.org/630737
http://bugs.debian.org/687086
http://bugs.debian.org/628876
http://bugs.debian.org/675933
http://bugs.debian.org/693657
http://bugs.debian.org/693657
http://bugs.debian.org/587191
http://bugs.debian.org/653374
* New upstream release.
* Acknowledge NMU, thanks Michael Gilbert.
* Add debian/patches/110_ld-as-needed.patch: Rearrange order of linker
  arguments to fix building with "ld --as-needed" (closes: #630737).
* Add missing dependency on dpkg-dev to oss4-dkms and oss4-source
  (closes: #687086).
* Fix typo in the changelog (closes: #628876, #675933)
* Add debian/patches/002_fix-linux-oss_native_word.patch (closes: #693657).
  Thanks to Ben Hutchings.
* Add debian/patches/003_linux-error-logging-fixes.patch (closes: #693657).
  Thanks to Ben Hutchings.
* check for /lib/modules/${kernelver}/build in addition of
  /lib/modules/${kernelver}/source (closes: #587191).
* oss4-dkms.dkms.in: fix 'CLEAN' rules (closes: #653374).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/301_libsalsa_fixes.patch
 
1
Index: oss4-4.2-build2004/lib/libsalsa/seq.c
 
2
===================================================================
 
3
--- oss4-4.2-build2004.orig/lib/libsalsa/seq.c  2011-06-14 11:33:22.000000000 -0500
 
4
+++ oss4-4.2-build2004/lib/libsalsa/seq.c       2011-06-14 11:33:24.000000000 -0500
 
5
@@ -111,7 +111,7 @@
 
6
   if ((seq = malloc (sizeof (*seq))) == NULL)
 
7
     return -ENOMEM;
 
8
 
 
9
-  dbg_printf ("Created sequencer seq=%x\n", seq);
 
10
+  dbg_printf ("Created sequencer seq=%p\n", seq);
 
11
 
 
12
   memset (seq, 0, sizeof (*seq));
 
13
 
 
14
Index: oss4-4.2-build2004/lib/libsalsa/seq_output.c
 
15
===================================================================
 
16
--- oss4-4.2-build2004.orig/lib/libsalsa/seq_output.c   2011-06-14 11:33:22.000000000 -0500
 
17
+++ oss4-4.2-build2004/lib/libsalsa/seq_output.c        2011-06-14 11:35:11.000000000 -0500
 
18
@@ -78,7 +78,7 @@
 
19
 
 
20
   dbg_printf3
 
21
     ("Event %2d: flags=%08x tag=%08x, q=%2d, time=%d, src=%x, dst=%x\n",
 
22
-     ev->type, ev->flags, ev->tag, ev->queue, ev->time, ev->source, ev->dest);
 
23
+     ev->type, ev->flags, ev->tag, ev->queue, ev->time.tick, ev->source, ev->dest);
 
24
 
 
25
   switch (ev->type)
 
26
     {
 
27
Index: oss4-4.2-build2004/lib/libsalsa/timer.c
 
28
===================================================================
 
29
--- oss4-4.2-build2004.orig/lib/libsalsa/timer.c        2011-06-14 11:33:22.000000000 -0500
 
30
+++ oss4-4.2-build2004/lib/libsalsa/timer.c     2011-06-14 11:33:24.000000000 -0500
 
31
@@ -57,7 +57,7 @@
 
32
 
 
33
   timer = malloc (sizeof (*timer));
 
34
 
 
35
-  dbg_printf ("snd_timer_open(name='%s', mode=%x)=%x\n", name, mode, timer);
 
36
+  dbg_printf ("snd_timer_open(name='%s', mode=%x)=%p\n", name, mode, timer);
 
37
 
 
38
   if (timer == NULL)
 
39
     return -ENOMEM;
 
40
Index: oss4-4.2-build2004/lib/libsalsa/local.h
 
41
===================================================================
 
42
--- oss4-4.2-build2004.orig/lib/libsalsa/local.h        2011-06-14 11:33:24.000000000 -0500
 
43
+++ oss4-4.2-build2004/lib/libsalsa/local.h     2011-06-14 11:33:24.000000000 -0500
 
44
@@ -9,6 +9,7 @@
 
45
 #include "../../include/soundcard.h"
 
46
 #include "alsakernel.h"
 
47
 #include <sys/poll.h>
 
48
+#include <sys/ioctl.h>
 
49
 #include "../../kernel/framework/include/midiparser.h"
 
50
 
 
51
 extern int alib_verbose;