Changeset 955

Timestamp:

09/05/08 11:09:14 (3 months ago)

Author:

mariodebian

Message:

initramfs-tools-tcos (0.89.6)

• xmlrpc/sh/rtp-controller.sh, hooks-addons/21pulseaudio:
  • Copy and create links of sox libs
  • Copy libasound2-plugins of pulseaudio and create /etc/asound.conf
• bin/tcos-buildchroot:
  • Add libasound2-plugins to base packages
• bin/configurexorg:
  • touch mysettings.conf (newer tftp don't create if no exists)
• debian/control:
  • Add libsox-fmt-all and libasound2-plugins to tcos-core Depends

Location:

trunk/initramfs-tools-tcos

Files:

• bin/configurexorg (modified) (1 diff)
• bin/tcos-buildchroot (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• hooks-addons/21pulseaudio (modified) (2 diffs)
• xmlrpc/sh/rtp-controller.sh (modified) (2 diffs)

trunk/initramfs-tools-tcos/bin/configurexorg

@@ -55 +55 @@
   debug "downloading file /tcos/conf/${MYIP}.conf"
   download_file /tcos/conf/${MYIP}.conf /conf/mysettings.conf
+  # new versions of tftp don't create file
+  touch /conf/mysettings.conf
   . /conf/mysettings.conf
 }

trunk/initramfs-tools-tcos/bin/tcos-buildchroot

@@ -50 +50 @@
 TCOS_PACKAGES="tcos-keyring initramfs-tools-tcos tcos-usplash tinylogin ltspfs-client lp-server xvnc4viewer esound"
 TCOS_PACKAGES="${TCOS_PACKAGES} iftop strace twm x11vnc scrot cdparanoia dropbear console-data discover"
-TCOS_PACKAGES="${TCOS_PACKAGES} busybox rdesktop pulseaudio pulseaudio-module-x11 pulseaudio-utils"
+TCOS_PACKAGES="${TCOS_PACKAGES} busybox rdesktop pulseaudio pulseaudio-module-x11 pulseaudio-utils libasound2-plugins"
 
 # apt options (force-yes)

trunk/initramfs-tools-tcos/debian/changelog

@@ +1 @@
+initramfs-tools-tcos (0.89.6) unstable; urgency=low
+
+  * xmlrpc/sh/rtp-controller.sh, hooks-addons/21pulseaudio:
+    - Copy and create links of sox libs
+    - Copy libasound2-plugins of pulseaudio and create /etc/asound.conf
+  * bin/tcos-buildchroot:
+    - Add libasound2-plugins to base packages
+  * bin/configurexorg:
+    - touch mysettings.conf (newer tftp don't create if no exists)
+  * debian/control:
+    - Add libsox-fmt-all and libasound2-plugins to tcos-core Depends
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 11:08:42 +0200
+
 initramfs-tools-tcos (0.89.5) unstable; urgency=low
 

trunk/initramfs-tools-tcos/debian/control

@@ -33 +33 @@
 Architecture: any
 Depends: busybox, xterm, x11vnc, xvnc4viewer | xvncviewer, vlc, dosfstools, cdparanoia, 
-         scrot, eject, netpipes, libnotify-bin, python, python-utmp, rtptools, stunnel4, openssl, iproute,
+         scrot, eject, netpipes, libnotify-bin, python, python-utmp, rtptools, libsox-fmt-all, libasound2-plugins,
+         stunnel4, openssl, iproute,
          python-dbus | python2.4-dbus, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: tcosmonitor (<< 0.1.23.2), initramfs-tools-tcos (<< 0.87.0)

trunk/initramfs-tools-tcos/hooks-addons/21pulseaudio

@@ -90 +90 @@
  cpifexists /etc/pulse/daemon.conf     /etc/pulse/
 
+ cat << EOF >> ${DESTDIR}/etc/asound.conf
+pcm.!default {
+    type pulse
+}
+ctl.!default {
+    type pulse
+}
+EOF
+
+  mkdir -p ${DESTDIR}/usr/lib/alsa-lib/
+  cpifexists /usr/lib/alsa-lib/libasound_module_pcm_pulse.so    /usr/lib/alsa-lib/
+  cpifexists /usr/lib/alsa-lib/libasound_module_ctl_pulse.so    /usr/lib/alsa-lib/
+  cpifexists /usr/lib/alsa-lib/libasound_module_pcm_alsa_dsp.so /usr/lib/alsa-lib/
+
+  mkdir -p ${DESTDIR}/usr/lib/sox/
+  for lib in $(find /usr/lib/sox/ -type f| grep -v -e mp3 -e flac -e sd2 -e fap -e vorbis -e mat5 -e wavpack -e ffmpeg -e mat4 -e pvf); do
+     cpifexists $lib  /usr/lib/sox/
+  done
+
+
+
  cat << EOF >> ${DESTDIR}/sbin/startpulseaudio
 #!/bin/sh
@@ -97 +118 @@
 . /conf/tcos.conf
 . /conf/tcos-run-functions
+
 
 # check lib link

trunk/initramfs-tools-tcos/xmlrpc/sh/rtp-controller.sh

@@ -30 +30 @@
   STANDALONE=0
   export XAUTHORITY=/root/.Xauthority
+  if [ -d /usr/lib/sox ]  && [ ! -f /tmp/sox.libs ]; then
+    # update sox libs
+    for lib in $(/usr/lib/sox/ -type f); do
+      ln -s $lib $(echo $lib | awk -F"\.so" '{print $1".so"}')    >> /tmp/sox.libs 2>&1
+      ln -s $lib $(echo $lib | awk -F"\.so" '{print $1".so.0"}')  >> /tmp/sox.libs 2>&1
+    done
+  fi
+
 else
   STANDALONE=1
@@ -37 +45 @@
   DBUS_HANDLER="/usr/lib/tcos/tcos-dbus-helper --username=${STANDALONE_USER} "
 fi
+