Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2

    Diff of /branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 9371 by niro, Mon Nov 28 09:07:03 2011 UTC revision 9372 by niro, Mon Nov 28 10:41:17 2011 UTC
    # Line 199  src_install_pulseaudio() Line 199  src_install_pulseaudio()
    199   # enable avahi support   # enable avahi support
    200   sed -i '/module-zeroconf-publish/s:^#::' ${BINDIR}/etc/pulse/default.pa || die   sed -i '/module-zeroconf-publish/s:^#::' ${BINDIR}/etc/pulse/default.pa || die
    201    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/libpulsecore-*.*  
      usr/lib/pulseaudio  
      usr/lib/pulse-${PVER}/*always*  
      usr/lib/pulse-${PVER}/*augment*  
      usr/lib/pulse-${PVER}/*card*  
      usr/lib/pulse-${PVER}/*combine*  
      usr/lib/pulse-${PVER}/*console*  
      usr/lib/pulse-${PVER}/*cork*  
      usr/lib/pulse-${PVER}/*cli*  
      usr/lib/pulse-${PVER}/*dbus*  
      usr/lib/pulse-${PVER}/*default*  
      usr/lib/pulse-${PVER}/*detect*  
      usr/lib/pulse-${PVER}/*echo*  
      usr/lib/pulse-${PVER}/*equalizer*  
      usr/lib/pulse-${PVER}/*filter*  
      usr/lib/pulse-${PVER}/*hal*  
      usr/lib/pulse-${PVER}/*http*  
      usr/lib/pulse-${PVER}/*intended*  
      usr/lib/pulse-${PVER}/*ladspa*  
      usr/lib/pulse-${PVER}/*loopback*  
      usr/lib/pulse-${PVER}/*match*  
      usr/lib/pulse-${PVER}/*mmkbd*  
      usr/lib/pulse-${PVER}/*native*  
      usr/lib/pulse-${PVER}/*null*  
      usr/lib/pulse-${PVER}/*pipe*  
      usr/lib/pulse-${PVER}/*position*  
      usr/lib/pulse-${PVER}/*remap*  
      usr/lib/pulse-${PVER}/*rtp*  
      usr/lib/pulse-${PVER}/*rygel*  
      usr/lib/pulse-${PVER}/*simple*  
      usr/lib/pulse-${PVER}/*sine*  
      usr/lib/pulse-${PVER}/*stream*  
      usr/lib/pulse-${PVER}/*suspend*  
      usr/lib/pulse-${PVER}/*switch*  
      usr/lib/pulse-${PVER}/*tunnel*  
      usr/lib/pulse-${PVER}/*udev*  
      usr/lib/pulse-${PVER}/*virtual*  
      usr/lib/pulse-${PVER}/*volume*"  
      fi  
       
    202   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    203   etc/pulse/daemon.conf \   etc/pulse/daemon.conf \
    204   etc/pulse/*.pa \   etc/pulse/*.pa \
    # Line 285  src_install_pulseaudio() Line 242  src_install_pulseaudio()
    242   usr/$(mlibdir)/pulse-${PVER}/*udev* \   usr/$(mlibdir)/pulse-${PVER}/*udev* \
    243   usr/$(mlibdir)/pulse-${PVER}/*virtual* \   usr/$(mlibdir)/pulse-${PVER}/*virtual* \
    244   usr/$(mlibdir)/pulse-${PVER}/*volume* \   usr/$(mlibdir)/pulse-${PVER}/*volume* \
    245   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo "usr/lib/libpulsecore-*.*
    246     usr/lib/pulseaudio
    247     usr/lib/pulse-${PVER}/*always*
    248     usr/lib/pulse-${PVER}/*augment*
    249     usr/lib/pulse-${PVER}/*card*
    250     usr/lib/pulse-${PVER}/*combine*
    251     usr/lib/pulse-${PVER}/*console*
    252     usr/lib/pulse-${PVER}/*cork*
    253     usr/lib/pulse-${PVER}/*cli*
    254     usr/lib/pulse-${PVER}/*dbus*
    255     usr/lib/pulse-${PVER}/*default*
    256     usr/lib/pulse-${PVER}/*detect*
    257     usr/lib/pulse-${PVER}/*echo*
    258     usr/lib/pulse-${PVER}/*equalizer*
    259     usr/lib/pulse-${PVER}/*filter*
    260     usr/lib/pulse-${PVER}/*hal*
    261     usr/lib/pulse-${PVER}/*http*
    262     usr/lib/pulse-${PVER}/*intended*
    263     usr/lib/pulse-${PVER}/*ladspa*
    264     usr/lib/pulse-${PVER}/*loopback*
    265     usr/lib/pulse-${PVER}/*match*
    266     usr/lib/pulse-${PVER}/*mmkbd*
    267     usr/lib/pulse-${PVER}/*native*
    268     usr/lib/pulse-${PVER}/*null*
    269     usr/lib/pulse-${PVER}/*pipe*
    270     usr/lib/pulse-${PVER}/*position*
    271     usr/lib/pulse-${PVER}/*remap*
    272     usr/lib/pulse-${PVER}/*rtp*
    273     usr/lib/pulse-${PVER}/*rygel*
    274     usr/lib/pulse-${PVER}/*simple*
    275     usr/lib/pulse-${PVER}/*sine*
    276     usr/lib/pulse-${PVER}/*stream*
    277     usr/lib/pulse-${PVER}/*suspend*
    278     usr/lib/pulse-${PVER}/*switch*
    279     usr/lib/pulse-${PVER}/*tunnel*
    280     usr/lib/pulse-${PVER}/*udev*
    281     usr/lib/pulse-${PVER}/*virtual*
    282     usr/lib/pulse-${PVER}/*volume*") \
    283   usr/share/man/man1/pulseaudio.1 \   usr/share/man/man1/pulseaudio.1 \
    284   usr/share/man/man5/default.pa.5 \   usr/share/man/man5/default.pa.5 \
    285   usr/share/man/man5/pulse-daemon.conf.5 \   usr/share/man/man5/pulse-daemon.conf.5 \
    # Line 301  src_install_pulseaudio-alsa() Line 295  src_install_pulseaudio-alsa()
    295  {  {
    296   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    297    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*alsa*"  
      fi  
       
    298   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    299   usr/$(mlibdir)/pulse-${PVER}/*alsa* \   usr/$(mlibdir)/pulse-${PVER}/*alsa* \
    300   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*alsa*") \
    301   usr/share/pulseaudio/alsa-mixer \   usr/share/pulseaudio/alsa-mixer \
    302   || die   || die
    303  }  }
    # Line 318  src_install_pulseaudio-esound() Line 306  src_install_pulseaudio-esound()
    306  {  {
    307   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    308    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*esound*"  
      fi  
       
    309   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    310   usr/bin/esdcompat \   usr/bin/esdcompat \
    311   usr/$(mlibdir)/pulse-${PVER}/*esound* \   usr/$(mlibdir)/pulse-${PVER}/*esound* \
    312   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*esound*") \
    313   usr/share/pulseaudio/alsa-mixer \   usr/share/pulseaudio/alsa-mixer \
    314   usr/share/man/man1/esdcompat.1 \   usr/share/man/man1/esdcompat.1 \
    315   || die   || die
    # Line 337  src_install_pulseaudio-zeroconf() Line 319  src_install_pulseaudio-zeroconf()
    319  {  {
    320   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    321    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*avahi*  
      usr/lib/pulse-${PVER}/*zeroconf*"  
      fi  
       
    322   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    323   usr/$(mlibdir)/pulse-${PVER}/*avahi* \   usr/$(mlibdir)/pulse-${PVER}/*avahi* \
    324   usr/$(mlibdir)/pulse-${PVER}/*zeroconf* \   usr/$(mlibdir)/pulse-${PVER}/*zeroconf* \
    325   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*avahi*
    326     usr/lib/pulse-${PVER}/*zeroconf*") \
    327   || die   || die
    328  }  }
    329    
    # Line 355  src_install_pulseaudio-x11() Line 331  src_install_pulseaudio-x11()
    331  {  {
    332   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    333    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*x11*"  
      fi  
       
    334   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    335   etc/xdg \   etc/xdg \
    336   usr/bin/start-pulseaudio* \   usr/bin/start-pulseaudio* \
    337   usr/$(mlibdir)/pulse-${PVER}/*x11* \   usr/$(mlibdir)/pulse-${PVER}/*x11* \
    338     $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*x11*") \
    339   usr/share/man/man1/start-pulseaudio* \   usr/share/man/man1/start-pulseaudio* \
      ${myzap} \  
    340   || die   || die
       
    341  }  }
    342    
    343  src_install_pulseaudio-bluetooth()  src_install_pulseaudio-bluetooth()
    344  {  {
    345   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    346    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*bluetooth*  
      usr/lib/pulseaudio/proximity-helper"  
      fi  
       
    347   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    348   usr/$(mlibdir)/pulse-${PVER}/*bluetooth* \   usr/$(mlibdir)/pulse-${PVER}/*bluetooth* \
    349   usr/$(mlibdir)/pulseaudio/proximity-helper \   usr/$(mlibdir)/pulseaudio/proximity-helper \
    350   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*bluetooth*
    351     usr/lib/pulseaudio/proximity-helper") \
    352   || die   || die
    353  }  }
    354    
    # Line 393  src_install_pulseaudio-raop() Line 356  src_install_pulseaudio-raop()
    356  {  {
    357   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    358    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/pulse-${PVER}/*raop*"  
      fi  
       
    359   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    360   usr/$(mlibdir)/pulse-${PVER}/*raop* \   usr/$(mlibdir)/pulse-${PVER}/*raop* \
    361   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*raop*") \
    362   || die   || die
    363  }  }
    364    
    # Line 409  src_install_pulseaudio-utils() Line 366  src_install_pulseaudio-utils()
    366  {  {
    367   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    368    
      local myzap  
      if [[ $(mlibdir) != lib ]]  
      then  
      myzap="usr/lib/libpulsedsp.*"  
      fi  
       
    369   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    370   usr/bin/pa* \   usr/bin/pa* \
    371   usr/$(mlibdir)/libpulsedsp.* \   usr/$(mlibdir)/libpulsedsp.* \
    372   ${myzap} \   $([[ $(mlibdir) != lib ]] && echo"usr/lib/libpulsedsp.*") \
    373   usr/share/man/man1/pa* \   usr/share/man/man1/pa* \
    374   || die   || die
    375  }  }
    Legend:
    Removed from v.9371  
    changed lines
      Added in v.9372