[arch-commits] Commit in xmms2/repos (20 files)

Sergej Pupykin spupykin at archlinux.org
Fri Oct 2 11:05:45 UTC 2015


    Date: Friday, October 2, 2015 @ 13:05:45
  Author: spupykin
Revision: 142755

archrelease: copy trunk to community-i686, community-x86_64

Added:
  xmms2/repos/community-i686/PKGBUILD
    (from rev 142754, xmms2/trunk/PKGBUILD)
  xmms2/repos/community-i686/install.sh
    (from rev 142754, xmms2/trunk/install.sh)
  xmms2/repos/community-i686/system.service
    (from rev 142754, xmms2/trunk/system.service)
  xmms2/repos/community-i686/tmpfiles.conf
    (from rev 142754, xmms2/trunk/tmpfiles.conf)
  xmms2/repos/community-i686/user.service
    (from rev 142754, xmms2/trunk/user.service)
  xmms2/repos/community-x86_64/PKGBUILD
    (from rev 142754, xmms2/trunk/PKGBUILD)
  xmms2/repos/community-x86_64/install.sh
    (from rev 142754, xmms2/trunk/install.sh)
  xmms2/repos/community-x86_64/system.service
    (from rev 142754, xmms2/trunk/system.service)
  xmms2/repos/community-x86_64/tmpfiles.conf
    (from rev 142754, xmms2/trunk/tmpfiles.conf)
  xmms2/repos/community-x86_64/user.service
    (from rev 142754, xmms2/trunk/user.service)
Deleted:
  xmms2/repos/community-i686/PKGBUILD
  xmms2/repos/community-i686/install.sh
  xmms2/repos/community-i686/system.service
  xmms2/repos/community-i686/tmpfiles.conf
  xmms2/repos/community-i686/user.service
  xmms2/repos/community-x86_64/PKGBUILD
  xmms2/repos/community-x86_64/install.sh
  xmms2/repos/community-x86_64/system.service
  xmms2/repos/community-x86_64/tmpfiles.conf
  xmms2/repos/community-x86_64/user.service

---------------------------------+
 /PKGBUILD                       |  238 ++++++++++++++++++++++++++++++++++++++
 /install.sh                     |   20 +++
 /system.service                 |   34 +++++
 /tmpfiles.conf                  |    4 
 /user.service                   |   26 ++++
 community-i686/PKGBUILD         |  119 -------------------
 community-i686/install.sh       |   12 -
 community-i686/system.service   |   17 --
 community-i686/tmpfiles.conf    |    2 
 community-i686/user.service     |   13 --
 community-x86_64/PKGBUILD       |  119 -------------------
 community-x86_64/install.sh     |   12 -
 community-x86_64/system.service |   17 --
 community-x86_64/tmpfiles.conf  |    2 
 community-x86_64/user.service   |   13 --
 15 files changed, 322 insertions(+), 326 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-i686/PKGBUILD	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,119 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Storm Dragon <stormdragon2976 at gmail.com>
