From 4eb56e1b3a80c84f2dddf2692310369dc9cbd31a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 14 Oct 2012 00:46:01 -0700 Subject: Sun Oct 14 00:45:38 PDT 2012 --- community-staging/gigi/PKGBUILD | 27 +- community/acpid/PKGBUILD | 6 +- community/acpid/handler.sh | 19 +- community/assimp/PKGBUILD | 14 +- community/astromenace/PKGBUILD | 6 +- community/catalyst-dkms/PKGBUILD | 25 +- community/catalyst-dkms/catalyst.install | 24 +- community/chromium-bsu/PKGBUILD | 6 +- community/compiz/PKGBUILD | 23 +- community/compiz/compiz-gcc-4.7.patch | 38 + community/compiz/compiz-kde-4.8.patch | 18 + community/compiz/compiz-kde-4.9.patch | 196 +++++ community/darktable/PKGBUILD | 11 +- community/desmume/PKGBUILD | 8 +- community/devil/PKGBUILD | 4 +- community/erlang/PKGBUILD | 8 +- community/esdl/PKGBUILD | 4 +- community/extremetuxracer/PKGBUILD | 9 +- community/flightgear/PKGBUILD | 6 +- community/fox/PKGBUILD | 6 +- community/freemat/PKGBUILD | 10 +- community/freewrl/PKGBUILD | 8 +- community/fxdesktop/PKGBUILD | 7 +- community/fxprocessview/PKGBUILD | 5 +- community/gambas2/PKGBUILD | 16 +- community/gambas3/PKGBUILD | 24 +- community/gigi/PKGBUILD | 9 +- community/gl-117/PKGBUILD | 6 +- community/glob2/PKGBUILD | 8 +- community/gmic/PKGBUILD | 4 +- community/gnash/PKGBUILD | 8 +- community/gogglesmm/PKGBUILD | 8 +- community/gource/PKGBUILD | 4 +- community/gpac/PKGBUILD | 8 +- community/grafx2/PKGBUILD | 35 +- community/kdenlive/PKGBUILD | 6 +- community/kicad/PKGBUILD | 8 +- community/luminancehdr/PKGBUILD | 4 +- community/megaglest/PKGBUILD | 6 +- community/nestopia/PKGBUILD | 6 +- community/nodejs/PKGBUILD | 6 +- community/opencolorio/PKGBUILD | 34 + community/openimageio/PKGBUILD | 8 +- community/prboom/PKGBUILD | 7 +- community/pyqt3/PKGBUILD | 5 +- community/qcad/PKGBUILD | 11 +- community/qlandkartegt/PKGBUILD | 20 +- community/rss-glx/PKGBUILD | 6 +- community/scorched3d/PKGBUILD | 31 +- community/smc/PKGBUILD | 4 +- community/stone-soup/PKGBUILD | 4 +- community/tdfsb/PKGBUILD | 10 +- community/teeworlds/PKGBUILD | 16 +- community/tmux/PKGBUILD | 39 +- community/torcs/PKGBUILD | 6 +- community/warzone2100/PKGBUILD | 11 +- community/xbmc/PKGBUILD | 31 +- community/xbmc/xbmc.install | 10 +- community/xlockmore/PKGBUILD | 6 +- community/xmoto/PKGBUILD | 9 +- core/openldap/PKGBUILD | 6 +- core/systemd/PKGBUILD | 5 +- core/sysvinit/PKGBUILD | 5 +- extra/asymptote/PKGBUILD | 10 +- extra/bzflag/PKGBUILD | 10 +- ...ting-jobs-due-to-cabal-1.16.0-bug-shipped.patch | 27 + extra/cabal-install/PKGBUILD | 10 +- extra/calligra/PKGBUILD | 4 +- extra/celestia/PKGBUILD | 13 +- extra/celestia/gcc-4.7-fixes.diff | 10 + extra/cinepaint/PKGBUILD | 4 +- extra/claws-mail/PKGBUILD | 16 +- extra/claws-mail/gnutls313.diff | 12 + extra/cyrus-sasl/PKGBUILD | 15 +- extra/cyrus-sasl/saslauthd.service | 2 +- extra/cyrus-sasl/tmpfiles.conf | 1 + extra/dhcp/PKGBUILD | 8 +- extra/dhcp/dhcpd4.service | 1 - extra/dhcp/dhcpd6.service | 1 - extra/enblend-enfuse/PKGBUILD | 4 +- extra/freeglut/PKGBUILD | 12 +- extra/ftgl/PKGBUILD | 12 +- extra/fyre/PKGBUILD | 4 +- extra/gcin/PKGBUILD | 6 +- extra/gegl/PKGBUILD | 4 +- extra/git/PKGBUILD | 8 +- extra/glew/PKGBUILD | 6 +- extra/glu/PKGBUILD | 32 + extra/gnome-games/PKGBUILD | 6 +- extra/gnutls/PKGBUILD | 8 +- extra/gnutls/gnutls.install | 2 +- extra/gtkglext/PKGBUILD | 7 +- extra/gtkglextmm/PKGBUILD | 6 +- extra/hugin/PKGBUILD | 4 +- extra/imagemagick/PKGBUILD | 4 +- extra/jasper/PKGBUILD | 6 +- extra/kdelibs3/PKGBUILD | 4 +- extra/libmygpo-qt/PKGBUILD | 11 +- extra/libreoffice/PKGBUILD | 8 +- extra/libvisual-plugins/PKGBUILD | 8 +- extra/mesa/PKGBUILD | 309 +++---- extra/mesa/git_fixes.diff | 93 +++ extra/octave/PKGBUILD | 26 +- extra/octave/buildfix.diff | 85 ++ extra/octave/octave-gethelp.patch | 13 + extra/opencv/PKGBUILD | 6 +- extra/perl-netaddr-ip/PKGBUILD | 6 +- extra/python-telepathy/PKGBUILD | 16 +- extra/qt3/PKGBUILD | 8 +- extra/qtiplot/PKGBUILD | 8 +- extra/rsync/PKGBUILD | 6 +- extra/rsync/rsyncd.socket | 1 - extra/smpeg/PKGBUILD | 10 +- extra/stellarium/PKGBUILD | 8 +- extra/swt/PKGBUILD | 8 +- extra/xf86-input-acecad/PKGBUILD | 9 +- extra/xf86-input-aiptek/PKGBUILD | 9 +- extra/xf86-input-elographics/PKGBUILD | 10 +- extra/xf86-input-evdev/PKGBUILD | 8 +- extra/xf86-input-joystick/PKGBUILD | 8 +- extra/xf86-input-keyboard/PKGBUILD | 8 +- extra/xf86-input-mouse/PKGBUILD | 8 +- extra/xf86-input-synaptics/PKGBUILD | 8 +- extra/xf86-input-vmmouse/PKGBUILD | 8 +- extra/xf86-input-void/PKGBUILD | 9 +- extra/xf86-input-wacom/PKGBUILD | 8 +- extra/xf86-video-apm/PKGBUILD | 9 +- extra/xf86-video-ark/PKGBUILD | 8 +- extra/xf86-video-ast/PKGBUILD | 8 +- extra/xf86-video-ati/PKGBUILD | 15 +- extra/xf86-video-chips/PKGBUILD | 9 +- extra/xf86-video-cirrus/PKGBUILD | 8 +- extra/xf86-video-dummy/PKGBUILD | 8 +- extra/xf86-video-fbdev/PKGBUILD | 8 +- extra/xf86-video-glint/PKGBUILD | 8 +- extra/xf86-video-i128/PKGBUILD | 8 +- extra/xf86-video-i740/PKGBUILD | 9 +- extra/xf86-video-intel/PKGBUILD | 11 +- extra/xf86-video-intel/xf86-video-intel.install | 4 +- extra/xf86-video-mach64/PKGBUILD | 14 +- extra/xf86-video-mach64/git_fixes.diff | 107 +++ extra/xf86-video-mga/PKGBUILD | 10 +- extra/xf86-video-neomagic/PKGBUILD | 8 +- extra/xf86-video-nouveau/PKGBUILD | 11 +- extra/xf86-video-openchrome/PKGBUILD | 9 +- extra/xf86-video-r128/PKGBUILD | 8 +- extra/xf86-video-rendition/PKGBUILD | 9 +- extra/xf86-video-s3/PKGBUILD | 9 +- extra/xf86-video-s3virge/PKGBUILD | 9 +- extra/xf86-video-savage/PKGBUILD | 8 +- extra/xf86-video-siliconmotion/PKGBUILD | 8 +- extra/xf86-video-sis/PKGBUILD | 8 +- extra/xf86-video-sisusb/PKGBUILD | 9 +- extra/xf86-video-tdfx/PKGBUILD | 8 +- extra/xf86-video-trident/PKGBUILD | 8 +- extra/xf86-video-tseng/PKGBUILD | 9 +- extra/xf86-video-v4l/PKGBUILD | 8 +- extra/xf86-video-vesa/PKGBUILD | 8 +- extra/xf86-video-vmware/PKGBUILD | 16 +- extra/xf86-video-vmware/git_fixes.diff | 894 +++++++++++++++++++++ extra/xf86-video-voodoo/PKGBUILD | 8 +- extra/xine-lib/PKGBUILD | 8 +- extra/xorg-server/PKGBUILD | 22 +- gnome-unstable/networkmanager/PKGBUILD | 11 +- gnome-unstable/networkmanager/systemd-sleep.patch | 637 +++++++++++++++ libre/kdebase-runtime-libre/PKGBUILD | 2 +- libre/kdelibs-libre/PKGBUILD | 2 +- libre/linux-libre-lts/PKGBUILD | 8 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 12 +- libre/linux-libre/config.i686 | 3 +- libre/linux-libre/config.x86_64 | 3 +- libre/linux-libre/linux-libre.install | 2 +- multilib/lib32-catalyst-utils/PKGBUILD | 34 +- multilib/lib32-glew/PKGBUILD | 6 +- multilib/lib32-glu/PKGBUILD | 45 ++ multilib/lib32-gnutls/PKGBUILD | 8 +- multilib/lib32-mesa/PKGBUILD | 297 +++---- multilib/lib32-mesa/git_fixes.diff | 93 +++ multilib/wine/PKGBUILD | 9 +- multilib/wine_gecko/PKGBUILD | 8 +- staging/dbus-python/PKGBUILD | 66 ++ staging/kdebase-workspace/PKGBUILD | 59 +- staging/kdebase-workspace/kde-np.pam | 19 +- staging/kdebase-workspace/kde.pam | 15 +- staging/kdebase-workspace/kdm.logrotate | 6 + staging/kdebase-workspace/kdm.service | 2 +- staging/kdebase-workspace/logind-support.patch | 66 ++ staging/konversation/PKGBUILD | 11 +- staging/pycrypto/PKGBUILD | 52 ++ staging/pyopenssl/PKGBUILD | 46 ++ staging/python-egenix-mx-base/PKGBUILD | 31 + staging/python-markupsafe/PKGBUILD | 41 + staging/xfce4-session/PKGBUILD | 44 + staging/xfce4-session/xfce4-session.install | 13 + staging/xorg-xdm/PKGBUILD | 60 ++ staging/xorg-xdm/Xsession-loginshell.patch | 15 + staging/xorg-xdm/Xsession-xsm.patch | 22 + staging/xorg-xdm/git_fixes.diff | 673 ++++++++++++++++ .../xdm-1.0.5-sessreg-utmp-fix-bug177890.patch | 8 + staging/xorg-xdm/xdm.pam | 10 + testing/kdebase-workspace/PKGBUILD | 20 +- testing/kdebase-workspace/kde-np.pam | 19 +- testing/kdebase-workspace/kde.pam | 15 +- testing/kdebase-workspace/kdm.logrotate | 6 + testing/nfs-utils/PKGBUILD | 105 +++ testing/nfs-utils/blkmapd.service | 11 + testing/nfs-utils/exports | 15 + testing/nfs-utils/idmapd.conf | 14 + testing/nfs-utils/nfs | 40 + testing/nfs-utils/nfs-common | 315 ++++++++ testing/nfs-utils/nfs-common.conf | 40 + testing/nfs-utils/nfs-server | 299 +++++++ testing/nfs-utils/nfs-server.conf | 29 + testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch | 39 + testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch | 15 + testing/nfs-utils/nfs-utils.conf | 1 + testing/nfs-utils/nfs-utils.install | 32 + testing/nfs-utils/nfsd.service | 16 + testing/nfs-utils/proc-fs-nfsd.mount | 8 + testing/nfs-utils/rpc-gssd.service | 13 + testing/nfs-utils/rpc-idmapd.service | 13 + testing/nfs-utils/rpc-mountd.service | 12 + testing/nfs-utils/rpc-statd.service | 13 + testing/nfs-utils/rpc-svcgssd.service | 12 + testing/nfs-utils/start-statd.patch | 22 + testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount | 7 + testing/postgresql/PKGBUILD | 32 +- testing/postgresql/postgresql-run-socket.patch | 12 + testing/postgresql/postgresql.install | 4 + testing/postgresql/postgresql.service | 1 - testing/postgresql/postgresql.tmpfiles.conf | 1 + testing/ppp/PKGBUILD | 17 +- testing/ppp/ip-down | 2 +- testing/ppp/ipv6-down | 12 + testing/ppp/ipv6-up | 12 + testing/ppp/ipv6-up.d.iface-config.sh | 4 + testing/util-linux/PKGBUILD | 39 +- testing/wpa_supplicant/PKGBUILD | 7 +- testing/wpa_supplicant/config | 14 + 240 files changed, 5865 insertions(+), 1133 deletions(-) create mode 100644 community/compiz/compiz-gcc-4.7.patch create mode 100644 community/compiz/compiz-kde-4.8.patch create mode 100644 community/compiz/compiz-kde-4.9.patch create mode 100644 community/opencolorio/PKGBUILD create mode 100644 extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch create mode 100644 extra/celestia/gcc-4.7-fixes.diff create mode 100644 extra/claws-mail/gnutls313.diff create mode 100644 extra/cyrus-sasl/tmpfiles.conf create mode 100644 extra/glu/PKGBUILD create mode 100644 extra/mesa/git_fixes.diff create mode 100644 extra/octave/buildfix.diff create mode 100644 extra/octave/octave-gethelp.patch create mode 100644 extra/xf86-video-mach64/git_fixes.diff create mode 100644 extra/xf86-video-vmware/git_fixes.diff create mode 100644 gnome-unstable/networkmanager/systemd-sleep.patch create mode 100644 multilib/lib32-glu/PKGBUILD create mode 100644 multilib/lib32-mesa/git_fixes.diff create mode 100644 staging/dbus-python/PKGBUILD create mode 100644 staging/kdebase-workspace/kdm.logrotate create mode 100644 staging/kdebase-workspace/logind-support.patch create mode 100644 staging/pycrypto/PKGBUILD create mode 100644 staging/pyopenssl/PKGBUILD create mode 100644 staging/python-egenix-mx-base/PKGBUILD create mode 100644 staging/python-markupsafe/PKGBUILD create mode 100644 staging/xfce4-session/PKGBUILD create mode 100644 staging/xfce4-session/xfce4-session.install create mode 100644 staging/xorg-xdm/PKGBUILD create mode 100644 staging/xorg-xdm/Xsession-loginshell.patch create mode 100644 staging/xorg-xdm/Xsession-xsm.patch create mode 100644 staging/xorg-xdm/git_fixes.diff create mode 100644 staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch create mode 100644 staging/xorg-xdm/xdm.pam create mode 100644 testing/kdebase-workspace/kdm.logrotate create mode 100644 testing/nfs-utils/PKGBUILD create mode 100644 testing/nfs-utils/blkmapd.service create mode 100644 testing/nfs-utils/exports create mode 100644 testing/nfs-utils/idmapd.conf create mode 100644 testing/nfs-utils/nfs create mode 100644 testing/nfs-utils/nfs-common create mode 100644 testing/nfs-utils/nfs-common.conf create mode 100644 testing/nfs-utils/nfs-server create mode 100644 testing/nfs-utils/nfs-server.conf create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch create mode 100644 testing/nfs-utils/nfs-utils.conf create mode 100644 testing/nfs-utils/nfs-utils.install create mode 100644 testing/nfs-utils/nfsd.service create mode 100644 testing/nfs-utils/proc-fs-nfsd.mount create mode 100644 testing/nfs-utils/rpc-gssd.service create mode 100644 testing/nfs-utils/rpc-idmapd.service create mode 100644 testing/nfs-utils/rpc-mountd.service create mode 100644 testing/nfs-utils/rpc-statd.service create mode 100644 testing/nfs-utils/rpc-svcgssd.service create mode 100644 testing/nfs-utils/start-statd.patch create mode 100644 testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount create mode 100644 testing/postgresql/postgresql-run-socket.patch create mode 100644 testing/postgresql/postgresql.tmpfiles.conf create mode 100644 testing/ppp/ipv6-down create mode 100644 testing/ppp/ipv6-up create mode 100644 testing/ppp/ipv6-up.d.iface-config.sh diff --git a/community-staging/gigi/PKGBUILD b/community-staging/gigi/PKGBUILD index 3a7c2321d..66e4f6b09 100644 --- a/community-staging/gigi/PKGBUILD +++ b/community-staging/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73559 2012-07-09 20:29:24Z arodseth $ +# $Id: PKGBUILD 77673 2012-10-13 12:05:23Z lcarlier $ # Maintainer: Alexander Rødseth # Contributor: Sven-Hendrik Haase # Contributor: fana-m @@ -7,15 +7,14 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=11 -_fixedrevision=1074 -pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL" +pkgrel=14 +_fixedrevision=5208 +pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" arch=('x86_64' 'i686') license=('LGPL') -depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen') -conflicts=('gigi-svn' 'mesa-full') +depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') build() { cd "$srcdir" @@ -24,7 +23,8 @@ build() { if [ -d gigi/.svn ]; then (cd gigi && svn up -r "$_fixedrevision") else - svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ + #svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ + svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \ --config-dir ./ -r "$_fixedrevision" gigi fi @@ -32,12 +32,6 @@ build() { svn export gigi gigi-build cd gigi-build - msg2 "Patching..." - sed -i 's/move_backward(/adobe::move_backward(/g' GG/adobe/vector.hpp - sed -i 's/__GNUC_MINOR__ <= 6/__GNUC_MINOR__ <= 999/g' GG/adobe/cmath.hpp - sed -i 's/insert(adobe/this->insert(adobe/g' GG/adobe/closed_hash.hpp - sed -i 's:TIME_UTC:TIME_UTC_:' src/GUI.cpp - msg2 "Configuring..." setconf cmake/GiGiOgre.pc.in prefix /usr setconf cmake/GiGi.pc.in prefix /usr @@ -72,6 +66,11 @@ package() { sed -i "s:$srcdir:/:g" "$f" done + msg2 "Fixing python3 shebang..." + for f in `find "$pkgdir/usr" -name "*.py"`; do + sed -i "s:/env python:/python3:g" "$f" + done + msg2 "Packaging license..." install -Dm 644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 4431fcecf..f08eee579 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76355 2012-09-16 14:46:11Z seblu $ +# $Id: PKGBUILD 77739 2012-10-14 03:02:21Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.17 -pkgrel=1 +pkgrel=3 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -28,7 +28,7 @@ md5sums=('d858729b7d984c5e3a0c7558e9de1584' 'ee6cb99e50e580c50331a73045412ae9' '7f545754db5be7296d2dd97c049062ee' '2d37b98d6e74bab815604b8b48c6cfd4' - '74ee3c33714ff5cb44f30c9a0dceeef0') + '47f44ff5f02685dce8bcdab8568f0c38') build() { cd $pkgname-$pkgver diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh index b5a548f43..bab144d03 100644 --- a/community/acpid/handler.sh +++ b/community/acpid/handler.sh @@ -1,18 +1,11 @@ -#!/bin/sh +#!/bin/bash # Default acpi script that takes an entry for all actions -minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` -maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` -setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" - -set $* - case "$1" in button/power) case "$2" in PBTN|PWRF) - logger "PowerButton pressed: $2" - poweroff + logger 'PowerButton pressed' ;; *) logger "ACPI action undefined: $2" @@ -22,7 +15,7 @@ case "$1" in button/sleep) case "$2" in SLPB|SBTN) - echo -n mem >/sys/power/state + logger 'SleepButton pressed' ;; *) logger "ACPI action undefined: $2" @@ -34,12 +27,10 @@ case "$1" in AC|ACAD|ADP0) case "$4" in 00000000) - echo -n $minspeed >$setspeed - #/etc/laptop-mode/laptop-mode start + logger 'AC unpluged' ;; 00000001) - echo -n $maxspeed >$setspeed - #/etc/laptop-mode/laptop-mode stop + logger 'AC pluged' ;; esac ;; diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD index 215c165f5..6a5087a83 100644 --- a/community/assimp/PKGBUILD +++ b/community/assimp/PKGBUILD @@ -2,22 +2,22 @@ # Contributor: jepaan pkgname=assimp -pkgver=3.0 +pkgver=3.0.1270 pkgrel=1 pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" arch=('i686' 'x86_64') license=('BSD') -depends=('libxmu') -makedepends=('cmake' 'boost' 'freeglut') +depends=('libxmu' 'zlib' 'freeglut') +makedepends=('cmake' 'boost') url=('http://assimp.sourceforge.net/index.html') -source=("http://downloads.sourceforge.net/assimp/assimp-${pkgver}-src.tar.gz") -md5sums=('2cb57a3f9c9930dc3320a93670ec6fdf') +source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip") +md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1') build() { cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}--${pkgver}-source-only \ -DCMAKE_INSTALL_PREFIX=/usr make } @@ -26,5 +26,5 @@ package() { cd ${srcdir}/build make DESTDIR=$pkgdir install - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD index d161f50f7..145b5e98e 100644 --- a/community/astromenace/PKGBUILD +++ b/community/astromenace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64740 2012-02-18 03:43:03Z svenstaro $ +# $Id: PKGBUILD 77621 2012-10-13 11:41:17Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Arkham # Contributor: Ivan Bobrov @@ -6,12 +6,12 @@ pkgname=astromenace pkgver=1.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" arch=('i686' 'x86_64') url="http://www.viewizard.com/astromenace/index_linux.php" license=('GPL3') -depends=('sdl' 'freealut' 'libjpeg' 'libvorbis') +depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') makedepends=('cmake' 'mesa') source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD index 61d49f0b1..d48e8f2cd 100644 --- a/community/catalyst-dkms/PKGBUILD +++ b/community/catalyst-dkms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77076 2012-10-04 11:57:37Z lcarlier $ +# $Id: PKGBUILD 77694 2012-10-13 14:52:56Z lcarlier $ # Maintainer: Laurent Carlier # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=catalyst-dkms -pkgver=12.8 +pkgver=12.9 pkgrel=1 pkgdesc="AMD proprietary gpu kernel driver" arch=('i686' 'x86_64') @@ -14,12 +14,11 @@ depends=('dkms') optdepends=('linux-headers: build the module against Arch kernel' 'linux-lts-headers: build the module against LTS Arch kernel') replaces=('catalyst-lts-dkms') # useless -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - dkms.conf - 3.5-do_mmap.patch) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - '972049dc247a74a7162f2227078abcb0' - 'a450e2e3db61994b09e9d99d95bee837') +source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz + dkms.conf) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' + '972049dc247a74a7162f2227078abcb0') install=catalyst.install package() { @@ -33,14 +32,14 @@ package() { _archdir=x86 fi - sh ./amd-driver-installer*.run --extract fglrx-install + #sh ./amd-driver-installer*.run --extract fglrx-install - cd fglrx-install - patch -Np1 -i ../3.5-do_mmap.patch + #cd fglrx-install + #patch -Np1 -i ../3.5-do_mmap.patch install -dm755 "${pkgdir}/usr/lib/modprobe.d" install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" @@ -48,5 +47,5 @@ package() { echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" } diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install index f32e7ae7a..655468646 100644 --- a/community/catalyst-dkms/catalyst.install +++ b/community/catalyst-dkms/catalyst.install @@ -1,24 +1,18 @@ -post_install() -{ - dkms add -m fglrx -v $1 - dkms build -m fglrx -v $1 +post_install() { dkms install -m fglrx -v $1 } -pre_upgrade() -{ - dkms remove -m fglrx -v $1 --all +pre_upgrade() { + local curver=$2 + # $2 is unset due to a bug. Query current version using pacman as fallback + [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') + pre_remove $curver } -post_upgrade() -{ - dkms add -m fglrx -v $1 - dkms build -m fglrx -v $1 - dkms install -m fglrx -v $1 +post_upgrade() { + post_install $1 } -pre_remove() -{ +pre_remove() { dkms remove -m fglrx -v $1 --all } - diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD index 3f1b30386..5637d2a22 100644 --- a/community/chromium-bsu/PKGBUILD +++ b/community/chromium-bsu/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64919 2012-02-18 20:42:52Z jelle $ +# $Id: PKGBUILD 77622 2012-10-13 11:41:22Z allan $ # Maintainer: Allan McRae # Contributor: William Rea pkgname=chromium-bsu pkgver=0.9.15 -pkgrel=2 +pkgrel=3 pkgdesc="A fast paced top scrolling shooter" arch=('i686' 'x86_64') url="http://chromium-bsu.sourceforge.net/" license=('custom:artistic') -depends=('freeglut' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') +depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') install=chromium-bsu.install source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('d57137a1ac2292363b35192724c7e3be') diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index 0d049ce7c..2f930707a 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17032 2010-05-17 11:13:51Z rvanharen $ +# $Id: PKGBUILD 77624 2012-10-13 11:41:40Z allan $ # Maintainer: Ronald van Haren # Contributor: Hussam Al-Tayeb ht990332@gmail.com # Contributor: Khashayar Naderehvandi @@ -9,25 +9,34 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=3 +pkgrel=4 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch) +source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz + compiz-kde-4.8.patch + compiz-kde-4.9.patch + compiz-gcc-4.7.patch) sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f') + '148656352f8a20b3781ee185025c5c8d4b7d720f' + '2b6fa7398ccb96172a99f4d12990bbc0491e355c' + '2138342ae9f253bae003e96e91fdd0bc9918291a') build() { cd "$srcdir/compiz-$pkgver" - patch -p1 -i ../compiz-build.patch + + patch -p0 -i ../compiz-gcc-4.7.patch + patch -p1 -i ../compiz-kde-4.8.patch + patch -p1 -i ../compiz-kde-4.9.patch + ./configure --prefix=/usr \ --enable-gnome \ --enable-gtk \ @@ -47,7 +56,7 @@ package_compiz-core() pkgdesc="Composite manager for Aiglx and Xgl" depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') + 'libgl' 'dbus' 'glu' 'libxslt' 'fuse') cd "$srcdir/compiz-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch new file mode 100644 index 000000000..28315baec --- /dev/null +++ b/community/compiz/compiz-gcc-4.7.patch @@ -0,0 +1,38 @@ +--- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 ++++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 +@@ -59,6 +59,9 @@ + + #include "paintredirector.h" + ++// header for gcc-4.7 compatibility ++#include "unistd.h" ++ + KWD::Window::Window (WId parentId, + WId clientId, + WId frame, +--- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 ++++ configure.ac 2012-09-12 23:40:37.253686000 +0400 +@@ -72,11 +72,6 @@ + *) CFLAGS="$CFLAGS -Wnested-externs" ;; + esac + +- case " $CFLAGS " in +- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; +- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; +- esac +- + if test "x$enable_ansi" = "xyes"; then + case " $CFLAGS " in + *[[\ \ ]]-ansi[[\ \ ]]*) ;; +@@ -95,11 +90,6 @@ + *[[\ \ ]]-Wall[[\ \ ]]*) ;; + *) CXXFLAGS="$CXXFLAGS -Wall" ;; + esac +- +- case " $CXXFLAGS " in +- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; +- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; +- esac + fi + + AC_C_BIGENDIAN diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch new file mode 100644 index 000000000..f22a3fa21 --- /dev/null +++ b/community/compiz/compiz-kde-4.8.patch @@ -0,0 +1,18 @@ +diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp +--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 ++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 +@@ -986,10 +986,10 @@ + { + Atom atom = Atoms::compizWindowBlurDecor; + QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; +- Region topRegion = NULL; +- Region bottomRegion = NULL; +- Region leftRegion = NULL; +- Region rightRegion = NULL; ++ ::Region topRegion = NULL; ++ ::Region bottomRegion = NULL; ++ ::Region leftRegion = NULL; ++ ::Region rightRegion = NULL; + int size = 0; + int w, h; + diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch new file mode 100644 index 000000000..7b56da95c --- /dev/null +++ b/community/compiz/compiz-kde-4.9.patch @@ -0,0 +1,196 @@ +From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 +From: Dennis Kasprzyk +Date: Mon, 06 Aug 2012 18:23:17 +0000 +Subject: KDE 4.9 support. + +Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov + +--- +diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp +index a65f99f..78d1a47 100644 +--- a/kde/window-decorator-kde4/window.cpp ++++ b/kde/window-decorator-kde4/window.cpp +@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const + return QRect (); + } + ++KDecorationDefines::WindowOperation ++KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) ++{ ++ Options::MouseCommand com = buttonToCommand (button); ++ ++ if (com == Options::MouseOperationsMenu) ++ return KDecorationDefines::OperationsOp; ++ ++ return KDecorationDefines::NoOp; ++} ++ ++ ++#endif ++ ++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) ++ + bool + KWD::Window::isClientGroupActive () + { +@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) + showWindowMenu (pos); + } + +-KDecorationDefines::WindowOperation +-KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) ++#endif ++ ++#if KDE_IS_VERSION(4,8,80) ++QString ++KWD::Window::caption(int idx) const + { +- Options::MouseCommand com = buttonToCommand (button); ++ return mName; ++} + +- if (com == Options::MouseOperationsMenu) +- return KDecorationDefines::OperationsOp; ++void ++KWD::Window::closeTab(long id) ++{ ++ closeWindow (); ++} + +- return KDecorationDefines::NoOp; ++void ++KWD::Window::closeTabGroup() ++{ ++ closeWindow (); ++} ++ ++long ++KWD::Window::currentTabId() const ++{ ++ return (long) mClientId; ++} ++ ++QIcon ++KWD::Window::icon(int idx) const ++{ ++ QIcon icon (mIcon); ++ icon.addPixmap (mMiniIcon); ++ return icon; ++} ++ ++void ++KWD::Window::setCurrentTab(long id) ++{ ++} ++ ++void ++KWD::Window::showWindowMenu(const QPoint& pos, long id) ++{ ++ showWindowMenu (pos); ++} ++ ++void ++KWD::Window::tab_A_before_B(long A, long B) ++{ ++} ++ ++void ++KWD::Window::tab_A_behind_B(long A, long B) ++{ ++} ++ ++int ++KWD::Window::tabCount() const ++{ ++ return 1; ++} ++ ++long ++KWD::Window::tabId(int idx) const ++{ ++ return (long) mClientId; ++} ++ ++void ++KWD::Window::untab(long id, const QRect& newGeom) ++{ + } + + #endif + ++ + void + KWD::Window::createDecoration (void) + { +@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, + int leftOffset, + int rightOffset) + { +- Atom atom = Atoms::compizWindowBlurDecor; +- QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; +- ::Region topRegion = NULL; +- ::Region bottomRegion = NULL; +- ::Region leftRegion = NULL; +- ::Region rightRegion = NULL; +- int size = 0; +- int w, h; ++ Atom atom = Atoms::compizWindowBlurDecor; ++ QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; ++ _XRegion *topRegion = NULL; ++ _XRegion *bottomRegion = NULL; ++ _XRegion *leftRegion = NULL; ++ _XRegion *rightRegion = NULL; ++ int size = 0; ++ int w, h; + + w = mGeometry.width () + mBorder.left + mBorder.right; + h = mGeometry.height () + mBorder.top + mBorder.bottom; +diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h +index c2b274b..1ddfbd1 100644 +--- a/kde/window-decorator-kde4/window.h ++++ b/kde/window-decorator-kde4/window.h +@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { + virtual bool compositingActive () const; + #if KDE_IS_VERSION(4,3,90) + virtual QRect transparentRect () const; +- ++ virtual WindowOperation ++ buttonToWindowOperation(Qt::MouseButtons button); ++#endif ++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) + virtual bool isClientGroupActive (); + virtual QList clientGroupItems () const; + virtual long itemId (int index); +@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { + virtual void closeClientGroupItem (int index); + virtual void closeAllInClientGroup (); + virtual void displayClientMenu (int index, const QPoint& pos); +- +- virtual WindowOperation +- buttonToWindowOperation(Qt::MouseButtons button); ++ ++#endif ++#if KDE_IS_VERSION(4,8,80) ++ using KDecorationBridge::caption; ++ virtual QString caption(int idx) const; ++ virtual void closeTab(long id); ++ virtual void closeTabGroup(); ++ virtual long currentTabId() const; ++ using KDecorationBridge::icon; ++ virtual QIcon icon(int idx) const; ++ virtual void setCurrentTab(long id); ++ using KDecorationBridge::showWindowMenu; ++ virtual void showWindowMenu(const QPoint& pos, long id); ++ virtual void tab_A_before_B(long A, long B); ++ virtual void tab_A_behind_B(long A, long B); ++ virtual int tabCount() const; ++ virtual long tabId(int idx) const; ++ virtual void untab(long id, const QRect& newGeom); + #endif ++ ++ + virtual bool eventFilter (QObject* o, QEvent* e); + + void handleActiveChange (void); +-- +cgit v0.8.3.1-30-gff3a diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 78f8d0ba8..636950019 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74834 2012-08-06 23:08:51Z andrea $ +# $Id: PKGBUILD 77602 2012-10-13 07:54:00Z ebelanger $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.0.5 _pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -22,8 +22,9 @@ source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/ md5sums=('9ad88a1a6b9761fce28c8073d8f47941') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt + sed -i 's/-Werror//' src/CMakeLists.txt mkdir -p build cd build cmake \ @@ -38,8 +39,8 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" # mkdir -p "${pkgdir}/usr/share/gconf/schemas/" # mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 187177a00..7905f5e16 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69392 2012-04-15 16:03:24Z schuay $ +# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $ # Maintainer: Jonathan Conder # Maintainer: Brad Fanella # Contributor: Arkham @@ -12,13 +12,13 @@ pkgname=desmume pkgver=0.9.8 -pkgrel=1 +pkgrel=3 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' - 'soundtouch' 'alsa-lib' 'zziplib') + 'soundtouch' 'alsa-lib' 'zziplib' 'glu') makedepends=('intltool') install=desmume.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585') +md5sums=('fb7c984c924087888b9eaaad8cb1875e') diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index a4e47d5bf..d4c342474 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77572 2012-10-12 17:47:07Z svenstaro $ +# $Id: PKGBUILD 77600 2012-10-13 07:27:55Z allan $ # Maintainer: Laurent Carlier # Contributor: damir # Contributor: TheHoff pkgname=devil pkgver=1.7.8 -pkgrel=12 +pkgrel=13 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64') url="http://openil.sourceforge.net/" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 933865d51..9be8a5098 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69792 2012-04-23 09:41:50Z ibiru $ +# $Id: PKGBUILD 77628 2012-10-13 11:41:57Z allan $ # Maintainer: Lukas Fleischer # Contributor: Vesa Kaihlavirta # Contributor: Sarah Hay @@ -6,15 +6,15 @@ pkgname=erlang pkgver=R15B01 -pkgrel=1 +pkgrel=2 pkgdesc='A small concurrent functional programming language developed by Ericsson.' arch=(i686 x86_64) url='http://www.erlang.org/index.html' license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa' 'glu') optdepends=('wxgtk: for wx support' - 'mesa: for wx support' + 'glu: for wx support' 'unixodbc: database' 'java-environment: for Java support') options=('!makeflags') diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index 76b5be9d6..83132ae56 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -4,13 +4,13 @@ pkgname=esdl pkgver=1.2 -pkgrel=1 +pkgrel=2 epoch=2 arch=('x86_64' 'i686') pkgdesc="SDL and OpenGL bindings for the Erlang programming language" url="http://esdl.sourceforge.net/" license=('custom') -depends=('erlang' 'sdl' 'mesa') +depends=('erlang' 'sdl' 'glu') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tarball/master") md5sums=('d51f8e2fe07b9e82ff9c2e06af35e3eb') _dirname='dgud-esdl-4139134' diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index 3f00c689d..46e21f075 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 63544 2012-02-05 11:55:05Z ibiru $ +# $Id: PKGBUILD 77630 2012-10-13 11:42:09Z allan $ # Maintainer: Ronald van Haren # Contributor: Eric Belanger # Contributor: Fabio Scotoni # Contributor: Alexander Rødseth pkgname=extremetuxracer pkgver=0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Downhill racing game starring Tux" arch=('x86_64' 'i686') url="http://www.extremetuxracer.com" license=('GPL') -depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu') +depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu') +makedepends=('mesa' 'libxi' 'libxmu') conflicts=('ppracer' 'etracer') replaces=('ppracer' 'etracer') source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz" @@ -25,7 +26,7 @@ sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' build() { cd "$srcdir/extremetuxracer-$pkgver" - patch -Np1 -i ${srcdir}/libpng15.patch + patch -Np1 -i "${srcdir}/libpng15.patch" sed -i -e 's/libpng12/libpng15/g' configure ./configure --prefix=/usr make diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 7c386c450..7005c0ff2 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 75601 2012-08-27 13:34:13Z spupykin $ +# $Id: PKGBUILD 77631 2012-10-13 11:42:12Z allan $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr') +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') makedepends=('boost' 'cmake') license=("GPL") url="http://www.flightgear.org" diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 2b607fc5a..5225f4927 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 74419 2012-07-27 14:49:42Z spupykin $ +# $Id: PKGBUILD 77632 2012-10-13 11:42:15Z allan $ # Maintainer: Sergej Pupykin # Contributor: Ben pkgname=fox pkgver=1.6.46 -pkgrel=1 +pkgrel=2 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64') url="http://www.fox-toolkit.org/" license=('LGPL' 'custom') -depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') +depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff' 'glu') optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index c3eedb732..7fa884dca 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 75755 2012-08-30 21:02:52Z spupykin $ +# $Id: PKGBUILD 77633 2012-10-13 11:42:24Z allan $ # Maintainer: Sergej Pupykin # Contributor: William Rea pkgname=freemat pkgver=4.1 -pkgrel=4 +pkgrel=5 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi') +depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu') makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz @@ -20,6 +20,7 @@ md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' build() { cd $srcdir/FreeMat-$pkgver-Source + unset LDFLAGS rm -f CMakeCache.txt find . -type f -name '*.moc.cpp' -exec rm -f {} \; find . -type f -name 'add.so' -exec rm -f {} \; @@ -30,6 +31,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_LLVM=OFF \ + -DFORCE_BUNDLED_UMFPACK=ON \ -DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ . @@ -38,7 +40,7 @@ build() { package() { cd $srcdir/FreeMat-$pkgver-Source - make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install -j1 sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install rm $pkgdir/usr/bin/blas.ini } diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 99bc8ce33..78e66da80 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 76107 2012-09-11 14:06:05Z spupykin $ +# $Id: PKGBUILD 77634 2012-10-13 11:42:27Z allan $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=1 +pkgrel=2 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment' 'xulrunner') + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') +makedepends=('java-environment' 'xulrunner' 'wget') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('27f4bf163011d8ac2088a535cb58a13d') diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD index 98eacc23b..973311383 100644 --- a/community/fxdesktop/PKGBUILD +++ b/community/fxdesktop/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 63570 2012-02-05 11:56:40Z ibiru $ +# $Id: PKGBUILD 77636 2012-10-13 11:42:37Z allan $ # Maintainer: Sergej Pupykin # Contributor: Sander Jansen pkgname=fxdesktop pkgver=0.1.12 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight Desktop Environment" arch=('i686' 'x86_64') url="http://code.google.com/p/fxdesktop/" license=('GPL') -depends=('fox>=1.6.0' ) +depends=('fox>=1.6.0') +makedepends=('glu') source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) md5sums=('9489e7369b5e052e0b6836a3b0670832') diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD index 4596b5e26..260a3b3bd 100644 --- a/community/fxprocessview/PKGBUILD +++ b/community/fxprocessview/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 63572 2012-02-05 11:56:52Z ibiru $ +# $Id: PKGBUILD 77637 2012-10-13 11:42:42Z allan $ # Maintainer: Sergej Pupykin # Contributor: Sander Jansen pkgname=fxprocessview pkgver=0.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="Process Viewer" arch=('i686' 'x86_64') license=('GPL') depends=('fox>=1.4.0') +makedepends=('glu') url="http://code.google.com/p/fxdesktop/" source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ build-fix.patch) diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index e1bc2770e..3b683fef4 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75313 2012-08-19 08:00:28Z heftig $ +# $Id: PKGBUILD 77638 2012-10-13 11:42:56Z allan $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,11 +20,11 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=6 +pkgrel=7 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' +makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') @@ -390,7 +390,7 @@ package_gambas2-gb-db-postgresql() { } package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') + depends=('gambas2-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Gambas2 Sqlite2 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 @@ -398,7 +398,7 @@ package_gambas2-gb-db-sqlite2() { } package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite') + depends=('gambas2-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Gambas2 Sqlite3 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 @@ -580,7 +580,7 @@ package_gambas2-gb-gtk-svg() { } package_gambas2-gb-image() { - depends=('gambas2-runtime') + depends=('gambas2-runtime' 'gcc-libs') pkgdesc="Gambas2 image processing component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.image @@ -632,7 +632,7 @@ package_gambas2-gb-net-smtp() { } package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') + depends=('gambas2-runtime' 'glu') pkgdesc="Gambas2 OpenGL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl @@ -778,7 +778,7 @@ package_gambas2-gb-report() { } package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') + depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'glu') pkgdesc="Gambas2 SDL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 6e8e7c292..762b2e808 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76895 2012-10-01 22:33:08Z lcarlier $ +# $Id: PKGBUILD 77639 2012-10-13 11:43:04Z allan $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -14,8 +14,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.3.2 -pkgrel=2 +pkgver=3.3.3 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -27,11 +27,11 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' - 'gmime') + 'gmime' 'glu') options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('2d148d3fbdff7a063157073d555f343c' +md5sums=('18902ae2bbd0d66d165503aba7e89474' 'b284be39d147ec799f1116a6abc068b4' '6d9e080b66443e7246387b1716d24e31') @@ -374,7 +374,7 @@ package_gambas3-gb-db-postgresql() { } package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') + depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Sqlite2 database access component" ## Workaround for splitting @@ -392,7 +392,7 @@ package_gambas3-gb-db-sqlite2() { } package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite') + depends=('gambas3-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Sqlite3 database access component" ## Workaround for splitting @@ -633,7 +633,7 @@ package_gambas3-gb-gtk() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting @@ -685,7 +685,7 @@ package_gambas3-gb-image() { } package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') + depends=('gambas3-gb-image' 'gcc-libs') pkgdesc="Image effect component" ## workaround for splitting @@ -909,7 +909,7 @@ package_gambas3-gb-net-smtp() { } package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') + depends=('gambas3-runtime' 'glew') pkgdesc="OpenGL component" ## workaround for splitting @@ -1122,7 +1122,7 @@ package_gambas3-gb-report() { } package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew') pkgdesc="SDL component" ## workaround for splitting @@ -1228,7 +1228,7 @@ package_gambas3-gb-vb() { } package_gambas3-gb-xml() { - depends=('gambas3-runtime') + depends=('gambas3-runtime' 'gcc-libs') pkgdesc="XML component" ## workaround for splitting diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index 5066202b2..ee46e850e 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76013 2012-09-08 21:44:20Z arodseth $ +# $Id: PKGBUILD 77640 2012-10-13 11:43:07Z allan $ # Maintainer: Alexander Rødseth # Contributor: Sven-Hendrik Haase # Contributor: fana-m @@ -7,15 +7,14 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=12 +pkgrel=13 _fixedrevision=5208 pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" arch=('x86_64' 'i686') license=('LGPL') -depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen') -conflicts=('gigi-svn' 'mesa-full') +depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') build() { cd "$srcdir" diff --git a/community/gl-117/PKGBUILD b/community/gl-117/PKGBUILD index db49d6f6c..6dd2488b9 100644 --- a/community/gl-117/PKGBUILD +++ b/community/gl-117/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65522 2012-02-21 08:42:12Z spupykin $ +# $Id: PKGBUILD 77641 2012-10-13 11:43:14Z allan $ # Maintainer: Sergej Pupykin # Contributor: andrewski pkgname=gl-117 pkgver=1.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="An action flight simulator" arch=('i686' 'x86_64') url="http://www.heptargon.de/gl-117/gl-117.html" license=("GPL") -depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi') +depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/project/gl-117/gl-117/GL-117%20Source/gl-117-$pkgver-src.tar.bz2 gl-117.desktop gl-117.png) diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 213646f90..64d83922f 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 73992 2012-07-18 01:06:49Z ibiru $ +# $Id: PKGBUILD 77642 2012-10-13 11:43:21Z allan $ # Contributor: Jaroslaw Swierczynski # Contributor: Roman Kyrylych pkgname=glob2 pkgver=0.9.4.4 -pkgrel=12 +pkgrel=13 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64') url="http://www.globulation2.org/" license=('GPL3') -depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost') +makedepends=('scons' 'boost' 'mesa') install=glob2.install source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz glob2-0.9.4.1-gcc44.patch) diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 55f37d274..a240f9acf 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75579 2012-08-27 10:53:33Z spupykin $ +# $Id: PKGBUILD 77710 2012-10-13 20:01:04Z ebelanger $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.1.8 -pkgrel=2 +pkgrel=3 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 029f0a37c..4bae2c98c 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 73994 2012-07-18 01:07:03Z ibiru $ +# $Id: PKGBUILD 77643 2012-10-13 11:43:30Z allan $ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu speex fontconfig gstreamer0.10-base gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext @@ -47,7 +47,7 @@ build() { package_gnash-common() { pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl mesa + depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu speex fontconfig cairo gstreamer0.10-base boost-libs) diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index b12b6959c..1b8e96051 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61917 2012-01-10 23:41:37Z ebelanger $ +# $Id: PKGBUILD 77644 2012-10-13 11:43:35Z allan $ # Maintainer: Sergej Pupykin # Contributor: Sander Jansen pkgname=gogglesmm pkgver=0.12.6 -pkgrel=1 +pkgrel=2 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64') url="http://code.google.com/p/gogglesmm/" license=('GPL3') install=gogglesmm.install -depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') -makedepends=('pkgconfig' 'glproto' 'dri2proto') +depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') +makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 801c29480..110b73b03 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74617 2012-07-31 19:56:05Z ebelanger $ +# $Id: PKGBUILD 77645 2012-10-13 11:43:38Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Jose Valecillos # Contributor: Olivier Ramonat pkgname=gource pkgver=0.38 -pkgrel=3 +pkgrel=4 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 849e52ee0..65daa5607 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 73474 2012-07-08 09:30:16Z ibiru $ +# $Id: PKGBUILD 77646 2012-10-13 11:43:41Z allan $ # Maintainer: Eric Bélanger pkgname=gpac pkgver=4065 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" license=('LGPL') -depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +depends=('ffmpeg' 'libjpeg' 'libpng' 'glu') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index bbd6c8d17..698ac86bd 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,43 +1,42 @@ -# $Id: PKGBUILD 72950 2012-06-25 12:33:19Z arodseth $ +# $Id: PKGBUILD 77732 2012-10-14 01:28:09Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Simon Parzer pkgname=grafx2 -pkgver=2.3 -pkgrel=2 -pkgdesc="Pixelart-oriented painting program" +pkgver=2.4 +pkgrel=1 +_pkgrev=2027 +pkgdesc='Pixelart-oriented painting program' arch=('x86_64' 'i686') -url="http://code.google.com/p/grafx2/" +url='http://code.google.com/p/grafx2/' license=('GPL2') install=grafx2.install depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') makedepends=('gendesk' 'setconf') options=('!emptydirs') -source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz") -sha256sums=('b43fa837e30abfb0830f9a1b793a78ed690fbafdcd378e51197f01998bbf392e') +source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.$_pkgrev-src.tgz") +sha256sums=('97088d07f1bcd668c619da9f1efe7c5782da707306c90c05564df91f51afe9d7') _name=('GrafX2') _exec=('grafx2 %U') _genericname=('Drawing program') _mimetype=('image/bmp;image/gif;image/png;image/x-tga;image/tiff') build() { - cd "$srcdir" + cd $srcdir gendesk -n - setconf "$pkgname.desktop" Categories 'Graphics;2DGraphics;RasterGraphics' - cd "$pkgname/src" + setconf $pkgname.desktop Categories 'Graphics;2DGraphics;RasterGraphics' + cd $pkgname/src make } package() { - cd "$srcdir/$pkgname/src" + cd $srcdir/$pkgname/src - make prefix="/usr" DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ - "$pkgdir/usr/share/doc/$pkgname/readme.txt" - install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make prefix=/usr DESTDIR=$pkgdir install + install -Dm644 $srcdir/$pkgname.desktop \ + $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $srcdir/$pkgname/doc/README.txt \ + $pkgdir/usr/share/doc/$pkgname/readme.txt } # vim:set ts=2 sw=2 et: diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 67f1ffc63..36ad53179 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75757 2012-08-30 21:03:04Z spupykin $ +# $Id: PKGBUILD 77647 2012-10-13 11:43:46Z allan $ # Maintainer: Sergej Pupykin # Contributor: Zuf # Contributor: Darwin Bautista pkgname=kdenlive pkgver=0.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ @@ -13,7 +13,7 @@ url="http://www.kdenlive.org/" license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext' 'mesa') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu') optdepends=('recordmydesktop' 'dvdauthor' 'mkisolinux' diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 6bedf50a6..c35adf1c2 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75041 2012-08-12 14:50:10Z jelle $ +# $Id: PKGBUILD 77648 2012-10-13 11:43:53Z allan $ # Maintainer: Kyle Keen # Contributor: Marq Schneider @@ -6,13 +6,13 @@ pkgname=kicad pkgver=20120119 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} _pkgbzr=3256 -pkgrel=2 +pkgrel=3 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" license=('GPL') -depends=('mesa' 'wxgtk') -makedepends=('boost' 'cmake' 'zlib') +depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('boost' 'cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index d9b25937c..cff63eca8 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74839 2012-08-06 23:09:16Z andrea $ +# $Id: PKGBUILD 77594 2012-10-13 06:46:05Z allan $ # Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov pkgname=luminancehdr pkgver=2.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index fa7793fd5..928544444 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74620 2012-07-31 19:56:16Z ebelanger $ +# $Id: PKGBUILD 77649 2012-10-13 11:43:58Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Larry Hajali pkgname=megaglest pkgver=3.6.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' -'libircclient' 'miniupnpc' 'wxgtk') +'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" lol.patch) diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index 9748e1dcd..f9238d3f5 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 76885 2012-10-01 19:05:45Z spupykin $ +# $Id: PKGBUILD 77652 2012-10-13 11:44:15Z allan $ # Maintainer: Sergej Pupykin # Contributor: Tiago Pierezan Camargo # Contributor: robb_force pkgname=nestopia pkgver=1.42 -pkgrel=2 +pkgrel=3 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://0ldsk00l.ca/nestopia.html' license=('GPL') arch=('i686' 'x86_64') -depends=('sdl' 'alsa-lib' 'gtk3' 'mesa') +depends=('sdl' 'alsa-lib' 'gtk3' 'mesa' 'glu') makedepends=('unzip') source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" "build-fix.patch") diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 4dd77667e..a5f42959f 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76757 2012-09-29 07:00:16Z bpiotrowski $ +# $Id: PKGBUILD 77604 2012-10-13 08:08:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.8.11 +pkgver=0.8.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') #'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -md5sums=('23cb6d6a5c3949ac73df3c6b330e834d') +md5sums=('2d053e4d08e6b44747ed2f519a8b20be') build() { cd node-v${pkgver} diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD new file mode 100644 index 000000000..80b9323e2 --- /dev/null +++ b/community/opencolorio/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Sven-Hendrik Haase +# Contributor: Dumitru Ursu + +pkgname=opencolorio +pkgver=1.0.7 +pkgrel=1 +pkgdesc="A color management framework for visual effects and animation" +arch=('i686' 'x86_64') +url="http://opencolorio.org" +license=('BSD') +depends=('python') +makedepends=('cmake') +source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver) +sha1sums=('01befa5c4198254b8848946ba3c85cce9a0f38d4') + +build() +{ + mv imageworks-OpenColorIO-b3cb224 $pkgname-$pkgver + cd $pkgname-$pkgver + + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make +} + +package() +{ + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index d19e13a0d..d76723397 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74621 2012-07-31 19:56:19Z ebelanger $ +# $Id: PKGBUILD 77692 2012-10-13 14:45:45Z svenstaro $ # Contributor: SpepS # Maintainer: Sven-Hendrik Haase pkgname=openimageio -pkgver=1.0.8 -pkgrel=1 +pkgver=1.0.9 +pkgrel=3 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('7d8ee962f29cea749d02ab992e2874df') +md5sums=('4b98a057515cc95fc954743c987f19ba') build() { cd "$srcdir"/$_pkgname*/src diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD index a7af51cb7..6118d3d5a 100644 --- a/community/prboom/PKGBUILD +++ b/community/prboom/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 63714 2012-02-05 12:08:47Z ibiru $ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ # Maintainer: Lukas Fleischer # Contributor: Thayer Williams # Contributor: dale pkgname=prboom pkgver=2.5.0 -pkgrel=6 +pkgrel=7 pkgdesc='A game engine which provides a program to play Doom levels.' url='http://prboom.sourceforge.net/' license=('GPL2') arch=('i686' 'x86_64') -depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" 'libpng-1.4.patch') md5sums=('a8a15f61fa2626ab98051ab2703378c4' diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 990cec25f..01edb1144 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 63716 2012-02-05 12:08:52Z ibiru $ +# $Id: PKGBUILD 77656 2012-10-13 11:44:31Z allan $ # Maintainer: Sergej Pupykin # Contributor: Tobias Powalowski # Contributor: riai Ben pkgname=pyqt3 pkgver=3.18.1 -pkgrel=10 +pkgrel=11 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/pyqt/intro" depends=('python2-sip' 'qscintilla-qt3') +makedepends=('glu') license=('GPL') source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('f1d120495d1aaf393819e988c0a7bb7e') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 28cacf696..610f3b6a4 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63722 2012-02-05 12:09:17Z ibiru $ +# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $ # Maintainer: Sergej Pupykin # Contributor: Stefan Husmann # Contributor: Giovanni Scafora @@ -6,12 +6,13 @@ pkgname=qcad pkgver=2.0.5.0 -pkgrel=9 +pkgrel=11 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') depends=('qt3') +makedepends=('glu') options=(libtool) source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz qcad.xpm @@ -31,8 +32,10 @@ build() { cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - #Arch64 fix - gentoo patch - [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch + [ "$CARCH" = "x86_64" ] && { + patch -p1 < ../qcad-intptr.patch; + sed -i '1,1i#include ' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; + } patch -p1 < ../qcad.patch sed -i "s:"-pedantic"::g" mkspecs/defs.pro diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 7ee43a4d0..96d07690c 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 75950 2012-09-06 20:00:35Z jlichtblau $ +# $Id: PKGBUILD 77658 2012-10-13 11:44:51Z allan $ # Maintainer: Jaroslav Lichtblau # Contributor: Matthias Maennich # Contributor: pkgname=qlandkartegt pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') url="http://www.qlandkarte.org/" license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs' 'qt' 'shared-mime-info' 'qtwebkit') -makedepends=('cmake' 'garmindev') +makedepends=('cmake' 'garmindev' 'mesa') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog @@ -22,9 +22,7 @@ sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { - cd ${srcdir}/$pkgname-$pkgver - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build @@ -35,10 +33,10 @@ build() { } package(){ - cd ${srcdir}/build + cd "${srcdir}/build" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ - ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml + install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ + "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 30adb23b8..8822cdff5 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74624 2012-07-31 19:56:44Z ebelanger $ +# $Id: PKGBUILD 77659 2012-10-13 11:44:58Z allan $ # Maintainer : Ionut Biru # Contributor: Corrado 'bardo' Primier # Contributor: Tate "Tatey" Johnson pkgname=rss-glx pkgver=0.9.1 -pkgrel=9 +pkgrel=10 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu' 'mesa') optdepends=('xscreensaver: xscreensaver integration') install=rss-glx.install options=('!libtool') diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 002a79432..0ae9d7dcb 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -5,31 +5,29 @@ pkgname=scorched3d pkgver=43.3.d _pkgver=43.3d -pkgrel=1 -pkgdesc="A 3d artillery combat game" +pkgrel=4 +pkgdesc="3D artillery combat game" arch=('i686' 'x86_64') url="http://www.scorched3d.co.uk/" license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils') -makedepends=('sharutils') +depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') +makedepends=('gendesk' 'mesa') install=scorched3d.install source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" - 'scorched3d.desktop' - 'scorched3d.png.uu' + 'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' 'scorched3d-libpng1.5.patch' 'libpng14.patch') md5sums=('9c3043282a9e7451468ff325bef3b04c' - 'b951f2150004e10fdff3e6226f1a3939' - '178a281333006c6a5a92919865c1d7af' + '0f7e570f586c227873e909ebbc17c84d' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' 'ec6958191751b5a2c44aa15abfc75269' 'c8c03855fd3693122fd39427fa3638c1') build() { - cd scorched + cd "$srcdir/scorched" # patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch # patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch @@ -43,6 +41,7 @@ build() { --disable-openaltest \ --with-wx-config=wx-config + sed -i '1 i #include ' src/client/client/SecureID.cpp #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 @@ -50,14 +49,14 @@ build() { } package() { - cd scorched + cd "$srcdir" + gendesk + cd scorched make DESTDIR=${pkgdir} install - - cd ${srcdir} - - uudecode --output-file=scorched3d.png scorched3d.png.uu + cd .. - install -D -m644 scorched3d.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png - install -D -m644 scorched3d.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png" + install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" } diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index e98a8c889..705250989 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74010 2012-07-18 01:09:00Z ibiru $ +# $Id: PKGBUILD 77661 2012-10-13 11:45:22Z allan $ # Maintainer: # Contributor: Juergen Hoetzel # Contributor: Kritoke pkgname=smc pkgver=1.9 -pkgrel=16 +pkgrel=17.1 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64') url="http://www.secretmaryo.org/" diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index e3fe0d43c..17177714b 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -2,11 +2,11 @@ pkgname=stone-soup pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2' 'ttf-dejavu') +depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu') makedepends=('bison' 'flex' 'gendesk') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') diff --git a/community/tdfsb/PKGBUILD b/community/tdfsb/PKGBUILD index 8c80e350b..c2df49a2c 100644 --- a/community/tdfsb/PKGBUILD +++ b/community/tdfsb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 59877 2011-12-01 15:19:47Z giovanni $ +# $Id: PKGBUILD 77663 2012-10-13 11:45:35Z allan $ # Maintainer: Giovanni Scafora pkgname=tdfsb pkgver=0.0.10 -pkgrel=5 +pkgrel=6 pkgdesc="SDL based graphical file browser" arch=('i686' 'x86_64') url="http://www.determinate.net/webdata/seg/tdfsb.html" license=('GPL') -depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu') +depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu' 'glu') source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz" 'tdfsb.desktop' 'tdfsb.png') @@ -29,7 +29,7 @@ package() { install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb" # Install desktop file - install -D -m755 ${srcdir}/tdfsb.desktop "${pkgdir}/usr/share/applications/tdfsb.desktop" + install -D -m755 "${srcdir}/tdfsb.desktop" "${pkgdir}/usr/share/applications/tdfsb.desktop" # Install icon - install -D -m644 ${srcdir}/tdfsb.png "${pkgdir}/usr/share/pixmaps/tdfsb.png" + install -D -m644 "${srcdir}/tdfsb.png" "${pkgdir}/usr/share/pixmaps/tdfsb.png" } diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index b104310ef..51ee46ff9 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -6,37 +6,29 @@ pkgname=teeworlds pkgver=0.6.1 -_bamver=0.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multiplayer 2D shooter" arch=('i686' 'x86_64') url="http://teeworlds.com" license=('custom') -depends=('alsa-lib' 'mesa' 'sdl' 'freetype2') -makedepends=('python2') +depends=('alsa-lib' 'glu' 'sdl' 'freetype2') +makedepends=('python2' 'bam' 'mesa') replaces=('teewars') source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz - https://github.com/downloads/matricks/bam/bam-${_bamver}.tar.bz2 teeworlds.desktop teeworlds.png) md5sums=('00de7195ecd1f23596dc3237341af512' - 'f8b62ad553c3615a725a034df4fb4257' '3944aaf7a8c19a83510b2b39c4cddf5f' '44f39e398409232a0e0a431ed46d8cc8') build() { - # Build bam (used to build teeworlds) - # Now it is released separately I should make a separate package... - cd ${srcdir}/bam-${_bamver} - ./make_unix.sh - # Build teeworlds cd ${srcdir}/${pkgname}-*-source # Use Python 2 sed -i 's/python /python2 /' bam.lua - ../bam-${_bamver}/bam server_release client_release + bam server_release client_release } package() { diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index e256f2f6f..eb7d55a06 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 69194 2012-04-10 02:24:04Z spupykin $ +# $Id: PKGBUILD 77704 2012-10-13 15:48:59Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: TDY # Contributor: Grigorios Bouzakis pkgname=tmux -pkgver=1.6 -pkgrel=2 -pkgdesc="A terminal multiplexer" -url="http://tmux.sourceforge.net/" +pkgver=1.7 +pkgrel=1 +pkgdesc='A terminal multiplexer' +url='http://tmux.sourceforge.net/' arch=('i686' 'x86_64') license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz - LICENSE) -md5sums=('3e37db24aa596bf108a0442a81c845b3' + LICENSE) +md5sums=('2c48fb9beb22eedba7a5de3b78dd0c03' '71601bc37fa44e4395580b321963018e') build() { - cd "$srcdir/tmux-$pkgver" - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } package() { - cd "$srcdir/tmux-$pkgver" - make install DESTDIR=$pkgdir - install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim" - install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE" - install -dm755 "$pkgdir/usr/share/tmux/" - install -m644 examples/* "$pkgdir/usr/share/tmux/" -# mv $pkgdir/usr/man $pkgdir/usr/share/ - mkdir -p $pkgdir/usr/share/bash-completion/completions/ - mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/usr/share/bash-completion/completions/tmux + cd "$srcdir/$pkgname-$pkgver" + make install DESTDIR=$pkgdir + install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE" + + install -dm755 "$pkgdir/usr/share/tmux/" + install -m644 examples/* "$pkgdir/usr/share/tmux/" + install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim" + + install -d $pkgdir/usr/share/bash-completion/completions/ + mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/usr/share/bash-completion/completions/tmux } diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index d514322a8..1ed0a02fc 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64985 2012-02-19 11:26:28Z spupykin $ +# $Id: PKGBUILD 77665 2012-10-13 11:45:51Z allan $ # Maintainer: Sergej Pupykin # Contributor: Shahar Weiss pkgname=torcs pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64') -depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis') +depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') makedepends=('plib') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index c3acd0b53..4b333fa1c 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 63775 2012-02-05 12:13:50Z ibiru $ +# $Id: PKGBUILD 77666 2012-10-13 11:45:54Z allan $ # Maintainer: Vesa Kaihlavirta # Contributor: Angelo Theodorou pkgname=warzone2100 pkgver=2.3.9 -pkgrel=2 +pkgrel=3 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64') license=('GPL') -depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') -source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") +depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc') +source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz" + "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('7185090a089c9c0e0eca7535a8f25dca') build() { diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index e74658b6a..98c3e47f5 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74630 2012-07-31 19:57:28Z ebelanger $ +# $Id: PKGBUILD 77668 2012-10-13 11:46:04Z allan $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -9,23 +9,26 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=6 +pkgrel=8 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') -depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez') -optdepends=( - 'libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' - 'pulseaudio: pulseaudio support' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them' -) +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' + 'udisks' 'upower' 'bluez') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'vdpau-video: accelerated video playback for nvidia cards' + 'xvba-video: accelerated video playback for amd cards' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'unrar: access compressed files without unpacking them') install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install index 213889cdd..862508e73 100644 --- a/community/xbmc/xbmc.install +++ b/community/xbmc/xbmc.install @@ -1,15 +1,15 @@ post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications - /bin/true + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + true } post_upgrade() { post_install $1 - /bin/true + true } post_remove() { post_install $1 - /bin/true + true } diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 6916de04d..afcbb9752 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 74407 2012-07-27 05:34:52Z spupykin $ +# $Id: PKGBUILD 77669 2012-10-13 11:46:09Z allan $ # Maintainer: Sergej Pupykin # Maintainer: dorphell pkgname=xlockmore pkgver=5.40 -pkgrel=1 +pkgrel=2 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) license=('BSD') -depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu) +depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 94a49dfd5..ad1c581a8 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 74121 2012-07-21 19:56:28Z giovanni $ +# $Id: PKGBUILD 77670 2012-10-13 11:46:18Z allan $ # Maintainer: Ronald van Haren # Contributor: Travis Willard # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto pkgver=0.5.10 -pkgrel=1 +pkgrel=2 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64') url="http://xmoto.tuxfamily.org" license=('GPL') -depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' - 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' +depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' + 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml++') +makedepends=('mesa') install=xmoto.install source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" 'xmoto-0.5.10-libpng15.patch' diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 9fad9cd4e..8a9d9c011 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164817 2012-08-06 19:23:29Z eric $ +# $Id: PKGBUILD 168672 2012-10-13 23:13:42Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.32 +pkgver=2.4.33 pkgrel=1 arch=('i686' 'x86_64') url="http://www.openldap.org/" @@ -13,7 +13,7 @@ options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd slapd.default slapd.service slapd.tmpfiles ntlm.patch) -sha1sums=('294d5e9711bcb6850188ed895eeb986d43b62664' +sha1sums=('0cea642ba2dae1eb719da41bfedb9eba72ad504d' 'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index f895939ef..f6660eec5 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=194 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -135,8 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" + groups=('base') conflicts=('sysvinit') - depends=('sysvinit-tools') + depends=('sysvinit-tools' 'systemd') mv "$srcdir/_sysvcompat"/* "$pkgdir" diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index 8a9de3577..334bafded 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166964 2012-09-23 12:22:41Z tomegun $ +# $Id: PKGBUILD 168539 2012-10-13 09:28:52Z thomas $ # Maintainer: Eric Belanger pkgbase=sysvinit pkgname=('sysvinit-tools' 'sysvinit') pkgver=2.88 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') -groups=('base') depends=('util-linux' 'coreutils' 'glibc' 'awk') source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2 "0001-simplify-writelog.patch" diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 89e2ec232..3a6ca6ec9 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 160750 2012-06-04 21:42:23Z remy $ +# $Id: PKGBUILD 168597 2012-10-13 11:46:36Z andyrtr $ # Maintainer: Rémy Oudompheng # Contributor: Firmicus # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.16 +pkgver=2.20 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') url="http://asymptote.sourceforge.net/" license=("GPL3") -depends=('texlive-core' 'gc' 'freeglut' 'gsl' 'fftw' 'libsigsegv') +depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv') makedepends=('ghostscript' 'imagemagick') optdepends=('python2: for the xasy GUI' 'python-imaging: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('ca110698b8c710eb93830f0fa55d29503c39e92a') +sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -36,7 +36,7 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install-all + make -j1 DESTDIR="${pkgdir}" install-all sed -i -e 's@env python@env python2@' ${pkgdir}/usr/share/asymptote/GUI/*.py # this dir contains png files that are already embedded in the pdf documentation: rm -rf ${pkgdir}/usr/share/info/asymptote diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 92fa18186..742ce8d48 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 164360 2012-07-31 19:42:02Z eric $ +# $Id: PKGBUILD 168598 2012-10-13 11:46:40Z andyrtr $ # Contributor: Damir Perisa # Contributor: Kevin Piche # Maintainer: Gaetan Bisson pkgname=bzflag -pkgver=2.4.0 -pkgrel=4 +pkgver=2.4.2 +pkgrel=1 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') options=('!libtool') arch=('i686' 'x86_64') -depends=('curl' 'glew' 'mesa' 'sdl') +depends=('curl' 'glew' 'glu' 'sdl') source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") -sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') +sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch new file mode 100644 index 000000000..f67e34677 --- /dev/null +++ b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch @@ -0,0 +1,27 @@ +From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Sat, 13 Oct 2012 20:37:09 -0700 +Subject: [PATCH] disable setting jobs due to cabal 1.16.0 bug shipped with + ghc 7.6.1 + +--- + Distribution/Client/Config.hs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Distribution/Client/Config.hs b/Distribution/Client/Config.hs +index 93e5a52..ecbc6f7 100644 +--- a/Distribution/Client/Config.hs ++++ b/Distribution/Client/Config.hs +@@ -202,8 +202,7 @@ initialSavedConfig = do + }, + savedInstallFlags = mempty { + installSummaryFile = [toPathTemplate (logsDir "build.log")], +- installBuildReports= toFlag AnonymousReports, +- installNumJobs = toFlag (Just numberOfProcessors) ++ installBuildReports= toFlag AnonymousReports + } + } + +-- +1.7.12.3 + diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 5ce042013..13bbc4a74 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -4,19 +4,23 @@ pkgname=cabal-install pkgver=1.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3') depends=('ghc' 'gmp' 'zlib') -source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz") -md5sums=('da046116eee7664158411fa9e2cf6b14') +source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz" + '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch') +md5sums=('da046116eee7664158411fa9e2cf6b14' + 'd4705a398588efe6dbbcf6f4c3185a7d') build() { cd cabal-install-${pkgver} + patch -Np1 -i ${srcdir}/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch + runhaskell Setup configure \ --enable-shared \ --enable-split-objs \ diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index ddfe47a3d..61f297008 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168190 2012-10-06 18:51:56Z andrea $ +# $Id: PKGBUILD 168545 2012-10-13 09:58:07Z andrea $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -22,7 +22,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index 47608a909..570372aaa 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 148690 2012-02-05 11:47:02Z ibiru $ +# $Id: PKGBUILD 168599 2012-10-13 11:46:55Z andyrtr $ # Maintainer: Ronald van Haren # Contributor : Damir Perisa pkgname=celestia pkgver=1.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64') license=('GPL') url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg') +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg') options=('!makeflags') source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" 'celestia-1.6.1-gcc46.patch' 'celestia-1.6.1-libpng15.patch' - 'celestia-1.6.1-linking.patch') + 'celestia-1.6.1-linking.patch' + 'gcc-4.7-fixes.diff') sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' '7c08ca391603806d788cb8f3342acedafc924eef' '46ecc4e10b24191384bc848c206652498843adf0' - '534c8eee18d13a868c91f0b870ebecc05f3e7ae1') + '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' + '582f9eed93eca02a16350f02c29e2ea6f69aa869') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -27,6 +29,7 @@ build() { patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" + patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" # This version of Celestia has a bug in the font rendering and requires -fsigned-char export CFLAGS="$CFLAGS -fsigned-char" diff --git a/extra/celestia/gcc-4.7-fixes.diff b/extra/celestia/gcc-4.7-fixes.diff new file mode 100644 index 000000000..9ca09e03f --- /dev/null +++ b/extra/celestia/gcc-4.7-fixes.diff @@ -0,0 +1,10 @@ +--- a/src/celmath/intersect.h ++++ b/src/celmath/intersect.h +@@ -15,6 +15,7 @@ + #include "ray.h" + #include "sphere.h" + #include "ellipsoid.h" ++#include "mathlib.h" + + + template bool testIntersection(const Ray3& ray, diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 2d462072e..58326a439 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163175 2012-07-08 10:43:05Z andyrtr $ +# $Id: PKGBUILD 168510 2012-10-13 05:14:52Z allan $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index da1602db0..3886ec90c 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168432 2012-10-11 16:05:02Z andyrtr $ +# $Id: PKGBUILD 168547 2012-10-13 11:00:14Z andyrtr $ # Maintainer: Andreas Radke pkgname=claws-mail pkgver=3.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,11 +19,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d388929fb1c8f04d4bcb2139faaf9e70') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + gnutls313.diff) +md5sums=('d388929fb1c8f04d4bcb2139faaf9e70' + '21bdc9d324f9424e0071bb73be169977') + build() { cd ${srcdir}/${pkgname}-${pkgver} - + + # fix a bug in gnutls cert check triggered since gnutls 3.1.3 update + patch -Np1 -i ${srcdir}/gnutls313.diff + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py ./configure --prefix=/usr --disable-static \ diff --git a/extra/claws-mail/gnutls313.diff b/extra/claws-mail/gnutls313.diff new file mode 100644 index 000000000..27040f7bd --- /dev/null +++ b/extra/claws-mail/gnutls313.diff @@ -0,0 +1,12 @@ +diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c +index efc5c53..8303f3e 100644 +--- a/src/common/ssl_certificate.c ++++ b/src/common/ssl_certificate.c +@@ -92,6 +92,7 @@ + size_t size; + gnutls_datum tmp; + gnutls_x509_crt dest; ++ size = 0; + + if (gnutls_x509_crt_init(&dest) != 0) { + g_warning("couldn't gnutls_x509_crt_init\n"); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index bda16a03c..2521c5a91 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165622 2012-08-27 12:25:58Z heftig $ +# $Id: PKGBUILD 168631 2012-10-13 16:37:23Z thomas $ # Maintainer: Jan de Groot # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=10 +pkgrel=11 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" @@ -35,7 +35,8 @@ source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd) + saslauthd + tmpfiles.conf) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' 'e27ddff076342e7a3041c4759817d04b' 'd7e6886e88af04d05f3dec7f0a59ccf7' @@ -54,9 +55,10 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' 'b7848957357e7c02d6490102be496bf9' 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' - '00f6b781549a274630e22173f77bd41d' + '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20') + '75542f613185d5a90520ad0d7d926a20' + '45bb0192d2f188066240b9a66ee6365f') build() { cd "${srcdir}/cyrus-sasl-${pkgver}" @@ -149,7 +151,7 @@ package_libsasl() { } package_cyrus-sasl() { - depends=("libsasl=${pkgver}") + depends=("libsasl=${pkgver}" 'krb5') pkgdesc="Cyrus saslauthd SASL authentication daemon" backup=('etc/conf.d/saslauthd') @@ -158,6 +160,7 @@ package_cyrus-sasl() { install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" + install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" diff --git a/extra/cyrus-sasl/saslauthd.service b/extra/cyrus-sasl/saslauthd.service index 42d8ad768..978dbd37d 100644 --- a/extra/cyrus-sasl/saslauthd.service +++ b/extra/cyrus-sasl/saslauthd.service @@ -5,7 +5,7 @@ Description=Cyrus SASL authentication daemon Type=forking EnvironmentFile=/etc/conf.d/saslauthd ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS -PidFile=/var/run/saslauthd/saslauthd.pid +PIDFile=/var/run/saslauthd/saslauthd.pid [Install] WantedBy=multi-user.target diff --git a/extra/cyrus-sasl/tmpfiles.conf b/extra/cyrus-sasl/tmpfiles.conf new file mode 100644 index 000000000..7258b1a9f --- /dev/null +++ b/extra/cyrus-sasl/tmpfiles.conf @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - - diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 7ea93f6bc..fca51e846 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165619 2012-08-27 12:24:33Z heftig $ +# $Id: PKGBUILD 168635 2012-10-13 17:04:17Z thomas $ # Maintainer: Daniel Isenmann pkgbase=dhcp @@ -8,7 +8,7 @@ pkgname=('dhcp' 'dhclient') pkgver=4.2.4.1 _pkgver=4.2.4-P1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" @@ -22,8 +22,8 @@ md5sums=('0ca7181024651f6323951d5498c8020b' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' - '1076444f22e13eb5f6bff7821fd0f446' - '9310f2d8b1d7e97ace06d68cb41d9998' + '439ee2f145a1e86dd644cb94a854f8e7' + '588aa85b6fe228c45623185a58d11992' 'fd64aeb4f399dcc41ea43089a3811094' '541b415a25a169eaf64b681405f79a80') diff --git a/extra/dhcp/dhcpd4.service b/extra/dhcp/dhcpd4.service index 2ef4a9f26..89f7d2500 100644 --- a/extra/dhcp/dhcpd4.service +++ b/extra/dhcp/dhcpd4.service @@ -6,7 +6,6 @@ After=network.target Type=forking PIDFile=/run/dhcpd4.pid ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid -ExecReload=/bin/kill -TERM $MAINPID KillSignal=SIGINT [Install] diff --git a/extra/dhcp/dhcpd6.service b/extra/dhcp/dhcpd6.service index eb3b337c6..95d3dc45f 100644 --- a/extra/dhcp/dhcpd6.service +++ b/extra/dhcp/dhcpd6.service @@ -6,7 +6,6 @@ After=network.target Type=forking PIDFile=/run/dhcpd6.pid ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid -ExecReload=/bin/kill -TERM $MAINPID KillSignal=SIGINT [Install] diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index bf4bd70d3..f6c195dd7 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164362 2012-07-31 19:42:40Z eric $ +# $Id: PKGBUILD 168516 2012-10-13 05:28:59Z allan $ # Maintainer: tobias # Contributor: Dominik Ryba pkgname=enblend-enfuse pkgver=4.0 -pkgrel=6 +pkgrel=7 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD index afd3f36bf..a0196905e 100644 --- a/extra/freeglut/PKGBUILD +++ b/extra/freeglut/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 147152 2012-01-23 14:30:00Z heftig $ +# $Id: PKGBUILD 168622 2012-10-13 15:13:40Z andyrtr $ # Maintainer: Eric Belanger # Contributor: Tom Newsom pkgname=freeglut pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64') url="http://freeglut.sourceforge.net/" license=('MIT') -depends=('libxxf86vm' 'mesa' 'libxi') +depends=('libxi' 'libxrandr' 'libgl') +makedepends=('mesa' 'glu' 'libxxf86vm') replaces=('glut') provides=('glut') conflicts=('glut') @@ -20,6 +21,11 @@ sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # smooth_opengl3 demo doesn't build with recent mesa, Gentoo bug #428382 + sed -i "s/smooth_opengl3 //" progs/demos/Makefile.* + + autoreconf -vfi ./configure --prefix=/usr --disable-static make all } diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index 09a890d9e..ecc5e938a 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 143589 2011-11-26 21:44:46Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 168600 2012-10-13 11:46:59Z andyrtr $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Alexander Baldeck # Contributor: tobias pkgname=ftgl _pkgver=2.1.3-rc5 pkgver=${_pkgver/-/} -pkgrel=3 +pkgrel=4 pkgdesc="OpenGL library to use arbitrary fonts" arch=(i686 x86_64) url="http://ftgl.wiki.sourceforge.net/" license=(MIT) -depends=(freetype2 mesa) -makedepends=(doxygen glut) +depends=(freetype2 mesa glu) +makedepends=(doxygen) options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") md5sums=('c7879018cde844059495b3029b0b6503') build() { cd "$srcdir/$pkgname-${_pkgver/-/~}" - ./configure --prefix=/usr --with-pic + ./configure --prefix=/usr --with-pic --disable-static make } diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD index 73f2d9a2e..f922b5fd9 100644 --- a/extra/fyre/PKGBUILD +++ b/extra/fyre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143668 2011-11-28 09:29:53Z eric $ +# $Id: PKGBUILD 168512 2012-10-13 05:22:49Z eric $ # Maintainer: Eric Bélanger pkgname=fyre pkgver=1.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Rendering of the Peter de Jong map" arch=('i686' 'x86_64') url="http://fyre.navi.cx/" diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 801e68ecf..6630fd69f 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162854 2012-07-02 00:37:56Z bisson $ +# $Id: PKGBUILD 168538 2012-10-13 09:11:11Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.7.8 +pkgver=2.7.9 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4.patch') -sha1sums=('bba2f8d8bac2332aa9245f4ea9f67de584a18cce' +sha1sums=('bd0375188a0d8a74efece0e23f30c16cd4a2f1df' '1c6cdcaa218615e53869bb9d67d7f9d2141e86fe') install=install diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 9e8a9b408..6d7acc87e 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166461 2012-09-08 07:12:58Z daniel $ +# $Id: PKGBUILD 168518 2012-10-13 05:42:21Z allan $ # Maintainer: Daniel Isenmann pkgname=gegl pkgver=0.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index feaf46def..b3f7eeeed 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167293 2012-09-30 15:45:48Z dan $ +# $Id: PKGBUILD 168623 2012-10-13 15:18:41Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.12.2 +pkgver=1.7.12.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('5aa5d146825f74fee889ca5408e4e00b' - '51db657f9e8fa70f43ae56cb6bcb631b' +md5sums=('c3c1e2d56794fcc46e31fd8cb0e71252' + '27c0a53545e3f89579a98cae009bc3c8' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 7737b995e..03a734f82 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 164363 2012-07-31 19:42:44Z eric $ +# $Id: PKGBUILD 168601 2012-10-13 11:47:03Z andyrtr $ # Maintainer: Stéphane Gaudreault # Contributor: SleepyDog pkgname=glew pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') +depends=('libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD new file mode 100644 index 000000000..a3905a97e --- /dev/null +++ b/extra/glu/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168550 2012-10-13 11:42:49Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: Laurent Carlier + +pkgname=glu +pkgver=9.0.0 +pkgrel=1 +pkgdesc="Mesa OpenGL Utility library" +arch=('i686' 'x86_64') +url="http://cgit.freedesktop.org/mesa/glu/" +license=('LGPL') +depends=('libgl') +makedepends=('mesa') +options=('!libtool') +source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index 86c47d226..b2afe4f2f 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $ +# $Id: PKGBUILD 168602 2012-10-13 11:47:08Z andyrtr $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-games pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') options=('!emptydirs' '!libtool') install=gnome-games.install diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index ad28fdfc6..b4e24f364 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167195 2012-09-27 15:45:57Z andyrtr $ +# $Id: PKGBUILD 168527 2012-10-13 06:38:44Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace') source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('5d722e5850d79269ba413b0e69b9e14f' - '2764135bac008654a0b2fdd9fc6e62d1') +md5sums=('8a7b47456f65ffa8c01c58461fed1388' + 'ecd7bfe70612f88afd117124e18444df') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/gnutls.install b/extra/gnutls/gnutls.install index e8c8e1798..691f3c69d 100644 --- a/extra/gnutls/gnutls.install +++ b/extra/gnutls/gnutls.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz) +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz gnutls-guile.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD index cb5edb812..5425f1d09 100644 --- a/extra/gtkglext/PKGBUILD +++ b/extra/gtkglext/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 148772 2012-02-05 11:49:55Z ibiru $ +# $Id: PKGBUILD 168603 2012-10-13 11:47:13Z andyrtr $ # Maintainer: # Contributor: Ben pkgname=gtkglext pkgver=1.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="opengl extensions for gtk2" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" license=('LGPL') -depends=('gtk2' 'mesa' 'libxmu') +depends=('gtk2' 'glu' 'libxmu') +makedepends=('mesa') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" 'gtk2.20.patch') diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD index f29c74bc5..8393743ce 100644 --- a/extra/gtkglextmm/PKGBUILD +++ b/extra/gtkglextmm/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 143747 2011-11-28 20:23:35Z giovanni $ +# $Id: PKGBUILD 168604 2012-10-13 11:47:19Z andyrtr $ # Maintainer: Giovanni Scafora # Contributor: Bastien Bouclet # Contributor: SpepS pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" depends=('gtkmm' 'gtkglext') -makedepends=('pkgconfig') +makedepends=('mesa') options=('!libtool') license=('GPL') source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 39a3ac5c8..e6e29aed9 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164837 2012-08-06 23:07:38Z andrea $ +# $Id: PKGBUILD 168523 2012-10-13 06:26:15Z allan $ # Maintainer: Tobias Kieslich # Contributor: Giovanni Scafora # Contributor: Dominik Ryba pkgname=hugin pkgver=2011.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index b3a717d40..812cdbb46 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167199 2012-09-27 17:38:29Z eric $ +# $Id: PKGBUILD 168520 2012-10-13 05:48:33Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') pkgver=6.7.9.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD index fac3b03c0..83df195b9 100644 --- a/extra/jasper/PKGBUILD +++ b/extra/jasper/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 149364 2012-02-07 08:11:39Z eric $ +# $Id: PKGBUILD 168605 2012-10-13 11:47:31Z andyrtr $ # Maintainer: Eric Bélanger pkgname=jasper pkgver=1.900.1 -pkgrel=7 +pkgrel=8 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" arch=('i686' 'x86_64') url="http://www.ece.uvic.ca/~mdadams/jasper/" license=('custom:JasPer2.0') -depends=('libjpeg' 'freeglut' 'libxmu') +depends=('libjpeg' 'freeglut' 'libxmu' 'glu') options=('!libtool') source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 7c5c291a1..22ae21842 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168253 2012-10-06 22:17:40Z eric $ +# $Id: PKGBUILD 168525 2012-10-13 06:35:43Z eric $ # Maintainer: Eric Bélanger # Contributor: Pierre Schmitz # Contributor: Tobias Powalowski pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=13 +pkgrel=14 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 0acf293b5..9d16abfcb 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 142810 2011-11-15 16:35:49Z andrea $ +# $Id: PKGBUILD 168683 2012-10-14 02:17:22Z andrea $ # Maintainer: # Contributor: Andrea Scarpino pkgname=libmygpo-qt -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64') url="http://wiki.gpodder.org/wiki/Libmygpo-qt" license=('LGPL2.1') depends=('qjson') -makedepends=('cmake') +makedepends=('cmake' 'doxygen') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('37af04b1e944f982e35b69c04b5d1b0f') +md5sums=('dd07ccc88eac954a3860aeda96aab7b1') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}.${pkgver} \ @@ -25,6 +24,6 @@ build() { } package(){ - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 2e6c051f7..8df933197 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 167978 2012-10-04 14:32:20Z andyrtr $ +# $Id: PKGBUILD 168606 2012-10-13 11:47:57Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.2.2 pkgver=3.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -34,7 +34,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' + 'glu' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" @@ -462,7 +462,7 @@ package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." install=libreoffice-impress.install depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') + optdepends=('glu: for the OGLTrans extension') backup=() groups=('libreoffice') replaces=('libreoffice') diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD index dbfb65884..eead2c10c 100644 --- a/extra/libvisual-plugins/PKGBUILD +++ b/extra/libvisual-plugins/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 153728 2012-03-18 21:20:45Z jgc $ +# $Id: PKGBUILD 168607 2012-10-13 11:48:12Z andyrtr $ # Maintainer: damir pkgname=libvisual-plugins pkgver=0.4.0 -pkgrel=6 +pkgrel=7 pkgdesc="plugins for libvisual" arch=("i686" "x86_64") license=('GPL') url="http://www.localhost.nl/~synap/libvisual/" -depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack') -makedepends=('pkgconfig' 'namcap') +depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack') +makedepends=('mesa') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz 02_64-bit_JESS_fix.patch diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 94c6d2c76..c4cffbb3e 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,76 +1,51 @@ -# $Id: PKGBUILD 165814 2012-08-30 20:33:25Z andyrtr $ +# $Id: PKGBUILD 168551 2012-10-13 11:42:56Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri') +pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') #_git=true -_gitdate=20111031 +#_gitdate=20121006 _git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110709 - #pkgver=7.11 + pkgver=8.99.git_$_gitdate else - pkgver=8.0.4 + pkgver=9.0 fi -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools') +makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' + 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5') url="http://mesa3d.sourceforge.net" license=('custom') +options=('!libtool') source=(LICENSE - mesa-8.0.3-llvm-3.1-fixes.patch) + git_fixes.diff) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") + # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'c452ed3392468170726c004c2f4e02ca' - 'd546f988adfdf986cff45b1efa2d8a46') + '2ebce12196dbb7b69bdf7ef53b8afdee' + '60e557ce407be3732711da484ab3db6c') build() { cd ${srcdir}/?esa-* - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + patch -Np1 -i ${srcdir}/git_fixes.diff -if [ "${_git}" = "true" ]; then - autoreconf -vfi - ./autogen.sh --prefix=/usr \ + COMMONOPTS="--prefix=/usr \ + --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ - --enable-gallium-llvm \ - --enable-egl \ - --enable-gallium-egl \ - --with-egl-platforms=x11,drm \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore - #--enable-gbm \ - # --enable-gallium-svga \ - - else - autoreconf -vfi - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,svga,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,swrast \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ @@ -85,201 +60,237 @@ if [ "${_git}" = "true" ]; then --enable-gles2 \ --enable-texture-float \ --enable-xa \ - --enable-shared-dricore + --enable-vdpau " + +# not default: +# --enable-gallium-egl enable optional EGL state tracker (not required for +# EGL support in Gallium with OpenGL and OpenGL ES) +# [default=disable] +# --enable-xa enable build of the XA X Acceleration API [default=no] + + +if [ "${_git}" = "true" ]; then + ./autogen.sh \ + $COMMONOPTS + else + autoreconf -vfi + ./configure \ + $COMMONOPTS fi - make + make +} + +package_libglapi() { + depends=('glibc') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" } package_libgl() { - depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') + depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + # libGL & libdricore + make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" - cd src/mesa/drivers/dri make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" install -m755 -d "${pkgdir}/usr/share/licenses/libgl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" } +package_mesa() { + # check also gl.pc + depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + pkgdesc="Mesa 3-D graphics libraries and include files" + + make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS + make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA + + make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} + package_osmesa() { - depends=('mesa') + depends=('libglapi' 'gcc-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3D off-screen rendering library" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa -} -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" + make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" } package_libgbm() { - depends=('systemd-tools') + depends=('systemd' 'libglapi' 'libdrm') pkgdesc="Mesa gbm library" - cd ${srcdir}/?esa-* - install -m755 -d ${pkgdir}/usr/{include,lib/gbm} - bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" - bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/" - bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" - bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" } package_libgles() { - depends=('libglapi' 'khrplatform-devel') + depends=('libglapi' 'libdrm' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libgles" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') + # check also egl.pc + depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" - cd ${srcdir}/?esa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" + make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/egl" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" + install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/" + + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libegl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" + + # fix file conflicts + rm -rf ${pkgdir}/usr/include/KHR } package_khrplatform-devel() { - #depends=('') pkgdesc="Khronos platform development package" - cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/include/KHR" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" + install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" } -package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libglapi.so"* - rm -f "${pkgdir}/usr/lib/libgbm.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f "${pkgdir}/usr/lib/libOSMesa"* - rm -rf "${pkgdir}/usr/lib/gbm" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -f "${pkgdir}/usr/include/gbm.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - package_ati-dri() { - depends=("libgl=${pkgver}" 'libffi') + depends=("libgl=${pkgver}") pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa drivers for radeon,r200 make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600 + # gallium3D driver for r300,r600,radeonsi make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - # gallium egl drivers - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib/gbm" - bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/" + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install + # vdpau driver + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" } package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" } package_nouveau-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install + # vdpau driver + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } package_svga-dri() { - depends=("mesa=${pkgver}" 'libffi') + depends=('gcc-libs' 'libdrm' 'expat') pkgdesc="Gallium3D VMware guest GL driver" make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install - # gallium egl driver - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib/gbm" - bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/" + + install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" } diff --git a/extra/mesa/git_fixes.diff b/extra/mesa/git_fixes.diff new file mode 100644 index 000000000..8132d1d10 --- /dev/null +++ b/extra/mesa/git_fixes.diff @@ -0,0 +1,93 @@ +From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 +From: Ian Romanick +Date: Mon, 08 Oct 2012 22:07:10 +0000 +Subject: docs: Add 9.0 release md5sums + +Signed-off-by: Ian Romanick +--- +diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html +index d72c5bb..02b7324 100644 +--- a/docs/relnotes-9.0.html ++++ b/docs/relnotes-9.0.html +@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. + +

