← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to debian/patches/debian_dfsg_configure.patch

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2010-06-04 11:52:55 UTC
  • mfrom: (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100604115255-tu8woz22vgmcyrql
Tags: 1.0.23+dfsg-1ubuntu1
* Merge from debian alsa-driver svn, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.
  - Drop kernel-package recommends to a suggests in order to be able to demote
    kernel-package to universe

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian_dfsg_configure.patch
 
1
From: Elimar Riesebieter <riesebie@lxtec.de>
 
2
Subject: Clean build system for running a DFSG build.
 
3
Last-Update: 2010-05-23
 
4
 
1
5
Prevent to not configure cs46xx, korg1212, maestro3, ymfpci. These drivers do
2
6
have binary code in sorce.
3
 
Index: alsa-driver-1.0.22.1+dfsg/configure
 
7
 
 
8
Index: alsa-driver-1.0.23+dfsg/acinclude.m4
4
9
===================================================================
5
 
--- alsa-driver-1.0.22.1+dfsg.orig/configure    2010-01-17 17:42:40.000000000 +0100
6
 
+++ alsa-driver-1.0.22.1+dfsg/configure 2010-01-17 17:42:40.000000000 +0100
7
 
@@ -1890,16 +1890,16 @@
8
 
                             msnd-pinnacle, msnd-classic, pc98-cs4232, ad1889,
9
 
                             als300, als4000, ali5451, atiixp, atiixp-modem,
10
 
                             au8810, au8820, au8830, aw2, azt3328, bt87x,
11
 
-                            ca0106, cmipci, oxygen, cs4281, cs46xx, cs5530,
12
 
+                            ca0106, cmipci, oxygen, cs4281, cs5530,
13
 
                             cs5535audio, ctxfi, darla20, gina20, layla20,
14
 
                             darla24, gina24, layla24, mona, mia, echo3g,
15
 
                             indigo, indigoio, indigodj, indigoiox, indigodjx,
16
 
                             emu10k1x, ens1370, ens1371, es1938, es1968,
17
 
                             fm801, hda-intel, hdsp, hdspm, hifier, ice1712,
18
 
-                            ice1724, intel8x0, intel8x0m, korg1212, lx6464es,
19
 
-                            maestro3, mixart, nm256, pcxhr, riptide, rme32,
20
 
+                            ice1724, intel8x0, intel8x0m, lx6464es,
21
 
+                            mixart, nm256, pcxhr, riptide, rme32,
22
 
                             rme96, rme9652, sis7019, sonicvibes, trident,
23
 
-                            via82xx, via82xx-modem, virtuoso, vx222, ymfpci,
24
 
+                            via82xx, via82xx-modem, virtuoso, vx222,
25
 
                             pdplus, asihpi, powermac, ps3, aoa,
26
 
                             aoa-fabric-layout, aoa-onyx, aoa-tas, aoa-toonie,
27
 
                             aoa-soundbus, aoa-soundbus-i2s, armaaci,
28
 
@@ -1949,7 +1949,7 @@
29
 
                           Possible options are:
30
 
                             seq-hrtimer-default, seq-rtctimer-default,
31
 
                             support-old-api, pcm-xrun-debug, ac97-power-save,
32
 
-                            sb16-csp, bt87x-overclock, cs46xx-new-dsp,
33
 
+                            sb16-csp, bt87x-overclock,
34
 
                             fm801-tea575x-bool, hda-hwdep, hda-reconfig,
35
 
                             hda-input-beep, hda-input-jack, hda-patch-loader,
36
 
                             hda-codec-realtek, hda-codec-analog,
37
 
@@ -12851,23 +12851,6 @@
 
10
--- alsa-driver-1.0.23+dfsg.orig/acinclude.m4   2010-05-23 13:52:35.000000000 +0200
 
11
+++ alsa-driver-1.0.23+dfsg/acinclude.m4        2010-05-23 13:53:14.000000000 +0200
 
12
@@ -595,16 +595,16 @@
 
13
   [                          msnd-pinnacle, msnd-classic, pc98-cs4232, ad1889, ]
 
14
   [                          als300, als4000, ali5451, atiixp, atiixp-modem, ]
 
15
   [                          au8810, au8820, au8830, aw2, azt3328, bt87x, ]
 
16
-  [                          ca0106, cmipci, oxygen, cs4281, cs46xx, cs5530, ]
 
17
+  [                          ca0106, cmipci, oxygen, cs4281, cs5530, ]
 
18
   [                          cs5535audio, ctxfi, darla20, gina20, layla20, ]
 
19
   [                          darla24, gina24, layla24, mona, mia, echo3g, ]
 
20
   [                          indigo, indigoio, indigodj, indigoiox, indigodjx, ]
 
21
   [                          emu10k1x, ens1370, ens1371, es1938, es1968, ]
 
22
   [                          fm801, hda-intel, hdsp, hdspm, hifier, ice1712, ]
 
23
-  [                          ice1724, intel8x0, intel8x0m, korg1212, lx6464es, ]
 
24
-  [                          maestro3, mixart, nm256, pcxhr, riptide, rme32, ]
 
25
+  [                          ice1724, intel8x0, intel8x0m, lx6464es, ]
 
26
+  [                          mixart, nm256, pcxhr, riptide, rme32, ]
 
27
   [                          rme96, rme9652, sis7019, sonicvibes, trident, ]
 
28
-  [                          via82xx, via82xx-modem, virtuoso, vx222, ymfpci, ]
 
29
+  [                          via82xx, via82xx-modem, virtuoso, vx222, ]
 
30
   [                          pdplus, asihpi, powermac, ps3, aoa, ]
 
31
   [                          aoa-fabric-layout, aoa-onyx, aoa-tas, aoa-toonie, ]
 
32
   [                          aoa-soundbus, aoa-soundbus-i2s, armaaci, ]
 
33
@@ -659,7 +659,7 @@
 
34
   [                        Possible options are: ]
 
35
   [                          seq-hrtimer-default, seq-rtctimer-default, ]
 
36
   [                          support-old-api, pcm-xrun-debug, ac97-power-save, ]
 
37
-  [                          sb16-csp, bt87x-overclock, cs46xx-new-dsp, ]
 
38
+  [                          sb16-csp, bt87x-overclock, ]
 
39
   [                          fm801-tea575x-bool, hda-hwdep, hda-reconfig, ]
 
40
   [                          hda-input-beep, hda-input-jack, hda-patch-loader, ]
 
41
   [                          hda-codec-realtek, hda-codec-analog, ]
 
42
@@ -1436,23 +1436,6 @@
38
43
       CONFIG_SND_CS4281="m"
39
44
     fi
40
45
   fi
58
63
   if alsa_check_kconfig_card "cs5530"; then
59
64
     if ( test "$CONFIG_SND_PCI" = "y" -o "$CONFIG_SND_PCI" = "m" ) &&
60
65
       ( test "$CONFIG_ISA_DMA_API" = "y" -o "$CONFIG_ISA_DMA_API" = "m" ); then
61
 
@@ -13309,13 +13292,6 @@
 
66
@@ -1895,13 +1878,6 @@
62
67
       CONFIG_SND_INTEL8X0M="m"
63
68
     fi
64
69
   fi
72
77
   if alsa_check_kconfig_card "lx6464es"; then
73
78
     if ( test "$CONFIG_SND_PCI" = "y" -o "$CONFIG_SND_PCI" = "m" ) &&
74
79
       ( test "$kversion.$kpatchlevel" = "2.6" ); then
75
 
@@ -13324,16 +13300,6 @@
 
80
@@ -1910,16 +1886,6 @@
76
81
       CONFIG_SND_LX6464ES="m"
77
82
     fi
78
83
   fi
89
94
   if alsa_check_kconfig_card "mixart"; then
90
95
     if ( test "$CONFIG_SND_PCI" = "y" -o "$CONFIG_SND_PCI" = "m" ); then
91
96
       CONFIG_SND_TIMER="m"
92
 
@@ -13476,20 +13442,6 @@
 
97
@@ -2062,20 +2028,6 @@
93
98
       CONFIG_SND_VX222="m"
94
99
     fi
95
100
   fi