-# Contributor: Aaron 'venisonslurpee' Laursen <venisonslurpee at gmail.com>
-# Contributor: Christopher Rosell <chrippa at tanuki.se>
-# Contributor: lh <jarryson at gmail.com>
-# Contributor: Sebastian Schwarz <seschwar at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Xilon <xilon at gmail.com>
-
-pkgname=xmms2
-pkgver=0.8DrO_o.882.g942b17f
-pkgrel=1
-pkgdesc="X-platform Music Multiplexing System 2"
-arch=(i686 x86_64)
-url="https://xmms2.org/"
-license=(GPL LGPL)
-_depends=('alsa-lib: ALSA output'
-          'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
-          'boost: C++ bindings'
-          'curl: play HTTP streams'
-          'cython: Python bindings'
-          'faad2: AAC support'
-          'ffmpeg: WMA, avcodec & avformat support'
-          'fftw: visualization'
-          'flac: FLAC support'
-          'fluidsynth: MIDI support'
-          'jack: JACK output'
-          'libao: libao output'
-          'libcdio-paranoia: CDDA support'
-          'libdiscid: CDDA support'
-          'libgme: support for various video game music formats'
-          'libmad: MP3 support'
-          'libmms: play MMS streams'
-          'libmodplug: MOD support'
-          'libmpcdec: Musepack support'
-          'libofa: MusicDNS fingerprinting'
-          'libsamplerate: vocoder support'
-          'libshout: Icecast output'
-          'libvorbis: Ogg Vorbis support'
-          'libxml2: XSPF and podcast support'
-          'mac: APE support'
-          'mpg123: alternative MP3 support'
-          'opusfile: Opus support'
-          'perl: Perl bindings'
-          'ruby: Ruby bindings'
-#          'sidplay2-libs: support for C64 music files'
-# we do not have sidplay 2 series in repos; also it's
-# somehow connected with resid i guess(not in repos also)
-          'smbclient: direct CIFS/SMB access'
-          'speex: Speex support'
-          'wavpack: WavPack support')
-depends=(glib2 readline)
-makedepends=("${_depends[@]%%:*}" libpulse python2 git)
-optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output')
-provides=(xmms2)
-conflicts=(xmms2 xmms2-devel)
-install=install.sh
-source=(git://git.xmms2.org/xmms2/xmms2-devel.git
-        tmpfiles.conf
-        system.service
-        user.service)
-md5sums=('SKIP'
-         'd3ab09ed8d1cf982468d1ceb141d4a9d'
-         '4b026ab80e853f24b5cf13b310afb83c'
-         'f773f674882946065c02e36e9548eb00')
-
-pkgver() {
-    cd "$srcdir/xmms2-devel"
-    git describe --always | sed 's/-/./g'
-}
-
-prepare() {
-    cd "$srcdir/xmms2-devel"
-    git submodule update --init
-    sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
-    sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
-    sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
-    sed -i 's|Werror|Wno-error|g' waftools/*.py
-}
-
-build() {
-    cd "$srcdir/xmms2-devel"
-    CXXFLAGS="-Wall" CFLAGS="-Wall" ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \
-            --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
-            --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \
-            --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \
-            --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
-            --without-optionals=python
-    ./waf build
-}
-
-package() {
-    cd "$srcdir/xmms2-devel"
-    ./waf --destdir="$pkgdir" install
-    install -d -o46 -g46 "$pkgdir/var/lib/xmms2"
-    install -Dm0644 "$srcdir/tmpfiles.conf" \
-            "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
-    install -Dm0644 "$srcdir/system.service" \
-            "$pkgdir/usr/lib/systemd/system/xmms2d.service"
-    install -Dm0644 "$srcdir/user.service" \
-            "$pkgdir/usr/lib/systemd/user/xmms2d.service"
-
-    [ -d $pkgdir/usr/lib64 ] && \
-        { mv $pkgdir/usr/lib64/* $pkgdir/usr/lib/; rmdir $pkgdir/usr/lib64; } || \
-        true
-
-    # also install python2 bindings
-    #./waf distclean
-    #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
-    #./waf build
-    #./waf --destdir="$pkgdir" install
-# template start; name=perl-binary-module-dependency; version=1;
-if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-fi
-# template end;
-}

Copied: xmms2/repos/community-i686/PKGBUILD (from rev 142754, xmms2/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,119 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Storm Dragon <stormdragon2976 at gmail.com>
+# Contributor: Aaron 'venisonslurpee' Laursen <venisonslurpee at gmail.com>
+# Contributor: Christopher Rosell <chrippa at tanuki.se>
+# Contributor: lh <jarryson at gmail.com>
+# Contributor: Sebastian Schwarz <seschwar at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Xilon <xilon at gmail.com>
+
+pkgname=xmms2
+pkgver=0.8DrO_o.882.g942b17f
+pkgrel=2
+pkgdesc="X-platform Music Multiplexing System 2"
+arch=(i686 x86_64)
+url="https://xmms2.org/"
+license=(GPL LGPL)
+_depends=('alsa-lib: ALSA output'
+          'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
+          'boost: C++ bindings'
+          'curl: play HTTP streams'
+          'cython: Python bindings'
+          'faad2: AAC support'
+          'ffmpeg: WMA, avcodec & avformat support'
+          'fftw: visualization'
+          'flac: FLAC support'
+          'fluidsynth: MIDI support'
+          'jack: JACK output'
+          'libao: libao output'
+          'libcdio-paranoia: CDDA support'
+          'libdiscid: CDDA support'
+          'libgme: support for various video game music formats'
+          'libmad: MP3 support'
+          'libmms: play MMS streams'
+          'libmodplug: MOD support'
+          'libmpcdec: Musepack support'
+          'libofa: MusicDNS fingerprinting'
+          'libsamplerate: vocoder support'
+          'libshout: Icecast output'
+          'libvorbis: Ogg Vorbis support'
+          'libxml2: XSPF and podcast support'
+          'mac: APE support'
+          'mpg123: alternative MP3 support'
+          'opusfile: Opus support'
+          'perl: Perl bindings'
+          'ruby: Ruby bindings'
+#          'sidplay2-libs: support for C64 music files'
+# we do not have sidplay 2 series in repos; also it's
+# somehow connected with resid i guess(not in repos also)
+          'smbclient: direct CIFS/SMB access'
+          'speex: Speex support'
+          'wavpack: WavPack support')
+depends=(glib2 readline)
+makedepends=("${_depends[@]%%:*}" libpulse python2 git)
+optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output')
+provides=(xmms2)
+conflicts=(xmms2 xmms2-devel)
+install=install.sh
+source=(git://git.xmms2.org/xmms2/xmms2-devel.git
+        tmpfiles.conf
+        system.service
+        user.service)
+md5sums=('SKIP'
+         'd3ab09ed8d1cf982468d1ceb141d4a9d'
+         '4b026ab80e853f24b5cf13b310afb83c'
+         'f773f674882946065c02e36e9548eb00')
+
+pkgver() {
+    cd "$srcdir/xmms2-devel"
+    git describe --always | sed 's/-/./g'
+}
+
+prepare() {
+    cd "$srcdir/xmms2-devel"
+    git submodule update --init
+    sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
+    sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
+    sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
+    sed -i 's|Werror|Wno-error|g' waftools/*.py
+}
+
+build() {
+    cd "$srcdir/xmms2-devel"
+    CXXFLAGS="-Wall" CFLAGS="-Wall" ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \
+            --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
+            --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \
+            --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \
+            --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater,sqlite2s4 \
+            --without-optionals=python
+    ./waf build
+}
+
+package() {
+    cd "$srcdir/xmms2-devel"
+    ./waf --destdir="$pkgdir" install
+    install -d -o46 -g46 "$pkgdir/var/lib/xmms2"
+    install -Dm0644 "$srcdir/tmpfiles.conf" \
+            "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
+    install -Dm0644 "$srcdir/system.service" \
+            "$pkgdir/usr/lib/systemd/system/xmms2d.service"
+    install -Dm0644 "$srcdir/user.service" \
+            "$pkgdir/usr/lib/systemd/user/xmms2d.service"
+
+    [ -d $pkgdir/usr/lib64 ] && \
+        { mv $pkgdir/usr/lib64/* $pkgdir/usr/lib/; rmdir $pkgdir/usr/lib64; } || \
+        true
+
+    # also install python2 bindings
+    #./waf distclean
+    #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
+    #./waf build
+    #./waf --destdir="$pkgdir" install
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+}

Deleted: community-i686/install.sh
===================================================================
--- community-i686/install.sh	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-i686/install.sh	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,12 +0,0 @@
-post_install() {
-    getent group  xmms2 > /dev/null || groupadd -r -g 46 xmms2
-    getent passwd xmms2 > /dev/null || useradd  -r -u 46 -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2
-    usr/bin/systemd-tmpfiles --create xmms2.conf
-    true
-}
-
-post_remove() {
-    getent passwd xmms2 > /dev/null && userdel  xmms2
-    getent group  xmms2 > /dev/null && groupdel xmms2
-    true
-}

Copied: xmms2/repos/community-i686/install.sh (from rev 142754, xmms2/trunk/install.sh)
===================================================================
--- community-i686/install.sh	                        (rev 0)
+++ community-i686/install.sh	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,10 @@
+post_install() {
+    getent group  xmms2 > /dev/null || groupadd -r -g 46 xmms2
+    getent passwd xmms2 > /dev/null || useradd  -r -u 46 -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2
+    usr/bin/systemd-tmpfiles --create xmms2.conf
+    true
+}
+
+post_upgrade() {
+  post_install
+}
\ No newline at end of file

Deleted: community-i686/system.service
===================================================================
--- community-i686/system.service	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-i686/system.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,17 +0,0 @@
-[Unit]
-Description=XMMS2 daemon
-Documentation=man:xmms2-launcher(1) man:xmms2d(1)
-Wants=fluidsynth.service
-After=fluidsynth.service network.target sound.target
-
-[Service]
-Type=forking
-User=xmms2
-# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration
-Environment=XDG_CONFIG_HOME=/var/lib
-PIDFile=%t/xmms2/xmms2d.pid
-ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid
-ExecStop=/usr/bin/xmms2 server shutdown
-
-[Install]
-WantedBy=multi-user.target

Copied: xmms2/repos/community-i686/system.service (from rev 142754, xmms2/trunk/system.service)
===================================================================
--- community-i686/system.service	                        (rev 0)
+++ community-i686/system.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,17 @@
+[Unit]
+Description=XMMS2 daemon
+Documentation=man:xmms2-launcher(1) man:xmms2d(1)
+Wants=fluidsynth.service
+After=fluidsynth.service network.target sound.target
+
+[Service]
+Type=forking
+User=xmms2
+# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration
+Environment=XDG_CONFIG_HOME=/var/lib
+PIDFile=%t/xmms2/xmms2d.pid
+ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid
+ExecStop=/usr/bin/xmms2 server shutdown
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/tmpfiles.conf
===================================================================
--- community-i686/tmpfiles.conf	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-i686/tmpfiles.conf	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,2 +0,0 @@
-d /run/xmms2          0755 xmms2 xmms2
-f /var/log/xmms2d.log 0644 xmms2 xmms2

Copied: xmms2/repos/community-i686/tmpfiles.conf (from rev 142754, xmms2/trunk/tmpfiles.conf)
===================================================================
--- community-i686/tmpfiles.conf	                        (rev 0)
+++ community-i686/tmpfiles.conf	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,2 @@
+d /run/xmms2          0755 xmms2 xmms2
+f /var/log/xmms2d.log 0644 xmms2 xmms2

Deleted: community-i686/user.service
===================================================================
--- community-i686/user.service	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-i686/user.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,13 +0,0 @@
-[Unit]
-Description=XMMS2 daemon
-Documentation=man:xmms2-launcher(1) man:xmms2d(1)
-After=network.target sound.target
-
-[Service]
-Type=forking
-PIDFile=%t/xmms2d.pid
-ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid
-ExecStop=/usr/bin/xmms2 server shutdown
-
-[Install]
-WantedBy=default.target

Copied: xmms2/repos/community-i686/user.service (from rev 142754, xmms2/trunk/user.service)
===================================================================
--- community-i686/user.service	                        (rev 0)
+++ community-i686/user.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,13 @@
+[Unit]
+Description=XMMS2 daemon
+Documentation=man:xmms2-launcher(1) man:xmms2d(1)
+After=network.target sound.target
+
+[Service]
+Type=forking
+PIDFile=%t/xmms2d.pid
+ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid
+ExecStop=/usr/bin/xmms2 server shutdown
+
+[Install]
+WantedBy=default.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-x86_64/PKGBUILD	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,119 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Storm Dragon <stormdragon2976 at gmail.com>
-# Contributor: Aaron 'venisonslurpee' Laursen <venisonslurpee at gmail.com>
-# Contributor: Christopher Rosell <chrippa at tanuki.se>
-# Contributor: lh <jarryson at gmail.com>
-# Contributor: Sebastian Schwarz <seschwar at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Xilon <xilon at gmail.com>
-
-pkgname=xmms2
-pkgver=0.8DrO_o.882.g942b17f
-pkgrel=1
-pkgdesc="X-platform Music Multiplexing System 2"
-arch=(i686 x86_64)
-url="https://xmms2.org/"
-license=(GPL LGPL)
-_depends=('alsa-lib: ALSA output'
-          'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
-          'boost: C++ bindings'
-          'curl: play HTTP streams'
-          'cython: Python bindings'
-          'faad2: AAC support'
-          'ffmpeg: WMA, avcodec & avformat support'
-          'fftw: visualization'
-          'flac: FLAC support'
-          'fluidsynth: MIDI support'
-          'jack: JACK output'
-          'libao: libao output'
-          'libcdio-paranoia: CDDA support'
-          'libdiscid: CDDA support'
-          'libgme: support for various video game music formats'
-          'libmad: MP3 support'
-          'libmms: play MMS streams'
-          'libmodplug: MOD support'
-          'libmpcdec: Musepack support'
-          'libofa: MusicDNS fingerprinting'
-          'libsamplerate: vocoder support'
-          'libshout: Icecast output'
-          'libvorbis: Ogg Vorbis support'
-          'libxml2: XSPF and podcast support'
-          'mac: APE support'
-          'mpg123: alternative MP3 support'
-          'opusfile: Opus support'
-          'perl: Perl bindings'
-          'ruby: Ruby bindings'
-#          'sidplay2-libs: support for C64 music files'
-# we do not have sidplay 2 series in repos; also it's
-# somehow connected with resid i guess(not in repos also)
-          'smbclient: direct CIFS/SMB access'
-          'speex: Speex support'
-          'wavpack: WavPack support')
-depends=(glib2 readline)
-makedepends=("${_depends[@]%%:*}" libpulse python2 git)
-optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output')
-provides=(xmms2)
-conflicts=(xmms2 xmms2-devel)
-install=install.sh
-source=(git://git.xmms2.org/xmms2/xmms2-devel.git
-        tmpfiles.conf
-        system.service
-        user.service)
-md5sums=('SKIP'
-         'd3ab09ed8d1cf982468d1ceb141d4a9d'
-         '4b026ab80e853f24b5cf13b310afb83c'
-         'f773f674882946065c02e36e9548eb00')
-
-pkgver() {
-    cd "$srcdir/xmms2-devel"
-    git describe --always | sed 's/-/./g'
-}
-
-prepare() {
-    cd "$srcdir/xmms2-devel"
-    git submodule update --init
-    sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
-    sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
-    sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
-    sed -i 's|Werror|Wno-error|g' waftools/*.py
-}
-
-build() {
-    cd "$srcdir/xmms2-devel"
-    CXXFLAGS="-Wall" CFLAGS="-Wall" ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \
-            --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
-            --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \
-            --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \
-            --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
-            --without-optionals=python
-    ./waf build
-}
-
-package() {
-    cd "$srcdir/xmms2-devel"
-    ./waf --destdir="$pkgdir" install
-    install -d -o46 -g46 "$pkgdir/var/lib/xmms2"
-    install -Dm0644 "$srcdir/tmpfiles.conf" \
-            "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
-    install -Dm0644 "$srcdir/system.service" \
-            "$pkgdir/usr/lib/systemd/system/xmms2d.service"
-    install -Dm0644 "$srcdir/user.service" \
-            "$pkgdir/usr/lib/systemd/user/xmms2d.service"
-
-    [ -d $pkgdir/usr/lib64 ] && \
-        { mv $pkgdir/usr/lib64/* $pkgdir/usr/lib/; rmdir $pkgdir/usr/lib64; } || \
-        true
-
-    # also install python2 bindings
-    #./waf distclean
-    #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
-    #./waf build
-    #./waf --destdir="$pkgdir" install
-# template start; name=perl-binary-module-dependency; version=1;
-if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-fi
-# template end;
-}

Copied: xmms2/repos/community-x86_64/PKGBUILD (from rev 142754, xmms2/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,119 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Storm Dragon <stormdragon2976 at gmail.com>
+# Contributor: Aaron 'venisonslurpee' Laursen <venisonslurpee at gmail.com>
+# Contributor: Christopher Rosell <chrippa at tanuki.se>
+# Contributor: lh <jarryson at gmail.com>
+# Contributor: Sebastian Schwarz <seschwar at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Xilon <xilon at gmail.com>
+
+pkgname=xmms2
+pkgver=0.8DrO_o.882.g942b17f
+pkgrel=2
+pkgdesc="X-platform Music Multiplexing System 2"
+arch=(i686 x86_64)
+url="https://xmms2.org/"
+license=(GPL LGPL)
+_depends=('alsa-lib: ALSA output'
+          'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
+          'boost: C++ bindings'
+          'curl: play HTTP streams'
+          'cython: Python bindings'
+          'faad2: AAC support'
+          'ffmpeg: WMA, avcodec & avformat support'
+          'fftw: visualization'
+          'flac: FLAC support'
+          'fluidsynth: MIDI support'
+          'jack: JACK output'
+          'libao: libao output'
+          'libcdio-paranoia: CDDA support'
+          'libdiscid: CDDA support'
+          'libgme: support for various video game music formats'
+          'libmad: MP3 support'
+          'libmms: play MMS streams'
+          'libmodplug: MOD support'
+          'libmpcdec: Musepack support'
+          'libofa: MusicDNS fingerprinting'
+          'libsamplerate: vocoder support'
+          'libshout: Icecast output'
+          'libvorbis: Ogg Vorbis support'
+          'libxml2: XSPF and podcast support'
+          'mac: APE support'
+          'mpg123: alternative MP3 support'
+          'opusfile: Opus support'
+          'perl: Perl bindings'
+          'ruby: Ruby bindings'
+#          'sidplay2-libs: support for C64 music files'
+# we do not have sidplay 2 series in repos; also it's
+# somehow connected with resid i guess(not in repos also)
+          'smbclient: direct CIFS/SMB access'
+          'speex: Speex support'
+          'wavpack: WavPack support')
+depends=(glib2 readline)
+makedepends=("${_depends[@]%%:*}" libpulse python2 git)
+optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output')
+provides=(xmms2)
+conflicts=(xmms2 xmms2-devel)
+install=install.sh
+source=(git://git.xmms2.org/xmms2/xmms2-devel.git
+        tmpfiles.conf
+        system.service
+        user.service)
+md5sums=('SKIP'
+         'd3ab09ed8d1cf982468d1ceb141d4a9d'
+         '4b026ab80e853f24b5cf13b310afb83c'
+         'f773f674882946065c02e36e9548eb00')
+
+pkgver() {
+    cd "$srcdir/xmms2-devel"
+    git describe --always | sed 's/-/./g'
+}
+
+prepare() {
+    cd "$srcdir/xmms2-devel"
+    git submodule update --init
+    sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
+    sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
+    sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
+    sed -i 's|Werror|Wno-error|g' waftools/*.py
+}
+
+build() {
+    cd "$srcdir/xmms2-devel"
+    CXXFLAGS="-Wall" CFLAGS="-Wall" ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \
+            --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
+            --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \
+            --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \
+            --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater,sqlite2s4 \
+            --without-optionals=python
+    ./waf build
+}
+
+package() {
+    cd "$srcdir/xmms2-devel"
+    ./waf --destdir="$pkgdir" install
+    install -d -o46 -g46 "$pkgdir/var/lib/xmms2"
+    install -Dm0644 "$srcdir/tmpfiles.conf" \
+            "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
+    install -Dm0644 "$srcdir/system.service" \
+            "$pkgdir/usr/lib/systemd/system/xmms2d.service"
+    install -Dm0644 "$srcdir/user.service" \
+            "$pkgdir/usr/lib/systemd/user/xmms2d.service"
+
+    [ -d $pkgdir/usr/lib64 ] && \
+        { mv $pkgdir/usr/lib64/* $pkgdir/usr/lib/; rmdir $pkgdir/usr/lib64; } || \
+        true
+
+    # also install python2 bindings
+    #./waf distclean
+    #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
+    #./waf build
+    #./waf --destdir="$pkgdir" install
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+}

Deleted: community-x86_64/install.sh
===================================================================
--- community-x86_64/install.sh	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-x86_64/install.sh	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,12 +0,0 @@
-post_install() {
-    getent group  xmms2 > /dev/null || groupadd -r -g 46 xmms2
-    getent passwd xmms2 > /dev/null || useradd  -r -u 46 -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2
-    usr/bin/systemd-tmpfiles --create xmms2.conf
-    true
-}
-
-post_remove() {
-    getent passwd xmms2 > /dev/null && userdel  xmms2
-    getent group  xmms2 > /dev/null && groupdel xmms2
-    true
-}

Copied: xmms2/repos/community-x86_64/install.sh (from rev 142754, xmms2/trunk/install.sh)
===================================================================
--- community-x86_64/install.sh	                        (rev 0)
+++ community-x86_64/install.sh	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,10 @@
+post_install() {
+    getent group  xmms2 > /dev/null || groupadd -r -g 46 xmms2
+    getent passwd xmms2 > /dev/null || useradd  -r -u 46 -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2
+    usr/bin/systemd-tmpfiles --create xmms2.conf
+    true
+}
+
+post_upgrade() {
+  post_install
+}
\ No newline at end of file

Deleted: community-x86_64/system.service
===================================================================
--- community-x86_64/system.service	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-x86_64/system.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,17 +0,0 @@
-[Unit]
-Description=XMMS2 daemon
-Documentation=man:xmms2-launcher(1) man:xmms2d(1)
-Wants=fluidsynth.service
-After=fluidsynth.service network.target sound.target
-
-[Service]
-Type=forking
-User=xmms2
-# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration
-Environment=XDG_CONFIG_HOME=/var/lib
-PIDFile=%t/xmms2/xmms2d.pid
-ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid
-ExecStop=/usr/bin/xmms2 server shutdown
-
-[Install]
-WantedBy=multi-user.target

Copied: xmms2/repos/community-x86_64/system.service (from rev 142754, xmms2/trunk/system.service)
===================================================================
--- community-x86_64/system.service	                        (rev 0)
+++ community-x86_64/system.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,17 @@
+[Unit]
+Description=XMMS2 daemon
+Documentation=man:xmms2-launcher(1) man:xmms2d(1)
+Wants=fluidsynth.service
+After=fluidsynth.service network.target sound.target
+
+[Service]
+Type=forking
+User=xmms2
+# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration
+Environment=XDG_CONFIG_HOME=/var/lib
+PIDFile=%t/xmms2/xmms2d.pid
+ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid
+ExecStop=/usr/bin/xmms2 server shutdown
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/tmpfiles.conf
===================================================================
--- community-x86_64/tmpfiles.conf	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-x86_64/tmpfiles.conf	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,2 +0,0 @@
-d /run/xmms2          0755 xmms2 xmms2
-f /var/log/xmms2d.log 0644 xmms2 xmms2

Copied: xmms2/repos/community-x86_64/tmpfiles.conf (from rev 142754, xmms2/trunk/tmpfiles.conf)
===================================================================
--- community-x86_64/tmpfiles.conf	                        (rev 0)
+++ community-x86_64/tmpfiles.conf	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,2 @@
+d /run/xmms2          0755 xmms2 xmms2
+f /var/log/xmms2d.log 0644 xmms2 xmms2

Deleted: community-x86_64/user.service
===================================================================
--- community-x86_64/user.service	2015-10-02 11:05:15 UTC (rev 142754)
+++ community-x86_64/user.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -1,13 +0,0 @@
-[Unit]
-Description=XMMS2 daemon
-Documentation=man:xmms2-launcher(1) man:xmms2d(1)
-After=network.target sound.target
-
-[Service]
-Type=forking
-PIDFile=%t/xmms2d.pid
-ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid
-ExecStop=/usr/bin/xmms2 server shutdown
-
-[Install]
-WantedBy=default.target

Copied: xmms2/repos/community-x86_64/user.service (from rev 142754, xmms2/trunk/user.service)
===================================================================
--- community-x86_64/user.service	                        (rev 0)
+++ community-x86_64/user.service	2015-10-02 11:05:45 UTC (rev 142755)
@@ -0,0 +1,13 @@
+[Unit]
+Description=XMMS2 daemon
+Documentation=man:xmms2-launcher(1) man:xmms2d(1)
+After=network.target sound.target
+
+[Service]
+Type=forking
+PIDFile=%t/xmms2d.pid
+ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid
+ExecStop=/usr/bin/xmms2 server shutdown
+
+[Install]
+WantedBy=default.target



More information about the arch-commits mailing list