diff options
Diffstat (limited to 'abs/extra')
55 files changed, 824 insertions, 348 deletions
diff --git a/abs/extra/community/afpfs-ng/01-gcrypt.patch b/abs/extra/afpfs-ng/01-gcrypt.patch index 7bcace2..7bcace2 100644 --- a/abs/extra/community/afpfs-ng/01-gcrypt.patch +++ b/abs/extra/afpfs-ng/01-gcrypt.patch diff --git a/abs/extra/community/afpfs-ng/02-pointer.patch b/abs/extra/afpfs-ng/02-pointer.patch index 80507b5..80507b5 100644 --- a/abs/extra/community/afpfs-ng/02-pointer.patch +++ b/abs/extra/afpfs-ng/02-pointer.patch diff --git a/abs/extra/community/afpfs-ng/10-fix-errno.patch b/abs/extra/afpfs-ng/10-fix-errno.patch index ff7ce44..ff7ce44 100644 --- a/abs/extra/community/afpfs-ng/10-fix-errno.patch +++ b/abs/extra/afpfs-ng/10-fix-errno.patch diff --git a/abs/extra/community/afpfs-ng/20-build-error-fixes.patch b/abs/extra/afpfs-ng/20-build-error-fixes.patch index 303e264..303e264 100644 --- a/abs/extra/community/afpfs-ng/20-build-error-fixes.patch +++ b/abs/extra/afpfs-ng/20-build-error-fixes.patch diff --git a/abs/extra/community/afpfs-ng/21-header-path-fix.patch b/abs/extra/afpfs-ng/21-header-path-fix.patch index fe79b1f..fe79b1f 100644 --- a/abs/extra/community/afpfs-ng/21-header-path-fix.patch +++ b/abs/extra/afpfs-ng/21-header-path-fix.patch diff --git a/abs/extra/community/afpfs-ng/30-include-fixes.patch b/abs/extra/afpfs-ng/30-include-fixes.patch index de4f883..de4f883 100644 --- a/abs/extra/community/afpfs-ng/30-include-fixes.patch +++ b/abs/extra/afpfs-ng/30-include-fixes.patch diff --git a/abs/extra/community/afpfs-ng/PKGBUILD b/abs/extra/afpfs-ng/PKGBUILD index 4538db9..f8dc2d6 100644 --- a/abs/extra/community/afpfs-ng/PKGBUILD +++ b/abs/extra/afpfs-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 68567 2012-03-28 10:22:57Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: slubman <slubman.dndd@laposte.net> diff --git a/abs/extra/community/afpfs-ng/fix_afpfs-ng_includes.patch b/abs/extra/afpfs-ng/fix_afpfs-ng_includes.patch index f507a48..f507a48 100644 --- a/abs/extra/community/afpfs-ng/fix_afpfs-ng_includes.patch +++ b/abs/extra/afpfs-ng/fix_afpfs-ng_includes.patch diff --git a/abs/extra/community/fluidsynth/fluidsynth.conf b/abs/extra/community/fluidsynth/fluidsynth.conf deleted file mode 100644 index 5267d58..0000000 --- a/abs/extra/community/fluidsynth/fluidsynth.conf +++ /dev/null @@ -1,2 +0,0 @@ -FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT=""
\ No newline at end of file diff --git a/abs/extra/dbus-c++/PKGBUILD b/abs/extra/dbus-c++/PKGBUILD new file mode 100644 index 0000000..d79922e --- /dev/null +++ b/abs/extra/dbus-c++/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Xavier D. <magicrhesus@ouranos.be> +# Contributor: Zarra <zarraxx@gmail.com> + +pkgname=dbus-c++ +_pkgname=lib$pkgname +pkgver=0.9.0 +pkgrel=4 +pkgdesc="A C++ API for D-BUS" +url="http://sourceforge.net/projects/dbus-cplusplus/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus>=1.2.0' 'glib2') +makedepends=('autoconf' 'automake' 'libtool') +options=('!libtool') +source=("http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/$pkgver/libdbus-c%2B%2B-$pkgver.tar.gz" + 'gcc47.patch') +md5sums=('e752116f523fa88ef041e63d3dee4de2' + '9319b402b15f37d881b51bc758368900') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + patch -Np0 -i "$srcdir/gcc47.patch" + export LDFLAGS+=" -lexpat -lpthread" # -lpthread needed for i686 + + ./autogen.sh --prefix=/usr \ + --disable-static \ + --enable-glib \ + --disable-ecore + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/dbus-c++/gcc47.patch b/abs/extra/dbus-c++/gcc47.patch new file mode 100644 index 0000000..6a82773 --- /dev/null +++ b/abs/extra/dbus-c++/gcc47.patch @@ -0,0 +1,10 @@ +--- src/eventloop-integration.cpp.orig 2012-05-09 11:22:09.683290763 +0200 ++++ src/eventloop-integration.cpp 2012-05-09 11:22:44.313288912 +0200 +@@ -38,6 +38,7 @@ + #include <cassert> + #include <sys/poll.h> + #include <fcntl.h> ++#include <unistd.h> + + using namespace DBus; + using namespace std; diff --git a/abs/extra/doxygen/PKGBUILD b/abs/extra/doxygen/PKGBUILD index 19ca9c8..d877cd2 100644 --- a/abs/extra/doxygen/PKGBUILD +++ b/abs/extra/doxygen/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 84267 2010-06-28 05:13:23Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=doxygen -pkgver=1.7.2 +pkgver=1.8.2 pkgrel=1 pkgdesc="A documentation system for C++, C, Java, IDL and PHP" license=('GPL') @@ -21,6 +21,5 @@ build() { make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install } -md5sums=('13e76e10fb55581a16ee04de35c264f0') -md5sums=('d5f3e32474186abc64288db6b8ffd7f0') +md5sums=('6fa7baf995fa3f71cfc09e264ba88a83') diff --git a/abs/extra/community/fluidsynth/PKGBUILD b/abs/extra/fluidsynth/PKGBUILD index 944222e..bef6083 100644 --- a/abs/extra/community/fluidsynth/PKGBUILD +++ b/abs/extra/fluidsynth/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 94804 2010-10-11 11:48:58Z schiv $ +# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth -pkgver=1.1.3 +pkgver=1.1.6 pkgrel=1 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.fluidsynth.org/" -depends=('glib2' 'jack' 'dbus-core') +#depends=('glib2' 'jack' 'dbus-core' 'libpulse') +depends=('glib2' 'dbus-core' ) makedepends=('cmake' 'ladspa' 'doxygen') -optdepends=('bash: init script') +#optdepends=('pulseaudio: PulseAudio sound support') license=('LGPL') backup=('etc/conf.d/fluidsynth') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fluidsynth.conf - fluidsynthd) -md5sums=('0d3e3cc770b4da413010dfb7dfdce9c8' - '16c5f4d4cbdddc6c5fcbd4fd4cc142f1' - 'b296dbfb524c2164f552f68bd9abe2ec') +install=$pkgname.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'fluidsynth.conf' + 'fluidsynth.rc' + 'fluidsynth.systemd') +md5sums=('ae5aca6de824b4173667cbd3a310b263' + '7d0ab0d75d4e87652f4cb7ffeac8a82b' + 'b296dbfb524c2164f552f68bd9abe2ec' + 'e0406748a154409907df62292be32e8a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,8 +42,11 @@ package() { install -Dm644 "$srcdir/fluidsynth.conf" \ "$pkgdir/etc/conf.d/fluidsynth" - install -Dm755 "$srcdir/fluidsynthd" \ + install -Dm755 "$srcdir/fluidsynth.rc" \ "$pkgdir/etc/rc.d/fluidsynth" + + install -Dm644 "$srcdir/fluidsynth.systemd" \ + "$pkgdir/usr/lib/systemd/system/fluidsynth.service" } # vim:set ts=2 sw=2 et: diff --git a/abs/extra/fluidsynth/__changelog b/abs/extra/fluidsynth/__changelog new file mode 100644 index 0000000..144c13b --- /dev/null +++ b/abs/extra/fluidsynth/__changelog @@ -0,0 +1 @@ +removed pulse jack diff --git a/abs/extra/fluidsynth/fluidsynth.conf b/abs/extra/fluidsynth/fluidsynth.conf new file mode 100644 index 0000000..b8465fa --- /dev/null +++ b/abs/extra/fluidsynth/fluidsynth.conf @@ -0,0 +1,2 @@ +FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" +FSYNTH_SOUNDFONT="" # path to your soundfont diff --git a/abs/extra/fluidsynth/fluidsynth.install b/abs/extra/fluidsynth/fluidsynth.install new file mode 100644 index 0000000..86e05f8 --- /dev/null +++ b/abs/extra/fluidsynth/fluidsynth.install @@ -0,0 +1,19 @@ +post_install() { + echo + echo " > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth" + echo + echo " > Systemd users need to copy the service file from:" + echo " /usr/lib/systemd/system/fluidsynth.service" + echo " > to:" + echo " /etc/systemd/system/multi-user.target.wants/" + echo " > and then edit accordingly." + echo + echo " > PulseAudio output when running as a daemon" + echo " > is known to be problematic. See:" + echo " https://bbs.archlinux.org/viewtopic.php?id=135092" + echo +} + +post_upgrade() { + post_install +} diff --git a/abs/extra/community/fluidsynth/fluidsynthd b/abs/extra/fluidsynth/fluidsynth.rc index ca1e8fa..ca1e8fa 100644 --- a/abs/extra/community/fluidsynth/fluidsynthd +++ b/abs/extra/fluidsynth/fluidsynth.rc diff --git a/abs/extra/fluidsynth/fluidsynth.systemd b/abs/extra/fluidsynth/fluidsynth.systemd new file mode 100644 index 0000000..06784fe --- /dev/null +++ b/abs/extra/fluidsynth/fluidsynth.systemd @@ -0,0 +1,9 @@ +[Unit] +Description=FluidSynth Daemon +After=sound.target + +[Service] +ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/libconfig/PKGBUILD b/abs/extra/libconfig/PKGBUILD new file mode 100644 index 0000000..fe7ac1e --- /dev/null +++ b/abs/extra/libconfig/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 55397 2011-09-11 21:15:58Z spupykin $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: see .contrib + +pkgname=libconfig +pkgver=1.4.8 +pkgrel=1 +pkgdesc="C/C++ Configuration File Library" +arch=('i686' 'x86_64') +url="http://hyperrealm.com/libconfig/libconfig.html" +license=('LGPL') +depends=('gcc-libs' 'texinfo') +install=$pkgname.install +options=('!libtool' '!emptydirs' 'zipman') +source=("http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz") +md5sums=('36788da452e9fcfc8efb7661ef5d31ef') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/share/info/dir" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/libconfig/libconfig.install b/abs/extra/libconfig/libconfig.install new file mode 100644 index 0000000..c03d5f7 --- /dev/null +++ b/abs/extra/libconfig/libconfig.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(libconfig.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/extra/libffado/60-ffado.rules b/abs/extra/libffado/60-ffado.rules deleted file mode 100644 index 6ab8ef8..0000000 --- a/abs/extra/libffado/60-ffado.rules +++ /dev/null @@ -1,27 +0,0 @@ -SUBSYSTEM!="firewire", GOTO="ffado_end" - -ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S -ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. -ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. -ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation -ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG -ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation -ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH -ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio -ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. -ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. -ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. -ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited -ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation -ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH -ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems -ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. -ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION - -# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. - -ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW -ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire -ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME - -LABEL="ffado_end" diff --git a/abs/extra/libffado/PKGBUILD b/abs/extra/libffado/PKGBUILD index 772ebec..d1a0915 100644 --- a/abs/extra/libffado/PKGBUILD +++ b/abs/extra/libffado/PKGBUILD @@ -1,49 +1,46 @@ -# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $ +# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado -pkgver=2.0.1 -pkgrel=7 +pkgver=2.1.0 +pkgrel=3 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" license=('GPL') -depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-pyqt') +depends=('libiec61883' 'libavc1394' 'dbus-c++' + 'libxml++' 'alsa-lib' 'libsigc++' 'libconfig') +makedepends=('scons' 'subversion' 'python2-pyqt') optdepends=('python2: ffado-diag' 'python2-pyqt: mixer applet') provides=('ffado') -source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules') -md5sums=('786f31facd417e6207e429f50af0e15e' - '287bb3f506e31626c4b8f91f0e1d9407' - 'ac9763cb2dc2f3eb4e1894e30645c6f1' - 'f03a3e950801c4405b8934084651bca8') +source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz" + 'python2-qt.patch') +md5sums=('26bce2be0b9c1fa4e614f2f494edf388' + '10aa837f5521da213caa93e1ddc58c0e') + +_scons-conf() { + scons DEBUG=False \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + UDEVDIR=/usr/lib/udev/rules.d \ + COMPILE_FLAGS="$CFLAGS" $@ +} build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir"/libffado-gcc47.patch - patch -p3 -i "$srcdir"/fix-segfault-on-close.patch - - # hack to use CFLAGS without optimising - sed -i 's/-O2//g' SConstruct + # python2 fix + patch -Np1 -i "$srcdir/python2-qt.patch" - if [ "$CARCH" = "x86_64" ]; then - sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct + # build! + if [ "$CARCH" = 'x86_64' ]; then + _scons-conf ENABLE_OPTIMIZATIONS=True else - sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct + _scons-conf fi - - # python2 fix - sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct - sed -i 's:python support/tools:python2 support/tools:' \ - support/tools/SConscript - - scons PREFIX=/usr } package() { @@ -51,16 +48,6 @@ package() { scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install - # add audio device rules - # see https://bugs.archlinux.org/task/26342 - install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules" - - # python2 fix - for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i" - done - # desktop files & icons install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \ "$pkgdir/usr/share/applications/ffadomixer.desktop" diff --git a/abs/extra/libffado/fix-segfault-on-close.patch b/abs/extra/libffado/fix-segfault-on-close.patch deleted file mode 100644 index c81b97e..0000000 --- a/abs/extra/libffado/fix-segfault-on-close.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: /trunk/libffado/src/debugmodule/debugmodule.h
-===================================================================
---- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)
-+++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)
-@@ -283,6 +283,10 @@
- void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );
-
-+class DebugModuleManager;
-+
- class DebugModule {
- public:
-+ friend class DebugModuleManager;
-+
- enum {
- eDL_Message = DEBUG_LEVEL_MESSAGE,
-@@ -333,4 +337,5 @@
- std::string m_name;
- debug_level_t m_level;
-+ DebugModuleManager* m_manager;
- };
-
-Index: /trunk/libffado/src/debugmodule/debugmodule.cpp
-===================================================================
---- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)
-+++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)
-@@ -84,5 +84,6 @@
- // << endl;
- // }
-- if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-+
-+ if (m_manager && !m_manager->unregisterModule( *this ) ) {
- cerr << "Could not unregister DebugModule at DebugModuleManager"
- << endl;
-@@ -263,12 +264,9 @@
- DebugModuleManager::~DebugModuleManager()
- {
-- // cleanin up leftover modules
-- for ( DebugModuleVectorIterator it = m_debugModules.begin();
-- it != m_debugModules.end();
-- ++it )
-+ // cleaning up leftover modules
-+ while (!m_debugModules.empty())
- {
-- fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());
-- m_debugModules.erase( it );
-- delete *it;
-+ DebugModule *mod = m_debugModules.back();
-+ unregisterModule(*mod);
- }
-
-@@ -455,4 +453,6 @@
- } else {
- m_debugModules.push_back( &debugModule );
-+ if (debugModule.m_manager == NULL)
-+ debugModule.m_manager = this;
- }
- return true;
-@@ -469,4 +469,6 @@
- if ( *it == &debugModule ) {
- m_debugModules.erase( it );
-+ if (debugModule.m_manager == this)
-+ debugModule.m_manager = NULL;
- return true;
- }
diff --git a/abs/extra/libffado/libffado-gcc47.patch b/abs/extra/libffado/libffado-gcc47.patch deleted file mode 100644 index f296956..0000000 --- a/abs/extra/libffado/libffado-gcc47.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp ---- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 -+++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 -@@ -35,6 +35,7 @@ - - #include <cstdio> - #include <cstring> -+#include <unistd.h> - - namespace BeBoB { - enum { -diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp ---- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 -+++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 -@@ -34,6 +34,7 @@ - - #include <iostream> - #include <sstream> -+#include <unistd.h> - - #include <assert.h> - -diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp ---- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 -+++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 -@@ -44,6 +44,7 @@ - #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 - - #include <sstream> -+#include <unistd.h> - using namespace std; - - // FireWorks is the platform used and developed by ECHO AUDIO -diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp ---- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 -+++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 -@@ -34,6 +34,7 @@ - #include "libutil/Configuration.h" - - #include <cstring> -+#include <unistd.h> - #include <assert.h> - - IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); -diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp ---- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 -+++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 -@@ -24,6 +24,7 @@ - #include <argp.h> - #include <stdlib.h> - #include <iostream> -+#include <unistd.h> - #include <signal.h> - - #include "controlclient.h" diff --git a/abs/extra/libffado/python2-qt.patch b/abs/extra/libffado/python2-qt.patch new file mode 100644 index 0000000..042aa26 --- /dev/null +++ b/abs/extra/libffado/python2-qt.patch @@ -0,0 +1,246 @@ +diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct +--- libffado-2.1.0.orig/SConstruct 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/SConstruct 2012-09-19 14:20:01.670414379 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2007, 2008, 2010 Arnold Krille +@@ -134,7 +134,7 @@ + + def CheckForPyModule( context, module ): + context.Message( "Checking for the python module '" + module + "' " ) +- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) ++ ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" ) + context.Result( ret[0] ) + return ret[0] + +@@ -351,7 +351,7 @@ + + # PyQT checks + build_mixer = False +-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): ++if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): + env['PYUIC4'] = True + build_mixer = True + +diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py +--- libffado-2.1.0.orig/admin/dbus.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/dbus.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py +--- libffado-2.1.0.orig/admin/doxygen.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/doxygen.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py +--- libffado-2.1.0.orig/admin/pkgconfig.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pkgconfig.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py +--- libffado-2.1.0.orig/admin/pyuic.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py +--- libffado-2.1.0.orig/admin/pyuic4.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic4.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +@@ -21,10 +21,8 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-import imp +- + def pyuic4_action( target, source, env ): +- env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) ++ env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) + return 0 + + def pyuic4_string( target, source, env ): +@@ -34,7 +32,7 @@ + context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ import PyQt4.pyqtconfig + except ImportError: + ret = False + context.Result( ret ) +diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py +--- libffado-2.1.0.orig/admin/scanreplace.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/scanreplace.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript +--- libffado-2.1.0.orig/doc/SConscript 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/doc/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python2 + + Import( 'env' ) + +diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript +--- libffado-2.1.0.orig/support/dbus/SConscript 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/support/dbus/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/bin/env python ++#!/usr/bin/python2 + # + # Copyright (C) 2007,2008,2011 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript +--- libffado-2.1.0.orig/support/mixer-qt4/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2009 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py +--- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:18:53.834115214 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript +--- libffado-2.1.0.orig/support/tools/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/SConscript 2012-09-19 14:20:51.970141882 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +@@ -43,7 +43,7 @@ + # For the installation of the stuff + e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) + +-e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" ) ++e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" ) + + e.ScanReplace( "ffado-diag.in" ) + +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static +--- libffado-2.1.0.orig/support/tools/ffado-diag-static 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag-static 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -74,7 +74,7 @@ + # check libraries + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in +--- libffado-2.1.0.orig/support/tools/ffado-diag.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -120,7 +120,7 @@ + print " Prerequisites (dynamic at run-time)..." + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py +--- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-sandbox-install.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py +--- libffado-2.1.0.orig/support/tools/listirqinfo.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/listirqinfo.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py +--- libffado-2.1.0.orig/tests/dbus_test.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/dbus_test.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2007 by Pieter Palmers + # 2007-2008 by Arnold Krille +diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py +--- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/python/test-eap-ctrl.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # diff --git a/abs/extra/libimobiledevice/HOME-segfault.patch b/abs/extra/libimobiledevice/HOME-segfault.patch new file mode 100644 index 0000000..e48e6cb --- /dev/null +++ b/abs/extra/libimobiledevice/HOME-segfault.patch @@ -0,0 +1,14 @@ +The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset +Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> +--- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300 ++++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300 +@@ -125,6 +125,9 @@ + const char *cdir = getenv("XDG_CONFIG_HOME"); + if (!cdir) { + cdir = getenv("HOME"); ++ if (!cdir) { ++ cdir="/root"; ++ } + strcpy(__config_dir, cdir); + strcat(__config_dir, DIR_SEP_S); + strcat(__config_dir, ".config"); diff --git a/abs/extra/libimobiledevice/PKGBUILD b/abs/extra/libimobiledevice/PKGBUILD index 81a8003..bc921ac 100644 --- a/abs/extra/libimobiledevice/PKGBUILD +++ b/abs/extra/libimobiledevice/PKGBUILD @@ -1,27 +1,23 @@ -# $Id$ +# $Id: PKGBUILD 164989 2012-08-08 00:24:19Z tomegun $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice -pkgver=1.1.1 -pkgrel=3 +pkgver=1.1.4 +pkgrel=2 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') -depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') -makedepends=('python2' 'swig') +depends=('usbmuxd' 'gnutls' 'libgcrypt') options=('!libtool') source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 - swig-version-check.patch) -md5sums=('cdc13037e822d9ac2e109536701d153a' - '8bb215e36fe0e08a72332c108c7842cc') + HOME-segfault.patch) build() { cd "$pkgname-$pkgver" - # SWIG version check is wrong (still not fixed upstream) - patch -p1 -i ../swig-version-check.patch + patch -p0 < "$srcdir/HOME-segfault.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr make @@ -31,3 +27,5 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('3f28cbc6a2e30d34685049c0abde5183' + '0de709dbf8e79d0b00cca06f5e61d57c') diff --git a/abs/extra/libimobiledevice/swig-version-check.patch b/abs/extra/libimobiledevice/swig-version-check.patch deleted file mode 100644 index c56b095..0000000 --- a/abs/extra/libimobiledevice/swig-version-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure ---- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 -+++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 -@@ -3477,9 +3477,7 @@ - if test -z "$available_patch" ; then - available_patch=0 - fi -- if test $available_major -ne $required_major \ -- -o $available_minor -ne $required_minor \ -- -o $available_patch -lt $required_patch ; then -+ if test $available_major -lt $required_major ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 - $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} - SWIG=false diff --git a/abs/extra/libmicrohttpd/PKGBUILD b/abs/extra/libmicrohttpd/PKGBUILD index e56945d..7312377 100644 --- a/abs/extra/libmicrohttpd/PKGBUILD +++ b/abs/extra/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 35497 2010-12-21 07:51:02Z spupykin $ +# $Id: PKGBUILD 79771 2012-11-12 09:04:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,16 +6,17 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.3 -pkgrel=2 +pkgver=0.9.23 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') url="http://www.gnu.org/software/libmicrohttpd/" license=('LGPL') -options=(!libtool) -depends=('gnutls') +options=('!libtool') +depends=('gnutls' 'libgcrypt') +install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('a6c7dae57c51afd648b45a526098429a') +md5sums=('efd038d93836adc0149beaa1c2927f61') build() { cd ${pkgname}-${pkgver} @@ -31,5 +32,6 @@ package() { ${pkgdir}/usr/include/$pkgname/platform.h install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc + sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ + $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc } diff --git a/abs/extra/libmicrohttpd/libmicrohttpd.install b/abs/extra/libmicrohttpd/libmicrohttpd.install new file mode 100644 index 0000000..dc0d2b9 --- /dev/null +++ b/abs/extra/libmicrohttpd/libmicrohttpd.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(microhttpd.info microhttpd-tutorial.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/abs/extra/community/libmodplug/PKGBUILD b/abs/extra/libmodplug/PKGBUILD index 3065783..0db6639 100644 --- a/abs/extra/community/libmodplug/PKGBUILD +++ b/abs/extra/libmodplug/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 150611 2012-02-18 22:54:35Z pierre $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> pkgname=libmodplug -pkgver=0.8.8.3 +pkgver=0.8.8.4 pkgrel=1 pkgdesc="A MOD playing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') depends=('gcc-libs') options=('!libtool') source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz") -md5sums=('8a9c713f0f56894163ddc61f9a0d1f71') +md5sums=('fddc3c704c5489de2a3cf0fedfec59db') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/extra/community/libnfs/PKGBUILD b/abs/extra/libnfs/PKGBUILD index 687a416..eaef7ac 100644 --- a/abs/extra/community/libnfs/PKGBUILD +++ b/abs/extra/libnfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 68570 2012-03-28 10:32:51Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs diff --git a/abs/extra/community/libshairport/PKGBUILD b/abs/extra/libshairport/PKGBUILD index 293e1cc..d6e406c 100644 --- a/abs/extra/community/libshairport/PKGBUILD +++ b/abs/extra/libshairport/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 68571 2012-03-28 10:35:14Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libshairport diff --git a/abs/extra/libsigc++/PKGBUILD b/abs/extra/libsigc++/PKGBUILD index 308b99e..f40723b 100644 --- a/abs/extra/libsigc++/PKGBUILD +++ b/abs/extra/libsigc++/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151408 2012-02-26 10:35:06Z pierre $ +# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=libsigc++ pkgname=('libsigc++' 'libsigc++-docs') -pkgver=2.2.10 -pkgrel=2 +pkgver=2.2.11 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libsigc.sourceforge.net/" makedepends=('gcc-libs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2") -sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c') +source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz") +sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/abs/extra/libssh/PKGBUILD b/abs/extra/libssh/PKGBUILD index f70c291..a2dc1bf 100644 --- a/abs/extra/libssh/PKGBUILD +++ b/abs/extra/libssh/PKGBUILD @@ -1,22 +1,22 @@ -# $Id$ +# $Id: PKGBUILD 138141 2011-09-17 12:41:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.4.6 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" license=('LGPL') arch=('i686' 'x86_64') depends=('openssl') makedepends=('cmake' 'doxygen') -source=("http://www.libssh.org/files/0.4/${pkgname}-${pkgver}.tar.gz") -md5sums=('9efdc8911fdb150fb16500c2fbe4ef2e') +source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz") +md5sums=('38b67c48af7a9204660a3e08f97ceba6') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +26,6 @@ build() { } package(){ - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libssh/__changelog b/abs/extra/libssh/__changelog deleted file mode 100644 index 9e60b2f..0000000 --- a/abs/extra/libssh/__changelog +++ /dev/null @@ -1 +0,0 @@ -12/27/10 - chw - fixed URL for source diff --git a/abs/extra/libxml++/PKGBUILD b/abs/extra/libxml++/PKGBUILD index 198544c..8e7c83e 100644 --- a/abs/extra/libxml++/PKGBUILD +++ b/abs/extra/libxml++/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137178 2011-09-06 09:14:31Z ibiru $ +# $Id: PKGBUILD 170207 2012-11-05 11:38:10Z jgc $ # Maintainer: damir <damir@archlinux.org> pkgbase=libxml++ pkgname=('libxml++' 'libxml++-docs') -pkgver=2.34.2 +pkgver=2.36.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libxmlplusplus.sourceforge.net/" makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.36/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/abs/extra/libxml++/libxml++-2.36.0-1.src.tar.gz b/abs/extra/libxml++/libxml++-2.36.0-1.src.tar.gz new file mode 120000 index 0000000..5ef6071 --- /dev/null +++ b/abs/extra/libxml++/libxml++-2.36.0-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/src_packages/libxml++-2.36.0-1.src.tar.gz
\ No newline at end of file diff --git a/abs/extra/sdl_image/PKGBUILD b/abs/extra/sdl_image/PKGBUILD index 062490b..3f5fefb 100644 --- a/abs/extra/sdl_image/PKGBUILD +++ b/abs/extra/sdl_image/PKGBUILD @@ -1,22 +1,29 @@ -# $Id$ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_image -pkgver=1.2.10 +pkgver=1.2.12 pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom') depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) -md5sums=('6c06584b31559e2b59f2b982d0d1f628') +source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) +md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { - cd ${srcdir}/SDL_image-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + cd "$srcdir/SDL_image-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_image-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/extra/sdl_mixer/PKGBUILD b/abs/extra/sdl_mixer/PKGBUILD index f241519..626d401 100644 --- a/abs/extra/sdl_mixer/PKGBUILD +++ b/abs/extra/sdl_mixer/PKGBUILD @@ -1,29 +1,48 @@ -# $Id: PKGBUILD 70367 2010-02-26 13:24:25Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 170804 2012-11-12 02:00:36Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Lukas Sabota <punkrockguy318@cocmast.net> (Timidity Patch) pkgname=sdl_mixer -pkgver=1.2.11 -pkgrel=2 +pkgver=1.2.12 +pkgrel=3 pkgdesc="A simple multi-channel audio mixer" arch=('i686' 'x86_64') url="http://www.libsdl.org/projects/SDL_mixer/" -license=('LGPL' 'GPL') +license=('custom') depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg') +makedepends=('fluidsynth') +optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz) -md5sums=('65ada3d997fe85109191a5fb083f248c') +source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz + mikmod1.patch mikmod2.patch fluidsynth-volume.patch double-free-crash.patch) +md5sums=('e03ff73d77a55e3572ad0217131dc4a1' + '95a6d58686fe3017d58c39e3e1dd40f7' + 'd823994c3961f2ff48644478f27a27d1' + 'eed8b61defde36ac2077ef96d868ea3e' + '4b4835c63297f016a198cacb7dd68ec1') build() { - cd ${srcdir}/SDL_mixer-${pkgver} + cd "$srcdir/SDL_mixer-$pkgver" - sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \ - -e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \ - -e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \ + patch -Np1 -i ../mikmod1.patch + patch -Np1 -i ../mikmod2.patch + patch -Np1 -i ../fluidsynth-volume.patch + patch -Np1 -i ../double-free-crash.patch + + sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \ + -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \ + -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \ -i timidity/config.h - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_mixer-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/extra/sdl_mixer/double-free-crash.patch b/abs/extra/sdl_mixer/double-free-crash.patch new file mode 100644 index 0000000..6f4e6a1 --- /dev/null +++ b/abs/extra/sdl_mixer/double-free-crash.patch @@ -0,0 +1,32 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1329087437 18000 +# Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd +# Parent df72f22b4b411ad4b08f924329678aabd5ac97d6 +Fixed 1418 - crash on double free if loading WAV file failed + +diff -r df72f22b4b41 -r 2d713670db9b mixer.c +--- a/mixer.c Mon Jan 30 21:41:45 2012 -0500 ++++ b/mixer.c Sun Feb 12 17:57:17 2012 -0500 +@@ -610,13 +610,15 @@ + break; + default: + SDL_SetError("Unrecognized sound file type"); +- return(0); ++ if ( freesrc ) { ++ SDL_RWclose(src); ++ } ++ loaded = NULL; ++ break; + } + if ( !loaded ) { ++ /* The individual loaders have closed src if needed */ + SDL_free(chunk); +- if ( freesrc ) { +- SDL_RWclose(src); +- } + return(NULL); + } + + diff --git a/abs/extra/sdl_mixer/fluidsynth-volume.patch b/abs/extra/sdl_mixer/fluidsynth-volume.patch new file mode 100644 index 0000000..cf346ed --- /dev/null +++ b/abs/extra/sdl_mixer/fluidsynth-volume.patch @@ -0,0 +1,23 @@ + +# HG changeset patch +# User James Le Cuirot <chewi@aura-online.co.uk> +# Date 1330896767 0 +# Node ID c92001a2c18f628698c58aa4e05a7335d10d0e9e +# Parent 2d713670db9b832b0c5aa700824900bc1fc3c3cd +Raise the maximum FluidSynth gain from 0.8 to 1.2 because apparently the former is too quiet in some cases. + +diff -r 2d713670db9b -r c92001a2c18f fluidsynth.c +--- a/fluidsynth.c Sun Feb 12 17:57:17 2012 -0500 ++++ b/fluidsynth.c Sun Mar 04 21:32:47 2012 +0000 +@@ -176,8 +176,8 @@ + + void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume) + { +- /* FluidSynth's default is 0.2. Make 0.8 the maximum. */ +- fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 0.00625)); ++ /* FluidSynth's default is 0.2. Make 1.2 the maximum. */ ++ fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 1.2 / MIX_MAX_VOLUME)); + } + + int fluidsynth_playsome(FluidSynthMidiSong *song, void *dest, int dest_len) + diff --git a/abs/extra/sdl_mixer/mikmod1.patch b/abs/extra/sdl_mixer/mikmod1.patch new file mode 100644 index 0000000..b3bb829 --- /dev/null +++ b/abs/extra/sdl_mixer/mikmod1.patch @@ -0,0 +1,67 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1342998807 25200 +# Node ID 56cad6484b04f83c8d42428c755a046678506436 +# Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e +Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver + +diff -r c92001a2c18f -r 56cad6484b04 CHANGES +--- a/CHANGES Sun Mar 04 21:32:47 2012 +0000 ++++ b/CHANGES Sun Jul 22 16:13:27 2012 -0700 +@@ -1,3 +1,7 @@ ++1.2.13: ++Paul P Komkoff Jr - Sun Jul 22 16:12:28 PDT 2012 ++ * Fixed malloc/free mismatch in the MikMod driver ++ + 1.2.12: + Sam Lantinga - Sat Jan 14 22:00:29 2012 -0500 + * Fixed seek offset with SMPEG (was relative, should be absolute) +diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c +--- a/dynamic_mod.c Sun Mar 04 21:32:47 2012 +0000 ++++ b/dynamic_mod.c Sun Jul 22 16:13:27 2012 -0700 +@@ -93,6 +93,13 @@ + SDL_UnloadObject(mikmod.handle); + return -1; + } ++ mikmod.MikMod_free = ++ (void (*)(void*)) ++ SDL_LoadFunction(mikmod.handle, "MikMod_free"); ++ if ( mikmod.MikMod_free == NULL ) { ++ SDL_UnloadObject(mikmod.handle); ++ return -1; ++ } + mikmod.Player_Active = + (BOOL (*)(void)) + SDL_LoadFunction(mikmod.handle, "Player_Active"); +diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h +--- a/dynamic_mod.h Sun Mar 04 21:32:47 2012 +0000 ++++ b/dynamic_mod.h Sun Jul 22 16:13:27 2012 -0700 +@@ -35,6 +35,7 @@ + void (*MikMod_RegisterDriver)(struct MDRIVER*); + int* MikMod_errno; + char* (*MikMod_strerror)(int); ++ void (*MikMod_free)(void*); + BOOL (*Player_Active)(void); + void (*Player_Free)(MODULE*); + MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL); +diff -r c92001a2c18f -r 56cad6484b04 music_mod.c +--- a/music_mod.c Sun Mar 04 21:32:47 2012 +0000 ++++ b/music_mod.c Sun Jul 22 16:13:27 2012 -0700 +@@ -109,13 +109,13 @@ + + list = mikmod.MikMod_InfoDriver(); + if ( list ) +- free(list); ++ mikmod.MikMod_free(list); + else + mikmod.MikMod_RegisterDriver(mikmod.drv_nos); + + list = mikmod.MikMod_InfoLoader(); + if ( list ) +- free(list); ++ mikmod.MikMod_free(list); + else + mikmod.MikMod_RegisterAllLoaders(); + + diff --git a/abs/extra/sdl_mixer/mikmod2.patch b/abs/extra/sdl_mixer/mikmod2.patch new file mode 100644 index 0000000..6e89ca8 --- /dev/null +++ b/abs/extra/sdl_mixer/mikmod2.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1343000017 25200 +# Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba +# Parent 56cad6484b04f83c8d42428c755a046678506436 +Fixed normal linking with libmikmod and linking with earlier versions of libmikmod. + +diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c +--- a/dynamic_mod.c Sun Jul 22 16:13:27 2012 -0700 ++++ b/dynamic_mod.c Sun Jul 22 16:33:37 2012 -0700 +@@ -97,8 +97,8 @@ + (void (*)(void*)) + SDL_LoadFunction(mikmod.handle, "MikMod_free"); + if ( mikmod.MikMod_free == NULL ) { +- SDL_UnloadObject(mikmod.handle); +- return -1; ++ /* libmikmod 3.1 and earlier doesn't have it */ ++ mikmod.MikMod_free = free; + } + mikmod.Player_Active = + (BOOL (*)(void)) +@@ -246,6 +246,11 @@ + mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver; + mikmod.MikMod_errno = &MikMod_errno; + mikmod.MikMod_strerror = MikMod_strerror; ++#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8)) ++ mikmod.MikMod_free = free; ++#else ++ mikmod.MikMod_free = MikMod_free; ++#endif + mikmod.Player_Active = Player_Active; + mikmod.Player_Free = Player_Free; + mikmod.Player_LoadGeneric = Player_LoadGeneric; + diff --git a/abs/extra/smpeg/PKGBUILD b/abs/extra/smpeg/PKGBUILD index 1b52434..fe2acfe 100644 --- a/abs/extra/smpeg/PKGBUILD +++ b/abs/extra/smpeg/PKGBUILD @@ -1,28 +1,35 @@ -# $Id: PKGBUILD 19615 2008-11-28 13:17:01Z allan $ +# $Id: PKGBUILD 168611 2012-10-13 11:49:26Z andyrtr $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=smpeg pkgver=0.4.4 -pkgrel=4 +pkgrel=7 pkgdesc="SDL MPEG Player Library" arch=('i686' 'x86_64') url="http://icculus.org/smpeg/" license=('LGPL') depends=('sdl') -makedepends=('gtk' 'mesa') +#makedepends=('gtk' 'mesa' 'glu') +makedepends=('gtk' 'mesa' ) +optdepends=('gtk: to use gtv ' 'glu: to use glmovie') options=('!libtool' '!makeflags') -source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/$pkgname-$pkgver.tar.gz smpeg-0.4.4-gcc41.patch) -md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4') -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') +source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz + smpeg-0.4.4-gcc41.patch) +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../smpeg-0.4.4-gcc41.patch - ./configure --prefix=/usr - make LDFLAGS+=-lstdc++ || return 1 - make DESTDIR=$startdir/pkg install + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install - #fix aclocal warnings + # fix aclocal warnings sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 } diff --git a/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch new file mode 100644 index 0000000..2694334 --- /dev/null +++ b/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + diff --git a/abs/extra/upower/PKGBUILD b/abs/extra/upower/PKGBUILD index 370f483..d27d378 100644 --- a/abs/extra/upower/PKGBUILD +++ b/abs/extra/upower/PKGBUILD @@ -1,27 +1,38 @@ -# $Id$ +# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.15 +pkgver=0.9.18 pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" license=('GPL') -depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c') +source=($url/releases/$pkgname-$pkgver.tar.xz + 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/upower --disable-static + cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + + # https://bugs.freedesktop.org/show_bug.cgi?id=54371 + patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname \ + --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' + '188afea4919dc324b2efbae35d9d216a') diff --git a/abs/extra/usbmuxd/85-usbmuxd.rules b/abs/extra/usbmuxd/85-usbmuxd.rules new file mode 100644 index 0000000..ec9f725 --- /dev/null +++ b/abs/extra/usbmuxd/85-usbmuxd.rules @@ -0,0 +1,9 @@ +# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd) + +# Forces iDevices to the last USB configuration and runs usbmuxd +TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux" +LABEL="usbmuxd_systemd_end" + +# Exit usbmuxd when the last device is removed +ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x" diff --git a/abs/extra/usbmuxd/PKGBUILD b/abs/extra/usbmuxd/PKGBUILD index 758cb66..885dcae 100644 --- a/abs/extra/usbmuxd/PKGBUILD +++ b/abs/extra/usbmuxd/PKGBUILD @@ -1,25 +1,24 @@ -# $Id$ +# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64') license=('GPL2' 'GPL3' 'LGPL2.1') -depends=('libusb>=1.0.8') +depends=('libusb' 'libplist') makedepends=('cmake') install=usbmuxd.install -source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - usbmuxd-udevuser.patch - usbmuxd-describe.patch) +source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2" + 'usbmuxd.service' + '85-usbmuxd.rules') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" - patch -Np1 -i "${srcdir}/usbmuxd-describe.patch" + echo "${pkgver}" > version.tag mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" @@ -29,7 +28,18 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install + + # fix udev dir being hardcoded + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rmdir "${pkgdir}/lib" + # install systemd service file + install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service + # use udev rule that works with systemd + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ + #fix version + sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc + } -md5sums=('6f431541f3177fa06aa6df9ceecb2da0' - '8526f24f4ad16cd6b2a7321c0b59592c' - 'bac157d6e01e1e0d56750f73850b96fb') +md5sums=('87fd27773a84e97ac6e2dc28b08d682e' + 'dae0660f972510a6483992b5b81e1b5a' + 'dc4b2893651149eccbf7b2c8467cd288') diff --git a/abs/extra/usbmuxd/__changelog b/abs/extra/usbmuxd/__changelog index 7b30556..e5a6fbf 100644 --- a/abs/extra/usbmuxd/__changelog +++ b/abs/extra/usbmuxd/__changelog @@ -1 +1,3 @@ -- added usbmuxd-describe.patch so version number is correctly detected +#fix version -jm +sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc + diff --git a/abs/extra/usbmuxd/usbmuxd-describe.patch b/abs/extra/usbmuxd/usbmuxd-describe.patch deleted file mode 100644 index 3023235..0000000 --- a/abs/extra/usbmuxd/usbmuxd-describe.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usbmuxd-1.0.7/Modules/describe.sh.orig 2012-04-07 22:37:03.218203610 +0000 -+++ usbmuxd-1.0.7/Modules/describe.sh 2012-04-07 22:37:22.979010437 +0000 -@@ -1,17 +1,8 @@ - #!/bin/bash - --# Check for git and a git repo. --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -- /bin/echo -n `git describe` -- -- # Are there uncommitted changes? -- git update-index --refresh --unmerged > /dev/null -- git diff-index --quiet HEAD || /bin/echo -n -dirty --else - # Check for version tag - if [ -e version.tag ]; then - /bin/echo -n `cat version.tag` - fi --fi - - echo diff --git a/abs/extra/usbmuxd/usbmuxd-udevuser.patch b/abs/extra/usbmuxd/usbmuxd-udevuser.patch deleted file mode 100644 index 51c8f3d..0000000 --- a/abs/extra/usbmuxd/usbmuxd-udevuser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in ---- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000 -+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000 -@@ -1,7 +1,7 @@ - # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) - - # Forces iDevices to the last USB configuration and runs usbmuxd --ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" - - # Exit usbmuxd when the last device is removed - ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff --git a/abs/extra/usbmuxd/usbmuxd.service b/abs/extra/usbmuxd/usbmuxd.service new file mode 100644 index 0000000..fbebf65 --- /dev/null +++ b/abs/extra/usbmuxd/usbmuxd.service @@ -0,0 +1,5 @@ +[Unit] +Description=iOS USB Muxer + +[Service] +ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux diff --git a/abs/extra/vdpau-video/PKGBUILD b/abs/extra/vdpau-video/PKGBUILD index b426e75..dcb8714 100644 --- a/abs/extra/vdpau-video/PKGBUILD +++ b/abs/extra/vdpau-video/PKGBUILD @@ -10,8 +10,9 @@ license=('GPL') depends=('libva' 'libvdpau') makedepends=('mesa') options=('!libtool') -source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/${pkgname}-${pkgver}.tar.gz) -md5sums=('18870e007ecdc50a528861fa55556364') +#source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/${pkgname}-${pkgver}.tar.gz) +source=(http://www.slackware.com/~alien/slackbuilds/vdpau-video/build/vdpau-video-0.7.3.tar.gz ) + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,3 +24,4 @@ build() { # vim:set ts=2 sw=2 et: +md5sums=('18870e007ecdc50a528861fa55556364') diff --git a/abs/extra/vdpau-video/__changelog b/abs/extra/vdpau-video/__changelog new file mode 100644 index 0000000..2ee9561 --- /dev/null +++ b/abs/extra/vdpau-video/__changelog @@ -0,0 +1 @@ +corrected url -jm |