Changeset 968

Timestamp:

09/05/08 17:23:43 (3 months ago)

Author:

mariodebian

Message:

initramfs-tools-tcos (0.89.7)

• debian/control Makefile:
  • Debian etch and Ubuntu feisty, gutsy don't have libsox-fmt-all, use sox instead
• Move sox and alsa code from 21pulseaudio to 20 alsa

Location:

trunk/initramfs-tools-tcos

Files:

• Makefile (modified) (2 diffs)
• debian/changelog (modified) (2 diffs)
• hooks-addons/20alsa (modified) (1 diff)
• hooks-addons/21pulseaudio (modified) (1 diff)

trunk/initramfs-tools-tcos/Makefile

@@ -243 +243 @@
 
 patch_feisty: patch_amd64
-        # nothing to patch
+        sed -i 's/libsox-fmt-all/sox/g' debian/control
 
 patch_gutsy: patch_amd64
-        # nothing to patch
+        sed -i 's/libsox-fmt-all/sox/g' debian/control
 
 patch_max: patch_amd64
@@ -260 +260 @@
         # PATCHING INITRAMFS_TOOLS_TCOS in Debian etch
         sed -i '/^Build/s/libusplash-dev/usplash, libbogl-dev, libgd-dev/g' debian/control
+        sed -i 's/libsox-fmt-all/sox/g' debian/control
 
 patch_testing: patch_amd64

trunk/initramfs-tools-tcos/debian/changelog

@@ +1 @@
+initramfs-tools-tcos (0.89.7) unstable; urgency=low
+
+  * debian/control Makefile:
+    - Debian etch and Ubuntu feisty, gutsy don't have libsox-fmt-all, use sox instead
+  * Move sox and alsa code from 21pulseaudio to 20 alsa
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 17:23:35 +0200
+
 initramfs-tools-tcos (0.89.6) unstable; urgency=low
 
@@ -17 +25 @@
     - Add intrepid in if sentences
 
- -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 15:10:58 +0200
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 17:22:54 +0200
 
 initramfs-tools-tcos (0.89.5) unstable; urgency=low

trunk/initramfs-tools-tcos/hooks-addons/20alsa

@@ -40 +40 @@
     fi
 
+
+    # copy sox if avalaible (needed for RTP)
+    if [ "$(_ldd /usr/bin/play >/dev/null 2>&1 ; echo $? )" = "1"  ]; then
+      # play is a script (Ubuntu dapper => gutsy and Debian etch)
+      cpifexists /usr/bin/play  /usr/bin/
+      cpifexists /usr/bin/sox   /usr/bin/
+    else
+      # play is a binary (or symlink to sox)
+      cpifexists /usr/bin/play  /usr/bin/
+    fi
+
+    if [ -d /usr/lib/sox ]; then
+      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
+    fi
+
+    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/
+
+
+
  
     stat_after "Alsa sound support"

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

@@ -89 +89 @@
  cpifexists /etc/pulse/client.conf     /etc/pulse/
  cpifexists /etc/pulse/daemon.conf     /etc/pulse/
-
-  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
-