diff options
65 files changed, 1512 insertions, 164 deletions
diff --git a/community-staging/chromaprint/PKGBUILD b/community-staging/chromaprint/PKGBUILD new file mode 100644 index 000000000..52518f3ea --- /dev/null +++ b/community-staging/chromaprint/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 71948 2012-06-04 01:05:16Z bisson $ +# Contributor: Wieland Hoffmann <the_mineo@web.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=chromaprint +pkgver=0.6 +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') +license=('LGPL') +depends=('ffmpeg') +makedepends=('cmake') +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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/chromaprint/ffmpeg.patch b/community-staging/chromaprint/ffmpeg.patch new file mode 100644 index 000000000..7c0b86d77 --- /dev/null +++ b/community-staging/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-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD new file mode 100644 index 000000000..ef02d4658 --- /dev/null +++ b/community-staging/gnash/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 71943 2012-06-03 22:41:22Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.10 +pkgrel=3 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +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 + nodebug.patch) +sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' + '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Disable very, very verbose debugging (gigabytes of logs) + patch -Np1 -i "$srcdir/nodebug.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk,dump \ + --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 + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib sdl agg libjpeg libpng libltdl mesa + speex fontconfig cairo + gstreamer0.10-base + boost-libs) + backup=(etc/gnashrc etc/gnashthumbnailrc) + + cd "$srcdir/gnash-$pkgver" + + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \ + "$srcdir/gtk/usr/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \ + "$srcdir/gtk/usr/share/man/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/" + mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + mv "$srcdir"/gtk/* "$pkgdir" + + cd "$srcdir/gnash-$pkgver" + make DESTDIR="$pkgdir" install-plugin + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \ + "$pkgdir"/usr/share/applications/*.schemas + rm -f "$pkgdir"/usr/share/applications/*.schemas +} diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install new file mode 100644 index 000000000..6678a7f8a --- /dev/null +++ b/community-staging/gnash/gnash-gtk.install @@ -0,0 +1,22 @@ +post_install() { + gconfpkg --install gnash + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall gnash +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch new file mode 100644 index 000000000..ca160b898 --- /dev/null +++ b/community-staging/gnash/nodebug.patch @@ -0,0 +1,48 @@ +diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h +--- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 +@@ -331,27 +331,27 @@ + + // Define to 0 to completely remove parse debugging at compile-time + #ifndef VERBOSE_PARSE +-#define VERBOSE_PARSE 1 ++#define VERBOSE_PARSE 0 + #endif + + // Define to 0 to completely remove action debugging at compile-time + #ifndef VERBOSE_ACTION +-#define VERBOSE_ACTION 1 ++#define VERBOSE_ACTION 0 + #endif + + // Define to 0 to remove ActionScript errors verbosity at compile-time + #ifndef VERBOSE_ASCODING_ERRORS +-#define VERBOSE_ASCODING_ERRORS 1 ++#define VERBOSE_ASCODING_ERRORS 0 + #endif + + // Define to 0 this to remove invalid SWF verbosity at compile-time + #ifndef VERBOSE_MALFORMED_SWF +-#define VERBOSE_MALFORMED_SWF 1 ++#define VERBOSE_MALFORMED_SWF 0 + #endif + + // Define to 0 this to remove Networking verbosity at compile-time + #ifndef VERBOSE_NETWORKING +-#define VERBOSE_NETWORKING 1 ++#define VERBOSE_NETWORKING 0 + #endif + + #if VERBOSE_PARSE +diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp +--- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 +@@ -46,7 +46,7 @@ + // too much information for my tastes. I really want just + // to see how stack changes while executing actions... + // --strk Fri Jun 30 02:28:46 CEST 2006 +-# define DEBUG_STACK 1 ++//# define DEBUG_STACK 1 + + // Max number of stack item to dump. 0 for unlimited. + # define STACK_DUMP_LIMIT 32 diff --git a/community-staging/picard/PKGBUILD b/community-staging/picard/PKGBUILD new file mode 100644 index 000000000..3e7ceb0ac --- /dev/null +++ b/community-staging/picard/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 71926 2012-06-03 18:18:47Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: sysrq + +pkgname=picard +pkgver=1.0 +pkgrel=2 +pkgdesc='Official MusicBrainz tagger' +url='http://musicbrainz.org/doc/MusicBrainz_Picard' +license=('GPL') +arch=('i686' 'x86_64') +depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') +optdepends=('libdiscid: CD lookup' + 'chromaprint: fingerprinting') +source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('abbd606a89b60ed8c948705d47ce1ae1a90f866a') + +install=install + +build() { + cd "${srcdir}/picard-${pkgver}" + python2 setup.py config +} + +package() { + cd "${srcdir}/picard-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/community-staging/picard/install b/community-staging/picard/install new file mode 100644 index 000000000..b46fab005 --- /dev/null +++ b/community-staging/picard/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index e4b2d706b..51ed71635 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70950 2012-05-20 14:02:23Z giovanni $ +# $Id: PKGBUILD 71906 2012-06-03 07:35:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.8 +pkgver=2.0.9 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7e2a3c37ed7d2a5f2c2a9bd891fc50d1') +md5sums=('62d596cda98a7d82b3ea21cb1ce7b546') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 88b750eca..23e14844b 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 71735 2012-06-02 10:28:04Z bluewind $ +# $Id: PKGBUILD 71904 2012-06-03 06:03:10Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.1.0 -pkgrel=2 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' -arch=('i686' 'x86_64') url='http://collectd.org/' +arch=('i686' 'x86_64') license=('GPL') optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' @@ -42,10 +42,12 @@ depends=('libltdl') source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'rtnl_dump_filter.patch' 'libperl.patch' + 'service' 'rc.d') sha1sums=('55f17b17a10710641a9bf4e8c5332cef661cafcd' 'c92b8dacff0a71f2cc8645c2e350ff9bdc1cbd5f' '245c098d121a4a05594553583310953b3a2f6461' + 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') backup=('etc/collectd.conf') @@ -75,5 +77,6 @@ package() { make DESTDIR="${pkgdir}" install 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 } diff --git a/community/collectd/service b/community/collectd/service new file mode 100644 index 000000000..9581ec0c9 --- /dev/null +++ b/community/collectd/service @@ -0,0 +1,13 @@ +[Unit] +Description=System statistics collection daemon +After=local-fs.target network.target + +[Service] +Type=forking +PIDFile=/run/collectdmon.pid +ExecStart=/usr/sbin/collectdmon +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 530ab61b6..12ddd047f 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71737 2012-06-02 10:28:34Z bluewind $ +# $Id: PKGBUILD 71916 2012-06-03 14:33:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -7,8 +7,8 @@ # Go read http://www.courier-mta.org/install.html b4 running or building courier pkgname=courier-mta -pkgver=0.68.0 -pkgrel=2 +pkgver=0.68.1 +pkgrel=1 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') @@ -40,7 +40,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri pop3d.rc.d pop3d-ssl.rc.d webmaild.rc.d) -md5sums=('5bd56150ed7c75cc8378c443742c632e' +md5sums=('d894f57186933480e116350e7e0df8bc' '9055ba622efd37603186ce1f37277224' '5cbeb5c323706058e545f74ad7752ebe' 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index cd78dbde4..2678ea80e 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 64321 2012-02-11 23:20:47Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 71941 2012-06-03 21:58:45Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + pkgname=exim -pkgver=4.77 -pkgrel=3 +pkgver=4.80 +pkgrel=1 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') -url="http://www.exim.org/" +url='http://www.exim.org/' license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf \ - etc/logrotate.d/exim etc/conf.d/exim) +backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim) install=exim.install -changelog=ChangeLog depends=('db' 'pcre' 'pam' 'openssl' 'libldap') provides=('smtp-server') conflicts=('smtp-server') @@ -22,7 +22,7 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2 exim.logrotate exim.conf.d exim.Makefile) -sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475' +sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984' '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' @@ -39,29 +39,31 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim - install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim - install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 - install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim - mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ - ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin} - chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim + install -Dm0644 ../exim.logrotate "${pkgdir}/etc/logrotate.d/exim" + install -Dm0644 ../exim.conf.d "${pkgdir}/etc/conf.d/exim" + install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8" + install -Dm0755 ../exim "${pkgdir}/etc/rc.d/exim" + + mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \ + "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin} + + chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim" + cd build-Linux-* - for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ - exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ - exim_fixdb eximstats exinext exiqgrep exiwhat; do - install -m 0755 "$i" "$pkgdir/usr/sbin" + for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \ + exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do + install -m0755 "$i" "$pkgdir/usr/sbin" done cd "$srcdir/exim-$pkgver/src" - sed -e "s|/etc/aliases|/etc/mail/aliases|g" \ - -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \ - >"$pkgdir/etc/mail/exim.conf" + sed -e "s|/etc/aliases|/etc/mail/aliases|g" -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ + configure.default > "$pkgdir/etc/mail/exim.conf" cp "$srcdir/aliases" "$pkgdir/etc/mail" + cd "$pkgdir/usr/sbin" for i in mailq rmail rsmtp runq sendmail; do - ln -s exim "$i" + ln -s exim "$i" done # fhs compliancy ln -s ../sbin/exim ../lib/sendmail @@ -69,5 +71,3 @@ package() { mkdir -p "$pkgdir/etc/rc.d" cp "$srcdir/exim" "$pkgdir/etc/rc.d" } - -# vim:set ts=2 sw=2 et: diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index ef785244e..515910ea8 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67760 2012-03-14 10:41:59Z spupykin $ +# $Id: PKGBUILD 71939 2012-06-03 21:25:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('bc16671ed9f28808a262f2c88b018687') +md5sums=('0ca9f143a928ee29ddc3c60e1d4b6dc8') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index de4c1913a..4a6a82c1d 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67758 2012-03-14 10:41:00Z spupykin $ +# $Id: PKGBUILD 71937 2012-06-03 21:24:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64') url="http://gnunet.org" license=('GPL') -depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' +depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'curl' 'libmicrohttpd' 'libunistring') makedepends=('gettext' 'pkgconfig') backup=(etc/gnunetd.conf) @@ -19,13 +19,14 @@ source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz gnunet.rc gnunet.conf.d defaults.conf) -md5sums=('ecb3c0853e3b8feae6e6b16e69e0d527' +md5sums=('7d2b75d8662804b8047c98ed59979dcb' '5baf691913b007fb33e365239e3f7217' 'f161b46915736e4017e77ad735521453' '0fe23b2ca5b3fc47a0b5645e04406da0') build() { cd $srcdir/gnunet-$pkgver + sed -i 's|contrib doc|doc|' Makefile.* [ -f Makefile ] || ./configure --prefix=/usr --without-mysql make } diff --git a/community/lxshortcut/PKGBUILD b/community/lxshortcut/PKGBUILD new file mode 100644 index 000000000..75732c2a7 --- /dev/null +++ b/community/lxshortcut/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 71908 2012-06-03 08:11:43Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: swanson <swansonwebaake at gmail dot com> +# Contributor: zoulnix <http://goo.gl/HQaP> +# Contributor: n6W588kJ2d + +pkgname=lxshortcut +pkgver=0.1.2 +pkgrel=1 +pkgdesc='Small program used to edit application shortcuts' +arch=('i686' 'x86_64') +url="http://lxde.org/" +license=('GPL') +groups=('lxde') +depends=('gtk2') +makedepends=('autoconf' 'automake' 'gcc' 'intltool' 'make' 'pkg-config') +options=(!libtool) +source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) +md5sums=('72f0dfafa8098be853beae6e33b5e13b') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 1a7c9c3a5..586761908 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71031 2012-05-22 06:04:35Z bpiotrowski $ +# $Id: PKGBUILD 71910 2012-06-03 09:52:48Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.23 -pkgrel=3 +pkgver=5.5.24 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" @@ -12,7 +12,7 @@ makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://mirror.de.gsnw.de:56431/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz" 'mysqld') -md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' +md5sums=('caf9461227eeadd4e57cf3f2a74b1165' '3bb5a9a96340feb0184bc057ee6e330b') build() { diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index fca605f66..04e329e46 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,34 +1,47 @@ -# $Id: PKGBUILD 64529 2012-02-15 22:26:23Z bisson $ +# $Id: PKGBUILD 71903 2012-06-03 06:00:07Z bisson $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd pkgver=3.2.10 -pkgrel=1 +pkgrel=2 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') depends=('openssl') makedepends=('flex') arch=('i686' 'x86_64') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('04657cffe5087d97213b245f8281296cac86b868') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'service') +sha1sums=('04657cffe5087d97213b245f8281296cac86b868' + 'e560876628a30f11f9abbee4abcaa1f51cf449a6') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share + + ./configure \ + --prefix=/ \ + --exec-prefix=/usr \ + --datarootdir=/usr/share \ + --with-pidfile=/run/nsd.pid \ + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -d "${pkgdir}"/{etc/rc.d,usr/share/{doc,licenses}/"${pkgname}"} + + install -d "${pkgdir}"/etc/rc.d + ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service + rm doc/differences.pdf + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" ln -s ../../doc/"${pkgname}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE - ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd } diff --git a/community/nsd/install b/community/nsd/install index a2662903f..5a5f41dd7 100644 --- a/community/nsd/install +++ b/community/nsd/install @@ -3,14 +3,6 @@ post_install() { getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null chown nsd:nsd /var/db/nsd chmod 700 /var/db/nsd - install -o nsd -d /var/run/nsd -} - -post_upgrade() { - [[ `vercmp $2 3.2.9` -lt 0 ]] && cat <<\EOF -==> The database format was updated; please run `nsdc rebuild`. -EOF - true } post_remove() { diff --git a/community/nsd/service b/community/nsd/service new file mode 100644 index 000000000..37649f557 --- /dev/null +++ b/community/nsd/service @@ -0,0 +1,14 @@ +[Unit] +Description=NSD Name Server Daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/nsd.pid +ExecStart=/usr/sbin/nsd start +ExecReload=/usr/sbin/nsd reload +ExecStop=/usr/sbin/nsd stop +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 5c8aeef52..30320cc06 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70039 2012-04-28 15:51:53Z bisson $ +# $Id: PKGBUILD 71898 2012-06-03 04:13:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard -pkgver=0.16 -pkgrel=5 +pkgver=1.0 +pkgrel=1 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') @@ -13,16 +13,13 @@ arch=('i686' 'x86_64') depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') optdepends=('libdiscid: CD lookup' 'chromaprint: fingerprinting') -source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'typeheader.patch') -sha1sums=('274071410550ee29051bb0137d72602921a015f9' - '0bd871632c28ef656af7ae89a8e752120f2cd7bd') +source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('abbd606a89b60ed8c948705d47ce1ae1a90f866a') install=install build() { cd "${srcdir}/picard-${pkgver}" - patch -p1 -i ../typeheader.patch python2 setup.py config } diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD new file mode 100644 index 000000000..0e19921fc --- /dev/null +++ b/community/qupzilla/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 71945 2012-06-03 23:57:58Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +_name=QupZilla +pkgname=qupzilla +pkgver=1.2.0 +pkgrel=1 +pkgdesc="Cross-platform QtWebKit browser" +arch=(i686 x86_64) +url="http://www.qupzilla.com/" +license=('GPL3') +depends=('qtwebkit' 'gtk-update-icon-cache') +install="$pkgname.install" +source=("https://github.com/$_name/$pkgname/tarball/v$pkgver") +md5sums=('fc689dcda60a45d7b1aed32ecb851c1a') + +build() { + cd "$srcdir/$_name-$pkgname-"* + + # enable webgl support + export USE_WEBGL=true + + qmake QUPZILLA_PREFIX=/usr/ + make +} + +package() { + cd "$srcdir/$_name-$pkgname-"* + make INSTALL_ROOT="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/qupzilla/qupzilla.install b/community/qupzilla/qupzilla.install new file mode 100644 index 000000000..bce670aff --- /dev/null +++ b/community/qupzilla/qupzilla.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index ec9fd8e13..a5c51c984 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71115 2012-05-24 13:42:42Z bisson $ +# $Id: PKGBUILD 71901 2012-06-03 05:58:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.17 -pkgrel=1 +pkgrel=2 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') @@ -16,9 +16,11 @@ makedepends=('expat') optdepends=('expat: unbound-anchor') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" + 'unbound.service' 'unbound.conf' 'rc.d') sha1sums=('fea4d812c03af4737ef671ac30b7b7400d346516' + '5bc313cd978e4d6efe8c13600e838c70629be477' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'dc96e772f467b32555df21d16fdb15e98194c228') @@ -34,7 +36,7 @@ build() { --enable-static=no \ --disable-rpath \ --with-conf-file=/etc/unbound/unbound.conf \ - --with-pidfile=/var/run/unbound.pid \ + --with-pidfile=/run/unbound.pid \ make } @@ -48,4 +50,5 @@ package() { install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf" install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" + install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service" } diff --git a/community/unbound/unbound.service b/community/unbound/unbound.service new file mode 100644 index 000000000..8b3c9576b --- /dev/null +++ b/community/unbound/unbound.service @@ -0,0 +1,11 @@ +[Unit] +Description=Unbound DNS Resolver + +[Service] +PIDFile=/run/unbound.pid +ExecStart=/usr/sbin/unbound -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index 2272389c4..5e717e680 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67880 2012-03-15 16:16:37Z spupykin $ +# $Id: PKGBUILD 71934 2012-06-03 20:48:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> pkgname=yagf -pkgver=0.9 +pkgver=0.9.1 pkgrel=1 pkgdesc="QT4-based GUI for Cuneiform OCR" arch=(i686 x86_64) @@ -14,10 +14,10 @@ optdepends=('xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('47ddc8dfe9539242073312dcf098fa86') +md5sums=('501946bd993c29b23b54d114727ccafb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release . make make DESTDIR=${pkgdir} install diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 436add0c5..6aced1ea4 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153485 2012-03-14 23:26:22Z tomegun $ +# $Id: PKGBUILD 160678 2012-06-03 16:32:18Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.19.4 -pkgrel=2 +pkgver=1.20.1 +pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') url="http://www.busybox.net/" @@ -13,8 +13,8 @@ depends=('glibc') options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'config') -sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee' - '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a') +sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9' + 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') build() { cd "$srcdir/busybox-$pkgver" diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 3cd776e03..ed84c5383 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.19.2 -# Sun Oct 16 15:24:19 2011 +# Busybox version: 1.20.0 +# Sun May 13 11:33:40 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -49,7 +49,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -62,7 +62,10 @@ CONFIG_FEATURE_HAVE_RPC=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" # # Debugging Options @@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 +CONFIG_MD5_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -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 @@ -124,7 +128,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set +CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set @@ -140,6 +144,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_GUNZIP is not set # CONFIG_GZIP is not set # 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 is not set @@ -173,11 +178,13 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +# CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set @@ -220,7 +227,6 @@ CONFIG_FALSE=y # CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_LN=y @@ -313,7 +319,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # CONFIG_CHVT is not set # CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set CONFIG_KBD_MODE=y @@ -461,6 +467,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set # CONFIG_GETTY is not set # CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set @@ -469,6 +476,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set @@ -511,13 +519,19 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -# CONFIG_DEFAULT_MODULES_DIR is not set -# CONFIG_DEFAULT_DEPMOD_FILE is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # # CONFIG_BLOCKDEV is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set @@ -561,12 +575,6 @@ CONFIG_HEXDUMP=y CONFIG_LOSETUP=y # CONFIG_LSPCI is not set # CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set @@ -600,10 +608,6 @@ CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # CONFIG_VOLUMEID is not set - -# -# Filesystem/Volume identification -# # CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set @@ -835,6 +839,7 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPC6 is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -881,6 +886,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # Process Utilities # # CONFIG_IOSTAT is not set +# CONFIG_LSOF is not set # CONFIG_MPSTAT is not set # CONFIG_NMETER is not set # CONFIG_PMAP is not set @@ -902,6 +908,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set 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/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index aa67049d5..5cb43c056 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 148459 2012-02-01 09:04:29Z pierre $ +# $Id: PKGBUILD 160667 2012-06-03 14:22:11Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.2.1 +pkgver=4.3.1 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('6359b273bee9b959d243d1490caa8f0f5ff8dc294690b1bdb5df755d6364be0f') +sha256sums=('03cbb242b8b86f444477e0bbe8e391c18aec8f8d08a2a02e8893efd1d5d6e4bc') build() { cd $srcdir/debianutils-$pkgver diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 42d31533b..765609685 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.4/$pkgname-$pkgver.tar.xz banshee-recent-gpod.patch) -md5sums=('a719717d02ed26cccf4e6432edd48a31' +md5sums=('18d77594e524ff5e51c5cca5c6b31a34' 'e988bb83e1a49e5f0da5958e8af6508e') build() { diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index e98e28e64..cf00e6549 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150841 2012-02-23 12:31:37Z ibiru $ +# $Id: PKGBUILD 160663 2012-06-03 10:40:04Z bisson $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -8,7 +8,7 @@ pkgname=hddtemp pkgver=0.3.beta15.46 _origver=0.3-beta15 _patchver=46 -pkgrel=2 +pkgrel=3 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" arch=('i686' 'x86_64') url="http://www.guzu.net/linux/hddtemp.php" @@ -17,10 +17,11 @@ depends=('glibc') backup=('etc/conf.d/hddtemp') source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2 http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz - 'hddtemp' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch') + 'hddtemp' 'hddtemp.service' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch') md5sums=('8b829339e1ae9df701684ec239021bb8' '040437845e28771c560b4bb40e41f933' 'b7ebb86dfeef3bc4577ed1040307e36b' + 'b6767bdbb03b6cdbc1995418cafdb1e1' 'fdca5c43900406f0be76534ef2a5a697' '526ef28549dd0da7e38d32cfc8523592') options=('!libtool') @@ -42,5 +43,6 @@ package() { install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \ "$pkgdir/usr/share/${pkgname}/hddtemp.db" install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp" + install -D -m644 "$srcdir/hddtemp.service" "$pkgdir/usr/lib/systemd/system/hddtemp.service" install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp" } diff --git a/extra/hddtemp/hddtemp.service b/extra/hddtemp/hddtemp.service new file mode 100644 index 000000000..bc56d16b0 --- /dev/null +++ b/extra/hddtemp/hddtemp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hard drive temperature monitor daemon + +[Service] +EnvironmentFile=/etc/conf.d/hddtemp +ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES + +[Install] +WantedBy=multi-user.target diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 55d289c7d..2b4176add 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156577 2012-04-21 07:39:14Z giovanni $ +# $Id: PKGBUILD 160650 2012-06-03 07:59:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.40.9 +pkgver=1.40.10 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('243aa6d549888c265616f2a082777a56') +md5sums=('7181a363af41e0f476dd81f36b105a8e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 72c8c3581..20d5bf4cc 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153833 2012-03-19 19:50:28Z andyrtr $ +# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=2.12 +pkgver=2.13 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') options=('!libtool') install=libtasn1.install -source=(ftp://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('b73539aee5444efb5e606b94bdf3ec5bfedb8620' - 'c260eae1003b4195b3a1065252b69e95ae482661') +source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) +sha1sums=('89120584bfedd244dab92df99e955a174c481851' + '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index eea3e9cba..5347acf40 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158554 2012-05-04 23:23:19Z giovanni $ +# $Id: PKGBUILD 160652 2012-06-03 08:11:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('0ff7c7f7c50e506d494ff84baa10a77d' +md5sums=('9f59b5d71969cbb2671702cd2a7a5a11' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mono-upnp/PKGBUILD b/extra/mono-upnp/PKGBUILD index 02b0d806b..c819c4cd2 100644 --- a/extra/mono-upnp/PKGBUILD +++ b/extra/mono-upnp/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 154079 2012-03-22 17:57:25Z daniel $ +# $Id: PKGBUILD 160690 2012-06-03 19:15:39Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=mono-upnp -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="UPNP binding for Mono/.NET" arch=('i686' 'x86_64') url="https://github.com/mono/mono-upnp" license=('MIT') depends=('gtk-sharp-2' 'mono-addins' 'taglib-sharp') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('35b3e2ab07407eed018a5b24c22241aa') +source=(https://github.com/downloads/mono/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('9fd681bc1fee67db8a54f5da1a3805dc') build() { cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh --help sed -i 's/nunit/mono-nunit/' configure tests/*/Makefile.in ./configure --prefix=/usr - make } diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index 2a18f9139..eecc391c5 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150669 2012-02-19 23:09:39Z andrea $ +# $Id: PKGBUILD 160656 2012-06-03 09:29:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc pkgver=0.5.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://phonon.kde.org/' pkgdesc="Phonon VLC backend" diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 6882fd26a..f6c46d1bf 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160385 2012-06-01 13:01:31Z tpowa $ +# $Id: PKGBUILD 160692 2012-06-03 19:17:38Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.3 -pkgrel=4 +pkgrel=5 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -57,7 +57,7 @@ package() { } md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' 'd8ea9c4dee2811524b67f4f666311a1f' - 'ebfff3417058619a1328284ae0e2f48e' + 'd33edc74724c6ca00445767ce38fc732' '43da096480bf72c3ccec8ad8400f34f0' '7c0bf1fb6292537e2c63ec04f8532079' 'ae4b237d472ec5d373e30080aa0ff804' diff --git a/extra/slim/pam.d b/extra/slim/pam.d index 4a6b53d0f..2a875d9e3 100644 --- a/extra/slim/pam.d +++ b/extra/slim/pam.d @@ -7,3 +7,4 @@ password required pam_unix.so session required pam_limits.so session required pam_unix.so session optional pam_loginuid.so +session optional pam_systemd.so diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 09fcb9679..5f6736583 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 153239 2012-03-12 11:49:26Z giovanni $ +# $Id: PKGBUILD 160665 2012-06-03 10:41:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') url="http://smb4k.sourceforge.net/" license=('GPL') depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4' 'docbook-xsl') +makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c4b515e482ef7a7a834a3b660e1ee4d0') +md5sums=('e1c895044faaf18d90ea4b564412455e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 132a89cdf..20b0ccc7e 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $ +# $Id: PKGBUILD 160646 2012-06-03 04:02:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" @@ -17,11 +17,14 @@ optdepends=('libao: for ao plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox_default_audio_driver_fallback.patch) +sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978' + 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" diff --git a/extra/sox/sox_default_audio_driver_fallback.patch b/extra/sox/sox_default_audio_driver_fallback.patch new file mode 100644 index 000000000..9f9060e17 --- /dev/null +++ b/extra/sox/sox_default_audio_driver_fallback.patch @@ -0,0 +1,51 @@ +--- src/sox.c.old 2012-05-06 22:45:45.380564154 -0400 ++++ src/sox.c 2012-05-06 22:47:11.948248987 -0400 +@@ -2538,20 +2538,38 @@ + return name? from_env? from_env : name : NULL; + } + ++static char const * try_device(char const * name) ++{ ++ sox_format_handler_t const * handler = sox_find_format(name, sox_false); ++ if (handler) { ++ sox_format_t format, * ft = &format; ++ memset(ft, 0, sizeof(*ft)); ++ ft->filename = (char *)device_name(name); ++ ft->priv = lsx_calloc(1, handler->priv_size); ++ if (handler->startwrite(ft) == SOX_SUCCESS) { ++ handler->stopwrite(ft); ++ free(ft->priv); ++ return name; ++ } ++ free(ft->priv); ++ } ++ return NULL; ++} ++ + static char const * set_default_device(file_t * f) + { + /* Default audio driver type in order of preference: */ + if (!f->filetype) f->filetype = getenv("AUDIODRIVER"); +- if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio"; +- if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio"; +- if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa"; +- if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio"; +- if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio"; +- if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss"; +- if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau"; +- if (!f->filetype && sox_find_format("ao" , sox_false) && file_count) /*!rec*/ +- f->filetype = "ao"; +- ++ if (!f->filetype) f->filetype = try_device("coreaudio"); ++ if (!f->filetype) f->filetype = try_device("pulseaudio"); ++ if (!f->filetype) f->filetype = try_device("alsa"); ++ if (!f->filetype) f->filetype = try_device("waveaudio"); ++ if (!f->filetype) f->filetype = try_device("sndio"); ++ if (!f->filetype) f->filetype = try_device("oss"); ++ if (!f->filetype) f->filetype = try_device("sunau"); ++ if (!f->filetype && file_count) /*!rec*/ ++ f->filetype = try_device("ao"); ++ + if (!f->filetype) { + lsx_fail("Sorry, there is no default audio device configured"); + exit(1); diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index eabbcde40..2d2f03d72 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160581 2012-06-02 10:29:09Z bluewind $ +# $Id: PKGBUILD 160654 2012-06-03 08:20:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.7 -pkgrel=2 +pkgver=0.3.8 +pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('62bb5002b2ba9e5816dfeededc3fa276') +md5sums=('c07047eca33c176df25e94964bdec7bf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 94d5390ab..d77f392b6 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $ +# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=filesystem -pkgver=2012.2 -pkgrel=5 +pkgver=2012.6 +pkgrel=1 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -17,8 +17,8 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' - 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells' - 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') + 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') md5sums=('772fe869b921698cc3e6fde73c4ac85a' '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' @@ -31,6 +31,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a' 'e5d8323a4dbee7a6d0d2a19cbf4b819f' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' 'd2dc4e39dbdea75b107f91789e3274ab' @@ -43,10 +44,11 @@ package() { # # setup root filesystem # - for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do + for d in boot dev etc home media mnt usr var opt srv/http run; do install -d -m755 ${d} done install -d -m555 proc + install -d -m555 sys install -d -m0750 root install -d -m1777 tmp # vsftpd won't run with write perms on /srv/ftp @@ -54,7 +56,7 @@ package() { # setup /etc install -d etc/{ld.so.conf.d,skel,profile.d} - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do + for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do install -m644 ${srcdir}/${f} etc/ done ln -s /proc/self/mounts etc/mtab @@ -65,17 +67,15 @@ package() { install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf # setup /var - for d in cache/man local opt log/old lib/misc empty run; do + for d in cache/man local opt log/old lib/misc empty; do install -d -m755 var/${d} done - install -d -m1777 var/{tmp,spool/mail,lock} + install -d -m1777 var/{tmp,spool/mail} # allow setgid games to write scores install -d -m775 -g games var/games ln -s spool/mail var/mail - # not ready yet, needs possible change in pacman or other magic - # is fixed by initscripts on next boot -# ln -s ../run var/run -# ln -s ../run/lock var/lock + ln -s ../run var/run + ln -s ../run/lock var/lock # # setup /usr hierarchy diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release new file mode 100644 index 000000000..fe5f20b4f --- /dev/null +++ b/libre/filesystem/os-release @@ -0,0 +1,8 @@ +NAME="Parabola" +ID=parabola +ID_LIKE=arch +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" +HOME_URL="https://parabolagnulinux.org/" +BUG_REPORT_URL="https://labs.parabola.nu/" + diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 81b24e100..c2cec2e13 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,5 @@ # $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> # Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> @@ -6,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.12.4 -pkgrel=1 +pkgrel=4 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -28,24 +29,39 @@ provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('a063f76aa47edab55a3f31ff2558df07' + '2fe18f4091afb3dec200271dc7836128') build() { cd "$srcdir/$_pkgname-$pkgver" export PYTHON=python2 + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + export AUTOMAKE='automake --foreign' autoreconf --force --install ./configure --prefix=/usr \ --enable-qt4 \ - --enable-foomatic-rip-hplip-install \ + --disable-foomatic-rip-hplip-install \ --enable-foomatic-ppd-install \ --enable-hpcups-install \ --enable-new-hpcups \ @@ -70,5 +86,3 @@ package() { mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ rm "$pkgdir"/lib -r } -md5sums=('a063f76aa47edab55a3f31ff2558df07' - '2fe18f4091afb3dec200271dc7836128') diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install index cb0eaf8e8..74532cde3 100644 --- a/libre/hplip-libre/hplip.install +++ b/libre/hplip-libre/hplip.install @@ -8,3 +8,11 @@ NOTE EOF } + +post_upgrade() { + if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then + # important upgrade notice + echo "> Please remove your printer in cups, then add it" + echo "> back and reconfigure it to make it work again!" + fi +} diff --git a/staging/avidemux/PKGBUILD b/staging/avidemux/PKGBUILD new file mode 100644 index 000000000..bd131f484 --- /dev/null +++ b/staging/avidemux/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 160694 2012-06-03 22:00:36Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.6 +pkgrel=3 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') +options=('!makeflags') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') + +build() { + cd "${srcdir}/${pkgbase}_${pkgver}" + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux') + replaces=('avidemux') + + cd "${srcdir}/${pkgbase}_${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/staging/avidemux/avidemux.install b/staging/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/staging/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/ffmpeg/PKGBUILD b/staging/ffmpeg/PKGBUILD new file mode 100644 index 000000000..4de7bdd65 --- /dev/null +++ b/staging/ffmpeg/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 160671 2012-06-03 15:50:03Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg +pkgver=0.11 +pkgrel=1 +epoch=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 v4l-utils x264 xvidcore zlib) +makedepends=('yasm' 'git' 'libvdpau') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('101e1092582bbfca8f2a204cbcecb8fc') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --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-libv4l2 \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..a93aea115 --- /dev/null +++ b/staging/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 160680 2012-06-03 16:55:40Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.19 +pkgrel=2 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz + opencore-amr.patch) +md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' + 'd8feb6c99bfaff8be6b2c48ea4e98e47') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + patch -Np0 -i "${srcdir}/opencore-amr.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make check +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/staging/gstreamer0.10-ugly/opencore-amr.patch b/staging/gstreamer0.10-ugly/opencore-amr.patch new file mode 100644 index 000000000..0a350dc46 --- /dev/null +++ b/staging/gstreamer0.10-ugly/opencore-amr.patch @@ -0,0 +1,35 @@ +--- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 ++++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 +@@ -22,7 +22,7 @@ + + #include <gst/gst.h> + #include <gst/audio/gstaudiodecoder.h> +-#include <interf_dec.h> ++#include <opencore-amrnb/interf_dec.h> + + G_BEGIN_DECLS + +--- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 ++++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 +@@ -21,7 +21,7 @@ + #define __GST_AMRNBENC_H__ + + #include <gst/gst.h> +-#include <interf_enc.h> ++#include <opencore-amrnb/interf_enc.h> + #include <gst/audio/gstaudioencoder.h> + + G_BEGIN_DECLS +--- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 ++++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 +@@ -22,8 +22,8 @@ + + #include <gst/gst.h> + #include <gst/audio/gstaudiodecoder.h> +-#include <dec_if.h> +-#include <if_rom.h> ++#include <opencore-amrwb/dec_if.h> ++#include <opencore-amrwb/if_rom.h> + + G_BEGIN_DECLS + diff --git a/staging/k3b/PKGBUILD b/staging/k3b/PKGBUILD new file mode 100644 index 000000000..e22f80e9d --- /dev/null +++ b/staging/k3b/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 160702 2012-06-04 03:41:19Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=k3b +pkgver=2.0.2 +pkgrel=5 +pkgdesc="Feature-rich and easy to handle CD burning application" +arch=('i686' 'x86_64') +url="http://k3b.org/" +license=('GPL') +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') +optdepends=('dvd+rw-tools: for dvd burning support' + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support' + 'cdrdao: for disk-at-once (DAO) mode support') +options=('!libtool') +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b' + '5b35bff3f7670686a32bd71afea2deaca4331631') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" + patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" + cd .. + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/k3b/k3b-2.0.2-ffmpeg.patch b/staging/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/staging/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <michalm@jabster.pl> +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/staging/k3b/k3b-2.0.2-libavformat54.patch b/staging/k3b/k3b-2.0.2-libavformat54.patch new file mode 100644 index 000000000..174a776b8 --- /dev/null +++ b/staging/k3b/k3b-2.0.2-libavformat54.patch @@ -0,0 +1,22 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; +@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } diff --git a/staging/k3b/k3b.install b/staging/k3b/k3b.install new file mode 100644 index 000000000..413ad60f7 --- /dev/null +++ b/staging/k3b/k3b.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD new file mode 100644 index 000000000..f8d55e21b --- /dev/null +++ b/staging/moc/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 160696 2012-06-03 22:26:49Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=moc +pkgver=20120224 +pkgrel=2 +pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" +arch=('i686' 'x86_64') +url="http://moc.daper.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') +makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') +optdepends=('speex: for using the speex plugin' + 'ffmpeg: for using the ffmpeg plugin' + 'taglib: for using the musepack plugin' + 'libmpcdec: for using the musepack plugin' + 'wavpack: for using the wavpack plugin' + 'libmodplug: for using the modplug plugin') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46' + 'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=2412 + _svntrunk="svn://daper.net/moc/trunk" + _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 {} \; + 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}" + +# Disabling aac to use the external ffmpeg to play them (FS#13164) + autoreconf -i + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/mpd/PKGBUILD b/staging/mpd/PKGBUILD new file mode 100644 index 000000000..17183d011 --- /dev/null +++ b/staging/mpd/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 160682 2012-06-03 17:43:39Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Ben <ben@benmazer.net> + +pkgname=mpd +pkgver=0.16.8 +pkgrel=4 +pkgdesc='Flexible, powerful, server-side application for playing music' +url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' +license=('GPL') +arch=('i686' 'x86_64') +depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' + 'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' + 'libpulse') +makedepends=('doxygen') +source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" + 'tmpfiles.d' + 'rc.d') +sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1' + 'f4d5922abb69abb739542d8e93f4dfd748acdad7' + '3470d489565f0ed479f1665dd2876f66acb5a585') + +backup=('etc/mpd.conf') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-lastfm \ + --enable-jack \ + --enable-pulse \ + --enable-documentation \ + --disable-libwrap \ + --disable-cue \ + --disable-sidplay \ + --disable-documentation \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + sed \ + -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ + -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ + -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ + -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ + -e '/^#user/c user "mpd"' \ + -i doc/mpdconf.example + + install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd + install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf +} diff --git a/staging/mpd/install b/staging/mpd/install new file mode 100644 index 000000000..261b8fd0d --- /dev/null +++ b/staging/mpd/install @@ -0,0 +1,11 @@ +post_install() { + getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null + getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null + true +} + +post_remove() { + getent passwd mpd &>/dev/null && userdel mpd >/dev/null + getent group mpd &>/dev/null && groupdel mpd >/dev/null + true +} diff --git a/staging/mpd/rc.d b/staging/mpd/rc.d new file mode 100755 index 000000000..f00e16067 --- /dev/null +++ b/staging/mpd/rc.d @@ -0,0 +1,25 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy 'Starting Music Player Daemon' + /usr/bin/mpd /etc/mpd.conf &> /dev/null && + { add_daemon mpd; stat_done; } || stat_fail + ;; + stop) + stat_busy 'Stopping Music Player Daemon' + /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && + { rm_daemon mpd; stat_done; } || stat_fail + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/mpd/tmpfiles.d b/staging/mpd/tmpfiles.d new file mode 100644 index 000000000..41c4e743a --- /dev/null +++ b/staging/mpd/tmpfiles.d @@ -0,0 +1 @@ +d /run/mpd 0755 mpd mpd diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD new file mode 100644 index 000000000..04c9a0888 --- /dev/null +++ b/staging/vlc/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 160698 2012-06-03 23:04:50Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> + +pkgname=vlc +pkgver=2.0.1 +pkgrel=3 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('LGPL2.1' 'GPL2') +depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' + 'xcb-util-keysyms' 'ttf-freefont') +makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' + 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' + 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' + 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards' + 'libbluray: for Blu-Ray support' + 'flac: for Free Lossless Audio Codec plugin' + 'oss: for OSS audio support' + 'portaudio: for portaudio support' + 'twolame: for TwoLAME mpeg2 encoder plugin' + 'projectm: for ProjectM visualisation plugin' + 'libcaca: for colored ASCII art video output' + 'libgme: for libgme plugin' + 'librsvg: for SVG plugin' + 'gnome-vfs: for GNOME Virtual File System support' + 'libgoom2: for libgoom plugin' + 'vcdimager: navigate VCD with libvcdinfo' + 'xosd: for xosd support' + 'aalib: for ASCII art plugin' + 'libmtp: for MTP devices support' + 'fluidsynth: for synthesizer MIDI FluidSynth' + 'smbclient: for SMB access plugin') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool' '!emptydirs') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('5ad114755670e4881a2b35354e2f79bc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-oss \ + --enable-faad \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --enable-realrtsp \ + --enable-xosd \ + --enable-aa \ + --enable-vcdx + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install new file mode 100644 index 000000000..dc4961cae --- /dev/null +++ b/staging/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/staging/x264/PKGBUILD b/staging/x264/PKGBUILD new file mode 100644 index 000000000..ace432d9a --- /dev/null +++ b/staging/x264/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 160669 2012-06-03 15:05:06Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=x264 +pkgver=20120602 +pkgrel=1 +pkgdesc="free library for encoding H264/AVC video streams" +arch=('i686' 'x86_64') +url="http://www.videolan.org/developers/x264.html" +license=('GPL') +depends=('glibc') +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) +md5sums=('50e6dc7a1031a19c710e912dffb19a7a') + +build() { + cd "$pkgname-snapshot-$pkgver-2245-stable" + + ./configure --enable-shared + + make +} +package() { + cd "$pkgname-snapshot-$pkgver-2245-stable" + + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD new file mode 100644 index 000000000..d84e13b7a --- /dev/null +++ b/staging/xine-lib/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 160700 2012-06-04 01:22:50Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-lib +pkgver=1.2.1 +pkgrel=3 +pkgdesc="A multimedia playback engine" +arch=('i686' 'x86_64') +url="http://www.xine-project.org" +license=('LGPL' 'GPL') +depends=('libxvmc' 'ffmpeg' 'libxinerama') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' + 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') +optdepends=('imagemagick: for using the imagemagick plugin' \ + 'jack: for using the jack plugin' \ + 'vcdimager: for using the vcd plugin' \ + 'mesa: for using the opengl plugin' \ + 'wavpack: for using the wavpack plugin' \ + 'faad2: for using the faad plugin' \ + 'libmng: for using the mng plugin' \ + 'aalib: for using the aalib plugin' \ + 'libmodplug: for using the modplug plugin' \ + 'libdca: for using the dca plugin' \ + 'a52dec: for using the a52 plugin' \ + 'libmad: for using the mp3 plugin' \ + 'libmpcdec: for using the musepack plugin' \ + 'libcaca: for using the caca plugin' \ + 'libbluray: for using the bluray plugin' \ + 'gnome-vfs: for using the gnome-vfs plugin' \ + 'libvdpau: for using the VDPAU plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz + xine-lib-1.2.1-ffmpeg.patch) +sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94' + '179558f72566574e52f3a79231aac25968f18ff0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/xine-lib-1.2.1-ffmpeg.patch" + ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch b/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch new file mode 100644 index 000000000..c036a0ec9 --- /dev/null +++ b/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch @@ -0,0 +1,75 @@ +# HG changeset patch +# User Edgar Hucek <ebsi4711@gmail.com> +# Date 1327873178 -3600 +# Node ID 69983efb1c928e64cc1900579b98142cef0569c4 +# Parent 61f51ebc2659363e308bedb10b9fa4e71a60cedc +fix compile against recent ffmpeg + +diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ff_video_decoder.c +--- a/src/combined/ffmpeg/ff_video_decoder.c Sat Feb 04 18:52:01 2012 +0000 ++++ b/src/combined/ffmpeg/ff_video_decoder.c Sun Jan 29 22:39:38 2012 +0100 +@@ -130,7 +130,9 @@ + + yuv_planes_t yuv; + ++#ifdef AVPaletteControl + AVPaletteControl palette_control; ++#endif + + #ifdef LOG + enum PixelFormat debug_fmt; +@@ -218,7 +220,9 @@ + /* We should really keep track of the ages of xine frames (see + * avcodec_default_get_buffer in libavcodec/utils.c) + * For the moment tell ffmpeg that every frame is new (age = bignumber) */ ++#ifdef AVFRAMEAGE + av_frame->age = 256*256*256*64; ++#endif + + av_frame->type= FF_BUFFER_TYPE_USER; + +@@ -1028,7 +1032,9 @@ + memcpy(this->context->extradata, buf->decoder_info_ptr[2], + buf->decoder_info[2]); + +- } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { ++ } ++#ifdef AVPaletteControl ++ else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { + unsigned int i; + + palette_entry_t *demuxer_palette; +@@ -1047,7 +1053,9 @@ + } + decoder_palette->palette_changed = 1; + +- } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { ++ } ++#endif ++ else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { + int i; + + lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n"); +@@ -1794,7 +1802,9 @@ + this->av_frame = avcodec_alloc_frame(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; ++#ifdef AVPaletteControl + this->context->palctrl = NULL; ++#endif + + this->decoder_ok = 0; + this->decoder_init_mode = 1; +diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ffmpeg_compat.h +--- a/src/combined/ffmpeg/ffmpeg_compat.h Sat Feb 04 18:52:01 2012 +0000 ++++ b/src/combined/ffmpeg/ffmpeg_compat.h Sun Jan 29 22:39:38 2012 +0100 +@@ -91,5 +91,9 @@ + # define AVAUDIO 2 + #endif + ++/* AVFrame.age */ ++#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) ++# define AVFRAMEAGE 1 ++#endif + + #endif /* XINE_AVCODEC_COMPAT_H */ |