diff options
90 files changed, 3049 insertions, 11923 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b653bec83f..64a179f182 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -287,7 +287,16 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi + dotlai=$libname.lai + + # Sanity check that the libname.lai is unique + number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` + if [ $number_of_files -gt 1 ]; then + oefatal "oe_libinstall: $dotlai is not unique in $dir" + fi + + dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 2c2bffea96..0edb4ef0ae 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -1,9 +1,11 @@ +EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}" SRCREV_pn-assassin ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-illume ?= "${AUTOREV}" +SRCREV_pn-illume-theme ?= "${AUTOREV}" SRCREV_pn-libgsmd ?= "${AUTOREV}" SRCREV_pn-libjana ?= "${AUTOREV}" SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}" @@ -14,11 +16,13 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-multitap-pad ?= "${AUTOREV}" +SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}" SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" +SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" @@ -52,8 +56,10 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -#SRCREV_pn-opkg ?= "${AUTOREV}" -#SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg-sdk ?= "${AUTOREV}" +SRCREV_pn-python-etk ?= "${AUTOREV}" SRCREV_pn-python-gsmd ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 23093ef2c1..7721d97ce6 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE ?= "20080427" +EFL_SRCDATE ?= "20080428" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -155,3 +155,6 @@ SRCDATE_yamonenv ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" +# aleph1/yaffs +SRCDATE_yaffs2-utils = "20080331" +SRCDATE_yaffs2-utils-native = "20080331" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ffa847677b..246789fcbe 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,7 +12,7 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-assassin ?= "41" +SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-uclibc ?= "21926" SRCREV_pn-uclibc-initial ?= "21926" @@ -22,11 +22,12 @@ SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "277" -SRCREV_pn-diversity-nav ?= "284" +SRCREV_pn-diversity-nav ?= "340" SRCREV_pn-eds-dbus ?= "659" SRCREV_pn-eglibc ?= "5963" SRCREV_pn-eglibc-initial ?= "5963" SRCREV_pn-eglibc-intermediate ?= "5963" +SRCREV_pn-enlazar ?= "37" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" SRCREV_pn-exalt-module ?= "78" @@ -43,7 +44,8 @@ SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "14" +SRCREV_pn-illume ?= "58" +SRCREV_pn-illume-theme ?= "58" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" @@ -59,6 +61,7 @@ SRCREV_pn-libmokoui2 ?= "4342" SRCREV_pn-libowl ?= "277" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libw100 ?= "47" +SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" @@ -80,7 +83,7 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-neod ?= "4336" SRCREV_pn-netsurf ?= "3859" -SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager ?= "3202" SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" @@ -88,7 +91,7 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-agpsui ?= "7" -SRCREV_pn-openmoko-alsa-scenarios ?= "4317" +SRCREV_pn-openmoko-alsa-scenarios ?= "4406" SRCREV_pn-openmoko-appearance ?= "3262" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" @@ -154,6 +157,7 @@ SRCREV_pn-opkg-sdk ?= "4247" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965" SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" @@ -165,6 +169,7 @@ SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae" SRCREV_pn-s3c24xx-gpio ?= "4130" +SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna ?= "45" @@ -177,4 +182,5 @@ SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1971" +SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index e041b34c6f..3b9ed1b468 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -9,6 +9,7 @@ MACHINE_CLASS = "neo1973" PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index d13b9d8270..ce7c97f0cc 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -7,30 +7,16 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" -RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" -PR = "r15" +PR = "r16" SRC_URI = " \ file://asoundrc \ file://asound.state \ file://alsa-state " -SRC_URI_append_om-gta01 = " \ - file://capturehandset.state \ - file://captureheadset.state \ - file://gsmbluetooth.state \ - file://gsmhandset.state \ - file://gsmheadset.state \ - file://gsmspeakerout.state \ - file://stereoout.state \ - file://voip-handset.state \ - file://voip-headset.state" - -SRC_URI_append_om-gta02 = "\ - file://stereoout.state \ - file://gsmhandset.state \ - " inherit update-rc.d diff --git a/packages/alsa/alsa-state/om-gta01/asound.state b/packages/alsa/alsa-state/om-gta01/asound.state deleted file mode 100644 index 26db3cf311..0000000000 --- a/packages/alsa/alsa-state/om-gta01/asound.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 230 - value.1 230 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Line 2' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 22 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 22 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Stereo Speakers + Headphones' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value Headphones - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/capturehandset.state b/packages/alsa/alsa-state/om-gta01/capturehandset.state deleted file mode 100644 index 54bf01e945..0000000000 --- a/packages/alsa/alsa-state/om-gta01/capturehandset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 3 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 2' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Line 2' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value true - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value 'Analogue Mix Left' - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value 'Analogue Mix Left' - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 0 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 0 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value Off - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'Capture Handset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/captureheadset.state b/packages/alsa/alsa-state/om-gta01/captureheadset.state deleted file mode 100644 index 2a174d80ab..0000000000 --- a/packages/alsa/alsa-state/om-gta01/captureheadset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 3 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 3 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 2' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Line 2' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value true - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value 'Analogue Mix Left' - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value 'Analogue Mix Left' - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 0 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 0 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value Off - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'Capture Headset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state deleted file mode 100644 index 8569474a0e..0000000000 --- a/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state +++ /dev/null @@ -1,900 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Line 2' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value true - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value 'Analogue Mix Left' - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value 'Analogue Mix Left' - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value true - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 0 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 0 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value Off - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Bluetooth' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/gsmhandset.state b/packages/alsa/alsa-state/om-gta01/gsmhandset.state deleted file mode 100644 index 999f71253c..0000000000 --- a/packages/alsa/alsa-state/om-gta01/gsmhandset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 0 - value.1 0 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 111 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 5 - value.1 5 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 1 - value.1 1 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 5 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 6 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 6 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 0 - value.1 0 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 0 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 0 - value.1 0 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value Voice - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 5 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 5 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value Inverted - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 2' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 26 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 0 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 9 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Call Speaker' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Handset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/gsmheadset.state b/packages/alsa/alsa-state/om-gta01/gsmheadset.state deleted file mode 100644 index e81bfc8306..0000000000 --- a/packages/alsa/alsa-state/om-gta01/gsmheadset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 102 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 0 - value.1 0 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 4 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 4 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 4 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 5 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 5 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value Inverted - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 3 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value true - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 1' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 30 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 15 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value Headphones - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Headset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state b/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state deleted file mode 100644 index 5e3ed93179..0000000000 --- a/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 0 - value.1 0 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 111 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 5 - value.1 5 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 1 - value.1 1 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 5 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 6 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 6 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 0 - value.1 0 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 0 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 0 - value.1 0 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value Voice - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 5 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 5 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value Inverted - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 1' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 31 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 31 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 9 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Stereo Speakers' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Handset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/stereoout.state b/packages/alsa/alsa-state/om-gta01/stereoout.state deleted file mode 100644 index 26db3cf311..0000000000 --- a/packages/alsa/alsa-state/om-gta01/stereoout.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 230 - value.1 230 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Line 2' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 22 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 22 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 0 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Stereo Speakers + Headphones' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value Headphones - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/voip-handset.state b/packages/alsa/alsa-state/om-gta01/voip-handset.state deleted file mode 100644 index 420a4eb79d..0000000000 --- a/packages/alsa/alsa-state/om-gta01/voip-handset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 6 - value.1 6 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 true - value.1 true - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 6 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 63 - value.1 63 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value Voice - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value false - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Left - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value true - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 11 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 5 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Playback - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Right - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 2 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 2' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value 'Channel Swap' - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 2' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Rx Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value true - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 1' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value 'Analogue Mix Left' - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value 'Analogue Mix Left' - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 16 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 29 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 18 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Call Speaker' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Handset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta01/voip-headset.state b/packages/alsa/alsa-state/om-gta01/voip-headset.state deleted file mode 100644 index df22f5b7d5..0000000000 --- a/packages/alsa/alsa-state/om-gta01/voip-headset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 6 - value.1 6 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 true - value.1 true - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 6 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 63 - value.1 63 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value Voice - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value false - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Left - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value true - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 11 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 5 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Playback - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Right - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 2 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 2' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value 'Channel Swap' - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Rx Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Line 1' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value true - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 1' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value 'Analogue Mix Left' - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value 'Analogue Mix Left' - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 16 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 29 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 18 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value Headphones - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Headset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta02/asound.state b/packages/alsa/alsa-state/om-gta02/asound.state deleted file mode 100644 index 3b46fc7223..0000000000 --- a/packages/alsa/alsa-state/om-gta02/asound.state +++ /dev/null @@ -1,885 +0,0 @@ -state.neo1973gta02 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 235 - value.1 235 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 0 - value.1 0 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 0 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Stereo Out Switch' - value true - } - control.88 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line Out Switch' - value false - } - control.89 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line In Switch' - value false - } - control.90 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Headset Mic Switch' - value false - } - control.91 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Mic Switch' - value false - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Spk Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value true - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' - value true - } -} diff --git a/packages/alsa/alsa-state/om-gta02/gsmhandset.state b/packages/alsa/alsa-state/om-gta02/gsmhandset.state deleted file mode 100644 index 722ce88425..0000000000 --- a/packages/alsa/alsa-state/om-gta02/gsmhandset.state +++ /dev/null @@ -1,885 +0,0 @@ -state.neo1973gta02 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 235 - value.1 235 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 0 - value.1 0 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 127 - value.1 127 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 0 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value false - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Left - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value true - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Stereo Out Switch' - value false - } - control.88 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line Out Switch' - value true - } - control.89 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line In Switch' - value false - } - control.90 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Headset Mic Switch' - value false - } - control.91 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Mic Switch' - value true - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Spk Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/om-gta02/stereoout.state b/packages/alsa/alsa-state/om-gta02/stereoout.state deleted file mode 100644 index 3b46fc7223..0000000000 --- a/packages/alsa/alsa-state/om-gta02/stereoout.state +++ /dev/null @@ -1,885 +0,0 @@ -state.neo1973gta02 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 235 - value.1 235 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 0 - value.1 0 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 0 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value false - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value false - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value false - } - control.87 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Stereo Out Switch' - value true - } - control.88 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line Out Switch' - value false - } - control.89 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line In Switch' - value false - } - control.90 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Headset Mic Switch' - value false - } - control.91 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Mic Switch' - value false - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Spk Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value true - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' - value true - } -} diff --git a/packages/classpath/classpath-native_0.97.1.bb b/packages/classpath/classpath-native_0.97.1.bb new file mode 100644 index 0000000000..02328b8a21 --- /dev/null +++ b/packages/classpath/classpath-native_0.97.1.bb @@ -0,0 +1,3 @@ +require classpath-native.inc + +PR = "r0" diff --git a/packages/alsa/alsa-state/om-gta01/.mtn2git_empty b/packages/dvbtools/dvb-apps-1.1.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/alsa/alsa-state/om-gta01/.mtn2git_empty +++ b/packages/dvbtools/dvb-apps-1.1.1/.mtn2git_empty diff --git a/packages/dvbtools/dvb-apps-1.1.1/makefile.patch b/packages/dvbtools/dvb-apps-1.1.1/makefile.patch new file mode 100644 index 0000000000..d3acb45d05 --- /dev/null +++ b/packages/dvbtools/dvb-apps-1.1.1/makefile.patch @@ -0,0 +1,89 @@ +Index: linuxtv-dvb-apps-1.1.1/test/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/test/Makefile 2004-01-17 17:59:46.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/test/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,6 +1,6 @@ + # Makefile for Linux DVB API Version 3 test programs + +-CC = gcc ++ + CFLAGS = -g -O2 -W -Wall -I../include + + TARGETS = \ +Index: linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/av7110_loadkeys/Makefile 2004-01-17 17:59:46.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,7 +1,6 @@ +-CC = gcc + CFLAGS = -g -Wall -O2 + +-all: av7110_loadkeys evtest ++all: evtest + + av7110_loadkeys: av7110_loadkeys.o + +Index: linuxtv-dvb-apps-1.1.1/util/lib/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/lib/Makefile 2004-01-17 17:59:46.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,5 +1,5 @@ + +-CC = gcc ++ + CFLAGS = -MD -g -Wall -O2 -I../../include -I. + LFLAGS = -g -Wall + +Index: linuxtv-dvb-apps-1.1.1/util/scan/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/scan/Makefile 2006-05-18 01:34:53.000000000 +0200 ++++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,5 +1,5 @@ + +-CC = gcc ++ + CFLAGS = -MD -g -Wall -O2 -I../../include + LFLAGS = -g -Wall + +Index: linuxtv-dvb-apps-1.1.1/util/szap/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/szap/Makefile 2006-05-18 01:31:54.000000000 +0200 ++++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,4 +1,4 @@ +-CC = gcc ++ + CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib + LFLAGS = -Wall -g -O2 + RM = rm -f +Index: linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/dvbdate/Makefile 2004-01-17 17:59:46.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,5 +1,4 @@ + +-CC = gcc + CFLAGS = -g -O2 -MD -Wall -I. -I../../include + LFLAGS = + +Index: linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/dvbnet/Makefile 2004-01-17 17:59:46.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile 2008-03-25 20:04:23.000000000 +0100 +@@ -1,5 +1,4 @@ + +-CC = gcc + CFLAGS = -g -O2 -MD -Wall -I. -I../../include + LFLAGS = + +Index: linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile +=================================================================== +--- linuxtv-dvb-apps-1.1.1.orig/util/dvbtraffic/Makefile 2004-01-19 18:10:16.000000000 +0100 ++++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile 2008-03-25 20:09:00.000000000 +0100 +@@ -1,6 +1,6 @@ + + dvbtraffic: dvbtraffic.c +- gcc -MD -g -O2 -Wall -I../../include $< -o $@ ++ $(CC) -MD -g -O2 -Wall -I../../include $< -o $@ + + clean: + rm -f *.o *.d dvbtraffic diff --git a/packages/dvbtools/dvb-apps_1.1.1.bb b/packages/dvbtools/dvb-apps_1.1.1.bb new file mode 100644 index 0000000000..ebf25d0393 --- /dev/null +++ b/packages/dvbtools/dvb-apps_1.1.1.bb @@ -0,0 +1,109 @@ +HOMEPAGE = "http://www.linuxtv.org" +LICENSE = "GPL" +S = "${WORKDIR}/linuxtv-dvb-apps-${PV}" + +SRC_URI = "http://linuxtv.org/downloads/linuxtv-dvb-apps-${PV}.tar.bz2 \ + file://makefile.patch;patch=1" + +PACKAGES += "evtest evtest-dbg \ + dvbapp-tests dvbapp-tests-dbg \ + dvbdate dvbdate-dbg \ + dvbtraffic dvbtraffic-dbg \ + dvbnet dvbnet-dbg \ + dvb-scan dvb-scan-dbg dvb-scan-data \ + dvb-azap dvb-azap-dbg \ + dvb-czap dvb-czap-dbg \ + dvb-szap dvb-szap-dbg \ + dvb-tzap dvb-tzap-dbg \ + dvb-femon dvb-femon-dbg \ + dvb-zap-data" + + +FILES_${PN} = "" +FILES_${PN}-dbg = "" +FILES_${PN}-doc = "" + +FILES_evtest = "${bindir}/evtest" +FILES_evtest-dbg = "${bindir}/.debug/evtest" + +FILES_dvbapp-tests = "${bindir}/test_*" +FILES_dvbapp-tests-dbg = "${bindir}/.debug/test_*" + +FILES_dvbdate = "${bindir}/dvbdate" +FILES_dvbdate-dbg = "${bindir}/.debug/dvbdate" + +FILES_dvbtraffic = "${bindir}/dvbtraffic" +FILES_dvbtraffic-dbg = "${bindir}/.debug/dvbtraffic" + +FILES_dvbnet = "${bindir}/dvbnet" +FILES_dvbnet-dbg = "${bindir}/.debug/dvbnet" + +FILES_dvb-scan = "${bindir}/scan" +FILES_dvb-scan-dbg = "${bindir}/.debug/scan" +FILES_dvb-scan-data = "${docdir}/dvb-apps/scan" + +FILES_dvb-azap = "${bindir}/azap" +FILES_dvb-azap-dbg = "${bindir}/.debug/azap" + +FILES_dvb-czap = "${bindir}/czap" +FILES_dvb-czap-dbg = "${bindir}/.debug/czap" + +FILES_dvb-szap = "${bindir}/szap" +FILES_dvb-szap-dbg = "${bindir}/.debug/szap" + +FILES_dvb-tzap = "${bindir}/tzap" +FILES_dvb-tzap-dbg = "${bindir}/.debug/tzap" + +FILES_dvb-femon = "${bindir}/femon" +FILES_dvb-femon-dbg = "${bindir}/.debug/femon" + +FILES_dvb-zap-data = "${docdir}/dvb-apps/szap" + + + +do_install() { + install -d ${D}/${bindir} + install -d ${D}/${docdir}/dvb-apps + install -d ${D}/${docdir}/dvb-apps/scan + install -d ${D}/${docdir}/dvb-apps/szap + + # Install tests + install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage + install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k + install -m 0755 ${S}/test/video ${D}${bindir}/test_video + install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst + install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc + install -m 0755 ${S}/test/test_sections ${D}${bindir}/ + install -m 0755 ${S}/test/test_av_play ${D}${bindir}/ + install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/ + install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/ + install -m 0755 ${S}/test/test_tt ${D}${bindir}/ + install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/ + install -m 0755 ${S}/test/test_stc ${D}${bindir}/ + install -m 0755 ${S}/test/test_av ${D}${bindir}/ + install -m 0755 ${S}/test/test_vevent ${D}${bindir}/ + install -m 0755 ${S}/test/test_pes ${D}${bindir}/ + install -m 0755 ${S}/test/test_dvr ${D}${bindir}/ + + # Install the utils + install -m 0755 ${S}/util/dvbtraffic/dvbtraffic ${D}${bindir}/ + install -m 0755 ${S}/util/scan/scan ${D}${bindir}/ + install -m 0755 ${S}/util/szap/tzap ${D}${bindir}/ + install -m 0755 ${S}/util/szap/czap ${D}${bindir}/ + install -m 0755 ${S}/util/szap/femon ${D}${bindir}/ + install -m 0755 ${S}/util/szap/szap ${D}${bindir}/ + install -m 0755 ${S}/util/szap/azap ${D}${bindir}/ + install -m 0755 ${S}/util/av7110_loadkeys/evtest ${D}${bindir}/ + install -m 0755 ${S}/util/dvbnet/dvbnet ${D}${bindir}/ + install -m 0755 ${S}/util/dvbdate/dvbdate ${D}${bindir}/ + + # Install data files + cp -pPR ${S}/util/scan/dvb-c ${D}/${docdir}/dvb-apps/scan/ + cp -pPR ${S}/util/scan/dvb-s ${D}/${docdir}/dvb-apps/scan/ + cp -pPR ${S}/util/scan/dvb-t ${D}/${docdir}/dvb-apps/scan/ + cp -pPR ${S}/util/scan/atsc ${D}/${docdir}/dvb-apps/scan/ + cp -pPR ${S}/util/scan/README ${D}/${docdir}/dvb-apps/scan/ + + cp -pPR ${S}/util/szap/channels.conf-* ${D}/${docdir}/dvb-apps/szap/ + cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ +} diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu index e163864acf..9cd933a240 100644 --- a/packages/e17/e-wm/applications.menu +++ b/packages/e17/e-wm/applications.menu @@ -62,9 +62,10 @@ <Name>Settings</Name> <Directory>Settings.directory</Directory> <Include> - <And> + <Or> <Category>SystemSettings</Category> - </And> + <Category>Settings</Category> + </Or> </Include> </Menu> diff --git a/packages/e17/e-wm/enlightenment_start.oe b/packages/e17/e-wm/enlightenment_start.oe new file mode 100644 index 0000000000..7d472fa76f --- /dev/null +++ b/packages/e17/e-wm/enlightenment_start.oe @@ -0,0 +1,8 @@ +#!/bin/sh + +E_PROFILE="" +if [ -r /etc/enlightenment/default_profile ]; then + . /etc/enlightenment/default_profile +fi + +exec enlightenment_start $E_PROFILE diff --git a/packages/e17/e-wm/pkgconfig-fix.patch b/packages/e17/e-wm/pkgconfig-fix.patch new file mode 100644 index 0000000000..9ea929da27 --- /dev/null +++ b/packages/e17/e-wm/pkgconfig-fix.patch @@ -0,0 +1,18 @@ +Index: enlightenment.pc.in +=================================================================== +--- enlightenment.pc.in.orig 2008-03-28 22:33:51.000000000 +0100 ++++ enlightenment.pc.in 2008-03-29 17:22:30.000000000 +0100 +@@ -1,11 +1,12 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/@PACKAGE@ + + Name: enlightenment + Description: Enlightenmnt Window Manager + Version: @VERSION@ ++Requires: efreet >= 0.0.3.042 + Libs: @libdir@/@PACKAGE@/modules + Libs.private: + Cflags: -I${includedir} diff --git a/packages/e17/e-wm/profile-search.patch b/packages/e17/e-wm/profile-search.patch new file mode 100644 index 0000000000..7f3e9e2e29 --- /dev/null +++ b/packages/e17/e-wm/profile-search.patch @@ -0,0 +1,41 @@ +? .e_border.c.swn +? .e_border.c.swo +? .e_border.c.swp +? .e_border.h.swp +? .e_config.c.swp +? .e_int_menus.c.swp +? .e_main.c.swp +? .e_popup.c.swp +? .e_prefix.c.swp +? .e_shelf.c.swo +? .e_shelf.c.swp +Index: e_config.c +=================================================================== +RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.c,v +retrieving revision 1.282 +diff -u -r1.282 e_config.c +--- e/src/bin/e_config.c 20 Feb 2008 04:12:58 -0000 1.282 ++++ e/src/bin/e_config.c 31 Mar 2008 01:57:00 -0000 +@@ -1827,7 +1827,22 @@ + { + data = eet_data_read(ef, edd, "config"); + eet_close(ef); ++ return data; + } ++ ++ /* fallback to a system directory ++ * FIXME proper $PATH like handling might be wanted ++ */ ++ snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg", ++ e_prefix_data_get(), _e_config_profile, domain); ++ ef = eet_open(buf, EET_FILE_MODE_READ); ++ if (ef) ++ { ++ data = eet_data_read(ef, edd, "config"); ++ eet_close(ef); ++ return data; ++ } ++ + return data; + } + diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index 9cd4ab7ffc..41e27da46a 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -2,13 +2,15 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet" LICENSE = "MIT BSD" PV = "0.16.999.042+cvs${SRCDATE}" -PR = "r0" +PR = "r5" inherit e update-alternatives SRC_URI = "${E_CVS};module=e17/apps/e \ file://disable-e-cursor.patch;patch=1 \ - file://Xsession.d/98enlightenment \ + file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \ + file://profile-search.patch;patch=1;mindate=20080328;maxdate=20080401 \ + file://enlightenment_start.oe \ file://applications.menu \ " S = "${WORKDIR}/e" @@ -34,8 +36,7 @@ do_stage() { do_install_append() { # customising - should rather make this simple upstream - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} install -d ${D}/${sysconfdir}/xdg/menus install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ } @@ -57,7 +58,7 @@ FILES_${PN}-dev += "\ ${libdir}/enlightenment/preload/*.?a \ " -ALTERNATIVE_PATH = "${bindir}/enlightenment_start" +ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/examine_cvs.bb b/packages/e17/examine_cvs.bb index c8b06de346..750cdb3e09 100644 --- a/packages/e17/examine_cvs.bb +++ b/packages/e17/examine_cvs.bb @@ -1,9 +1,11 @@ DESCRIPTION = "Examine, the program configurator" -DEPENDS = "ewl" LICENSE = "MIT BSD" +DEPENDS = "ewl" PV = "0.0.1+cvs${SRCDATE}" PR = "r0" +SRCNAME = "examine" + inherit e EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb index 2c32fc12d6..94bce42af5 100644 --- a/packages/e17/exhibit_cvs.bb +++ b/packages/e17/exhibit_cvs.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Exhibit is the ETK picture viewer" -DEPENDS = "evas ecore epsilon edje eet etk efreet" LICENSE = "MIT BSD" +DEPENDS = "evas ecore epsilon edje eet etk efreet" PV = "0.1.1+cvs${SRCDATE}" PR = "r0" +SRCNAME = "exhibit" + inherit e diff --git a/packages/e17/exquisite_cvs.bb b/packages/e17/exquisite_cvs.bb new file mode 100644 index 0000000000..7f2d32f83b --- /dev/null +++ b/packages/e17/exquisite_cvs.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A psplash replacement for display" +LICENSE = "MIT BSD" +DEPENDS = "eet evas ecore embryo edje" +PV = "0.0.1+cvs${SRCDATE}" +PR = "r0" + +SRCNAME = "exquisite" + +inherit e + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 84c0b90c29..140254f897 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" -DEPENDS = "curl eet evas tslib" +DEPENDS = "curl eet evas tslib libxtst libxscrnsaver" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.042+cvs${SRCDATE}" diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index c6ff68b8bf..be9b64378b 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -2,11 +2,13 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore efreet ewl" LICENSE = "MIT BSD" PV = "0.1.0.042+cvs${SRCDATE}" -PR = "r0" +PR = "r5" inherit efl -SRC_URI = "${E_CVS};module=e17/libs/e_dbus" +SRC_URI = "${E_CVS};module=e17/libs/e_dbus \ + http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \ + " S = "${WORKDIR}/e_dbus" EXTRA_OECONF = "--enable-build-test-gui" diff --git a/packages/alsa/alsa-state/om-gta02/.mtn2git_empty b/packages/efl1/imlib2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/alsa/alsa-state/om-gta02/.mtn2git_empty +++ b/packages/efl1/imlib2/.mtn2git_empty diff --git a/packages/efl1/imlib2/remove-local-includes-20080421.patch b/packages/efl1/imlib2/remove-local-includes-20080421.patch new file mode 100644 index 0000000000..d28ba9ebf0 --- /dev/null +++ b/packages/efl1/imlib2/remove-local-includes-20080421.patch @@ -0,0 +1,15 @@ +Index: imlib2/configure.in +=================================================================== +--- imlib2.orig/configure.in 2008-04-21 14:28:58.000000000 +0800 ++++ imlib2/configure.in 2008-04-21 14:30:07.000000000 +0800 +@@ -191,9 +191,7 @@ + + if test "x$have_x" = "xyes"; then + AC_PATH_XTRA +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="-lX11 -lXext" + AC_DEFINE(BUILD_X11, 1, [enabling X11 support]) + else + x_cflags="" diff --git a/packages/efl1/imlib2/remove-local-includes.patch b/packages/efl1/imlib2/remove-local-includes.patch new file mode 100644 index 0000000000..bc85b10424 --- /dev/null +++ b/packages/efl1/imlib2/remove-local-includes.patch @@ -0,0 +1,15 @@ +Index: imlib2/configure.in +=================================================================== +--- imlib2.orig/configure.in 2007-09-01 14:34:26.000000000 +0000 ++++ imlib2/configure.in 2007-09-01 14:35:07.000000000 +0000 +@@ -188,9 +188,7 @@ + + if test "x$have_x" = "xyes"; then + AC_PATH_XTRA +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="-lX11 -lXext" + AM_CONDITIONAL(BUILD_X11, true) + AC_DEFINE(BUILD_X11, 1, [enabling X11 support]) + else diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb index 18cca99ae4..0008ca9122 100644 --- a/packages/efl1/imlib2_cvs.bb +++ b/packages/efl1/imlib2_cvs.bb @@ -3,10 +3,14 @@ LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" PV = "1.4.1.000+cvs${SRCDATE}" -PR = "r1" +PR = "r2" inherit efl +# The original patch was out of date in 20080420 +SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \ + file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 " + EXTRA_OECONF = "--with-x" # TODO: Use more fine granular version diff --git a/packages/git/git-native_1.5.3.bb b/packages/git/git-native_1.5.3.bb index 935c773c1c..1ef8eafc19 100644 --- a/packages/git/git-native_1.5.3.bb +++ b/packages/git/git-native_1.5.3.bb @@ -1,4 +1,4 @@ require git.inc inherit native DEPENDS = "openssl-native curl-native zlib-native expat-native" -PR = "r1" +PR = "r2" diff --git a/packages/git/git.inc b/packages/git/git.inc index 3a80c5d950..879dc84cbe 100644 --- a/packages/git/git.inc +++ b/packages/git/git.inc @@ -8,14 +8,14 @@ SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ " S = "${WORKDIR}/git-${PV}" -EXTRA_OEMAKE = "NO_TCLTL=1" +EXTRA_OEMAKE = "NO_TCLTK=1" inherit autotools do_install () { - oe_runmake install prefix=${D} bindir=${D}${bindir} \ - template_dir=${D}${datadir}/git-core/templates \ - GIT_PYTHON_DIR=${D}${datadir}/git-core/python + oe_runmake install DESTDIR="${D}" bindir=${bindir} \ + template_dir=${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${datadir}/git-core/python } FILES_${PN} += "${datadir}/git-core" diff --git a/packages/git/git_1.5.3.bb b/packages/git/git_1.5.3.bb new file mode 100644 index 0000000000..f250bd5166 --- /dev/null +++ b/packages/git/git_1.5.3.bb @@ -0,0 +1,5 @@ +require git.inc +DEPENDS = "openssl curl zlib expat" +RDEPENDS = "perl perl-module-file-path cpio findutils sed" +PR = "r2" + diff --git a/packages/hal/hal-info_20080313.bb b/packages/hal/hal-info_20080313.bb new file mode 100644 index 0000000000..635fd0aa41 --- /dev/null +++ b/packages/hal/hal-info_20080313.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Hardware Abstraction Layer device information" +HOMEPAGE = "http://hal.freedesktop.org/" +SECTION = "unknown" +LICENSE = "GPL AFL" + +SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz" +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-recall --disable-video" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/hal/" diff --git a/packages/libnl/files/linux-header.patch b/packages/libnl/files/linux-header.patch new file mode 100644 index 0000000000..cecb38dc9e --- /dev/null +++ b/packages/libnl/files/linux-header.patch @@ -0,0 +1,24 @@ +Index: libnl-1.0-pre8/include/netlink/netlink.h +=================================================================== +--- libnl-1.0-pre8.orig/include/netlink/netlink.h 2007-11-21 18:25:39.000000000 +0100 ++++ libnl-1.0-pre8/include/netlink/netlink.h 2008-04-07 03:18:14.000000000 +0200 +@@ -24,7 +24,6 @@ + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + #include <linux/genetlink.h> +-#include <linux/ip_mp_alg.h> + #include <linux/netfilter/nfnetlink.h> + #include <netlink/types.h> + #include <netlink/handlers.h> +Index: libnl-1.0-pre8/lib/route/route_obj.c +=================================================================== +--- libnl-1.0-pre8.orig/lib/route/route_obj.c 2008-04-07 03:20:25.000000000 +0200 ++++ libnl-1.0-pre8/lib/route/route_obj.c 2008-04-07 03:20:35.000000000 +0200 +@@ -33,6 +33,7 @@ + * @{ + */ + ++#include <linux/ip_mp_alg.h> + #include <netlink-local.h> + #include <netlink/netlink.h> + #include <netlink/cache.h> diff --git a/packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch b/packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch new file mode 100644 index 0000000000..428df53a94 --- /dev/null +++ b/packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch @@ -0,0 +1,13 @@ +--- libnl-1.0-pre8/Makefile.opts.in.orig 2007-11-21 18:25:39.000000000 +0100 ++++ libnl-1.0-pre8/Makefile.opts.in 2008-04-04 23:38:40.000000000 +0200 +@@ -10,8 +10,8 @@ + # + + CC := @CC@ +-CFLAGS := @CFLAGS@ +-LDFLAGS := @LDFLAGS@ ++CFLAGS := -I./include -I. -I../include @CFLAGS@ ++LDFLAGS := + CPPFLAGS := @CPPFLAGS@ + PACKAGE_NAME := @PACKAGE_NAME@ + PACKAGE_VERSION := @PACKAGE_VERSION@ diff --git a/packages/libnl/libnl_1.0-pre8.bb b/packages/libnl/libnl_1.0-pre8.bb new file mode 100644 index 0000000000..e80b5aa4bd --- /dev/null +++ b/packages/libnl/libnl_1.0-pre8.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" +PRIORITY = "optional" +PV = "0.99+1.0-pre8" + +inherit autotools pkgconfig gpe + +SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \ + file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \ + file://linux-header.patch;patch=1 " + +S = "${WORKDIR}/${PN}-1.0-pre8" + +do_stage () { + autotools_stage_all prefix=${prefix} +} + diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc index ce819d64ac..2a0f28753f 100644 --- a/packages/networkmanager/networkmanager.inc +++ b/packages/networkmanager/networkmanager.inc @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools" RDEPENDS = "wpa-supplicant iproute2 dhcdbd" - -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ file://NetworkManager \ @@ -21,7 +20,7 @@ EXTRA_OECONF = " \ --without-gcrypt \ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/sbin/dhcdbd \ - --with-ip=/sbin/ip" + --with-ip=/sbin/ip.iproute2" inherit autotools pkgconfig @@ -48,13 +47,18 @@ fi /etc/init.d/populate-volatile.sh update } -PACKAGES =+ "libnmutil libnmglib" +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" FILES_libnmutil += "${libdir}/libnm-util.so.*" FILES_libnmglib += "${libdir}/libnm_glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*" -FILES_${PN} += "${datadir} \ - ${libexecdir}" +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so" +FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ " FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd " diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb index e6d21de286..2817124887 100644 --- a/packages/networkmanager/networkmanager_0.6.5.bb +++ b/packages/networkmanager/networkmanager_0.6.5.bb @@ -1,6 +1,6 @@ require networkmanager.inc -PR = "r0" +PR = "r2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ file://NetworkManager \ diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb index 610bd01e7e..e6bd318063 100644 --- a/packages/networkmanager/networkmanager_svn.bb +++ b/packages/networkmanager/networkmanager_svn.bb @@ -7,31 +7,31 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svnr${SRCREV}" -PR = "r2" +PR = "r5" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ file://no-restarts.diff;patch=1;pnum=0 \ file://25NetworkManager \ file://99_networkmanager" +S = "${WORKDIR}/trunk" + EXTRA_OECONF = " \ --with-distro=debian \ - --with-ip=/sbin/ip" -# TODO: will /bin/ip from busybox do? - -S = "${WORKDIR}/trunk" + --with-ip=/sbin/ip.iproute2" inherit autotools pkgconfig +do_stage () { + autotools_stage_all +} + do_install_append () { install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles install -d ${D}/etc/dbus-1/event.d install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d -} - -do_stage () { - autotools_stage_all + sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager } pkg_postinst () { @@ -41,15 +41,17 @@ pkg_postinst () { /etc/init.d/populate-volatile.sh update } -PACKAGES =+ "libnmutil libnmglib" +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" FILES_libnmutil += "${libdir}/libnm-util.so.*" - FILES_libnmglib += "${libdir}/libnm_glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so" +FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ " +FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd " -FILES_${PN}-dev = "${includedir}/* \ - ${libdir}/*.so \ - ${libdir}/*.a \ - ${libdir}/pkgconfig/*.pc \ - ${datadir}/NetworkManager/gdb-cmd \ - " diff --git a/packages/notification-daemon/files/notification-daemon-fix-text-color.diff b/packages/notification-daemon/files/notification-daemon-fix-text-color.diff new file mode 100644 index 0000000000..aacb507151 --- /dev/null +++ b/packages/notification-daemon/files/notification-daemon-fix-text-color.diff @@ -0,0 +1,44 @@ +--- notification-daemon-0.3.7.orig/src/themes/standard/theme.c 2007-01-26 04:20:15.000000000 +0000 ++++ notification-daemon-0.3.7/src/themes/standard/theme.c 2008-04-18 12:14:33.000000000 +0100 +@@ -653,6 +653,23 @@ + return FALSE; + } + ++ ++static void ++style_set_cb (GtkWidget *label, GtkStyle *previous_style, WindowData *windata) ++{ ++ static gboolean in_style_set_cb; ++ ++ if (in_style_set_cb) ++ return; ++ ++ in_style_set_cb = TRUE; ++ ++ gtk_widget_modify_fg (label, GTK_STATE_NORMAL, ++ &label->style->text[GTK_STATE_NORMAL]); ++ ++ in_style_set_cb = FALSE; ++} ++ + GtkWindow * + create_notification(UrlClickedCb url_clicked) + { +@@ -753,6 +770,8 @@ + gtk_widget_set_size_request(spacer, SPACER_LEFT, -1); + + windata->summary_label = gtk_label_new(NULL); ++ g_signal_connect(windata->summary_label, "style-set", ++ G_CALLBACK(style_set_cb), windata); + gtk_widget_show(windata->summary_label); + gtk_box_pack_start(GTK_BOX(hbox), windata->summary_label, TRUE, TRUE, 0); + gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0); +@@ -800,6 +819,8 @@ + gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0); + + windata->body_label = sexy_url_label_new(); ++ g_signal_connect(windata->body_label, "style-set", ++ G_CALLBACK(style_set_cb), windata); + gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0); + gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0); + gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE); diff --git a/packages/notification-daemon/notification-daemon_0.3.7.bb b/packages/notification-daemon/notification-daemon_0.3.7.bb index d86c2f48e8..4f38ea9ff9 100644 --- a/packages/notification-daemon/notification-daemon_0.3.7.bb +++ b/packages/notification-daemon/notification-daemon_0.3.7.bb @@ -3,8 +3,10 @@ HOMEPAGE = "http://www.galago-project.org/" SECTION = "x11" LICENSE = "GPL" DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" +PR = "r1" -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ + file://notification-daemon-fix-text-color.diff;patch=1" EXTRA_OECONF = "--disable-binreloc" diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb index 987d44070d..32c976df7a 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/packages/openmoko-projects/assassin_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Action GUI for Installer" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" -PV = "0.2+svn${SRCREV}" -PR = "r4" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet" +PV = "0.2+svnr${SRCREV}" +PR = "r6" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" diff --git a/packages/openmoko-projects/diversity-daemon/.mtn2git_empty b/packages/openmoko-projects/diversity-daemon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko-projects/diversity-daemon/.mtn2git_empty diff --git a/packages/openmoko-projects/diversity-daemon/no-xmmp.patch b/packages/openmoko-projects/diversity-daemon/no-xmmp.patch new file mode 100644 index 0000000000..2065e97dce --- /dev/null +++ b/packages/openmoko-projects/diversity-daemon/no-xmmp.patch @@ -0,0 +1,24 @@ +Index: diversity-xmpp-backend/Makefile.am +=================================================================== +--- a/diversity-xmpp-backend/Makefile.am (revision 276) ++++ a/diversity-xmpp-backend/Makefile.am (working copy) +@@ -1,3 +1,4 @@ ++if HAVE_XMPP + INCLUDES = -I${top_srcdir}/include + + AM_CPPFLAGS = \ +@@ -4,9 +5,7 @@ + $(GLIB_CFLAGS) \ + $(LM_CFLAGS) + +-if HAVE_XMPP + noinst_LTLIBRARIES = libdiversity-xmpp-backend.la +-endif + + noinst_HEADERS = diversity-xmpp-backend.h + +@@ -48,3 +47,4 @@ + + xmpp-marshal.h: xmpp-marshal.list + $(GLIB_GENMARSHAL) --prefix xmpp_marshal --header $< > $@ ++endif diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 8ffcdc5038..43c1d0a1b9 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -3,11 +3,12 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "network/misc" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" -RDEPENDS_${PN} = "eds-dbus openmoko-dialer2" +RDEPENDS_${PN} = "eds-dbus" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \ + file://no-xmmp.patch;patch=1;minrev=276" S = "${WORKDIR}/diversity-daemon" inherit autotools pkgconfig diff --git a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb new file mode 100644 index 0000000000..c882963fb2 --- /dev/null +++ b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb @@ -0,0 +1,7 @@ +PR = "r0" + +require diversity-maps.inc + +MAP_NAME = "Taipei" +MAP_FN = "taipei.eet" +MAP_VER = "${PV}" diff --git a/packages/openmoko-projects/diversity-maps.inc b/packages/openmoko-projects/diversity-maps.inc new file mode 100644 index 0000000000..9af5e95d95 --- /dev/null +++ b/packages/openmoko-projects/diversity-maps.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Diversity Maps - ${MAP_NAME}" +HOMEPAGE = "http://diversity.projects.openmoko.org/" +SECTION = "network/misc" +LICENSE = "Creative Commons Attribution-ShareAlike 2.0" + +SRC_URI = "http://people.openmoko.org/olv/diversity/${MAP_VER}/${MAP_FN}" + +MAP_DIR = "${datadir}/diversity-nav/maps" +FILES_${PN} = "${MAP_DIR}/${MAP_FN}" + +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" +PKG_TAGS_${PN} = "group::maps" + +do_install() { + install -d ${D}${MAP_DIR} + cp -f ${WORKDIR}/${MAP_FN} ${D}${MAP_DIR} +} diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb index 8d1af02d3a..9f839c5c5e 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Diversity_nav - a GPS location based communicative application" HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "openmoko/applications" LICENSE = "GPL" -DEPENDS = "evas edje ecore edbus ewl" -RDEPENDS_${PN} = "diversity-daemon ewl-themes" +DEPENDS = "evas edje ecore edbus etk" +RDEPENDS_${PN} = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" diff --git a/packages/openmoko-projects/enlazar_svn.bb b/packages/openmoko-projects/enlazar_svn.bb new file mode 100644 index 0000000000..38fdab4747 --- /dev/null +++ b/packages/openmoko-projects/enlazar_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Enlazar - Network part for Assasin" +HOMEPAGE = "http://enlazar.projects.openmoko.org/" +LICENSE = "GPL" +DEPENDS = "evas edje ecore edbus" +RDEPENDS = "networkmanager" +PV = "0.1+svn${SRCREV}" +PR = "r3" +PE = "1" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http" + +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + +EXTRA_OECONF = "" diff --git a/packages/openmoko-projects/illume-theme_svn.bb b/packages/openmoko-projects/illume-theme_svn.bb new file mode 100644 index 0000000000..b360d3b14a --- /dev/null +++ b/packages/openmoko-projects/illume-theme_svn.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Illume - Mobile UI module for Enlightenment" +HOMEPAGE = "http://illume.projects.openmoko.org/" +LICENSE = "MIT/BSD" + +PACKAGE_ARCH="all" +PV = "0.0+svnr${SRCREV}" +PR = "r4" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https" +S = "${WORKDIR}/illume" + +python do_unpack_append() { + bb.note("Unpacking to %s" % os.getcwd()) + os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz") +} + +CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile" +FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment" + +do_install() { + install -d ${D}${sysconfdir}/enlightenment + install -d ${D}${datadir}/enlightenment/data/themes/ + install -d ${D}${datadir}/enlightenment/data/config/ + + # Make illume the default profile + echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile + + install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/ + cp -pPR ${S}/.e/e/config/default ${D}${datadir}/enlightenment/data/config/illume +} diff --git a/packages/openmoko-projects/illume/illume-fix-includes.patch b/packages/openmoko-projects/illume/illume-fix-includes.patch deleted file mode 100644 index 74418b31de..0000000000 --- a/packages/openmoko-projects/illume/illume-fix-includes.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: src/e_mod_win.c -=================================================================== ---- src/e_mod_win.c (revision 14) -+++ src/e_mod_win.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_mod_win.h" - #include "e_slipshelf.h" - #include "e_slipwin.h" -Index: src/e_kbd.c -=================================================================== ---- src/e_kbd.c (revision 14) -+++ src/e_kbd.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_kbd.h" - - /* internal calls */ -Index: src/e_slip.c -=================================================================== ---- src/e_slip.c (revision 14) -+++ src/e_slip.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_slip.h" - - EAPI int E_EVENT_SLIP_DEL = 0; -Index: src/e_mod_layout.c -=================================================================== ---- src/e_mod_layout.c (revision 14) -+++ src/e_mod_layout.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_mod_main.h" - #include "e_mod_layout.h" - -Index: src/e_mod_main.c -=================================================================== ---- src/e_mod_main.c (revision 14) -+++ src/e_mod_main.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - - #include "e_kbd.h" - #include "e_slipshelf.h" -Index: src/e_slipwin.c -=================================================================== ---- src/e_slipwin.c (revision 14) -+++ src/e_slipwin.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_slipwin.h" - - EAPI int E_EVENT_SLIPWIN_DEL = 0; -Index: src/e_slipshelf.c -=================================================================== ---- src/e_slipshelf.c (revision 14) -+++ src/e_slipshelf.c (working copy) -@@ -1,4 +1,4 @@ --#include <e.h> -+#include <enlightenment/e.h> - #include "e_slipshelf.h" - - /* FIXME: break out gadcons for 2 swallow areas */ diff --git a/packages/openmoko-projects/illume/keyboard.patch b/packages/openmoko-projects/illume/keyboard.patch new file mode 100644 index 0000000000..320e798a3e --- /dev/null +++ b/packages/openmoko-projects/illume/keyboard.patch @@ -0,0 +1,89 @@ +Index: configure.in +=================================================================== +--- configure.in (Revision 17) ++++ configure.in (Arbeitskopie) +@@ -28,6 +28,9 @@ + AC_SUBST(LOCALEDIR, "${localedir}") + AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory") + ++keyboarddir="${datarootdir}/${PACKAGE}/keyboard" ++AC_SUBST(keyboarddir) ++ + # + # Check EFL Libs + # +Index: src/e_kbd.c +=================================================================== +--- src/e_kbd.c (Revision 17) ++++ src/e_kbd.c (Arbeitskopie) +@@ -57,6 +57,7 @@ + + static int _e_kbd_config_parse(E_Kbd *kbd, const char *config); + static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group); ++static char* _e_kbd_get_default_path(void); + + /* state */ + +@@ -470,7 +471,7 @@ + edje_object_part_swallow(kbd->base_obj, "e.swallow.content", o); + evas_object_show(o); + kbd->layout_obj = o; +- _e_kbd_config_parse(kbd, "/home/raster/work/illume/default.kbd"); ++ _e_kbd_config_parse(kbd, _e_kbd_get_default_path()); + _e_kbd_layout_build(kbd); + + edje_object_size_min_calc(kbd->base_obj, &mw, &mh); +@@ -744,3 +745,26 @@ + } + return o; + } ++ ++/* ++ * Return the to be used keyboard file ++ */ ++static char * ++_e_kbd_get_default_path() ++{ ++ static char *buf = 0; ++ ++ if (getenv("ILLUME_KEYBOARD_DIR")) ++ { ++ if (!buf) ++ { ++ buf = (char*)malloc(sizeof(char)*PATH_MAX); ++ } ++ ++ snprintf(buf, PATH_MAX, "%s/default.kbd", getenv("ILLUME_KEYBOARD_DIR")); ++ return buf; ++ } ++ ++ ++ return KEYBOARDDIR"/default.kbd"; ++} +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (Revision 17) ++++ src/Makefile.am (Arbeitskopie) +@@ -1,6 +1,8 @@ + ACLOCAL_AMFLAGS = -I m4 + MAINTAINERCLEANFILES = Makefile.in + ++AM_CPPFLAGS = -DKEYBOARDDIR=\"$(keyboarddir)\" ++ + INCLUDES = -I. \ + -I$(top_srcdir) \ + @e_cflags@ +Index: Makefile.am +=================================================================== +--- Makefile.am (Revision 17) ++++ Makefile.am (Arbeitskopie) +@@ -14,6 +14,9 @@ + files_DATA = module.desktop \ + e-module-illume.edj \ + illume.edj ++ ++keybddir = $(keyboarddir) ++keybd_DATA = default.kbd + + EXTRA_DIST = $(files_DATA) \ + illume.edc \ diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index f93108dca4..5136240568 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -1,14 +1,13 @@ DESCRIPTION = "Illume - Mobile UI module for Enlightenment" HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" - DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" - +RRECOMMENDS = "wamerican" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r3" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ - file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14" + file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20" S = "${WORKDIR}/${PN}" @@ -16,18 +15,11 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ + --enable-simple-x11 \ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" -export CFLAGS += "-DE_TYPEDEFS=1" - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \ ${libdir}/enlightenment/modules/*/*.desktop \ - ${libdir}/enlightenment/modules/*/*/*" - + ${libdir}/enlightenment/modules/*/*/* \ + ${datadir}/${PN} " FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" diff --git a/packages/openmoko-tools/pty-forward-native.bb b/packages/openmoko-tools/pty-forward-native.bb new file mode 100644 index 0000000000..972070d6b6 --- /dev/null +++ b/packages/openmoko-tools/pty-forward-native.bb @@ -0,0 +1,24 @@ +LICENSE="GPL" +SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S = "${WORKDIR}/serial_forward" + +inherit native + +do_compile() { + cd ${S} + oe_runmake +} + +do_stage() { + : +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward +} + +addtask deploy before do_package after do_install + diff --git a/packages/openmoko-tools/serial-forward.bb b/packages/openmoko-tools/serial-forward.bb new file mode 100644 index 0000000000..3cc33770d6 --- /dev/null +++ b/packages/openmoko-tools/serial-forward.bb @@ -0,0 +1,15 @@ +LICENSE="GPL" +SUMMARY="Forward a serial using TCP/IP" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S="${WORKDIR}/serial_forward" + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/forward ${D}/${bindir}/${PN} +} diff --git a/packages/openmoko2/openmoko-alsa-scenarios.bb b/packages/openmoko2/openmoko-alsa-scenarios.bb index 7aa76a8443..08531e898e 100644 --- a/packages/openmoko2/openmoko-alsa-scenarios.bb +++ b/packages/openmoko2/openmoko-alsa-scenarios.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Package for the different scenarios used by OpenMoko" +DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" PV = "1.0+svnr${SRCREV}" PR = "r1" diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb index 6d8349313f..c7f3066946 100644 --- a/packages/openmoko2/openmoko-browser2_svn.bb +++ b/packages/openmoko2/openmoko-browser2_svn.bb @@ -5,6 +5,7 @@ PV = "0.0.1+svnr${SRCREV}" PR = "r2" inherit openmoko2 +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" diff --git a/packages/openssl/openssl-0.9.7m/.mtn2git_empty b/packages/openssl/openssl-0.9.7m/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/.mtn2git_empty diff --git a/packages/openssl/openssl-0.9.7m/armeb.patch b/packages/openssl/openssl-0.9.7m/armeb.patch new file mode 100644 index 0000000000..7539506949 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/armeb.patch @@ -0,0 +1,18 @@ +--- Configure.orig 2006-03-22 16:29:20.000000000 +0100 ++++ Configure 2006-03-22 16:31:44.000000000 +0100 +@@ -395,6 +395,7 @@ + "debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + #"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + #"debian-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -474,6 +475,7 @@ + # ARM comes in both little- and big-endian flavors. The following line is + # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN... + "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + # SCO/Caldera targets. + # diff --git a/packages/openssl/openssl-0.9.7m/avr32.patch b/packages/openssl/openssl-0.9.7m/avr32.patch new file mode 100644 index 0000000000..b6ac81b717 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/avr32.patch @@ -0,0 +1,10 @@ +--- Configure~ 2008-01-23 17:44:04.000000000 +0100 ++++ Configure 2008-01-23 17:44:04.000000000 +0100 +@@ -442,6 +442,7 @@ + "linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc32.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # -bpowerpc64-linux is transient option, -m64 should be the one to use... ++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", + "linux-ppc64", "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::", + "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/packages/openssl/openssl-0.9.7m/debian.patch b/packages/openssl/openssl-0.9.7m/debian.patch new file mode 100644 index 0000000000..f5fd51bf36 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/debian.patch @@ -0,0 +1,832 @@ +Index: openssl-0.9.7m/tools/c_rehash.in +=================================================================== +--- openssl-0.9.7m.orig/tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200 ++++ openssl-0.9.7m/tools/c_rehash.in 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + + # Perl c_rehash script, scan all files in a directory +Index: openssl-0.9.7m/tools/c_rehash +=================================================================== +--- openssl-0.9.7m.orig/tools/c_rehash 2007-02-23 13:52:38.000000000 +0100 ++++ openssl-0.9.7m/tools/c_rehash 2008-04-12 02:37:45.000000000 +0200 +@@ -6,7 +6,7 @@ + + my $openssl; + +-my $dir = "/usr/local/ssl"; ++my $dir = "/usr/lib/ssl"; + + if(defined $ENV{OPENSSL}) { + $openssl = $ENV{OPENSSL}; +Index: openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S +=================================================================== +--- openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S 2003-05-30 00:22:34.000000000 +0200 ++++ openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S 2008-04-12 02:37:45.000000000 +0200 +@@ -74,14 +74,14 @@ + #define Dval R8 + + #if defined(MD5_BLOCK_DATA_ORDER) +-# if defined(OPENSSL_SYSNAME_ULTRASPARC) ++/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/ + # define LOAD lda + # define X(i) [%i1+i*4]%asi + # define md5_block md5_block_asm_data_order_aligned + # define ASI_PRIMARY_LITTLE 0x88 +-# else ++/*# else + # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!" +-# endif ++# endif*/ + #else + # define LOAD ld + # define X(i) [%i1+i*4] +Index: openssl-0.9.7m/crypto/pkcs7/pk7_mime.c +=================================================================== +--- openssl-0.9.7m.orig/crypto/pkcs7/pk7_mime.c 2005-05-01 14:47:33.000000000 +0200 ++++ openssl-0.9.7m/crypto/pkcs7/pk7_mime.c 2008-04-12 02:37:45.000000000 +0200 +@@ -297,9 +297,9 @@ + + if(strcmp(hdr->value, "application/x-pkcs7-signature") && + strcmp(hdr->value, "application/pkcs7-signature")) { +- sk_MIME_HEADER_pop_free(headers, mime_hdr_free); + PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE); + ERR_add_error_data(2, "type: ", hdr->value); ++ sk_MIME_HEADER_pop_free(headers, mime_hdr_free); + sk_BIO_pop_free(parts, BIO_vfree); + return NULL; + } +Index: openssl-0.9.7m/crypto/dsa/dsa_ossl.c +=================================================================== +--- openssl-0.9.7m.orig/crypto/dsa/dsa_ossl.c 2006-09-28 13:53:49.000000000 +0200 ++++ openssl-0.9.7m/crypto/dsa/dsa_ossl.c 2008-04-12 02:37:45.000000000 +0200 +@@ -286,6 +286,18 @@ + return -1; + } + ++ if (BN_num_bits(dsa->q) != 160) ++ { ++ DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE); ++ return -1; ++ } ++ ++ if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) ++ { ++ DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE); ++ return -1; ++ } ++ + BN_init(&u1); + BN_init(&u2); + BN_init(&t1); +Index: openssl-0.9.7m/crypto/dsa/dsa.h +=================================================================== +--- openssl-0.9.7m.orig/crypto/dsa/dsa.h 2006-09-28 13:53:49.000000000 +0200 ++++ openssl-0.9.7m/crypto/dsa/dsa.h 2008-04-12 02:37:45.000000000 +0200 +@@ -83,6 +83,10 @@ + # define OPENSSL_DSA_MAX_MODULUS_BITS 10000 + #endif + ++#ifndef OPENSSL_DSA_MAX_MODULUS_BITS ++# define OPENSSL_DSA_MAX_MODULUS_BITS 10000 ++#endif ++ + #define DSA_FLAG_CACHE_MONT_P 0x01 + #define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA + * implementation now uses constant time +Index: openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl +=================================================================== +--- openssl-0.9.7m.orig/crypto/rc4/asm/rc4-x86_64.pl 2005-05-04 18:12:07.000000000 +0200 ++++ openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +Index: openssl-0.9.7m/crypto/asn1/charmap.pl +=================================================================== +--- openssl-0.9.7m.orig/crypto/asn1/charmap.pl 2000-07-28 03:58:11.000000000 +0200 ++++ openssl-0.9.7m/crypto/asn1/charmap.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + use strict; + +Index: openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl +=================================================================== +--- openssl-0.9.7m.orig/crypto/sha/asm/sha1-ia64.pl 2004-12-09 21:55:52.000000000 +0100 ++++ openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +Index: openssl-0.9.7m/crypto/bn/asm/ppc.pl +=================================================================== +--- openssl-0.9.7m.orig/crypto/bn/asm/ppc.pl 2005-07-03 11:24:35.000000000 +0200 ++++ openssl-0.9.7m/crypto/bn/asm/ppc.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # Implemented as a Perl wrapper as we want to support several different + # architectures with single file. We pick up the target based on the +Index: openssl-0.9.7m/crypto/rsa/rsa_eay.c +=================================================================== +--- openssl-0.9.7m.orig/crypto/rsa/rsa_eay.c 2006-12-04 21:41:46.000000000 +0100 ++++ openssl-0.9.7m/crypto/rsa/rsa_eay.c 2008-04-12 02:37:45.000000000 +0200 +@@ -336,6 +336,28 @@ + int local_blinding = 0; + BN_BLINDING *blinding = NULL; + ++ if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE); ++ return -1; ++ } ++ ++ if (BN_ucmp(rsa->n, rsa->e) <= 0) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_BAD_E_VALUE); ++ return -1; ++ } ++ ++ /* for large moduli, enforce exponent limit */ ++ if (BN_num_bits(rsa->n) > OPENSSL_RSA_SMALL_MODULUS_BITS) ++ { ++ if (BN_num_bits(rsa->e) > OPENSSL_RSA_MAX_PUBEXP_BITS) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_BAD_E_VALUE); ++ return -1; ++ } ++ } ++ + BN_init(&f); + BN_init(&ret); + +@@ -644,6 +666,28 @@ + } + } + ++ if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_MODULUS_TOO_LARGE); ++ return -1; ++ } ++ ++ if (BN_ucmp(rsa->n, rsa->e) <= 0) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_BAD_E_VALUE); ++ return -1; ++ } ++ ++ /* for large moduli, enforce exponent limit */ ++ if (BN_num_bits(rsa->n) > OPENSSL_RSA_SMALL_MODULUS_BITS) ++ { ++ if (BN_num_bits(rsa->e) > OPENSSL_RSA_MAX_PUBEXP_BITS) ++ { ++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_BAD_E_VALUE); ++ return -1; ++ } ++ } ++ + BN_init(&f); + BN_init(&ret); + ctx=BN_CTX_new(); +Index: openssl-0.9.7m/crypto/rsa/rsa.h +=================================================================== +--- openssl-0.9.7m.orig/crypto/rsa/rsa.h 2006-09-28 13:53:50.000000000 +0200 ++++ openssl-0.9.7m/crypto/rsa/rsa.h 2008-04-12 02:37:45.000000000 +0200 +@@ -165,6 +165,17 @@ + # define OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit enforced for "large" modulus only */ + #endif + ++#ifndef OPENSSL_RSA_MAX_MODULUS_BITS ++# define OPENSSL_RSA_MAX_MODULUS_BITS 16384 ++#endif ++ ++#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS ++# define OPENSSL_RSA_SMALL_MODULUS_BITS 3072 ++#endif ++#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS ++# define OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit enforced for "small" modulus only */ ++#endif ++ + #define RSA_3 0x3L + #define RSA_F4 0x10001L + +Index: openssl-0.9.7m/crypto/opensslconf.h +=================================================================== +--- openssl-0.9.7m.orig/crypto/opensslconf.h 2007-02-23 13:52:32.000000000 +0100 ++++ openssl-0.9.7m/crypto/opensslconf.h 2008-04-12 02:37:45.000000000 +0200 +@@ -4,17 +4,38 @@ + /* OpenSSL was configured with the following options: */ + #ifndef OPENSSL_DOING_MAKEDEPEND + ++#ifndef OPENSSL_NO_IDEA ++# define OPENSSL_NO_IDEA ++#endif ++#ifndef OPENSSL_NO_MDC2 ++# define OPENSSL_NO_MDC2 ++#endif ++#ifndef OPENSSL_NO_RC5 ++# define OPENSSL_NO_RC5 ++#endif + #ifndef OPENSSL_NO_KRB5 + # define OPENSSL_NO_KRB5 + #endif + + #endif /* OPENSSL_DOING_MAKEDEPEND */ ++#ifndef OPENSSL_THREADS ++# define OPENSSL_THREADS ++#endif + + /* The OPENSSL_NO_* macros are also defined as NO_* if the application + asks for it. This is a transient feature that is provided for those + who haven't had the time to do the appropriate changes in their + applications. */ + #ifdef OPENSSL_ALGORITHM_DEFINES ++# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) ++# define NO_IDEA ++# endif ++# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) ++# define NO_MDC2 ++# endif ++# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) ++# define NO_RC5 ++# endif + # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) + # define NO_KRB5 + # endif +@@ -27,7 +48,7 @@ + + #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ + #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +-#define OPENSSLDIR "/usr/local/ssl" ++#define OPENSSLDIR "/usr/lib/ssl" + #endif + #endif + +@@ -79,7 +100,7 @@ + + #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) + #define CONFIG_HEADER_BN_H +-#undef BN_LLONG ++#define BN_LLONG + + /* Should we define BN_DIV2W here? */ + +@@ -98,7 +119,7 @@ + #define CONFIG_HEADER_RC4_LOCL_H + /* if this is defined data[i] is used instead of *data, this is a %20 + * speedup on x86 */ +-#undef RC4_INDEX ++#define RC4_INDEX + #endif + + #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) +@@ -112,14 +133,14 @@ + /* the following is tweaked from a config script, that is why it is a + * protected undef/define */ + #ifndef DES_PTR +-#undef DES_PTR ++#define DES_PTR + #endif + + /* This helps C compiler generate the correct code for multiple functional + * units. It reduces register dependancies at the expense of 2 more + * registers */ + #ifndef DES_RISC1 +-#undef DES_RISC1 ++#define DES_RISC1 + #endif + + #ifndef DES_RISC2 +@@ -133,7 +154,7 @@ + /* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ + #ifndef DES_UNROLL +-#undef DES_UNROLL ++#define DES_UNROLL + #endif + + /* These default values were supplied by +Index: openssl-0.9.7m/ms/fipscheck.pl +=================================================================== +--- openssl-0.9.7m.orig/ms/fipscheck.pl 2006-01-28 14:34:27.000000000 +0100 ++++ openssl-0.9.7m/ms/fipscheck.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + + # fipscheck.pl + # sample perl script to check integrity of critical FIPS files +Index: openssl-0.9.7m/Configure +=================================================================== +--- openssl-0.9.7m.orig/Configure 2007-02-22 23:30:49.000000000 +0100 ++++ openssl-0.9.7m/Configure 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-: ++#!/usr/local/bin/perl + eval 'exec perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + ## +@@ -390,6 +390,43 @@ + # assembler versions -- currently defunct: + ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}", + ++# Debian GNU/* (various architectures) ++"debian-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC", ++"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the + # bn86-elf.o file file since it is hand tweaked assembler. + "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +Index: openssl-0.9.7m/os2/backwardify.pl +=================================================================== +--- openssl-0.9.7m.orig/os2/backwardify.pl 2003-11-28 15:51:17.000000000 +0100 ++++ openssl-0.9.7m/os2/backwardify.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/local/bin/perl + use strict; + + # Use as $0 +Index: openssl-0.9.7m/Makefile.org +=================================================================== +--- openssl-0.9.7m.orig/Makefile.org 2007-01-16 20:30:19.000000000 +0100 ++++ openssl-0.9.7m/Makefile.org 2008-04-12 02:37:45.000000000 +0200 +@@ -57,6 +57,7 @@ + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + ++#TOP=$(shell pwd) + CC= gcc + #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM + CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM +@@ -195,7 +196,7 @@ + # we might set SHLIB_MARK to '$(SHARED_LIBS)'. + SHLIB_MARK= + +-DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools ++DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps doc tools + SHLIBDIRS= crypto ssl + + # dirs in crypto to build +@@ -214,10 +215,10 @@ + + MAKEFILE= Makefile + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=/usr/share/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl + SHELL=/bin/sh + + TOP= . +Index: openssl-0.9.7m/util/selftest.pl +=================================================================== +--- openssl-0.9.7m.orig/util/selftest.pl 2005-06-20 22:45:44.000000000 +0200 ++++ openssl-0.9.7m/util/selftest.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # + # Run the test suite and generate a report + # +Index: openssl-0.9.7m/util/extract-names.pl +=================================================================== +--- openssl-0.9.7m.orig/util/extract-names.pl 2004-03-25 20:52:36.000000000 +0100 ++++ openssl-0.9.7m/util/extract-names.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + + $/ = ""; # Eat a paragraph at once. + while(<STDIN>) { +Index: openssl-0.9.7m/util/checkhash.pl +=================================================================== +--- openssl-0.9.7m.orig/util/checkhash.pl 2005-05-26 23:29:03.000000000 +0200 ++++ openssl-0.9.7m/util/checkhash.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl -w ++#!/usr/local/bin/perl + + my $package = caller; + +Index: openssl-0.9.7m/util/clean-depend.pl +=================================================================== +--- openssl-0.9.7m.orig/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200 ++++ openssl-0.9.7m/util/clean-depend.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # Clean the dependency list in a makefile of standard includes... + # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 + +Index: openssl-0.9.7m/util/mkerr.pl +=================================================================== +--- openssl-0.9.7m.orig/util/mkerr.pl 2006-11-21 20:19:09.000000000 +0100 ++++ openssl-0.9.7m/util/mkerr.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + my $config = "crypto/err/openssl.ec"; + my $debug = 0; +Index: openssl-0.9.7m/util/mkdef.pl +=================================================================== +--- openssl-0.9.7m.orig/util/mkdef.pl 2006-02-05 00:05:40.000000000 +0100 ++++ openssl-0.9.7m/util/mkdef.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # + # generate a .def file + # +Index: openssl-0.9.7m/util/mkstack.pl +=================================================================== +--- openssl-0.9.7m.orig/util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200 ++++ openssl-0.9.7m/util/mkstack.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + # This is a utility that searches out "DECLARE_STACK_OF()" + # declarations in .h and .c files, and updates/creates/replaces +Index: openssl-0.9.7m/util/pod2man.pl +=================================================================== +--- openssl-0.9.7m.orig/util/pod2man.pl 2005-06-18 06:27:11.000000000 +0200 ++++ openssl-0.9.7m/util/pod2man.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-: #!/usr/bin/perl-5.005 ++#!/usr/local/bin/perl + eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + +Index: openssl-0.9.7m/util/fipslink.pl +=================================================================== +--- openssl-0.9.7m.orig/util/fipslink.pl 2006-02-06 00:49:06.000000000 +0100 ++++ openssl-0.9.7m/util/fipslink.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + + sub check_env + { +Index: openssl-0.9.7m/config +=================================================================== +--- openssl-0.9.7m.orig/config 2007-01-16 14:48:16.000000000 +0100 ++++ openssl-0.9.7m/config 2008-04-12 02:37:45.000000000 +0200 +@@ -179,8 +179,8 @@ + echo "${MACHINE}-whatever-linux1"; exit 0 + ;; + +- GNU*) +- echo "hurd-x86"; exit 0; ++ GNU:*|GNU/*:*) ++ echo "${MACHINE}-gnuish"; exit 0; + ;; + + LynxOS:*) +Index: openssl-0.9.7m/doc/Makefile +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ openssl-0.9.7m/doc/Makefile 2008-04-12 02:37:45.000000000 +0200 +@@ -0,0 +1,40 @@ ++VERSION = ++ ++#PODS = $(wildcard *.pod) ++#MANS = $(addsuffix .man, $(basename $(PODS))) ++ ++MANS = openssl.1 ssl.3 crypto.3 ++ ++P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)" ++ ++all: manpages ++ ++.PHONY: manpages ++ ++manpages: openssl.1 crypto.3 ssl.3 ++ ++openssl.1: ++ $(P2M) --section=1 openssl.pod > openssl.1 ++ ++crypto.3: ++ $(P2M) --section=3 crypto.pod > crypto.3 ++ ++ssl.3: ++ $(P2M) --section=3 ssl.pod > ssl.3 ++ ++.PHONY: install ++install: ++ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1 ++ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1 ++ install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ rm -f $(MANS) ++ ++.PHONY: clean ++clean: ++ rm -f $(MANS) ++ ++.PHONY: realclean ++realclean: ++ -$(MAKE) clean +Index: openssl-0.9.7m/Makefile +=================================================================== +--- openssl-0.9.7m.orig/Makefile 2007-02-23 13:52:32.000000000 +0100 ++++ openssl-0.9.7m/Makefile 2008-04-12 02:46:16.000000000 +0200 +@@ -11,11 +11,11 @@ + SHLIB_VERSION_HISTORY= + SHLIB_MAJOR=0 + SHLIB_MINOR=9.7 +-SHLIB_EXT= +-PLATFORM=dist +-OPTIONS= no-krb5 +-CONFIGURE_ARGS=dist +-SHLIB_TARGET= ++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) ++PLATFORM=debian-i386 ++OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug no-krb5 ++CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug debian-i386 ++SHLIB_TARGET=linux-shared + + # HERE indicates where this Makefile lives. This can be used to indicate + # where sub-Makefiles are expected to be. Currently has very limited usage, +@@ -26,10 +26,10 @@ + # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. + # Normally it is left empty. + INSTALL_PREFIX= +-INSTALLTOP=/usr/local/ssl ++INSTALLTOP=/usr + + # Do not edit this manually. Use Configure --openssldir=DIR do change this! +-OPENSSLDIR=/usr/local/ssl ++OPENSSLDIR=/usr/lib/ssl + + # NO_IDEA - Define to build without the IDEA algorithm + # NO_RC4 - Define to build without the RC4 algorithm +@@ -59,12 +59,12 @@ + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +-CC= cc ++CC= gcc + #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM +-CFLAG= -DOPENSSL_NO_KRB5 -O +-DEPFLAG= ++CFLAG= -DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DL_ENDIAN -DTERMIO -O3 -Wall -g ++DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 + PEX_LIBS= +-EX_LIBS= ++EX_LIBS= -ldl + EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r +@@ -72,7 +72,7 @@ + PERL= /usr/bin/perl + TAR= tar + TARFLAGS= --no-recursion +-MAKEDEPPROG=makedepend ++MAKEDEPPROG= gcc + + # We let the C compiler driver to take care of .s files. This is done in + # order to be excused from maintaining a separate set of architecture +@@ -197,13 +197,13 @@ + # we might set SHLIB_MARK to '$(SHARED_LIBS)'. + SHLIB_MARK= + +-DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools ++DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps doc tools + SHLIBDIRS= crypto ssl + + # dirs in crypto to build + SDIRS= objects \ +- md2 md4 md5 sha mdc2 hmac ripemd \ +- des rc2 rc4 rc5 idea bf cast \ ++ md2 md4 md5 sha hmac ripemd \ ++ des rc2 rc4 bf cast \ + bn ec rsa dsa dh dso engine aes \ + buffer bio stack lhash rand err \ + evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 +@@ -216,10 +216,10 @@ + + MAKEFILE= Makefile + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=/usr/share/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl + SHELL=/bin/sh + + TOP= . +@@ -230,7 +230,7 @@ + SHARED_CRYPTO=libcrypto$(SHLIB_EXT) + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_LIBS= +-SHARED_LIBS_LINK_EXTS= ++SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so + SHARED_LDFLAGS= + + GENERAL= Makefile +Index: openssl-0.9.7m/VMS/VMSify-conf.pl +=================================================================== +--- openssl-0.9.7m.orig/VMS/VMSify-conf.pl 2004-05-13 23:38:23.000000000 +0200 ++++ openssl-0.9.7m/VMS/VMSify-conf.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/local/bin/perl + + use strict; + use warnings; +Index: openssl-0.9.7m/ssl/ssl_lib.c +=================================================================== +--- openssl-0.9.7m.orig/ssl/ssl_lib.c 2006-09-28 13:53:51.000000000 +0200 ++++ openssl-0.9.7m/ssl/ssl_lib.c 2008-04-12 02:48:25.000000000 +0200 +@@ -1169,7 +1169,6 @@ + char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) + { + char *p; +- const char *cp; + STACK_OF(SSL_CIPHER) *sk; + SSL_CIPHER *c; + int i; +@@ -1182,20 +1181,21 @@ + sk=s->session->ciphers; + for (i=0; i<sk_SSL_CIPHER_num(sk); i++) + { +- /* Decrement for either the ':' or a '\0' */ +- len--; ++ int n; ++ + c=sk_SSL_CIPHER_value(sk,i); +- for (cp=c->name; *cp; ) ++ n=strlen(c->name); ++ if (n+1 > len) + { +- if (len-- <= 0) +- { +- *p='\0'; +- return(buf); +- } +- else +- *(p++)= *(cp++); ++ if (p != buf) ++ --p; ++ *p='\0'; ++ return buf; + } ++ strcpy(p,c->name); ++ p+=n; + *(p++)=':'; ++ len-=n+1; + } + p[-1]='\0'; + return(buf); +Index: openssl-0.9.7m/ssl/ssl_algs.c +=================================================================== +--- openssl-0.9.7m.orig/ssl/ssl_algs.c 2001-02-20 09:11:58.000000000 +0100 ++++ openssl-0.9.7m/ssl/ssl_algs.c 2008-04-12 02:37:45.000000000 +0200 +@@ -109,3 +109,8 @@ + return(1); + } + ++#undef SSLeay_add_ssl_algorithms ++int SSLeay_add_ssl_algorithms(void) ++ { ++ return SSL_library_init(); ++ } +Index: openssl-0.9.7m/demos/tunala/configure.in +=================================================================== +--- openssl-0.9.7m.orig/demos/tunala/configure.in 2002-01-08 03:58:54.000000000 +0100 ++++ openssl-0.9.7m/demos/tunala/configure.in 2008-04-12 02:37:45.000000000 +0200 +@@ -1,4 +1,4 @@ +-dnl Process this file with autoconf to produce a configure script. ++#!/usr/local/bin/perl + AC_INIT(tunala.c) + AM_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE(tunala, 0.0.1-dev) +Index: openssl-0.9.7m/apps/CA.pl +=================================================================== +--- openssl-0.9.7m.orig/apps/CA.pl 2007-02-23 13:52:38.000000000 +0100 ++++ openssl-0.9.7m/apps/CA.pl 2008-04-12 02:37:45.000000000 +0200 +@@ -63,6 +63,7 @@ + foreach (@ARGV) { + if ( /^(-\?|-h|-help)$/ ) { + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 0; + } elsif (/^-newcert$/) { + # create a certificate +@@ -159,6 +160,7 @@ + } else { + print STDERR "Unknown arg $_\n"; + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 1; + } + } +Index: openssl-0.9.7m/apps/CA.pl.in +=================================================================== +--- openssl-0.9.7m.orig/apps/CA.pl.in 2005-07-04 23:44:19.000000000 +0200 ++++ openssl-0.9.7m/apps/CA.pl.in 2008-04-12 02:37:45.000000000 +0200 +@@ -63,6 +63,7 @@ + foreach (@ARGV) { + if ( /^(-\?|-h|-help)$/ ) { + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 0; + } elsif (/^-newcert$/) { + # create a certificate +@@ -159,6 +160,7 @@ + } else { + print STDERR "Unknown arg $_\n"; + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 1; + } + } +Index: openssl-0.9.7m/apps/progs.h +=================================================================== +--- openssl-0.9.7m.orig/apps/progs.h 2004-06-19 15:54:59.000000000 +0200 ++++ openssl-0.9.7m/apps/progs.h 2008-04-12 02:37:45.000000000 +0200 +@@ -35,11 +35,9 @@ + extern int spkac_main(int argc,char *argv[]); + extern int smime_main(int argc,char *argv[]); + extern int rand_main(int argc,char *argv[]); +-extern int prime_main(int argc,char *argv[]); +-#ifndef OPENSSL_NO_ENGINE + extern int engine_main(int argc,char *argv[]); +-#endif + extern int ocsp_main(int argc,char *argv[]); ++extern int prime_main(int argc,char *argv[]); + + #define FUNC_TYPE_GENERAL 1 + #define FUNC_TYPE_MD 2 +@@ -95,9 +93,7 @@ + #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) + {FUNC_TYPE_GENERAL,"s_client",s_client_main}, + #endif +-#ifndef OPENSSL_NO_SPEED + {FUNC_TYPE_GENERAL,"speed",speed_main}, +-#endif + #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) + {FUNC_TYPE_GENERAL,"s_time",s_time_main}, + #endif +@@ -116,11 +112,9 @@ + {FUNC_TYPE_GENERAL,"spkac",spkac_main}, + {FUNC_TYPE_GENERAL,"smime",smime_main}, + {FUNC_TYPE_GENERAL,"rand",rand_main}, +- {FUNC_TYPE_GENERAL,"prime",prime_main}, +-#ifndef OPENSSL_NO_ENGINE + {FUNC_TYPE_GENERAL,"engine",engine_main}, +-#endif + {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, ++ {FUNC_TYPE_GENERAL,"prime",prime_main}, + #ifndef OPENSSL_NO_MD2 + {FUNC_TYPE_MD,"md2",dgst_main}, + #endif diff --git a/packages/openssl/openssl-0.9.7m/gnueabi-arm.patch b/packages/openssl/openssl-0.9.7m/gnueabi-arm.patch new file mode 100644 index 0000000000..be0adbdea7 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/gnueabi-arm.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- openssl-0.9.7e/Configure~gnueabi-arm 2006-03-19 21:04:31.000000000 +0100 ++++ openssl-0.9.7e/Configure 2006-03-19 21:07:22.000000000 +0100 +@@ -462,6 +462,7 @@ + # Linux on ARM + "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + # SCO/Caldera targets. + # diff --git a/packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch b/packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch new file mode 100644 index 0000000000..38f725b789 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch @@ -0,0 +1,10 @@ +--- openssl-0.9.7g/Configure~ 2007-07-07 21:08:27.000000000 +0930 ++++ openssl-0.9.7g/Configure 2007-07-07 21:13:41.000000000 +0930 +@@ -477,6 +477,7 @@ + "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + # SCO/Caldera targets. + # diff --git a/packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch b/packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch new file mode 100644 index 0000000000..d89bfdeec9 --- /dev/null +++ b/packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch @@ -0,0 +1,12 @@ +--- /tmp/Configure.patched 2007-08-27 18:34:23.412489103 +0200 ++++ openssl-0.9.7g/Configure 2007-08-27 18:35:05.134866725 +0200 +@@ -478,6 +478,9 @@ + "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibcgnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibcgnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + + # SCO/Caldera targets. + # diff --git a/packages/openssl/openssl-0.9.8g/.mtn2git_empty b/packages/openssl/openssl-0.9.8g/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openssl/openssl-0.9.8g/.mtn2git_empty diff --git a/packages/openssl/openssl-0.9.8g/configure-targets.patch b/packages/openssl/openssl-0.9.8g/configure-targets.patch new file mode 100644 index 0000000000..b68123a233 --- /dev/null +++ b/packages/openssl/openssl-0.9.8g/configure-targets.patch @@ -0,0 +1,24 @@ + +The number of colons are important :) + +Index: openssl-0.9.8g/Configure +=================================================================== +--- openssl-0.9.8g.orig/Configure 2008-04-12 04:27:22.000000000 +0200 ++++ openssl-0.9.8g/Configure 2008-04-12 04:38:56.000000000 +0200 +@@ -395,6 +395,16 @@ + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", + ++ # Linux on ARM ++"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibcgnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibcgnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ ++"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", ++ + #### *BSD [do see comment about ${BSDthreads} above!] + "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/packages/openssl/openssl-0.9.8g/debian.patch b/packages/openssl/openssl-0.9.8g/debian.patch new file mode 100644 index 0000000000..bf2e50b6ce --- /dev/null +++ b/packages/openssl/openssl-0.9.8g/debian.patch @@ -0,0 +1,1281 @@ +--- openssl-0.9.8g.orig/Makefile ++++ openssl-0.9.8g/Makefile +@@ -11,11 +11,11 @@ + SHLIB_VERSION_HISTORY= + SHLIB_MAJOR=0 + SHLIB_MINOR=9.8 +-SHLIB_EXT= +-PLATFORM=dist +-OPTIONS= no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-tlsext no-zlib no-zlib-dynamic +-CONFIGURE_ARGS=dist +-SHLIB_TARGET= ++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) ++PLATFORM=debian-amd64 ++OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-gmp no-idea no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-zlib-dynamic ++CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-amd64 ++SHLIB_TARGET=linux-shared + + # HERE indicates where this Makefile lives. This can be used to indicate + # where sub-Makefiles are expected to be. Currently has very limited usage, +@@ -26,10 +26,10 @@ + # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. + # Normally it is left empty. + INSTALL_PREFIX= +-INSTALLTOP=/usr/local/ssl ++INSTALLTOP=/usr + + # Do not edit this manually. Use Configure --openssldir=DIR do change this! +-OPENSSLDIR=/usr/local/ssl ++OPENSSLDIR=/usr/lib/ssl + + # NO_IDEA - Define to build without the IDEA algorithm + # NO_RC4 - Define to build without the RC4 algorithm +@@ -59,11 +59,11 @@ + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +-CC= cc +-CFLAG= -O +-DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT ++CC= gcc ++CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DMD5_ASM ++DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED + PEX_LIBS= +-EX_LIBS= ++EX_LIBS= -ldl -lz + EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r +@@ -71,7 +71,7 @@ + PERL= /usr/bin/perl + TAR= tar + TARFLAGS= --no-recursion +-MAKEDEPPROG=makedepend ++MAKEDEPPROG= gcc + + # We let the C compiler driver to take care of .s files. This is done in + # order to be excused from maintaining a separate set of architecture +@@ -86,15 +86,15 @@ + PROCESSOR= + + # CPUID module collects small commonly used assembler snippets +-CPUID_OBJ= +-BN_ASM= bn_asm.o ++CPUID_OBJ= x86_64cpuid.o ++BN_ASM= x86_64-gcc.o + DES_ENC= des_enc.o fcrypt_b.o + AES_ASM_OBJ= aes_core.o aes_cbc.o + BF_ENC= bf_enc.o + CAST_ENC= c_enc.o + RC4_ENC= rc4_enc.o + RC5_ENC= rc5_enc.o +-MD5_ASM_OBJ= ++MD5_ASM_OBJ= md5-x86_64.o + SHA1_ASM_OBJ= + RMD160_ASM_OBJ= + +@@ -106,14 +106,14 @@ + ZLIB_INCLUDE= + LIBZLIB= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + SHLIBDIRS= crypto ssl + + # dirs in crypto to build + SDIRS= \ + objects \ + md2 md4 md5 sha hmac ripemd \ +- des aes rc2 rc4 idea bf cast \ ++ des aes rc2 rc4 bf cast \ + bn ec rsa dsa ecdsa dh ecdh dso engine \ + buffer bio stack lhash rand err \ + evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ +@@ -127,10 +127,11 @@ + + MAKEFILE= Makefile + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=/usr/share/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl ++MANSECTION=SSL + SHELL=/bin/sh + + TOP= . +@@ -141,8 +142,8 @@ + SHARED_CRYPTO=libcrypto$(SHLIB_EXT) + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_LIBS= +-SHARED_LIBS_LINK_EXTS= +-SHARED_LDFLAGS= ++SHARED_LIBS_LINK_EXTS=.so ++SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld + + GENERAL= Makefile + BASENAME= openssl +@@ -310,7 +311,8 @@ + echo 'Description: OpenSSL cryptography library'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lcrypto'; \ ++ echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc + + libssl.pc: Makefile +@@ -323,7 +325,8 @@ + echo 'Description: Secure Sockets Layer and cryptography libraries'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lssl'; \ ++ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc + + openssl.pc: Makefile +@@ -336,7 +339,8 @@ + echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ ++ echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + + Makefile: Makefile.org Configure config +@@ -480,7 +484,7 @@ + install_sw: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ +- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ ++ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \ + $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ + $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ +@@ -558,7 +562,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \ +@@ -575,7 +579,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \ +--- openssl-0.9.8g.orig/VMS/VMSify-conf.pl ++++ openssl-0.9.8g/VMS/VMSify-conf.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/local/bin/perl + + use strict; + use warnings; +--- openssl-0.9.8g.orig/Netware/do_tests.pl ++++ openssl-0.9.8g/Netware/do_tests.pl +@@ -1,4 +1,4 @@ +-# perl script to run OpenSSL tests ++#!/usr/local/bin/perl + + + my $base_path = "\\openssl"; +--- openssl-0.9.8g.orig/apps/CA.sh ++++ openssl-0.9.8g/apps/CA.sh +@@ -91,6 +91,7 @@ + -out ${CATOP}/$CAREQ + $CA -out ${CATOP}/$CACERT $CADAYS -batch \ + -keyfile ${CATOP}/private/$CAKEY -selfsign \ ++ -extensions v3_ca \ + -infiles ${CATOP}/$CAREQ + RET=$? + fi +--- openssl-0.9.8g.orig/apps/CA.pl.in ++++ openssl-0.9.8g/apps/CA.pl.in +@@ -65,6 +65,7 @@ + foreach (@ARGV) { + if ( /^(-\?|-h|-help)$/ ) { + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 0; + } elsif (/^-newcert$/) { + # create a certificate +@@ -165,6 +166,7 @@ + } else { + print STDERR "Unknown arg $_\n"; + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 1; + } + } +--- openssl-0.9.8g.orig/apps/speed.c ++++ openssl-0.9.8g/apps/speed.c +@@ -577,7 +577,7 @@ + #define MAX_BLOCK_SIZE 64 + #endif + unsigned char DES_iv[8]; +- unsigned char iv[MAX_BLOCK_SIZE/8]; ++ unsigned char iv[2*MAX_BLOCK_SIZE/8]; + #ifndef OPENSSL_NO_DES + DES_cblock *buf_as_des_cblock = NULL; + static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; +--- openssl-0.9.8g.orig/apps/CA.pl ++++ openssl-0.9.8g/apps/CA.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + # + # CA - wrapper around ca to make it easier to use ... basically ca requires + # some setup stuff to be done before you can use it and this makes +@@ -65,6 +65,7 @@ + foreach (@ARGV) { + if ( /^(-\?|-h|-help)$/ ) { + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 0; + } elsif (/^-newcert$/) { + # create a certificate +@@ -165,6 +166,7 @@ + } else { + print STDERR "Unknown arg $_\n"; + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 1; + } + } +--- openssl-0.9.8g.orig/os2/backwardify.pl ++++ openssl-0.9.8g/os2/backwardify.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/local/bin/perl + use strict; + + # Use as $0 +--- openssl-0.9.8g.orig/Configure ++++ openssl-0.9.8g/Configure +@@ -1,4 +1,4 @@ +-: ++#!/usr/local/bin/perl + eval 'exec perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + ## +@@ -118,7 +118,8 @@ + my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o"; + my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o"; + +-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::"; ++#my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::"; ++my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::::"; + my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o::"; + + my $no_asm="::::::::::"; +@@ -308,6 +309,47 @@ + "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so", + "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so", + ++# Debian GNU/* (various architectures) ++"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC", ++"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + #### + #### Variety of LINUX:-) + #### +@@ -476,7 +518,7 @@ + # Cygwin + "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", + "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", +-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", ++-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", + + # NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools + # netware-clib => legacy CLib c-runtime support +@@ -1300,6 +1342,8 @@ + $shlib_minor=$2; + } + ++$shared_ldflag .= " -Wl,--version-script=openssl.ld"; ++ + open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; + unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; + open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; +@@ -1371,7 +1415,8 @@ + elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) + { + my $sotmp = $1; +- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; ++# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; ++ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; + } + elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) + { +@@ -1490,7 +1535,7 @@ + if (/^#define\s+OPENSSLDIR/) + { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; } + elsif (/^#define\s+ENGINESDIR/) +- { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; } ++ { print OUT "#define ENGINESDIR \"$prefix/lib/ssl/engines\"\n"; } + elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/) + { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n" + if $export_var_as_fn; +--- openssl-0.9.8g.orig/engines/Makefile ++++ openssl-0.9.8g/engines/Makefile +@@ -97,13 +97,13 @@ + *DSO_DL*) sfx="sl";; \ + *) sfx="bad";; \ + esac; \ +- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ ++ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \ + else \ + sfx="so"; \ + cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ + fi; \ +- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ +- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \ ++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \ ++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx ); \ + done; \ + fi + +--- openssl-0.9.8g.orig/engines/openssl.ld ++++ openssl-0.9.8g/engines/openssl.ld +@@ -0,0 +1,5 @@ ++OPENSSL_0.9.8 { ++ global: ++ *; ++}; ++ +--- openssl-0.9.8g.orig/tools/c_rehash ++++ openssl-0.9.8g/tools/c_rehash +@@ -6,7 +6,7 @@ + + my $openssl; + +-my $dir = "/usr/local/ssl"; ++my $dir = "/usr/lib/ssl"; + + if(defined $ENV{OPENSSL}) { + $openssl = $ENV{OPENSSL}; +@@ -59,12 +59,15 @@ + } + } + closedir DIR; +- FILE: foreach $fname (grep {/\.pem$/} @flist) { ++ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) { + # Check to see if certificates and/or CRLs present. + my ($cert, $crl) = check_file($fname); + if(!$cert && !$crl) { +- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; +- next; ++ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | "); ++ if(!$cert && !$crl) { ++ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; ++ next; ++ } + } + link_hash_cert($fname) if($cert); + link_hash_crl($fname) if($crl); +@@ -102,6 +105,9 @@ + my $fname = $_[0]; + $fname =~ s/'/'\\''/g; + my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`; ++ if(!$hash || !fprint) { ++ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`; ++ } + chomp $hash; + chomp $fprint; + $fprint =~ s/^.*=//; +--- openssl-0.9.8g.orig/tools/c_rehash.in ++++ openssl-0.9.8g/tools/c_rehash.in +@@ -59,12 +59,15 @@ + } + } + closedir DIR; +- FILE: foreach $fname (grep {/\.pem$/} @flist) { ++ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) { + # Check to see if certificates and/or CRLs present. + my ($cert, $crl) = check_file($fname); + if(!$cert && !$crl) { +- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; +- next; ++ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | "); ++ if(!$cert && !$crl) { ++ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; ++ next; ++ } + } + link_hash_cert($fname) if($cert); + link_hash_crl($fname) if($crl); +@@ -102,6 +105,9 @@ + my $fname = $_[0]; + $fname =~ s/'/'\\''/g; + my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`; ++ if(!$hash || !fprint) { ++ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`; ++ } + chomp $hash; + chomp $fprint; + $fprint =~ s/^.*=//; +--- openssl-0.9.8g.orig/Makefile.shared ++++ openssl-0.9.8g/Makefile.shared +@@ -151,9 +151,9 @@ + SHLIB_SUFFIX=; \ + ALLSYMSFLAGS='-Wl,--whole-archive'; \ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + +-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" ++DO_GNU_APP=LDFLAGS="$(CFLAGS)" + + #This is rather special. It's a special target with which one can link + #applications without bothering with any features that have anything to +--- openssl-0.9.8g.orig/ssl/t1_lib.c ++++ openssl-0.9.8g/ssl/t1_lib.c +@@ -132,6 +132,10 @@ + int extdatalen=0; + unsigned char *ret = p; + ++ /* don't add extensions for SSLv3 */ ++ if (s->client_version == SSL3_VERSION) ++ return p; ++ + ret+=2; + + if (ret>=limit) return NULL; /* this really never occurs, but ... */ +@@ -202,6 +206,10 @@ + int extdatalen=0; + unsigned char *ret = p; + ++ /* don't add extensions for SSLv3 */ ++ if (s->version == SSL3_VERSION) ++ return p; ++ + ret+=2; + if (ret>=limit) return NULL; /* this really never occurs, but ... */ + +--- openssl-0.9.8g.orig/ms/uplink.pl ++++ openssl-0.9.8g/ms/uplink.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # For Microsoft CL this is implemented as inline assembler. So that + # even though this script can generate even Win32 code, we'll be +--- openssl-0.9.8g.orig/config ++++ openssl-0.9.8g/config +@@ -162,8 +162,8 @@ + echo "${MACHINE}-whatever-linux1"; exit 0 + ;; + +- GNU*) +- echo "hurd-x86"; exit 0; ++ GNU:*|GNU/*:*) ++ echo "${MACHINE}-gnuish"; exit 0; + ;; + + LynxOS:*) +--- openssl-0.9.8g.orig/demos/tunala/configure.in ++++ openssl-0.9.8g/demos/tunala/configure.in +@@ -1,4 +1,4 @@ +-dnl Process this file with autoconf to produce a configure script. ++#!/usr/local/bin/perl + AC_INIT(tunala.c) + AM_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE(tunala, 0.0.1-dev) +--- openssl-0.9.8g.orig/doc/Makefile ++++ openssl-0.9.8g/doc/Makefile +@@ -0,0 +1,40 @@ ++VERSION = ++ ++#PODS = $(wildcard *.pod) ++#MANS = $(addsuffix .man, $(basename $(PODS))) ++ ++MANS = openssl.1 ssl.3 crypto.3 ++ ++P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)" ++ ++all: manpages ++ ++.PHONY: manpages ++ ++manpages: openssl.1 crypto.3 ssl.3 ++ ++openssl.1: ++ $(P2M) --section=1 openssl.pod > openssl.1 ++ ++crypto.3: ++ $(P2M) --section=3 crypto.pod > crypto.3 ++ ++ssl.3: ++ $(P2M) --section=3 ssl.pod > ssl.3 ++ ++.PHONY: install ++install: ++ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1 ++ mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1 ++ install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3 ++ rm -f $(MANS) ++ ++.PHONY: clean ++clean: ++ rm -f $(MANS) ++ ++.PHONY: realclean ++realclean: ++ -$(MAKE) clean +--- openssl-0.9.8g.orig/doc/apps/c_rehash.pod ++++ openssl-0.9.8g/doc/apps/c_rehash.pod +@@ -0,0 +1,55 @@ ++ ++=pod ++ ++=head1 NAME ++ ++c_rehash - Create symbolic links to files named by the hash values ++ ++=head1 SYNOPSIS ++ ++B<c_rehash> ++[directory] ... ++ ++=head1 DESCRIPTION ++ ++c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require. ++ ++If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed. ++ ++For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory. ++ ++Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost. ++ ++The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior. ++ ++The program will also warn if there are files with extension .pem which are not certificate or CRL files. ++ ++The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=). ++ ++=head1 OPTIONS ++ ++None ++ ++=head1 ENVIRONMENT ++ ++=over 4 ++ ++=item B<OPENSSL> ++ ++The name (and path) of an executable to use to generate hashes and fingerprints (see above). ++ ++=item B<SSL_CERT_DIR> ++ ++Colon separated list of directories to operate on. Ignored if directories are listed on the command line. ++ ++=head1 SEE ALSO ++ ++L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)> ++ ++=back ++ ++=head1 BUGS ++ ++No known bugs ++ ++=cut +--- openssl-0.9.8g.orig/Makefile.org ++++ openssl-0.9.8g/Makefile.org +@@ -104,7 +104,7 @@ + ZLIB_INCLUDE= + LIBZLIB= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + SHLIBDIRS= crypto ssl + + # dirs in crypto to build +@@ -125,10 +125,11 @@ + + MAKEFILE= Makefile + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=/usr/share/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl ++MANSECTION=SSL + SHELL=/bin/sh + + TOP= . +@@ -308,7 +309,8 @@ + echo 'Description: OpenSSL cryptography library'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lcrypto'; \ ++ echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc + + libssl.pc: Makefile +@@ -321,7 +323,8 @@ + echo 'Description: Secure Sockets Layer and cryptography libraries'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lssl'; \ ++ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc + + openssl.pc: Makefile +@@ -334,7 +337,8 @@ + echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ +- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ ++ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ ++ echo 'Libs.private: $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + + Makefile: Makefile.org Configure config +@@ -478,7 +482,7 @@ + install_sw: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ +- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ ++ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \ + $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ + $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ +@@ -556,7 +560,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \ +@@ -573,7 +577,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \ +--- openssl-0.9.8g.orig/openssl.ld ++++ openssl-0.9.8g/openssl.ld +@@ -0,0 +1,5 @@ ++OPENSSL_0.9.8 { ++ global: ++ *; ++}; ++ +--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl ++++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/local/bin/perl + # + # MD5 optimized for AMD64. + # +--- openssl-0.9.8g.orig/crypto/md5/asm/md5-sparcv9.S ++++ openssl-0.9.8g/crypto/md5/asm/md5-sparcv9.S +@@ -74,14 +74,14 @@ + #define Dval R8 + + #if defined(MD5_BLOCK_DATA_ORDER) +-# if defined(OPENSSL_SYSNAME_ULTRASPARC) ++/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/ + # define LOAD lda + # define X(i) [%i1+i*4]%asi + # define md5_block md5_block_asm_data_order_aligned + # define ASI_PRIMARY_LITTLE 0x88 +-# else ++/*# else + # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!" +-# endif ++# endif*/ + #else + # define LOAD ld + # define X(i) [%i1+i*4] +--- openssl-0.9.8g.orig/crypto/Makefile ++++ openssl-0.9.8g/crypto/Makefile +@@ -57,7 +57,7 @@ + echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ + echo '#endif' ) >buildinf.h + +-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl ++x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl + $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@ + x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl + $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@ +@@ -70,7 +70,7 @@ + uplink-cof.s: ../ms/uplink.pl + $(PERL) ../ms/uplink.pl coff > $@ + +-x86_64cpuid.s: x86_64cpuid.pl ++x86_64cpuid.S: x86_64cpuid.pl + $(PERL) x86_64cpuid.pl $@ + ia64cpuid.s: ia64cpuid.S + $(CC) $(CFLAGS) -E ia64cpuid.S > $@ +--- openssl-0.9.8g.orig/crypto/sha/asm/sha1-ia64.pl ++++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-sse2.pl ++++ openssl-0.9.8g/crypto/sha/asm/sha512-sse2.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-ia64.pl ++++ openssl-0.9.8g/crypto/sha/asm/sha512-ia64.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +--- openssl-0.9.8g.orig/crypto/sha/sha.h ++++ openssl-0.9.8g/crypto/sha/sha.h +@@ -59,6 +59,7 @@ + #ifndef HEADER_SHA_H + #define HEADER_SHA_H + ++#include <stddef.h> + #include <openssl/e_os2.h> + #include <stddef.h> + +--- openssl-0.9.8g.orig/crypto/rand/md_rand.c ++++ openssl-0.9.8g/crypto/rand/md_rand.c +@@ -271,7 +271,10 @@ + else + MD_Update(&m,&(state[st_idx]),j); + ++/* ++ * Don't add uninitialised data. + MD_Update(&m,buf,j); ++*/ + MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); + MD_Final(&m,local_md); + md_c[1]++; +@@ -465,8 +468,10 @@ + MD_Update(&m,local_md,MD_DIGEST_LENGTH); + MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); + #ifndef PURIFY ++#if 0 /* Don't add uninitialised data. */ + MD_Update(&m,buf,j); /* purify complains */ + #endif ++#endif + k=(st_idx+MD_DIGEST_LENGTH/2)-st_num; + if (k > 0) + { +--- openssl-0.9.8g.orig/crypto/des/asm/desboth.pl ++++ openssl-0.9.8g/crypto/des/asm/desboth.pl +@@ -16,6 +16,11 @@ + + &push("edi"); + ++ &call (&label("pic_point0")); ++ &set_label("pic_point0"); ++ &blindpop("ebp"); ++ &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]"); ++ + &comment(""); + &comment("Load the data words"); + &mov($L,&DWP(0,"ebx","",0)); +@@ -47,15 +52,21 @@ + &mov(&swtmp(2), (DWC(($enc)?"1":"0"))); + &mov(&swtmp(1), "eax"); + &mov(&swtmp(0), "ebx"); +- &call("DES_encrypt2"); ++ &exch("ebx", "ebp"); ++ &call("DES_encrypt2\@PLT"); ++ &exch("ebx", "ebp"); + &mov(&swtmp(2), (DWC(($enc)?"0":"1"))); + &mov(&swtmp(1), "edi"); + &mov(&swtmp(0), "ebx"); +- &call("DES_encrypt2"); ++ &exch("ebx", "ebp"); ++ &call("DES_encrypt2\@PLT"); ++ &exch("ebx", "ebp"); + &mov(&swtmp(2), (DWC(($enc)?"1":"0"))); + &mov(&swtmp(1), "esi"); + &mov(&swtmp(0), "ebx"); +- &call("DES_encrypt2"); ++ &exch("ebx", "ebp"); ++ &call("DES_encrypt2\@PLT"); ++ &exch("ebx", "ebp"); + + &stack_pop(3); + &mov($L,&DWP(0,"ebx","",0)); +--- openssl-0.9.8g.orig/crypto/x86cpuid.pl ++++ openssl-0.9.8g/crypto/x86cpuid.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + + push(@INC,"perlasm"); + require "x86asm.pl"; +--- openssl-0.9.8g.orig/crypto/rc4/asm/rc4-x86_64.pl ++++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +--- openssl-0.9.8g.orig/crypto/perlasm/x86unix.pl ++++ openssl-0.9.8g/crypto/perlasm/x86unix.pl +@@ -399,6 +399,29 @@ + $stack=4; + } + ++sub main'function_begin_B_static ++ { ++ local($func,$extra)=@_; ++ ++ &main'external_label($func); ++ $func=$under.$func; ++ ++ local($tmp)=<<"EOF"; ++.text ++EOF ++ push(@out,$tmp); ++ if ($main'cpp) ++ { push(@out,"TYPE($func,\@function)\n"); } ++ elsif ($main'coff) ++ { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } ++ elsif ($main'aout and !$main'pic) ++ { } ++ else { push(@out,".type $func,\@function\n"); } ++ push(@out,".align\t$align\n"); ++ push(@out,"$func:\n"); ++ $stack=4; ++ } ++ + sub main'function_end + { + local($func)=@_; +@@ -730,7 +753,17 @@ + { + $tmp=<<___; + .section .init ++#ifdef OPENSSL_PIC ++ pushl %ebx ++ call .pic_point0 ++.pic_point0: ++ popl %ebx ++ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx ++ call $under$f\@PLT ++ popl %ebx ++#else + call $under$f ++#endif + jmp .Linitalign + .align $align + .Linitalign: +--- openssl-0.9.8g.orig/crypto/perlasm/cbc.pl ++++ openssl-0.9.8g/crypto/perlasm/cbc.pl +@@ -122,7 +122,11 @@ + &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call + &mov(&DWP($data_off+4,"esp","",0), "ebx"); # + +- &call($enc_func); ++ &call (&label("pic_point0")); ++ &set_label("pic_point0"); ++ &blindpop("ebx"); ++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]"); ++ &call("$enc_func\@PLT"); + + &mov("eax", &DWP($data_off,"esp","",0)); + &mov("ebx", &DWP($data_off+4,"esp","",0)); +@@ -187,7 +191,11 @@ + &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call + &mov(&DWP($data_off+4,"esp","",0), "ebx"); # + +- &call($enc_func); ++ &call (&label("pic_point1")); ++ &set_label("pic_point1"); ++ &blindpop("ebx"); ++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]"); ++ &call("$enc_func\@PLT"); + + &mov("eax", &DWP($data_off,"esp","",0)); + &mov("ebx", &DWP($data_off+4,"esp","",0)); +@@ -220,7 +228,11 @@ + &mov(&DWP($data_off,"esp","",0), "eax"); # put back + &mov(&DWP($data_off+4,"esp","",0), "ebx"); # + +- &call($dec_func); ++ &call (&label("pic_point2")); ++ &set_label("pic_point2"); ++ &blindpop("ebx"); ++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]"); ++ &call("$dec_func\@PLT"); + + &mov("eax", &DWP($data_off,"esp","",0)); # get return + &mov("ebx", &DWP($data_off+4,"esp","",0)); # +@@ -263,7 +275,11 @@ + &mov(&DWP($data_off,"esp","",0), "eax"); # put back + &mov(&DWP($data_off+4,"esp","",0), "ebx"); # + +- &call($dec_func); ++ &call (&label("pic_point3")); ++ &set_label("pic_point3"); ++ &blindpop("ebx"); ++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]"); ++ &call("$dec_func\@PLT"); + + &mov("eax", &DWP($data_off,"esp","",0)); # get return + &mov("ebx", &DWP($data_off+4,"esp","",0)); # +--- openssl-0.9.8g.orig/crypto/perlasm/x86_64-xlate.pl ++++ openssl-0.9.8g/crypto/perlasm/x86_64-xlate.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + + # Ascetic x86_64 AT&T to MASM assembler translator by <appro>. + # +--- openssl-0.9.8g.orig/crypto/opensslconf.h ++++ openssl-0.9.8g/crypto/opensslconf.h +@@ -10,6 +10,9 @@ + #ifndef OPENSSL_NO_GMP + # define OPENSSL_NO_GMP + #endif ++#ifndef OPENSSL_NO_IDEA ++# define OPENSSL_NO_IDEA ++#endif + #ifndef OPENSSL_NO_KRB5 + # define OPENSSL_NO_KRB5 + #endif +@@ -25,11 +28,11 @@ + #ifndef OPENSSL_NO_SEED + # define OPENSSL_NO_SEED + #endif +-#ifndef OPENSSL_NO_TLSEXT +-# define OPENSSL_NO_TLSEXT +-#endif + + #endif /* OPENSSL_DOING_MAKEDEPEND */ ++#ifndef OPENSSL_THREADS ++# define OPENSSL_THREADS ++#endif + #ifndef OPENSSL_NO_DYNAMIC_ENGINE + # define OPENSSL_NO_DYNAMIC_ENGINE + #endif +@@ -45,6 +48,9 @@ + # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) + # define NO_GMP + # endif ++# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) ++# define NO_IDEA ++# endif + # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) + # define NO_KRB5 + # endif +@@ -60,11 +66,10 @@ + # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) + # define NO_SEED + # endif +-# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) +-# define NO_TLSEXT +-# endif + #endif + ++#define OPENSSL_CPUID_OBJ ++ + /* crypto/opensslconf.h.in */ + + /* Generate 80386 code? */ +@@ -72,8 +77,8 @@ + + #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ + #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +-#define ENGINESDIR "/usr/local/ssl/lib/engines" +-#define OPENSSLDIR "/usr/local/ssl" ++#define ENGINESDIR "/usr/lib/ssl/engines" ++#define OPENSSLDIR "/usr/lib/ssl" + #endif + #endif + +@@ -104,14 +109,14 @@ + * - Intel P6 because partial register stalls are very expensive; + * - elder Alpha because it lacks byte load/store instructions; + */ +-#define RC4_INT unsigned int ++#define RC4_INT unsigned char + #endif + #if !defined(RC4_CHUNK) + /* + * This enables code handling data aligned at natural CPU word + * boundary. See crypto/rc4/rc4_enc.c for further details. + */ +-#undef RC4_CHUNK ++#define RC4_CHUNK unsigned long + #endif + #endif + +@@ -119,7 +124,7 @@ + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +-#define DES_LONG unsigned long ++#define DES_LONG unsigned int + #endif + #endif + +@@ -133,9 +138,9 @@ + /* The prime number generation stuff may not work when + * EIGHT_BIT but I don't care since I've only used this mode + * for debuging the bignum libraries */ +-#undef SIXTY_FOUR_BIT_LONG ++#define SIXTY_FOUR_BIT_LONG + #undef SIXTY_FOUR_BIT +-#define THIRTY_TWO_BIT ++#undef THIRTY_TWO_BIT + #undef SIXTEEN_BIT + #undef EIGHT_BIT + #endif +@@ -149,7 +154,7 @@ + + #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) + #define CONFIG_HEADER_BF_LOCL_H +-#undef BF_PTR ++#define BF_PTR2 + #endif /* HEADER_BF_LOCL_H */ + + #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) +@@ -179,7 +184,7 @@ + /* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ + #ifndef DES_UNROLL +-#undef DES_UNROLL ++#define DES_UNROLL + #endif + + /* These default values were supplied by +--- openssl-0.9.8g.orig/crypto/pkcs7/pk7_mime.c ++++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c +@@ -335,9 +335,9 @@ + + if(strcmp(hdr->value, "application/x-pkcs7-signature") && + strcmp(hdr->value, "application/pkcs7-signature")) { +- sk_MIME_HEADER_pop_free(headers, mime_hdr_free); + PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE); + ERR_add_error_data(2, "type: ", hdr->value); ++ sk_MIME_HEADER_pop_free(headers, mime_hdr_free); + sk_BIO_pop_free(parts, BIO_vfree); + return NULL; + } +--- openssl-0.9.8g.orig/crypto/bn/asm/ppc.pl ++++ openssl-0.9.8g/crypto/bn/asm/ppc.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # Implemented as a Perl wrapper as we want to support several different + # architectures with single file. We pick up the target based on the +--- openssl-0.9.8g.orig/crypto/x86_64cpuid.pl ++++ openssl-0.9.8g/crypto/x86_64cpuid.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + + $output=shift; + $win64a=1 if ($output =~ /win64a\.[s|asm]/); +@@ -134,5 +134,9 @@ + .size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid + + .section .init ++#ifdef OPENSSL_PIC ++ call OPENSSL_cpuid_setup\@PLT ++#else + call OPENSSL_cpuid_setup ++#endif + ___ +--- openssl-0.9.8g.orig/crypto/aes/asm/aes-586.pl ++++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/local/bin/perl + # + # ==================================================================== + # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL +@@ -250,7 +250,7 @@ + sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } } + + &public_label("AES_Te"); +-&function_begin_B("_x86_AES_encrypt"); ++&function_begin_B_static("_x86_AES_encrypt"); + if ($vertical_spin) { + # I need high parts of volatile registers to be accessible... + &exch ($s1="edi",$key="ebx"); +@@ -539,7 +539,7 @@ + } + + &public_label("AES_Td"); +-&function_begin_B("_x86_AES_decrypt"); ++&function_begin_B_static("_x86_AES_decrypt"); + # note that caller is expected to allocate stack frame for me! + &mov (&DWP(12,"esp"),$key); # save key + +@@ -1460,15 +1460,22 @@ + &public_label("AES_Td"); + &public_label("AES_Te"); + &function_begin_B("AES_set_decrypt_key"); ++ &push ("ebx"); + &mov ("eax",&wparam(0)); + &mov ("ecx",&wparam(1)); + &mov ("edx",&wparam(2)); + &sub ("esp",12); ++ ++ &call (&label("pic_point0")); ++ &set_label("pic_point0"); ++ &blindpop("ebx"); ++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]"); + &mov (&DWP(0,"esp"),"eax"); + &mov (&DWP(4,"esp"),"ecx"); + &mov (&DWP(8,"esp"),"edx"); +- &call ("AES_set_encrypt_key"); ++ &call ("AES_set_encrypt_key\@PLT"); + &add ("esp",12); ++ &pop ("ebx"); + &cmp ("eax",0); + &je (&label("proceed")); + &ret (); +--- openssl-0.9.8g.orig/crypto/asn1/charmap.pl ++++ openssl-0.9.8g/crypto/asn1/charmap.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + use strict; + +--- openssl-0.9.8g.orig/util/mkerr.pl ++++ openssl-0.9.8g/util/mkerr.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + my $config = "crypto/err/openssl.ec"; + my $debug = 0; +--- openssl-0.9.8g.orig/util/clean-depend.pl ++++ openssl-0.9.8g/util/clean-depend.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # Clean the dependency list in a makefile of standard includes... + # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 + +--- openssl-0.9.8g.orig/util/extract-names.pl ++++ openssl-0.9.8g/util/extract-names.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + + $/ = ""; # Eat a paragraph at once. + while(<STDIN>) { +--- openssl-0.9.8g.orig/util/pod2man.pl ++++ openssl-0.9.8g/util/pod2man.pl +@@ -1,4 +1,4 @@ +-: #!/usr/bin/perl-5.005 ++#!/usr/local/bin/perl + eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' + if $running_under_some_shell; + +--- openssl-0.9.8g.orig/util/mkstack.pl ++++ openssl-0.9.8g/util/mkstack.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + + # This is a utility that searches out "DECLARE_STACK_OF()" + # declarations in .h and .c files, and updates/creates/replaces +--- openssl-0.9.8g.orig/util/selftest.pl ++++ openssl-0.9.8g/util/selftest.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # + # Run the test suite and generate a report + # +--- openssl-0.9.8g.orig/util/extract-section.pl ++++ openssl-0.9.8g/util/extract-section.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/local/bin/perl + + while(<STDIN>) { + if (/=for\s+comment\s+openssl_manual_section:(\S+)/) +--- openssl-0.9.8g.orig/util/pl/netware.pl ++++ openssl-0.9.8g/util/pl/netware.pl +@@ -1,4 +1,4 @@ +-# Metrowerks Codewarrior for NetWare ++#!/usr/local/bin/perl + # + + # The import files and other misc imports needed to link +--- openssl-0.9.8g.orig/util/mkdef.pl ++++ openssl-0.9.8g/util/mkdef.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/local/bin/perl + # + # generate a .def file + # diff --git a/packages/openssl/openssl-native_0.9.7m.bb b/packages/openssl/openssl-native_0.9.7m.bb new file mode 100644 index 0000000000..115d4011d9 --- /dev/null +++ b/packages/openssl/openssl-native_0.9.7m.bb @@ -0,0 +1,16 @@ +inherit pkgconfig native + +require openssl.inc + +PR = "r1" + +SRC_URI += "file://debian.patch;patch=1 \ + file://armeb.patch;patch=1;pnum=0 \ + file://gnueabi-arm.patch;patch=1" + +FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +do_install() { + : +} + diff --git a/packages/openssl/openssl_0.9.7m.bb b/packages/openssl/openssl_0.9.7m.bb new file mode 100644 index 0000000000..3a420001c9 --- /dev/null +++ b/packages/openssl/openssl_0.9.7m.bb @@ -0,0 +1,12 @@ +inherit pkgconfig + +require openssl.inc + +PR = "r6" + +SRC_URI += "file://debian.patch;patch=1 \ + file://armeb.patch;patch=1;pnum=0 \ + file://gnueabi-arm.patch;patch=1 \ + file://gnueabi-armeb.patch;patch=1 \ + file://uclibcgnueabi.patch;patch=1 \ + file://avr32.patch;patch=1;pnum=0" diff --git a/packages/openssl/openssl_0.9.8g.bb b/packages/openssl/openssl_0.9.8g.bb new file mode 100644 index 0000000000..622fd2e9c9 --- /dev/null +++ b/packages/openssl/openssl_0.9.8g.bb @@ -0,0 +1,10 @@ +inherit pkgconfig + +require openssl.inc + +PR = "r6" + +SRC_URI += "file://debian.patch;patch=1 \ + file://configure-targets.patch;patch=1" + +PARALLEL_MAKE = "" diff --git a/packages/python/python-etk_git.bb b/packages/python/python-etk_git.bb new file mode 100644 index 0000000000..3c2cb71d7e --- /dev/null +++ b/packages/python/python-etk_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Python etk binding" +require python-efl.inc +DEPENDS += "etk python-setuptools python-ecore python-cython python-edje" +RDEPENDS += "etk python-cython python-evas python-ecore python-edje python-numeric python-math etk-themes" +PR = "r0.01" + +SRC_URI = "git://staff.get-e.org/users/cmarcelo/python-etk.git;protocol=git" + +S = "${WORKDIR}/git" + +do_stage() { + distutils_stage_all +} diff --git a/packages/python/python-gsmd_svn.bb b/packages/python/python-gsmd_svn.bb index e92df762e7..927dff01d4 100644 --- a/packages/python/python-gsmd_svn.bb +++ b/packages/python/python-gsmd_svn.bb @@ -10,6 +10,4 @@ PR = "r0" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko/trunk;module=python-gsmd;proto=http" S = "${WORKDIR}/python-gsmd" -SRCREV_pn-python-gsmd ?= "${AUTOREV}" - inherit distutils diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 989b9b5348..63fcec904f 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,12 +1,17 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r26" +PR = "r27" inherit task RDEPENDS_task-openmoko-feed = "\ aspell enchant \ + openmoko-agpsui \ + gypsy \ + py-odeviced \ + gsm0710muxd \ + ppp \ bluez-hcidump \ bootchart \ eet evas ecore embryo epsilon edje efreet emotion epdf \ @@ -37,6 +42,8 @@ RDEPENDS_task-openmoko-feed = "\ x11vnc \ libswt3.4-gtk-java \ cacao \ + jamvm \ + classpath \ gpsdrive \ asterisk \ qtopia-phone \ @@ -44,6 +51,7 @@ RDEPENDS_task-openmoko-feed = "\ mono \ diversity-daemon \ diversity-nav \ + diversity-maps-taipei \ assassin \ tangogps \ " diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb index f2c5d6ff36..c4aaa70779 100644 --- a/packages/tasks/task-openmoko-games.bb +++ b/packages/tasks/task-openmoko-games.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -11,4 +11,5 @@ inherit task DESCRIPTION_task-openmoko-games = "Openmoko: Games" RDEPENDS_task-openmoko-games = "\ oh-puzzles \ + kobodeluxe \ " diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index 75ac0f1205..bbf1fca05e 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -4,7 +4,7 @@ SECTION = "x11/docs" LICENSE = "MIT-X" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index b0d5e39813..bfa43809cd 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -117,7 +117,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dmx ${W100_OECONF} \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" + ac_cv_file__usr_share_sgml_X11_defs_ent=no" do_configure_prepend() { sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index f6b17c413e..65ff03cc16 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,11 +9,10 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-kdrive" PROVIDES = "virtual/xserver" PE = "1" -PR = "r5" +PR = "r6" +PV = "1.3.0.0+git${SRCREV}" -XGLAMO_GIT_REV = "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" - -SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \ +SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \ file://kmode.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ @@ -53,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" + ac_cv_file__usr_share_sgml_X11_defs_ent=no" do_configure_prepend() { sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb index 9a8db266b6..c87f4abaa4 100644 --- a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb @@ -45,7 +45,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no \ + ac_cv_file__usr_share_sgml_X11_defs_ent=no \ --enable-xomap" do_configure_prepend() { diff --git a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb index 2c7e1d5f48..5fdf7c4943 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb @@ -52,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" + ac_cv_file__usr_share_sgml_X11_defs_ent=no" do_configure_prepend() { sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index 78fdc01b46..421e044970 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -3,7 +3,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " +EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " export LDFLAGS += " -ldl " diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index c8a3c42ed5..0a37ab39fd 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -6,7 +6,7 @@ PR = "r4" SRC_URI += "file://drmfix.patch;patch=1" -EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " +EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " export LDFLAGS += " -ldl " diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index ee84cac779..6e643a9138 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -11,6 +11,6 @@ SRC_URI += "file://drmfix.patch;patch=1 \ MESA_VER = "7.0.2" -EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " +EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " export LDFLAGS += " -ldl " |