summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/busybox/PKGBUILD15
-rw-r--r--community/busybox/config31
-rw-r--r--community/chromaprint/PKGBUILD11
-rw-r--r--community/chromaprint/ffmpeg.patch33
-rw-r--r--community/collectd/PKGBUILD12
-rw-r--r--community/cppcheck/PKGBUILD20
-rw-r--r--community/deadbeef/PKGBUILD14
-rw-r--r--community/deadbeef/deadbeef.install5
-rw-r--r--community/ejabberd/PKGBUILD17
-rw-r--r--community/electricsheep/PKGBUILD55
-rw-r--r--community/ffmpeg-compat/PKGBUILD58
-rw-r--r--community/ffmpeg2theora/PKGBUILD14
-rw-r--r--community/freerdp/PKGBUILD4
-rw-r--r--community/gambas3/PKGBUILD138
-rw-r--r--community/gambas3/fix-typedef-structure.patch17
-rw-r--r--community/glfw/PKGBUILD6
-rw-r--r--community/gnash/PKGBUILD24
-rw-r--r--community/gpac/PKGBUILD14
-rw-r--r--community/haskell-gtk/PKGBUILD21
-rw-r--r--community/ibus/PKGBUILD22
-rw-r--r--community/ibus/ibus-1389-dbus-address.patch15
-rw-r--r--community/imdbpy/PKGBUILD8
-rw-r--r--community/ipset/PKGBUILD8
-rw-r--r--community/jbig2dec/PKGBUILD2
-rw-r--r--community/jbig2dec/jbig2dec-0.11-libpng15.patch31
-rw-r--r--community/jhead/LICENSE12
-rw-r--r--community/jhead/PKGBUILD29
-rw-r--r--community/kid3/PKGBUILD26
-rw-r--r--community/kid3/ffmpeg-0.11.diff34
-rw-r--r--community/kvirc/PKGBUILD16
-rw-r--r--community/libmemcached/PKGBUILD6
-rw-r--r--community/luaposix/PKGBUILD10
-rw-r--r--community/luminancehdr/PKGBUILD16
-rw-r--r--community/luminancehdr/luminancehdr.changelog3
-rw-r--r--community/midori/PKGBUILD12
-rw-r--r--community/mixxx/PKGBUILD14
-rw-r--r--community/mlt/PKGBUILD8
-rw-r--r--community/motion/PKGBUILD23
-rw-r--r--community/motion/ffmpeg-compat.patch172
-rw-r--r--community/mplayer2/PKGBUILD14
-rw-r--r--community/multipath-tools/PKGBUILD8
-rw-r--r--community/murmur/PKGBUILD14
-rw-r--r--community/murmur/murmur.conf1
-rw-r--r--community/murmur/murmur.service12
-rw-r--r--community/mythtv/PKGBUILD4
-rw-r--r--community/nbd/PKGBUILD6
-rw-r--r--community/nginx/PKGBUILD8
-rw-r--r--community/openscenegraph/PKGBUILD25
-rw-r--r--community/opensips/PKGBUILD6
-rw-r--r--community/parrot/PKGBUILD24
-rw-r--r--community/performous/PKGBUILD17
-rw-r--r--community/performous/ffmpeg-0.11.patch42
-rw-r--r--community/pgadmin3/PKGBUILD10
-rw-r--r--community/php-memcached/PKGBUILD4
-rw-r--r--community/picard/PKGBUILD4
-rw-r--r--community/pigeonhole/PKGBUILD4
-rw-r--r--community/pstotext/PKGBUILD27
-rw-r--r--community/python-psutil/PKGBUILD8
-rw-r--r--community/qlandkartegt/PKGBUILD6
-rw-r--r--community/qlandkartegt/qlandkartegt.changelog3
-rw-r--r--community/qmmp/PKGBUILD8
-rw-r--r--community/qmmp/qmmp.changelog15
-rw-r--r--community/radvd/PKGBUILD10
-rw-r--r--community/synfig/PKGBUILD10
-rw-r--r--community/tinc/PKGBUILD10
-rw-r--r--community/units/PKGBUILD6
-rw-r--r--community/units/build-fix.patch11
-rw-r--r--community/vidalia/PKGBUILD10
-rw-r--r--community/vidalia/bug6178.patch28
-rw-r--r--community/vifm/PKGBUILD6
-rw-r--r--community/vifm/vifm.changelog3
-rw-r--r--community/virtkey/PKGBUILD46
-rw-r--r--community/webfs/PKGBUILD6
-rw-r--r--community/xmms2/PKGBUILD15
-rw-r--r--community/xmms2/ffmpeg-0.11.diff10
75 files changed, 1075 insertions, 342 deletions
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 065f39f20..6e11ac52a 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69589 2012-04-19 10:16:37Z spupykin $
+# $Id: PKGBUILD 73502 2012-07-08 17:57:22Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
pkgname=busybox
-pkgver=1.19.4
+pkgver=1.20.2
pkgrel=1
pkgdesc="Utilities for rescue and embedded systems"
arch=("i686" "x86_64" 'mips64el')
@@ -11,20 +11,17 @@ url="http://www.busybox.net"
license=('GPL')
makedepends=("make" "gcc" "sed" "ncurses")
source=($url/downloads/$pkgname-$pkgver.tar.bz2
- http://git.exherbo.org/arbor.git/plain/packages/sys-apps/busybox/files/linux-headers-fix.patch
config)
install=busybox.install
-md5sums=('9c0cae5a0379228e7b55e5b29528df8e'
- '853097e2f1477f962d6f268c1b3ebd78'
- 'edd5c66c974ccc1b0030fd00beaa1b02')
+md5sums=('e025414bc6cd79579cc7a32a45d3ae1c'
+ '09d4562ee4a9ab5415be44b945bfc7e2')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p1 <$srcdir/linux-headers-fix.patch
cp $srcdir/config .config
+ sed '1,1i#include <sys/resource.h>' -i include/libbb.h
# if you want to run menuconfig uncomment the following line:
- # make menuconfig ; return 1
- sed -i '1,2i#define __packed __attribute__((packed))' miscutils/ubi_tools.c
+# make menuconfig ; return 1
make
}
diff --git a/community/busybox/config b/community/busybox/config
index 493a766d5..197f11f8b 100644
--- a/community/busybox/config
+++ b/community/busybox/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.19.2
-# Wed Sep 7 13:01:26 2011
+# Busybox version: 1.20.2
+# Sun Jul 8 21:35:17 2012
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -62,7 +62,10 @@ CONFIG_STATIC=y
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
#
# Debugging Options
@@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install"
# CONFIG_FEATURE_SYSTEMD is not set
CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_USE_TERMIOS=y
@@ -101,6 +104,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
# CONFIG_FEATURE_EDITING_VI is not set
CONFIG_FEATURE_EDITING_HISTORY=15
# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
# CONFIG_FEATURE_REVERSE_SEARCH is not set
CONFIG_FEATURE_TAB_COMPLETION=y
# CONFIG_FEATURE_USERNAME_COMPLETION is not set
@@ -140,6 +144,7 @@ CONFIG_FEATURE_CPIO_O=y
CONFIG_GUNZIP=y
CONFIG_GZIP=y
# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
# CONFIG_LZOP is not set
# CONFIG_LZOP_COMPR_HIGH is not set
CONFIG_RPM2CPIO=y
@@ -173,11 +178,13 @@ CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
# CONFIG_FEATURE_DATE_NANO is not set
CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_HOSTID=y
CONFIG_ID=y
CONFIG_GROUPS=y
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
CONFIG_FEATURE_TR_EQUIV=y
@@ -220,7 +227,6 @@ CONFIG_FOLD=y
CONFIG_FSYNC=y
CONFIG_HEAD=y
CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
CONFIG_INSTALL=y
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
CONFIG_LN=y
@@ -461,6 +467,7 @@ CONFIG_DELGROUP=y
CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
CONFIG_GETTY=y
CONFIG_LOGIN=y
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
# CONFIG_PAM is not set
CONFIG_LOGIN_SCRIPTS=y
CONFIG_FEATURE_NOLOGIN=y
@@ -469,6 +476,7 @@ CONFIG_PASSWD=y
CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
CONFIG_CRYPTPW=y
CONFIG_CHPASSWD=y
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
CONFIG_SU=y
CONFIG_FEATURE_SU_SYSLOG=y
CONFIG_FEATURE_SU_CHECKS_SHELLS=y
@@ -518,6 +526,12 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
# Linux System Utilities
#
CONFIG_BLOCKDEV=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
CONFIG_REV=y
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
@@ -561,12 +575,6 @@ CONFIG_IPCS=y
CONFIG_LOSETUP=y
CONFIG_LSPCI=y
CONFIG_LSUSB=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
-CONFIG_FEATURE_MDEV_EXEC=y
-CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
CONFIG_MKSWAP=y
CONFIG_FEATURE_MKSWAP_UUID=y
CONFIG_MORE=y
@@ -835,6 +843,7 @@ CONFIG_TRACEROUTE6=y
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
CONFIG_TUNCTL=y
CONFIG_FEATURE_TUNCTL_UG=y
+# CONFIG_UDHCPC6 is not set
# CONFIG_UDHCPD is not set
# CONFIG_DHCPRELAY is not set
# CONFIG_DUMPLEASES is not set
@@ -881,6 +890,7 @@ CONFIG_SENDMAIL=y
# Process Utilities
#
CONFIG_IOSTAT=y
+CONFIG_LSOF=y
CONFIG_MPSTAT=y
CONFIG_NMETER=y
CONFIG_PMAP=y
@@ -902,6 +912,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y
CONFIG_PKILL=y
CONFIG_PS=y
CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_LONG=y
# CONFIG_FEATURE_PS_TIME is not set
# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD
index 8b0f2fff5..1d0f59642 100644
--- a/community/chromaprint/PKGBUILD
+++ b/community/chromaprint/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 62590 2012-01-22 09:25:04Z bisson $
+# $Id: PKGBUILD 73467 2012-07-08 09:29:39Z ibiru $
# Contributor: Wieland Hoffmann <the_mineo@web.de>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=chromaprint
pkgver=0.6
-pkgrel=2
+pkgrel=3
pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
url='http://acoustid.org/chromaprint/'
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
depends=('ffmpeg')
makedepends=('cmake')
-source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'ffmpeg.patch')
+sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0'
+ '56057f824a29194fc6041bd73e0d07412fcc065b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../ffmpeg.patch
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
make
}
diff --git a/community/chromaprint/ffmpeg.patch b/community/chromaprint/ffmpeg.patch
new file mode 100644
index 000000000..7c0b86d77
--- /dev/null
+++ b/community/chromaprint/ffmpeg.patch
@@ -0,0 +1,33 @@
+diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c
+--- old/examples/fpcalc.c 2011-12-22 22:11:23.000000000 +1100
++++ new/examples/fpcalc.c 2012-06-04 10:44:30.596604910 +1000
+@@ -28,7 +28,7 @@
+ #endif
+ int16_t *buffer;
+
+- if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) {
++ if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) {
+ fprintf(stderr, "ERROR: couldn't open the file\n");
+ goto done;
+ }
+@@ -71,9 +71,9 @@
+ goto done;
+ }
+
+- if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
++ if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
+ #ifdef HAVE_AV_AUDIO_CONVERT
+- convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels,
++ convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels,
+ codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0);
+ if (!convert_ctx) {
+ fprintf(stderr, "ERROR: couldn't create sample format converter\n");
+@@ -133,7 +133,7 @@
+ if (convert_ctx) {
+ const void *ibuf[6] = { buffer1 };
+ void *obuf[6] = { buffer2 };
+- int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 };
++ int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) };
+ int ostride[6] = { 2 };
+ int len = buffer_size / istride[0];
+ if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) {
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 5ff60e81c..61ec563ef 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72138 2012-06-09 00:34:11Z dreisner $
+# $Id: PKGBUILD 73395 2012-07-07 05:48:11Z foutrelis $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
pkgname=collectd
pkgver=5.1.0
-pkgrel=4
+pkgrel=5
pkgdesc='Daemon which collects system performance statistics periodically'
url='http://collectd.org/'
arch=('i686' 'x86_64' 'mips64el')
@@ -76,10 +76,8 @@ package() {
make DESTDIR="${pkgdir}" install
- install -Dm755 "$srcdir"/rc.d "${pkgdir}/etc/rc.d/${pkgname}"
- install -Dm644 "$srcdir"/service "${pkgdir}"/usr/lib/systemd/system/collectd.service
+ rmdir "${pkgdir}/var/run" # FS#30201
+ install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+ install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-
- # avoid conflict with filesystem>=2012.06
- rmdir "$pkgdir/var/run"
}
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 0897f0159..3a565f512 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 69536 2012-04-18 02:12:09Z stephane $
+# $Id: PKGBUILD 73296 2012-07-05 20:48:55Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=cppcheck
-pkgver=1.54
+pkgver=1.55
pkgrel=1
pkgdesc="A tool for static C/C++ code analysis"
arch=('i686' 'x86_64' 'mips64el')
url="http://cppcheck.wiki.sourceforge.net/"
license=('GPL')
-depends=('pcre')
+depends=('pcre' 'qt')
makedepends=('docbook-xsl')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f63abbd9bda7179c3ce3a399123bd7fb476e4537')
+sha1sums=('0e6f797ced959afddf7b847856a50636aa87ee3c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
make
- make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl man
+ make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.77.1/manpages/docbook.xsl man
+
+ cd gui
+ export HAVE_RULES=yes
+ qmake
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -D -p -m 644 cppcheck.1 ${pkgdir}/usr/share/man/man1/cppcheck.1
+
+ install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
+
+ install -m755 gui/cppcheck-gui "${pkgdir}"/usr/bin
}
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index a5c1f0526..43246142d 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $
+# $Id: PKGBUILD 73469 2012-07-08 09:29:55Z ibiru $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
pkgname=deadbeef
-pkgver=0.5.4
-pkgrel=2
+pkgver=0.5.5
+pkgrel=1
pkgdesc='An audio player for GNU/Linux based on GTK2.'
arch=('i686' 'x86_64' 'mips64el')
url='http://deadbeef.sourceforge.net'
license=('GPL2')
depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
- 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
- 'libsamplerate')
+ 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate')
[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
optdepends=('libsamplerate: for Resampler plugin'
'libvorbis: for Ogg Vorbis playback'
@@ -24,7 +23,6 @@ optdepends=('libsamplerate: for Resampler plugin'
'libsndfile: for Wave playback'
'libcdio: audio cd plugin'
'libcddb: audio cd plugin'
- 'ffmpeg: for WMA, AA, OMA, AC, etc.'
'faad2: for AAC/MP4 support'
'dbus: for OSD notifications support'
'pulseaudio: for PulseAudio output plugin'
@@ -34,12 +32,12 @@ optdepends=('libsamplerate: for Resampler plugin'
options=('!libtool')
install='deadbeef.install'
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('062b7c15d21e383a54e43b3e8076d8e3')
+md5sums=('7cc10cefda0f4044eea897893e4cc1a9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --disable-ffmpeg
make
}
diff --git a/community/deadbeef/deadbeef.install b/community/deadbeef/deadbeef.install
index eaf1b9a69..fcdbf15fb 100644
--- a/community/deadbeef/deadbeef.install
+++ b/community/deadbeef/deadbeef.install
@@ -7,6 +7,11 @@ post_install() {
post_upgrade() {
post_install
+
+ cat <<EOF
+==> ffmpeg support was disabled in this deadbeef release due to
+==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon.
+EOF
}
post_remove() {
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 5c4fe144f..73968e57c 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70983 2012-05-21 13:12:40Z spupykin $
+# $Id: PKGBUILD 73273 2012-07-05 09:07:14Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=ejabberd
pkgver=2.1.11
-pkgrel=1
+pkgrel=2
pkgdesc="Jabber server written in Erlang"
arch=('x86_64' 'i686' 'mips64el')
url="http://www.ejabberd.im/"
@@ -16,15 +16,9 @@ install=$pkgname.install
source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
"$pkgname.logrotate"
"$pkgname")
-sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be'
- '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
- '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6')
-sha256sums=('bb5560a8cc77c46238a67bd6e8fd116c960be7f4c135346cda96da548d20ef6e'
- '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
- '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6')
-sha256sums=('91d5c10e64f9faa60c345c68304746f493d71f82723302955d40d6619e3d87de'
- '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
- '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6')
+md5sums=('a70b040c4e7602f47718c8afe8780d50'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ '13c22f8f3b55e3933d531e652e4e7535')
build() {
cd "$srcdir/$pkgname-$pkgver/src"
@@ -43,6 +37,7 @@ package() {
install -d "$pkgdir/var/lib/$pkgname"
install -D -m0644 "$srcdir/$pkgname.logrotate" \
"$pkgdir/etc/logrotate.d/$pkgname"
+ sed -i 's|SPOOLDIR=/var/lib/ejabberd|SPOOLDIR=/var/spool/ejabberd|' $pkgdir/usr/sbin/ejabberdctl
chmod ug+r "$pkgdir/etc/$pkgname/"*
rm -rf "$pkgdir/var/lock"
}
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index f2ac0230c..204beaf52 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,37 +1,52 @@
-# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $
+# $Id: PKGBUILD 73470 2012-07-08 09:29:58Z ibiru $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=electricsheep
-pkgver=2.7b12
-pkgrel=5
+pkgver=2.7b33
+pkgrel=1
pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
arch=('i686' 'x86_64' 'mips64el')
url="http://community.electricsheep.org/"
license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
-makedepends=('xscreensaver')
+depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee')
+makedepends=('boost' 'tinyxml')
optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch)
-sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
- 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825'
- 'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a')
+options=('!emptydirs')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
+ 'fda3aae435507d03973f0c4d1ed3509067657f06')
+
+# source PKGBUILD && mksource
+mksource() {
+ [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+ _svnver=r125
+ _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic"
+ _svnmod="${pkgname}-${pkgver}"
+ mkdir ${pkgname}-${pkgver}
+ pushd ${pkgname}-${pkgver}
+ svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod}
+ find . -depth -type d -name .svn -exec rm -rf {} \;
+ (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \
+ Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig)
+ tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+ popd
+ rm -r ${pkgname}-${pkgver}
+ gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
- patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch"
+ sed -i 's/wx-config/wx-config-2.9/g' configure.ac
+ sed -i '12 i\
+#include <cstdio>' Common/Singleton.h
+ ./autogen.sh
./configure --prefix=/usr
- make
+ make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}/usr/share/applications/screensavers"
- install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver"
- make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \
- GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install
- install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
- install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml"
- install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
+ install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
}
diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD
new file mode 100644
index 000000000..19336feeb
--- /dev/null
+++ b/community/ffmpeg-compat/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=ffmpeg-compat
+pkgver=20120509
+pkgrel=1
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://ffmpeg.org/"
+license=('GPL')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('yasm' 'git' 'libvdpau')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz)
+md5sums=('a35359e424608f369d380f03e4dc9966')
+
+build() {
+ cd "ffmpeg"
+
+ ./configure \
+ --prefix=/usr \
+ --incdir=/usr/include/ffmpeg-compat \
+ --libdir=/usr/lib/ffmpeg-compat \
+ --shlibdir=/usr/lib/ffmpeg-compat \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libxvid \
+ --enable-libx264 \
+ --enable-libvpx \
+ --enable-libtheora \
+ --enable-libgsm \
+ --enable-libspeex \
+ --enable-postproc \
+ --enable-shared \
+ --enable-x11grab \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-librtmp \
+ --enable-libpulse \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-runtime-cpudetect \
+ --disable-debug \
+ --disable-static
+
+ make
+}
+
+package() {
+ cd "ffmpeg"
+ make DESTDIR="$pkgdir" install
+ rm -rf $pkgdir/usr/{bin,share}
+}
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index 269f3b872..bf9a0c177 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 62853 2012-01-27 19:43:55Z arodseth $
+# $Id: PKGBUILD 73471 2012-07-08 09:30:01Z ibiru $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=ffmpeg2theora
-pkgver=0.28
-pkgrel=3
+pkgver=0.29
+pkgrel=1
pkgdesc="Simple converter to create Ogg Theora files"
arch=('x86_64' 'i686' 'mips64el')
url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL3')
+license=('GPL')
depends=('ffmpeg')
-makedepends=('pkgconfig' 'scons') # 'libkate')
+makedepends=('scons') # 'libkate')
source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e')
+sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d')
build() {
cd "$srcdir/$pkgname-$pkgver"
- sed -i 's:pp_mode_t:pp_mode:' src/ffmpeg2theora.c
- sed -i 's:pp_context_t:pp_context:' src/ffmpeg2theora.c
scons
}
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 4975ecdc6..916b521f9 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70706 2012-05-15 10:37:17Z spupykin $
+# $Id: PKGBUILD 73472 2012-07-08 09:30:06Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
pkgname=freerdp
pkgver=1.0.1
-pkgrel=4
+pkgrel=5
pkgdesc="Free RDP client"
arch=('i686' 'x86_64' 'mips64el')
url="http://freerdp.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 9d0e08c7d..4d82d08e0 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,46 +1,45 @@
-# $Id: PKGBUILD 72972 2012-06-25 18:51:23Z foutrelis $
+# $Id: PKGBUILD 73513 2012-07-08 23:03:50Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor : sebikul <sebikul@gmail.com>
pkgbase=gambas3
pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
- 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
- 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
- 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
- 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
- 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=3.1.1
-pkgrel=4
+ 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gui' 'gambas3-gb-image'
+ 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media'
+ 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu'
+ 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext'
+ 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings'
+ 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
+ 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
+pkgver=3.2.0
+pkgrel=1
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64' 'mips64el')
url="http://gambas.sourceforge.net/"
-license=('GPL')
+license=('GPL2')
groups=('gambas3')
makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
- 'gsl')
+ 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm')
options=('!emptydirs' '!makeflags')
source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
- 'gambas3-script.install' 'gambas3-runtime.install'
- 'poppler-0-20.patch')
-md5sums=('bdf387f435d7aeedb7efa488ea1a5d62'
+ 'gambas3-script.install' 'gambas3-runtime.install' 'fix-typedef-structure.patch')
+md5sums=('3d1ee5bc2e1500a9b612be4c06d3d6a5'
'b284be39d147ec799f1116a6abc068b4'
'b5cc403990f31b8ea1c5cf37366d3d29'
- '39d2ae1e2096a29df7857fce083eafaf')
+ 'e4853f8aaeefefbabe714dc2e763dab6')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
- # fix building with poppler-0.20.x (merged upstream)
- cd gb.pdf
- patch -Np1 -i ../../poppler-0-20.patch
- cd ..
+ # fix redefinition of siginfo_t (merged upstream)
+ patch -Np3 -i ${srcdir}/fix-typedef-structure.patch
./reconf-all
./configure --prefix=/usr -C
@@ -552,6 +551,27 @@ package_gambas3-gb-gtk() {
cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+
+ ## cleanup the workaround
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+ ##
+}
+
+package_gambas3-gb-gtk-opengl() {
+ depends=('gambas3-gb-gtk' 'gtkglext')
+ pkgdesc="GTK+ toolkit OpenGL component"
+
+ ## workaround for splitting
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+ ##
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
## cleanup the workaround
cd ${srcdir}/${pkgbase}-${pkgver}/main
@@ -668,6 +688,60 @@ package_gambas3-gb-image-io() {
##
}
+package_gambas3-gb-jit() {
+ depends=('gambas3-runtime' 'llvm')
+ pkgdesc="Just-in-time compiler for gambas"
+
+ ## workaround for splitting
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+ ##
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+ ## cleanup the workaround
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+ ##
+}
+
+package_gambas3-gb-media() {
+ depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
+ pkgdesc="Simplified interface to the GStreamer library"
+
+ ## workaround for splitting
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+ ##
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+ ## cleanup the workaround
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+ ##
+}
+
+package_gambas3-gb-ncurses() {
+ depends=('gambas3-runtime' 'ncurses')
+ pkgdesc="Ncurses component for gambas"
+
+ ## workaround for splitting
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+ ##
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+ ## cleanup the workaround
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+ ##
+}
+
package_gambas3-gb-net() {
depends=('gambas3-runtime')
pkgdesc="Network component"
@@ -1042,7 +1116,7 @@ package_gambas3-gb-vb() {
}
package_gambas3-gb-xml() {
- depends=('gambas3-runtime' 'libxml2')
+ depends=('gambas3-runtime')
pkgdesc="XML component"
## workaround for splitting
@@ -1054,10 +1128,33 @@ package_gambas3-gb-xml() {
make XDG_UTILS='' DESTDIR="${pkgdir}" install
## cleanup the workaround
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+
cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+
cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+ ##
+}
+
+package_gambas3-gb-xml-html() {
+ depends=('gambas3-gb-xml')
+ pkgdesc="HTML generator component"
+
+ ## workaround for splitting
+ cd ${srcdir}/${pkgbase}-${pkgver}/main
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+ ##
+
+ cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
+ make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+ ## cleanup the workaround
cd ${srcdir}/${pkgbase}-${pkgver}/main
make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
##
@@ -1128,3 +1225,4 @@ package_gambas3-gb-web() {
rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
##
}
+
diff --git a/community/gambas3/fix-typedef-structure.patch b/community/gambas3/fix-typedef-structure.patch
new file mode 100644
index 000000000..8a5965a5f
--- /dev/null
+++ b/community/gambas3/fix-typedef-structure.patch
@@ -0,0 +1,17 @@
+--- gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:18:14 4902
++++ gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:46:07 4903
+@@ -40,10 +40,12 @@
+ #define SIGPWR -1
+ #endif
+
+-#if !defined(OS_BSD) && !defined(OS_CYGWIN)
++// How could the following fix a BSD warning if it is not compiled on BSD systems?
++
++/*#if !defined(OS_BSD) && !defined(OS_CYGWIN)
+ typedef
+ struct siginfo siginfo_t;
+-#endif
++#endif*/
+
+ // The -1 signal is used for ignored signal numbers
+
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index db6073db4..17ab644b4 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69414 2012-04-16 00:32:44Z svenstaro $
+# $Id: PKGBUILD 73522 2012-07-09 01:16:26Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: philefou <tuxication AT gmail DOT com>
# Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=glfw
-pkgver=2.7.5
+pkgver=2.7.6
pkgrel=1
pkgdesc="A free, open source, portable framework for OpenGL application development"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
depends=('libgl' 'libxrandr')
makedepends=('mesa')
source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b9ef11d08b6283b1b4a274fcf995fd79')
+md5sums=('d76512d292d91782487f6e2d4a43e7bc')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index f4023057d..5d37997c9 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 67186 2012-03-05 08:57:26Z ibiru $
+# $Id: PKGBUILD 73473 2012-07-08 09:30:13Z ibiru $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=gnash
pkgname=(gnash-common gnash-gtk)
pkgver=0.8.10
-pkgrel=2
+pkgrel=3
arch=(i686 x86_64 mips64el)
url="http://www.gnu.org/software/gnash/"
license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
- speex fontconfig ffmpeg
- gstreamer0.10-base gstreamer0.10-ffmpeg
- gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf
+makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa
+ speex fontconfig
+ gstreamer0.10-base
+ gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext
pkgconfig boost)
options=(!libtool !emptydirs)
source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
@@ -31,8 +31,8 @@ build() {
--with-plugins-install=system \
--with-npapi-plugindir=/usr/lib/mozilla/plugins \
--enable-gui=sdl,gtk,dump \
- --enable-media=gst,ffmpeg \
- --enable-renderer=agg,cairo \
+ --enable-media=gst \
+ --enable-renderer=all \
--enable-device=x11
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
@@ -42,9 +42,9 @@ build() {
package_gnash-common() {
pkgdesc="A GNU Flash movie player"
- depends=(curl giflib sdl agg libjpeg libpng libltdl
- speex fontconfig ffmpeg cairo
- gstreamer0.10-base gstreamer0.10-ffmpeg
+ depends=(curl giflib sdl agg libjpeg libpng libltdl mesa
+ speex fontconfig cairo
+ gstreamer0.10-base
boost-libs)
backup=(etc/gnashrc etc/gnashthumbnailrc)
@@ -65,7 +65,7 @@ package_gnash-common() {
package_gnash-gtk() {
pkgdesc="A GNU Flash movie player"
depends=("gnash-common=$pkgver"
- gtk2 libldap hicolor-icon-theme desktop-file-utils gconf)
+ gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext)
install=gnash-gtk.install
backup=(etc/gnashpluginrc)
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index 73a303fb7..70f64f6c1 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63606 2012-02-05 12:00:04Z ibiru $
+# $Id: PKGBUILD 73474 2012-07-08 09:30:16Z ibiru $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gpac
-pkgver=3824
-pkgrel=2
+pkgver=4065
+pkgrel=1
pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
arch=('i686' 'x86_64' 'mips64el')
url="http://gpac.sourceforge.net"
@@ -13,8 +13,9 @@ makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
optdepends=('jack: for jack support' 'a52dec: for A52 support'
'faad2: for AAC support' 'libmad: for mp3 support')
options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8'
+ 'a015cef1fd003c57bd91a6d0959ccd58df2357d4')
# source PKGBUILD && mksource
mksource() {
@@ -25,10 +26,11 @@ mksource() {
mkdir ${pkgname}-$pkgver
pushd ${pkgname}-$pkgver
svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
find . -depth -type d -name .svn -exec rm -rf {} \;
tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
popd
+ rm -r ${pkgname}-${pkgver}
+ gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
}
build() {
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 9b1e2ba62..064702b29 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72389 2012-06-13 13:46:24Z tdziedzic $
+# $Id: PKGBUILD 73280 2012-07-05 11:48:30Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-gtk
-pkgver=0.12.3
-pkgrel=2
+pkgver=0.12.3.1
+pkgrel=1
pkgdesc="Binding to the gtk library for Gtk2Hs."
url="http://hackage.haskell.org/package/gtk"
license=('LGPL2.1')
@@ -15,19 +15,11 @@ replaces=('gtk2hs-gtk')
conflicts=('gtk2hs-gtk')
options=('strip')
install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
- 'gtk-gthread.h-include.patch')
-md5sums=('65a65b5cc1e1db0fbf722779a7044ded'
- '5277990f8ca28d2b12e77dac97c10354')
+source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
+md5sums=('b10dfe92d2e4dfe3c0c92dd349489727')
build() {
cd ${srcdir}/gtk-${pkgver}
-
- # fix compile error with latest glib2 >= 2.32
- # http://hackage.haskell.org/trac/gtk2hs/ticket/1253
- # got the patch from fedora
- patch -Np1 -i ${srcdir}/gtk-gthread.h-include.patch
-
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
--libsubdir=\$compiler/site-local/\$pkgid
@@ -39,9 +31,6 @@ build() {
}
package() {
- #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- #depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0')
-
cd ${srcdir}/gtk-${pkgver}
install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 19b4ebdbf..fd8a1a777 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63863 2012-02-06 10:52:08Z ebelanger $
+# $Id: PKGBUILD 73242 2012-07-04 07:56:41Z ebelanger $
# Contributor: Rainy <rainylau(at)gmail(dot)com>
# Contributor: Lee.MaRS <leemars at gmail dot com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,44 +6,38 @@
pkgname=ibus
pkgver=1.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Next Generation Input Bus for Linux"
arch=('i686' 'x86_64' 'mips64el')
url="http://ibus.googlecode.com"
license=('LGPL')
-depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \
+depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \
'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme')
makedepends=('intltool' 'gobject-introspection')
optdepends=('notification-daemon')
options=('!libtool')
install=ibus.install
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88ef7dda720cec2de92b8673832a702e')
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1389-dbus-address.patch)
+sha1sums=('4cc045553885d35a118ec4b44c2694910209509e'
+ 'ee4eb1cf900a14d62adae932621ffb2f8d0a549d')
build() {
cd ${pkgname}-${pkgver}
export PYTHON=python2
- sed -i 's|--pkg=ibus-1.0||' src/Makefile.in
+ patch -p1 -i ../ibus-1389-dbus-address.patch
+ sed -i 's|--pkg=ibus-1.0|--pkg-export=ibus-1.0|' src/Makefile.in
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/ibus \
--sysconfdir=/etc \
--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
--enable-gtk3
-
-# python2 fix
- for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
- sed -i 's_exec python_exec python2_' $file
- done
-
make
}
package() {
cd ${pkgname}-${pkgver}
- export PYTHON=python2
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/etc/xdg/autostart"
ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
- find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
}
diff --git a/community/ibus/ibus-1389-dbus-address.patch b/community/ibus/ibus-1389-dbus-address.patch
new file mode 100644
index 000000000..e6b18bdb2
--- /dev/null
+++ b/community/ibus/ibus-1389-dbus-address.patch
@@ -0,0 +1,15 @@
+--- ibus-1.4.99.20120317/src/ibusshare.c.orig 2012-04-26 12:24:55.922072674 +0900
++++ ibus-1.4.99.20120317/src/ibusshare.c 2012-04-26 13:10:44.301421547 +0900
+@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void)
+ if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+ &machine_id,
+ NULL,
+- &error)) {
++ &error) &&
++ !g_file_get_contents ("/etc/machine-id",
++ &machine_id,
++ NULL,
++ NULL)) {
+ g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
+ g_error_free (error);
+ machine_id = "machine-id";
diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD
index ebd2c9b23..8ebacc82b 100644
--- a/community/imdbpy/PKGBUILD
+++ b/community/imdbpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67897 2012-03-15 23:14:25Z ebelanger $
+# $Id: PKGBUILD 73447 2012-07-07 19:43:08Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
@@ -6,8 +6,8 @@
pkgname=imdbpy
_realname=IMDbPY
-pkgver=4.8.2
-pkgrel=2
+pkgver=4.9
+pkgrel=1
pkgdesc="Python bindings for the Internet Movie Database (IMDb)"
url="http://imdbpy.sourceforge.net/"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('python2')
makedepends=('python2-distribute')
optdepends=('python2-lxml' 'python2-sqlalchemy' 'python2-sqlobject')
source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz)
-md5sums=('6644540206c5023cb332637089d5342d')
+md5sums=('5b071cd63d1804ed568741d2db8d12b5')
build(){
cd "$srcdir/$_realname-$pkgver"
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 04e22fd8a..5828a7a3f 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71313 2012-05-26 14:56:36Z seblu $
+# $Id: PKGBUILD 73450 2012-07-07 23:42:48Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgname=ipset
-pkgver=6.12.1
-pkgrel=2
+pkgver=6.13
+pkgrel=1
pkgdesc='Administration tool for IP sets'
arch=('i686' 'x86_64' 'mips64el')
url='http://ipset.netfilter.org'
@@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
"$pkgname.rc"
"$pkgname.systemd"
"$pkgname.service")
-md5sums=('80df500a4d93cb14e1373ae290716cda'
+md5sums=('0b7f5db12a1852d9c31b1ec13d31ade1'
'3e606a2823a700b4e9c5f17511a6f6a5'
'de89b054d967036e08b13bc6a7235286'
'dfc3105b89ed41fc4a1feb4f4f13f2a3'
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index 6f6550950..32432afb0 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67870 2012-03-15 15:48:59Z bpiotrowski $
+# $Id: PKGBUILD 73320 2012-07-06 13:34:39Z spupykin $
# Maintainer: Bartłomiej Piotrowski
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
diff --git a/community/jbig2dec/jbig2dec-0.11-libpng15.patch b/community/jbig2dec/jbig2dec-0.11-libpng15.patch
new file mode 100644
index 000000000..c18ccb7af
--- /dev/null
+++ b/community/jbig2dec/jbig2dec-0.11-libpng15.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -45,7 +45,7 @@
+ fi
+ dnl libpng requires pow() which may be in libm
+ AC_SEARCH_LIBS([pow], [m])
+- AC_CHECK_LIB([png], [png_check_sig], [
++ AC_CHECK_LIB([png], [png_sig_cmp], [
+ AC_CHECK_LIB([z], [deflate], [
+ AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
+ LIBS="-lpng -lz $LIBS"
+--- jbig2_image_png.c
++++ jbig2_image_png.c
+@@ -33,7 +33,7 @@
+ {
+ png_size_t check;
+
+- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
+ if (check != length) {
+ png_error(png_ptr, "Write Error");
+ }
+@@ -43,7 +43,7 @@
+ jbig2_png_flush(png_structp png_ptr)
+ {
+ png_FILE_p io_ptr;
+- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
++ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
+ if (io_ptr != NULL)
+ fflush(io_ptr);
+ }
diff --git a/community/jhead/LICENSE b/community/jhead/LICENSE
new file mode 100644
index 000000000..63ad89ebc
--- /dev/null
+++ b/community/jhead/LICENSE
@@ -0,0 +1,12 @@
+License:
+
+ Jhead is public domain software - that is, you can do whatever you want
+ with it, and include it software that is licensesed under the GNU or the
+ BSD license, or whatever other licence you chose, including proprietary
+ closed source licenses. Although not part of the liscense, I do expect
+ common courtesy, please.
+
+ If you do integrate the code into some software of yours, I'd appreciate
+ knowing about it though.
+
+Matthias Wandel
diff --git a/community/jhead/PKGBUILD b/community/jhead/PKGBUILD
new file mode 100644
index 000000000..3b217dd63
--- /dev/null
+++ b/community/jhead/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 73309 2012-07-06 06:23:17Z andrea $
+# Maintainer: François Charette <francois ατ archlinux δοτ org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=jhead
+pkgver=2.96
+pkgrel=1
+pkgdesc="EXIF JPEG info parser and thumbnail remover"
+url="http://www.sentex.net/~mwandel/jhead/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('glibc')
+optdepends=('libjpeg: to up-right images according to rotation tag')
+source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ LICENSE)
+md5sums=('562b45d4d82f64196debed8c520c1cab'
+ '1f0db611d2642a981719f45252762a45')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
+ install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
+ install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index cb30a590a..b7a0e6b30 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71118 2012-05-24 14:06:52Z tomegun $
+# $Id: PKGBUILD 73475 2012-07-08 09:30:25Z ibiru $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alois Nespor <alois.nespor@gmail.com>
pkgname=kid3
pkgver=2.1
-pkgrel=3
+pkgrel=4
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
arch=('i686' 'x86_64' 'mips64el')
url="http://kid3.sourceforge.net/"
@@ -14,19 +14,33 @@ makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
options=('!makeflags')
install=$pkgname.install
changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'ffmpeg-0.11.diff')
+sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225'
+ '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54')
build() {
+ cd ${pkgname}-${pkgver}
+
+ # fix error building with latest ffmpeg
+ # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a
+ patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff
+
cd ${srcdir}
mkdir build
cd build
- cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+
+ cmake \
+ ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+
make
}
package() {
- cd ${srcdir}/build
+ cd build
+
make DESTDIR=${pkgdir} install
}
diff --git a/community/kid3/ffmpeg-0.11.diff b/community/kid3/ffmpeg-0.11.diff
new file mode 100644
index 000000000..349ca4b3d
--- /dev/null
+++ b/community/kid3/ffmpeg-0.11.diff
@@ -0,0 +1,34 @@
+From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <ufleisch@users.sourceforge.net>
+Date: Mon, 4 Jun 2012 15:23:36 +0200
+Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
+
+---
+ src/core/import/fingerprintcalculator.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
+index 05158ae..6ac632c 100644
+--- a/src/core/import/fingerprintcalculator.cpp
++++ b/src/core/import/fingerprintcalculator.cpp
+@@ -218,7 +218,7 @@ public:
+ }
+
+ bool createForCodec(const Codec& codecCtx) {
+- m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
++ m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
+ codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
+ return m_ptr != 0;
+ }
+@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
+ return Result::NoCodecFound;
+
+ Converter converter;
+- if (codec.sampleFormat() != SAMPLE_FMT_S16) {
++ if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
+ if (!converter.createForCodec(codec))
+ return Result::NoConverterFound;
+ }
+--
+1.7.4.1
+
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 8cfd1899e..f1ce496a5 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71745 2012-06-02 10:29:12Z bluewind $
+# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=kvirc
-pkgver=4.0.4
-pkgrel=5
+pkgver=4.2.0
+pkgrel=1
pkgdesc="Qt-based IRC client"
url="http://www.kvirc.net"
depends=('python2' 'qt' 'libxss' 'qtwebkit')
@@ -12,17 +12,11 @@ makedepends=('cmake')
license=('GPL')
options=("!libtool")
install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2
- kvirc-4.0.4-gcc-4.7.0.patch)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788'
- '863e33f5b38f0b5124144e9a8b640e42')
+source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
+md5sums=('bf7229aaae132933a18b6a35125a2328')
build() {
cd $srcdir
-
- # Fix build with GCC 4.7
- patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch"
-
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 74c2f58d5..f1638e2a7 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 71092 2012-05-23 19:58:18Z foutrelis $
+# $Id: PKGBUILD 73390 2012-07-07 05:46:41Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=libmemcached
-pkgver=1.0.8
+pkgver=1.0.9
pkgrel=1
pkgdesc="C and C++ client library to the memcached server"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent')
makedepends=('perl')
options=('!libtool')
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('03f4eb91634f1434a93d4709eccd0c4cce3eb296b54f2b1998ca4a9ce1661ca5')
+sha256sums=('795c51ef53ffc7d877f79c549db1f46ba71d190c7f03a3c2f00455bb948bda34')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index 28be7c809..26a2c9407 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 70187 2012-05-01 12:58:45Z seblu $
+# $Id: PKGBUILD 73453 2012-07-07 23:53:09Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: Laszlo Papp <djszapi at archlinux us>
# Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
pkgname=luaposix
-pkgver=5.1.19
-pkgrel=2
+pkgver=5.1.20
+pkgrel=1
pkgdesc='A POSIX library for Lua programming language'
arch=('i686' 'x86_64' 'mips64el')
url='http://luaforge.net/projects/luaposix/'
@@ -15,13 +15,13 @@ depends=('lua')
#checkdepends=('lunit')
options=('!libtool')
source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('3d74beb1b1d887adb689e6e9316abb42')
+md5sums=('594d67678f829875e33c86b281441843')
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr \
--libdir=/usr/lib/lua/5.1 \
- --datadir=/usr/share/lua/5.1
+ --datadir=/usr/share/lua/5.1
make
}
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 8a4ad7eb8..bf1f0df01 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 68166 2012-03-18 20:30:56Z jlichtblau $
+# $Id: PKGBUILD 73397 2012-07-07 06:32:43Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Dmitry N. Shilov <stormblast@land.ru>
pkgname=luminancehdr
-pkgver=2.2.1
+pkgver=2.3.0
pkgrel=1
pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
arch=('i686' 'x86_64' 'mips64el')
url='http://qtpfsgui.sourceforge.net/'
license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
+depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit')
makedepends=('cmake')
optdepends=('hugin: align image stack functionality')
install=$pkgname.install
changelog=$pkgname.changelog
options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-v${pkgver}.tar.gz)
-sha256sums=('a8d781ca7a07737dfb1fe00702f948ecd044be6b8405a23d9e18fe46b27036f1')
+source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2)
+sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
build() {
- cd "${srcdir}/luminance-hdr-v${pkgver}"
+ cd ${srcdir}/luminance-hdr-${pkgver}
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd "${srcdir}/luminance-hdr-v${pkgver}"
+ cd ${srcdir}/luminance-hdr-${pkgver}
- make DESTDIR="${pkgdir}" install
+ make DESTDIR=${pkgdir} install
}
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index b649ab768..d0236e879 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,3 +1,6 @@
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * luminancehdr 2.3.0-1
+
2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* luminancehdr 2.2.1-1
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index a36de8fce..d5f878be8 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 70793 2012-05-16 17:08:50Z bpiotrowski $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 73311 2012-07-06 07:26:16Z bpiotrowski $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: rabyte <rabyte.at.gmail.dot.com>
# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
pkgname=midori
pkgver=0.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Lightweight web browser based on Gtk WebKit"
arch=('x86_64' 'i686' 'mips64el')
url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
license=('LGPL2.1')
install=midori.install
depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
-optdepends=('vala: for use in extensions')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala')
+optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support')
options=('!emptydirs')
source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea')
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index d8f99ecc3..590db4288 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61280 2011-12-28 01:40:23Z seblu $
+# $Id: PKGBUILD 73315 2012-07-06 08:33:12Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
# Contributor: Ryan Coyner <rcoyner@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=mixxx
-pkgver=1.10.0
+pkgver=1.10.1
pkgrel=1
pkgdesc="Free, open source software for digital DJ'ing."
arch=('i686' 'x86_64' 'mips64el')
@@ -15,22 +15,14 @@ depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio
'qt>=4.5' 'taglib' 'qtwebkit')
makedepends=('mesa' 'scons' 'libshout')
source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('d92bf422491fa92adf7ed6c2998e67fb')
+md5sums=('765bc5216ec8102c2186dd3ea80187a9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- # GCC segfault workaround (fixes FS#26716)
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr"
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- # GCC segfault workaround (fixes FS#26716)
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install
}
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index c93ca71ee..41d8f0786 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $
+# $Id: PKGBUILD 73477 2012-07-08 09:30:31Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
# Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,8 +7,8 @@
pkgbase=mlt
pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.8
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
pkgdesc="An open source multimedia framework"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mltframework.org"
@@ -16,7 +16,7 @@ license=('GPL')
makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('4bdce45d832e065ac4c8c8ca56765e1d')
+md5sums=('d56e0cdfba9c5b5608bf84493322615f')
build() {
# mlt
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index a165015eb..c342bd7bf 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,37 +1,39 @@
-# $Id: PKGBUILD 70406 2012-05-05 14:52:58Z spupykin $
+# $Id: PKGBUILD 73478 2012-07-08 09:30:42Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=motion
pkgver=3.2.12
-pkgrel=4
+pkgrel=6
pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('ffmpeg' 'libjpeg' 'v4l-utils')
+depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
backup=('etc/motion/motion.conf')
options=('!makeflags')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
rc.motion
ffmpeg-0.8.patch
- linux-headers.patch)
+ linux-headers.patch
+ ffmpeg-compat.patch)
md5sums=('1ba0065ed50509aaffb171594c689f46'
'2e8c53c4980edddd420f08fdd572c9be'
'd36687710837d69fbce4608b1345fa34'
- 'd8c3c4fdded5cfbd729710475559a21d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
- '47536a115d4df7497f6e6c616b76ea98e3372e29'
- '6912448db0711f85322505ee6f8052f8f98ae634'
- '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
+ 'd8c3c4fdded5cfbd729710475559a21d'
+ 'e85c596292aceb425fcf17e5072e2fff')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
patch -Np1 -i $srcdir/ffmpeg-0.8.patch
patch -Np1 -i $srcdir/linux-headers.patch
+ patch -Np1 -i $srcdir/ffmpeg-compat.patch
+ autoreconf
./configure --prefix=/usr \
--without-pgsql \
--without-mysql \
- --sysconfdir=/etc/motion
+ --sysconfdir=/etc/motion \
+ --with-ffmpeg
make
}
@@ -39,6 +41,5 @@ package(){
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
-
install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
}
diff --git a/community/motion/ffmpeg-compat.patch b/community/motion/ffmpeg-compat.patch
new file mode 100644
index 000000000..278166e18
--- /dev/null
+++ b/community/motion/ffmpeg-compat.patch
@@ -0,0 +1,172 @@
+diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in
+--- motion-3.2.12/configure.in 2010-06-01 10:48:23.000000000 +0400
++++ motion-3.2.12.q/configure.in 2012-06-20 13:51:42.000000000 +0400
+@@ -290,163 +290,11 @@
+ fi
+
+
+-#
+-# Check for libavcodec and libavformat from ffmpeg
+-#
+-FFMPEG_DIR="yes"
+-FFMPEG_OK="no_found"
+-FFMPEG_OBJ=""
+-AC_ARG_WITH(ffmpeg,
+-[ --with-ffmpeg[=DIR] Specify the prefix for the install path for
+- libavcodec/libavformat (part of ffmpeg) be able to
+- encode mpeg movies realtime.
+- If this is not specified motion will try to find
+- the libraries in /usr and /usr/local.
+- ],
+-FFMPEG_DIR="$withval"
+-)
+-#
+-# --without-ffmpeg or with-ffmpeg=no
+-#
+-if test "${FFMPEG_DIR}" = "no"; then
+- AC_MSG_CHECKING(for ffmpeg)
+- AC_MSG_RESULT(skipping)
+-#
+-# with-ffmpeg=<dir> or nothing
+-#
+-else if test "${FFMPEG_DIR}" = "yes"; then
+- # AUTODETECT STATIC/SHARED LIB
+- AC_MSG_CHECKING(for ffmpeg autodetecting)
+-
+- if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
+- AC_MSG_RESULT(found in /usr/lib64)
+- FFMPEG_OK="found"
+- FFMPEG_LIB="/usr/lib64"
+- FFMPEG_DIR="/usr"
+- elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
+- AC_MSG_RESULT(found in /usr/lib)
+- FFMPEG_OK="found"
+- FFMPEG_LIB="/usr/lib"
+- FFMPEG_DIR="/usr"
+- elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then
+- AC_MSG_RESULT(found in /usr/local/lib)
+- FFMPEG_OK="found"
+- FFMPEG_LIB="/usr/local/lib"
+- FFMPEG_DIR="/usr/local"
+- else
+- AC_MSG_RESULT(not found)
+- echo ""
+- echo "**********************************************"
+- echo "* libavcodec.a or libavcodec.so or *"
+- echo "* libavformat.a or libavformat.so not found: *"
+- echo "* ALL FFMPEG FEATURES DISABLED *"
+- echo "* *"
+- echo "* Please read the Motion Guide for help: *"
+- echo "* http://motion.sourceforge.net *"
+- echo "**********************************************"
+- echo ""
+- fi
+-else
+- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
+- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
+- AC_MSG_RESULT(found)
+- FFMPEG_OK="found"
+- FFMPEG_LIB="${FFMPEG_DIR}/lib"
+- elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
+- AC_MSG_RESULT(found)
+- FFMPEG_LIB="${FFMPEG_DIR}"
+- FFMPEG_OK="found"
+- else
+- AC_MSG_RESULT(not found)
+- if test "${FFMPEG_OK}" != "found"; then
+- echo ""
+- echo "**********************************************"
+- echo "* libavcodec.a or libavcodec.so or *"
+- echo "* libavformat.a or libavformat.so not found: *"
+- echo "* ALL FFMPEG FEATURES DISABLED *"
+- echo "* *"
+- echo "* Please read the Motion Guide for help: *"
+- echo "* http://motion.sourceforge.net *"
+- echo "**********************************************"
+- echo ""
+- fi
+- fi
+-fi
+-
+-#
+-# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found
+-#
+-
+-if test "${FFMPEG_OK}" = "found"; then
+- AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
+-
+- if test -f ${FFMPEG_DIR}/include/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
+- elif test -f ${FFMPEG_DIR}/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
+- elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
+- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
+- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
+- else
+- AC_MSG_RESULT(not found)
+- FFMPEG_OK="no_found"
+- echo "**********************************************"
+- echo "* avformat.h not found: *"
+- echo "* ALL FFMPEG FEATURES DISABLED *"
+- echo "* *"
+- echo "* Please read the Motion Guide for help: *"
+- echo "* http://motion.sourceforge.net *"
+- echo "**********************************************"
+- echo ""
+- fi
+-
+-#
+-# If ffmpeg libs and headers have been found
+-#
+-
+- if test "${FFMPEG_OK}" = "found"; then
+- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
+- TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
+- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
+-
+- FFMPEG_OBJ="ffmpeg.o"
+- AC_SUBST(FFMPEG_OBJ)
+-
+- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
+- saved_CFLAGS=$CFLAGS
+- saved_LIBS=$LIBS
+- CFLAGS="${FFMPEG_CFLAGS}"
+- LIBS="$TEMP_LIBS"
+-
+- AC_COMPILE_IFELSE(
+- [
+- #include <avformat.h>
+- URLProtocol test_file_protocol;
+- int main(void){
+- test_file_protocol.url_read = file_protocol.url_read;
+- return 0;
+- }
+- ],
+- [AC_MSG_RESULT(yes)],
+- [
+- AC_MSG_RESULT(no)
+- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW"
+- ]
+- )
+- CFLAGS=$saved_CFLAGS
+- LIBS=$saved_LIBS
+- fi
+-fi
+-fi
+-
++TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
++TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat"
++FFMPEG_OK=found
++FFMPEG_OBJ="ffmpeg.o"
++AC_SUBST(FFMPEG_OBJ)
+
+ #
+ # Check Mysql
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 700b950b0..72db058fe 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71594 2012-05-30 14:21:43Z bpiotrowski $
+# $Id: PKGBUILD 73479 2012-07-08 09:30:47Z ibiru $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Martin Panter <vadmium+aur@gmail.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=mplayer2
pkgver=20120517
-pkgrel=2
+pkgrel=4
pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -37,17 +37,15 @@ build() {
*86*) extra=--enable-runtime-cpudetection;;
esac
- ./configure --prefix=/usr \
+ ./configure --prefix=/usr --confdir=/etc/mplayer \
+ --enable-translation --language=all \
+ --enable-joystick \
--disable-speex \
--disable-openal \
--disable-libdv \
--disable-musepack \
- --disable-mga \
- --language=all \
- --enable-translation \
- --confdir=/etc/mplayer \
$extra \
- --disable-live # Disabled by default in Uoti’s Git branch
+ --disable-mga
make
}
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index 9d72a7441..7b84044d4 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71861 2012-06-02 13:06:55Z dreisner $
+# $Id: PKGBUILD 73313 2012-07-06 07:32:23Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
# Contributor: Michael P <ptchinster@archlinux.us>
@@ -6,12 +6,12 @@
pkgname=multipath-tools
pkgver=0.4.9
-pkgrel=8
+pkgrel=9
pkgdesc='Multipath tools for Linux'
arch=('i686' 'x86_64' 'mips64el')
url="http://christophe.varoqui.free.fr/"
license=('GPL')
-depends=('libaio' 'device-mapper')
+depends=('bash' 'libaio' 'device-mapper')
backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
install=multipath-tools.install
options=(!emptydirs)
@@ -40,7 +40,7 @@ build() {
# https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814
export LDFLAGS=${LDFLAGS/-Wl,--as-needed}
- make
+ make LIB='usr/lib'
}
package() {
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index 4aa2e680a..aa13363d6 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73004 2012-06-27 13:21:50Z svenstaro $
+# $Id: PKGBUILD 73303 2012-07-06 03:27:30Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
# Contributor: Malte Rabenseifner <malte@zearan.de>
pkgname=murmur
pkgver=1.2.3
-pkgrel=6
+pkgrel=8
pkgdesc="The voice chat application server for Mumble"
arch=('i686' 'x86_64' 'mips64el')
url="http://mumble.sourceforge.net"
@@ -21,12 +21,16 @@ source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
"murmur.rc.d"
"murmur.conf.d"
"murmur.dbus.conf"
- "murmur.logrotate.d")
+ "murmur.logrotate.d"
+ "murmur.service"
+ "murmur.conf")
md5sums=('55804e3dfe98b16eeb40abca6c254625'
'a4f6fc515f258eb4db437a226e16de5d'
'11c1cc875e8021739ec2087252cf0533'
'eddea4cdbd0bde4b960a67e16b5d5478'
- 'c56726cb267ead68f37f35c28e36e6fa')
+ 'c56726cb267ead68f37f35c28e36e6fa'
+ '5ad8798aea4f8b70f47f16df64f755b3'
+ 'e00d0d2610b77efebce5b3556609251f')
build() {
cd ${srcdir}/mumble-$pkgver
@@ -56,6 +60,8 @@ package() {
install -Dm644 ${srcdir}/murmur.logrotate.d ${pkgdir}/etc/logrotate.d/murmur
install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
+ install -Dm644 ${srcdir}/murmur.conf ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf
+ install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service
}
# vim: sw=2:ts=2 et:
diff --git a/community/murmur/murmur.conf b/community/murmur/murmur.conf
new file mode 100644
index 000000000..0cc583c40
--- /dev/null
+++ b/community/murmur/murmur.conf
@@ -0,0 +1 @@
+d /run/murmur 0775 murmur murmur -
diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service
new file mode 100644
index 000000000..b0097796e
--- /dev/null
+++ b/community/murmur/murmur.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mumble Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/murmur/murmur.pid
+ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index e52fc70cd..30b89b5ae 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73064 2012-06-30 06:07:26Z jconder $
+# $Id: PKGBUILD 73481 2012-07-08 09:31:09Z ibiru $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=mythtv
pkgver=0.25.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 3cd23e4d8..764e5d644 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72000 2012-06-05 13:31:36Z svenstaro $
+# $Id: PKGBUILD 73267 2012-07-04 16:56:49Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
pkgname=nbd
-pkgver=3.1.1
+pkgver=3.2
pkgrel=1
pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
backup=('etc/nbd-server/config')
depends=('glib2')
install=nbd.install
-md5sums=('e0e9d96abe068ee4f6fecd58635450ac'
+md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9'
'2d05d426b8c2708d5f8a0d028fcbae05'
'e7b13a8b3369e11927d9917664557efa')
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index a64ba0f85..92006eadf 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73197 2012-07-03 19:16:22Z dreisner $
+# $Id: PKGBUILD 73240 2012-07-04 07:09:22Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
pkgname=nginx
-pkgver=1.2.1
-pkgrel=6
+pkgver=1.2.2
+pkgrel=1
pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
arch=('i686' 'x86_64' 'mips64el')
depends=('pcre' 'zlib' 'openssl')
@@ -27,7 +27,7 @@ backup=('etc/nginx/fastcgi.conf'
source=(http://nginx.org/download/nginx-$pkgver.tar.gz
rc.d service
nginx.logrotate)
-md5sums=('ceacae12d66d1f021bf3737a0269b6f4'
+md5sums=('53105bbe3ac9319db54d9eb46119695b'
'f62c7c9b5a53471d4666a4c49ad363fb'
'16c6b4cbe24001a3f4f58b9d5f4e3d4c'
'b38744739022876554a0444d92e6603b')
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 4bf29d281..068a93971 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71588 2012-05-30 10:24:59Z spupykin $
+# $Id: PKGBUILD 73482 2012-07-08 09:31:14Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Hans Janssen <janserv@gmail.com>
# Contributor: my64 <packages@obordes.com>
@@ -6,13 +6,13 @@
pkgname=openscenegraph
pkgver=3.0.1
-pkgrel=5
+pkgrel=6
pkgdesc="An Open Source, high performance real-time graphics toolkit"
arch=('i686' 'x86_64')
license=('custom:OSGPL')
url="http://www.openscenegraph.org"
depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver' 'qt')
+makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat')
optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
conflicts=('openthreads')
provides=('openthreads')
@@ -24,7 +24,24 @@ md5sums=('c43a25d023e635c3566b2083d8e6d956'
build() {
cd OpenSceneGraph-$pkgver
- [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+ export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+ CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+ CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+ [ $NOEXTRACT -eq 1 ] || cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+ -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \
+ -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+ -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \
+ -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+ -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \
+ -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+ -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \
+ -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
+ -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so
+
sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
patch -p1 <$srcdir/osg-xine-1.2.patch
make
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index 6bb2f95ca..9b2fd912b 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 64126 2012-02-09 00:57:46Z spupykin $
+# $Id: PKGBUILD 73317 2012-07-06 09:18:06Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=opensips
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
url="http://www.opensips.org"
-depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2')
+depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient'
'lynx' 'libxslt')
optdepends=('postgresql-libs'
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 0e4a3927c..35af52e37 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71230 2012-05-25 11:31:06Z spupykin $
+# $Id: PKGBUILD 73261 2012-07-04 14:01:36Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
pkgname=parrot
-pkgver=4.4.0
+pkgver=4.5.0
#_rel=stable
_rel=devel
pkgrel=1
@@ -16,36 +16,20 @@ makedepends=('perl-json')
optdepends=('freeglut')
options=('!makeflags')
source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990')
-sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d')
-sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d')
+md5sums=('8deb517792652d8b44442ebb5d289e2c')
build() {
cd "$srcdir/$pkgname-$pkgver"
-
- sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm
- sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm
-
perl Configure.pl --prefix=/usr \
--parrot_is_shared \
- --disable-rpath || true
-
-# find -type f -name Makefile | while read F; do
-# grep "$srcdir" $F && sed -i \
-# "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
-# grep "$srcdir" $F && sed -i \
-# "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
-# done
-
+ --disable-rpath
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
make all parrot_utils docs html
}
package() {
cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install-dev
-
sed -i "s#$srcdir#/usr/src#" \
$pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm
}
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ef98f7ab6..9cf72cee5 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 67200 2012-03-05 08:58:33Z ibiru $
+# $Id: PKGBUILD 73483 2012-07-08 09:31:23Z ibiru $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=performous
pkgver=0.6.1
-pkgrel=13
+pkgrel=14
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64' 'mips64el')
url="http://performous.org/"
license=('GPL')
-depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
+depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
optdepends=('performous-freesongs: free songs for performous')
source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
boost-filesystem-v3.patch
- ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a"
+ ffmpeg-0.11.patch
png15.patch)
md5sums=('451a759de77984b5a699e91107fe52e2'
'42a8c825d80b0de16bd5752d2a80e585'
- 'ff0ffa681dfaa09c4f42133a65309bf0'
+ '07e52e926595d053155bbfb7168e308f'
'89157d5e21b0efd09fcbeee299d23c7e')
build() {
@@ -28,10 +28,13 @@ build() {
# fix to built against boost 1.46 and later, upstream (git) now support v3
patch -Np1 -i ../boost-filesystem-v3.patch
- # fix with ffmpeg-0.8
- patch -Np1 -i ../ffmpeg-0.8.patch
+ # fix with ffmpeg-0.11
+ patch -Np1 -i ../ffmpeg-0.11.patch
# fix for libpng 1.5
patch -Np1 -i ../png15.patch
+ # fix glib2.0 building
+ # #error "Only <glib.h> can be included directly."
+ sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc
mkdir -p build
cd build
diff --git a/community/performous/ffmpeg-0.11.patch b/community/performous/ffmpeg-0.11.patch
new file mode 100644
index 000000000..2962123ed
--- /dev/null
+++ b/community/performous/ffmpeg-0.11.patch
@@ -0,0 +1,42 @@
+diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc
+--- Performous-0.6.1-Source/game/ffmpeg.cc 2010-10-31 16:05:43.000000000 +0000
++++ Performous-0.6.1a-Source/game/ffmpeg.cc 2012-06-08 21:40:10.876636789 +0000
+@@ -47,11 +47,17 @@
+ return d >= 0.0 ? d : getInf();
+ }
+
++// FFMPEG has fluctuating API
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0)
++#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
++#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
++#endif
++
+ void FFmpeg::open() {
+ boost::mutex::scoped_lock l(s_avcodec_mutex);
+ av_register_all();
+ av_log_set_level(AV_LOG_ERROR);
+- if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file");
++ if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file");
+ if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information");
+ pFormatCtx->flags |= AVFMT_FLAG_GENPTS;
+ videoStream = -1;
+@@ -60,8 +66,8 @@
+ for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
+ AVCodecContext* cc = pFormatCtx->streams[i]->codec;
+ cc->workaround_bugs = FF_BUG_AUTODETECT;
+- if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
+- if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
++ if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
++ if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
+ }
+ if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
+ if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");
+@@ -92,7 +98,7 @@
+ pAudioCodecCtx = cc;
+ #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0)
+ pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate,
+- SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8);
++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8);
+ #else
+ pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate);
+ #endif
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index 33848d663..824c02be6 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 69321 2012-04-13 16:11:02Z spupykin $
+# $Id: PKGBUILD 73360 2012-07-06 16:34:53Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
# Contributor: Benjamin Andresen <benny@klapmuetz.org>
# Contributor: bekks <eduard.warkentin@gmx.de>
pkgname=pgadmin3
-pkgver=1.14.2
-pkgrel=2
+pkgver=1.14.3
+pkgrel=1
pkgdesc="Comprehensive design and management interface for PostgreSQL"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.pgadmin.org"
license=('custom')
depends=('wxgtk' 'postgresql-libs' 'libxslt')
makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick')
-source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
-md5sums=('49f039353539b346616b663bbedd17c8')
+source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
+md5sums=('0669074fda039f5128abb40f63948ff5')
build() {
cd "$srcdir"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index fedae5dae..40254db01 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70505 2012-05-09 18:48:15Z pschmitz $
+# $Id: PKGBUILD 73393 2012-07-07 05:47:10Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=php-memcached
pkgver=2.0.1
-pkgrel=4
+pkgrel=5
pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
arch=('i686' 'x86_64' 'mips64el')
url="http://pecl.php.net/package/memcached"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index ff4edb976..9f89dc415 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73038 2012-06-29 11:35:44Z andrea $
+# $Id: PKGBUILD 73484 2012-07-08 09:31:28Z ibiru $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: sysrq
pkgname=picard
pkgver=1.0
-pkgrel=3
+pkgrel=4
pkgdesc='Official MusicBrainz tagger'
url='http://musicbrainz.org/doc/MusicBrainz_Picard'
license=('GPL')
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index a7430b0f1..d92edb97a 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
# This must be built against the version of dovecot being used,
# else mail delivery will fail.
# Specify the version of dovecot to be used here:
-_dcpkgver=2.1.7
+_dcpkgver=2.1.8
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
pkgver=0.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
arch=('i686' 'x86_64' 'mips64el')
url="http://pigeonhole.dovecot.org/"
diff --git a/community/pstotext/PKGBUILD b/community/pstotext/PKGBUILD
new file mode 100644
index 000000000..7b9f890b8
--- /dev/null
+++ b/community/pstotext/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 73278 2012-07-05 10:43:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Mike Sampson <mike at sambodata dot com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: froggie <sullivanva@gmail.com>
+
+pkgname=pstotext
+pkgver=1.9
+pkgrel=2
+pkgdesc="Converts Postscript to text"
+arch=('i686' 'x86_64')
+url="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
+license=('GPL')
+depends=('ghostscript')
+source=(ftp://ftp.uni-frankfurt.de/pub/Mirrors2/gentoo.org/distfiles/$pkgname-$pkgver.tar.gz)
+md5sums=('64576e8a10ff5514e285d98b3898ae78')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -Dm755 pstotext $pkgdir/usr/bin/pstotext
+ install -Dm644 pstotext.1 $pkgdir/usr/share/man/man1/pstotext.1
+}
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 0d96246c0..de8409cf7 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 68068 2012-03-17 16:12:56Z seblu $
+# $Id: PKGBUILD 73458 2012-07-08 00:12:47Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=python-psutil
pkgname=('python-psutil' 'python2-psutil')
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.5.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://code.google.com/p/psutil/'
license=('custom: BSD')
makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz")
-sha1sums=('2705862e00280a7fa76cfb687dbd61623d5e236e')
+sha1sums=('e4276dd11b5f03c4397490736f6c6445a7e64798')
build() {
cd psutil-$pkgver
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 896655d5b..cf9a05e7e 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71192 2012-05-24 17:21:45Z jlichtblau $
+# $Id: PKGBUILD 73400 2012-07-07 07:56:30Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Matthias Maennich <arch@maennich.net>
# Contributor: <boenki@gmx.de>
pkgname=qlandkartegt
-pkgver=1.4.2
+pkgver=1.5.0
pkgrel=1
pkgdesc="Use your GPS with Linux"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=$pkgname.install
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname-mimetypes.xml)
-sha256sums=('89f1021bda2bba054cb6d4363bb04fd5002fc34ccd01c73aa2513e99cfd65535'
+sha256sums=('439137d4864217c350678d8357c07a0f80455f2cff35a736dd6b58a2d3d683b4'
'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index f9934e824..abf10ce78 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qlandkartegt 1.5.0-1
+
2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qlandkartegt 1.4.2-1
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index b7d8b4540..2f68394b9 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 71311 2012-05-26 14:22:36Z jlichtblau $
+#$Id: PKGBUILD 73485 2012-07-08 09:31:35Z ibiru $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=qmmp
-pkgver=0.5.5
-pkgrel=1
+pkgver=0.6.0
+pkgrel=2
pkgdesc="Qt4 based audio-player"
arch=('i686' 'x86_64' 'mips64el')
url="http://qmmp.ylsoftware.com/"
@@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support'
'ffmpeg' 'libsamplerate' 'wavpack')
install=$pkgname.install
source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6')
+sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 04be7b9e8..bfd002e57 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,18 @@
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.6.0-2 ffmpeg 0.11 rebuild
+
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.6.0-1
+
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.5.6-2 ffmpeg 0.11 rebuild
+
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.5.6-1
+
+2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.5.5-2 ffmpeg 0.11 rebuild
+
2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qmmp 0.5.5-1
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index ff27c5d97..696a40dde 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 69704 2012-04-22 21:26:38Z seblu $
+# $Id: PKGBUILD 73459 2012-07-08 00:19:18Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
pkgname=radvd
-pkgver=1.8.5
-pkgrel=4
+pkgver=1.9.1
+pkgrel=1
pkgdesc='IPv6 Router Advertisement Daemon'
url='http://www.litech.org/radvd/'
license=('custom')
-depends=('glibc')
+depends=('glibc' 'libdaemon')
arch=('i686' 'x86_64' 'mips64el')
backup=('etc/radvd.conf' 'etc/conf.d/radvd')
source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
"$pkgname.rc"
"$pkgname.conf"
"$pkgname.service")
-sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d'
+sha1sums=('8db7d69f5ca4ce3643f06866b4dbf634490f479a'
'08dd01319682f4ef2e847d11aa375e0239c08c7a'
'63ce41d790a0472e6b3b15928f6a71d1dbb7700d'
'9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d')
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 397fcc26a..4bd234999 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 69581 2012-04-19 07:27:11Z spupykin $
+# $Id: PKGBUILD 73486 2012-07-08 09:31:42Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Franco Iacomella <yaco@gnu.org>
pkgname=synfig
pkgver=0.63.05
-pkgrel=1
+pkgrel=2
pkgdesc="Professional vector animation program (CLI renderer only)"
arch=(i686 x86_64 'mips64el')
url="http://synfig.org"
license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
+depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng'
'libtiff' 'libdv' 'libmng')
optdepends=('openexr' 'libsigc++')
conflicts=('synfig-core')
@@ -24,6 +24,10 @@ md5sums=('8591cf17c26405d68d2cc050a2929292'
build() {
cd $srcdir/$pkgname-$pkgver
+ export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+ CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+ CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
[ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
[ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
patch -p1 -i $srcdir/build-fix.patch
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index 12ce2531b..f3831670f 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68908 2012-04-05 15:23:32Z tredaelli $
+# $Id: PKGBUILD 73258 2012-07-04 13:07:27Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: helios
# Contributor: Lothar Gesslein
@@ -15,6 +15,10 @@ backup=(etc/conf.d/tincd.conf)
install=tinc.install
source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
tincd.rc tincd.conf)
+md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32'
+ 'af4a88d89a17c216e38b93630389181a'
+ '64bb53748d9051255f243003f0d511f5'
+ '7c0276d4812cc5d3cc18142562a3aa82')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -35,7 +39,3 @@ package() {
install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd"
install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf"
}
-md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32'
- 'af4a88d89a17c216e38b93630389181a'
- '64bb53748d9051255f243003f0d511f5'
- '7c0276d4812cc5d3cc18142562a3aa82')
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 1e51aa0f1..7f95ba95a 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73111 2012-07-01 18:55:45Z spupykin $
+# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jeff Mickey <jeff@archlinux.org>
# Contributor: Steve Sansom <snsansom@gmail.com>
pkgname=units
pkgver=2.00
-pkgrel=1
+pkgrel=2
pkgdesc="converts between different units"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/units/units.html"
@@ -16,7 +16,7 @@ install=units.install
source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
build-fix.patch)
md5sums=('6d0518d493f9bab5aa318a3c7d0801b2'
- 'bf891464e398b0ddadac97dd7ce948c4')
+ 'dbb20e628ce0879fe82393f585e9dab6')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
index 219c16b85..7361a9e91 100644
--- a/community/units/build-fix.patch
+++ b/community/units/build-fix.patch
@@ -1,6 +1,6 @@
diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
--- units-2.00.org/Makefile.in 2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in 2012-07-01 22:44:37.000000000 +0400
++++ units-2.00/Makefile.in 2012-07-04 12:54:20.000000000 +0400
@@ -84,10 +84,10 @@
sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
@@ -16,3 +16,12 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
install: units@EXEEXT@ install-doc install-support
+diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
+--- units-2.00.org/units_cur 2012-05-01 04:51:35.000000000 +0400
++++ units-2.00/units_cur 2012-07-04 12:53:47.000000000 +0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+
+ import urllib
+ import datetime
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index 24b3ff93a..9aada1a70 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $
+# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Rorschach <r0rschach@lavabit.com>
pkgname=vidalia
pkgver=0.2.19
-pkgrel=2
+pkgrel=3
pkgdesc="Controller GUI for Tor"
url="https://www.torproject.org/vidalia"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,15 @@ depends=('qt' 'tor')
makedepends=('cmake')
install=vidalia.install
source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}
- revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch)
+ bug6178.patch)
md5sums=('caf92b44ad2932bbc1c40d6405951c39'
'1ba45d7c91797e880d79a3fc85818dee'
- '72de3a292b8481b381f67016cb2a677c')
+ 'bdc0855fef6b230ab63a5b523e853d4e')
build() {
[[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
- patch "$srcdir"/$pkgname-$pkgver/src/vidalia/MainWindow.cpp "$srcdir"/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch
+ patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1
cd "$srcdir"
mkdir build
diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch
new file mode 100644
index 000000000..5da41ef55
--- /dev/null
+++ b/community/vidalia/bug6178.patch
@@ -0,0 +1,28 @@
+From: Tomás Touceda <chiiph@torproject.org>
+Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300)
+Subject: Do not add relative root to datadirectory if it is empty
+X-Git-Url: https://gitweb.torproject.org
+
+Do not add relative root to datadirectory if it is empty
+---
+
+diff --git a/changes/bug6178 b/changes/bug6178
+new file mode 100644
+index 0000000..e727ed9
+--- /dev/null
++++ b/changes/bug6178
+@@ -0,0 +1 @@
++ o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178.
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index a8dce5a..a7a4a09 100644
+--- a/src/vidalia/MainWindow.cpp
++++ b/src/vidalia/MainWindow.cpp
+@@ -1104,7 +1104,7 @@ MainWindow::start()
+ QString dataDirectory = settings.getDataDirectory();
+ QFileInfo dataDirectoryInfo(dataDirectory);
+
+- if(QDir(dataDirectory).isRelative()) {
++ if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) {
+ dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
+
+ QFileInfo newDataDirectoryInfo(dataDirectory);
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index 56f4c933a..72f698552 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 71984 2012-06-04 19:39:36Z jlichtblau $
+# $Id: PKGBUILD 73402 2012-07-07 08:01:19Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=vifm
-pkgver=0.7.3
+pkgver=0.7.3a
pkgrel=1
pkgdesc="Ncurses based file manager with vi like keybindings"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
depends=('ncurses' 'gtk2')
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('c2cdb40ca03ea3e0464c2f0f68d27013fd447c0b67b0a5f87521f95c855e7658')
+sha256sums=('77dbf8bb8caaf1b8e805c98dc6c3345d08a855fe1c09e93e6eb5a1b2cf0fd383')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog
index 953f35aaa..767b7b70a 100644
--- a/community/vifm/vifm.changelog
+++ b/community/vifm/vifm.changelog
@@ -1,3 +1,6 @@
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * vifm 0.7.3a-1
+
2012-06-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* vifm 0.7.3-1
diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD
new file mode 100644
index 000000000..bdbe2675e
--- /dev/null
+++ b/community/virtkey/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: codl <codl@aquageek.net>
+# Contributor: Megamixman <Megamixman@gmail.com>
+
+pkgbase=virtkey
+pkgname=('python2-virtkey' 'python-virtkey')
+pkgver=0.61.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url="https://launchpad.net/virtkey"
+license=('LGPL')
+makedepends=('python2' 'python' 'libxtst' 'gtk2')
+source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz)
+md5sums=('536d30acb2c8ddadc6b4a26fc01e8390')
+
+build() {
+ cd "$srcdir"
+
+ cp -a {,python2-}$pkgbase-$pkgver
+
+ # Build python 2 module
+ cd "$srcdir/python2-$pkgbase-$pkgver"
+ python2 setup.py build
+
+ # Build python 3 module
+ cd "$srcdir/$pkgbase-$pkgver"
+ python setup.py build
+}
+
+package_python2-virtkey() {
+ pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server"
+ depends=('python2' 'libxtst' 'gtk2')
+
+ cd "$srcdir/python2-$pkgbase-$pkgver"
+
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+}
+
+package_python-virtkey() {
+ pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
+ depends=('python' 'libxtst' 'gtk2')
+
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ python setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD
index b67886f5c..289641381 100644
--- a/community/webfs/PKGBUILD
+++ b/community/webfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66065 2012-02-22 17:25:28Z cbrannon $
+# $Id: PKGBUILD 73433 2012-07-07 15:26:00Z cbrannon $
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: Mark Rosenstand <mark@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,12 +6,12 @@
pkgname=webfs
pkgver=1.21
-pkgrel=6
+pkgrel=7
pkgdesc="Simple http server for mostly static content."
arch=(i686 x86_64 'mips64el')
url="http://linux.bytesex.org/misc/webfs.html"
license=("GPL")
-depends=('openssl')
+depends=('mime-types' 'openssl')
backup=(etc/conf.d/webfsd)
source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz
webfsd.rc webfsd.conf webfs.patch)
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 981e41d6e..805aa46fd 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $
+# $Id: PKGBUILD 73487 2012-07-08 09:31:59Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xmms2
pkgver=0.8DrO_o
-pkgrel=6
+pkgrel=7
pkgdesc="complete rewrite of the popular music player"
arch=('i686' 'x86_64' 'mips64el')
url="http://xmms2.org/"
@@ -49,12 +49,19 @@ conflicts=('xmms2-devel')
install=xmms2.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
xmms2d.conf
- xmms2d.rc)
+ xmms2d.rc
+ 'ffmpeg-0.11.diff')
md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
'af13c937bf3c86b77ae6820107aab9b8'
- '9d8e3e1a434f271423bdd228a1e9bd7c')
+ '9d8e3e1a434f271423bdd228a1e9bd7c'
+ 'e176971ef96807f72fa8fc17d260c20a')
build() {
+ cd xmms2-${pkgver}/src/plugins/avcodec/
+ # remove call to avcodec_init
+ # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13
+ patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff
+
cd ${srcdir}/${pkgname}-${pkgver}
# python2 fix
diff --git a/community/xmms2/ffmpeg-0.11.diff b/community/xmms2/ffmpeg-0.11.diff
new file mode 100644
index 000000000..91d3a3106
--- /dev/null
+++ b/community/xmms2/ffmpeg-0.11.diff
@@ -0,0 +1,10 @@
+--- avcodec.c.orig 2012-06-07 15:08:23.796225671 -0500
++++ avcodec.c 2012-06-07 15:08:36.649489373 -0500
+@@ -134,7 +134,6 @@
+
+ xmms_xform_private_data_set (xform, data);
+
+- avcodec_init ();
+ avcodec_register_all ();
+
+ mimetype = xmms_xform_indata_get_str (xform,