← Back to branch summary

~ubuntu-branches/ubuntu/trusty/alsa-utils/trusty

« back to all changes in this revision

Viewing changes to debian/patches/unset_pulse_internal.patch

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich
  • Date: 2014-01-17 15:08:13 UTC
  • mfrom: (1.2.18) (94.1.2 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140117150813-v2rqw7ynuhs4m60a
Tags: 1.0.27.2-1ubuntu2
https://launchpad.net/bugs/1269731
* Forgot to add an env declaration for an environment variable to the
  upstart files. (LP: #1269731)
* debian/patches/work_around_ncurses_weirdness.patch:
  - Work around some ncurses pkg-config changes for now, not sure if ncurses
    upstream intended the include dir changes, or whether its a bug. Fixes
    FTBFs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/unset_pulse_internal.patch
1
 
Index: alsa-utils-1.0.27/alsamixer/cli.c
 
1
Index: alsa-utils-1.0.27.2/alsamixer/cli.c
2
2
===================================================================
3
 
--- alsa-utils-1.0.27.orig/alsamixer/cli.c      2013-04-30 15:42:02.652987098 +1000
4
 
+++ alsa-utils-1.0.27/alsamixer/cli.c   2013-04-30 15:42:02.644987098 +1000
 
3
--- alsa-utils-1.0.27.2.orig/alsamixer/cli.c    2013-10-28 12:06:49.310416172 -0700
 
4
+++ alsa-utils-1.0.27.2/alsamixer/cli.c 2013-10-28 12:06:49.306416172 -0700
5
5
@@ -123,6 +123,10 @@
6
6
        textdomain(PACKAGE);
7
7
 #endif
13
13
        parse_options(argc, argv);
14
14
 
15
15
        create_mixer_object(&selem_regopt);
16
 
Index: alsa-utils-1.0.27/amixer/amixer.c
 
16
Index: alsa-utils-1.0.27.2/amixer/amixer.c
17
17
===================================================================
18
 
--- alsa-utils-1.0.27.orig/amixer/amixer.c      2013-04-30 15:42:02.652987098 +1000
19
 
+++ alsa-utils-1.0.27/amixer/amixer.c   2013-04-30 15:42:02.644987098 +1000
20
 
@@ -1712,6 +1712,11 @@
 
18
--- alsa-utils-1.0.27.2.orig/amixer/amixer.c    2013-10-28 12:06:49.310416172 -0700
 
19
+++ alsa-utils-1.0.27.2/amixer/amixer.c 2013-10-28 12:06:49.306416172 -0700
 
20
@@ -1739,6 +1739,11 @@
21
21
 {
22
22
        int morehelp, level = 0;
23
23
        int read_stdin = 0;
29
29
        static const struct option long_option[] =
30
30
        {
31
31
                {"help", 0, NULL, 'h'},
32
 
Index: alsa-utils-1.0.27/iecset/iecset.c
 
32
Index: alsa-utils-1.0.27.2/iecset/iecset.c
33
33
===================================================================
34
 
--- alsa-utils-1.0.27.orig/iecset/iecset.c      2013-04-30 15:42:02.652987098 +1000
35
 
+++ alsa-utils-1.0.27/iecset/iecset.c   2013-04-30 15:42:02.648987098 +1000
 
34
--- alsa-utils-1.0.27.2.orig/iecset/iecset.c    2013-10-28 12:06:49.310416172 -0700
 
35
+++ alsa-utils-1.0.27.2/iecset/iecset.c 2013-10-28 12:06:49.306416172 -0700
36
36
@@ -324,6 +324,10 @@
37
37
        char tmpname[32];
38
38
        int parms[IDX_LAST];
44
44
        for (i = 0; i < IDX_LAST; i++)
45
45
                parms[i] = -1; /* not set */
46
46
 
 
47
Index: alsa-utils-1.0.27.2/alsactl/alsactl.c
 
48
===================================================================
 
49
--- alsa-utils-1.0.27.2.orig/alsactl/alsactl.c  2013-07-09 08:28:37.000000000 -0700
 
50
+++ alsa-utils-1.0.27.2/alsactl/alsactl.c       2013-10-28 12:07:25.566417101 -0700
 
51
@@ -164,6 +164,8 @@
 
52
 
 
53
 int main(int argc, char *argv[])
 
54
 {
 
55
+       setenv("PULSE_INTERNAL", "0", 1);
 
56
+
 
57
        static const char *const devfiles[] = {
 
58
                "/dev/snd/controlC",
 
59
                "/dev/snd/pcmC",