MD5 checksums

+ 
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+
+ + +-- +cgit v0.9.0.2-2-gbebe +From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:47:40 +0000 +Subject: mesa: don't call TexImage driver hooks for zero-sized images + +This simply avoids some failed assertions but there's no reason to +call the driver hooks for storing a tex image if its size is zero. + +Note: This is a candidate for the stable branches. +(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 21646cc..8004876 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, + border, internalFormat, texFormat); + + /* Give the texture to the driver. may be null. */ +- if (compressed) { +- ctx->Driver.CompressedTexImage(ctx, dims, texImage, +- imageSize, pixels); +- } +- else { +- ctx->Driver.TexImage(ctx, dims, texImage, format, +- type, pixels, unpack); ++ if (width > 0 && height > 0 && depth > 0) { ++ if (compressed) { ++ ctx->Driver.CompressedTexImage(ctx, dims, texImage, ++ imageSize, pixels); ++ } ++ else { ++ ctx->Driver.TexImage(ctx, dims, texImage, format, ++ type, pixels, unpack); ++ } + } + + check_gen_mipmap(ctx, target, texObj, level); +-- +cgit v0.9.0.2-2-gbebe +From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:59:27 +0000 +Subject: mesa: fix error check for zero-sized compressed subtexture + +For glCompressedTexSubImage, width or height = 0 is legal. +Fixes a failure in piglit's s3tc-errors test. + +This is for the 9.0 and 8.0 branches. Already fixed on master. +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 8004876..38fa9fa 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, + if (!_mesa_is_compressed_format(ctx, format)) + return GL_INVALID_ENUM; + +- if (width < 1 || width > maxTextureSize) ++ if (width < 0 || width > maxTextureSize) + return GL_INVALID_VALUE; + +- if ((height < 1 || height > maxTextureSize) ++ if ((height < 0 || height > maxTextureSize) + && dimensions > 1) + return GL_INVALID_VALUE; + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 2dbc969da..8aa1bde8a 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,32 +1,44 @@ -# $Id: PKGBUILD 161971 2012-06-17 19:52:12Z ronald $ +# $Id: PKGBUILD 168608 2012-10-13 11:48:28Z andyrtr $ # Maintainer: Ronald van Haren # Contributor : shining # Contributor : cyberdune pkgname=octave pkgver=3.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') -depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse') +depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse') makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" + buildfix.diff + octave-gethelp.patch) options=('!emptydirs') install=octave.install -sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7') - +sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7' + 'a7cdba1e05fbdd182facdd804aeec37729255551' + 'd39d54763ac86114029f8bc5d60763d2adce27bb') + build() { cd ${srcdir}/${pkgname}-${pkgver} + # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log + patch -Np0 -i ${srcdir}/buildfix.diff + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log + patch -Np0 -i ${srcdir}/octave-gethelp.patch + + autoreconf -vfi + # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static + --enable-shared --disable-static \ + --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html LANG=C make } diff --git a/extra/octave/buildfix.diff b/extra/octave/buildfix.diff new file mode 100644 index 000000000..8288b7bec --- /dev/null +++ b/extra/octave/buildfix.diff @@ -0,0 +1,85 @@ +--- libgnu/stdio.in.h.origs 2012-05-24 12:46:13.000000000 -0600 ++++ libgnu/stdio.in.h 2012-05-24 16:29:54.813734894 -0600 +@@ -1,12 +1,10 @@ +-/* -*- buffer-read-only: t -*- vi: set ro: */ +-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ + /* A GNU-like . + + Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) ++ the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, +@@ -15,8 +13,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software Foundation, +- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ along with this program; if not, see . */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -55,7 +52,8 @@ + #include + + /* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 +- and eglibc 2.11.2. */ ++ and eglibc 2.11.2. ++ May also define off_t to a 64-bit type on native Windows. */ + #include + + /* The __attribute__ feature is available in gcc versions 2.5 and later. +@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un + # endif + #endif + +-#if @GNULIB_GETS@ +-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef gets +-# define gets rpl_gets +-# endif +-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (gets, char *, (char *s)); +-# else +-_GL_CXXALIAS_SYS (gets, char *, (char *s)); +-# undef gets +-# endif +-_GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ ++ so any use of gets warrants an unconditional warning; besides, C11 ++ removed it. */ ++#undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif + +@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose); + #elif defined GNULIB_POSIXCHECK + # undef pclose + # if HAVE_RAW_DECL_PCLOSE +-_GL_WARN_ON_USE (pclose, "popen is unportable - " ++_GL_WARN_ON_USE (pclose, "pclose is unportable - " + "use gnulib module pclose for more portability"); + # endif + #endif +@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is + # endif + #endif + +-/* Some people would argue that sprintf should be handled like gets +- (for example, OpenBSD issues a link warning for both functions), +- since both can cause security holes due to buffer overruns. ++/* Some people would argue that all sprintf uses should be warned about ++ (for example, OpenBSD issues a link warning for it), ++ since it can cause security holes due to buffer overruns. + However, we believe that sprintf can be used safely, and is more + efficient than snprintf in those safe cases; and as proof of our + belief, we use sprintf in several gnulib modules. So this header diff --git a/extra/octave/octave-gethelp.patch b/extra/octave/octave-gethelp.patch new file mode 100644 index 000000000..c0e693abc --- /dev/null +++ b/extra/octave/octave-gethelp.patch @@ -0,0 +1,13 @@ +Help parallel compilation +patch by Sebastien Fabbro +--- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 ++++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 +@@ -316,7 +316,7 @@ + + gethelp_SOURCES = gethelp.cc + +-.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile ++.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp + @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) + if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ + cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index eedf88d60..19d032381 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163187 2012-07-08 15:43:25Z ibiru $ +# $Id: PKGBUILD 168644 2012-10-13 18:33:04Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski @@ -6,12 +6,12 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.2 -pkgrel=2 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' +depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0' 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') optdepends=('opencv-docs' diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 7990b8690..7964591c6 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163577 2012-07-16 03:34:25Z eric $ +# $Id: PKGBUILD 168685 2012-10-14 03:44:54Z eric $ # Maintainer: # Contributor: Dale Blount # Contributor: Francois Charette pkgname=perl-netaddr-ip _realname=NetAddr-IP -pkgver=4.062 +pkgver=4.065 pkgrel=1 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('perl') options=('!emptydirs') url="http://search.cpan.org/dist/${_realname}/" source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('01503542903fe09fe078130f3b1bb3af') +md5sums=('f4efa7e90820ecf7ce2b3d9144f2568f') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD index 0df359a07..515a5b590 100644 --- a/extra/python-telepathy/PKGBUILD +++ b/extra/python-telepathy/PKGBUILD @@ -1,17 +1,21 @@ -# $Id: PKGBUILD 150847 2012-02-23 12:38:51Z ibiru $ +# $Id: PKGBUILD 168660 2012-10-13 20:59:47Z eric $ # Maintainer: Ionut Biru # Contributor: Daniel Balieiro -pkgname=python-telepathy +pkgbase=python-telepathy +pkgname=('python2-telepathy') pkgver=0.15.19 -pkgrel=2 +pkgrel=3 pkgdesc="Python libraries for use in Telepathy clients and connection managers" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" license=('LGPL') depends=('dbus-python') makedepends=('libxslt') -source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz) -md5sums=('f7ca25ab3c88874015b7e9728f7f3017') +conflicts=('python-telepathy') +replaces=('python-telepathy') +source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz{,.asc}) +md5sums=('f7ca25ab3c88874015b7e9728f7f3017' + '3f0e1af0452d62a0c0aab916e045579c') build() { cd "${srcdir}/telepathy-python-${pkgver}" @@ -19,7 +23,7 @@ build() { make } -package() { +package_python2-telepathy() { cd "${srcdir}/telepathy-python-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index cdd4ac7f1..39c4c5767 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 149356 2012-02-07 05:40:02Z eric $ +# $Id: PKGBUILD 168609 2012-10-13 11:48:48Z andyrtr $ # Maintainer: Eric Bélanger pkgname=qt3 pkgver=3.3.8b -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64') url="http://www.trolltech.com/products/qt/index.html" license=('GPL') -depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' +depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') -makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') +makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa') optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') options=('!libtool') install=qt.install diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index dc0109641..705e2aa63 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 164771 2012-08-04 20:28:32Z ronald $ +# $Id: PKGBUILD 168610 2012-10-13 11:49:18Z andyrtr $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Gergely Imreh pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" -depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') +depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') # build against qwtplot3d provided in the package ... # build against qwt provided in the package ... # as systemwide one doesn't provide all needed functions -makedepends=('pkg-config' 'boost') +makedepends=('pkg-config' 'boost' 'mesa') license=('GPL2') install=${pkgname}.install source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 756d5bb35..bfa7063cd 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165402 2012-08-18 01:22:52Z heftig $ +# $Id: PKGBUILD 168629 2012-10-13 16:16:09Z thomas $ pkgname=rsync pkgver=3.0.9 -pkgrel=4 +pkgrel=5 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" @@ -17,7 +17,7 @@ md5sums=('5ee72266fe2c1822333c407e1761b92b' 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' 'ec96f9089d71109557cdcaa3f0633ed6' - 'af4eabd94380050191b20ab03e6f6076' + 'ae4c381e0c02d6132c7f6ded3f473041' '53f94e613e0bc502d38dd61bd2cd7636') build() { diff --git a/extra/rsync/rsyncd.socket b/extra/rsync/rsyncd.socket index 83724159f..2b9a9643b 100644 --- a/extra/rsync/rsyncd.socket +++ b/extra/rsync/rsyncd.socket @@ -1,6 +1,5 @@ [Unit] Description=Rsync Socket -After=network.target Conflicts=rsyncd.service [Socket] diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD index 9503a1bae..c48a18d05 100644 --- a/extra/smpeg/PKGBUILD +++ b/extra/smpeg/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137587 2011-09-09 23:30:58Z allan $ +# $Id: PKGBUILD 168611 2012-10-13 11:49:26Z andyrtr $ # Maintainer: Eric Belanger # Contributor: Jan de Groot pkgname=smpeg pkgver=0.4.4 -pkgrel=6 +pkgrel=7 pkgdesc="SDL MPEG Player Library" arch=('i686' 'x86_64') url="http://icculus.org/smpeg/" license=('LGPL') depends=('sdl') -makedepends=('gtk' 'mesa') -optdepends=('gtk: to use gtv ' 'mesa: to use glmovie') +makedepends=('gtk' 'mesa' 'glu') +optdepends=('gtk: to use gtv ' 'glu: to use glmovie') options=('!libtool' '!makeflags') source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch) @@ -23,7 +23,7 @@ sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static make LDFLAGS+=-lstdc++ } diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 8b900c199..edd8a973f 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166485 2012-09-08 09:30:15Z ronald $ +# $Id: PKGBUILD 168612 2012-10-13 11:49:36Z andyrtr $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=stellarium pkgver=0.11.4 -pkgrel=1 +pkgrel=2 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64") url="http://stellarium.free.fr/" license=('GPL2') -depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl') -makedepends=('cmake' 'boost') +depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl') +makedepends=('cmake' 'boost' 'mesa') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index a27856a13..b5000d64f 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166495 2012-09-08 11:23:32Z guillaume $ +# $Id: PKGBUILD 168613 2012-10-13 11:49:41Z andyrtr $ # Maintainer: Guillaume ALAUX pkgname=swt pkgver=4.2 -pkgrel=1 +pkgrel=2 _date=201206081400 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" license=('EPL') depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') -optdepends=('libgnomeui' 'mesa' 'libwebkit') -makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') +optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') +makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then _carch=x86 md5sums=('3efe0404f6129183abae46f7620fe14f' diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD index dad6302b5..3c13488cc 100644 --- a/extra/xf86-input-acecad/PKGBUILD +++ b/extra/xf86-input-acecad/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 153299 2012-03-12 20:52:33Z andyrtr $ +# $Id: PKGBUILD 168553 2012-10-13 11:43:16Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-acecad pkgver=1.5.0 -pkgrel=3 +pkgrel=5 pkgdesc="X.Org acecad tablet input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('sysfsutils') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool') -groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 assign-local-private-after-allocating.patch) sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD index 615b04a5e..92d0537f3 100644 --- a/extra/xf86-input-aiptek/PKGBUILD +++ b/extra/xf86-input-aiptek/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 153301 2012-03-12 20:52:36Z andyrtr $ +# $Id: PKGBUILD 168554 2012-10-13 11:43:19Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-input-aiptek pkgver=1.4.1 -pkgrel=3 +pkgrel=5 pkgdesc="X.Org Aiptek USB Digital Tablet input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool') -groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') diff --git a/extra/xf86-input-elographics/PKGBUILD b/extra/xf86-input-elographics/PKGBUILD index ca83100e5..ee6ad8451 100644 --- a/extra/xf86-input-elographics/PKGBUILD +++ b/extra/xf86-input-elographics/PKGBUILD @@ -3,14 +3,14 @@ pkgname=xf86-input-elographics pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Elographics TouchScreen input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.12.3.901') -conflicts=('xorg-server<1.12.3.901') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4') @@ -19,6 +19,10 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index 97b4e8373..daab499b1 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 165210 2012-08-13 08:42:14Z jgc $ +# $Id: PKGBUILD 168556 2012-10-13 11:43:27Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck =1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 27e57bdde..ae655949c 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153305 2012-03-12 20:52:42Z andyrtr $ +# $Id: PKGBUILD 168557 2012-10-13 11:43:35Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-joystick pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD index 621262005..c8f67c5af 100644 --- a/extra/xf86-input-keyboard/PKGBUILD +++ b/extra/xf86-input-keyboard/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 164026 2012-07-24 15:46:19Z andyrtr $ +# $Id: PKGBUILD 168558 2012-10-13 11:43:39Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-keyboard pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org keyboard input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index 06dedce66..15b0f2ce4 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 164523 2012-08-01 14:34:46Z andyrtr $ +# $Id: PKGBUILD 168559 2012-10-13 11:43:43Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-mouse pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mouse input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 58583a274..9712c535a 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161623 2012-06-12 15:20:16Z andyrtr $ +# $Id: PKGBUILD 168560 2012-10-13 11:43:49Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Tobias Powalowski # Contributor: Thomas Bächler @@ -6,14 +6,14 @@ pkgname=xf86-input-synaptics pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxtst' 'mtdev') -makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') replaces=('synaptics') provides=('synaptics') conflicts=('synaptics') diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD index f32c89108..f55f8d22c 100644 --- a/extra/xf86-input-vmmouse/PKGBUILD +++ b/extra/xf86-input-vmmouse/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 159500 2012-05-25 15:04:46Z andyrtr $ +# $Id: PKGBUILD 168561 2012-10-13 11:43:53Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-vmmouse pkgver=12.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org VMWare Mouse input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc' 'sh') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') groups=('xorg-drivers' 'xorg') backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') options=('!libtool') diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD index 4ab21391f..5dd81a5f2 100644 --- a/extra/xf86-input-void/PKGBUILD +++ b/extra/xf86-input-void/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 153315 2012-03-12 20:53:00Z andyrtr $ +# $Id: PKGBUILD 168562 2012-10-13 11:43:57Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-input-void pkgver=1.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org void input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 17c8f8f8d..3c65914ea 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166529 2012-09-09 15:58:07Z heftig $ +# $Id: PKGBUILD 168563 2012-10-13 11:44:03Z andyrtr $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: M Rawash pkgname=xf86-input-wacom pkgver=0.17.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64') url="http://linuxwacom.sourceforge.net/" license=('GPL') backup=('etc/X11/xorg.conf.d/50-wacom.conf') depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel>=1.12.0' 'libxext') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD index e7f967a5e..a6982cb01 100644 --- a/extra/xf86-video-apm/PKGBUILD +++ b/extra/xf86-video-apm/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 163635 2012-07-17 16:04:08Z andyrtr $ +# $Id: PKGBUILD 168564 2012-10-13 11:44:07Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-apm pkgver=1.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Alliance ProMotion video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') -groups=('xorg-drivers' 'xorg') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f') diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD index 9b27ec5a1..ce16d52cf 100644 --- a/extra/xf86-video-ark/PKGBUILD +++ b/extra/xf86-video-ark/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163637 2012-07-17 16:08:25Z andyrtr $ +# $Id: PKGBUILD 168565 2012-10-13 11:44:11Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-ark pkgver=0.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ark video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD index 9aff71d79..d6dd021e1 100644 --- a/extra/xf86-video-ast/PKGBUILD +++ b/extra/xf86-video-ast/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163639 2012-07-17 16:10:36Z andyrtr $ +# $Id: PKGBUILD 168566 2012-10-13 11:44:15Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-ast pkgver=0.97.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index 61ec6f9ec..16003d403 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 162834 2012-07-01 07:57:54Z andyrtr $ +# $Id: PKGBUILD 168567 2012-10-13 11:44:18Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-ati pkgver=6.14.6 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libdrm>=2.4.37' 'systemd-tools' 'ati-dri') -makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) @@ -20,7 +20,12 @@ sha256sums=('aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr #--enable-dri --help + + # fix build now that XAA isn't available in new Xorg - http://bugs.gentoo.org/show_bug.cgi?id=428094 + sed -i '/USE_XAA, 1/d' configure.ac + autoreconf -vfi + + ./configure --prefix=/usr make } diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index 90b34de81..28b0a216c 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 163841 2012-07-21 10:59:26Z andyrtr $ +# $Id: PKGBUILD 168568 2012-10-13 11:44:27Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-chips pkgver=1.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=(glibc) -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h) sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index 1e4bbb070..73835a604 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163641 2012-07-17 16:18:49Z andyrtr $ +# $Id: PKGBUILD 168569 2012-10-13 11:44:31Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-cirrus pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD index f07c93e6a..93fd4e3ad 100644 --- a/extra/xf86-video-dummy/PKGBUILD +++ b/extra/xf86-video-dummy/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163836 2012-07-21 10:34:04Z andyrtr $ +# $Id: PKGBUILD 168570 2012-10-13 11:44:35Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-dummy pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org dummy video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index f4d70a393..62f0c0314 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 162873 2012-07-02 16:14:07Z andyrtr $ +# $Id: PKGBUILD 168571 2012-10-13 11:44:39Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-fbdev pkgver=0.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD index bbb6ba655..e3105fdc9 100644 --- a/extra/xf86-video-glint/PKGBUILD +++ b/extra/xf86-video-glint/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163643 2012-07-17 16:20:51Z andyrtr $ +# $Id: PKGBUILD 168573 2012-10-13 11:44:48Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-glint pkgver=1.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="X.org GLINT/Permedia video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD index 4028be160..f48ca85ab 100644 --- a/extra/xf86-video-i128/PKGBUILD +++ b/extra/xf86-video-i128/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163645 2012-07-17 16:23:32Z andyrtr $ +# $Id: PKGBUILD 168574 2012-10-13 11:44:52Z andyrtr $ # Maintainer:Jan de Groot pkgname=xf86-video-i128 pkgver=1.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Number 9 I128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD index 6fd616360..a8ec213ce 100644 --- a/extra/xf86-video-i740/PKGBUILD +++ b/extra/xf86-video-i740/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 163647 2012-07-17 16:25:27Z andyrtr $ +# $Id: PKGBUILD 168575 2012-10-13 11:44:55Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-i740 pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Intel i740 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') -groups=('xorg-drivers' 'xorg') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78') diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 98739e106..c3e7b9ae5 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 167556 2012-10-02 18:42:38Z andyrtr $ +# $Id: PKGBUILD 168576 2012-10-13 11:45:01Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel pkgver=2.20.9 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') install=$pkgname.install pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools') -makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') +depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender') replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' + 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install index e3ddb5522..d523eb61a 100644 --- a/extra/xf86-video-intel/xf86-video-intel.install +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -1,8 +1,8 @@ post_install() { echo ">>> This driver now allows to switch" - echo ">>> between several acceleration methods." + echo ">>> between sna/uxa acceleration methods." echo ">>> Add to the device section in /etc/X11/xorg.conf" echo ">>> Option \"AccelMethod\" \"sna\"" - echo ">>> use uxa/xaa method if you run into trouble with sna." + echo ">>> use uxa method if you run into trouble with sna." } diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 474eab5de..92443de50 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 163649 2012-07-17 16:29:33Z andyrtr $ +# $Id: PKGBUILD 168577 2012-10-13 11:45:07Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-mach64 pkgver=6.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' ) +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') optdepends=('mach64-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) +sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218' + '27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-mach64/git_fixes.diff b/extra/xf86-video-mach64/git_fixes.diff new file mode 100644 index 000000000..aad11772e --- /dev/null +++ b/extra/xf86-video-mach64/git_fixes.diff @@ -0,0 +1,107 @@ +From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 18 Jul 2012 08:46:49 +0000 +Subject: mach64: fix build on 32-bit. + +tvout code only builds on 32-bit, fix build. + +Signed-off-by: Dave Airlie +--- +diff --git a/src/atiscreen.c b/src/atiscreen.c +index 2957877..b1fbd3c 100644 +--- a/src/atiscreen.c ++++ b/src/atiscreen.c +@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) + #ifdef TV_OUT + /* Fix-up TV out after ImpacTV probe */ + if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO) +- ATISwitchMode(0, pScreenInfo->currentMode, 0); ++ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode)); + #endif /* TV_OUT */ + + #ifdef XF86DRI_DEVEL +-- +cgit v0.9.0.2-2-gbebe +From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 26 Sep 2012 20:21:25 +0000 +Subject: Don't gratuitously disable Render when ShadowFBing + +There's no reason to do this, and I am at a loss to explain why that was +ever done. The first instance of this logic comes from xfree86 (over 11 +years ago!): + +http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16 + +Now, cfb never had Render support, so that might make some sense if +there was an intermediate uncommitted state where the driver used fb for +direct but cfb for shadowed. But that's really the only plausible +explanation I can think of. + +Signed-off-by: Adam Jackson +--- +diff --git a/src/atiscreen.c b/src/atiscreen.c +index b1fbd3c..62a4dd9 100644 +--- a/src/atiscreen.c ++++ b/src/atiscreen.c +@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- /* If applicable, initialise RENDER extension */ ++ /* initialise RENDER extension */ ++ if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1)) + { +- if (pATI->OptionShadowFB) +- { +- if (serverGeneration == 1) +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, +- "RENDER extension not supported with a shadowed" +- " framebuffer.\n"); +- } +- else if (!fbPictureInit(pScreen, NULL, 0) && +- (serverGeneration == 1)) +- { +- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, +- "RENDER extension initialisation failed.\n"); +- } ++ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, ++ "RENDER extension initialisation failed.\n"); + } + + xf86SetBlackWhitePixels(pScreen); +-- +cgit v0.9.0.2-2-gbebe +From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 02 Oct 2012 14:19:47 +0000 +Subject: Fix build with neither XAA nor EXA against xserver 1.13.0 + +Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined +before compat-api.h is parsed, otherwise you fail with: + +In file included from /usr/include/xorg/picturestr.h:28:0, + from /usr/include/xorg/exa.h:38, + from atimach64accel.h:31, + from atiscreen.c:46: +/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token +/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token +/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token +/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token + +Signed-off-by: Adam Jackson +--- +diff --git a/src/atistruct.h b/src/atistruct.h +index 702360b..98dc15e 100644 +--- a/src/atistruct.h ++++ b/src/atistruct.h +@@ -51,6 +51,7 @@ + + #endif /* TV_OUT */ + ++#include "picturestr.h" + #ifdef USE_EXA + #include "exa.h" + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index 79c9a9917..4d19ea417 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 167227 2012-09-28 19:49:02Z andyrtr $ +# $Id: PKGBUILD 168578 2012-10-13 11:45:11Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-mga pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mga video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') optdepends=('mga-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') +#conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index ca20ef851..3a2915274 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163653 2012-07-17 16:33:32Z andyrtr $ +# $Id: PKGBUILD 168579 2012-10-13 11:45:15Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-neomagic pkgver=1.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index b9c08bef3..7d947570c 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 166750 2012-09-17 16:20:09Z andyrtr $ +# $Id: PKGBUILD 168580 2012-10-13 11:45:21Z andyrtr $ # Maintainer: Andreas Radke # Contributor: buddabrod pkgname=xf86-video-nouveau pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') url="http://nouveau.freedesktop.org/" license=('GPL') -depends=('libdrm' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'xf86driproto') -conflicts=('xorg-server<1.11.99.902') +depends=('libdrm' 'udev' 'nouveau-dri') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') install=$pkgname.install source=($url/release/$pkgname-$pkgver.tar.bz2) diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 15a88f597..8ffda0a95 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 166181 2012-09-05 07:54:00Z andyrtr $ +# $Id: PKGBUILD 168581 2012-10-13 11:45:24Z andyrtr $ # Contributor: Paul Mattal # Maintainer: Juergen Hoetzel pkgname=xf86-video-openchrome pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) license=('custom') url="http://www.openchrome.org" depends=('libdrm' 'libxvmc') -makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri') replaces=('openchrome' 'xf86-video-via') +groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') -conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 31c15e8a5..62273c1b0 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 167229 2012-09-28 19:51:26Z andyrtr $ +# $Id: PKGBUILD 168582 2012-10-13 11:45:27Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-r128 pkgver=6.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') optdepends=('r128-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD index 907f978bd..a44856620 100644 --- a/extra/xf86-video-rendition/PKGBUILD +++ b/extra/xf86-video-rendition/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 166766 2012-09-18 18:43:37Z andyrtr $ +# $Id: PKGBUILD 168583 2012-10-13 11:45:31Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-rendition pkgver=4.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Rendition video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool' '!strip') -groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5') diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD index 4a63a6d46..1cc340295 100644 --- a/extra/xf86-video-s3/PKGBUILD +++ b/extra/xf86-video-s3/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 166769 2012-09-18 18:48:45Z andyrtr $ +# $Id: PKGBUILD 168584 2012-10-13 11:45:35Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-s3 pkgver=0.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org S3 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') -groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39') diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD index e7eed6c01..9ed62f972 100644 --- a/extra/xf86-video-s3virge/PKGBUILD +++ b/extra/xf86-video-s3virge/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 163657 2012-07-17 16:37:24Z andyrtr $ +# $Id: PKGBUILD 168585 2012-10-13 11:45:39Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-s3virge pkgver=1.10.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org S3 Virge video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=(!libtool) -groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e') diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index 8d4c50c33..423c0af69 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 163659 2012-07-17 16:39:29Z andyrtr $ +# $Id: PKGBUILD 168586 2012-10-13 11:45:43Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-savage pkgver=2.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') optdepends=('savage-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index 00a98177e..149367f7c 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 163661 2012-07-17 16:43:27Z andyrtr $ +# $Id: PKGBUILD 168587 2012-10-13 11:45:47Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-siliconmotion pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="X.org siliconmotion video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD index da414ed76..a44bde11c 100644 --- a/extra/xf86-video-sis/PKGBUILD +++ b/extra/xf86-video-sis/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 163663 2012-07-17 16:45:36Z andyrtr $ +# $Id: PKGBUILD 168588 2012-10-13 11:45:51Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-sis pkgver=0.10.7 -pkgrel=1 +pkgrel=2 pkgdesc="X.org SiS video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa' 'xf86dgaproto') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') optdepends=('sis-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD index 436edc120..7d9a9ee9f 100644 --- a/extra/xf86-video-sisusb/PKGBUILD +++ b/extra/xf86-video-sisusb/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 163665 2012-07-17 16:47:27Z andyrtr $ +# $Id: PKGBUILD 168589 2012-10-13 11:45:54Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-sisusb pkgver=0.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org SiS USB video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046') diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD index 39b4bc555..0e13090fd 100644 --- a/extra/xf86-video-tdfx/PKGBUILD +++ b/extra/xf86-video-tdfx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 163667 2012-07-17 16:49:31Z andyrtr $ +# $Id: PKGBUILD 168590 2012-10-13 11:45:58Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-tdfx pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org tdfx video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') optdepends=('tdfx-dri: DRI1 support from community repo') -conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD index 001edd620..a709ee1a2 100644 --- a/extra/xf86-video-trident/PKGBUILD +++ b/extra/xf86-video-trident/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163669 2012-07-17 16:51:34Z andyrtr $ +# $Id: PKGBUILD 168591 2012-10-13 11:46:02Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-trident pkgver=1.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Trident video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') -conflicts=('xorg-server<1.12.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=(!libtool) source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD index 7c482520f..a87980924 100644 --- a/extra/xf86-video-tseng/PKGBUILD +++ b/extra/xf86-video-tseng/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 163671 2012-07-17 16:53:38Z andyrtr $ +# $Id: PKGBUILD 168592 2012-10-13 11:46:06Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-tseng pkgver=1.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org tseng video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819') diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD index 16a11493d..680323861 100644 --- a/extra/xf86-video-v4l/PKGBUILD +++ b/extra/xf86-video-v4l/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153380 2012-03-12 20:55:02Z andyrtr $ +# $Id: PKGBUILD 168593 2012-10-13 11:46:14Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-v4l pkgver=0.2.0 -pkgrel=10 +pkgrel=11 pkgdesc="X.org v4l video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD index 565aeab9f..3f48ff9d6 100644 --- a/extra/xf86-video-vesa/PKGBUILD +++ b/extra/xf86-video-vesa/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163838 2012-07-21 10:36:33Z andyrtr $ +# $Id: PKGBUILD 168594 2012-10-13 11:46:21Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-vesa pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index a7a678bbf..fe5546265 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 154036 2012-03-21 19:49:43Z andyrtr $ +# $Id: PKGBUILD 168595 2012-10-13 11:46:27Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-vmware pkgver=12.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libdrm' 'svga-dri') -makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libxext') -conflicts=('xorg-server<1.11.99.903') +depends=('libdrm' 'svga-dri' 'mesa') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('efa47f365d88da245804a9934719ff860ed04f95') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) +sha1sums=('efa47f365d88da245804a9934719ff860ed04f95' + 'ad475b37e2614f365533a40da0fb5b9e2709e3c6') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xf86-video-vmware/git_fixes.diff b/extra/xf86-video-vmware/git_fixes.diff new file mode 100644 index 000000000..85894169e --- /dev/null +++ b/extra/xf86-video-vmware/git_fixes.diff @@ -0,0 +1,894 @@ +From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 20 Apr 2012 20:24:26 +0000 +Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces + +This fixes a failed assertion in the gallium/svga driver in the +svga_texture_get_handle() function. The texture resource wasn't +getting created with the PIPE_BIND_SHARED flag so the !cachable +assertion would fail and the X session would abort. This didn't +happen with release builds. + +Reviewed-by: Jakob Bornecrantz +--- +diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c +index 2a18762..8b30e45 100644 +--- a/vmwgfx/vmwgfx_xa_surface.c ++++ b/vmwgfx/vmwgfx_xa_surface.c +@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, + + vpix->staging_format = format; + vpix->staging_remove_flags = 0; +- vpix->staging_add_flags = XA_FLAG_RENDER_TARGET; ++ vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED; + + return TRUE; + } +-- +cgit v0.9.0.2-2-gbebe +From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 06 Jun 2012 08:58:01 +0000 +Subject: vmware: port vmware driver to new compat API + +This is a port of the vmware driver to the new compat API. + +Tested-by: Jakob Bornecrantz +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Dave Airlie +Signed-off-by: Jakob Bornecrantz +--- +diff --git a/saa/saa.c b/saa/saa.c +index 173c090..f2d68e9 100644 +--- a/saa/saa.c ++++ b/saa/saa.c +@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable) + * screen private, before calling down to the next CloseScreen. + */ + Bool +-saa_close_screen(int i, ScreenPtr pScreen) ++saa_close_screen(CLOSE_SCREEN_ARGS_DECL) + { + struct saa_screen_priv *sscreen = saa_screen(pScreen); + struct saa_driver *driver = sscreen->driver; +@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen) + + free(sscreen); + +- return (*pScreen->CloseScreen) (i, pScreen); ++ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); + } + + struct saa_driver * +diff --git a/saa/saa.h b/saa/saa.h +index c7aa3b6..4e5ced5 100644 +--- a/saa/saa.h ++++ b/saa/saa.h +@@ -44,6 +44,8 @@ + #include + #include + ++#include "../src/compat-api.h" ++ + #define SAA_VERSION_MAJOR 0 + #define SAA_VERSION_MINOR 1 + +@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr + saa_bitmap_to_region(PixmapPtr pPix); + + extern _X_EXPORT Bool +-saa_close_screen(int i, ScreenPtr pScreen); ++saa_close_screen(CLOSE_SCREEN_ARGS_DECL); + + extern _X_EXPORT Bool + saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC); +diff --git a/src/Makefile.am b/src/Makefile.am +index 04c9e0d..b0dd147 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -37,6 +37,7 @@ endif + vmware_drv_la_SOURCES = \ + bits2pixels.c \ + bits2pixels.h \ ++ compat-api.h \ + guest_os.h \ + includeCheck.h \ + svga_escape.h \ +diff --git a/src/compat-api.h b/src/compat-api.h +new file mode 100644 +index 0000000..6bc946f +--- a/dev/null ++++ b/src/compat-api.h +@@ -0,0 +1,99 @@ ++/* ++ * Copyright 2012 Red Hat, Inc. ++ * ++ * 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. ++ * ++ * Author: Dave Airlie ++ */ ++ ++/* this file provides API compat between server post 1.13 and pre it, ++ it should be reused inside as many drivers as possible */ ++#ifndef COMPAT_API_H ++#define COMPAT_API_H ++ ++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR ++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] ++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p ++#endif ++ ++#ifndef XF86_HAS_SCRN_CONV ++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#endif ++ ++#ifndef XF86_SCRN_INTERFACE ++ ++#define SCRN_ARG_TYPE int ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] ++ ++#define SCREEN_ARG_TYPE int ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] ++ ++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 ++ ++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 ++ ++#define FREE_SCREEN_ARGS_DECL int arg, int flags ++ ++#define VT_FUNC_ARGS_DECL int arg, int flags ++#define VT_FUNC_ARGS pScrn->scrnIndex, 0 ++ ++#define XF86_SCRN_ARG(x) ((x)->scrnIndex) ++#else ++#define SCRN_ARG_TYPE ScrnInfoPtr ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) ++ ++#define SCREEN_ARG_TYPE ScreenPtr ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) ++ ++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y ++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y ++ ++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode ++#define SWITCH_MODE_ARGS(arg, m) arg, m ++ ++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg ++ ++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg ++#define VT_FUNC_ARGS pScrn ++ ++#define XF86_SCRN_ARG(x) (x) ++ ++#endif ++ ++#endif +diff --git a/src/vmware.c b/src/vmware.c +index e3892f1..41201f1 100644 +--- a/src/vmware.c ++++ b/src/vmware.c +@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap) + pScrn->pScreen->rootDepth), + (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); + +- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE); +- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE); ++ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE); ++ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE); + } + + vgaHWProtect(pScrn, FALSE); +@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE) + } + + static void +-VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags) ++VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL) + { + /* FIXME */ + } +@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn) + } + + static Bool +-VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) ++VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + ScreenPtr save = &pVMWARE->ScrnFuncs; + +@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) + pScrn->DriverFunc = NULL; + #endif + +- return (*pScreen->CloseScreen)(scrnIndex, pScreen); ++ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); + } + + static Bool +@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1, + } + + static Bool +-VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ++VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) + { +- ScrnInfoPtr pScrn; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + vgaHWPtr hwp; + VMWAREPtr pVMWARE; + OptionInfoPtr options; + Bool useXinerama = TRUE; + +- /* Get the ScrnInfoRec */ +- pScrn = xf86Screens[pScreen->myNum]; + pVMWARE = VMWAREPTR(pScrn); + + +@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + VMWAREModeInit(pScrn, pScrn->currentMode, FALSE); + + /* Set the viewport if supported */ +- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); ++ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); + + /* + * Setup the screen's visuals, and initialise the framebuffer +@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + + static Bool +-VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +- ++VMWARESwitchMode(SWITCH_MODE_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + ScreenPtr pScreen = pScrn->pScreen; + + pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM + +@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) + } + + static Bool +-VMWAREEnterVT(int scrnIndex, int flags) ++VMWAREEnterVT(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + + /* +@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags) + } + + static void +-VMWARELeaveVT(int scrnIndex, int flags) ++VMWARELeaveVT(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + + /* +@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags) + } + + static void +-VMWAREFreeScreen(int scrnIndex, int flags) ++VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL) + { ++ SCRN_INFO_PTR(arg); + /* + * If the vgahw module is used vgaHWFreeHWRec() would be called + * here. + */ +- VMWAREFreeRec(xf86Screens[scrnIndex]); ++ VMWAREFreeRec(pScrn); + } + + static ModeStatus +-VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) ++VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) + { + return MODE_OK; + } +diff --git a/src/vmware.h b/src/vmware.h +index 458390a..4818e16 100644 +--- a/src/vmware.h ++++ b/src/vmware.h +@@ -177,7 +177,7 @@ typedef struct { + #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) + + static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { +- return xf86Screens[s->myNum]; ++ return xf86ScreenToScrn(s); + } + + #define MIN(a,b) ((a)<(b)?(a):(b)) +diff --git a/src/vmware_common.h b/src/vmware_common.h +index 9cd7194..5629c10 100644 +--- a/src/vmware_common.h ++++ b/src/vmware_common.h +@@ -32,6 +32,8 @@ + #include + #include + ++#include "compat-api.h" ++ + xXineramaScreenInfo * + VMWAREParseTopologyString(ScrnInfoPtr pScrn, + const char *topology, +diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c +index 1b82ac4..7de0772 100644 +--- a/vmwgfx/vmwgfx_dri2.c ++++ b/vmwgfx/vmwgfx_dri2.c +@@ -83,7 +83,7 @@ static Bool + dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format) + { + ScreenPtr pScreen = pDraw->pScreen; +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + BufferPrivatePtr private = buffer->driverPrivate; + PixmapPtr pPixmap; +@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, + Bool + xorg_dri2_init(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + DRI2InfoRec dri2info; + int major, minor; +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index ed1eb8c..9959ffb 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -107,14 +107,13 @@ typedef uint8_t uint8; + */ + + static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags); +-static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, +- char **argv); +-static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags); +-static void drv_adjust_frame(int scrnIndex, int x, int y, int flags); +-static Bool drv_enter_vt(int scrnIndex, int flags); +-static void drv_leave_vt(int scrnIndex, int flags); +-static void drv_free_screen(int scrnIndex, int flags); +-static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, ++static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); ++static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); ++static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); ++static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); ++static void drv_leave_vt(VT_FUNC_ARGS_DECL); ++static void drv_free_screen(FREE_SCREEN_ARGS_DECL); ++static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, + int flags); + + extern void xorg_tracker_set_functions(ScrnInfoPtr scrn); +@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn) + * Internal function definitions + */ + +-static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen); ++static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL); + + /* + * Internal functions +@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, + + void xorg_flush(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + PixmapPtr pixmap = NULL; +@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen) + free(pixmaps); + } + +-static void drv_block_handler(int i, pointer blockData, pointer pTimeout, +- pointer pReadmask) ++static void drv_block_handler(BLOCKHANDLER_ARGS_DECL) + { +- ScreenPtr pScreen = screenInfo.screens[i]; +- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); ++ SCREEN_PTR(arg); ++ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); + + vmwgfx_swap(ms, pScreen, BlockHandler); +- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); ++ pScreen->BlockHandler(BLOCKHANDLER_ARGS); + vmwgfx_swap(ms, pScreen, BlockHandler); + + vmwgfx_flush_dri2(pScreen); +@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout, + static Bool + drv_create_screen_resources(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + Bool ret; + +@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen) + if (!ret) + return ret; + +- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); ++ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); + +- return drv_enter_vt(pScreen->myNum, 1); ++ return drv_enter_vt(VT_FUNC_ARGS); + } + + static Bool +@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn) + static Bool + vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) + { +- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; + modesettingPtr ms = modesettingPTR(pScrn); +@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) + static Bool + vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) + { +- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; + modesettingPtr ms = modesettingPTR(pScrn); +@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors, + + + static Bool +-drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ++drv_screen_init(SCREEN_INIT_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + VisualPtr visual; + +@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + + static void +-drv_adjust_frame(int scrnIndex, int x, int y, int flags) ++drv_adjust_frame(ADJUST_FRAME_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + xf86OutputPtr output = config->output[config->compat_output]; + xf86CrtcPtr crtc = output->crtc; +@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags) + } + + static void +-drv_free_screen(int scrnIndex, int flags) ++drv_free_screen(FREE_SCREEN_ARGS_DECL) + { +- drv_free_rec(xf86Screens[scrnIndex]); ++ SCRN_INFO_PTR(arg); ++ drv_free_rec(pScrn); + } + + static void +-drv_leave_vt(int scrnIndex, int flags) ++drv_leave_vt(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + modesettingPtr ms = modesettingPTR(pScrn); + + vmwgfx_cursor_bypass(ms->fd, 0, 0); +@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags) + * This gets called when gaining control of the VT, and from ScreenInit(). + */ + static Bool +-drv_enter_vt(int scrnIndex, int flags) ++drv_enter_vt(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + + if (!drv_set_master(pScrn)) + return FALSE; +@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags) + } + + static Bool +-drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags) ++drv_switch_mode(SWITCH_MODE_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + + return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); + } + + static Bool +-drv_close_screen(int scrnIndex, ScreenPtr pScreen) ++drv_close_screen(CLOSE_SCREEN_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + + if (ms->cursor) { +@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) + xorg_dri2_close(pScreen); + + if (pScrn->vtSema) +- pScrn->LeaveVT(scrnIndex, 0); ++ pScrn->LeaveVT(VT_FUNC_ARGS); + + pScrn->vtSema = FALSE; + +@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) + if (ms->xat) + xa_tracker_destroy(ms->xat); + +- return (*pScreen->CloseScreen) (scrnIndex, pScreen); ++ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); + } + + static ModeStatus +-drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) ++drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) + { + return MODE_OK; + } +diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h +index 4fcfed6..f78a85f 100644 +--- a/vmwgfx/vmwgfx_driver.h ++++ b/vmwgfx/vmwgfx_driver.h +@@ -46,6 +46,7 @@ + #include + #include + ++#include "../src/compat-api.h" + #ifdef DRI2 + #include + #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3)) +@@ -118,9 +119,9 @@ typedef struct _modesettingRec + ScreenBlockHandlerProcPtr saved_BlockHandler; + CreateScreenResourcesProcPtr saved_CreateScreenResources; + CloseScreenProcPtr saved_CloseScreen; +- Bool (*saved_EnterVT)(int, int); +- void (*saved_LeaveVT)(int, int); +- void (*saved_AdjustFrame)(int, int, int, int); ++ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL); ++ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL); ++ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL); + Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr); + Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr); + +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 469598a..63df3a1 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen) + struct vmwgfx_saa *vsaa = + to_vmwgfx_saa(saa_get_driver(pScreen)); + struct _WsbmListHead *list, *next; +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + + if (!pScrn->vtSema) + return; +@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, + struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); + struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap); + struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix); +- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen); + + /* + * Make dri2 drawables up to date, or add them to the flush list +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index af53379..449266b 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn, + DrawablePtr pDraw) + { + struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; +- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ ScreenPtr pScreen = xf86ScrnToScreen(pScrn); + PixmapPtr pPixmap; + INT32 x1, x2, y1, y2; + BoxRec dstBox; +@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports) + static XF86VideoAdaptorPtr + xorg_setup_textured_adapter(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + XF86VideoAdaptorPtr adapt; + XF86AttributePtr attrs; +@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen) + void + xorg_xv_init(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + modesettingPtr ms = modesettingPTR(pScrn); + XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL; + XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL; +-- +cgit v0.9.0.2-2-gbebe +From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001 +From: Robert Hooker +Date: Fri, 15 Jun 2012 15:56:59 +0000 +Subject: vmware: Fix up some warnings after new compat API change. + +Fixes multiple instances of these warnings on x86_64: +../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration] +../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs] +../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default] +Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180 + +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Robert Hooker +Signed-off-by: Jakob Bornecrantz +--- +diff --git a/src/vmware.h b/src/vmware.h +index 4818e16..be113bb 100644 +--- a/src/vmware.h ++++ b/src/vmware.h +@@ -18,6 +18,7 @@ + #include "xf86.h" + #include "xf86_OSproc.h" + ++#include "compat-api.h" + + #include + +-- +cgit v0.9.0.2-2-gbebe +From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Sat, 16 Jun 2012 13:43:52 +0000 +Subject: vmware: drop infoFromScreen inline in favour of new interface + +This also should fix the build regression introduced with the fix +for this macro. + +Signed-off-by: Dave Airlie +--- +diff --git a/src/vmware.h b/src/vmware.h +index be113bb..028dff3 100644 +--- a/src/vmware.h ++++ b/src/vmware.h +@@ -18,8 +18,6 @@ + #include "xf86.h" + #include "xf86_OSproc.h" + +-#include "compat-api.h" +- + #include + + #ifdef XSERVER_LIBPCIACCESS +@@ -177,10 +175,6 @@ typedef struct { + + #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) + +-static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { +- return xf86ScreenToScrn(s); +-} +- + #define MIN(a,b) ((a)<(b)?(a):(b)) + #define MAX(a,b) ((a)>(b)?(a):(b)) + #define ABS(x) (((x) >= 0) ? (x) : -(x)) +diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c +index 2e2effb..93dacc0 100644 +--- a/src/vmwarecurs.c ++++ b/src/vmwarecurs.c +@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] = + #endif + + #include "vmware.h" ++#include "vmware_common.h" + #include "bits2pixels.h" + + static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, +@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) + static Bool + vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) + { +- ScrnInfoPtr pScrn = infoFromScreen(pScreen); ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n", + pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); +@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src ) + static Bool + vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) + { +- ScrnInfoPtr pScrn = infoFromScreen(pScreen); ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n", + pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); +@@ -283,7 +284,7 @@ Bool + vmwareCursorInit(ScreenPtr pScreen) + { + xf86CursorInfoPtr infoPtr; +- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); ++ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); + Bool ret; + + TRACEPOINT +@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen) + void + vmwareCursorCloseScreen(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = infoFromScreen(pScreen); ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + #ifdef RENDER + PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); +@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen) + void + vmwareCursorHookWrappers(ScreenPtr pScreen) + { +- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); ++ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); + #ifdef RENDER + PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); + #endif +@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, + unsigned int format, unsigned long planeMask, char *pBinImage) + { + ScreenPtr pScreen = src->pScreen; +- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen)); ++ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen)); + BoxRec box; + Bool hidden = FALSE; + +@@ -412,7 +413,7 @@ static void + VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) + { + ScreenPtr pScreen = pWin->drawable.pScreen; +- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen)); ++ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen)); + BoxPtr pBB; + Bool hidden = FALSE; + +@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, + CARD16 width, CARD16 height) + { + ScreenPtr pScreen = pDst->pDrawable->pScreen; +- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); ++ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); + PictureScreenPtr ps = GetPictureScreen(pScreen); + BoxRec box; + Bool hidden = FALSE; +diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c +index 71f21fe..745c71f 100644 +--- a/src/vmwarevideo.c ++++ b/src/vmwarevideo.c +@@ -39,6 +39,7 @@ + #endif + + #include "vmware.h" ++#include "vmware_common.h" + #include "xf86xv.h" + #include "fourcc.h" + #include "svga_escape.h" +@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE) + Bool + vmwareVideoInit(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = infoFromScreen(pScreen); ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL; + XF86VideoAdaptorPtr newAdaptor = NULL; + int numAdaptors; +@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen) + void + vmwareVideoEnd(ScreenPtr pScreen) + { +- ScrnInfoPtr pScrn = infoFromScreen(pScreen); ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + VMWAREVideoPtr pVid; + int i; +-- +cgit v0.9.0.2-2-gbebe +From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Tue, 03 Jul 2012 12:50:30 +0000 +Subject: vmware: avoid warnings about shadowing 'i' + +Signed-off-by: Dave Airlie +--- +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..205ac59 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -46,7 +46,7 @@ + #define SCREEN_ARG_TYPE int + #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv ++#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv + + #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask +-- +cgit v0.9.0.2-2-gbebe +From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001 +From: Jakob Bornecrantz +Date: Tue, 29 May 2012 21:01:14 +0000 +Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy + +Reviewed-by: Thomas Hellström +Signed-off-by: Jakob Bornecrantz +--- +diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c +index eaf87b2..fec04c0 100644 +--- a/vmwgfx/vmwgfx_crtc.c ++++ b/vmwgfx/vmwgfx_crtc.c +@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) + static void + crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) + { +- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen; ++ ScreenPtr pScreen; + ++ if (rotate_pixmap == NULL) ++ return; ++ ++ pScreen = rotate_pixmap->drawable.pScreen; + pScreen->DestroyPixmap(rotate_pixmap); + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD index 581cf0b90..abbcae874 100644 --- a/extra/xf86-video-voodoo/PKGBUILD +++ b/extra/xf86-video-voodoo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163673 2012-07-17 16:55:52Z andyrtr $ +# $Id: PKGBUILD 168596 2012-10-13 11:46:31Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-voodoo pkgver=1.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 3e63b912e..682321d85 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163163 2012-07-08 09:32:46Z ibiru $ +# $Id: PKGBUILD 168614 2012-10-13 11:49:44Z andyrtr $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -11,11 +11,11 @@ license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu') optdepends=('imagemagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ - 'mesa: for using the opengl plugin' \ + 'glu: for using the opengl plugin' \ 'wavpack: for using the wavpack plugin' \ 'faad2: for using the faad plugin' \ 'libmng: for using the mng plugin' \ diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 1d281bdef..36da56815 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 165604 2012-08-27 08:11:34Z jgc $ +# $Id: PKGBUILD 168552 2012-10-13 11:43:10Z andyrtr $ # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.4 -pkgrel=1 +pkgver=1.13.0 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') + 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch @@ -19,7 +19,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha256sums=('8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7' +sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' @@ -92,9 +92,10 @@ package_xorg-server-common() { package_xorg-server() { pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) + depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') + # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') groups=('xorg') conflicts=('nvidia-utils<=290.10') @@ -173,7 +174,12 @@ package_xorg-server-xdmx() { package_xorg-server-devel() { pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc + xproto randrproto renderproto xextproto inputproto kbproto + fontsproto pixman videoproto xf86driproto glproto + mesa dri2proto xineramaproto libpciaccess + # not technically required but almost every Xorg pkg needs it to build + xorg-util-macros) cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD index ebc84c67d..debe2701f 100644 --- a/gnome-unstable/networkmanager/PKGBUILD +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 167248 2012-09-29 10:55:58Z heftig $ +# $Id: PKGBUILD 168649 2012-10-13 19:17:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Jan de Groot # Contributor: Wael Nasreddine @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -28,13 +28,14 @@ backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch - nm-polkit-permissive.patch repair-signals.patch) + nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch) sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' - 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6') + 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6' + '8fe72946aa3b01d2205f3910bf07a3669c6c0218fb8d2bad45b6a27b48e3e496') build() { cd $_pkgname-$pkgver @@ -43,6 +44,8 @@ build() { patch -Np1 -i ../dnsmasq-path.patch patch -Np1 -i ../nm-polkit-permissive.patch patch -Np1 -i ../repair-signals.patch # FS#31115 + patch -Np1 -i ../systemd-sleep.patch + AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi ./configure \ --prefix=/usr \ diff --git a/gnome-unstable/networkmanager/systemd-sleep.patch b/gnome-unstable/networkmanager/systemd-sleep.patch new file mode 100644 index 000000000..2240594b2 --- /dev/null +++ b/gnome-unstable/networkmanager/systemd-sleep.patch @@ -0,0 +1,637 @@ +From 64fd8eea7706038e5d38c8463a1c765ed9331db2 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Tue, 9 Oct 2012 00:36:35 -0400 +Subject: [PATCH 1/2] core: factor out the upower suspend/resume code (bgo + #677694) + +Factor the code that listens for upower sleeping and resuming +signals out into a class code NMSleepMonitor. +--- + src/Makefile.am | 2 + + src/nm-manager.c | 40 +++++-------- + src/nm-sleep-monitor.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/nm-sleep-monitor.h | 46 +++++++++++++++ + 4 files changed, 214 insertions(+), 26 deletions(-) + create mode 100644 src/nm-sleep-monitor.c + create mode 100644 src/nm-sleep-monitor.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index b155209..9484a1f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -191,6 +191,8 @@ NetworkManager_SOURCES = \ + nm-session-monitor.h \ + nm-session-utils.c \ + nm-session-utils.h \ ++ nm-sleep-monitor.h \ ++ nm-sleep-monitor.c \ + nm-connection-provider.h \ + nm-connection-provider.c \ + nm-dispatcher.c \ +diff --git a/src/nm-manager.c b/src/nm-manager.c +index 618c4ed..8adb409 100644 +--- a/src/nm-manager.c ++++ b/src/nm-manager.c +@@ -69,6 +69,7 @@ + #include "nm-device-factory.h" + #include "wifi-utils.h" + #include "nm-enum-types.h" ++#include "nm-sleep-monitor.h" + + #if WITH_CONCHECK + #include "nm-connectivity.h" +@@ -78,8 +79,6 @@ + #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" + #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" + +-#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" +- + static gboolean impl_manager_get_devices (NMManager *manager, + GPtrArray **devices, + GError **err); +@@ -228,7 +227,7 @@ typedef struct { + guint modem_removed_id; + + DBusGProxy *aipd_proxy; +- DBusGProxy *upower_proxy; ++ NMSleepMonitor *sleep_monitor; + + GSList *auth_chains; + +@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self, + } + + static void +-upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) ++sleeping_cb (DBusGProxy *proxy, gpointer user_data) + { +- nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); ++ nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal"); + _internal_sleep (NM_MANAGER (user_data), TRUE); + } + + static void +-upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) ++resuming_cb (DBusGProxy *proxy, gpointer user_data) + { +- nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); ++ nm_log_dbg (LOGD_SUSPEND, "Received resuming signal"); + _internal_sleep (NM_MANAGER (user_data), FALSE); + } + +@@ -4049,8 +4048,8 @@ dispose (GObject *object) + if (priv->aipd_proxy) + g_object_unref (priv->aipd_proxy); + +- if (priv->upower_proxy) +- g_object_unref (priv->upower_proxy); ++ if (priv->sleep_monitor) ++ g_object_unref (priv->sleep_monitor); + + if (priv->fw_monitor) { + if (priv->fw_monitor_id) +@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager) + } else + nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy"); + +- /* upower sleep/wake handling */ +- priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection, +- UPOWER_DBUS_SERVICE, +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower"); +- if (priv->upower_proxy) { +- dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID); +- dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping", +- G_CALLBACK (upower_sleeping_cb), +- manager, NULL); +- +- dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID); +- dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming", +- G_CALLBACK (upower_resuming_cb), +- manager, NULL); +- } else +- nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); ++ /* sleep/wake handling */ ++ priv->sleep_monitor = nm_sleep_monitor_get (); ++ g_signal_connect (priv->sleep_monitor, "Sleeping", ++ G_CALLBACK (sleeping_cb), manager); ++ g_signal_connect (priv->sleep_monitor, "Resuming", ++ G_CALLBACK (resuming_cb), manager); + + /* Listen for authorization changes */ + nm_auth_changed_func_register (authority_changed_cb, manager); +diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c +new file mode 100644 +index 0000000..488200e +--- /dev/null ++++ b/src/nm-sleep-monitor.c +@@ -0,0 +1,152 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * (C) Copyright 2012 Red Hat, Inc. ++ * Author: Matthias Clasen ++ */ ++ ++#include "config.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include "nm-logging.h" ++#include "nm-dbus-manager.h" ++ ++#include "nm-sleep-monitor.h" ++ ++#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" ++ ++struct _NMSleepMonitor { ++ GObject parent_instance; ++ ++ DBusGProxy *upower_proxy; ++}; ++ ++struct _NMSleepMonitorClass { ++ GObjectClass parent_class; ++ ++ void (*sleeping) (NMSleepMonitor *monitor); ++ void (*resuming) (NMSleepMonitor *monitor); ++}; ++ ++ ++enum { ++ SLEEPING, ++ RESUMING, ++ LAST_SIGNAL, ++}; ++static guint signals[LAST_SIGNAL] = {0}; ++ ++G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); ++ ++/********************************************************************/ ++ ++static void ++upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) ++{ ++ nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); ++ g_signal_emit (user_data, signals[SLEEPING], 0); ++} ++ ++static void ++upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) ++{ ++ nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); ++ g_signal_emit (user_data, signals[RESUMING], 0); ++} ++ ++static void ++nm_sleep_monitor_init (NMSleepMonitor *self) ++{ ++ NMDBusManager *dbus_mgr; ++ DBusGConnection *bus; ++ ++ dbus_mgr = nm_dbus_manager_get (); ++ bus = nm_dbus_manager_get_connection (dbus_mgr); ++ self->upower_proxy = dbus_g_proxy_new_for_name (bus, ++ UPOWER_DBUS_SERVICE, ++ "/org/freedesktop/UPower", ++ "org.freedesktop.UPower"); ++ if (self->upower_proxy) { ++ dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping", ++ G_CALLBACK (upower_sleeping_cb), ++ self, NULL); ++ ++ dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming", ++ G_CALLBACK (upower_resuming_cb), ++ self, NULL); ++ } else ++ nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); ++ g_object_unref (bus); ++ g_object_unref (dbus_mgr); ++} ++ ++static void ++finalize (GObject *object) ++{ ++ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); ++ ++ if (self->upower_proxy) ++ g_object_unref (self->upower_proxy); ++ ++ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) ++ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); ++} ++ ++static void ++nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ ++ gobject_class->finalize = finalize; ++ ++ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++} ++ ++NMSleepMonitor * ++nm_sleep_monitor_get (void) ++{ ++ static NMSleepMonitor *singleton = NULL; ++ ++ if (singleton) ++ return g_object_ref (singleton); ++ ++ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); ++ return singleton; ++} ++ ++/* ---------------------------------------------------------------------------------------------------- */ +diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h +new file mode 100644 +index 0000000..173e6a1 +--- /dev/null ++++ b/src/nm-sleep-monitor.h +@@ -0,0 +1,46 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * (C) Copyright 2012 Red Hat, Inc. ++ * Author: Matthias Clasen ++ */ ++ ++#ifndef NM_SLEEP_MONITOR_H ++#define NM_SLEEP_MONITOR_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) ++#define NM_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor)) ++#define NM_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) ++#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) ++#define NM_IS_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR)) ++#define NM_IS_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR)) ++ ++#define NM_SLEEP_MONITOR_SLEEPING "sleeping" ++#define NM_SLEEP_MONITOR_RESUMING "resuming" ++ ++typedef struct _NMSleepMonitor NMSleepMonitor; ++typedef struct _NMSleepMonitorClass NMSleepMonitorClass; ++ ++GType nm_sleep_monitor_get_type (void) G_GNUC_CONST; ++NMSleepMonitor *nm_sleep_monitor_get (void); ++ ++G_END_DECLS ++ ++#endif /* NM_SLEEP_MONITOR_H */ ++ +-- +1.7.12.2 + + + +From ea0c3a3e0fcbe400a704692d3b436d4733d348a1 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Tue, 9 Oct 2012 00:39:03 -0400 +Subject: [PATCH 2/2] core: add a systemd suspend/resume monitor (bgo #677694) + +This implementation uses a delay inhibitor to get systemd to +emit PrepareForSleep, and then emits ::Sleeping and ::Resuming +when receiving the before/after PrepareForSleep emissions. +--- + configure.ac | 2 +- + src/Makefile.am | 9 +- + src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++ + ...m-sleep-monitor.c => nm-sleep-monitor-upower.c} | 0 + 4 files changed, 225 insertions(+), 3 deletions(-) + create mode 100644 src/nm-sleep-monitor-systemd.c + rename src/{nm-sleep-monitor.c => nm-sleep-monitor-upower.c} (100%) + +diff --git a/configure.ac b/configure.ac +index e76e193..9152c23 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) + AC_SUBST(GUDEV_CFLAGS) + AC_SUBST(GUDEV_LIBS) + +-PKG_CHECK_MODULES(GIO, gio-2.0) ++PKG_CHECK_MODULES(GIO, gio-unix-2.0) + AC_SUBST(GIO_CFLAGS) + AC_SUBST(GIO_LIBS) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9484a1f..ba7d2d6 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -192,7 +192,6 @@ NetworkManager_SOURCES = \ + nm-session-utils.c \ + nm-session-utils.h \ + nm-sleep-monitor.h \ +- nm-sleep-monitor.c \ + nm-connection-provider.h \ + nm-connection-provider.c \ + nm-dispatcher.c \ +@@ -203,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h + endif + + if SESSION_TRACKING_SYSTEMD +-NetworkManager_SOURCES += nm-session-monitor-systemd.c ++NetworkManager_SOURCES += \ ++ nm-session-monitor-systemd.c \ ++ nm-sleep-monitor-systemd.c + else + if SESSION_TRACKING_CK + NetworkManager_SOURCES += nm-session-monitor-ck.c + else + NetworkManager_SOURCES += nm-session-monitor-null.c + endif ++ ++# UPower suspend/resume used whenever systemd is not enabled ++NetworkManager_SOURCES += nm-sleep-monitor-upower.c + endif + + nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml +@@ -285,6 +289,7 @@ BUILT_SOURCES = \ + NetworkManager_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ ++ $(GIO_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(GMODULE_CFLAGS) \ +diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c +new file mode 100644 +index 0000000..70adc89 +--- /dev/null ++++ b/src/nm-sleep-monitor-systemd.c +@@ -0,0 +1,217 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * (C) Copyright 2012 Red Hat, Inc. ++ * Author: Matthias Clasen ++ */ ++ ++#include "config.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "nm-logging.h" ++#include "nm-dbus-manager.h" ++ ++#include "nm-sleep-monitor.h" ++ ++#define SD_NAME "org.freedesktop.login1" ++#define SD_PATH "/org/freedesktop/login1" ++#define SD_INTERFACE "org.freedesktop.login1.Manager" ++ ++ ++struct _NMSleepMonitor { ++ GObject parent_instance; ++ ++ GDBusProxy *sd_proxy; ++ gint inhibit_fd; ++}; ++ ++struct _NMSleepMonitorClass { ++ GObjectClass parent_class; ++ ++ void (*sleeping) (NMSleepMonitor *monitor); ++ void (*resuming) (NMSleepMonitor *monitor); ++}; ++ ++ ++enum { ++ SLEEPING, ++ RESUMING, ++ LAST_SIGNAL, ++}; ++static guint signals[LAST_SIGNAL] = {0}; ++ ++G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); ++ ++/********************************************************************/ ++ ++static void ++inhibit_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *sd_proxy = G_DBUS_PROXY (source); ++ NMSleepMonitor *self = user_data; ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error); ++ if (!res) { ++ nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message); ++ g_error_free (error); ++ } else { ++ if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1) ++ nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back"); ++ ++ self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL); ++ ++ nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++static void ++take_inhibitor (NMSleepMonitor *self) ++{ ++ g_assert (self->inhibit_fd == -1); ++ ++ nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor"); ++ g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy, ++ "Inhibit", ++ g_variant_new ("(ssss)", ++ "sleep", ++ g_get_user_name (), ++ "inhibited", ++ "delay"), ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_done, ++ self); ++} ++ ++static gboolean ++drop_inhibitor (NMSleepMonitor *self) ++{ ++ if (self->inhibit_fd >= 0) { ++ nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor"); ++ close (self->inhibit_fd); ++ self->inhibit_fd = -1; ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++static void ++signal_cb (GDBusProxy *proxy, ++ const gchar *sendername, ++ const gchar *signalname, ++ GVariant *args, ++ gpointer data) ++{ ++ NMSleepMonitor *self = data; ++ gboolean is_about_to_suspend; ++ ++ if (strcmp (signalname, "PrepareForSleep") != 0) ++ return; ++ ++ g_variant_get (args, "(b)", &is_about_to_suspend); ++ nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend); ++ ++ if (is_about_to_suspend) { ++ g_signal_emit (self, signals[SLEEPING], 0); ++ drop_inhibitor (self); ++ } else { ++ take_inhibitor (self); ++ g_signal_emit (self, signals[RESUMING], 0); ++ } ++} ++ ++static void ++nm_sleep_monitor_init (NMSleepMonitor *self) ++{ ++ GDBusConnection *bus; ++ ++ self->inhibit_fd = -1; ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); ++ self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL, ++ SD_NAME, SD_PATH, SD_INTERFACE, ++ NULL, NULL); ++ g_object_unref (bus); ++ g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self); ++ take_inhibitor (self); ++} ++ ++static void ++finalize (GObject *object) ++{ ++ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); ++ ++ drop_inhibitor (self); ++ if (self->sd_proxy) ++ g_object_unref (self->sd_proxy); ++ ++ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) ++ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); ++} ++ ++static void ++nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ ++ gobject_class->finalize = finalize; ++ ++ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++} ++ ++NMSleepMonitor * ++nm_sleep_monitor_get (void) ++{ ++ static NMSleepMonitor *singleton = NULL; ++ ++ if (singleton) ++ return g_object_ref (singleton); ++ ++ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); ++ return singleton; ++} ++ ++/* ---------------------------------------------------------------------------------------------------- */ +diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor-upower.c +similarity index 100% +rename from src/nm-sleep-monitor.c +rename to src/nm-sleep-monitor-upower.c +-- +1.7.12.2 + diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index bcf1c0922..008b94310 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index ce44c6bcd..d63eb96f7 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 4feb1ac6f..d544abb26 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=45 +_sublevel=46 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.44 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.45 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '74df2b1ddb4f50eed20df1dbfda040cd' + 'a2ced38cb23963b9efef79100f5885c5' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -40,7 +40,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '31878a4cf1dd4083a61982199b4ee650') + '2fb6f217d649733bd5d977bf32c1f292') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 843a3ce27..57f19a417 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.45-1-LIBRE-LTS +KERNEL_VERSION=3.0.46-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 61ba504a7..a0f8777e6 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '62d272c8ec79bd2eb9cc56001aaf1042' - '8262778cb9c808d1c33f3e3c726e48e3' - 'e0ba119c57f72d467995e8e63a69b2ab' + '1014a197e2bea449600d7b2cca415eec' + '600af9b069c8a1c18dd5ef1f25bf7080' + 'c18004748092bf4ee57ade7e25fdef22' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '5dd9f2e6717ed2639c1685cffe034b7f') + '1690532ad271b11a87e8824f7da65101') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index e3598a3e0..e553c3d44 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1325,7 +1325,7 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y +# CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y @@ -2449,7 +2449,6 @@ CONFIG_IWLDVM=m # # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_IWLWIFI_DEVICE_TESTMODE=y # CONFIG_IWLWIFI_P2P is not set # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set CONFIG_IWLEGACY=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 3263e4dca..479c39929 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1282,7 +1282,7 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y +# CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y @@ -2330,7 +2330,6 @@ CONFIG_IWLDVM=m # # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_IWLWIFI_DEVICE_TESTMODE=y # CONFIG_IWLWIFI_P2P is not set # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set CONFIG_IWLEGACY=m diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 389ab27c6..e5af2a1bd 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.1-1-LIBRE +KERNEL_VERSION=3.6.2-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/multilib/lib32-catalyst-utils/PKGBUILD b/multilib/lib32-catalyst-utils/PKGBUILD index 1f57c82b6..e94f84b62 100644 --- a/multilib/lib32-catalyst-utils/PKGBUILD +++ b/multilib/lib32-catalyst-utils/PKGBUILD @@ -1,46 +1,48 @@ -# $Id: PKGBUILD 77082 2012-10-04 12:27:22Z lcarlier $ +# $Id: PKGBUILD 77685 2012-10-13 13:39:25Z lcarlier $ # Maintainer: Laurent Carlier # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=lib32-catalyst-utils -pkgver=12.8 -pkgrel=1 +pkgver=12.9 +pkgrel=0.1 pkgdesc="AMD Catalyst drivers libraries (32 bits)" arch=('x86_64') url="http://www.amd.com" license=('custom') -source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip") -md5sums=('41c5478322b13be6909eeb46412a3aa0') +source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b') provides=('lib32-libgl') conflicts=('lib32-libgl' 'lib32-nvidia-utils') -depends=("catalyst-utils=${pkgver}") -build() { - cd ${srcdir} - - sh ./amd-driver-installer*.run --extract fglrx-install -} +#build() { +# cd ${srcdir} +# +# sh ./amd-driver-installer*.run --extract fglrx-install +#} package() { + depends=("catalyst-utils=${pkgver}") + install -dm755 "${pkgdir}"/usr/bin install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}} # binaries - cd ${srcdir}/fglrx-install + cd ${srcdir} install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32" install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32" # dri/gl/... drivers - cd ${srcdir}/fglrx-install/xpic/usr/X11R6/lib/modules + cd ${srcdir}/xpic/usr/X11R6/lib/modules install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/" - cd ${srcdir}/fglrx-install/arch/x86/usr/X11R6/lib + cd ${srcdir}/arch/x86/usr/X11R6/lib install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/" ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/" install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/" install -m755 *.so* "${pkgdir}/usr/lib32/" install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/" - cd ${srcdir}/fglrx-install/arch/x86/usr/lib + cd ${srcdir}/arch/x86/usr/lib install -m755 *.so* "${pkgdir}/usr/lib32/" # needed symlinks ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1" @@ -54,5 +56,5 @@ package() { rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* # licenses - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" } diff --git a/multilib/lib32-glew/PKGBUILD b/multilib/lib32-glew/PKGBUILD index cc1f6f06f..f93d91895 100644 --- a/multilib/lib32-glew/PKGBUILD +++ b/multilib/lib32-glew/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 74807 2012-08-05 18:43:15Z bluewind $ +# $Id: PKGBUILD 77618 2012-10-13 11:32:25Z allan $ # Maintainer: Florian Pritz _pkgbasename=glew pkgname=lib32-$_pkgbasename pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" arch=('x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') -depends=('lib32-libxmu' 'lib32-libxi' 'lib32-mesa' "$_pkgbasename>=$pkgver") +depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver") makedepends=('gcc-multilib') source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') diff --git a/multilib/lib32-glu/PKGBUILD b/multilib/lib32-glu/PKGBUILD new file mode 100644 index 000000000..dcf535b67 --- /dev/null +++ b/multilib/lib32-glu/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 77675 2012-10-13 12:37:35Z bluewind $ +# Maintainer: Laurent Carlier + +pkgname=lib32-glu +pkgver=9.0.0 +pkgrel=1 +pkgdesc="Mesa OpenGL utility library (32 bits)" +arch=('x86_64') +url="http://mesa.freedesktop.org/" +license=('LGPL') +depends=('lib32-libgl') +makedepends=('gcc-multilib' 'lib32-mesa') +options=('!libtool') +source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2) +sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') + +build() { + cd ${srcdir}/glu-$pkgver + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --disable-static \ + --libdir=/usr/lib32 + make +} + +check() { + cd "$srcdir/glu-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + make -k check +} + +package() { + cd ${srcdir}/glu-$pkgver + + make DESTDIR=${pkgdir} install + + rm -rf ${pkgdir}/usr/include +} diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD index b5b1feb33..dde7c6c56 100644 --- a/multilib/lib32-gnutls/PKGBUILD +++ b/multilib/lib32-gnutls/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77416 2012-10-09 17:45:23Z bluewind $ +# $Id: PKGBUILD 77613 2012-10-13 10:53:28Z bluewind $ # Maintainer: Florian Pritz # Contributor: Christoph Vigano # Contributor: Biru Ionut @@ -6,7 +6,7 @@ # Contributor: Mikko Seppälä _pkgbasename=gnutls pkgname=lib32-$_pkgbasename -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" arch=('x86_64') @@ -16,8 +16,8 @@ options=('!libtool') depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' 'lib32-libtasn1' $_pkgbasename) makedepends=('gcc-multilib' 'lib32-libidn') source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz{,.sig}) -md5sums=('5d722e5850d79269ba413b0e69b9e14f' - '2764135bac008654a0b2fdd9fc6e62d1') +md5sums=('8a7b47456f65ffa8c01c58461fed1388' + 'ecd7bfe70612f88afd117124e18444df') build() { export CC="gcc -m32" diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index 591a51d11..284026eef 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 74678 2012-08-01 20:07:21Z lcarlier $ +# $Id: PKGBUILD 77676 2012-10-13 12:39:51Z bluewind $ # Contributor: Jan de Groot # Contributor: Andreas Radke pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-osmesa' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-libgbm') # 'lib32-nouveau-dri' - +pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' + 'lib32-nouveau-dri') # lib32-libgbm needs udev #_git=true -_gitdate=20111031 +#_gitdate=20121005 _git=false if [ "${_git}" = "true" ]; then - #pkgver=7.10.99.git20110709 - pkgver=7.11 + pkgver=8.99.git_$_gitdate else - pkgver=8.0.4 + pkgver=9.0 fi -pkgrel=4 +pkgrel=1 arch=('x86_64') -makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' - 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') +makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' + 'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' + 'gcc-multilib' 'imake' 'lib32-llvm') url="http://mesa3d.sourceforge.net" license=('custom') -source=('mesa-8.0.3-llvm-3.1-fixes.patch') +options=('!libtool') +source=(git_fixes.diff) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") - md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') + # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") - md5sums=('0082f4d17674155aa13bc611a5687788' - 'd546f988adfdf986cff45b1efa2d8a46') fi -#options=('!buildflags') +md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee' + '60e557ce407be3732711da484ab3db6c') build() { export CC="gcc -m32" @@ -47,14 +47,14 @@ build() { cd ${srcdir}/?esa-* - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" - - autoreconf -vfi + # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b + patch -Np1 -i ${srcdir}/git_fixes.diff - if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ + COMMONOPTS="--prefix=/usr \ + --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --enable-gallium-llvm \ --disable-gallium-egl --enable-shared-glapi \ --enable-shared-glapi \ @@ -64,173 +64,194 @@ build() { --enable-gles2 \ --disable-egl \ --enable-texture-float \ - --enable-shared-dricore \ - --enable-gbm \ --enable-osmesa \ --enable-32-bit \ - --libdir=/usr/lib32 - # --enable-gallium-svga \ + --libdir=/usr/lib32 " + # --enable-gbm disabled because it needs udev + + if [ "${_git}" = "true" ]; then + ./autogen.sh \ + $COMMONOPTS else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,svga,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,swrast \ - --enable-gallium-llvm \ - --disable-gallium-egl --enable-shared-glapi \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --disable-egl \ - --enable-gbm \ - --enable-osmesa \ - --enable-texture-float \ - --enable-shared-dricore \ - --enable-32-bit \ - --libdir=/usr/lib32 -# --with-gallium-drivers=r300,r600,nouveau,swrast \ # also without --with-dri-driver + autoreconf -vfi + ./configure \ + $COMMONOPTS fi make } +package_lib32-libglapi() { + depends=('lib32-glibc' 'libglapi') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" + + cd ${srcdir}/?esa-* + + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" +} + package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl') + depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi' + 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - #replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri') + # currently disabled so force the remove + conflicts=('lib32-libgbm') + replace=('lib32-libgbm') cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" - bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" + # libGL & libdricore + make -C src/glx DESTDIR="${pkgdir}" install + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + # --with-gallium-drivers=swrast + make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share,bin} install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" + ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl" } -package_lib32-osmesa() { - depends=('lib32-mesa') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library (32-bits)" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa -} +package_lib32-mesa() { + # check also gl.pc + depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb' + 'lib32-libxxf86vm' 'mesa') + pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" -package_lib32-libglapi() { - depends=('lib32-glibc' 'libglapi') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" + cd ${srcdir}/?esa-* - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/" + # .pc files + make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" } -package_lib32-libgbm() { - depends=('lib32-glibc') - pkgdesc="Mesa gbm library (32-bit)" +package_lib32-osmesa() { + depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + pkgdesc="Mesa 3D off-screen rendering library (32-bits)" - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - bin/minstall lib32/libgbm.so* "${pkgdir}/usr/lib32/" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib32/pkgconfig/" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm" + make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall } +# package_lib32-libgbm() { +# depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm') +# pkgdesc="Mesa gbm library (32-bit)" +# +# cd ${srcdir}/?esa-* +# +# # fix linking because of splitted package +# make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install +# +# make -C src/gbm DESTDIR="${pkgdir}" install +# +# # fix linking because of splitted package - cleanup +# make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall +# +# install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" +# ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm" +# } + package_lib32-libgles() { - depends=('lib32-libglapi' 'libgles') + depends=('lib32-libglapi' 'lib32-libdrm' 'libgles') pkgdesc="Mesa GLES libraries (32-bit)" cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" -} - -#package_lib32-libegl() { -# depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl') -# pkgdesc="Mesa libEGL libraries (32-bit)" -# -# cd ${srcdir}/?esa-* -# make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install -# -# install -m755 -d "${pkgdir}/usr/lib32" -# install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" -# install -m755 -d "${pkgdir}/usr/lib32/egl" -# bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" -# bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" -# bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" -# -# install -m755 -d "${pkgdir}/usr/share/licenses/libegl" -# ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" -#} -package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') - pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib32/libGL.so"* - rm -f "${pkgdir}/usr/lib32/libglapi.so"* - rm -f "${pkgdir}/usr/lib32/libgbm.so"* - rm -f "${pkgdir}/usr/lib32/libGLESv"* - rm -f "${pkgdir}/usr/lib32/libEGL"* - rm -rf "${pkgdir}/usr/lib32/egl" - rm -f "${pkgdir}/usr/lib32/libOSMesa"* - rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} - rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} + # --enable-gles1 --enable-gles2 + make -C src/mapi/es1api DESTDIR="${pkgdir}" install + make -C src/mapi/es2api DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" + # fix linking because of splitted package - cleanup + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + rm -r "${pkgdir}"/usr/include + + install -m755 -d "${pkgdir}/usr/share/licenses/libgles" + ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" } package_lib32-ati-dri() { - depends=("lib32-libgl=${pkgver}") + depends=("lib32-libgl=${pkgver}" 'ati-dri') pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" conflicts=('xf86-video-ati<6.9.0-6') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa drivers for radeon,r200 - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install + # gallium3D driver for r300,r600 + make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" + ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri" } package_lib32-intel-dri() { - depends=("lib32-libgl=${pkgver}") + depends=("lib32-libgl=${pkgver}" 'intel-dri') pkgdesc="Mesa DRI drivers for Intel (32-bit)" - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" + ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri" } package_lib32-nouveau-dri() { - depends=("lib32-libgl=${pkgver}") + depends=("lib32-libgl=${pkgver}" 'nouveau-dri') pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install + make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" + ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri" } diff --git a/multilib/lib32-mesa/git_fixes.diff b/multilib/lib32-mesa/git_fixes.diff new file mode 100644 index 000000000..8132d1d10 --- /dev/null +++ b/multilib/lib32-mesa/git_fixes.diff @@ -0,0 +1,93 @@ +From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 +From: Ian Romanick +Date: Mon, 08 Oct 2012 22:07:10 +0000 +Subject: docs: Add 9.0 release md5sums + +Signed-off-by: Ian Romanick +--- +diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html +index d72c5bb..02b7324 100644 +--- a/docs/relnotes-9.0.html ++++ b/docs/relnotes-9.0.html +@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. + +

