Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1bb33e82d27418278a6534b137981b8fbbfac46f
commit 1bb33e82d27418278a6534b137981b8fbbfac46f Author: James Buren <r...@frugalware.org> Date: Sun Sep 18 12:16:59 2011 -0500 oss-v4.2_build2005-4-i686 * switch from sysvinit to systemd scripts * add subpkg for the libs & headers * release bump diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild index a2ed7dd..a1c3b5a 100644 --- a/source/multimedia-extra/oss/FrugalBuild +++ b/source/multimedia-extra/oss/FrugalBuild @@ -7,28 +7,30 @@ pkgname=oss pkgver=v4.2_build2005 _ver="${pkgver/_/-}" -pkgrel=3 +pkgrel=4 pkgdesc="Open Sound System Version 4 for Linux (Alternative to ALSA)." url="http://developer.opensound.com" _dlurl='http://www.4front-tech.com/developer/sources/stable/gpl' _ext='-src-gpl.tar.bz2' groups=('multimedia-extra') +rodepends=("$pkgname-libs") archs=('i686' 'x86_64') up2date="Flastarchive $_dlurl $_ext" backup=('usr/lib/oss/soundon.user') _F_kernelmod_scriptlet="$pkgname.install" source=($_dlurl/$pkgname-$_ver$_ext - $pkgname-disable-redundant-actions.patch - rc.$pkgname + $pkgname-frugalware.patch + oss-on.service + oss-off.service $pkgname.install) options=('scriptlet' 'genscriptlet') Finclude kernel-module -subpkgs=("$pkgname-gtk-mixer") -subdescs=('GUI mixer for oss that uses GTK+') -subrodepends=("$pkgname") -subdepends=('gtk+2') -subarchs=('i686 x86_64') -subgroups=('xmultimedia-extra') +subpkgs=("$pkgname-gtk-mixer" "$pkgname-libs") +subdescs=('GUI mixer for oss that uses GTK+' 'Libraries and headers for oss.') +subrodepends=("$pkgname" "") +subdepends=('gtk+2' 'glibc') +subarchs=('i686 x86_64' 'i686 x86_64') +subgroups=('xmultimedia-extra' 'multimedia-extra') _F_desktop_filename="ossxmix" _F_desktop_name="OSS Mixer Controls" _F_desktop_desc="GTK+ application for modifying OSS mixer controls." @@ -37,10 +39,21 @@ _F_desktop_exec="ossxmix" _F_desktop_categories="GTK;AudioVideo;" sha1sums=('7924d8893f3af94c5c73c651ae0a6d5073a94bae' \ 'e7887412fa6434e12ea8bf441cd6fd52008997e5' \ - '7f1c8c3758179bb1890dd17f232ebf824505cfea' \ - '89a6b9e479206ffb76cbd0475435dd41d8950651') + 'c11b5241b8b6cd805b9e32f6d3677c647e0abaa9' \ + 'cad69f7d4d653340947a7119888d4976640b8410' \ + 'dc8110e92b37c1b90b86fa98743242569f78058d') + +_symlink_lib() +{ + if [ -z "$2" ]; then + Fln /usr/lib/oss/lib/$1 /usr/lib/$1 + else + Fln /usr/lib/oss/lib/$1 /usr/lib/$2 + fi +} -build() { +build() +{ Fcd "$pkgname-$_ver-src-gpl" Fpatchall @@ -57,7 +70,7 @@ build() { mkdir tmp && cd tmp # Setup build directory - ../configure --enable-libsalsa=NO || Fdie + ../configure --regparm || Fdie # Compile first stage make build || Fdie @@ -96,14 +109,13 @@ build() { # Install everything else now cd ../../../.. || Fdie rm -rf usr/lib/oss/lib/flashsupport.c usr/lib/oss/etc/S89oss || Fdie - rm -rf usr/lib/oss/{build,cuckoo,include,etc_templates} usr/lib/oss/modules.* usr/lib/oss/objects.* || Fdie + rm -rf usr/lib/oss/{build,cuckoo,etc_templates} usr/lib/oss/modules.* usr/lib/oss/objects.* || Fdie + rm -rf usr/lib/oss/scripts/90-oss_usb-create-device.fdi Fsed '`uname -r`' "$_F_kernelmod_uname" usr/lib/oss/scripts/* cp -rf * "$Fdestdir" || Fdie - for i in $Fdestdir/usr/lib/oss/lib/*; do - Fln ${i/$Fdestdir/} /usr/lib/`basename $i` - done - Fln /usr/lib/oss/scripts/oss_usb-create-devices /usr/lib/hal/scripts/oss_usb-create-devices - Fln /usr/lib/oss/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/90-oss_usb-create-device.fdi + _symlink_lib libOSSlib.so + _symlink_lib libflashsupport.so + _symlink_lib libossmix.so Fmv /usr/lib/oss/conf.tmpl /usr/lib/oss/conf echo "autosave_mixer yes" > $Fdestdir/usr/lib/oss/etc/userdefs Fdirschmod / 0755 @@ -114,12 +126,17 @@ build() { Ffileschmod /usr/lib/oss/scripts 0755 Ffileschmod /usr/lib/oss/soundon.user 0755 Ficonrel ../../cmd/ossxmix/ossxmix.xpm - Frcd2 + Ffile /lib/systemd/system/oss-on.service + Ffile /lib/systemd/system/oss-off.service Fdesktop2 Fsplit $pkgname-gtk-mixer /usr/share/applications Fsplit $pkgname-gtk-mixer /usr/share/pixmaps Fsplit $pkgname-gtk-mixer /usr/share/man/man1/ossxmix.1.gz Fsplit $pkgname-gtk-mixer /usr/bin/ossxmix + Fsplit $pkgname-libs /usr/lib/lib{OSSlib,flashsupport,ossmix}.so + Fsplit $pkgname-libs /usr/lib/oss/lib/lib{OSSlib,flashsupport,ossmix}.so + Fsplit $pkgname-libs /usr/lib/oss/include + Fsplit $pkgname-libs /etc/oss.conf Fbuild_kernelmod_scriptlet } diff --git a/source/multimedia-extra/oss/oss-disable-redundant-actions.patch b/source/multimedia-extra/oss/oss-frugalware.patch similarity index 100% rename from source/multimedia-extra/oss/oss-disable-redundant-actions.patch rename to source/multimedia-extra/oss/oss-frugalware.patch diff --git a/source/multimedia-extra/oss/oss-off.service b/source/multimedia-extra/oss/oss-off.service new file mode 100644 index 0000000..f99f4b9 --- /dev/null +++ b/source/multimedia-extra/oss/oss-off.service @@ -0,0 +1,12 @@ +[Unit] +Description=OSS soundoff +DefaultDependencies=no +Before=shutdown.target + +[Service] +Type=oneshot +ExecStart=/usr/sbin/soundoff +StandardOutput=syslog + +[Install] +WantedBy=shutdown.target diff --git a/source/multimedia-extra/oss/oss-on.service b/source/multimedia-extra/oss/oss-on.service new file mode 100644 index 0000000..ef782d6 --- /dev/null +++ b/source/multimedia-extra/oss/oss-on.service @@ -0,0 +1,14 @@ +[Unit] +Description=OSS soundon +DefaultDependencies=no +After=sysinit.target +Before=shutdown.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +ExecStart=-/usr/sbin/soundon +StandardOutput=syslog + +[Install] +WantedBy=basic.target diff --git a/source/multimedia-extra/oss/oss.install b/source/multimedia-extra/oss/oss.install index 73e16d2..e56cdc1 100644 --- a/source/multimedia-extra/oss/oss.install +++ b/source/multimedia-extra/oss/oss.install @@ -3,8 +3,12 @@ post_install() echo -n "Suppressing ALSA drivers... " find /lib/modules -name "sound-preoss.tar.bz2" -not -path "*@_F_kernelmod_uname@*" -delete /usr/lib/oss/scripts/remove_drv.sh &> /dev/null + for i in /lib/systemd/system/alsa-{re,}store.service; do + [ -f "$i" ] && systemctl disable `basename $i` &> /dev/null + done + systemctl enable oss-on.service &> /dev/null + systemctl enable oss-off.service &> /dev/null depmod -a @_F_kernelmod_uname@ - /usr/sbin/chkconfig --add rc.oss echo "done." true } @@ -19,8 +23,12 @@ pre_remove() { echo -n "Restoring ALSA drivers... " /usr/lib/oss/scripts/restore_drv.sh &> /dev/null + for i in /lib/systemd/system/alsa-{re,}store.service; do + [ -f "$i" ] && systemctl enable `basename $i` &> /dev/null + done + systemctl disable oss-on.service &> /dev/null + systemctl disable oss-off.service &> /dev/null echo "done." - /usr/sbin/chkconfig --del rc.oss true } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git