Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 184123 | Differences between
and this patch

Collapse All | Expand All

(-)oss-v4.1test0-071114-src-gpl/setup/Linux/sbin/soundon (-22 / +26 lines)
Lines 224-252 then Link Here
224
  head -10 /proc/asound/version >> $LOG 2>&1
224
  head -10 /proc/asound/version >> $LOG 2>&1
225
  lsmod|grep snd >> $LOG
225
  lsmod|grep snd >> $LOG
226
  echo "**************************************" >> $LOG
226
  echo "**************************************" >> $LOG
227
else
227
##else
228
# Use library based ALSA compatibility
228
# Use library based ALSA compatibility
229
229
#
230
  if test -f $OSSLIBDIR/lib/libsalsa.so.2.0.0
230
# Disabled by Andrew Patridge;
231
  then
231
# Found in stable branch by daniel.jozsef;
232
     if test "`uname -m` " = "x86_64 "
232
# Breaks lots of stuff, use the pcm-oss ALSA plugin instead.
233
     then
233
#
234
       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
234
#  if test -f $OSSLIBDIR/lib/libsalsa.so.2.0.0
235
       #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
235
#  then
236
     else
236
#     if test "`uname -m` " = "x86_64 "
237
       if test -s /lib/libasound.so.2
237
#     then
238
       then
238
#       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
239
         ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /lib/libasound.so.2
239
#       #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
240
         #ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib
240
#     else
241
       fi
241
#       if test -s /lib/libasound.so.2
242
  
242
#       then
243
       if test -s /usr/lib/libasound.so.2
243
#         ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /lib/libasound.so.2
244
       then
244
#         #ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib
245
         ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
245
#       fi
246
         #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
246
#  
247
       fi
247
#       if test -s /usr/lib/libasound.so.2
248
     fi
248
#       then
249
  fi
249
#         ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
250
#         #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
251
#       fi
252
#     fi
253
#  fi
250
fi
254
fi
251
255
252
# Setup Flash 9 audio support plugin for OSS
256
# Setup Flash 9 audio support plugin for OSS

Return to bug 184123