Sat Feb 4 23:14:50 UTC 2012

2 files changed, 36 insertions, 57 deletions

diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index 076e17329..cceef84a2 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,36 +1,30 @@
-# $Id: PKGBUILD 59729 2011-11-29 20:14:19Z bluewind $
+# $Id: PKGBUILD 63447 2012-02-03 17:52:25Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
-pkgname=oss
-pkgver=4.2_2005
-pkgrel=2
-pkgdesc="Open Sound System UNIX audio architecture"
+pkgbase=oss
+pkgname=(oss libflashsupport-oss)
+pkgver=4.2_2006
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://developer.opensound.com/"
 license=('GPL2')
-depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed')
-makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils')
-optdepends=('gtk2: for graphical mixer (ossxmix)')
-conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
-replaces=('libflashsupport-oss')
-install=oss.install
-backup=('usr/lib/oss/soundon.user')
+makedepends=('gtk2')
 source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
 	"rm-init-scripts.patch"
 	"rc-script"
 	"soundon.patch"
 	"remove-hal.patch"
 	)
-md5sums=('964b1ec63b48b22baba6688fe2fc0633'
+md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c'
          'b9a380a0ac8896390d71ac13676f27e1'
          'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
          'cd7f1dc6166bba8c94d96f3a28e948a5')
+_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
 build() {
-	_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 	cd "${srcdir}/${_dir}"
 
 	# Avoid these flags conflicting with OSS build system.
@@ -71,16 +65,19 @@ build() {
 	sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh
 }
 
-package() {
-	_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
+package_oss() {
+	pkgdesc="Open Sound System UNIX audio architecture"
+	depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed')
+	optdepends=('gtk2: for graphical mixer (ossxmix)'
+	            'libflashsupport-oss: Adobe flash plugin support')
+	conflicts=('oss-linux' 'oss-linux-free' 'oss-testing')
+	backup=('usr/lib/oss/soundon.user')
+	install=oss.install
+
 	cd "${srcdir}/${_dir}"
 
 	msg "Copying files."
 
-	# Install libflashsupport.so
-	install -dm755 "$pkgdir/usr/lib"
-	ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
-
 	cd "${srcdir}/build/prototype"
 	cp -a * "${pkgdir}"
 
@@ -89,3 +86,14 @@ package() {
 	install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss"
 }
 
+package_libflashsupport-oss() {
+	pkgdesc="Adobe flash plugin support lib (OSSv4)"
+	conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
+	depends=('oss')
+
+	cd "${srcdir}/${_dir}"
+
+	install -dm755 "$pkgdir/usr/lib"
+	ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
+}
+
diff --git a/community/oss/oss.install b/community/oss/oss.install
index f665416db..672d63644 100644
--- a/community/oss/oss.install
+++ b/community/oss/oss.install
@@ -1,59 +1,30 @@
-_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."
+	sh /usr/lib/oss/build/install.sh &>/dev/null
 	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
+	sh /usr/lib/oss/build/install.sh &>/dev/null
+
+	if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then
+		echo "libflashsupport.so has been split into a seperate package."
+		echo "If you want flash to use oss, please install libflashsupport-oss"
+	fi
 }
 
 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
+	sh /usr/lib/oss/scripts/restore_drv.sh
 }
 
 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
 }