diff options
40 files changed, 1077 insertions, 255 deletions
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index e57e82843..fb206952e 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67172 2012-03-05 08:56:35Z ibiru $ +# $Id: PKGBUILD 68036 2012-03-17 05:43:38Z svenstaro $ # Contributor: John Sowiak <john@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> @@ -14,15 +14,16 @@ _svn=false pkgname=blender pkgver=2.62 -pkgrel=2 +pkgrel=3 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') license=('GPL') url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio') +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' + 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' + 'openimageio' 'libsndfile' 'jack') makedepends=('cmake' 'boost' 'cuda-toolkit') optdepends=('cuda-toolkit: cycles renderer cuda support') options=(!strip) @@ -64,6 +65,7 @@ build() { -DWITH_OPENCOLLADA:BOOL=ON \ -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \ -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_JACK:BOOL=ON \ -DWITH_PLAYER:BOOL=ON \ -DWITH_BUILTIN_GLEW:BOOL=OFF \ -DWITH_CODEC_FFMPEG:BOOL=ON \ diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 47cfe0b7b..31e48a2b5 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56110 2011-10-01 19:01:59Z ibiru $ +# $Id: PKGBUILD 68092 2012-03-17 19:45:14Z giovanni $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org" diff --git a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install index 24072f316..326aa98a2 100644 --- a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install +++ b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 860042a5a..de9c8c090 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 58331 2011-11-11 18:59:34Z spupykin $ +# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.51 +pkgver=0.7.54 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=( 'curl' 'libmms>=0.5-2' 'libzen>=0.4.15') +depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('eb377eebb40d64bf980c857f36cc5b51' +md5sums=('4d936fc2122ad1199e3185d2d6053715' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 8a1ee0723..ce3e18720 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58333 2011-11-11 19:01:15Z spupykin $ +# $Id: PKGBUILD 68076 2012-03-17 18:51:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.23 +pkgver=0.4.25 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('00e622cf33eeb134a785463fbf49d227') +md5sums=('f30a139d506170aeeb3bc47d15e10fae') build() { cd $srcdir/ZenLib/Project/GNU/Library @@ -28,9 +28,9 @@ package() { make DESTDIR=$pkgdir install install -dm 755 $pkgdir/usr/include/ZenLib install -m 644 $srcdir/ZenLib/Source/ZenLib/*.h $pkgdir/usr/include/ZenLib - for i in Base64 HTTP_Client Format/Html Format/Http TinyXml; do - install -dm 755 $pkgdir/usr/include/ZenLib/$i - install -m 644 $srcdir/ZenLib/Source/ZenLib/$i/*.h $pkgdir/usr/include/ZenLib/$i + for i in HTTP_Client Format/Html Format/Http; do + install -dm0755 $pkgdir/usr/include/ZenLib/$i + install -m0644 $srcdir/ZenLib/Source/ZenLib/$i/*.h $pkgdir/usr/include/ZenLib/$i done install -dm 755 $pkgdir/usr/lib/pkgconfig install -m 644 $srcdir/ZenLib/Project/GNU/Library/libzen.pc $pkgdir/usr/lib/pkgconfig diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index dc318cecf..ff010adb3 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 65741 2012-02-22 12:12:10Z seblu $ +# $Id: PKGBUILD 68094 2012-03-17 19:58:42Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=linux-tools pkgname=('perf' 'cpupower') pkgver=3.2 -kernver=${pkgver}.7 +kernver=${pkgver}.11 [[ ${kernver##*rc} != $kernver ]] && testing='testing' -pkgrel=3 +pkgrel=4 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -18,7 +18,7 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar 'cpupower.rc' 'cpupower.conf' 'cpupower.service') -md5sums=('66966f6c1c4b0279c5563eabdafbb044' +md5sums=('0e3d5a3dab51b3c36940461582bc06df' '26af384ca282bc0dc38ff65acc7bb4b9' '857ccdd0598511e3bf4b63522754dc48' '20870541e88109d2f153be3c58a277f1') diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 425dada88..7a6b8e2d9 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 58337 2011-11-11 19:02:47Z spupykin $ +# $Id: PKGBUILD 68080 2012-03-17 18:53:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.51 +pkgver=0.7.54 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=('libmediainfo>=0.7.35' 'wxgtk') +depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('b06dc34481ce2971c28e517b146888e8') +md5sums=('c851998158213a6b837048d67e1c2b9a') build() { cd $srcdir/MediaInfo/Project/GNU/GUI @@ -25,9 +25,9 @@ build() { package() { cd $srcdir/MediaInfo/Project/GNU/GUI make DESTDIR=$pkgdir install - install -D -m 644 $srcdir/MediaInfo/Source/Ressource/Image/MediaInfo.png \ + install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ $pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png - install -D -m 644 $srcdir/MediaInfo/Source/Ressource/Image/MediaInfo.png \ + install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ $pkgdir/usr/share/pixmaps/mediainfo-gui.png install -D -m 644 $srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop \ $pkgdir/usr/share/applications/mediainfo-gui.desktop diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index e954b259e..8f42bf55b 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 58335 2011-11-11 19:02:05Z spupykin $ +# $Id: PKGBUILD 68078 2012-03-17 18:52:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.51 +pkgver=0.7.54 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=('libmediainfo>=0.7.35') +depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('b06dc34481ce2971c28e517b146888e8') +md5sums=('c851998158213a6b837048d67e1c2b9a') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 1d6ff985f..893894e68 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67665 2012-03-13 16:41:27Z spupykin $ +# $Id: PKGBUILD 68084 2012-03-17 18:56:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules -pkgver=2011.12.20 -_pkgsubver=562307 -pkgrel=7 +pkgver=2012.03.13 +_pkgsubver=651368 +pkgrel=1 pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -16,7 +16,7 @@ install=$pkgname.install options=('!strip') source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" "modprobe.conf") -md5sums=('529c15cb6cfa2972a96664c504dee560' +md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' 'ac9b8e3cb798f5056ca92767ec705117') build() { diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 87a7a8f21..aa4c06173 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $ +# $Id: PKGBUILD 68082 2012-03-17 18:55:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.12.20 -_pkgsubver=562307 -pkgrel=2 +pkgver=2012.03.13 +_pkgsubver=651368 +pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -24,8 +24,8 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('529c15cb6cfa2972a96664c504dee560' - '06f7448e274db2a911f582e276088fc9' +md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' + 'b8f68fef3d388489e40dba581b6da18a' '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' diff --git a/community/open-vm-tools/scripts-network.patch b/community/open-vm-tools/scripts-network.patch index 13ea7f565..44c7e6dcb 100644 --- a/community/open-vm-tools/scripts-network.patch +++ b/community/open-vm-tools/scripts-network.patch @@ -1,5 +1,5 @@ ---- network.org 2010-04-28 10:21:14.000000000 +0000 -+++ network 2010-04-28 10:24:00.000000000 +0000 +--- network.org 2012-03-17 22:20:11.000000000 +0400 ++++ network 2012-03-17 22:18:47.000000000 +0400 @@ -34,51 +34,6 @@ @@ -17,47 +17,57 @@ -# - -find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then +- local script="error" +- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do +- if [ -d "$dir/rc0.d" ] && +- [ -d "$dir/rc1.d" ] && +- [ -d "$dir/rc2.d" ] && +- [ -d "$dir/rc3.d" ] && +- [ -d "$dir/rc4.d" ] && +- [ -d "$dir/rc5.d" ] && +- [ -d "$dir/rc6.d" ]; then - -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done +- # Now find the appropriate networking script. +- if [ -d "$dir/init.d" ]; then +- if [ -x "$dir/init.d/network" ]; then +- script="$dir/init.d/network" +- elif [ -x "$dir/init.d/networking" ]; then +- script="$dir/init.d/networking" +- fi +- else +- if [ -x "$dir/network" ]; then +- script="$dir/network" +- elif [ -x "$dir/networking" ]; then +- script="$dir/networking" +- fi +- fi +- fi +- done - -- echo "$script" +- echo "$script" -} - - -# - # save_active_NIC_list -- + # run_network_script -- # - # Records a list of every active NIC to /var/run/vmware-active-nics. -@@ -205,7 +160,7 @@ - exitCode=0 - activeList=/var/run/vmware-active-nics + # Finds out how to run the system's script used to control networking, and +@@ -87,17 +42,7 @@ + # + run_network_script() + { +- script=`find_networking_script` +- [ "$script" != "error" ] || Panic "Cannot find system networking script." +- +- # Using SysV "service" if it exists, otherwise fall back to run the script directly +- service=`which service 2>/dev/null` +- if [ $? = 0 -a -n "$service" ]; then +- serviceName=`basename "$script"` +- "$service" "$serviceName" "$1" +- else +- "$script" "$1" +- fi ++ /etc/rc.d/network "$1" + } -- networkScript=`find_networking_script` -+ networkScript=/etc/rc.d/network - [ "$networkScript" != "error" ] || Panic "Cannot find system networking script." - # XXX Are these really necessary? If so, we should have seen customer diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 837fbf183..c3a38cdf8 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,47 +1,39 @@ -# $Id: PKGBUILD 67891 2012-03-15 20:13:49Z svenstaro $ +# $Id: PKGBUILD 68034 2012-03-17 05:42:53Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -_pkg=OpenImageIO pkgname=openimageio +_pkgname=OpenImageIO pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" license=('custom') depends=('openexr' 'boost-libs' 'jasper' 'glew') makedepends=('cmake' 'qt' 'python2' 'boost') -optdepends=('qt: iv image viewer' 'python2: bindings support') -options=(!buildflags) +optdepends=('qt: iv image viewer' + 'python2: bindings support') source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}") md5sums=('5b74d7bda23f4b0e33c5104fd8dbdf79') build() { - cd "$srcdir"/$_pkg* + cd "$srcdir"/$_pkgname*/src - # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204 - [[ $CARCH == "i686" ]] && make debug || make + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make } package() { - cd "$srcdir"/$_pkg*/dist/* + cd "$srcdir"/$_pkgname*/src/build - # prepare dirs - install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages} + make DESTDIR=$pkgdir install - # bin - cp -r bin include lib "$pkgdir/usr" + mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7 - # docs - cp -r doc/* "$pkgdir/usr/share/doc/$_pkg" - - # python module - cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages" - - pwd - cd ../.. # license - pwd + cd ../.. install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD index cc1e07c26..6a80d70cb 100755 --- a/community/pigz/PKGBUILD +++ b/community/pigz/PKGBUILD @@ -1,9 +1,10 @@ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 68038 2012-03-17 08:29:09Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Laszlo Papp <djszapi2@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pigz -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=1 pkgdesc="Parallel implementation of the gzip file compressor" arch=('i686' 'x86_64') @@ -11,11 +12,10 @@ url="http://www.zlib.net/pigz/" license=('custom') depends=('zlib') source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('8330a6c6a3e5f1954687aaba4b973a6f') +md5sums=('9df2a3c742524446fa4e797c17e8fd85') build() { cd "${srcdir}/$pkgname-$pkgver" - #sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile make } diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index a062110dc..0d96246c0 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66402 2012-02-24 13:09:02Z seblu $ +# $Id: PKGBUILD 68068 2012-03-17 16:12:56Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') pkgver=0.4.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') @@ -13,16 +13,11 @@ source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") sha1sums=('2705862e00280a7fa76cfb687dbd61623d5e236e') build() { - 'cp' -a psutil-$pkgver psutil2-$pkgver - # build python cd psutil-$pkgver - python setup.py build - - cd ../psutil2-$pkgver - # change python interpreter - find -name '*.py' -exec \ - sed -i '1s,^#!/usr/bin/env python$,#!/usr/bin/python2,' {} \; -print - python2 setup.py build + python setup.py build --build-lib=build/python + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; } package_python-psutil() { @@ -30,16 +25,18 @@ package_python-psutil() { depends=('glibc' 'python') cd psutil-$pkgver - python setup.py install --root="$pkgdir" + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE } package_python2-psutil() { - pkgdesc='A cross-platform process and system utilities module for Python 2' + pkgdesc='A cross-platform process and system utilities module for Python2' depends=('glibc' 'python2') - cd psutil2-$pkgver - python2 setup.py install --root="$pkgdir" + cd psutil-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE } diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 9c87260ae..d405bb53b 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 57415 2011-10-27 10:22:06Z lcarlier $ +# $Id: PKGBUILD 68048 2012-03-17 13:06:01Z giovanni $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=quassel pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') url="http://quassel-irc.org/" license=('GPL') -depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme') +depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') -install=$pkgname.install +install=quassel.install backup=(etc/conf.d/quassel) -source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2 - rc.$pkgname - $pkgname.conf) +source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2" + 'rc.quassel' + 'quassel.conf') sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d' '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD index ec287ab3b..50397c44e 100644 --- a/community/quesoglc/PKGBUILD +++ b/community/quesoglc/PKGBUILD @@ -1,28 +1,29 @@ +# $Id: PKGBUILD 68088 2012-03-17 19:29:26Z giovanni $ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Markus Pargmann pkgname=quesoglc pkgver=0.7.2 -pkgrel=1 -pkgdesc='The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API).' +pkgrel=2 +pkgdesc="A free implementation of the OpenGL Character Renderer (GLC)" arch=('i686' 'x86_64' 'mips64el') -url='http://quesoglc.sourceforge.net/' -license=('GPL') -depends=('freetype2' 'fontconfig' 'freeglut' 'fribidi' 'mesa') +url="http://quesoglc.sourceforge.net/" +license=('LGPL2.1') +depends=('fontconfig' 'freeglut' 'fribidi' 'glew') +makedepends=('pkg-config') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('c2697a92e2cc00c537626020e4108a4e') build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { - cd ${pkgname}-${pkgver} + cd "${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/shell-fm/PKGBUILD b/community/shell-fm/PKGBUILD index 2336657b7..20ee6c60a 100644 --- a/community/shell-fm/PKGBUILD +++ b/community/shell-fm/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 15370 2010-04-10 21:42:26Z andrea $ +# $Id: PKGBUILD 68046 2012-03-17 12:04:37Z giovanni $ # Maintainer: Daenyth # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Jeff Mickey <jeff@archlinux.org> pkgname=shell-fm -pkgver=0.7 -pkgrel=3 +pkgver=0.8 +pkgrel=1 pkgdesc="A console based player for the streams provided by Last.FM" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/jkramer/$pkgname" license=('GPL') depends=('libmad' 'libao' 'taglib') -source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver - as-needed.diff::http://bugs.gentoo.org/attachment.cgi?id=205574) -md5sums=('3f83866622a892ee89685f1ed079eefd' - 'e49d91e2ee7145d8cfce8d43d0ef37c6') +source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver) +md5sums=('ce5c45ead71a299edbff280d4007ad99') build() { cd "$srcdir"/jkramer-$pkgname-* - patch -Np1 < "$srcdir/as-needed.diff" || return 1 + make +} + +package() { + cd "$srcdir"/jkramer-$pkgname-* - make || return 1 make DESTDIR="$pkgdir" install cd "$pkgdir/usr" diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD index cf1bf70a9..1443ae019 100644 --- a/community/shfs-utils/PKGBUILD +++ b/community/shfs-utils/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 24961 2010-08-29 19:56:51Z jlichtblau $ +# $Id: PKGBUILD 68044 2012-03-17 11:53:37Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=shfs-utils pkgver=0.35 -pkgrel=3 +pkgrel=4 pkgdesc="SHell FileSystem Linux utils" url="http://shfs.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc' 'openssh') makedepends=('patch') -source=(http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz \ - $pkgname-make.patch) +source=("http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz" + 'shfs-utils-make.patch') md5sums=('016f49d71bc32eee2b5d11fc1600cfbe' '49fb94b139bc69927815127f0bf85159') build() { - cd ${srcdir}/shfs-$pkgver + cd "${srcdir}/shfs-${pkgver}" - patch -Np0 -i ${srcdir}/$pkgname-make.patch - make utils + patch -Np0 -i "${srcdir}/$pkgname-make.patch" + make -j1 utils } package() { - cd ${srcdir}/shfs-$pkgver + cd "${srcdir}/shfs-${pkgver}" - make ROOT=${pkgdir} utils-install + make -j1 ROOT="${pkgdir}" utils-install } diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD index 5560361cd..5bafbb940 100644 --- a/community/trickle/PKGBUILD +++ b/community/trickle/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 39246 2011-02-07 19:18:47Z tdziedzic $ +# $Id: PKGBUILD 68040 2012-03-17 11:08:43Z giovanni $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor Romain Bouchaud-Leduc <r0m1.bl@camaris.org> pkgname=trickle pkgver=1.07 -pkgrel=5 -pkgdesc="Trickle - lightweight userspace bandwidth shaper" +pkgrel=6 +pkgdesc="Lightweight userspace bandwidth shaper" arch=('i686' 'x86_64' 'mips64el') url="http://monkey.org/~marius/trickle" license=('BSD') -depends=("libevent") -source=("http://monkey.org/~marius/trickle/$pkgname-$pkgver.tar.gz") +depends=('libevent') +source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz") md5sums=('860ebc4abbbd82957c20a28bd9390d7d') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - sed -i "s|.*in_addr_t.*||g" config.h - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + sed -i "s|.*in_addr_t.*||g" config.h + make -j1 +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index cea0f3650..0c25492a4 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 65011 2012-02-20 01:39:51Z spupykin $ +# $Id: PKGBUILD 68086 2012-03-17 18:57:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: sracker <smb.sac@gmail.com> pkgname=xdebug -pkgver=2.1.3 -pkgrel=2 +pkgver=2.1.4 +pkgrel=1 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64' 'mips64el') url="http://www.xdebug.org" @@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz xdebug-5.2.ini xdebug.ini) -md5sums=('779f4a66acdccd673553769e403674c4' +md5sums=('0a1339ad8053eface15ed6420a295939' '6b7fdbbe0bf381bda40e77e29981f439' '68de800943369d4c76bdf7eb35c8463b') diff --git a/cross/README b/cross/README index 004f01114..a77b1eb5c 100644 --- a/cross/README +++ b/cross/README @@ -7,6 +7,7 @@ * cross-$target-gcc-core-shared * $target-glibc * $target-gcc +* $target-glibc with BOOTSTRAPING=false cross-* packages are used to bootstrap the full toolchain for the first time, you'll only need binutils, linux-api-headers, glibc and gcc once you're done. diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index dd59ca350..83e598af8 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138318 2011-09-20 04:51:36Z eric $ +# $Id: PKGBUILD 153691 2012-03-18 02:01:54Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=fetchmail pkgver=6.3.21 -pkgrel=2 +pkgrel=3 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64' 'mips64el') url="http://fetchmail.berlios.de/" @@ -15,12 +15,10 @@ optdepends=('tk: for using fetchmailconf' backup=('etc/conf.d/fetchmail') options=('!makeflags') install=fetchmail.install -source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz{,.asc} fetchmail.rc fetchmail.conf) -md5sums=('0ad8eac47e85bd0ae63870daa09992af' - '89fdde15bf81b3a5c065949322b5d138' - '8fcd6a22dfbc247755fdd050c5c5c4d3') -sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7' +sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81' + 'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059' '910ec21ad0a619db67e4665189dc46d2a0634ea5' '30401729386d6f774c6c36ab8530842166de54a8') @@ -36,5 +34,5 @@ package() { make DESTDIR="${pkgdir}" install install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" - install -d "${pkgdir}/var/lib/fetchmail" + install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail" } diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index af4269387..f3061e903 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149381 2012-02-07 10:39:41Z ibiru $ +# $Id: PKGBUILD 153659 2012-03-17 13:50:07Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20120127 -pkgrel=3 +pkgver=20120317 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" @@ -17,11 +17,11 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends+=('yasm' 'libvdpau') fi #git clone git://git.videolan.org/ffmpeg.git -source=(http://mirrors.kernel.org/archlinux/other/ffmpeg/$pkgname-$pkgver.tar.xz) -md5sums=('dc706cdb31801b4746f37459b0c38b7e') +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('2a2ef83ae73713fcef6bba8c430665ce') build() { - cd "$srcdir/$pkgname" + cd "$pkgname" if [ "$CARCH" = "mips64el" ] ; then # Make video decoding faster and turn all pixels green. @@ -63,7 +63,7 @@ build() { } package() { - cd "$srcdir/$pkgname" + cd "$pkgname" make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 1ebf9c606..4471ea949 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151785 2012-03-02 19:31:37Z andyrtr $ +# $Id: PKGBUILD 153658 2012-03-17 12:17:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.15 +pkgver=3.0.17 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11') makedepends=('strace') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('37bdac12b5c039c7a8738b5d85eda968' - '594eb29cbc3147dc0b6b529ebe96bd33') +md5sums=('5e87bd73a237749e2acbbb7161f11d5e' + '28138f27cdc9e735b73955080c46c876') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 562f0be64..4f9e86de4 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152962 2012-03-10 20:34:51Z giovanni $ +# $Id: PKGBUILD 153667 2012-03-17 17:53:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode pkgver=0.12 -pkgrel=1 +pkgrel=2 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://www.ode.org" @@ -18,7 +18,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --enable-shared + --enable-shared \ + --enable-libccd make } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index b09ab358f..7bbf86fbb 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125249 2011-05-25 19:15:53Z foutrelis $ +# $Id: PKGBUILD 153674 2012-03-17 19:39:43Z eric $ # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite -pkgver=1.31 -pkgrel=2 +pkgver=1.35 +pkgrel=1 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" @@ -13,12 +13,16 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.61' 'sqlite3') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('67b3575104efd606c8093bc416e3338d') +md5sums=('d9752e4a26fa54e74aa893dafd02ceda') build() { cd "${srcdir}/${_cpanname}-${pkgver}" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_cpanname}-${pkgver}" make test } diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index 71111f93a..cf75937e5 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 124915 2011-05-25 07:47:08Z foutrelis $ +# $Id: PKGBUILD 153672 2012-03-17 19:13:48Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> pkgname=perl-dbi _realname=DBI -pkgver=1.616 -pkgrel=2 +pkgver=1.618 +pkgrel=1 pkgdesc="Database independent interface for Perl" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.12.1') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('799313e54a693beb635b47918458f7c4') +md5sums=('5ad29b56f7457f22bd1ca1c871b30719') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -21,6 +21,10 @@ build() { # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 6d43f820d..01d090454 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 125261 2011-05-25 19:17:47Z foutrelis $ +# $Id: PKGBUILD 153676 2012-03-17 19:52:14Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.68 -pkgrel=2 +pkgver=3.69 +pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') @@ -14,13 +14,17 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl-html-tagset' 'perl>=5.12.1') options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') +md5sums=('d22cc6468ce670a56034be907e4e7c54') build() { cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index b676b2524..9971ae8ea 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 125273 2011-05-25 19:19:34Z foutrelis $ +# $Id: PKGBUILD 153680 2012-03-17 20:08:26Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS -pkgver=0.66 -pkgrel=4 +pkgver=0.68 +pkgrel=1 pkgdesc="Perl Module: Interface to the DNS resolver." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) -options=(!emptydirs) +md5sums=('05c0f6955747758bb5c9578d9bc6c3a5') build() { - cd $srcdir/${_realname}-${pkgver} + cd "$srcdir/${_realname}-${pkgver}" # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } +check() { + cd "$srcdir/${_realname}-${pkgver}" + make test +} + package() { - cd $srcdir/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} + cd "$srcdir/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh -md5sums=('1635d876324e3c2f6e277d5778bfe94c') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index e772c2bbb..c5637f9e0 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,37 +1,41 @@ -# $Id: PKGBUILD 125297 2011-05-25 19:24:39Z foutrelis $ +# $Id: PKGBUILD 153683 2012-03-17 20:26:21Z eric $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.17 -pkgrel=2 +pkgver=1.20 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AV/AVAR/${_realname}-$pkgver.tar.gz) -md5sums=('f788529ad4b2c2fd037ccdfd5e7a88ab') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) +md5sums=('8f6d04ee5817b8479e1234264a8d458d') build() { - cd ${srcdir}/${_realname}-$pkgver + cd "${srcdir}/${_realname}-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-$pkgver" make test } package() { - cd ${srcdir}/${_realname}-$pkgver - make install DESTDIR=${pkgdir} + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete # license. - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index b1d9e01d6..02febf216 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $ +# $Id: PKGBUILD 153653 2012-03-17 10:02:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" license=('custom') -depends=('glibc' 'sis-dri') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.0') +depends=('libdrm') +makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto' 'xf86driproto' 'glproto') +conflicts=('xorg-server<1.12.0') options=('!libtool') source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2 xf86-video-sis-0.9.1-20102701.patch @@ -28,6 +28,12 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch 0005-Correct-bounds-check-of-blitClip-array-access.patch xserver19.patch + xserver112.patch + pciTag-removal-workaround.patch + Untangle-XF86DRI.patch + swap-func-rename.patch + xf86MapDomainMemory-pci_device_map_legacy.patch + sync-with-freedesktop.patch fix-xv-crash.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' @@ -46,6 +52,12 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '5e288526bfa2c534f1feabdb571da16da8a1c7a6' 'e86d702cb0b5e9bf43ff732696229965e176db7c' 'b5f260bed7e705808ec05620316e503ed5d52ee5' + 'ca25df590590284161cd68440fc4f0cfeb8618b2' + 'ce60625b915e8bd82a6ab2c78e52eb589f27a083' + '963ef59ecd0ca478434623efb68fce9ee832501d' + '5f686c54383c6677b043c6ca0b565b023c1907f9' + '4ea8d76b3e74172109e7013a2931e571d3a2f4e1' + '1d29504466840d2fbe1fc355d78666c1a9cd9b76' '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') @@ -66,6 +78,12 @@ build() { patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" patch -Np1 -i "${srcdir}/xserver19.patch" + patch -Np1 -i "${srcdir}/xserver112.patch" + patch -Np1 -i "${srcdir}/pciTag-removal-workaround.patch" + patch -Np1 -i "${srcdir}/Untangle-XF86DRI.patch" + patch -Np1 -i "${srcdir}/swap-func-rename.patch" + patch -Np1 -i "${srcdir}/xf86MapDomainMemory-pci_device_map_legacy.patch" + patch -Np1 -i "${srcdir}/sync-with-freedesktop.patch" patch -Np0 -i "${srcdir}/fix-xv-crash.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am @@ -74,7 +92,7 @@ build() { autoreconf -fi - ./configure --prefix=/usr --enable-dri + ./configure --prefix=/usr --disable-dri make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch b/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch new file mode 100644 index 000000000..55b9c9deb --- /dev/null +++ b/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch @@ -0,0 +1,186 @@ +diff -aur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac +--- xf86-video-sis-0.9.1.pristine/configure.ac 2012-03-17 04:52:35.410417514 +1100 ++++ xf86-video-sis-0.9.1.new/configure.ac 2012-03-17 04:55:05.949412228 +1100 +@@ -97,8 +97,8 @@ + AM_CONDITIONAL(DRI, test x$DRI = xyes) + if test "$DRI" = yes; then + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) +- AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) +- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) ++ AC_DEFINE(SISDRI,1,[Enable DRI driver support]) ++ AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support]) + fi + + # technically this should be a configure flag. meh. +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c +--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c 2012-03-17 04:52:35.380417061 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_driver.c 2012-03-17 04:57:54.118679619 +1100 +@@ -115,7 +115,7 @@ + #endif + + +-#ifdef XF86DRI ++#ifdef SISDRI + #include "dri.h" + #endif + +@@ -5779,7 +5779,7 @@ + } + + /* Load the dri and glx modules if requested. */ +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->loadDRI) { + if(!xf86LoaderCheckSymbol("DRIScreenInit")) { + if(xf86LoadSubModule(pScrn, "dri")) { +@@ -9469,7 +9469,7 @@ + + pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */ + +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->loadDRI) { + #ifdef SISDUALHEAD + /* No DRI in dual head mode */ +@@ -9802,7 +9802,7 @@ + #endif + + /* Finish DRI initialisation */ +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->loadDRI) { + if(pSiS->directRenderingEnabled) { + /* Now that mi, drm and others have done their thing, +@@ -10359,7 +10359,7 @@ + } + /* Mark for 3D full-screen bug */ + /* +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->directRenderingEnabled) { + DRILock(screenInfo.screens[scrnIndex], DRM_LOCK_QUIESCENT); + } +@@ -10388,7 +10388,7 @@ + #endif + /* Mark for 3D full-screen bug */ + /* +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->directRenderingEnabled) { + DRIUnlock(screenInfo.screens[scrnIndex]); + } +@@ -10601,7 +10601,7 @@ + + /* Mark for 3D full-screen bug */ + /* +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->directRenderingEnabled) { + DRIUnlock(screenInfo.screens[scrnIndex]); + } +@@ -10629,7 +10629,7 @@ + { + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SISPtr pSiS = SISPTR(pScrn); +-#ifdef XF86DRI ++#ifdef SISDRI + ScreenPtr pScreen; + + if(pSiS->directRenderingEnabled) { +@@ -10715,7 +10715,7 @@ + SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex); + } + +-#ifdef XF86DRI ++#ifdef SISDRI + if(pSiS->directRenderingEnabled) { + SISDRICloseScreen(pScreen); + pSiS->directRenderingEnabled = FALSE; +diff -aur xf86-video-sis-0.9.1.pristine/src/sis.h xf86-video-sis-0.9.1.new/src/sis.h +--- xf86-video-sis-0.9.1.pristine/src/sis.h 2012-03-17 04:52:35.357083354 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis.h 2012-03-17 04:56:36.814150836 +1100 +@@ -215,7 +215,13 @@ + + #undef SISHAVEDRMWRITE + #undef SISNEWDRI +-#ifdef XF86DRI ++ ++/* if the server was built without DRI support, force-disable DRI */ ++#ifndef XF86DRI ++#undef SISDRI ++#endif ++ ++#ifdef SISDRI + #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0) + #define SISHAVEDRMWRITE + #endif +@@ -229,7 +235,7 @@ + #include "dri.h" + #include "GL/glxint.h" + #include "sis_dri.h" +-#endif /* XF86DRI */ ++#endif /* SISDRI */ + + #include "sis_config.h" + +@@ -884,7 +890,7 @@ + ScrnInfoPtr pScrn_2; + UChar *BIOS; + struct SiS_Private *SiS_Pr; +-#ifdef XF86DRI ++#ifdef SISDRI + SISAGPHTYPE agpHandle; + ULong agpAddr; + UChar *agpBase; +@@ -1291,7 +1297,7 @@ + unsigned int cmdQueueSize_div2; + unsigned int cmdQueueSize_div4; + unsigned int cmdQueueSize_4_3; +-#ifdef XF86DRI ++#ifdef SISDRI + SISAGPHTYPE agpHandle; + ULong agpAddr; + UChar *agpBase; +@@ -1351,7 +1357,7 @@ + /* DRI */ + Bool loadDRI; + Bool DRIEnabled; +-#ifdef XF86DRI ++#ifdef SISDRI + Bool directRenderingEnabled; + DRIInfoPtr pDRIInfo; + int drmSubFD; +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_hwmc.c xf86-video-sis-0.9.1.new/src/sis_hwmc.c +--- xf86-video-sis-0.9.1.pristine/src/sis_hwmc.c 2012-03-17 04:52:35.330416274 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_hwmc.c 2012-03-17 05:22:17.014636372 +1100 +@@ -53,7 +53,9 @@ + #include "regionstr.h" + + #include "sis.h" ++#ifdef SISDRI + #include "sis_dri.h" ++#endif + + #include "xf86xv.h" + #include "xf86xvmc.h" +diff -aur xf86-video-sis-0.9.1/src/sis_opt.c xf86-video-sis-0.9.1.new/src/sis_opt.c +--- xf86-video-sis-0.9.1/src/sis_opt.c 2012-03-17 07:36:12.285566154 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_opt.c 2012-03-17 07:34:59.451106475 +1100 +@@ -494,7 +494,7 @@ + pSiS->ShadowFB = FALSE; + pSiS->loadDRI = FALSE; + pSiS->DRIEnabled = FALSE; +-#ifdef XF86DRI ++#ifdef SISDRI + pSiS->agpWantedPages = AGP_PAGES; + #endif + pSiS->VESA = -1; +@@ -2160,7 +2160,7 @@ + } + + +-#ifdef XF86DRI ++#ifdef SISDRI + /* DRI */ + from = X_DEFAULT; + if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) { diff --git a/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch b/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch new file mode 100644 index 000000000..b41f3c71b --- /dev/null +++ b/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch @@ -0,0 +1,39 @@ +diff -aur xf86-video-sis-0.9.1.pristine/src/sispcirename.h xf86-video-sis-0.9.1.new/src/sispcirename.h +--- xf86-video-sis-0.9.1.pristine/src/sispcirename.h 2012-03-17 04:45:58.280942665 +1100 ++++ xf86-video-sis-0.9.1.new/src/sispcirename.h 2012-03-17 04:48:28.539933065 +1100 +@@ -29,11 +29,35 @@ + #ifndef SISPCIRENAME_H + #define SISPCIRENAME_H + ++#include <stdint.h> ++ + enum region_type { + REGION_MEM, + REGION_IO + }; + ++#if (defined(__alpha__) || defined(__ia64__)) && defined (linux) ++#define PCI_DOM_MASK 0x01fful ++#else ++#define PCI_DOM_MASK 0x0ffu ++#endif ++ ++#ifndef PCI_DOM_MASK ++# define PCI_DOM_MASK 0x0ffu ++#endif ++#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu) ++ ++static inline uint32_t ++pciTag(int busnum, int devnum, int funcnum) ++{ ++ uint32_t tag; ++ tag = (busnum & (PCI_DOMBUS_MASK)) << 16; ++ tag |= (devnum & 0x00001fu) << 11; ++ tag |= (funcnum & 0x000007u) << 8; ++ ++ return tag; ++} ++ + #ifndef XSERVER_LIBPCIACCESS + + /* pciVideoPtr */ diff --git a/extra/xf86-video-sisimedia/swap-func-rename.patch b/extra/xf86-video-sisimedia/swap-func-rename.patch new file mode 100644 index 000000000..e22b38896 --- /dev/null +++ b/extra/xf86-video-sisimedia/swap-func-rename.patch @@ -0,0 +1,256 @@ +diff -aur xf86-video-sis-0.9.1.pristine/src/sis.h xf86-video-sis-0.9.1.new/src/sis.h +--- xf86-video-sis-0.9.1.pristine/src/sis.h 2012-03-17 05:32:39.414261430 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis.h 2012-03-17 05:28:34.100467696 +1100 +@@ -35,6 +35,10 @@ + #ifndef _SIS_H_ + #define _SIS_H_ + ++// XXX!!! ++#define _swapl(x, n) swapl(x) ++#define _swaps(x, n) swaps(x) ++ + #define SISDRIVERVERSIONYEAR 6 + #define SISDRIVERVERSIONMONTH 10 + #define SISDRIVERVERSIONDAY 17 +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_mergedfb.c xf86-video-sis-0.9.1.new/src/sis_mergedfb.c +--- xf86-video-sis-0.9.1.pristine/src/sis_mergedfb.c 2012-03-17 05:42:19.423231119 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_mergedfb.c 2012-03-17 06:01:18.070840068 +1100 +@@ -2472,10 +2472,10 @@ + rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION; + rep.minorVersion = SIS_XINERAMA_MINOR_VERSION; + if(client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swaps(&rep.majorVersion, n); +- swaps(&rep.minorVersion, n); ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swaps(&rep.majorVersion, n); ++ _swaps(&rep.minorVersion, n); + } + WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep); + return (client->noClientException); +@@ -2498,9 +2498,9 @@ + rep.sequenceNumber = client->sequence; + rep.state = !SiSnoPanoramiXExtension; + if(client->swapped) { +- swaps (&rep.sequenceNumber, n); +- swapl (&rep.length, n); +- swaps (&rep.state, n); ++ _swaps (&rep.sequenceNumber, n); ++ _swapl (&rep.length, n); ++ //_swaps (&rep.state, n); // XXX??? + } + WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep); + return client->noClientException; +@@ -2523,9 +2523,9 @@ + rep.sequenceNumber = client->sequence; + rep.ScreenCount = SiSXineramaNumScreens; + if(client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swaps(&rep.ScreenCount, n); ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ //_swaps(&rep.ScreenCount, n); // XXX??? + } + WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep); + return client->noClientException; +@@ -2549,10 +2549,10 @@ + rep.width = SiSXineramadataPtr[stuff->screen].width; + rep.height = SiSXineramadataPtr[stuff->screen].height; + if(client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swaps(&rep.width, n); +- swaps(&rep.height, n); ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swapl(&rep.width, n); ++ _swapl(&rep.height, n); + } + WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep); + return client->noClientException; +@@ -2571,9 +2571,9 @@ + rep.state = !SiSnoPanoramiXExtension; + if(client->swapped) { + register int n; +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swapl(&rep.state, n); ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swapl(&rep.state, n); + } + WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep); + return client->noClientException; +@@ -2592,9 +2592,9 @@ + rep.length = rep.number * sz_XineramaScreenInfo >> 2; + if(client->swapped) { + register int n; +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swapl(&rep.number, n); ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swapl(&rep.number, n); + } + WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep); + +@@ -2609,10 +2609,10 @@ + scratch.height = SiSXineramadataPtr[i].height; + if(client->swapped) { + register int n; +- swaps(&scratch.x_org, n); +- swaps(&scratch.y_org, n); +- swaps(&scratch.width, n); +- swaps(&scratch.height, n); ++ _swaps(&scratch.x_org, n); ++ _swaps(&scratch.y_org, n); ++ _swaps(&scratch.width, n); ++ _swaps(&scratch.height, n); + } + WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch); + } +@@ -2763,7 +2763,7 @@ + { + REQUEST(xPanoramiXQueryVersionReq); + register int n; +- swaps(&stuff->length,n); ++ _swaps(&stuff->length,n); + REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); + return SiSProcXineramaQueryVersion(client); + } +@@ -2773,7 +2773,7 @@ + { + REQUEST(xPanoramiXGetStateReq); + register int n; +- swaps (&stuff->length, n); ++ _swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); + return SiSProcXineramaGetState(client); + } +@@ -2783,7 +2783,7 @@ + { + REQUEST(xPanoramiXGetScreenCountReq); + register int n; +- swaps (&stuff->length, n); ++ _swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); + return SiSProcXineramaGetScreenCount(client); + } +@@ -2793,7 +2793,7 @@ + { + REQUEST(xPanoramiXGetScreenSizeReq); + register int n; +- swaps (&stuff->length, n); ++ _swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); + return SiSProcXineramaGetScreenSize(client); + } +@@ -2803,7 +2803,7 @@ + { + REQUEST(xXineramaIsActiveReq); + register int n; +- swaps (&stuff->length, n); ++ _swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xXineramaIsActiveReq); + return SiSProcXineramaIsActive(client); + } +@@ -2813,7 +2813,7 @@ + { + REQUEST(xXineramaQueryScreensReq); + register int n; +- swaps (&stuff->length, n); ++ _swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); + return SiSProcXineramaQueryScreens(client); + } +@@ -2823,8 +2823,8 @@ + { + REQUEST(xXineramaSelectInputReq); + register int n; +- swaps(&stuff->length, n); +- swapl(&stuff->window, n); ++ _swaps(&stuff->length, n); ++ _swapl(&stuff->window, n); + return SiSProcXineramaSelectInput(client); + } + +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_utility.c xf86-video-sis-0.9.1.new/src/sis_utility.c +--- xf86-video-sis-0.9.1.pristine/src/sis_utility.c 2012-03-17 07:34:54.727700088 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_utility.c 2012-03-17 08:06:48.570630477 +1100 +@@ -2059,11 +2059,11 @@ + rep.sequenceNumber = client->sequence; + rep.majorVersion = SISCTRL_MAJOR_VERSION; + rep.minorVersion = SISCTRL_MINOR_VERSION; +- if(client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swaps(&rep.majorVersion, n); +- swaps(&rep.minorVersion, n); ++ if(client->swapped) { ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swaps(&rep.majorVersion, n); ++ _swaps(&rep.minorVersion, n); + } + WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep); + return (client->noClientException); +@@ -2103,16 +2103,16 @@ + rep.length = (sizeof(xSiSCtrlCommandReply) - sizeof(xGenericReply)) >> 2; + rep.sequenceNumber = client->sequence; + +- if(client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swapl(&rep.screen, n); +- swapl(&rep.sdc_id, n); +- swapl(&rep.sdc_command, n); +- swapl(&rep.sdc_result_header, n); ++ if(client->swapped) { ++ _swaps(&rep.sequenceNumber, n); ++ _swapl(&rep.length, n); ++ _swapl(&rep.screen, n); ++ _swapl(&rep.sdc_id, n); ++ _swapl(&rep.sdc_command, n); ++ _swapl(&rep.sdc_result_header, n); + for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { +- swapl(&rep.sdc_parm[i], n); +- swapl(&rep.sdc_result[i], n); ++ _swapl(&rep.sdc_parm[i], n); ++ _swapl(&rep.sdc_result[i], n); + } + } + WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep); +@@ -2139,7 +2139,7 @@ + { + REQUEST(xSiSCtrlQueryVersionReq); + register int n; +- swaps(&stuff->length, n); ++ _swaps(&stuff->length, n); + REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); + return SiSProcSiSCtrlQueryVersion(client); + } +@@ -2150,14 +2150,14 @@ + REQUEST(xSiSCtrlCommandReq); + register int n; + int i; +- swaps(&stuff->length, n); +- swapl(&stuff->screen, n); +- swapl(&stuff->sdc_id, n); +- swapl(&stuff->sdc_command, n); +- swapl(&stuff->sdc_result_header, n); ++ _swaps(&stuff->length, n); ++ _swapl(&stuff->screen, n); ++ _swapl(&stuff->sdc_id, n); ++ _swapl(&stuff->sdc_command, n); ++ _swapl(&stuff->sdc_result_header, n); + for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { +- swapl(&stuff->sdc_parm[i], n); +- swapl(&stuff->sdc_result[i], n); ++ _swapl(&stuff->sdc_parm[i], n); ++ _swapl(&stuff->sdc_result[i], n); + } + REQUEST_SIZE_MATCH(xSiSCtrlCommandReq); + return SiSProcSiSCtrlCommand(client); diff --git a/extra/xf86-video-sisimedia/sync-with-freedesktop.patch b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch new file mode 100644 index 000000000..eb15814ff --- /dev/null +++ b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch @@ -0,0 +1,63 @@ +diff -daur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac +--- xf86-video-sis-0.9.1.pristine/configure.ac 2012-03-17 14:38:50.324387997 +1100 ++++ xf86-video-sis-0.9.1.new/configure.ac 2012-03-17 15:02:13.142748894 +1100 +@@ -21,7 +21,7 @@ + # Process this file with autoconf to produce a configure script + + # Initialize Autoconf +-AC_PREREQ(2.60) ++AC_PREREQ([2.60]) + AC_INIT([xf86-video-sis], + 0.9.1, + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +@@ -31,7 +31,7 @@ + AC_CONFIG_AUX_DIR(.) + + # Initialize Automake +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + + # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +@@ -40,10 +40,9 @@ + XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + +-# Checks for programs. ++# Initialize libtool + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-AC_PROG_CC + XORG_PROG_RAWCPP + + AH_TOP([#include "xorg-server.h"]) +@@ -76,9 +75,6 @@ + + # Checks for libraries. + +-# Checks for header files. +-AC_HEADER_STDC +- + if test "$DRI" != no; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) +@@ -123,8 +119,6 @@ + fi + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +-AC_SUBST([DRI_CFLAGS]) +-AC_SUBST([XORG_CFLAGS]) + AC_SUBST([moduledir]) + + DRIVER_NAME=sis +diff -daur xf86-video-sis-0.9.1.pristine/Makefile.am xf86-video-sis-0.9.1.new/Makefile.am +--- xf86-video-sis-0.9.1.pristine/Makefile.am 2012-03-17 14:38:50.304387685 +1100 ++++ xf86-video-sis-0.9.1.new/Makefile.am 2012-03-17 15:01:44.442304963 +1100 +@@ -18,7 +18,6 @@ + # 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. + +-AUTOMAKE_OPTIONS = foreign + SUBDIRS = src man + + if BUILD_LINUXDOC diff --git a/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch b/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch new file mode 100644 index 000000000..7a39cf2df --- /dev/null +++ b/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch @@ -0,0 +1,205 @@ +diff -aur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac +--- xf86-video-sis-0.9.1.pristine/configure.ac 2012-03-17 08:23:42.346308237 +1100 ++++ xf86-video-sis-0.9.1.new/configure.ac 2012-03-17 08:40:04.821501949 +1100 +@@ -20,20 +20,26 @@ + # + # Process this file with autoconf to produce a configure script + +-AC_PREREQ(2.57) ++# Initialize Autoconf ++AC_PREREQ(2.60) + AC_INIT([xf86-video-sis], + 0.9.1, + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + xf86-video-sis) +- + AC_CONFIG_SRCDIR([Makefile.am]) + AM_CONFIG_HEADER([config.h]) + AC_CONFIG_AUX_DIR(.) + ++# Initialize Automake + AM_INIT_AUTOMAKE([dist-bzip2]) +- + AM_MAINTAINER_MODE + ++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS ++m4_ifndef([XORG_MACROS_VERSION], ++ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) ++XORG_MACROS_VERSION(1.8) ++XORG_DEFAULT_OPTIONS ++ + # Checks for programs. + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +@@ -66,7 +72,7 @@ + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") + AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) +-sdkdir=$(pkg-config --variable=sdkdir xorg-server) ++sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` + + # Checks for libraries. + +@@ -104,6 +110,19 @@ + # technically this should be a configure flag. meh. + AC_DEFINE(XF86EXA, 1, [Build support for Exa]) + ++SAVE_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" ++AC_CHECK_DECL(XSERVER_LIBPCIACCESS, ++ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], ++ [#include "xorg-server.h"]) ++CPPFLAGS="$SAVE_CPPFLAGS" ++ ++if test "x$XSERVER_LIBPCIACCESS" = xyes; then ++ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901]) ++ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" ++fi ++AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) ++ + AC_SUBST([DRI_CFLAGS]) + AC_SUBST([XORG_CFLAGS]) + AC_SUBST([moduledir]) +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_vga.c xf86-video-sis-0.9.1.new/src/sis_vga.c +--- xf86-video-sis-0.9.1.pristine/src/sis_vga.c 2012-03-17 08:23:42.329641291 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_vga.c 2012-03-17 08:28:25.020679715 +1100 +@@ -1740,8 +1740,8 @@ + + #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) + #if XSERVER_LIBPCIACCESS +- pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, +- pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize); ++ (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize, ++ PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase); + #else + pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, + pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize); +@@ -1761,7 +1761,12 @@ + + if(pSiS->VGAMemBase == NULL) return; + ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize); ++#endif ++ + pSiS->VGAMemBase = NULL; + } + #endif +diff -daur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c +--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c 2012-03-17 08:23:42.336308093 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_driver.c 2012-03-17 09:35:33.766316476 +1100 +@@ -6014,7 +6014,11 @@ + if(pSiSEnt->MapCountIOPBase) { + pSiSEnt->MapCountIOPBase--; + if((pSiSEnt->MapCountIOPBase == 0) || (pSiSEnt->forceUnmapIOPBase)) { +- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOPBase, 2048); ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOPBase, 2048); ++#else ++ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOPBase, 2048); ++#endif + pSiSEnt->IOPBase = NULL; + pSiSEnt->MapCountIOPBase = 0; + pSiSEnt->forceUnmapIOPBase = FALSE; +@@ -6023,7 +6027,11 @@ + } + } else { + #endif ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOPBase, 2048); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOPBase, 2048); ++#endif + pSiS->IOPBase = NULL; + #ifdef SISDUALHEAD + } +@@ -6248,7 +6256,11 @@ + if(pSiSEnt->MapCountIOBase) { + pSiSEnt->MapCountIOBase--; + if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBase = NULL; + pSiSEnt->MapCountIOBase = 0; + pSiSEnt->forceUnmapIOBase = FALSE; +@@ -6259,7 +6271,11 @@ + if(pSiSEnt->MapCountIOBaseDense) { + pSiSEnt->MapCountIOBaseDense--; + if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBaseDense = NULL; + pSiSEnt->MapCountIOBaseDense = 0; + pSiSEnt->forceUnmapIOBaseDense = FALSE; +@@ -6270,7 +6286,11 @@ + if(pSiSEnt->MapCountFbBase) { + pSiSEnt->MapCountFbBase--; + if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#endif + pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; + pSiSEnt->MapCountFbBase = 0; + pSiSEnt->forceUnmapFbBase = FALSE; +@@ -6280,13 +6300,25 @@ + } + } else { + #endif ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBase = NULL; + #ifdef __alpha__ ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBaseDense = NULL; + #endif ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#endif + pSiS->FbBase = pSiS->RealFbBase = NULL; + #ifdef SISDUALHEAD + } +@@ -10940,7 +10972,13 @@ + + #ifdef SIS_USE_BIOS_SCRATCH + if(SISPTR(pScrn)->Primary) { ++ ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_map_legacy(SISPTR(pScrn)->PciInfo, 0, 0x2000, 1, &base); // HA HA HA MAGIC NUMBER ++#else + base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000); ++#endif ++ + if(!base) { + SISErrorLog(pScrn, "(Could not map BIOS scratch area)\n"); + return ret; +@@ -10953,7 +10991,11 @@ + *(base + offset) = value; + } + ++#if XSERVER_LIBPCIACCESS ++ (void) pci_device_unmap_legacy(SISPTR(pScrn)->PciInfo, base, 0x2000); ++#else + xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000); ++#endif + } + #endif + return ret; diff --git a/extra/xf86-video-sisimedia/xserver112.patch b/extra/xf86-video-sisimedia/xserver112.patch new file mode 100644 index 000000000..f0dff46b5 --- /dev/null +++ b/extra/xf86-video-sisimedia/xserver112.patch @@ -0,0 +1,12 @@ +diff -aur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c +--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c 2012-03-17 03:06:21.148507957 +1100 ++++ xf86-video-sis-0.9.1.new/src/sis_driver.c 2012-03-17 03:18:57.373535928 +1100 +@@ -3278,7 +3278,7 @@ + pSiS->pInt = NULL; + + /* Save PCI Domain Base */ +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 + pSiS->IODBase = 0; + #else + pSiS->IODBase = pScrn->domainIOBase; diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD index 7b47fcb20..4847b922a 100644 --- a/extra/xfce4-dev-tools/PKGBUILD +++ b/extra/xfce4-dev-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142012 2011-11-04 02:41:52Z eric $ +# $Id: PKGBUILD 153687 2012-03-17 20:59:01Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-dev-tools -pkgver=4.9.0 -pkgrel=1.1 +pkgver=4.9.1 +pkgrel=1 pkgdesc="Xfce developer tools" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -12,7 +12,7 @@ url="http://www.xfce.org/" depends=('gtk-doc' 'automake' 'automake' 'make' 'intltool' 'pkg-config') options=('!libtool') source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('325047a072f5599ec7fda9f970c47091') +sha1sums=('ba309d1286a2be964613e3eb19b08e2aced97bcc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index b5e29fd4c..aaf169d88 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,11 +1,12 @@ # $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ #mips64el Maintainer: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> -# Maintainer: Henry Jensen <hjensen@connochaetos.org> +# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=sdl-libre -pkgver=1.2.14 -pkgrel=7.1 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" @@ -13,32 +14,29 @@ license=('LGPL') provides=("sdl=${pkgver}") conflicts=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa') +makedepends=('alsa-lib' 'mesa' 'libpulse') replaces=('sdl') options=('!libtool') -source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.tar.gz - sdl-1.2.14-joystick-crash.diff +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch + sdl-1.2.14-disable-mmx.patch no-riva-accel.patch) -md5sums=('b8ac7254fe5425a0fb238fb535d3d14c' - '9d8890b3817736a5d365f7497f096634' +md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807' + 'e5c16b7611f62c7cb25f0534eff68852' 'eb2f5899db608ad27b379faa5e0beb80') build() { - cd ${srcdir}/SDL-${pkgver}-libre - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff + cd ${srcdir}/SDL-${pkgver} patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch + patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch patch -Np0 -i $srcdir/no-riva-accel.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath + --with-x --disable-rpath --disable-static make } package() { - cd ${srcdir}/SDL-${pkgver}-libre + cd ${srcdir}/SDL-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, |