big cleanup

9 files changed, 0 insertions, 305 deletions

diff --git a/oss-hg/.gitignore b/oss-hg/.gitignore
deleted file mode 100644
index 62ab099..0000000
--- a/oss-hg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-oss
diff --git a/oss-hg/PKGBUILD b/oss-hg/PKGBUILD
deleted file mode 100644
index 97a9956..0000000
--- a/oss-hg/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# Archlive <http://archlive-pkg.googlecode.com>
-
-pkgname=oss-hg
-pkgver=920
-pkgrel=1
-pkgdesc="Open Sound System UNIX audio architecture"
-arch=('i686' 'x86_64')
-url="http://www.opensound.com/"
-license=('GPL2')
-depends=('module-init-tools' 'libtool' 'sed')
-makedepends=('pkgconfig' 'gawk' 'gtk2' 'mercurial' 'gcc' 'make')
-provides=('oss' 'oss4')
-conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'oss' 'oss-mercurial')
-install='oss.install'
-backup=('usr/lib/oss/soundon.user')
-source=('oss.rm-init-scripts.patch' 'oss.soundon.patch' 'oss.rc' 'oss.install'
-	 'ossxmix.png' 'ossxmix.desktop')
-md5sums=()
-
-optdepends=('gtk2: for graphical mixer (ossxmix)'
-            'hal: for automatic USB audio configuration')
-
-_hgroot="http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound"
-_hgrepo="oss"
-
-
-build() {
-  cd $startdir
-
-  if [ -d ${_hgrepo} ]; then
-      cd ${_hgrepo} && hg pull -u -r ${pkgver}
-  else
-      hg clone ${_hgroot} ${_hgrepo} || return 1
-  fi
-  
-  [ -d $srcdir/${_hgrepo} ] && rm -rf $srcdir/${_hgrepo}
-  hg clone $startdir/${_hgrepo} $srcdir/${_hgrepo}
-  cd $srcdir/${_hgrepo}
-
-  # Avoid these flags conflicting with OSS build system.
-  unset CFLAGS
-  unset OSFLAGS
-  unset LIBRARIES
-  export NO_WARNING_CHECKS=yes
-
-  # Compile libflashsupport.so only in packaging time, so we avoid
-  # conflicts with other packages and ease package management.
-  msg "Building libflashsupport.so."
-  cd "oss/lib"
-  gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so || return 1
-  install -Dm755 libflashsupport.so "${pkgdir}/usr/lib/libflashsupport.so" || return 1
-  #rm -f "flashsupport.c" "libflashsupport.so" &> /dev/null
-
-  msg "Preparing the build environment."
-  cd $srcdir/${_hgrepo}
-  [ -d build ] && rm -rf build
-  mkdir build && cd build
-  ../configure --regparm --config-midi=YES --enable-timings --portable-build || return 1
-  #../configure --enable-libsalsa=YES || return 1
-
-  msg "Building OSS."
-  make build || return 1
-
-  msg "Patching init scripts."
-  cd prototype
-  rm usr/lib/oss/etc/S89oss
-  patch -Np0 -i "$srcdir/oss.rm-init-scripts.patch" || return 1
-  patch -Np0 -i "$srcdir/oss.soundon.patch" || return 1
-
-  msg "Copying files."
-  cp -a * "${pkgdir}"
-  chmod -R a+r "${pkgdir}" 
-  find "${pkgdir}" -type d -exec chmod a+x '{}' \;
-  install -D -m755 "$srcdir/oss.rc" "$pkgdir/etc/rc.d/oss4"
-  install -D -m755 "$srcdir/ossxmix.desktop" "$pkgdir/usr/share/applications/ossxmix.desktop"
-  install -D -m644 "$srcdir/ossxmix.png" "$pkgdir/usr/share/pixmaps/ossxmix.png"
-}
-md5sums=('b9a380a0ac8896390d71ac13676f27e1'
-         '65f07fe241bfbf912f76d8b6d8f276b5'
-         'b70f139f73c2f1ee9db2680ce48121fb'
-         '1494a2304a1eb7a1979e7e83d894c67a'
-         'f6a0fa9d274d21ab92cd03fca885add7'
-         '81e0f51ec04379dee64c31c32b045028')
diff --git a/oss-hg/namcap.log b/oss-hg/namcap.log
deleted file mode 100644
index 475fa85..0000000
--- a/oss-hg/namcap.log
+++ /dev/null
@@ -1,8 +0,0 @@
-PKGBUILD (oss-hg) E: File referenced in $startdir
-PKGBUILD (oss-hg) E: File referenced in $startdir
-PKGBUILD (oss-hg) W: Missing Maintainer tag
-oss-hg W: Referenced library 'libOSSlib.so' is an uninstalled dependency
-oss-hg W: Referenced library 'libossmix.so' is an uninstalled dependency
-oss-hg W: Dependency included and not needed ('module-init-tools')
-oss-hg W: Dependency included and not needed ('libtool')
-oss-hg W: Dependency included and not needed ('sed')
diff --git a/oss-hg/oss.install b/oss-hg/oss.install
deleted file mode 100644
index f665416..0000000
--- a/oss-hg/oss.install
+++ /dev/null
@@ -1,59 +0,0 @@
-_MSG_LIBOSSDIR=" Please note that OSS stores some of its configuration files
- at /usr/lib/oss. If you are upgrading from an older OSS
- release and it doesn't work properly, try removing that
- directory and reinstall this package."
-
-post_install() {
-	echo "Running OSS install script..."
-	/bin/sh /usr/lib/oss/build/install.sh &> /dev/null
-	echo
-	echo "-------------------------------------------------------------"
-	echo " Open Sound System was installed. Now you should add 'oss'"
-	echo " to your DAEMONS variable at /etc/rc.conf, and start the"
-	echo " daemon by running /etc/rc.d/oss start."
-	echo
-	echo " Note that OSS can't currently work together with kernel"
-	echo " ALSA modules, so they were moved out by the OSS install"
-	echo " scripts. If you want the ALSA kernel modules back, you can"
-	echo " just remove this package using pacman."
-	echo
-	echo "${_MSG_LIBOSSDIR}"
-	echo "-------------------------------------------------------------"
-	/bin/true
-}
-
-post_upgrade() {
-	echo "Running OSS update script..."
-	/bin/sh /usr/lib/oss/build/install.sh &> /dev/null
-	echo
-	echo "-------------------------------------------------------------"
-	echo " Open Sound System was updated. Now you should restart the"
-	echo " daemon by running /etc/rc.d/oss restart."
-	echo
-	echo "${_MSG_LIBOSSDIR}"
-	echo "-------------------------------------------------------------"
-	/bin/true
-}
-
-pre_remove() {
-	# Restore any replaced ALSA drivers.
-	/bin/sh /usr/lib/oss/scripts/restore_drv.sh
-	# Remove symlinks left by the 'install.sh' script.
-	rm -f /usr/lib/hal/scripts/oss_usb-create-devices
-	rm -f /usr/share/hal/fdi/policy/20thirdparty/90-oss_usb-create-device.fdi
-	/bin/true
-}
-
-post_remove() {
-	echo
-	echo "-------------------------------------------------------------"
-	echo " Open Sound System was now removed, and the ALSA kernel"
-	echo " modules were restored."
-	echo
-	echo " Please note that OSS stores some of its configuration files"
-	echo " at /usr/lib/oss. If you don't plan to use OSS anymore, you"
-	echo " can remove this directory."
-	echo "-------------------------------------------------------------"
-	/bin/true
-}
-
diff --git a/oss-hg/oss.rc b/oss-hg/oss.rc
deleted file mode 100644
index 1724aa2..0000000
--- a/oss-hg/oss.rc
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-case "$1" in
- start)
-	if [ "${msg_lang}" = "cn" ]; then
-		stat_busy "正在启动 OSS 开源驱动"
-	else
-		stat_busy "Starting OSS/Open source driver"
-	fi
-   # start
-   /usr/sbin/soundon
-   if [ $? -gt 0 ]; then
-     stat_fail
-   else
-     grep '^softoss' /proc/modules >/dev/null 2>/dev/null
-#      if [ $? -eq 0 ]; then
-#        stat_busy "Replacing old \"softoss\" module with \"vmix\""
-#        rmmod softoss
-#        modprobe vmix
-#        sed -i 's/^softoss.*$/vmix/' /usr/lib/oss/etc/installed_drivers
-#      fi
-     add_daemon oss4
-     stat_done
-   fi
-   ;;
- stop)
-   if [ "${msg_lang}" = "cn" ]; then
-   	stat_busy "正在保存 OSS 设置"
-   else
-   	stat_busy "Saving OSS mixer"
-   fi
-   /usr/sbin/savemixer
-   if [ $? -gt 0 ]; then
-     stat_fail
-   else
-     stat_done
-   fi
-   grep '^"cuckoo"' /proc/modules >/dev/null 2>/dev/null
-   if [ $? -eq 0 ]; then
-     stat_busy "Removing \"cuckoo\" module"
-     rmmod \"cuckoo\"
-   fi
-   if [ "${msg_lang}" = "cn" ]; then
-   	stat_busy "正在关闭 OSS 开源驱动"
-   else
-   	stat_busy "Stopping OSS/Open source driver"
-   fi
-   /usr/sbin/soundoff
-   if [ $? -gt 0 ]; then
-     stat_fail
-   else
-     rm_daemon oss4
-     stat_done
-   fi
-   ;;
- restart)
-   $0 stop
-   sleep 1
-   $0 start
-   ;;
- *)
-   echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/oss-hg/oss.rm-init-scripts.patch b/oss-hg/oss.rm-init-scripts.patch
deleted file mode 100644
index 981ff60..0000000
--- a/oss-hg/oss.rm-init-scripts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
-+++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
-@@ -290,38 +290,6 @@
-    echo 
- fi
- 
--if ! test -d /etc/init.d
--then
--  mkdir /etc/init.d
--fi
--
--rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
--cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
--
--chmod 744 /etc/init.d/oss
--
--if test -x /sbin/chkconfig
--then
--  /sbin/chkconfig oss on        > /dev/null 2>&1
--else
-- if test -x /usr/sbin/update-rc.d
-- then
--   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
-- else
--  if test -d etc/rc.d/rc3.d
--  then
--    rm -f /etc/rc.d/rc3.d/S89oss
--    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
--  else
--    if test -d /etc/rc3.d
--    then
--      rm -f /etc/rc3.d/S89oss
--      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
--    fi
--  fi
-- fi
--fi
--
- # Install ALSA interface module (Cuckoo)
- #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
- #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
---- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
-+++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
-@@ -18,8 +18,6 @@
-   fi
- fi
- 
--rm -f /etc/init.d/oss
--
- if ! test -d /lib/modules/`uname -r`/kernel/sound
- then
-    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/oss-hg/oss.soundon.patch b/oss-hg/oss.soundon.patch
deleted file mode 100644
index 4702b86..0000000
--- a/oss-hg/oss.soundon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
-+++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
-@@ -255,7 +255,10 @@
-   then
-      if test "`uname -m` " = "x86_64 "
-      then
--       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-+       # Fix for compatibility with Arch's directory structure
-+       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
-+       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
-+       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-      else
-        if test -s /lib/libasound.so.2
-@@ -278,8 +281,11 @@
- then
-    if test "`uname -m` " = "x86_64 "
-    then
--     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
--     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-+     # Fix for compatibility with Arch's directory structure
-+     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
-+     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
-+     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-+     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-    else
-      if test -s /lib/libasound.so.2
-      then
diff --git a/oss-hg/ossxmix.desktop b/oss-hg/ossxmix.desktop
deleted file mode 100644
index 2022bd7..0000000
--- a/oss-hg/ossxmix.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=OSS X Mixer
-Name[zh_CN]=OSS 声音设置
-Type=Application
-Comment=OSS Setup
-Exec=ossxmix
-Categories=System;Application;
-GenericName=OSS X Mixer
-Icon=/usr/share/pixmaps/ossxmix.png
diff --git a/oss-hg/ossxmix.png b/oss-hg/ossxmix.png
deleted file mode 100644
index 8758fdb..0000000
--- a/oss-hg/ossxmix.png
+++ /dev/null