[arch-commits] Commit in oss/trunk (PKGBUILD oss.service rc-script)

Sébastien Luttringer seblu at nymeria.archlinux.org
Thu May 30 22:02:47 EDT 2013


    Date: Friday, May 31, 2013 @ 04:02:47
  Author: seblu
Revision: 92058

upgpkg: oss 4.2_2007-4

- /usr merge

Modified:
  oss/trunk/PKGBUILD
  oss/trunk/oss.service
Deleted:
  oss/trunk/rc-script

-------------+
 PKGBUILD    |  153 +++++++++++++++++++++++++++++-----------------------------
 oss.service |    4 -
 rc-script   |   30 -----------
 3 files changed, 79 insertions(+), 108 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 01:31:14 UTC (rev 92057)
+++ PKGBUILD	2013-05-31 02:02:47 UTC (rev 92058)
@@ -8,113 +8,114 @@
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2007
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://developer.opensound.com/"
 license=('GPL2')
 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"
-        "linux-3.8.patch"
-	"oss.service"
-	)
+  "rm-init-scripts.patch"
+  "soundon.patch"
+  "remove-hal.patch"
+  "linux-3.8.patch"
+  "oss.service"
+)
 md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7'
          'b9a380a0ac8896390d71ac13676f27e1'
-         'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
          'cd7f1dc6166bba8c94d96f3a28e948a5'
          'effecefb774f1d08ef9f0af0ad205c34'
-         '8db0255b380dc6672993e627d1cd8ca6')
+         '39c46b10a6bc56fc146d669a61bd3028')
 _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
 build() {
-	cd "${srcdir}/${_dir}"
+  cd "${srcdir}/${_dir}"
 
-	# Avoid these flags conflicting with OSS build system.
-	unset CFLAGS
-	unset LDFLAGS
-	unset OSFLAGS
-	unset LIBRARIES
-	export NO_WARNING_CHECKS=yes
+  # Avoid these flags conflicting with OSS build system.
+  unset CFLAGS
+  unset LDFLAGS
+  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
+  # 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
 
-	msg "Preparing the build environment."
-	cd "${srcdir}"
+  msg "Preparing the build environment."
+  cd "${srcdir}"
 
-	# Create build directory and configure
-	rm -rf build
-	mkdir build && cd build
-	"${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
+  # Create build directory and configure
+  rm -rf build
+  mkdir build && cd build
+  "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
 
-	# ossvermagic hardcodes /lib/modules *grumble*
-	sed -i 's|/lib/modules|/usr&|' \
-			os_cmd/Linux/ossvermagic/ossvermagic.c
+  # ossvermagic hardcodes /lib/modules *grumble*
+  sed -i 's|/lib/modules|/usr&|' \
+      os_cmd/Linux/ossvermagic/ossvermagic.c
 
-        pushd "$srcdir/$_dir"
-	patch -p0 -i "${srcdir}/linux-3.8.patch"
-        popd
+  pushd "$srcdir/$_dir"
+  patch -p0 -i "${srcdir}/linux-3.8.patch"
+  popd
 
-	msg "Building OSS."
-	make build
+  msg "Building OSS."
+  make build
 
-	msg "Patching init scripts."
-	cd "${srcdir}/build/prototype"
-	rm usr/lib/oss/etc/S89oss
-	patch -p0 -i "${srcdir}/rm-init-scripts.patch"
-	patch -p0 -i "${srcdir}/soundon.patch"
-	# remove hal dependency
-	patch -p0 -i "${srcdir}/remove-hal.patch"
-	rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
+  msg "Patching init scripts."
+  cd "${srcdir}/build/prototype"
+  rm usr/lib/oss/etc/S89oss
+  patch -p0 -i "${srcdir}/rm-init-scripts.patch"
+  patch -p0 -i "${srcdir}/soundon.patch"
+  # remove hal dependency
+  patch -p0 -i "${srcdir}/remove-hal.patch"
+  rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
 
-	# fix kernel module directories
-	sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
-	sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
-	sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
-		usr/lib/oss/build/install.sh \
-		usr/lib/oss/scripts/restore_drv.sh \
-		usr/lib/oss/scripts/setup-alsa.sh \
-		usr/lib/oss/scripts/remove_drv.sh \
-		usr/lib/oss/build/Makefile.tmpl \
-		usr/lib/oss/build/Makefile.osscore \
-		usr/lib/oss/cuckoo/Makefile
+  # fix kernel module directories
+  sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
+  sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
+  sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
+  sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
+  sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
+    usr/lib/oss/build/install.sh \
+    usr/lib/oss/scripts/restore_drv.sh \
+    usr/lib/oss/scripts/setup-alsa.sh \
+    usr/lib/oss/scripts/remove_drv.sh \
+    usr/lib/oss/build/Makefile.tmpl \
+    usr/lib/oss/build/Makefile.osscore \
+    usr/lib/oss/cuckoo/Makefile
 }
 
 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
+  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}/build/prototype"
-	cp -a * "${pkgdir}"
+  cd "${srcdir}/build/prototype"
+  cp -a * "${pkgdir}"
 
-	chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815)
-	find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy
-	install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss"
-	install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service"
+  cd "$pkgdir"
+  mv usr/sbin/* usr/bin
+  rmdir usr/sbin
+  chmod -R a+r . # All files can have read permission (FS#13815)
+  find . -type d -exec chmod a+x '{}' \; # Make namcap happy
+  install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
 }
 
 package_libflashsupport-oss() {
-	pkgdesc="Adobe flash plugin support lib (OSSv4)"
-	conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
-	depends=('oss')
+  pkgdesc="Adobe flash plugin support lib (OSSv4)"
+  conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
+  depends=('oss')
 
-	cd "${srcdir}/${_dir}"
+  cd "${srcdir}/${_dir}"
 
-	install -dm755 "$pkgdir/usr/lib"
-	ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
+  install -dm755 "$pkgdir/usr/lib"
+  ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
 }
 
+# vim:set ts=2 sw=2 et:

Modified: oss.service
===================================================================
--- oss.service	2013-05-31 01:31:14 UTC (rev 92057)
+++ oss.service	2013-05-31 02:02:47 UTC (rev 92058)
@@ -5,8 +5,8 @@
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/soundon
-ExecStop=/usr/sbin/soundoff
+ExecStart=/usr/bin/soundon
+ExecStop=/usr/bin/soundoff
 
 [Install]
 WantedBy=multi-user.target

Deleted: rc-script
===================================================================
--- rc-script	2013-05-31 01:31:14 UTC (rev 92057)
+++ rc-script	2013-05-31 02:02:47 UTC (rev 92058)
@@ -1,30 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Open Sound System'
-		if /usr/sbin/soundon; then
-			add_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Open Sound System'
-		if /usr/sbin/soundoff; then
-			rm_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-esac



More information about the arch-commits mailing list