diff options
45 files changed, 845 insertions, 103 deletions
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index 6f713df50..e423110d6 100755 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17258 2010-05-22 14:32:23Z ibiru $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 42b0688a1..4cf31e845 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 57890 2011-11-04 08:33:14Z lcarlier $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 60209 2011-12-07 16:29:05Z svenstaro $ +# Maintainer: Laurent Carlier <lordheavym@gmail.org> +# Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=8 +pkgrel=9 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64') url="http://openil.sourceforge.net/" -depends=('allegro4' 'sdl' 'libpng' 'libmng' 'freeglut' - 'jasper' 'lcms' 'openexr') -makedepends=('bash') -options=('!libtool' '!docs') +depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') +install=devil.install +options=('!libtool' '!docs' '!emptydirs') license=('GPL') source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch) md5sums=('7918f215524589435e5ec2e8736d5e1d' @@ -22,7 +22,7 @@ build() { patch -Np1 -i ${srcdir}/libpng14.patch - ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl + ./configure --prefix=/usr --enable-ILU make } diff --git a/community/devil/devil.install b/community/devil/devil.install new file mode 100644 index 000000000..8336ac3d1 --- /dev/null +++ b/community/devil/devil.install @@ -0,0 +1,11 @@ +infodir=usr/share/info + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 9dca2de4f..d37772530 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 7c8118bc1..3c42396b4 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index c86eacb82..d5ee6b31c 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 369425178..4b8b9490d 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 7da79c631..e53fc77d4 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index fa3d8cb5b..d8b0f9208 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 938434454..bab9bbd9b 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 081fcf857..1b110b70f 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index b8e545dcc..8553e2ba5 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59461 2011-11-25 15:15:41Z jelle $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index d428dfe0a..c32c6e363 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53118 2011-07-30 17:05:35Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 8f5405bac..a4cf223f7 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 4bb0100c0..9dc24f933 100755 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42747 2011-03-20 15:07:32Z ttopper $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index ea0ed67f0..b71ab6e15 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58848 2011-11-18 21:30:35Z lcarlier $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD index 3154cc8b9..3d842fb77 100644 --- a/community/libmilter/PKGBUILD +++ b/community/libmilter/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 56914 2011-10-16 12:39:57Z spupykin $ +# $Id: PKGBUILD 60205 2011-12-07 15:22:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mutantmonkey <mutantmonkey@gmail.com> pkgname=libmilter -pkgver=8.14.4 -pkgrel=3 +pkgver=8.14.5 +pkgrel=1 pkgdesc="libmilter" arch=(i686 x86_64) url="http://www.postfix.org/MILTER_README.html" license=('custom:Sendmail open source license') source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz" -md5sums=('1b23d5000c8e7bfe82ec1a27f2f5fdc5') +md5sums=('02ccfc331cc81ed00ec8bb5ecfc69018') build(){ cd "${srcdir}/sendmail-${pkgver}" diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index c4cd987cd..b06b030e6 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58664 2011-11-17 11:39:42Z ttopper $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD index f5ad4cc39..99cafbacb 100755 --- a/community/python-psycopg1/PKGBUILD +++ b/community/python-psycopg1/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27290 2010-09-19 04:29:33Z ebelanger $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-psycopg1 diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD index d6dd0aa79..73e71f73c 100755 --- a/community/python-pyro/PKGBUILD +++ b/community/python-pyro/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56634 2011-10-09 10:13:09Z angvp $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br> pkgbase=python-pyro diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD index 24ba9e35d..15d970e37 100755 --- a/community/python2-cheetah/PKGBUILD +++ b/community/python2-cheetah/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56977 2011-10-17 13:24:23Z jelle $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: James Rayner <james@archlinux.org> # Contributor: Todd Maynard <arch@toddmaynard.com> diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index e265cc22b..8bcd24b0f 100755 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54585 2011-08-20 18:29:13Z jlichtblau $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 7496a585b..ba1e4ef98 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59968 2011-12-02 21:01:02Z ibiru $ +# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,12 +6,12 @@ pkgname=spring pkgver=0.84.0 _pkgver=84.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index e6e2387a5..70d7a4ca4 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,53 +1,57 @@ -# $Id: PKGBUILD 59377 2011-11-23 21:18:49Z andrea $ -# Maintainer: +# $Id: PKGBUILD 60193 2011-12-07 12:16:33Z arodseth $ +# Maintainer: Alexander Rødseth # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> - pkgname=sword pkgver=1.6.2 -pkgrel=5 +pkgrel=6 pkgdesc="Libraries for Bible programs" -arch=('i686' 'x86_64') -url="http://www.crosswire.org/sword/index.jsp" +arch=('x86_64' 'i686') +url="http://www.crosswire.org/sword/" license=('GPL') depends=('curl' 'clucene' 'swig') makedepends=('cmake') backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz" curl.patch) +source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" + curl.patch) md5sums=('a7dc4456e20e915fec46d774b690e305' 'e84a226ce3697af33b9fdd9a22884a2a') build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i $srcdir/curl.patch + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../curl.patch + + mkdir ../build + cd ../build - cd $srcdir - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ + cmake "../$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release + make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install - # Ugly workarounds to fix a weird cmakelists.txt - install -d "${pkgdir}"/usr/lib/sword - mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8* "${pkgdir}"/usr/lib/sword/ + install -d "$pkgdir/usr/lib/sword" + mv "$pkgdir"/usr/lib/1.6.2_icu_4.8* "$pkgdir/usr/lib/sword/" - cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/ + cd "$srcdir/$pkgname-$pkgver/locales.d/" for file in *.conf; do - install -Dm644 $file "${pkgdir}"/usr/share/sword/locales.d/$file + install -Dm644 "$file" "$pkgdir/usr/share/sword/locales.d/$file" done cd ../include - install -d "${pkgdir}"/usr/include/sword - install -Dm644 canon_{catholic{,2},synodalp}.h "${pkgdir}"/usr/include/sword + install -d "$pkgdir/usr/include/sword" + install -Dm644 canon_{catholic{,2},synodalp}.h "$pkgdir/usr/include/sword" cd ../samples - install -Dm644 mods.d/globals.conf "${pkgdir}"/usr/share/sword/mods.d/globals.conf - install -Dm644 recommended/sword.conf "${pkgdir}"/etc/sword.conf + install -Dm644 mods.d/globals.conf "$pkgdir/usr/share/sword/mods.d/globals.conf" + install -Dm644 recommended/sword.conf "$pkgdir/etc/sword.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD index 0473d014b..1e6e80c69 100755 --- a/community/xiphos/PKGBUILD +++ b/community/xiphos/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 49759 2011-06-20 22:11:59Z andrea $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 60197 2011-12-07 12:42:03Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> - pkgname=xiphos pkgver=3.1.4 -pkgrel=8 -pkgdesc="A Bible study tool for gtk" -arch=('i686' 'x86_64') -url="http://xiphos.org" +pkgrel=9 +pkgdesc="Bible study tool for GTK+" +arch=('x86_64' 'i686') +url="http://xiphos.org/" license=('GPL') -depends=('libgsf' 'libglade' 'gtkhtml' 'sword' 'hicolor-icon-theme') +depends=('libgsf' 'libglade' 'gtkhtml' 'sword') makedepends=('gnome-doc-utils' 'intltool' 'python2') conflicts=('gnomesword') provides=('gnomesword') replaces=('gnomesword') -install=$pkgname.install +install=xiphos.install source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz") md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a') build() { - cd $srcdir/$pkgname-$pkgver - sed -i '1s/python/python2/' waf + cd "$srcdir/$pkgname-$pkgver" + + sed -i '0,/on/s//on2/' waf ./waf configure --prefix=/usr --enable-gtkhtml ./waf build --prefix=/usr } package() { - cd $srcdir/$pkgname-$pkgver - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir=$pkgdir + cd "$srcdir/$pkgname-$pkgver" + + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir="$pkgdir" } + +# vim:set ts=2 sw=2 et: diff --git a/community/xiphos/xiphos.install b/community/xiphos/xiphos.install index ada2ca2f2..048e77780 100644 --- a/community/xiphos/xiphos.install +++ b/community/xiphos/xiphos.install @@ -1,5 +1,3 @@ -pkgname=xiphos - post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -11,3 +9,5 @@ post_upgrade() { post_remove() { post_install } + +# vim:set ts=2 sw=2 et: diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 7712b6f5d..747257aba 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142277 2011-11-07 20:10:07Z stephane $ +# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.5 +pkgrel=1 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64) url="http://www.kernel.org" @@ -10,7 +10,7 @@ license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('19811ee31f683058a9aae3e6a3a23a7f') +md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5bfd14ba4..8860ea752 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143899 2011-11-30 19:57:03Z giovanni $ +# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.11.29 +pkgver=2011.12.02 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('ab422e32f2e0820ac5161cc3d842343d') +md5sums=('4f10d93d33f6714a980fd1655ead69cd') build() { cd ${srcdir}/live diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index 6d2e61e9c..30f9b0ab5 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 77562 2010-04-15 22:34:21Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 144607 2011-12-08 01:03:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Dale Blount <dale@archlinux.org> pkgname=purple-plugin-pack -pkgver=2.6.3 +pkgver=2.7.0 pkgrel=1 -pkgdesc="Plugin pack for Pidgin" +pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64') -url="http://plugins.guifications.org/trac/wiki/PluginPack" +url="https://www.guifications.org/projects/purple-plugin-pack" license=('GPL') -depends=('pidgin') -makedepends=('intltool' 'python') +depends=('libpurple') +makedepends=('intltool' 'gettext' 'python2' 'pidgin') options=('!libtool') -source=(http://plugins.guifications.org/trac/downloads/48) -md5sums=('2dccee28f087c7e81cef07ee845399bb') +source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2) +sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { - cd "$srcdir/purple-plugin_pack-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 352881046..44368dc48 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 143828 2011-11-29 13:33:59Z stephane $ +# $Id: PKGBUILD 144599 2011-12-07 15:40:43Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=4.3.12 -pkgrel=3 +pkgver=4.3.14 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' license=('custom') depends=('pcre' 'libcap' 'gdbm') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') -md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' - 'b367c1398b60242f7044a93a837227f9') +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" + 'zprofile') +backup=('etc/zsh/zprofile') +md5sums=('1c819a3ff7302b42eba988e333e76109' + '24a9335edf77252a7b5f52e079f7aef7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # upstream patch to fix handling of compressed kernel modules - patch -p1 -i ${srcdir}/modules.patch # FS#16360 sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ Doc/zsh.texi \ @@ -29,7 +29,7 @@ build() { --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ --enable-zlogout=/etc/zsh/zlogout \ - --enable-zprofile=/etc/profile \ + --enable-zprofile=/etc/zsh/zprofile \ --enable-zshrc=/etc/zsh/zshrc \ --enable-maildir-support \ --with-term-lib='ncursesw' \ @@ -54,5 +54,6 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zprofile b/extra/zsh/zprofile new file mode 100644 index 000000000..6bfcdf7cb --- /dev/null +++ b/extra/zsh/zprofile @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD index e082dac0f..264a41750 100755 --- a/multilib/lib32-curl/PKGBUILD +++ b/multilib/lib32-curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53559 2011-08-05 17:14:56Z bluewind $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Florian Pritz <flo@xssn.at> _pkgbasename=curl diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..9cbe8c3d7 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 144605 2011-12-07 21:28:52Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.9.2 +pkgrel=2 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +provides=('heimdal') +replaces=('heimdal') +conflicts=('heimdal') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + krb5-kadmind + krb5-kdc + krb5-kpropd + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) +sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # - Make krb5-config suppress CFLAGS output when called with --libs + # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 + # + # - Omit extra libraries because their interfaces are not exposed to applications + # by libkrb5, unless do_deps is set to 1, which indicates that the caller + # wants the whole list. + # + # Patch from upstream : + # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 + patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.9.1-2011-007.patch b/testing/krb5/krb5-1.9.1-2011-007.patch new file mode 100644 index 000000000..336a4ad31 --- /dev/null +++ b/testing/krb5/krb5-1.9.1-2011-007.patch @@ -0,0 +1,40 @@ +diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in +index f46cad3..102fbaa 100644 +--- a/src/kdc/Makefile.in ++++ b/src/kdc/Makefile.in +@@ -67,6 +67,7 @@ check-unix:: rtest + + check-pytests:: + $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) + + install:: + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index c169c54..840a2ef 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -243,7 +243,8 @@ tgt_again: + if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { + errcode = find_alternate_tgs(request, &server); + firstpass = 0; +- goto tgt_again; ++ if (errcode == 0) ++ goto tgt_again; + } + } + status = "UNKNOWN_SERVER"; +diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py +new file mode 100644 +index 0000000..1760bcd +--- /dev/null ++++ b/src/kdc/t_emptytgt.py +@@ -0,0 +1,8 @@ ++#!/usr/bin/python ++from k5test import * ++ ++realm = K5Realm(start_kadmind=False, create_host=False) ++output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) ++if 'not found in Kerberos database' not in output: ++ fail('TGT lookup for empty realm failed in unexpected way') ++success('Empty tgt lookup.') diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch new file mode 100644 index 000000000..e5a38498f --- /dev/null +++ b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch @@ -0,0 +1,58 @@ +diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c +--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 ++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 +@@ -470,13 +470,10 @@ + + /***** STATE_REFERRALS *****/ + +-/* +- * Possibly retry a request in the fallback realm after a referral request +- * failure in the local realm. Expects ctx->reply_code to be set to the error +- * from a referral request. +- */ ++/* Possibly try a non-referral request after a referral request failure. ++ * Expects ctx->reply_code to be set to the error from a referral request. */ + static krb5_error_code +-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) ++try_fallback(krb5_context context, krb5_tkt_creds_context ctx) + { + krb5_error_code code; + char **hrealms; +@@ -485,9 +482,10 @@ + if (ctx->referral_count > 1) + return ctx->reply_code; + +- /* Only fall back if the original request used the referral realm. */ ++ /* If the request used a specified realm, make a non-referral request to ++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ + if (!krb5_is_referral_realm(&ctx->req_server->realm)) +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + + if (ctx->server->length < 2) { + /* We need a type/host format principal to find a fallback realm. */ +@@ -500,10 +498,10 @@ + if (code != 0) + return code; + +- /* Give up if the fallback realm isn't any different. */ ++ /* If the fallback realm isn't any different, use the existing TGT. */ + if (data_eq_string(ctx->server->realm, hrealms[0])) { + krb5_free_host_realm(context, hrealms); +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + } + + /* Rewrite server->realm to be the fallback realm. */ +@@ -540,9 +538,9 @@ + krb5_error_code code; + const krb5_data *referral_realm; + +- /* Possibly retry with the fallback realm on error. */ ++ /* Possibly try a non-referral fallback request on error. */ + if (ctx->reply_code != 0) +- return try_fallback_realm(context, ctx); ++ return try_fallback(context, ctx); + + if (krb5_principal_compare(context, ctx->reply_creds->server, + ctx->server)) { diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch new file mode 100644 index 000000000..a72a75edf --- /dev/null +++ b/testing/krb5/krb5-1.9.1-config-script.patch @@ -0,0 +1,27 @@ +diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in +--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 ++++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 +@@ -186,7 +186,7 @@ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ +- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` ++ -e 's#\$(CFLAGS)##'` + + if test $library = 'kdb'; then + lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" +@@ -214,9 +214,13 @@ + fi + + if test $library = 'krb5'; then +- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" ++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" + fi + ++ # If we ever support a flag to generate output suitable for static ++ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" ++ # here. ++ + echo $lib_flags + fi + diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/testing/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/libdrm/COPYING b/testing/libdrm/COPYING new file mode 100644 index 000000000..6e74c337c --- /dev/null +++ b/testing/libdrm/COPYING @@ -0,0 +1,48 @@ + Copyright 2005 Adam Jackson. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation on the rights to use, copy, modify, merge, + publish, distribute, sub license, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +------------------------------------------------------------------------ + + Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS + SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD new file mode 100644 index 000000000..91583d99a --- /dev/null +++ b/testing/libdrm/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 144601 2011-12-07 17:32:22Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libdrm +pkgver=2.4.28 +pkgrel=1 +pkgdesc="Userspace interface to kernel DRM services" +arch=(i686 x86_64) +license=('custom') +depends=('glibc' 'libpciaccess') +makedepends=('cairo') +options=('!libtool') +url="http://dri.freedesktop.org/" +source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + no-pthread-stubs.patch + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ + + #libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr \ + --enable-udev \ + --enable-intel \ + --enable-radeon \ + --enable-vmwgfx-experimental-api \ + --enable-nouveau-experimental-api + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/testing/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/testing/libdrm/list.h b/testing/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/testing/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include <stddef.h> + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch new file mode 100644 index 000000000..348c2a795 --- /dev/null +++ b/testing/libdrm/no-pthread-stubs.patch @@ -0,0 +1,66 @@ +diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac +--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 ++++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) +--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 +@@ -26,14 +26,13 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intel \ +- $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_intel_la_LTLIBRARIES = libdrm_intel.la + libdrm_intel_ladir = $(libdir) + libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ + + libdrm_intel_la_SOURCES = \ + intel_bufmgr.c \ +--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 +@@ -26,13 +26,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/radeon \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la + libdrm_radeon_ladir = $(libdir) + libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_radeon_la_LIBADD = ../libdrm.la + + libdrm_radeon_la_SOURCES = \ + radeon_bo_gem.c \ +--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/nouveau \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) + libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_nouveau_la_LIBADD = ../libdrm.la + + libdrm_nouveau_la_SOURCES = \ + nouveau_device.c \ diff --git a/testing/libdrm/rbo.h b/testing/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/testing/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Jerome Glisse <j.glisse@gmail.com> + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif |