Date: Monday, December 10, 2012 @ 07:00:17 Author: jgc Revision: 173082
archrelease: copy trunk to extra-i686, extra-x86_64 Added: libcanberra/repos/extra-i686/PKGBUILD (from rev 173081, libcanberra/trunk/PKGBUILD) libcanberra/repos/extra-i686/libcanberra.install (from rev 173081, libcanberra/trunk/libcanberra.install) libcanberra/repos/extra-i686/libcanberra.xinit (from rev 173081, libcanberra/trunk/libcanberra.xinit) libcanberra/repos/extra-x86_64/PKGBUILD (from rev 173081, libcanberra/trunk/PKGBUILD) libcanberra/repos/extra-x86_64/libcanberra.install (from rev 173081, libcanberra/trunk/libcanberra.install) libcanberra/repos/extra-x86_64/libcanberra.xinit (from rev 173081, libcanberra/trunk/libcanberra.xinit) Deleted: libcanberra/repos/extra-i686/PKGBUILD libcanberra/repos/extra-i686/libcanberra.install libcanberra/repos/extra-i686/libcanberra.xinit libcanberra/repos/extra-x86_64/PKGBUILD libcanberra/repos/extra-x86_64/libcanberra.install libcanberra/repos/extra-x86_64/libcanberra.xinit ----------------------------------+ extra-i686/PKGBUILD | 140 ++++++++++++++++++------------------- extra-i686/libcanberra.install | 10 +- extra-i686/libcanberra.xinit | 34 ++++---- extra-x86_64/PKGBUILD | 140 ++++++++++++++++++------------------- extra-x86_64/libcanberra.install | 10 +- extra-x86_64/libcanberra.xinit | 34 ++++---- 6 files changed, 184 insertions(+), 184 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-i686/PKGBUILD 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=libcanberra -pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) -pkgver=0.30 -pkgrel=2 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" -arch=(i686 x86_64) -license=(LGPL) -depends=(libvorbis libltdl alsa-lib tdb) -makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) -options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$pkgbase-$pkgver.tar.xz" - libcanberra.xinit) -sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' - '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') - -_plugindir=usr/lib/$pkgbase-$pkgver - -build() { - cd $pkgbase-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - # Fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_libcanberra() { - install=libcanberra.install - optdepends=("$pkgbase-pulse: PulseAudio driver" - "$pkgbase-gstreamer: GStreamer driver") - - cd $pkgbase-$pkgver - - make -j1 DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/libcanberra-gtk*.la - rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la - - install -D "$srcdir/libcanberra.xinit" \ - "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" - - # Split plugins - for _p in pulse gstreamer; do - mkdir ../$_p-plugin - mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin - done -} - -package_libcanberra-pulse() { - pkgdesc="PulseAudio plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" libpulse) - - install -d "$pkgdir/$_plugindir" - mv pulse-plugin/* "$pkgdir/$_plugindir" -} - -package_libcanberra-gstreamer() { - pkgdesc="GStreamer plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" gstreamer) - - install -d "$pkgdir/$_plugindir" - mv gstreamer-plugin/* "$pkgdir/$_plugindir" -} Copied: libcanberra/repos/extra-i686/PKGBUILD (from rev 173081, libcanberra/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=libcanberra +pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) +pkgver=0.30 +pkgrel=3 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" +arch=(i686 x86_64) +license=(LGPL) +depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop) +makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) +options=(!emptydirs) +url=http://0pointer.de/lennart/projects/libcanberra +source=("$url/$pkgbase-$pkgver.tar.xz" + libcanberra.xinit) +sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' + '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') + +_plugindir=usr/lib/$pkgbase-$pkgver + +build() { + cd $pkgbase-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --enable-gstreamer --enable-pulse \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + + # Fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_libcanberra() { + install=libcanberra.install + optdepends=("$pkgbase-pulse: PulseAudio driver" + "$pkgbase-gstreamer: GStreamer driver") + + cd $pkgbase-$pkgver + + make -j1 DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/lib/libcanberra-gtk*.la + rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la + + install -D "$srcdir/libcanberra.xinit" \ + "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" + + # Split plugins + for _p in pulse gstreamer; do + mkdir ../$_p-plugin + mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin + done +} + +package_libcanberra-pulse() { + pkgdesc="PulseAudio plugin for libcanberra" + depends=("$pkgbase=$pkgver-$pkgrel" libpulse) + + install -d "$pkgdir/$_plugindir" + mv pulse-plugin/* "$pkgdir/$_plugindir" +} + +package_libcanberra-gstreamer() { + pkgdesc="GStreamer plugin for libcanberra" + depends=("$pkgbase=$pkgver-$pkgrel" gstreamer) + + install -d "$pkgdir/$_plugindir" + mv gstreamer-plugin/* "$pkgdir/$_plugindir" +} Deleted: extra-i686/libcanberra.install =================================================================== --- extra-i686/libcanberra.install 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-i686/libcanberra.install 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,5 +0,0 @@ -pre_upgrade() { - if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --uninstall libcanberra - fi -} Copied: libcanberra/repos/extra-i686/libcanberra.install (from rev 173081, libcanberra/trunk/libcanberra.install) =================================================================== --- extra-i686/libcanberra.install (rev 0) +++ extra-i686/libcanberra.install 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,5 @@ +pre_upgrade() { + if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --uninstall libcanberra + fi +} Deleted: extra-i686/libcanberra.xinit =================================================================== --- extra-i686/libcanberra.xinit 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-i686/libcanberra.xinit 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,17 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome) # Done by gnome-settings-daemon - ;; - *) - # Extra check in case DESKTOP_SESSION is not set correctly - if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then - if [[ -z $GTK_MODULES ]]; then - GTK_MODULES="canberra-gtk-module" - else - GTK_MODULES="$GTK_MODULES:canberra-gtk-module" - fi - export GTK_MODULES - fi - ;; -esac Copied: libcanberra/repos/extra-i686/libcanberra.xinit (from rev 173081, libcanberra/trunk/libcanberra.xinit) =================================================================== --- extra-i686/libcanberra.xinit (rev 0) +++ extra-i686/libcanberra.xinit 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,17 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome) # Done by gnome-settings-daemon + ;; + *) + # Extra check in case DESKTOP_SESSION is not set correctly + if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then + if [[ -z $GTK_MODULES ]]; then + GTK_MODULES="canberra-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module" + fi + export GTK_MODULES + fi + ;; +esac Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-x86_64/PKGBUILD 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=libcanberra -pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) -pkgver=0.30 -pkgrel=2 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" -arch=(i686 x86_64) -license=(LGPL) -depends=(libvorbis libltdl alsa-lib tdb) -makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) -options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$pkgbase-$pkgver.tar.xz" - libcanberra.xinit) -sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' - '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') - -_plugindir=usr/lib/$pkgbase-$pkgver - -build() { - cd $pkgbase-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - # Fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_libcanberra() { - install=libcanberra.install - optdepends=("$pkgbase-pulse: PulseAudio driver" - "$pkgbase-gstreamer: GStreamer driver") - - cd $pkgbase-$pkgver - - make -j1 DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/libcanberra-gtk*.la - rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la - - install -D "$srcdir/libcanberra.xinit" \ - "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" - - # Split plugins - for _p in pulse gstreamer; do - mkdir ../$_p-plugin - mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin - done -} - -package_libcanberra-pulse() { - pkgdesc="PulseAudio plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" libpulse) - - install -d "$pkgdir/$_plugindir" - mv pulse-plugin/* "$pkgdir/$_plugindir" -} - -package_libcanberra-gstreamer() { - pkgdesc="GStreamer plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" gstreamer) - - install -d "$pkgdir/$_plugindir" - mv gstreamer-plugin/* "$pkgdir/$_plugindir" -} Copied: libcanberra/repos/extra-x86_64/PKGBUILD (from rev 173081, libcanberra/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=libcanberra +pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) +pkgver=0.30 +pkgrel=3 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" +arch=(i686 x86_64) +license=(LGPL) +depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop) +makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) +options=(!emptydirs) +url=http://0pointer.de/lennart/projects/libcanberra +source=("$url/$pkgbase-$pkgver.tar.xz" + libcanberra.xinit) +sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' + '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') + +_plugindir=usr/lib/$pkgbase-$pkgver + +build() { + cd $pkgbase-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --enable-gstreamer --enable-pulse \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + + # Fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_libcanberra() { + install=libcanberra.install + optdepends=("$pkgbase-pulse: PulseAudio driver" + "$pkgbase-gstreamer: GStreamer driver") + + cd $pkgbase-$pkgver + + make -j1 DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/lib/libcanberra-gtk*.la + rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la + + install -D "$srcdir/libcanberra.xinit" \ + "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" + + # Split plugins + for _p in pulse gstreamer; do + mkdir ../$_p-plugin + mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin + done +} + +package_libcanberra-pulse() { + pkgdesc="PulseAudio plugin for libcanberra" + depends=("$pkgbase=$pkgver-$pkgrel" libpulse) + + install -d "$pkgdir/$_plugindir" + mv pulse-plugin/* "$pkgdir/$_plugindir" +} + +package_libcanberra-gstreamer() { + pkgdesc="GStreamer plugin for libcanberra" + depends=("$pkgbase=$pkgver-$pkgrel" gstreamer) + + install -d "$pkgdir/$_plugindir" + mv gstreamer-plugin/* "$pkgdir/$_plugindir" +} Deleted: extra-x86_64/libcanberra.install =================================================================== --- extra-x86_64/libcanberra.install 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-x86_64/libcanberra.install 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,5 +0,0 @@ -pre_upgrade() { - if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --uninstall libcanberra - fi -} Copied: libcanberra/repos/extra-x86_64/libcanberra.install (from rev 173081, libcanberra/trunk/libcanberra.install) =================================================================== --- extra-x86_64/libcanberra.install (rev 0) +++ extra-x86_64/libcanberra.install 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,5 @@ +pre_upgrade() { + if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --uninstall libcanberra + fi +} Deleted: extra-x86_64/libcanberra.xinit =================================================================== --- extra-x86_64/libcanberra.xinit 2012-12-10 11:59:45 UTC (rev 173081) +++ extra-x86_64/libcanberra.xinit 2012-12-10 12:00:17 UTC (rev 173082) @@ -1,17 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome) # Done by gnome-settings-daemon - ;; - *) - # Extra check in case DESKTOP_SESSION is not set correctly - if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then - if [[ -z $GTK_MODULES ]]; then - GTK_MODULES="canberra-gtk-module" - else - GTK_MODULES="$GTK_MODULES:canberra-gtk-module" - fi - export GTK_MODULES - fi - ;; -esac Copied: libcanberra/repos/extra-x86_64/libcanberra.xinit (from rev 173081, libcanberra/trunk/libcanberra.xinit) =================================================================== --- extra-x86_64/libcanberra.xinit (rev 0) +++ extra-x86_64/libcanberra.xinit 2012-12-10 12:00:17 UTC (rev 173082) @@ -0,0 +1,17 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome) # Done by gnome-settings-daemon + ;; + *) + # Extra check in case DESKTOP_SESSION is not set correctly + if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then + if [[ -z $GTK_MODULES ]]; then + GTK_MODULES="canberra-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module" + fi + export GTK_MODULES + fi + ;; +esac