diff options
47 files changed, 1560 insertions, 154 deletions
diff --git a/community-staging/pdf2djvu/PKGBUILD b/community-staging/pdf2djvu/PKGBUILD new file mode 100644 index 000000000..787faccc6 --- /dev/null +++ b/community-staging/pdf2djvu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 56369 2011-10-06 19:52:32Z jelle $ +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +pkgname=pdf2djvu +pkgver=0.7.11 +pkgrel=1 +pkgdesc="Creates DjVu files from PDF files" +arch=('i686' 'x86_64') +url="http://pdf2djvu.googlecode.com" +license=('GPL') +depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') +makedepends=('pstreams') +source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 +} +md5sums=('37c3d5a31c155bc65a39912da4c6bce1') diff --git a/community-staging/pdf2svg/PKGBUILD b/community-staging/pdf2svg/PKGBUILD new file mode 100644 index 000000000..c15c7af0f --- /dev/null +++ b/community-staging/pdf2svg/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: corvolino <corvolino@archlinux.com.br> +# Contributor: Joel Schaerer + +pkgname=pdf2svg +pkgver=0.2.1 +pkgrel=6 +pkgdesc="A pdf to svg converter" +arch=('i686' 'x86_64') +url="http://www.cityinthesky.co.uk/pdf2svg.html" +license=('GPL') +depends=('poppler-glib' 'gtk2' 'glib2') +source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + + +md5sums=('59b3b9768166f73b77215e95d91f0a9d') diff --git a/community-staging/python2-poppler/PKGBUILD b/community-staging/python2-poppler/PKGBUILD new file mode 100644 index 000000000..8e810bc81 --- /dev/null +++ b/community-staging/python2-poppler/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 56373 2011-10-06 20:58:29Z jelle $ +# Maintainer: Ray Rashif <schiv@archlinux.org +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=python2-poppler +_realname=pypoppler +pkgver=0.12.1 +pkgrel=5 +pkgdesc="Python 2.x bindings for Poppler" +arch=('i686' 'x86_64') +url="https://launchpad.net/poppler-python" +license=('GPL') +depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2') +provides=('pypoppler' 'python-poppler') +conflicts=('python-poppler') +replaces=('python-poppler') +options=(!libtool) +source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz + pypoppler-0.12.1-poppler-0.16.0.patch) +md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a' + '683c5b67866d56adc2494120cc329dc8') + +build() { + cd "$srcdir/$_realname-$pkgver" + + patch -Np0 -i "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community-staging/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch b/community-staging/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch new file mode 100644 index 000000000..0e99b57ec --- /dev/null +++ b/community-staging/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch @@ -0,0 +1,11 @@ +--- poppler.defs.orig 2010-12-30 05:55:07.000000000 +0000 ++++ poppler.defs 2010-12-30 05:55:27.000000000 +0000 +@@ -1794,7 +1794,7 @@ + + (define-method get_text + (of-object "PopplerPage") +- (c-name "poppler_page_get_text") ++ (c-name "poppler_page_get_selected_text") + (return-type "char*") + (parameters + '("PopplerSelectionStyle" "style") diff --git a/community-testing/mingw32-gcc-base/PKGBUILD b/community-testing/mingw32-gcc-base/PKGBUILD new file mode 100644 index 000000000..7d66129da --- /dev/null +++ b/community-testing/mingw32-gcc-base/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 56365 2011-10-06 16:25:18Z svenstaro $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Ondrej Jirman <megous@megous.com> + +pkgname=mingw32-gcc-base +pkgver=4.6.1 +_w32apiver=3.17 +_runtimever=3.20 +_uprel=2 +_upw32rel=1 +pkgrel=2 +arch=(i686 x86_64) +pkgdesc="A C cross-compiler for building Windows executables on Linux" +depends=(mingw32-binutils) +makedepends=(p7zip mingw32-runtime mingw32-w32api) +conflicts=(mingw32-gcc) +options=(!strip) +license=(GPL LGPL) +url="http://mingw.sf.net" +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz + gcc-1-mingw-float.patch) +md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' + '89e5800096aa334009f98e7c1743d825' + '26c0886cc60729b94956cc6d81cd076c' + '2407123c35c0aa92ee5ffc27decca9a7') + +build() +{ + if [ $NOEXTRACT -ne 1 ]; then + # prepare headers + mkdir -p $srcdir/mingw/include/ + cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \ + $srcdir/mingwrt-${_runtimever}-mingw32/include/* \ + $srcdir/mingw/include/ + + unset CFLAGS CXXFLAGS + +# tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz + cd $srcdir + tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + + mkdir -p $srcdir/build + cd $srcdir/build + + chmod ugo+x $srcdir/gcc-$pkgver/configure + chmod ugo+x $srcdir/gcc-$pkgver/move-if-change + + $srcdir/gcc-$pkgver/configure \ + --target=i486-mingw32 \ + --host=$CHOST \ + --build=$CHOST \ + --prefix=/usr \ + --enable-languages=c \ + --enable-sjlj-exceptions \ + --enable-hash-synchronization \ + --disable-nls \ + --disable-shared \ + --disable-libssp \ + --disable-libgomp \ + --with-build-sysroot=$srcdir \ + --with-headers=$srcdir/include + else + cd $srcdir/build + fi + + make + make install DESTDIR=$pkgdir + + cd $pkgdir + rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ + usr/{include,lib/libiberty.a} usr/i486-mingw32 \ + usr/share/{info,man} usr/i486-mingw32 + strip usr/bin/* + strip usr/libexec/gcc/i486-mingw32/$pkgver/{cc1*,collect2} + i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a +} diff --git a/community-testing/mingw32-gcc-base/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc-base/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community-testing/mingw32-gcc-base/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community-testing/mingw32-gcc/PKGBUILD b/community-testing/mingw32-gcc/PKGBUILD new file mode 100644 index 000000000..95ddbf543 --- /dev/null +++ b/community-testing/mingw32-gcc/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 56364 2011-10-06 16:23:44Z svenstaro $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Ondrej Jirman <megous@megous.com> + +pkgname=mingw32-gcc +pkgver=4.6.1 +pkgrel=2 +_uprel=2 +arch=(i686 x86_64) +pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" +depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' + 'libmpc' 'elfutils' 'gmp') +replaces=('mingw32-gcc-base') +provides=('mingw32-gcc-base') +options=(!strip) +url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" +license=(GPL LGPL) +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + gcc-1-mingw-float.patch) +md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' + '2407123c35c0aa92ee5ffc27decca9a7') + +build() +{ + [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + + mkdir -p $srcdir/build + cd $srcdir/build + + unset CFLAGS CXXFLAGS + + chmod ugo+x $srcdir/gcc-$pkgver/configure + chmod ugo+x $srcdir/gcc-$pkgver/move-if-change + + msg "gcc" + [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ + --target=i486-mingw32 \ + --host=$CHOST \ + --build=$CHOST \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++ \ + --enable-shared \ + --enable-sjlj-exceptions \ + --enable-hash-synchronization \ + --disable-nls \ + --disable-libssp \ + --enable-libgomp + + make + make install DESTDIR=$pkgdir + + msg "libgcc" + make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install + + msg "libstdc++" + make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install + + msg "fixes" + cd $pkgdir/usr/i486-mingw32/lib + mkdir -p $pkgdir/usr/i486-mingw32/bin/ + for i in `ls -1 *.dll`; do + ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i + done + + cd $pkgdir + rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ + usr/{include,lib/libiberty.a} \ + usr/share/{info,man} \ + usr/share/gcc-$pkgver/python + + strip usr/bin/* + strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} + i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a +} diff --git a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index 975b3d6d5..00981bb6f 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55139 2011-09-04 02:28:01Z kkeen $ +# $Id: PKGBUILD 56380 2011-10-07 02:59:03Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.2 +pkgver=2.2.1 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://www.digip.org/jansson/' license=('MIT') options=('!libtool') source=("$url/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('0e91c6867f49dbc3ef0bbf21d26812ee') +md5sums=('074373f2d101c52d70659be86647e7a1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index e5d40753d..411bf9d68 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56187 2011-10-03 07:27:47Z spupykin $ +# $Id: PKGBUILD 56357 2011-10-06 09:08:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,7 +12,7 @@ _group=http pkgname=nginx pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -55,7 +55,9 @@ build() { --with-http_dav_module \ --with-http_gzip_static_module \ --with-ipv6 \ - --add-module=/usr/lib/passenger/ext/nginx + --add-module=/usr/lib/passenger/ext/nginx \ + --http-scgi-temp-path=${_tmp_path} \ + --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ #--with-http_realip_module \ #--with-http_addition_module \ diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 0f47776b6..9cd0fc150 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52272 2011-07-22 23:53:54Z schiv $ +# $Id: PKGBUILD 56375 2011-10-06 21:35:18Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('6dcc05532f71eaaa1aa0f336bcd265b0') +md5sums=('c54adf974fd363a9f2151a802f170e6d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,7 +28,7 @@ build() { package () { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 50c3d0110..7c1b51286 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134377 2011-08-03 11:19:59Z ibiru $ +# $Id: PKGBUILD 140075 2011-10-06 07:35:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus-core -pkgver=1.4.14 +pkgver=1.4.16 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -16,7 +16,7 @@ options=(!libtool) install=dbus.install source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz dbus) -md5sums=('ae6de2562a57516cfabaf56903375ba9' +md5sums=('44a2a10678e7e50460879c3eb4453a65' '08f93dd19cffd1b45ab05c1fd4efb560') build() { diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index dda460dab..3bf48567d 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134343 2011-08-03 00:13:58Z eric $ +# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD index 79c6a270e..5569f6dc5 100644 --- a/extra/dbus-glib/PKGBUILD +++ b/extra/dbus-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129344 2011-06-26 21:48:20Z ibiru $ +# $Id: PKGBUILD 140079 2011-10-06 07:35:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dbus-glib -pkgver=0.94 -pkgrel=2 +pkgver=0.98 +pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) license=('GPL') @@ -11,14 +11,11 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - fix_network_manager.patch) -md5sums=('e1f1506a6f4941e67bffd614b1ad5af6' - '2a3598342dd25722d452e7beaf21b5f3') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_network_manager.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --enable-bash-completion=no make diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 6def02fe7..9d8ab360b 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134376 2011-08-03 11:19:50Z ibiru $ +# $Id: PKGBUILD 140077 2011-10-06 07:35:45Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.4.14 +pkgver=1.4.16 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,7 +12,7 @@ license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz 30-dbus) -md5sums=('ae6de2562a57516cfabaf56903375ba9' +md5sums=('44a2a10678e7e50460879c3eb4453a65' 'd14e59575f04e55d21a04907b6fd9f3c') build() { diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index a781c4430..1a24e90ca 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 91030 2010-09-21 05:56:54Z schiv $ +# $Id: PKGBUILD 140086 2011-10-06 09:24:49Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 -pkgdesc="API for audio processing plugins/softsynths with user interfaces" -arch=(i686 x86_64) +pkgdesc="An API for audio processing plugins & softsynths with UIs" +arch=('i686' 'x86_64') url="http://dssi.sourceforge.net/" -license=('LGPL' 'BSD') +license=('LGPL' 'BSD' 'custom') depends=('liblo' 'jack') makedepends=('ladspa' 'qt') optdepends=('qt: example plugins') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - LICENSE) -md5sums=('dfc850e66fae94e7ec08aebb43d07848' +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'license.txt') +md5sums=('619ab73c883b02dc37ddb37001591f8b' '258ca4d0ca28c5c4d4675147621fac18') build() { @@ -29,9 +29,9 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/LICENSE" \ + install -Dm644 "$srcdir/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/dssi/license.txt b/extra/dssi/license.txt new file mode 100644 index 000000000..ddef4f23b --- /dev/null +++ b/extra/dssi/license.txt @@ -0,0 +1,77 @@ +Licensing +--------- + +The DSSI API itself (dssi.h) is licensed under the GNU Lesser General +Public License. See COPYING for details. + +The jack-dssi-host is provided under a BSD-style license. This means +you can do anything you want with it so long as you retain the +copyright attribution and license information. See the source files +for details. + +Licensing for the files in the examples directory may vary: please +check the individual files for details. Most of them are in the +public domain, which means you can use them for anything you want. + + + +/* jack-dssi-host.c + * + * DSSI Soft Synth Interface + * + * This is a host for DSSI plugins. It listens for MIDI events on an + * ALSA sequencer port, delivers them to DSSI synths and outputs the + * result via JACK. + * + * This program expects the names of up to 16 DSSI synth plugins, in + * the form '<dll-name>:<label>',* to be provided on the command line. + * If just '<dll-name>' is provided, the first plugin in the DLL is + * is used. MIDI channels are assigned to each plugin instance, in + * order, beginning with channel 0 (zero-based). A plugin may be + * easily instantiated multiple times by preceding its name and label + * with a dash followed immediately by the desired number of instances, + * e.g. '-3 my_plugins.so:zoomy' would create three instances of the + * 'zoomy' plugin. + */ + +/* + * Copyright 2004, 2009 Chris Cannam, Steve Harris and Sean Bolton. + * + * Permission to use, copy, modify, distribute, and sell this software + * for any purpose is hereby granted without fee, provided that the + * above copyright notice and this permission notice are included in + * all copies or substantial portions of the software. + */ + + +/* + * This program is in the public domain + * + * $Id: dssi_osc_send.c,v 1.5 2004/07/04 22:24:51 smbolton Exp $ + */ + +/* + * This program is in the public domain + * + * $Id: dssi_osc_update.c,v 1.6 2005/10/12 17:08:26 smbolton Exp $ + */ + +/* less_trivial_synth.c + + DSSI Soft Synth Interface + Constructed by Chris Cannam, Steve Harris and Sean Bolton + + This is an example DSSI synth plugin written by Steve Harris. + + This example file is in the public domain. +*/ + +/* trivial_sampler.c + + DSSI Soft Synth Interface + Constructed by Chris Cannam, Steve Harris and Sean Bolton + + A straightforward DSSI plugin sampler. + + This example file is in the public domain. +*/ diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 659a88ed5..b9d49ca06 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $ +# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110923 +pkgver=20111003 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' ' makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) -md5sums=('36111c640a2eea19f677924ac3193ce4') +md5sums=('38139817bee918a5664c549adb487468') build() { cd "$srcdir/$pkgname" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index ba6a31b91..3fc10e827 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 135657 2011-08-17 06:43:27Z tpowa $ +# $Id: PKGBUILD 140055 2011-10-06 06:24:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=9 +pkgrel=10 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64) url="http://freenx.berlios.de" license=('GPL') -depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') +depends=('nxserver' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') backup=(opt/NX/etc/node.conf) install=freenx.install source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz @@ -17,7 +17,6 @@ source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz freenx-latest-svn.patch remove-dialog.patch) - build() { # patch and install nxserver cd $startdir/src/$pkgname-server-$pkgver diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index 4365a7f19..d41108c0f 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139181 2011-10-01 08:28:33Z ibiru $ +# $Id: PKGBUILD 140109 2011-10-06 19:11:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ pkgbase=gnome-python-desktop pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint') pkgver=2.32.0 -pkgrel=7 +pkgrel=8 arch=(i686 x86_64) license=('GPL' 'LGPL') options=('!libtool') diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 972663291..c50e90add 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136393 2011-08-28 23:22:26Z andrea $ +# $Id: PKGBUILD 140082 2011-10-06 08:10:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org @@ -9,18 +9,19 @@ pkgver=3.1 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') -url="http://gpsd.berlios.de" +url="http://catb.org/gpsd/" license=('BSD') depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') + 'php-gd: image support for the PHP status page' + 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') options=('!libtool' '!buildflags') install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'gpsd' 'gpsd.conf.d') -md5sums=('f280b914c19da3a91aa5e67d83d35033' +md5sums=('f783c2890774fcafa56bdb968a0372fc' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 9f1074038..368c429f3 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ +# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index ab6e2177b..d85310795 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.6.0.1 +pkgver=2.8 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.6' 'gdb') +depends=('monodevelop>=2.8' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('ad11a5ae0ed0c10630ad6c92262c7cf0') +md5sums=('5378b91fdd9ac22e7d41f0a0002ef605') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 2214a492a..4517a1b7f 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.6.0.1 +pkgver=2.8 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('994ce8de46911568bd061c9e98b6faa3') +md5sums=('49d4831aa23972e2a63dfd1be98f1d5e') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 7b770c086..4e45a5a34 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136105 2011-08-23 01:58:25Z heftig $ +# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.ekiga.org" diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index e5ee7babf..f9506554d 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $ +# $Id: PKGBUILD 140085 2011-10-06 09:24:38Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64') url="http://www.breakfastquay.com/rubberband/" @@ -12,9 +12,8 @@ license=('GPL') depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') makedepends=('ladspa') source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" - 'gcc46.patch') -md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' - '7c2f404975da6052f6b80eac12efbeb4') + 'gcc46.patch' + 'vectorops.patch') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,6 +21,10 @@ build() { # fix gcc 4.6 compatibility patch -Np1 -i "$srcdir/gcc46.patch" + # fix bug exposed by gcc 4.6 + # see https://bugs.archlinux.org/task/26140 + patch -Np1 -i "$srcdir/vectorops.patch" + ./configure --prefix=/usr make } @@ -29,7 +32,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: +md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' + '7c2f404975da6052f6b80eac12efbeb4' + '4bdc9689179d3a2cf64172f0f911701d') diff --git a/extra/rubberband/vectorops.patch b/extra/rubberband/vectorops.patch new file mode 100644 index 000000000..cae961591 --- /dev/null +++ b/extra/rubberband/vectorops.patch @@ -0,0 +1,13 @@ +--- a/src/system/VectorOps.h Mon Mar 21 21:51:33 2011 +0000 ++++ b/src/system/VectorOps.h Sun Oct 02 21:12:42 2011 +0100 +@@ -84,8 +84,8 @@ + } + + template<typename T> +-inline void v_move(T *const R__ dst, +- const T *const R__ src, ++inline void v_move(T *const dst, ++ const T *const src, + const int count) + { + memmove(dst, src, count * sizeof(T)); diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 8034ad709..1c3208899 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135810 2011-08-18 15:04:49Z andyrtr $ +# $Id: PKGBUILD 140073 2011-10-06 07:33:49Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.11 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 90508716e..0e847a587 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ +# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20110617 +pkgver=20111001 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('928717aa2f0c7ca91e589d6b60e688f1') +md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD index 9a9662026..3e2f4047c 100644 --- a/kde-unstable/calligra/PKGBUILD +++ b/kde-unstable/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139111 2011-09-29 14:02:55Z andrea $ +# $Id: PKGBUILD 140105 2011-10-06 18:24:19Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -23,8 +23,8 @@ pkgname=('calligra-filters' 'calligra-thesaurus-doc' 'calligra-braindump' 'calligra-flow') -pkgver=2.3.81 -pkgrel=2 +pkgver=2.3.82 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org' license=('FDL1.2' 'GPL2' 'LGPL') @@ -33,7 +33,7 @@ makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf' 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2') groups=('calligra') source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('7f475e22fa3740b2da2f6478880d6341') +md5sums=('21653ffa13d68afbc760e34e8e9a71a2') build() { cd "${srcdir}" @@ -221,7 +221,6 @@ package_calligra-tables() { cd "${srcdir}"/build/tables make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/tables make DESTDIR="${pkgdir}" install } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index c83f3ef23..82bc609db 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,8 +9,8 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.0 -pkgver=${_basekernel}.4 -pkgrel=2 +pkgver=${_basekernel}.6 +pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -25,19 +25,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'fix-i915.patch' 'change-default-console-loglevel.patch') -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'f17e9c5f801be0b17efe78aaff0f2a0e' - 'bb679e0e61c53a8f1a22b8d46f89f47e' - '68d2fc73ce1d9057678f91235f6e22c6' - 'a8a3843046926eb7ab81312cd438c5c5' - '04b21c79df0a952c22d681dd4f4562df' - '263725f20c0b9eb9c353040792d644e5' - '9d3c56a4b999c8bfbd4018089a62f662') build() { cd "${srcdir}/linux-${_basekernel}" - patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + patch -Np0 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" @@ -284,3 +276,19 @@ package_linux-libre-docs() { rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +md5sums=('44e7bc20c235a193f9b6123a8d5e9509' + '8dc6d7d1a0728af0a59d5ba7197c390b' + 'bb679e0e61c53a8f1a22b8d46f89f47e' + '68d2fc73ce1d9057678f91235f6e22c6' + 'a8a3843046926eb7ab81312cd438c5c5' + '04b21c79df0a952c22d681dd4f4562df' + '263725f20c0b9eb9c353040792d644e5' + '9d3c56a4b999c8bfbd4018089a62f662') +md5sums=('44e7bc20c235a193f9b6123a8d5e9509' + '8dc6d7d1a0728af0a59d5ba7197c390b' + 'f50e2627816daaae346394512fa3bda5' + 'b24eadd33ae95e3c9e14d84e39109976' + 'a8a3843046926eb7ab81312cd438c5c5' + '04b21c79df0a952c22d681dd4f4562df' + '263725f20c0b9eb9c353040792d644e5' + '9d3c56a4b999c8bfbd4018089a62f662') diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 69a35c73c..6f572b0d2 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -68,10 +68,10 @@ CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -511,17 +511,17 @@ CONFIG_APM_DO_ENABLE=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m +CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # @@ -1268,9 +1268,12 @@ CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m -# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set CONFIG_MTD_OF_PARTS=y -# CONFIG_MTD_AR7_PARTS is not set +CONFIG_MTD_AR7_PARTS=m # # User Modules And Translation Layers @@ -1278,21 +1281,24 @@ CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CHAR=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -CONFIG_SM_FTL=m -# CONFIG_MTD_OOPS is not set +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m CONFIG_MTD_SWAP=m # # RAM/ROM/Flash chip drivers # -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -1303,29 +1309,53 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m # # Mapping drivers for chip access # -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set # # Self-contained MTD device drivers # -# CONFIG_MTD_PMC551 is not set +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set # CONFIG_MTD_M25P80 is not set -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m # # Disk-On-Chip Device Drivers @@ -1335,14 +1365,35 @@ CONFIG_MTD_PHRAM=m # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m # CONFIG_MTD_ONENAND is not set # # LPDDR flash memory drivers # -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_UBI is not set +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set CONFIG_OF=y # @@ -4023,7 +4074,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4599,7 +4650,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m -# CONFIG_LEDS_ALIX2 is not set +CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m @@ -5265,6 +5316,12 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m @@ -5757,6 +5814,8 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index d7b662cb6..37e2475d3 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -69,10 +69,10 @@ CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set + CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -497,14 +497,14 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # @@ -1233,8 +1233,11 @@ CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m # # User Modules And Translation Layers @@ -1242,21 +1245,24 @@ CONFIG_MTD_TESTS=m CONFIG_MTD_CHAR=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -CONFIG_SM_FTL=m -# CONFIG_MTD_OOPS is not set +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m CONFIG_MTD_SWAP=m # # RAM/ROM/Flash chip drivers # -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -1267,29 +1273,52 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m # # Mapping drivers for chip access # -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set # # Self-contained MTD device drivers # -# CONFIG_MTD_PMC551 is not set +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set # CONFIG_MTD_M25P80 is not set -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m # # Disk-On-Chip Device Drivers @@ -1299,14 +1328,34 @@ CONFIG_MTD_PHRAM=m # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m # CONFIG_MTD_ONENAND is not set # # LPDDR flash memory drivers # -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_UBI is not set +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -3841,7 +3890,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4380,7 +4429,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m -# CONFIG_LEDS_ALIX2 is not set +CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m @@ -5010,6 +5059,12 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m @@ -5498,6 +5553,8 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m diff --git a/staging/gimp/PKGBUILD b/staging/gimp/PKGBUILD new file mode 100644 index 000000000..028e751f3 --- /dev/null +++ b/staging/gimp/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 140049 2011-10-06 05:30:43Z eric $ +# Maintainer: tobias <tobias@archlinux.org> + +pkgname=gimp +pkgver=2.6.11 +pkgrel=7 +pkgdesc="GNU Image Manipulation Program" +arch=('i686' 'x86_64') +url="http://www.gimp.org/" +license=('GPL' 'LGPL') +depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ + 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') +optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' + 'libwebkit: for the help browser' + 'poppler-glib: for pdf support' + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support') +options=('!libtool' '!makeflags') +conflicts=('gimp-devel') +install=gimp.install +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl + uri-backend-libcurl.patch gimp-poppler-0.18.patch) +md5sums=('bb2939fe13e54fc7255cef5d097bb5dd' + 'bb27bc214261d36484093e857f015f38' + 'e894f4b2ffa92c71448fdd350e9b78c6' + 'bfc73f80e911ed7a7d500d80973469f1') +sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' + '110ce9798173b19a662d086ed7b882b4729f06cf' + 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4' + '1479a6d80be7adf74f66a3b88057a5029fe892e8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../uri-backend-libcurl.patch + patch -p1 < ../gimp-poppler-0.18.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-mp --enable-gimp-console --enable-gimp-remote \ + --enable-python --with-gif-compression=lzw --with-libcurl \ + --without-aa --without-hal --without-gvfs --without-gnomevfs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py + install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" + + rm "${pkgdir}/usr/share/man/man1/gimp-console.1" + ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" + ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" + ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" +} diff --git a/staging/gimp/gimp-poppler-0.18.patch b/staging/gimp/gimp-poppler-0.18.patch new file mode 100644 index 000000000..0715460bc --- /dev/null +++ b/staging/gimp/gimp-poppler-0.18.patch @@ -0,0 +1,476 @@ +From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Fri, 6 May 2011 11:58:44 +0200 +Subject: [PATCH] patch: poppler-0.17 + +Squashed commit of the following: + +commit 529d940222dfc352d41fbf72de29134421aa4002 +Author: Nils Philippsen <nils@redhat.com> +Date: Fri May 6 11:50:30 2011 +0200 + + use code based on pixbufs instead of cairo surfaces + + this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for + hints how to do this + +commit f8671d8767d4cdab830dc06310e96c63a88ec0fd +Author: Mukund Sivaraman <muks@banu.com> +Date: Thu Apr 21 13:57:13 2011 +0530 + + file-pdf-load: Update attribution, removing bogus copyright + (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) + +commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:52:18 2011 +0200 + + file-pdf-load: Use better API + cleanups + + * fixes issues with poppler 0.17 completely + * uses new libgimp API to pass surfaces instead of pixbufs + * uses GTK+ 3 API to convert surfaces to pixbufs where available + (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) + +commit 4e92302c4a14a961f112587a0ad86696c88da2f8 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:38:08 2011 +0200 + + file-pdf-load: Don't use deprecated API (bug #646947) + + (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) + + Conflicts: + + plug-ins/common/file-pdf.c +--- + plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ + 1 files changed, 283 insertions(+), 40 deletions(-) + +diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c +index a43b459..43c2b7d 100644 +--- a/plug-ins/common/file-pdf.c ++++ b/plug-ins/common/file-pdf.c +@@ -4,6 +4,9 @@ + * + * Copyright (C) 2005 Nathan Summers + * ++ * Some code in render_page_to_surface() borrowed from ++ * poppler.git/glib/poppler-page.cc. ++ * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or +@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, + static PopplerDocument * open_document (const gchar *filename, + GError **error); + +-static GdkPixbuf * get_thumbnail (PopplerDocument *doc, ++static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, ++ gint page, ++ gint preferred_size); ++ ++static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, + gint page, + gint preferred_size); + + static gint32 layer_from_pixbuf (gint32 image, +- const gchar *layer_name, +- gint position, +- GdkPixbuf *buf, +- gdouble progress_start, +- gdouble progress_scale); ++ const gchar *layer_name, ++ gint position, ++ GdkPixbuf *pixbuf, ++ gdouble progress_start, ++ gdouble progress_scale); + + /** + ** the following was formerly part of +@@ -433,11 +440,12 @@ run (const gchar *name, + } + else + { +- gdouble width = 0; +- gdouble height = 0; +- gdouble scale; +- gint32 image = -1; +- GdkPixbuf *pixbuf = NULL; ++ gdouble width = 0; ++ gdouble height = 0; ++ gdouble scale; ++ gint32 image = -1; ++ gint num_pages = 0; ++ GdkPixbuf *pixbuf = NULL; + + /* Possibly retrieve last settings */ + gimp_get_data (LOAD_PROC, &loadvals); +@@ -455,7 +463,10 @@ run (const gchar *name, + g_object_unref (page); + } + +- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); ++ num_pages = poppler_document_get_n_pages (doc); ++ ++ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); ++ + g_object_unref (doc); + } + +@@ -548,6 +559,187 @@ open_document (const gchar *filename, + return doc; + } + ++/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ ++ ++#if (!GTK_CHECK_VERSION (3, 0, 0)) ++ ++static cairo_format_t ++gdk_cairo_format_for_content (cairo_content_t content) ++{ ++ switch (content) ++ { ++ case CAIRO_CONTENT_COLOR: ++ return CAIRO_FORMAT_RGB24; ++ case CAIRO_CONTENT_ALPHA: ++ return CAIRO_FORMAT_A8; ++ case CAIRO_CONTENT_COLOR_ALPHA: ++ default: ++ return CAIRO_FORMAT_ARGB32; ++ } ++} ++ ++static cairo_surface_t * ++gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, ++ cairo_content_t content, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ cairo_surface_t *copy; ++ cairo_t *cr; ++ ++ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), ++ width, ++ height); ++ ++ cr = cairo_create (copy); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_surface (cr, surface, -src_x, -src_y); ++ cairo_paint (cr); ++ cairo_destroy (cr); ++ ++ return copy; ++} ++ ++static void ++convert_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ guint alpha = src[x] >> 24; ++ ++ if (alpha == 0) ++ { ++ dest_data[x * 4 + 0] = 0; ++ dest_data[x * 4 + 1] = 0; ++ dest_data[x * 4 + 2] = 0; ++ } ++ else ++ { ++ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; ++ } ++ dest_data[x * 4 + 3] = alpha; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++static void ++convert_no_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ dest_data[x * 3 + 0] = src[x] >> 16; ++ dest_data[x * 3 + 1] = src[x] >> 8; ++ dest_data[x * 3 + 2] = src[x]; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++/** ++ * gdk_pixbuf_get_from_surface: ++ * @surface: surface to copy from ++ * @src_x: Source X coordinate within @surface ++ * @src_y: Source Y coordinate within @surface ++ * @width: Width in pixels of region to get ++ * @height: Height in pixels of region to get ++ * ++ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) ++ * representation inside a #GdkPixbuf. This allows you to efficiently read ++ * individual pixels from cairo surfaces. For #GdkWindows, use ++ * gdk_pixbuf_get_from_window() instead. ++ * ++ * This function will create an RGB pixbuf with 8 bits per channel. ++ * The pixbuf will contain an alpha channel if the @surface contains one. ++ * ++ * Return value: (transfer full): A newly-created pixbuf with a reference ++ * count of 1, or %NULL on error ++ */ ++static GdkPixbuf * ++gdk_pixbuf_get_from_surface (cairo_surface_t *surface, ++ gint src_x, ++ gint src_y, ++ gint width, ++ gint height) ++{ ++ cairo_content_t content; ++ GdkPixbuf *dest; ++ ++ /* General sanity checks */ ++ g_return_val_if_fail (surface != NULL, NULL); ++ g_return_val_if_fail (width > 0 && height > 0, NULL); ++ ++ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; ++ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, ++ !!(content & CAIRO_CONTENT_ALPHA), ++ 8, ++ width, height); ++ ++ surface = gdk_cairo_surface_coerce_to_image (surface, content, ++ src_x, src_y, ++ width, height); ++ cairo_surface_flush (surface); ++ if (cairo_surface_status (surface) || dest == NULL) ++ { ++ cairo_surface_destroy (surface); ++ return NULL; ++ } ++ ++ if (gdk_pixbuf_get_has_alpha (dest)) ++ convert_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ else ++ convert_no_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ ++ cairo_surface_destroy (surface); ++ return dest; ++} ++ ++#endif ++ + static gint32 + layer_from_pixbuf (gint32 image, + const gchar *layer_name, +@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, + return layer; + } + ++static cairo_surface_t * ++render_page_to_surface (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ cairo_surface_t *surface; ++ cairo_t *cr; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); ++ cr = cairo_create (surface); ++ ++ cairo_save (cr); ++ cairo_translate (cr, 0.0, 0.0); ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ return surface; ++} ++ ++static GdkPixbuf * ++render_page_to_pixbuf (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; ++ ++ surface = render_page_to_surface (page, width, height, scale); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ ++ return pixbuf; ++} ++ + static gint32 + load_image (PopplerDocument *doc, + const gchar *filename, +@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, + gdouble page_width; + gdouble page_height; + +- GdkPixbuf *buf; ++ GdkPixbuf *pixbuf; + gint width; + gint height; + +@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, + gimp_image_set_resolution (image_ID, resolution, resolution); + } + +- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); +- +- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); ++ pixbuf = render_page_to_pixbuf (page, width, height, scale); + +- layer_from_pixbuf (image_ID, page_label, i, buf, ++ layer_from_pixbuf (image_ID, page_label, i, pixbuf, + doc_progress, 1.0 / pages->n_pages); + + g_free (page_label); +- g_object_unref (buf); ++ g_object_unref(pixbuf); + + doc_progress = (double) (i + 1) / pages->n_pages; + gimp_progress_update (doc_progress); +@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, + return image_ID; + } + +-static GdkPixbuf * +-get_thumbnail (PopplerDocument *doc, +- gint page_num, +- gint preferred_size) ++static cairo_surface_t * ++get_thumb_surface (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) + { + PopplerPage *page; +- GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; + + page = poppler_document_get_page (doc, page_num); + + if (! page) + return NULL; + +- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also +- * add configure check to make sure POPPLER_WITH_GDK is enabled! +- */ +-#ifdef POPPLER_WITH_GDK +- pixbuf = poppler_page_get_thumbnail_pixbuf (page); +-#else +- pixbuf = poppler_page_get_thumbnail (page); +-#endif +- ++ surface = poppler_page_get_thumbnail (page); + +- if (! pixbuf) ++ if (! surface) + { + gdouble width; + gdouble height; +@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, + width *= scale; + height *= scale; + +- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- width, height); +- +- poppler_page_render_to_pixbuf (page, +- 0, 0, width, height, scale, 0, pixbuf); ++ surface = render_page_to_surface (page, width, height, scale); + } + + g_object_unref (page); + ++ return surface; ++} ++ ++static GdkPixbuf * ++get_thumb_pixbuf (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) ++{ ++ cairo_surface_t *surface; ++ GdkPixbuf *pixbuf; ++ ++ surface = get_thumb_surface (doc, page_num, preferred_size); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ + return pixbuf; + } + +@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) + idle_data->page_no = i; + + /* FIXME get preferred size from somewhere? */ +- idle_data->pixbuf = get_thumbnail (thread_data->document, i, +- THUMBNAIL_SIZE); ++ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, ++ THUMBNAIL_SIZE); + + g_idle_add (idle_set_thumbnail, idle_data); + +-- +1.7.5 diff --git a/staging/gimp/gimp.install b/staging/gimp/gimp.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/staging/gimp/gimp.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/gimp/linux.gpl b/staging/gimp/linux.gpl new file mode 100644 index 000000000..0a73d8979 --- /dev/null +++ b/staging/gimp/linux.gpl @@ -0,0 +1,19 @@ +GIMP Palette +Name: linux +# + 0 0 0 + 0 0 170 + 0 170 0 + 0 170 170 +170 0 0 +170 0 170 +170 85 0 +170 170 170 + 85 85 85 + 85 85 255 + 85 255 85 + 85 255 255 +255 85 85 +255 85 255 +255 255 85 +255 255 255 diff --git a/staging/gimp/uri-backend-libcurl.patch b/staging/gimp/uri-backend-libcurl.patch new file mode 100644 index 000000000..85da2fc7f --- /dev/null +++ b/staging/gimp/uri-backend-libcurl.patch @@ -0,0 +1,77 @@ +diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c +--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 ++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 +@@ -4,9 +4,9 @@ + * libcurl backend for the URI plug-in + * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org> + * +- * This program is free software; you can redistribute it and/or modify ++ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or ++ * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, +@@ -15,8 +15,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + #include "config.h" +@@ -24,7 +23,6 @@ + #include <errno.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <glib/gstdio.h> +@@ -63,7 +61,7 @@ + + vinfo = curl_version_info (CURLVERSION_NOW); + +- protocols = g_string_new ("http:,ftp:"); ++ protocols = g_string_new ("http:,ftp:,gopher:"); + + if (vinfo->features & CURL_VERSION_SSL) + { +@@ -153,7 +151,7 @@ + FILE *out_file; + CURL *curl_handle; + CURLcode result; +- gint response_code; ++ glong response_code; + + gimp_progress_init (_("Connecting to server")); + +@@ -195,12 +193,12 @@ + + curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); + +- if (response_code != 200) ++ if (response_code != 200 && response_code != 226 && response_code != 0) + { + fclose (out_file); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Opening '%s' for reading resulted in HTTP " +- "response code: %d"), ++ "response code: %ld"), + uri, response_code); + curl_easy_cleanup (curl_handle); + return FALSE; +@@ -224,3 +222,10 @@ + + return FALSE; + } ++ ++gchar * ++uri_backend_map_image (const gchar *uri, ++ GimpRunMode run_mode) ++{ ++ return NULL; ++} diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD index a70723036..c8cfb3158 100644 --- a/staging/tracker/PKGBUILD +++ b/staging/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 139873 2011-10-05 16:29:31Z heftig $ +# $Id: PKGBUILD 140107 2011-10-06 18:31:24Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.3 +pkgver=0.12.4 _tver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('97c9e151d48878409129eeeea2da0716f14a52d6097d8db3b304c6af0b7ae187') +sha256sums=('14c1e2c02f96e1160cfe557e0669558524902042ae04b06e343f879419cb6d82') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD new file mode 100644 index 000000000..606fb44d8 --- /dev/null +++ b/staging/tumbler/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 140051 2011-10-06 06:06:45Z eric $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan Jezek <honzin.jezek@gmail.com> + +pkgname=tumbler +pkgver=0.1.22 +pkgrel=3 +pkgdesc="D-Bus service for applications to request thumbnails" +url="http://git.xfce.org/xfce/tumbler/" +license=('GPL2' 'LGPL') +arch=('i686' 'x86_64') +groups=('xfce4') +depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') +optdepends=('ffmpegthumbnailer: for video thumbnails' + 'gstreamer0.10: for video thumbnails') +options=('!libtool') +source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 + fix-video-image.patch) +md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' + 'be9b0f1c3a4b0be102774c84d5ac29e6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../fix-video-image.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/tumbler/fix-video-image.patch b/staging/tumbler/fix-video-image.patch new file mode 100644 index 000000000..11c9d867b --- /dev/null +++ b/staging/tumbler/fix-video-image.patch @@ -0,0 +1,34 @@ +From aab140d868c1ebedbb04bbd65deddf94dc21787b Mon Sep 17 00:00:00 2001 +From: Jannis Pohlmann <jannis@xfce.org> +Date: Mon, 26 Sep 2011 17:28:51 +0000 +Subject: Fix generation of video images by starting the pipeline (bug #7996). + +Patch provided by Sam Thursfield<ssssam@gmail.com>. +--- +diff --git a/NEWS b/NEWS +index 0ff1c1c..48e3896 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,7 @@ ++0.1.xx ++====== ++- Fix generation of video images by starting the pipeline (bug #7996). ++ + 0.1.22 + ====== + - Add coding style documentation. +diff --git a/plugins/gst-thumbnailer/gst-helper.c b/plugins/gst-thumbnailer/gst-helper.c +index b8a29ab..dead043 100644 +--- a/plugins/gst-thumbnailer/gst-helper.c ++++ b/plugins/gst-thumbnailer/gst-helper.c +@@ -154,6 +154,8 @@ gst_helper_convert_buffer_to_pixbuf (GstBuffer *buffer, + + bus = gst_element_get_bus (GST_ELEMENT (pipeline)); + ++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); ++ + i = 0; + msg = NULL; + while (msg == NULL && i < 5) +-- +cgit diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD new file mode 100644 index 000000000..5841142b4 --- /dev/null +++ b/testing/ntp/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 140053 2011-10-06 06:09:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> + +pkgname=ntp +pkgver=4.2.6.p4 +_realver=4.2.6p4 +pkgrel=1 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('openssl' 'readline' 'libcap') +makedepends=('perl-html-parser') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf') +sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' + '97b41b8bc34f259f4e525ab2e58707c9724e72e2' + '63572457586379aa6bf75b6e899e71d651e643f4' + '6d2d234afb1db2dcb940747a62f70217246a3d13' + '6cfcb7bbd34499b30e31dffca2f3e1a036010271') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${_realver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linux-caps \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-$_realver" + + make DESTDIR="${pkgdir}" install + + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf + + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + cd .. + + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d "${pkgdir}/var/lib/ntp" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/ntp/install b/testing/ntp/install new file mode 100644 index 000000000..ad9a39d54 --- /dev/null +++ b/testing/ntp/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then + cat <<EOF + +==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf +==> If you made changes to the former, please update the latter. + +EOF + fi +} diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf new file mode 100644 index 000000000..5f31fea83 --- /dev/null +++ b/testing/ntp/ntp.conf @@ -0,0 +1,22 @@ +# With the default settings below, ntpd will only synchronize your clock. +# +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon + +# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org + +# Only allow read-only access from localhost +restrict default nomodify nopeer +restrict 127.0.0.1 + +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log + +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd new file mode 100755 index 000000000..a3e886e1f --- /dev/null +++ b/testing/ntp/ntpd @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ntpd.conf + +PIDFILE="/var/run/ntpd/ntpd.pid" +PID=$(cat $PIDFILE 2> /dev/null) + +case "$1" in + start) + stat_busy "Starting NTP Daemon" + [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null + if [ -z "$PID" ]; then + /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon ntpd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Daemon" + if [ -n "$PID" ]; then + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm $PIDFILE &>/dev/null + rm_daemon ntpd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/ntp/ntpd.conf b/testing/ntp/ntpd.conf new file mode 100644 index 000000000..e728db579 --- /dev/null +++ b/testing/ntp/ntpd.conf @@ -0,0 +1,5 @@ +# client options for "ntpd -q" - ntpdate equivalent +NTP_CLIENT_OPTION="-g" + +# arguments passed to ntpd when started +NTPD_ARGS="-g" diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate new file mode 100755 index 000000000..4f7c8375b --- /dev/null +++ b/testing/ntp/ntpdate @@ -0,0 +1,31 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ntpd.conf + +case "$1" in + start) + stat_busy "Starting NTP Client" + /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon ntpdate + stat_done + fi + ;; + stop) + stat_busy "Stopping NTP Client" + rm_daemon ntpdate + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + |