← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/303_libsalsa_snd_asoundlib_version.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/303_libsalsa_snd_asoundlib_version.patch
 
1
Index: oss4-4.2-build2004/lib/libsalsa/misc.c
 
2
===================================================================
 
3
--- oss4-4.2-build2004.orig/lib/libsalsa/misc.c 2011-06-14 11:33:21.000000000 -0500
 
4
+++ oss4-4.2-build2004/lib/libsalsa/misc.c      2011-06-14 11:33:24.000000000 -0500
 
5
@@ -105,3 +105,13 @@
 
6
   dbg_printf ("snd_lib_error_set_handler()\n");
 
7
   return 0;
 
8
 }
 
9
+
 
10
+
 
11
+/**
 
12
+ * \brief Returns the ALSA sound library version in ASCII format
 
13
+ * \return The ASCII description of the used ALSA sound library.
 
14
+ */
 
15
+const char *snd_asoundlib_version(void)
 
16
+{
 
17
+       return SND_LIB_VERSION_STR;
 
18
+}