MD5 checksums

+ 
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+
+ + +-- +cgit v0.9.0.2-2-gbebe +From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:47:40 +0000 +Subject: mesa: don't call TexImage driver hooks for zero-sized images + +This simply avoids some failed assertions but there's no reason to +call the driver hooks for storing a tex image if its size is zero. + +Note: This is a candidate for the stable branches. +(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 21646cc..8004876 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, + border, internalFormat, texFormat); + + /* Give the texture to the driver. may be null. */ +- if (compressed) { +- ctx->Driver.CompressedTexImage(ctx, dims, texImage, +- imageSize, pixels); +- } +- else { +- ctx->Driver.TexImage(ctx, dims, texImage, format, +- type, pixels, unpack); ++ if (width > 0 && height > 0 && depth > 0) { ++ if (compressed) { ++ ctx->Driver.CompressedTexImage(ctx, dims, texImage, ++ imageSize, pixels); ++ } ++ else { ++ ctx->Driver.TexImage(ctx, dims, texImage, format, ++ type, pixels, unpack); ++ } + } + + check_gen_mipmap(ctx, target, texObj, level); +-- +cgit v0.9.0.2-2-gbebe +From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:59:27 +0000 +Subject: mesa: fix error check for zero-sized compressed subtexture + +For glCompressedTexSubImage, width or height = 0 is legal. +Fixes a failure in piglit's s3tc-errors test. + +This is for the 9.0 and 8.0 branches. Already fixed on master. +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 8004876..38fa9fa 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, + if (!_mesa_is_compressed_format(ctx, format)) + return GL_INVALID_ENUM; + +- if (width < 1 || width > maxTextureSize) ++ if (width < 0 || width > maxTextureSize) + return GL_INVALID_VALUE; + +- if ((height < 1 || height > maxTextureSize) ++ if ((height < 0 || height > maxTextureSize) + && dimensions > 1) + return GL_INVALID_VALUE; + +-- +cgit v0.9.0.2-2-gbebe diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index a5fec610b..7abeae26c 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 76761 2012-09-29 12:58:36Z bluewind $ +# $Id: PKGBUILD 77690 2012-10-13 14:39:25Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora pkgname=wine -pkgver=1.5.14 +pkgver=1.5.15 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}) -md5sums=('f84c54bd7422328e96b6cf14ee6e163c' - 'dd0c87e2dea529f0c898fe2ffa5390ce') +md5sums=('41728374d14d0f13552250c70c0d40d2' + '6d8a5749f3f7d45340fc9e43e906c238') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -28,6 +28,7 @@ depends=( libxdamage lib32-libxdamage libxi lib32-libxi gettext lib32-gettext + glu lib32-glu desktop-file-utils ) diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD index 2cf05544d..5ad2678e6 100644 --- a/multilib/wine_gecko/PKGBUILD +++ b/multilib/wine_gecko/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74651 2012-08-01 08:37:25Z bluewind $ +# $Id: PKGBUILD 77615 2012-10-13 10:57:22Z bluewind $ # Maintainer: Jan "heftig" Steffens # Contributor: Nicky726 (Nicky726 gmail com) # Contributor: Allan McRae (allan archlinux org) # Contributor: Alexander 'bas' Brovikov (bas it-core org) pkgname=wine_gecko -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" arch=(i686 x86_64) @@ -13,8 +13,8 @@ url="http://wiki.winehq.org/Gecko" license=(MPL) depends=('wine>=1.5') source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi) -md5sums=('2f69934abb13dcea0224baf4b4665700' - '903d682ef2b4ef31d256d1bf56d17d08') +md5sums=('c2f19f07e399d8b9d75a14f37fdddca7' + '5ce40ef8e3fd56d2c8c4e8d938f10f7b') if [[ $CARCH == i686 ]]; then # Strip x86_64 msi diff --git a/staging/dbus-python/PKGBUILD b/staging/dbus-python/PKGBUILD new file mode 100644 index 000000000..b6b1bc24f --- /dev/null +++ b/staging/dbus-python/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 168669 2012-10-13 22:15:37Z eric $ +# Maintainer: Jan de Groot + +pkgbase=dbus-python +pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') +pkgver=1.1.1 +pkgrel=2 +pkgdesc="Python bindings for DBUS" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +makedepends=('docutils' 'dbus-glib' 'python' 'python2') +options=('!libtool') +source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) +md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') + +build() { + cd "${srcdir}" + mkdir build-python2 build-python3 + cd "${srcdir}/build-python2" + PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr + make + + + cd "${srcdir}/build-python3" + ../${pkgbase}-${pkgver}/configure --prefix=/usr + make +} + +package_python-dbus-common() { + pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" + conflicts=('dbus-python<1.1.0') + + cd "${srcdir}/build-python3" + make DESTDIR="${pkgdir}" install-data + rm -rf "${pkgdir}"/usr/lib/python* +} + +package_python-dbus() { + depends=('python-dbus-common' 'python' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 3.3 bindings for DBUS" + + cd "${srcdir}/build-python3" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} + +package_python2-dbus() { + depends=('python-dbus-common' 'python2' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 2.7 bindings for DBUS" + replaces=('dbus-python') + conflicts=('dbus-python') + provides=("dbus-python=$pkgver") + + cd "${srcdir}/build-python2" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD index bab0e357a..6fde6ac6b 100644 --- a/staging/kdebase-workspace/PKGBUILD +++ b/staging/kdebase-workspace/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 161959 2012-06-17 08:29:22Z andrea $ +# $Id: PKGBUILD 168620 2012-10-13 14:47:43Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.8.4 -pkgrel=2 -pkgdesc="KDE Base Workspace" +pkgver=4.9.2 +pkgrel=5 +pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') -url='http://www.kde.org' +url='https://projects.kde.org/projects/kde/kde-workspace' license=('GPL' 'LGPL' 'FDL') groups=('kde') # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' - 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat') + 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' + 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install="${pkgname}.install" @@ -29,24 +29,37 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'kdm.logrotate' + 'logind-support.patch') +sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '712a90999bd429883dcef5dcaf288aace332ced8' - 'b321b5e613b60231330e606fdf1e124646148388' + '660eae40a707d2711d8d7f32a93214865506b795' + 'b7980f2e199963caf8e92b499042d244ece2fca0' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '758203a76b58d62786a1013f6f8682e48844138a' + 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' + 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') build() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} + + # FS#26120 patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + + # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - - cd "${srcdir}" + + # KDEBUG#307412 (fixed upstream) + patch -p1 -i "${srcdir}"/logind-support.patch + + cd ../ + mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -56,14 +69,13 @@ build() { -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ - -DWITH_OpenGLES=ON \ - -DKWIN_BUILD_WITH_OPENGLES=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DWITH_CkConnector=OFF make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde @@ -76,7 +88,8 @@ package() { install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm - install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm - install -Dm644 "${srcdir}"/kdm.service \ + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -D -m644 "${srcdir}"/kdm.service \ "${pkgdir}"/usr/lib/systemd/system/kdm.service + install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm } diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam index 7d60cc35c..eccaa08f4 100644 --- a/staging/kdebase-workspace/kde-np.pam +++ b/staging/kdebase-workspace/kde-np.pam @@ -1,9 +1,12 @@ #%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth required pam_tally.so onerr=succeed file=/var/log/faillog +auth required pam_shells.so +auth requisite pam_nologin.so +auth required pam_env.so +auth optional pam_permit.s + +account include system-login + +password include system-login + +session include system-login diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam index ec1d8277f..a0a29483d 100644 --- a/staging/kdebase-workspace/kde.pam +++ b/staging/kdebase-workspace/kde.pam @@ -1,9 +1,8 @@ #%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth include system-login + +account include system-login + +password include system-login + +session include system-login diff --git a/staging/kdebase-workspace/kdm.logrotate b/staging/kdebase-workspace/kdm.logrotate new file mode 100644 index 000000000..34331feae --- /dev/null +++ b/staging/kdebase-workspace/kdm.logrotate @@ -0,0 +1,6 @@ +/var/log/kdm.log { + maxage 365 + size=+1024k + notifempty + missingok +} diff --git a/staging/kdebase-workspace/kdm.service b/staging/kdebase-workspace/kdm.service index 15ff75ff2..c57aba920 100644 --- a/staging/kdebase-workspace/kdm.service +++ b/staging/kdebase-workspace/kdm.service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/bin/kdm -nodaemon [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/staging/kdebase-workspace/logind-support.patch b/staging/kdebase-workspace/logind-support.patch new file mode 100644 index 000000000..9de205400 --- /dev/null +++ b/staging/kdebase-workspace/logind-support.patch @@ -0,0 +1,66 @@ +From: Lukas Tinkl +Date: Fri, 05 Oct 2012 09:57:13 +0000 +Subject: store the filedescriptor in a member variable +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 +--- +store the filedescriptor in a member variable + +make systemd-inhibit work as intended, PowerDevil now handles +power/sleep/lid buttons as intended + +BUG: 307412 +--- + + +--- a/powerdevil/daemon/powerdevilpolicyagent.cpp ++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + + #include + #include +@@ -225,6 +224,9 @@ + onActiveSessionChanged(m_activeSessionPath); + + // inhibit systemd handling of power/sleep/lid buttons ++ // http://www.freedesktop.org/wiki/Software/systemd/inhibit ++ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); ++ + QVariantList args; + args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what + args << "PowerDevil"; // who +@@ -232,8 +234,9 @@ + args << "block"; // mode + QDBusPendingReply desc = managerIface.asyncCallWithArgumentList("Inhibit", args); + desc.waitForFinished(); +- if (desc.isValid() && desc.value().isValid()) { +- kDebug() << "systemd powersave events handling inhibited"; ++ if (desc.isValid()) { ++ m_systemdInhibitFd = desc.value(); ++ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); + } + else + kWarning() << "failed to inhibit systemd powersave handling"; + +--- a/powerdevil/daemon/powerdevilpolicyagent.h ++++ b/powerdevil/daemon/powerdevilpolicyagent.h +@@ -27,6 +27,7 @@ + #include + + #include ++#include + + #include + +@@ -108,6 +109,7 @@ + QString m_activeSessionPath; + QWeakPointer< QDBusInterface > m_sdSessionInterface; + QWeakPointer< QDBusInterface > m_sdSeatInterface; ++ QDBusUnixFileDescriptor m_systemdInhibitFd; + + // ConsoleKit support + bool m_ckAvailable; + diff --git a/staging/konversation/PKGBUILD b/staging/konversation/PKGBUILD index e491f6801..ee8a55574 100644 --- a/staging/konversation/PKGBUILD +++ b/staging/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 167386 2012-10-01 19:44:28Z stephane $ +# $Id: PKGBUILD 168681 2012-10-14 00:39:34Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Andrea Scarpino # Contributor: James Rayner @@ -6,12 +6,13 @@ pkgname=konversation pkgver=1.4 -pkgrel=2 +pkgrel=3 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64') url="http://konversation.kde.org" -depends=('kdebase-runtime' 'kdepimlibs' 'python') +depends=('kdebase-runtime' 'kdepimlibs') makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +optdepends=('python: python scripting support') license=('GPL2' 'FDL') install=${pkgname}.install options=('!makeflags') @@ -34,7 +35,7 @@ package() { make DESTDIR="${pkgdir}" install # Remove a bunch of symlinks pointing to non-existant files - for lang in pt_BR uk sv et de en nl; do - rm "${pkgdir}"/usr/share/doc/kde/html/${lang}/konversation/common + for _lang in pt_BR uk sv et de en nl; do + rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common done } diff --git a/staging/pycrypto/PKGBUILD b/staging/pycrypto/PKGBUILD new file mode 100644 index 000000000..d4987b4b3 --- /dev/null +++ b/staging/pycrypto/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 168667 2012-10-13 21:58:25Z eric $ +# Maintainer: Jan de Groot +# Contributor: Kritoke + +pkgbase=pycrypto +pkgname=('python2-crypto' 'python-crypto') +pkgver=2.6 +pkgrel=3 +arch=('i686' 'x86_64') +makedepends=('python2' 'python') +url="http://www.dlitz.net/software/pycrypto/" +license=('custom') +source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz") +sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8') + +build() { + cd "${srcdir}" + find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \; + find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \; + + cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3 + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py build + + cd "${srcdir}/${pkgbase}-${pkgver}-py3" + python setup.py build +} + +package_python2-crypto() { + pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2." + depends=('python2') + replaces=('pycrypto') + conflicts=('pycrypto') + provides=("pycrypto=${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" + cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_python-crypto() { + pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." + depends=('python') + + cd "${srcdir}/${pkgbase}-${pkgver}-py3" + python setup.py install --root="${pkgdir}" --optimize=1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" + cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/pyopenssl/PKGBUILD b/staging/pyopenssl/PKGBUILD new file mode 100644 index 000000000..12bf75be8 --- /dev/null +++ b/staging/pyopenssl/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 168651 2012-10-13 20:29:33Z eric $ +# Maintainer : Ionut Biru +# Contributor: Sergej Pupykin + +pkgbase=pyopenssl +pkgname=('python-pyopenssl' 'python2-pyopenssl') +pkgver=0.13 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/pyOpenSSL" +license=('LGPL2.1') +makedepends=('python' 'python2' 'openssl') +source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) +md5sums=('767bca18a71178ca353dff9e10941929') + +build() { + cd "${srcdir}" + cp -a "pyOpenSSL-${pkgver}"{,-python2} + + #build python 3 module + cd "pyOpenSSL-${pkgver}" + python setup.py build + + #build python 2 module + cd ../"pyOpenSSL-${pkgver}-python2" + python2 setup.py build +} + +package_python-pyopenssl(){ + pkgdesc="Python3 wrapper module around the OpenSSL library" + depends=('python>=3.3' 'openssl') + replaces=('pyopenssl') + provides=('pyopenssl') + conflicts=('pyopenssl') + + cd "${srcdir}/pyOpenSSL-${pkgver}" + python setup.py install --root "${pkgdir}" --optimize=1 +} + +package_python2-pyopenssl(){ + pkgdesc="Python2 wrapper module around the OpenSSL library" + depends=('python2>=2.7' 'openssl') + + cd "${srcdir}/pyOpenSSL-${pkgver}-python2" + python2 setup.py install --root "${pkgdir}" --optimize=1 +} diff --git a/staging/python-egenix-mx-base/PKGBUILD b/staging/python-egenix-mx-base/PKGBUILD new file mode 100644 index 000000000..f48fd8fb8 --- /dev/null +++ b/staging/python-egenix-mx-base/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168671 2012-10-13 23:05:54Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributor: Douglas Soares de Andrade + +pkgbase=python-egenix-mx-base +pkgname=('python2-egenix-mx-base') +_origname=egenix-mx-base +pkgver=3.2.4 +pkgrel=2 +pkgdesc="A collection of Python tools" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.egenix.com/products/python/mxBase/" +makedepends=('python2') +source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") +sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7') + +build() { + cd "${srcdir}/${_origname}-${pkgver}" + + find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \; + + python2 setup.py build +} + +package_python2-egenix-mx-base() { + depends=('python2>=2.7') + cd "${srcdir}/${_origname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 + install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/staging/python-markupsafe/PKGBUILD b/staging/python-markupsafe/PKGBUILD new file mode 100644 index 000000000..0ead0adad --- /dev/null +++ b/staging/python-markupsafe/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 168655 2012-10-13 20:45:16Z eric $ +# Maintainer : Ionut Biru +# Contributor: Alex Anthony + +pkgname=('python-markupsafe' 'python2-markupsafe') +pkgver=0.15 +pkgrel=2 +pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/MarkupSafe" +license=('custom') +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") +md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') + +build() { + cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} + cd "${srcdir}/MarkupSafe-${pkgver}" + python setup.py build + + cd "${srcdir}/python2-MarkupSafe-${pkgver}" + python2 setup.py build +} + +package_python-markupsafe() { + depends=('python') + + cd "${srcdir}/MarkupSafe-${pkgver}" + python setup.py install --root="${pkgdir}" --optimize=1 + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE" +} + +package_python2-markupsafe() { + depends=('python2') + + cd "${srcdir}/python2-MarkupSafe-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE" +} diff --git a/staging/xfce4-session/PKGBUILD b/staging/xfce4-session/PKGBUILD new file mode 100644 index 000000000..11ff3e201 --- /dev/null +++ b/staging/xfce4-session/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 168641 2012-10-13 17:34:14Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: tobias + +pkgname=xfce4-session +pkgver=4.10.0 +pkgrel=4 +pkgdesc="A session manager for Xfce" +arch=('i686' 'x86_64') +url="http://www.xfce.org/" +license=('GPL2') +groups=('xfce4') +depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit' + 'hicolor-icon-theme') +makedepends=('intltool') +optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled' + 'xscreensaver: for locking screen with xflock4' + 'gnome-screensaver: for locking screen with xflock4' + 'xlockmore: for locking screen with xflock4') +replaces=('xfce-utils') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-libgnome-keyring \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/xfce4-session/xfce4-session.install b/staging/xfce4-session/xfce4-session.install new file mode 100644 index 000000000..e4f8fd06c --- /dev/null +++ b/staging/xfce4-session/xfce4-session.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/xorg-xdm/PKGBUILD b/staging/xorg-xdm/PKGBUILD new file mode 100644 index 000000000..6da8b604c --- /dev/null +++ b/staging/xorg-xdm/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 168625 2012-10-13 15:55:26Z andyrtr $ +# Maintainer: Alexander Baldeck +# Contributor: Jan de Groot +pkgname=xorg-xdm +pkgver=1.1.11 +pkgrel=4 +pkgdesc="X Display Manager" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd') +makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans') +backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) +options=('!libtool') +source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 + Xsession-loginshell.patch + Xsession-xsm.patch + xdm-1.0.5-sessreg-utmp-fix-bug177890.patch + xdm.pam + git_fixes.diff) +sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' + 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' + '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' + '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a' + '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418' + '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2') + +build() { + cd "${srcdir}/xdm-${pkgver}" + # upstream commits - Add some missing malloc failure checks 2012-01-07 + patch -Np1 -i "${srcdir}/git_fixes.diff" + + patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" + patch -Np1 -i "${srcdir}/Xsession-xsm.patch" + patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" + + autoreconf -fi + ./configure --prefix=/usr \ + --disable-xdm-auth \ + --disable-static \ + --with-xdmconfigdir=/etc/X11/xdm \ + --with-xdmscriptdir=/etc/X11/xdm \ + --with-pixmapdir=/usr/share/xdm/pixmaps + make +} + +package() { + cd "${srcdir}/xdm-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/var/lib/xdm" + install -m755 -d "${pkgdir}/etc/pam.d" + install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* + + sed -i 's|^Alias=.*|Alias=display-manager.service|' \ + "$pkgdir/usr/lib/systemd/system/xdm.service" +} diff --git a/staging/xorg-xdm/Xsession-loginshell.patch b/staging/xorg-xdm/Xsession-loginshell.patch new file mode 100644 index 000000000..3710752ef --- /dev/null +++ b/staging/xorg-xdm/Xsession-loginshell.patch @@ -0,0 +1,15 @@ +--- config/Xsession.cpp.orig 2008-06-21 13:57:36.000000000 +0000 ++++ config/Xsession.cpp 2008-06-21 14:01:25.000000000 +0000 +@@ -56,11 +56,7 @@ + resources=$HOME/.Xresources + + if [ -s "$startup" ]; then +- if [ -x "$startup" ]; then +- exec "$startup" +- else +- exec /bin/sh "$startup" +- fi ++ exec /bin/sh -ls -c "$startup" + else + if [ -r "$resources" ]; then + BINDIR/xrdb -load "$resources" diff --git a/staging/xorg-xdm/Xsession-xsm.patch b/staging/xorg-xdm/Xsession-xsm.patch new file mode 100644 index 000000000..a2d4d6cc6 --- /dev/null +++ b/staging/xorg-xdm/Xsession-xsm.patch @@ -0,0 +1,22 @@ +diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp +--- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 ++++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 +@@ -54,6 +54,7 @@ + + startup=$HOME/.xsession + resources=$HOME/.Xresources ++xinitrc=$HOME/.xinitrc + + if [ -s "$startup" ]; then + if [ -x "$startup" ]; then +@@ -83,5 +84,9 @@ + exec `eval $XDESKTOP` + } + #endif +- exec BINDIR/xsm ++ if [ -r "$xinitrc" ]; then ++ exec /bin/sh -ls -c "$xinitrc" ++ else ++ exec /bin/sh -l /etc/X11/xinit/xinitrc ++ fi + fi diff --git a/staging/xorg-xdm/git_fixes.diff b/staging/xorg-xdm/git_fixes.diff new file mode 100644 index 000000000..69836d488 --- /dev/null +++ b/staging/xorg-xdm/git_fixes.diff @@ -0,0 +1,673 @@ +From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Sun, 25 Sep 2011 07:56:15 +0000 +Subject: Require xt >= 1.0 for appdefaultdir + +https://bugs.freedesktop.org/show_bug.cgi?id=7237 + +Signed-off-by: Jeremy Huddleston +--- +diff --git a/configure.ac b/configure.ac +index b488f0c..a4222f1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau) + # Greeter + # + +-PKG_CHECK_MODULES(XDMGREET, xt x11 xext) ++PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext) + + GREETERLIB="${XDMLIBDIR}/libXdmGreet.so" + AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library]) +-- +cgit v0.9.0.2-2-gbebe +From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 21 Sep 2011 02:11:20 +0000 +Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings + +Can't fix all the warnings, due to the Xt API, but can fix a bunch. + +Signed-off-by: Alan Coopersmith +--- +diff --git a/greeter/greet.c b/greeter/greet.c +index 539ce17..82e2c21 100644 +--- a/greeter/greet.c ++++ b/greeter/greet.c +@@ -110,9 +110,9 @@ void (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU + void (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL; + int (*__xdm_source)(char **environ, char *file) = NULL; + char **(*__xdm_defaultEnv)(void) = NULL; +-char **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL; ++char **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL; + char **(*__xdm_putEnv)(const char *string, char **env) = NULL; +-char **(*__xdm_parseArgs)(char **argv, char *string) = NULL; ++char **(*__xdm_parseArgs)(char **argv, const char *string) = NULL; + void (*__xdm_printEnv)(char **e) = NULL; + char **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL; + void (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL; +diff --git a/greeter/verify.c b/greeter/verify.c +index ea62cd2..5d2ad17 100644 +--- a/greeter/verify.c ++++ b/greeter/verify.c +@@ -61,7 +61,7 @@ from The Open Group. + extern char *crypt(const char *, const char *); + #endif + +-static char *envvars[] = { ++static const char *envvars[] = { + "TZ", /* SYSV and SVR4, but never hurts */ + #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) + "bootdev", +@@ -94,8 +94,8 @@ static char ** + userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell) + { + char **env; +- char **envvar; +- char *str; ++ const char **envvar; ++ const char *str; + + env = defaultEnv (); + env = setEnv (env, "DISPLAY", d->name); +diff --git a/include/dm.h b/include/dm.h +index 316dd46..4085cae 100644 +--- a/include/dm.h ++++ b/include/dm.h +@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy); + extern void execute(char **argv, char **environ); + + /* server.c */ +-extern char *_SysErrorMsg (int n); ++extern const char *_SysErrorMsg (int n); + extern int StartServer (struct display *d); + extern int WaitForServer (struct display *d); + extern void ResetServer (struct display *d); +@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...) + _X_ATTRIBUTE_PRINTF(2,3); + # endif + extern char *localHostname (void); +-extern char **parseArgs (char **argv, char *string); +-extern char **setEnv (char **e, char *name, char *value); ++extern char **parseArgs (char **argv, const char *string); ++extern char **setEnv (char **e, const char *name, const char *value); + extern char **putEnv(const char *string, char **env); +-extern char *getEnv (char **e, char *name); ++extern char *getEnv (char **e, const char *name); + extern void CleanUpChild (void); + extern void freeArgs (char **argv); + extern void freeEnv (char **env); +@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in + extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress); + extern int AnyWellKnownSockets (void); + extern void DestroyWellKnownSockets (void); +-extern void SendFailed (struct display *d, char *reason); ++extern void SendFailed (struct display *d, const char *reason); + extern void StopDisplay (struct display *d); + extern void WaitForChild (void); + extern void WaitForSomething (void); +diff --git a/include/greet.h b/include/greet.h +index 6b6689e..0d607ba 100644 +--- a/include/greet.h ++++ b/include/greet.h +@@ -65,9 +65,9 @@ struct dlfuncs { + void (*_DeleteXloginResources)(struct display *d, Display *dpy); + int (*_source)(char **environ, char *file); + char **(*_defaultEnv)(void); +- char **(*_setEnv)(char **e, char *name, char *value); ++ char **(*_setEnv)(char **e, const char *name, const char *value); + char **(*_putEnv)(const char *string, char **env); +- char **(*_parseArgs)(char **argv, char *string); ++ char **(*_parseArgs)(char **argv, const char *string); + void (*_printEnv)(char **e); + char **(*_systemEnv)(struct display *d, char *user, char *home); + void (*_LogOutOfMem)(const char * fmt, ...); +@@ -149,9 +149,9 @@ extern void (*__xdm_SessionExit)(struct display *d, int status, int removeAut + extern void (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy); + extern int (*__xdm_source)(char **environ, char *file); + extern char **(*__xdm_defaultEnv)(void); +-extern char **(*__xdm_setEnv)(char **e, char *name, char *value); ++extern char **(*__xdm_setEnv)(char **e, const char *name, const char *value); + extern char **(*__xdm_putEnv)(const char *string, char **env); +-extern char **(*__xdm_parseArgs)(char **argv, char *string); ++extern char **(*__xdm_parseArgs)(char **argv, const char *string); + extern void (*__xdm_printEnv)(char **e); + extern char **(*__xdm_systemEnv)(struct display *d, char *user, char *home); + extern void (*__xdm_LogOutOfMem)(const char * fmt, ...); +diff --git a/xdm/access.c b/xdm/access.c +index d0850ad..7035375 100644 +--- a/xdm/access.c ++++ b/xdm/access.c +@@ -667,7 +667,7 @@ scanHostlist ( + /* Returns non-0 iff string is matched by pattern. Does case folding. + */ + static int +-patternMatch (char *string, char *pattern) ++patternMatch (const char *string, char *pattern) + { + int p, s; + +diff --git a/xdm/auth.c b/xdm/auth.c +index bbca167..9e5cba2 100644 +--- a/xdm/auth.c ++++ b/xdm/auth.c +@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {} + + struct AuthProtocol { + unsigned short name_length; +- char *name; ++ const char *name; + void (*InitAuth)(unsigned short len, char *name); + Xauth *(*GetAuth)(unsigned short len, char *name); + void (*GetXdmcpAuth)( +diff --git a/xdm/file.c b/xdm/file.c +index 6e929b8..7b7f3d3 100644 +--- a/xdm/file.c ++++ b/xdm/file.c +@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable) + } + + static struct displayMatch { +- char *name; ++ const char *name; + DisplayType type; + } displayTypes[] = { + { "local", { Local, Permanent, FromFile } }, +diff --git a/xdm/resource.c b/xdm/resource.c +index ece4de3..83901a2 100644 +--- a/xdm/resource.c ++++ b/xdm/resource.c +@@ -145,10 +145,10 @@ int choiceTimeout; /* chooser choice timeout */ + #define DEF_UDP_PORT "177" /* registered XDMCP port, dont change */ + + struct dmResources { +- char *name, *class; +- int type; +- char **dm_value; +- char *default_value; ++ const char *name, *class; ++ int type; ++ char **dm_value; ++ const char *default_value; + } DmResources[] = { + { "servers", "Servers", DM_STRING, &servers, + DEF_SERVER_LINE} , +@@ -203,10 +203,10 @@ struct dmResources { + #define boffset(f) XtOffsetOf(struct display, f) + + struct displayResource { +- char *name, *class; +- int type; +- int offset; +- char *default_value; ++ const char *name, *class; ++ int type; ++ int offset; ++ const char *default_value; + }; + + /* resources for managing the server */ +@@ -289,15 +289,16 @@ XrmDatabase DmResourceDB; + + static void + GetResource ( +- char *name, +- char *class, +- int valueType, +- char **valuep, +- char *default_value) ++ const char *name, ++ const char *class, ++ int valueType, ++ char **valuep, ++ const char *default_value) + { + char *type; + XrmValue value; +- char *string, *new_string; ++ const char *string; ++ char *new_string; + char str_buf[50]; + int len; + +diff --git a/xdm/server.c b/xdm/server.c +index 7fe55e6..1bb8873 100644 +--- a/xdm/server.c ++++ b/xdm/server.c +@@ -62,9 +62,9 @@ CatchUsr1 (int n) + errno = olderrno; + } + +-char *_SysErrorMsg (int n) ++const char *_SysErrorMsg (int n) + { +- char *s = strerror(n); ++ const char *s = strerror(n); + return (s ? s : "unknown error"); + } + +diff --git a/xdm/util.c b/xdm/util.c +index 033633a..60aab21 100644 +--- a/xdm/util.c ++++ b/xdm/util.c +@@ -97,7 +97,7 @@ printEnv (char **e) + } + + static char * +-makeEnv (char *name, char *value) ++makeEnv (const char *name, const char *value) + { + char *result; + +@@ -111,7 +111,7 @@ makeEnv (char *name, char *value) + } + + char * +-getEnv (char **e, char *name) ++getEnv (char **e, const char *name) + { + int l = strlen (name); + +@@ -127,7 +127,7 @@ getEnv (char **e, char *name) + } + + char ** +-setEnv (char **e, char *name, char *value) ++setEnv (char **e, const char *name, const char *value) + { + char **new, **old; + char *newe; +@@ -207,9 +207,9 @@ freeEnv (char **env) + #define isblank(c) ((c) == ' ' || c == '\t') + + char ** +-parseArgs (char **argv, char *string) ++parseArgs (char **argv, const char *string) + { +- char *word; ++ const char *word; + char *save; + char **newargv; + int i; +diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c +index 4b945cf..66804a4 100644 +--- a/xdm/xdmauth.c ++++ b/xdm/xdmauth.c +@@ -44,7 +44,7 @@ static char auth_name[256]; + static int auth_name_len; + + static void +-XdmPrintDataHex (char *s, char *a, int l) ++XdmPrintDataHex (const char *s, const char *a, int l) + { + int i; + +@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l) + + # ifdef XDMCP + static void +-XdmPrintArray8Hex (char *s, ARRAY8Ptr a) ++XdmPrintArray8Hex (const char *s, ARRAY8Ptr a) + { + XdmPrintDataHex (s, (char *) a->data, a->length); + } +diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c +index 5bc4716..1c34e7c 100644 +--- a/xdm/xdmcp.c ++++ b/xdm/xdmcp.c +@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int + static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd); + static void send_alive (struct sockaddr *from, int fromlen, int length, int fd); + static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd); +-static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd); ++static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd); + static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd); + static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd); + static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd); +@@ -1300,7 +1300,7 @@ abort: + void + SendFailed ( + struct display *d, +- char *reason) ++ const char *reason) + { + Debug ("Display start failed, sending Failed\n"); + send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name, +@@ -1311,9 +1311,9 @@ static void + send_failed ( + struct sockaddr *from, + int fromlen, +- char *name, ++ const char *name, + CARD32 sessionID, +- char *reason, ++ const char *reason, + int fd) + { + static char buf[256]; +@@ -1416,7 +1416,7 @@ NetworkAddressToHostname ( + # else + char dotted[20]; + # endif +- char *local_name = ""; ++ const char *local_name = ""; + int af_type; + + # if defined(IPv6) && defined(AF_INET6) +-- +cgit v0.9.0.2-2-gbebe +From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 21 Sep 2011 02:22:48 +0000 +Subject: Fix warnings about printing longs with int type format strings + +Signed-off-by: Alan Coopersmith +--- +diff --git a/xdm/dm.c b/xdm/dm.c +index cd0ee25..7bc2605 100644 +--- a/xdm/dm.c ++++ b/xdm/dm.c +@@ -536,7 +536,7 @@ WaitForChild (void) + time(&now); + crash = d->lastReserv && + ((now - d->lastReserv) < XDM_BROKEN_INTERVAL); +- Debug("time %i %i try %i of %i%s\n", now, d->lastReserv, ++ Debug("time %li %li try %i of %i%s\n", now, d->lastReserv, + d->reservTries, d->reservAttempts, + crash ? " crash" : ""); + +diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c +index 66804a4..b3c1c16 100644 +--- a/xdm/xdmauth.c ++++ b/xdm/xdmauth.c +@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID) + if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2) + continue; + bzero(line, sizeof(line)); +- Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key)); ++ Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key)); + if (strlen (id) == displayID->length && + !strncmp (id, (char *)displayID->data, displayID->length)) + { +-- +cgit v0.9.0.2-2-gbebe +From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001 +From: Michał Górny +Date: Wed, 28 Sep 2011 19:25:17 +0000 +Subject: Support systemd startup notification. + +If libsystemd-daemon support is enabled, xdm uses it to announce its +startup as soon as the session is established. This gives the user +opportunity to delay I/O-intensive operations until the X server is +started so that they would not interfere with its loading while keeping +the machine busy when user types in his/her login. + +Reviewed-by: Jamey Sharp +Reviewed-by: Gaetan Nadon +Signed-off-by: Alan Coopersmith +--- +diff --git a/Makefile.am b/Makefile.am +index e5f9f5c..bb6b51c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -43,8 +43,13 @@ endif LINT + if HAVE_SYSTEMD + systemdsystemunit_DATA = xdm.service + +-xdm.service: xdm.service.in +- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@ ++xdm.service: xdm.service.in Makefile ++if USE_SYSTEMD_DAEMON ++ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@ ++else !USE_SYSTEMD_DAEMON ++ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@ ++endif !USE_SYSTEMD_DAEMON ++ + endif HAVE_SYSTEMD + CLEANFILES = xdm.service + EXTRA_DIST = xdm.service.in +diff --git a/configure.ac b/configure.ac +index a4222f1..fcb37f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then + fi + + # Check whether to install systemd unit files, as suggested in daemon(7). ++# When a full path is specified, this does not require systemd installed. + AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], + [Directory for systemd service files (default from the System and Service Manager)]),, + [with_systemdsystemunitdir=auto]) +@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ + ]) + AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"]) + ++# Check whether to enable systemd startup notification. ++# This requires libsystemd-daemon. ++AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], ++ [Add support for systemd startup notification (default is autodetected)]), ++ [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) ++AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ ++ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], ++ [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], ++ [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ )] ++ ) ++]) ++AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"]) ++ + # FIXME: Find better test for which OS'es use su -m - for now, just try to + # mirror the Imakefile setting of: + # if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture) +diff --git a/xdm.service.in b/xdm.service.in +index d15e072..e782dd9 100644 +--- a/xdm.service.in ++++ b/xdm.service.in +@@ -4,6 +4,8 @@ After=systemd-user-sessions.service + + [Service] + ExecStart=BINDIR/xdm -nodaemon ++Type=notify ++NotifyAccess=all + + [Install] + Alias=graphical.target.wants/xdm.service +diff --git a/xdm/Makefile.am b/xdm/Makefile.am +index aa9765c..797b5c5 100644 +--- a/xdm/Makefile.am ++++ b/xdm/Makefile.am +@@ -22,11 +22,11 @@ + bin_PROGRAMS = xdm + + AM_CPPFLAGS = -I$(top_srcdir)/include +-AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) ++AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) + + # The xdm binary needs to export symbols so that they can be used from + # libXdmGreet.so loaded through a dlopen call from session.c +-AM_LDFLAGS = $(XDM_LIBS) -export-dynamic ++AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic + + xdm_SOURCES = \ + access.c \ +diff --git a/xdm/session.c b/xdm/session.c +index 5fd47f0..573747d 100644 +--- a/xdm/session.c ++++ b/xdm/session.c +@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg); + # define RTLD_NOW 1 + # endif + ++#ifdef USE_SYSTEMD_DAEMON ++#include ++#endif ++ + #ifdef USE_SELINUX + /* This should be run just before we exec the user session. */ + static int +@@ -349,6 +353,12 @@ ManageSession (struct display *d) + exit(UNMANAGE_DISPLAY); + } + ++#ifdef USE_SYSTEMD_DAEMON ++ /* Subsequent notifications will be ignored by systemd ++ * and calling this function will clean up the env */ ++ sd_notify(1, "READY=1"); ++#endif ++ + /* tell the possibly dynamically loaded greeter function + * what data structure formats to expect. + * These version numbers are registered with The Open Group. */ +-- +cgit v0.9.0.2-2-gbebe +From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Sat, 22 Oct 2011 15:14:46 +0000 +Subject: greeter: link against -lXrender if xft is enabled + +XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for +the xft option, and link against it. + +Signed-off-by: Julien Cristau +Reviewed-by: Alan Coopersmith +--- +diff --git a/configure.ac b/configure.ac +index fcb37f8..d20ae28 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -345,10 +345,10 @@ AC_ARG_WITH(xft, + AS_HELP_STRING([--with-xft], + [Use Xft to draw text (default is YES if installed)]), + [USE_XFT="$withval"], +- PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"])) ++ PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"])) + + if test "x$USE_XFT" = "xyes" ; then +- PKG_CHECK_MODULES(XFT, xft) ++ PKG_CHECK_MODULES(XFT, xft xrender) + GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS" + GREETER_LIBS="$GREETER_LIBS $XFT_LIBS" + AC_DEFINE([USE_XFT], 1, +diff --git a/greeter/Login.c b/greeter/Login.c +index 99a3932..d899376 100644 +--- a/greeter/Login.c ++++ b/greeter/Login.c +@@ -86,6 +86,10 @@ from The Open Group. + # include + #endif + ++#ifdef USE_XFT ++# include ++#endif ++ + #ifndef DEBUG + # define XDM_ASSERT(a) /* do nothing */ + #else +-- +cgit v0.9.0.2-2-gbebe +From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb +Date: Mon, 07 Nov 2011 16:01:44 +0000 +Subject: Fix build outside of source dir. Fixes distcheck too. + +Signed-off-by: Matthieu Herrb +Reviewed-by: Alan Coopersmith +--- +diff --git a/Makefile.am b/Makefile.am +index bb6b51c..e9da40f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service + + xdm.service: xdm.service.in Makefile + if USE_SYSTEMD_DAEMON +- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@ ++ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@ + else !USE_SYSTEMD_DAEMON +- $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@ ++ $(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@ + endif !USE_SYSTEMD_DAEMON + + endif HAVE_SYSTEMD +-- +cgit v0.9.0.2-2-gbebe +From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb +Date: Thu, 15 Dec 2011 21:14:23 +0000 +Subject: replace by . Spotted my Marco Peereboom with clang. + +Reviewed-by: Mark Kettenis +Signed-off-by: Matthieu Herrb +--- +diff --git a/greeter/verify.c b/greeter/verify.c +index 5d2ad17..1221874 100644 +--- a/greeter/verify.c ++++ b/greeter/verify.c +@@ -48,7 +48,7 @@ from The Open Group. + # include + #elif defined(USE_BSDAUTH) + # include +-# include ++# include + # include + #elif defined(USESECUREWARE) + # include +-- +cgit v0.9.0.2-2-gbebe +From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 07 Jan 2012 03:34:30 +0000 +Subject: Add some missing malloc failure checks + +Flagged by Solaris Studio 12.3 code analyzer + +Signed-off-by: Alan Coopersmith +--- +diff --git a/xdm/access.c b/xdm/access.c +index 7035375..b16a066 100644 +--- a/xdm/access.c ++++ b/xdm/access.c +@@ -304,6 +304,11 @@ tryagain: + if (!hostOrAlias) + return NULL; + h = malloc (sizeof (DisplayEntry)); ++ if (!h) ++ { ++ LogOutOfMem ("ReadHostEntry: DisplayEntry\n"); ++ return NULL; ++ } + h->hopCount = 1; + if (*hostOrAlias == ALIAS_CHARACTER) + { +@@ -423,6 +428,11 @@ tryagain: + if (!displayOrAlias) + return NULL; + d = malloc (sizeof (DisplayEntry)); ++ if (!d) ++ { ++ LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n"); ++ return NULL; ++ } + d->notAllowed = 0; + d->notBroadcast = 0; + d->chooser = 0; +diff --git a/xdm/choose.c b/xdm/choose.c +index 6f077eb..e5e003d 100644 +--- a/xdm/choose.c ++++ b/xdm/choose.c +@@ -128,6 +128,11 @@ RememberIndirectClient ( + connectionType == i->connectionType) + return 1; + i = malloc (sizeof (IndirectUsersRec)); ++ if (!i) ++ { ++ LogOutOfMem ("RememberIndirectClient\n"); ++ return 0; ++ } + if (!XdmcpCopyARRAY8 (clientAddress, &i->client)) + { + free (i); +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch new file mode 100644 index 000000000..195858883 --- /dev/null +++ b/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch @@ -0,0 +1,8 @@ +--- config/GiveConsole.sessreg-utmp-fix-bug177890 2006-07-24 04:20:10.000000000 -0400 ++++ config/GiveConsole 2006-07-24 04:21:16.000000000 -0400 +@@ -8,3 +8,5 @@ + # causing serious grief. + # + chown $USER /dev/console ++exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ ++ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/staging/xorg-xdm/xdm.pam b/staging/xorg-xdm/xdm.pam new file mode 100644 index 000000000..a0b601db6 --- /dev/null +++ b/staging/xorg-xdm/xdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +auth required pam_env.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +session required pam_loginuid.so +-session optional pam_systemd.so diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD index 495c6f549..e3384d191 100644 --- a/testing/kdebase-workspace/PKGBUILD +++ b/testing/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168268 2012-10-07 11:14:11Z andrea $ +# $Id: PKGBUILD 168549 2012-10-13 11:06:38Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -18,7 +18,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' - 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'glu') + 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install="${pkgname}.install" @@ -30,25 +30,32 @@ options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'kdm.logrotate' 'logind-support.patch') sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '712a90999bd429883dcef5dcaf288aace332ced8' - 'b321b5e613b60231330e606fdf1e124646148388' + '660eae40a707d2711d8d7f32a93214865506b795' + 'b7980f2e199963caf8e92b499042d244ece2fca0' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' + 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') build() { cd ${_pkgname}-${pkgver} + + # FS#26120 patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + + # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - # KDEBUG 307412 + # KDEBUG#307412 (fixed upstream) patch -p1 -i "${srcdir}"/logind-support.patch cd ../ @@ -83,4 +90,5 @@ package() { install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm install -D -m644 "${srcdir}"/kdm.service \ "${pkgdir}"/usr/lib/systemd/system/kdm.service + install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm } diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam index 7d60cc35c..eccaa08f4 100644 --- a/testing/kdebase-workspace/kde-np.pam +++ b/testing/kdebase-workspace/kde-np.pam @@ -1,9 +1,12 @@ #%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth required pam_tally.so onerr=succeed file=/var/log/faillog +auth required pam_shells.so +auth requisite pam_nologin.so +auth required pam_env.so +auth optional pam_permit.s + +account include system-login + +password include system-login + +session include system-login diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam index ec1d8277f..a0a29483d 100644 --- a/testing/kdebase-workspace/kde.pam +++ b/testing/kdebase-workspace/kde.pam @@ -1,9 +1,8 @@ #%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth include system-login + +account include system-login + +password include system-login + +session include system-login diff --git a/testing/kdebase-workspace/kdm.logrotate b/testing/kdebase-workspace/kdm.logrotate new file mode 100644 index 000000000..34331feae --- /dev/null +++ b/testing/kdebase-workspace/kdm.logrotate @@ -0,0 +1,6 @@ +/var/log/kdm.log { + maxage 365 + size=+1024k + notifempty + missingok +} diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD new file mode 100644 index 000000000..2392879c2 --- /dev/null +++ b/testing/nfs-utils/PKGBUILD @@ -0,0 +1,105 @@ +# $Id: PKGBUILD 168633 2012-10-13 16:48:28Z thomas $ +# Maintainer: Tobias Powalowski +# Contributor: John Proctor +# Contributor: dibblethewrecker +# Contributor: abelstr +# Contributor: Marco Lima + +pkgname=nfs-utils +pkgver=1.2.6 +pkgrel=2 +pkgdesc="Support programs for Network File Systems" +arch=('i686' 'x86_64') +url='http://nfs.sourceforge.net' +license=('GPL') +backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') +makedepends=('pkgconfig' 'autoconf' 'automake') +source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + nfs-common + nfs-common.conf + nfs-server + nfs-server.conf + exports + idmapd.conf + start-statd.patch + nfs + nfs-utils-1.1.4-mtab-sym.patch + nfs-utils-1.1.4-no-exec.patch + rpc-gssd.service + rpc-mountd.service + rpc-svcgssd.service + rpc-idmapd.service + rpc-statd.service + nfsd.service + var-lib-nfs-rpc_pipefs.mount + proc-fs-nfsd.mount + blkmapd.service + nfs-utils.conf) +install=nfs-utils.install +md5sums=('8be543ca270c2234ff18f8c8d35e0d37' + 'dd0d65fc6e8f422fa12520813098264b' + 'f73f197a16b02c3e248488ec35c4cf43' + 'e619f18354ff958ed624d05d08853d8f' + '9cef69bc686cc5dcac23fbb51450747d' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + 'e9144277a89a620d9bc80413158a7d27' + 'f5e7bba09a46c5c5d7007cac6eff9df5' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2' + '3694619813cebc5b4502b58f1992b442' + '965311784d49a7d126d512cadbe91deb' + 'e05705d9ccccaeaeb1ecaee20adc05bc' + '359d84a85f8781dc3f45f4cf1dbe4b53' + 'c82ef7b238efe62af3d5e263e1ba1c5c' + '5d33d2e754fd37280365b287603bac90' + '1cd65909fa0983047f3f06a3ab352401' + '02a34835aa077146a90eb7d191e612d0' + '8ffc2ebe932d29efe17d6f3f23d5b975' + '8ac484023d786766d287ccbe878ae4ba') + +build() { + cd $srcdir/${pkgname}-${pkgver} + patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch + #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch + # arch specific patch + patch -Np0 -i $srcdir/start-statd.patch + + ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ + --without-tcp-wrappers --with-statedir=/var/lib/nfs \ + --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ + --enable-mountconfig + + make +} + +package() { + cd $srcdir/${pkgname}-${pkgver} + # fix make install + mkdir -p $pkgdir/sbin + make DESTDIR=$pkgdir install + + # support python2 (FS#25120) + sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + + # NFS & NFSv4 init scripts + install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common + install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server + # Configuration + install -D -m 644 ../exports "$pkgdir/"etc/exports + install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf + install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf + install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf + install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs + install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # systemd files + for i in ${srcdir}/*.{service,mount}; do + install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" + done + install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf + # directories + mkdir "$pkgdir/"etc/exports.d + mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs + mkdir "$pkgdir/"var/lib/nfs/v4recovery +} diff --git a/testing/nfs-utils/blkmapd.service b/testing/nfs-utils/blkmapd.service new file mode 100644 index 000000000..16cb68bbb --- /dev/null +++ b/testing/nfs-utils/blkmapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=pNFS block layout mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +ExecStart=/usr/sbin/blkmapd + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports new file mode 100644 index 000000000..8f4aac598 --- /dev/null +++ b/testing/nfs-utils/exports @@ -0,0 +1,15 @@ +# /etc/exports +# +# List of directories exported to NFS clients. See exports(5). +# Use exportfs -arv to reread. +# +# Example for NFSv2 and NFSv3: +# /srv/home hostname1(rw,sync) hostname2(ro,sync) +# +# Example for NFSv4: +# /srv/nfs4 hostname1(rw,sync,fsid=0) +# /srv/nfs4/home hostname1(rw,sync,nohide) +# Using Kerberos and integrity checking: +# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) +# /srv/nfs4/home gss/krb5i(rw,sync,nohide) +# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf new file mode 100644 index 000000000..b1b23afe9 --- /dev/null +++ b/testing/nfs-utils/idmapd.conf @@ -0,0 +1,14 @@ +[General] + +Verbosity = 0 +Pipefs-Directory = /var/lib/nfs/rpc_pipefs +Domain = localdomain + +[Mapping] + +Nobody-User = nobody +Nobody-Group = nobody + +[Translation] + +Method = nsswitch diff --git a/testing/nfs-utils/nfs b/testing/nfs-utils/nfs new file mode 100644 index 000000000..2d33cf3d4 --- /dev/null +++ b/testing/nfs-utils/nfs @@ -0,0 +1,40 @@ +# +# Optinal options passed to rquotad +RPCRQUOTADOPTS="" +# +# Optional arguments passed to in-kernel lockd +#LOCKDARG= +# TCP port rpc.lockd should listen on. +#LOCKD_TCPPORT=32803 +# UDP port rpc.lockd should listen on. +#LOCKD_UDPPORT=32769 +# +# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) +RPCNFSDARGS="" +# Number of nfs server processes to be started. +# The default is 8. +RPCNFSDCOUNT=8 +# Set V4 grace period in seconds +#NFSD_V4_GRACE=90 +# +# Optional arguments passed to rpc.mountd. See rpc.mountd(8) +RPCMOUNTDOPTS="" +# +# Optional arguments passed to rpc.statd. See rpc.statd(8) +STATDARG="" +# +# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) +RPCIDMAPDARGS="" +# +# Optional arguments passed to rpc.gssd. See rpc.gssd(8) +RPCGSSDARGS="" +# +# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) +RPCSVCGSSDARGS="" +# +# To enable RDMA support on the server by setting this to +# the port the server should listen on +#RDMA_PORT=20049 +# +# Optional arguments passed to blkmapd. See blkmapd(8) +BLKMAPDARGS="" diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common new file mode 100644 index 000000000..7b16b4b3c --- /dev/null +++ b/testing/nfs-utils/nfs-common @@ -0,0 +1,315 @@ +#!/bin/bash + +daemon_name=nfs-common + +NEED_STATD= +STATD_OPTS= +NEED_IDMAPD= +IDMAPD_OPTS= +NEED_GSSD= +GSSD_OPTS= +PIPEFS_MOUNTPOINT= +PIPEFS_MOUNTOPTS= + +# rpc.statd daemon & binary location +STATD_DAEMON_NAME=rpc.statd +STATD="/usr/sbin/rpc.statd" + +# rpc.idmapd daemon & binary location +IDMAPD_DAEMON_NAME=rpc.idmapd +IDMAPD="/usr/sbin/rpc.idmapd" + +# rpc.gssd daemon & binary location +GSSD_DAEMON_NAME=rpc.gssd +GSSD="/usr/sbin/rpc.gssd" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +# Default mountpoint and options for rpc_pipefs filesystem +[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" +[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" + +# Parse the fstab file, and determine whether we need idmapd and gssd. (The +# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) +AUTO_NEED_IDMAPD=no +AUTO_NEED_GSSD=no + +if [ -f /etc/fstab ]; then + exec 9<&0 /dev/null ; then + return 1 + fi + + if grep -vw "$1" /proc/mounts &> /dev/null ; then + if ! mountpoint -q "$2" ; then + mount -t "$1" "$1" "$2" -o "$3" + return + fi + fi + return 0 +} + +do_umount() { + if mountpoint -q "$1" ; then + umount "$1" + fi + return 0 +} + +get_pid() { + pidof -o %PPID "$1" +} + +case "$1" in + start) + ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } + rc=0 + if [ "$NEED_STATD" = yes ]; then + stat_busy "Starting $STATD_DAEMON_NAME daemon" + PID=$(get_pid $STATD) + if [ -z "$PID" ]; then + [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid + # RUN + $STATD $STATD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + # Run sm-notify + /usr/sbin/sm-notify $SMNOTIFY_OPTS + fi + + if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then + stat_busy "Mounting pipefs filesystem" + do_modprobe sunrpc + do_modprobe nfs + do_modprobe nfsd + do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" + PID=$(get_pid $IDMAPD) + if [ -z "$PID" ]; then + [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid + # RUN + $IDMAPD $IDMAPD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + + if [ "$NEED_GSSD" = yes ]; then + do_modprobe rpcsec_gss_krb5 + stat_busy "Starting $GSSD_DAEMON_NAME daemon" + PID=$(get_pid $GSSD) + if [ -z "$PID" ]; then + [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid + # RUN + $GSSD $GSSD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + fi + + add_daemon $daemon_name + ;; + + stop) + rc=0 + if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then + + if [ "$NEED_GSSD" = yes ]; then + stat_busy "Stopping $GSSD_DAEMON_NAME daemon" + PID=$(get_pid $GSSD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" + PID=$(get_pid $IDMAPD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true + fi + + if [ "$NEED_STATD" = yes ]; then + stat_busy "Stopping $STATD_DAEMON_NAME daemon" + PID=$(get_pid $STATD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + rm_daemon $daemon_name + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + + if [ "$NEED_STATD" = yes ]; then + stat_busy "Daemon $STATD_DAEMON_NAME running" + PID=$(get_pid $STATD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + + if [ "$NEED_GSSD" = yes ]; then + stat_busy "Daemon $GSSD_DAEMON_NAME running" + PID=$(get_pid $GSSD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Daemon $IDMAPD_DAEMON_NAME running" + PID=$(get_pid $IDMAPD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + echo + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|status|restart}" +esac +exit 0 + diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf new file mode 100644 index 000000000..12466b3e5 --- /dev/null +++ b/testing/nfs-utils/nfs-common.conf @@ -0,0 +1,40 @@ +# Parameters to be passed to nfs-common (nfs clients & server) init script. +# + +# If you do not set values for the NEED_ options, they will be attempted +# autodetected; this should be sufficient for most people. Valid alternatives +# for the NEED_ options are "yes" and "no". + +# Do you want to start the statd daemon? It is not needed for NFSv4. +NEED_STATD="" + +# Options to pass to rpc.statd. +# See rpc.statd(8) for more details. +# N.B. statd normally runs on both client and server, and run-time +# options should be specified accordingly. +# STATD_OPTS="-p 32765 -o 32766" +STATD_OPTS="" + +# Options to pass to sm-notify +# e.g. SMNOTIFY_OPTS="-p 32764" +SMNOTIFY_OPTS="" + +# Do you want to start the idmapd daemon? It is only needed for NFSv4. +NEED_IDMAPD="" + +# Options to pass to rpc.idmapd. +# See rpc.idmapd(8) for more details. +IDMAPD_OPTS="" + +# Do you want to start the gssd daemon? It is required for Kerberos mounts. +NEED_GSSD="" + +# Options to pass to rpc.gssd. +# See rpc.gssd(8) for more details. +GSSD_OPTS="" + +# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". +PIPEFS_MOUNTPOINT="" + +# Options used to mount rpc_pipefs filesystem; the default is "defaults". +PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server new file mode 100644 index 000000000..6aa609d8c --- /dev/null +++ b/testing/nfs-utils/nfs-server @@ -0,0 +1,299 @@ +#!/bin/bash + +daemon_name=nfs-server + +NFSD_COUNT= +NFSD_OPTS= +NEED_SVCGSSD= +SVCGSSD_OPTS= +MOUNTD_OPTS= +PROCNFSD_MOUNTPOINT= +PROCNFSD_MOUNTOPTS= + +# rpc.nfsd daemon & binary location +NFSD_PROCESS_NAME=nfsd +NFSD_DAEMON_NAME=rpc.nfsd +NFSD="/usr/sbin/rpc.nfsd" + +# rpc.svcgssd daemon & binary location +SVCGSSD_DAEMON_NAME=rpc.svcgssd +SVCGSSD="/usr/sbin/rpc.svcgssd" + +# rpc.idmapd daemon & binary location +IDMAPD_DAEMON_NAME=rpc.idmapd +IDMAPD="/usr/sbin/rpc.idmapd" + +# rpc.mountd daemon & binary location +MOUNTD_DAEMON_NAME=rpc.mountd +MOUNTD="/usr/sbin/rpc.mountd" + +# exortfs binary location +EXPORTFS="/usr/sbin/exportfs" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +# Default number of nfsd servers +[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 + +# Default mountpoint and options for nfsd filesystem +[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" +[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" + +case "$NEED_SVCGSSD" in + yes|no) + ;; + *) + NEED_SVCGSSD=no + ;; +esac + +do_modprobe() { + if [ -x /sbin/modprobe -a -f /proc/modules ]; then + modprobe -q "$1" || true + fi +} + +do_mount() { + if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then + return 1 + fi + + if grep -vw "$1" /proc/mounts &> /dev/null ; then + if ! mountpoint -q "$2" ; then + mount -t "$1" "$1" "$2" -o "$3" + return + fi + fi + return 0 +} + +do_umount() { + if mountpoint -q "$1" ; then + umount "$1" + fi + return 0 +} + +get_pid() { + pidof -o %PPID "$1" +} + +case "$1" in + start) + ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } + rc=0 + stat_busy "Mounting nfsd filesystem" + do_modprobe nfsd + do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + stat_busy "Exporting all directories" + $EXPORTFS -r + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + stat_busy "Starting $NFSD_DAEMON_NAME daemon" + PID=$(get_pid $NFSD_PROCESS_NAME) + if [ -z "$PID" ]; then + [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid + # RUN + $NFSD $NFSD_OPTS $NFSD_COUNT + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + do_modprobe rpcsec_gss_krb5 + stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" + PID=$(get_pid $SVCGSSD) + if [ -z "$PID" ]; then + [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid + # RUN + $SVCGSSD $SVCGSSD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + + PID=$(get_pid $IDMAPD) + [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null + + stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" + PID=$(get_pid $MOUNTD) + if [ -z "$PID" ]; then + [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid + # RUN + $MOUNTD $MOUNTD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + + add_daemon $daemon_name + ;; + + stop) + rc=0 + stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" + PID=$(get_pid $MOUNTD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" + PID=$(get_pid $SVCGSSD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + stat_busy "Stopping $NFSD_DAEMON_NAME daemon" + PID=$(get_pid $NFSD_PROCESS_NAME) + # KILL (SIGINT) + [ ! -z "$PID" ] && kill -2 $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + sleep 1 + PID=$(get_pid $NFSD_PROCESS_NAME) + # KILL (KILL) - just to be sure + [ ! -z "$PID" ] && kill -9 $PID &> /dev/null + # + rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + + stat_busy "Unexporting all directories" + $EXPORTFS -au + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + # flush everything out of the kernels export table + if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then + $EXPORTFS -f + fi + do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true + rm_daemon $daemon_name + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + + stat_busy "Daemon $NFSD_DAEMON_NAME running" + PID=$(get_pid $NFSD_PROCESS_NAME) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + + stat_busy "Daemon $MOUNTD_DAEMON_NAME running" + PID=$(get_pid $MOUNTD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" + PID=$(get_pid $SVCGSSD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + echo + ;; + + reload) + rc=0 + stat_busy "Re-exporting all directories" + $EXPORTFS -r + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|status|reload|restart}" +esac +exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf new file mode 100644 index 000000000..581e26350 --- /dev/null +++ b/testing/nfs-utils/nfs-server.conf @@ -0,0 +1,29 @@ +# Parameters to be passed to nfs-server init script. +# + +# Options to pass to rpc.nfsd. +# See rpc.nfsd(8) for more details. +NFSD_OPTS="" + +# Number of servers to start up; the default is 8 servers. +NFSD_COUNT="" + +# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". +PROCNFSD_MOUNTPOINT="" + +# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". +PROCNFSD_MOUNTOPTS="" + +# Options for rpc.mountd. +# If you have a port-based firewall, you might want to set up +# a fixed port here using the --port option. +# See rpc.mountd(8) for more details. +MOUNTD_OPTS="" + +# Do you want to start the svcgssd daemon? It is only required for Kerberos +# exports. Valid alternatives are "yes" and "no"; the default is "no". +NEED_SVCGSSD="" + +# Options to pass to rpc.svcgssd. +# See rpc.svcgssd(8) for more details. +SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch new file mode 100644 index 000000000..c9e60afc7 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +ripped from Debian + +--- nfs-utils-1.1.4/utils/mount/fstab.c ++++ nfs-utils-1.1.4/utils/mount/fstab.c +@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { + return var_mtab_does_not_exist; + } + +-static int ++int + mtab_is_a_symlink(void) { + get_mtab_info(); + return var_mtab_is_a_symlink; +--- nfs-utils-1.1.4/utils/mount/fstab.h ++++ nfs-utils-1.1.4/utils/mount/fstab.h +@@ -7,6 +7,7 @@ + #define _PATH_FSTAB "/etc/fstab" + #endif + ++int mtab_is_a_symlink(void); + int mtab_is_writable(void); + int mtab_does_not_exist(void); + void reset_mtab_info(void); +--- nfs-utils-1.1.4/utils/mount/mount.c ++++ nfs-utils-1.1.4/utils/mount/mount.c +@@ -230,6 +230,13 @@ create_mtab (void) { + int flags; + mntFILE *mfp; + ++ /* Avoid writing if the mtab is a symlink to /proc/mounts, since ++ that would create a file /proc/mounts in case the proc filesystem ++ is not mounted, and the fchmod below would also fail. */ ++ if (mtab_is_a_symlink()) { ++ return EX_SUCCESS; ++ } ++ + lock_mtab(); + + mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch new file mode 100644 index 000000000..ea50a21d8 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch @@ -0,0 +1,15 @@ +ripped from Debian + +--- nfs-utils-1.1.2/utils/mount/mount.c ++++ nfs-utils-1.1.2/utils/mount/mount.c +@@ -381,10 +381,6 @@ + mount_error(NULL, mount_point, ENOTDIR); + return 1; + } +- if (access(mount_point, X_OK) < 0) { +- mount_error(NULL, mount_point, errno); +- return 1; +- } + + return 0; + } diff --git a/testing/nfs-utils/nfs-utils.conf b/testing/nfs-utils/nfs-utils.conf new file mode 100644 index 000000000..33c97b838 --- /dev/null +++ b/testing/nfs-utils/nfs-utils.conf @@ -0,0 +1 @@ +nfs diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install new file mode 100644 index 000000000..7dcdf9575 --- /dev/null +++ b/testing/nfs-utils/nfs-utils.install @@ -0,0 +1,32 @@ +## arg 1: the new package version +post_install() { +cat << 'EOM' + ==> PLEASE NOTE: + ==> Extended configuration options for NFS (clients & server) are available in + ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf + ==> + ==> Please refer to http://wiki.archlinux.org/index.php/Nfs + ==> for further information on NFS; for NFSv4, refer to + ==> http://wiki.archlinux.org/index.php/NFSv4 +EOM +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then +cat << 'EOM' + ==> IMPORTANT NFS UTILS CHANGES: + ==> This is a rather important upgrade, you are going to have to change config files. + ==> /etc/rc.conf daemons changes: + ==> Change portmap to rpcbind + ==> Change nfslock to nfs-common + ==> Change nfsd to nfs-server + ==> + ==> Extended configuration options for NFS (clients & server) are available in: + ==> /etc/conf.d/nfs-common + ==> /etc/conf.d/nfs-server + ==> Please change them to your needs. +EOM + fi +} diff --git a/testing/nfs-utils/nfsd.service b/testing/nfs-utils/nfsd.service new file mode 100644 index 000000000..e5481c3d1 --- /dev/null +++ b/testing/nfs-utils/nfsd.service @@ -0,0 +1,16 @@ +[Unit] +Description=NFS server +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=oneshot +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/sbin/exportfs -a +ExecStop=/usr/sbin/rpc.nfsd 0 +ExecStopPost=/usr/sbin/exportfs -a -u +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000000000..f8664a8be --- /dev/null +++ b/testing/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=RPC Pipe File System +DefaultDependencies=no + +[Mount] +What=sunrpc +Where=/proc/fs/nfsd +Type=rpc_pipefs diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service new file mode 100644 index 000000000..da4c71307 --- /dev/null +++ b/testing/nfs-utils/rpc-gssd.service @@ -0,0 +1,13 @@ +[Unit] +Description=RPC GSS-API client-side daemon +After=rpcbind.service var-lib-nfs-rpc_pipefs.mount +Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount +Before=remote-fs-pre.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service new file mode 100644 index 000000000..7785c1bd5 --- /dev/null +++ b/testing/nfs-utils/rpc-idmapd.service @@ -0,0 +1,13 @@ +[Unit] +Description=NFSv4 ID-name mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount +Before=remote-fs-pre.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service new file mode 100644 index 000000000..edd8c851d --- /dev/null +++ b/testing/nfs-utils/rpc-mountd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFS Mount Daemon +After=rpcbind.service nfsd.service +Requires=rpcbind.service nfsd.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service new file mode 100644 index 000000000..97d397faf --- /dev/null +++ b/testing/nfs-utils/rpc-statd.service @@ -0,0 +1,13 @@ +[Unit] +Description=NFSv2/3 Network Status Monitor Daemon +After=rpcbind.service +Requires=rpcbind.service +Before=remote-fs-pre.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.statd $STATD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service new file mode 100644 index 000000000..8152e8338 --- /dev/null +++ b/testing/nfs-utils/rpc-svcgssd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RPC GSS-API server-side daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch new file mode 100644 index 000000000..5d73b6e35 --- /dev/null +++ b/testing/nfs-utils/start-statd.patch @@ -0,0 +1,22 @@ +--- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 ++++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 +@@ -1,9 +1,16 @@ +-#!/bin/bash -p ++#!/bin/sh ++ ++# Original script provided by the NFS project ++# Modified for Arch Linux by Tom Killian ++ + # nfsmount calls this script when mounting a filesystem with locking + # enabled, but when statd does not seem to be running (based on + # /var/run/rpc.statd.pid). + # It should run statd with whatever flags are apropriate for this + # site. +-PATH=/sbin:/usr/sbin +-exec rpc.statd --no-notify ++ ++# source application-specific settings ++[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf ++ ++exec /usr/sbin/rpc.statd $STATD_OPTS + diff --git a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount new file mode 100644 index 000000000..4bd440f24 --- /dev/null +++ b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount @@ -0,0 +1,7 @@ +[Unit] +Description=RPC pipe filesystem + +[Mount] +What=rpc_pipefs +Where=/var/lib/nfs/rpc_pipefs +Type=rpc_pipefs diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD index 7a79156d6..5863f2b73 100644 --- a/testing/postgresql/PKGBUILD +++ b/testing/postgresql/PKGBUILD @@ -1,39 +1,47 @@ -# $Id: PKGBUILD 166687 2012-09-15 16:47:20Z dan $ +# $Id: PKGBUILD 168645 2012-10-13 18:34:13Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.0 +pkgver=9.2.1 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql-run-socket.patch postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate - postgresql.service postgresql-check-db-dir) -md5sums=('8c4c32a4abe8cf61b02c8366181ede50' + postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) +md5sums=('c0b4799ea9850eae3ead14f0a60e9418' + '75c579eed03ffb2312631f0b649175b4' '1ddd1df8010549f237e7983bb326025e' 'a54d09a20ab1672adf08f037df188d53' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' - 'f0d46e63198db0a1e51dcd4a0599cd33' + '89b48774b0dae7c37fbb0e907c3c1db8' + 'd34e4ab6d589aa819a1e2829290a3b7c' '505e0e4abfc746cae9558584d471a03c') -sha256sums=('3731c607df492bbb57f37917b49f57719c0d6f823720426431fff10d82b1fe33' +sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' + '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' - 'af41dd8c1e6b124880fb4347c9fa4adabdef5b6e6bd13601cac25eb9e7bc7774' + 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' + 'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07' '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { cd "${srcdir}/postgresql-${pkgver}" + patch -Np1 < ../postgresql-run-socket.patch + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --datadir=/usr/share/postgresql \ + --sysconfdir=/etc \ --with-krb5 \ --with-libxml \ --with-openssl \ @@ -137,18 +145,20 @@ package_postgresql() { # install launch script install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \ + "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf" install -D -m644 "${srcdir}/postgresql.service" \ "${pkgdir}/usr/lib/systemd/system/postgresql.service" install -D -m755 "${srcdir}/postgresql-check-db-dir" \ "${pkgdir}/usr/bin/postgresql-check-db-dir" # install conf file - install -D -m644 ${srcdir}/postgresql.confd \ + install -D -m644 "${srcdir}/postgresql.confd" \ "${pkgdir}/etc/conf.d/postgresql" - install -D -m644 ${srcdir}/postgresql.pam \ + install -D -m644 "${srcdir}/postgresql.pam" \ "${pkgdir}/etc/pam.d/postgresql" - install -D -m644 ${srcdir}/postgresql.logrotate \ + install -D -m644 "${srcdir}/postgresql.logrotate" \ "${pkgdir}/etc/logrotate.d/postgresql" } diff --git a/testing/postgresql/postgresql-run-socket.patch b/testing/postgresql/postgresql-run-socket.patch new file mode 100644 index 000000000..b558c7b74 --- /dev/null +++ b/testing/postgresql/postgresql-run-socket.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h +--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400 ++++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400 +@@ -144,7 +144,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install index 7b73f6fa9..263bccb25 100644 --- a/testing/postgresql/postgresql.install +++ b/testing/postgresql/postgresql.install @@ -18,6 +18,10 @@ post_upgrade() { if [ "$postgres_shell" = "/sbin/nologin" ]; then chsh -s /bin/bash postgres fi + if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then + echo "Note: The Unix domain socket location has changed; be sure to" + echo " restart any local applications using libpq.so." + fi } post_remove() { diff --git a/testing/postgresql/postgresql.service b/testing/postgresql/postgresql.service index bea14e01e..294b66e8f 100644 --- a/testing/postgresql/postgresql.service +++ b/testing/postgresql/postgresql.service @@ -9,7 +9,6 @@ User=postgres Group=postgres Environment=PGROOT=/var/lib/postgres -Environment=PGLOG=/var/log/postgresql.log SyslogIdentifier=postgres PIDFile=/var/lib/postgres/data/postmaster.pid diff --git a/testing/postgresql/postgresql.tmpfiles.conf b/testing/postgresql/postgresql.tmpfiles.conf new file mode 100644 index 000000000..6c48e34ed --- /dev/null +++ b/testing/postgresql/postgresql.tmpfiles.conf @@ -0,0 +1 @@ +d /run/postgresql 0755 postgres postgres - diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD index d91c4a825..9d3bacfb0 100644 --- a/testing/ppp/PKGBUILD +++ b/testing/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165805 2012-08-30 17:53:10Z thomas $ +# $Id: PKGBUILD 168656 2012-10-13 20:46:01Z thomas $ # Maintainer: Thomas Baechler pkgname=ppp pkgver=2.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" @@ -21,6 +21,9 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ip-down ip-up.d.dns.sh ip-down.d.dns.sh + ipv6-up + ipv6-down + ipv6-up.d.iface-config.sh ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' @@ -30,9 +33,12 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57' '86cdaf133f7a79fb464f02d83afc7734' '44cc662ba9aa61dd9add3ddd4c5ded57' 'e4beb16ed600b61336d50b2bd2df7cd5' - '2fa0671f40711e69194ccf60979f8b33' + '529b924f644f80cf30d72a966abc7419' '4a074d74c29625b254a1db720cb87b99' '8d1be5af8e46393ba6eb273377831e38' + '4cbd0a9af01c27067450ec7d3f5fa673' + 'b75c2fbc4afa9f2d8108b680c88c7036' + '9dde53aa5a931ebe1c7e3469199777c5' 'fafead5c9d66d0574e6f0a2e5f4d4631') build() { @@ -70,6 +76,11 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" + install -D -m755 ../ipv6-up "${pkgdir}/etc/ppp/ipv6-up" + install -D -m755 ../ipv6-down "${pkgdir}/etc/ppp/ipv6-down" + install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" + install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" + install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" install -D -m755 ../pon "${pkgdir}/usr/bin/pon" install -D -m755 ../poff "${pkgdir}/usr/bin/poff" install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down index 301f3ab9b..cfd3ae093 100644 --- a/testing/ppp/ip-down +++ b/testing/ppp/ip-down @@ -3,7 +3,7 @@ # This script is run by pppd after the connection has ended. # -# Execute all scripts in /etc/ppp/ip-up.d/ +# Execute all scripts in /etc/ppp/ip-down.d/ for ipdown in /etc/ppp/ip-down.d/*.sh; do if [ -x $ipdown ]; then # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam diff --git a/testing/ppp/ipv6-down b/testing/ppp/ipv6-down new file mode 100644 index 000000000..d3b9e28b3 --- /dev/null +++ b/testing/ppp/ipv6-down @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd after the connection has ended. +# + +# Execute all scripts in /etc/ppp/ipv6-down.d/ +for ipdown in /etc/ppp/ipv6-down.d/*.sh; do + if [ -x $ipdown ]; then + # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam + $ipdown "$@" + fi +done diff --git a/testing/ppp/ipv6-up b/testing/ppp/ipv6-up new file mode 100644 index 000000000..b294aafdc --- /dev/null +++ b/testing/ppp/ipv6-up @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd when there's a successful ppp connection. +# + +# Execute all scripts in /etc/ppp/ipv6-up.d/ +for ipup in /etc/ppp/ipv6-up.d/*.sh; do + if [ -x $ipup ]; then + # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam + $ipup "$@" + fi +done diff --git a/testing/ppp/ipv6-up.d.iface-config.sh b/testing/ppp/ipv6-up.d.iface-config.sh new file mode 100644 index 000000000..b23d6f61d --- /dev/null +++ b/testing/ppp/ipv6-up.d.iface-config.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr +echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 45c057a63..2ff907d39 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167927 2012-10-03 20:37:22Z tomegun $ +# $Id: PKGBUILD 168617 2012-10-13 12:08:22Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux -pkgver=2.22 -pkgrel=7 +pkgver=2.22.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -16,12 +16,10 @@ provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') options=('!libtool') source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz - su.1 uuidd.tmpfiles pam-login pam-common - pam-su - hwclock-systz.patch) + pam-su) backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login @@ -32,13 +30,6 @@ install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../hwclock-systz.patch - - # unbreak --localstatedir - # TODO(dreisner): find out what sami had in mind with these heuristics - sed -i '71,75d' configure.ac - ./autogen.sh - ./configure --prefix=/usr \ --libdir=/usr/lib \ --localstatedir=/run \ @@ -52,15 +43,16 @@ build() { --enable-socket-activation # --enable-reset \ # part of ncurses -# --enable-last \ # not part of any package -# --enable-line \ # not compat +# --enable-line \ # not part of any package +# --enable-last \ # not compat make } -check() { - make -C "$pkgname-$pkgver" check -} +#check() { +# fails for some reason in chroot, works outside +# make -C "$pkgname-$pkgver" check +#} package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -79,19 +71,12 @@ package() { install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" - # broken buildsys doesn't include su(1), which means it - # isn't even in the dist tarball - # TODO(dreisner): patched upstream - install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" - # include tmpfiles fragment for uuidd # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('ba2d8cc12a937231c80a04f7f7149303' - '7f524538dcf57284a86f03a98e624f04' +md5sums=('730cf9932531ed09b53a04ca30fcb4c9' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad' - '19eaa197a0cfb046661dede2e991120b') + 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD index 10540bd95..5cc420cbf 100644 --- a/testing/wpa_supplicant/PKGBUILD +++ b/testing/wpa_supplicant/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 162331 2012-06-25 10:10:22Z heftig $ +# $Id: PKGBUILD 168658 2012-10-13 20:56:07Z thomas $ # Maintainer: Thomas Bächler pkgname=wpa_supplicant pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') depends=('openssl' 'dbus-core' 'readline' 'libnl') optdepends=('wpa_supplicant_gui: wpa_gui program') license=('GPL') -groups=('base') backup=('etc/wpa_supplicant/wpa_supplicant.conf') source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz" config hostap_allow-linking-with-libnl-3.2.patch) md5sums=('8650f6aa23646ef634402552d0669640' - '380d8d1fe24bccb2a2636cb2a6038c39' + 'c035e45e8e240239eecd7402f235fb3b' '473fb6b77909ec5a50b6f4d91370e86b') build() { diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config index 59da1e27e..5e6dfedc8 100644 --- a/testing/wpa_supplicant/config +++ b/testing/wpa_supplicant/config @@ -466,3 +466,17 @@ CONFIG_NO_RANDOM_POOL=y #CONFIG_INTERWORKING=y CONFIG_LIBNL32=y + +# More options that are not in defconfig: + +# Lightweight AP mode +CONFIG_AP=y + +# P2P (WiFi Direct) +CONFIG_P2P=y + +# RSN IBSS/AdHoc support +CONFIG_IBSS_RSN=y + +# Simple background scan +CONFIG_BGSCAN_SIMPLE=y -- cgit v1.2.3-54-g00ecf