diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bind/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/bind/remove-tools.patch | 2 | ||||
-rw-r--r-- | extra/cabal-install/PKGBUILD | 41 | ||||
-rw-r--r-- | extra/ghc/PKGBUILD | 133 | ||||
-rw-r--r-- | extra/ghc/build.mk | 27 | ||||
-rw-r--r-- | extra/haskell-http/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/haskell-mtl/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/haskell-network/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/haskell-parsec/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/haskell-random/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/haskell-text/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/haskell-transformers/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/haskell-zlib/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/kdevelop-php/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/kdevelop/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/kdevplatform/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/libva-intel-driver/PKGBUILD | 32 | ||||
-rw-r--r-- | extra/libva-intel-driver/build-fix.patch | 68 | ||||
-rw-r--r-- | extra/libva-vdpau-driver/PKGBUILD | 31 | ||||
-rw-r--r-- | extra/libva/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/libxcb/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/nx/PKGBUILD | 39 | ||||
-rw-r--r-- | extra/nx/nx-cflags.patch | 54 |
23 files changed, 400 insertions, 140 deletions
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index a567d0e8f..5e150fdf9 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166603 2012-09-12 22:39:35Z bisson $ +# $Id: PKGBUILD 168392 2012-10-09 22:16:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.1-P3 +_pkgver=9.9.2 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' @@ -23,9 +23,9 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799' +sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' - '18f477f510df31e6c6f547ee2d5fc46e973479bf' + '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch index cbd1c53ad..29b4c9c5f 100644 --- a/extra/bind/remove-tools.patch +++ b/extra/bind/remove-tools.patch @@ -7,6 +7,6 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in -SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PKCS11_TOOLS@ + check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ TARGETS = diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 30bffb560..5ce042013 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -3,34 +3,41 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=cabal-install -pkgver=0.14.0 -pkgrel=2 +pkgver=1.16.0 +pkgrel=1 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.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2') +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=('638514bd1a5792d75866481852148ae5') +source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz") +md5sums=('da046116eee7664158411fa9e2cf6b14') build() { - cd cabal-install-${pkgver} - runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr - runhaskell Setup build + cd cabal-install-${pkgver} + + runhaskell Setup configure \ + --enable-shared \ + --enable-split-objs \ + --enable-executable-stripping \ + --prefix=/usr + + runhaskell Setup build } package() { - cd cabal-install-${pkgver} - runhaskell Setup copy --destdir=$pkgdir + cd cabal-install-${pkgver} + + runhaskell Setup copy --destdir=$pkgdir - # rm license installed to wrong location - rm -rf ${pkgdir}/usr/share/doc + # rm license installed to wrong location + rm -rf ${pkgdir}/usr/share/doc - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - # add bash completion - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 bash-completion/cabal \ - ${pkgdir}/usr/share/bash-completion/completions + # add bash completion + install -d ${pkgdir}/usr/share/bash-completion/completions + install -m644 bash-completion/cabal \ + ${pkgdir}/usr/share/bash-completion/completions } diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index e2152d9db..d3a32f5b5 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161653 2012-06-13 13:44:00Z tdziedzic $ +# $Id: PKGBUILD 168343 2012-10-09 04:08:52Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: @@ -7,7 +7,7 @@ # This implies that all libraries need to be rebuilt when ghc is rebuilt. pkgname=ghc -pkgver=7.4.2 +pkgver=7.6.1 pkgrel=1 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') @@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') checkdepends=('python2') install='ghc.install' # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... -options=('!makeflags') +#options=('!makeflags') # missing rtl? -provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.1.0' - 'haskell-binary=0.5.1.0' +provides=('haskell-array=0.4.0.1' + 'haskell-base=4.6.0.0' + 'haskell-binary=0.5.1.1' 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.9.2.1' - 'haskell-containers=0.4.2.1' - 'haskell-deepseq=1.3.0.0' - 'haskell-directory=1.1.0.2' - 'haskell-extensible-exceptions=0.1.1.4' - 'haskell-filepath=1.3.0.0' - 'haskell-ghc-prim=0.2.0.0' - 'haskell-haskell2010=1.1.0.1' - 'haskell-haskell98=2.0.0.1' - 'haskell-hoopl=3.8.7.3' - 'haskell-hpc=0.5.1.1' - 'haskell-integer-gmp=0.4.0.0' - 'haskell-old-locale=1.0.0.4' - 'haskell-old-time=1.1.0.0' + 'haskell-bytestring=0.10.0.0' + 'haskell-containers=0.5.0.0' + 'haskell-deepseq=1.3.0.1' + 'haskell-directory=1.2.0.0' + 'haskell-filepath=1.3.0.1' + 'haskell-ghc-prim=0.3.0.0' + 'haskell-haskell2010=1.1.1.0' + 'haskell-haskell98=2.0.0.2' + 'haskell-hoopl=3.9.0.0' + 'haskell-hpc=0.6.0.0' + 'haskell-integer-gmp=0.5.0.0' + 'haskell-old-locale=1.0.0.5' + 'haskell-old-time=1.1.0.1' 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.1' - 'haskell-template-haskell=2.7.0.0' - 'haskell-time=1.4' - 'haskell-unix=2.5.1.1' - 'haskell-cabal=1.14.0' - ) -replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.1.0' - 'haskell-binary<0.5.1.0' + 'haskell-process=1.1.0.2' + 'haskell-template-haskell=2.8.0.0' + 'haskell-time=1.4.0.1' + 'haskell-unix=2.6.0.0' + 'haskell-cabal=1.16.0') +replaces=('haskell-array<0.4.0.1' + 'haskell-base<4.6.0.0' + 'haskell-binary<0.5.1.1' 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.9.2.1' - 'haskell-containers<0.4.2.1' - 'haskell-deepseq<1.3.0.0' - 'haskell-directory<1.1.0.2' - 'haskell-extensible-exceptions<0.1.1.4' - 'haskell-filepath<1.3.0.0' - 'haskell-ghc-prim<0.2.0.0' - 'haskell-haskell2010<1.1.0.1' - 'haskell-haskell98<2.0.0.1' - 'haskell-hoopl<3.8.7.3' - 'haskell-hpc<0.5.1.1' - 'haskell-integer-gmp<0.4.0.0' - 'haskell-old-locale<1.0.0.4' - 'haskell-old-time<1.1.0.0' + 'haskell-bytestring<0.10.0.0' + 'haskell-containers<0.5.0.0' + 'haskell-deepseq<1.3.0.1' + 'haskell-directory<1.2.0.0' + 'haskell-filepath<1.3.0.1' + 'haskell-ghc-prim<0.3.0.0' + 'haskell-haskell2010<1.1.1.0' + 'haskell-haskell98<2.0.0.2' + 'haskell-hoopl<3.9.0.0' + 'haskell-hpc<0.6.0.0' + 'haskell-integer-gmp<0.5.0.0' + 'haskell-old-locale<1.0.0.5' + 'haskell-old-time<1.1.0.1' 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.1' - 'haskell-template-haskell<2.7.0.0' - 'haskell-time<1.4' - 'haskell-unix<2.5.1.1' - 'haskell-cabal<1.14.0' - ) + 'haskell-process<1.1.0.2' + 'haskell-template-haskell<2.8.0.0' + 'haskell-time<1.4.0.1' + 'haskell-unix<2.6.0.0' + 'haskell-cabal<1.16.0') source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk' - 'silence-gen_contents_index.diff') -md5sums=('267462db5c5a7c245fb26361b77007c4' - '528005749c761fe6c12a0079bd84fb90' - '88ad4108c26f56fc38466d82aaf9a295' - '2ac480d025b706fc47acc58c54b246bb') + 'build.mk') +md5sums=('e9d892d2970550ec5e70130b3621f6b6' + '0d93c458e3b445a7e524ef6ae459ce11' + 'c367ef26300648ee9b8aca3dee5c9669') build() { cd ghc-${pkgver} - # Silence gen_contents_index for the common case. - # http://hackage.haskell.org/trac/ghc/ticket/5992 - patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff - cp ${srcdir}/build.mk mk/build.mk ./configure \ @@ -96,16 +86,35 @@ build() { } check() { + # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... + unset MAKEFLAGS + cd ghc-${pkgver} # python2 rename sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - #make THREADS=9 test + # upstream known failures on both i686 and x86_64: + # ghci.debugger/scripts break011 [bad stderr] (ghci) + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 make test - # might be some failures + + # enabling threads to speed up + # causes more failures than make test, need to investigate + # upstream known failures on both i686 and x86_64: + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 + #make THREADS=9 test + + # will most likely cause lots of failures + # enable this when upstream has 0 test failures from a simple 'make test' + # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757 #make fulltest } diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk index 73645a957..bb57594bf 100644 --- a/extra/ghc/build.mk +++ b/extra/ghc/build.mk @@ -10,6 +10,9 @@ # Full build with max optimisation and everything enabled (very slow build) BuildFlavour = perf +# As above but build GHC using the LLVM backend +#BuildFlavour = perf-llvm + # Fast build with optimised libraries, no profiling (RECOMMENDED): #BuildFlavour = quick @@ -51,6 +54,23 @@ endif endif +# ---------------- Perf build using LLVM ------------------------------------- + +ifeq "$(BuildFlavour)" "perf-llvm" + +SRC_HC_OPTS = -O -H64m -fllvm +GhcStage1HcOpts = -O -fllvm +GhcStage2HcOpts = -O2 -fllvm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + # -------- A Fast build ------------------------------------------------------ ifeq "$(BuildFlavour)" "quickest" @@ -151,10 +171,14 @@ endif ifeq "$(BuildFlavour)" "unreg" +# Note that the LLVM backend works in unregisterised mode as well as +# registerised mode. This often makes it a good choice for porting +# GHC. + GhcUnregisterised = YES GhcWithNativeCodeGen = NO -SRC_HC_OPTS = -O -H64m +SRC_HC_OPTS = -O -H64m # -fllvm GhcStage1HcOpts = -O GhcStage2HcOpts = -O2 GhcHcOpts = -Rghc-timing @@ -173,3 +197,4 @@ endif # NoFib settings NoFibWays = STRIP_CMD = : + diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD index fda58f3c9..5eb7da013 100644 --- a/extra/haskell-http/PKGBUILD +++ b/extra/haskell-http/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.3 +pkgver=4000.2.4 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('872a1e49c3701c61c354f76716d4e3e7') +md5sums=('5edcd9fd16a9cb72a140a29442d514b7') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD index 4b2f73533..f1fa7c286 100644 --- a/extra/haskell-mtl/PKGBUILD +++ b/extra/haskell-mtl/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=mtl pkgname=haskell-mtl -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('0654be687f1492a2ff30cf6f3fb7eed0') +md5sums=('943c110524d96126bfa0e61f7df1ebcd') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD index f3a3cc022..7f5d13fc1 100644 --- a/extra/haskell-network/PKGBUILD +++ b/extra/haskell-network/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=network pkgname=haskell-network -pkgver=2.3.0.14 +pkgver=2.3.1.0 pkgrel=1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('1e45cc731647acff8b9c33bda085bf2a') +md5sums=('d824db8fc068cab60fa178ab330a57a2') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD index 2ab24a745..9c7c1aafb 100644 --- a/extra/haskell-parsec/PKGBUILD +++ b/extra/haskell-parsec/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=parsec pkgname=haskell-parsec -pkgver=3.1.2 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('c2a75dfd247ae4839e2602b62dc87487') +md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD index 56b110289..07cc5e2c2 100644 --- a/extra/haskell-random/PKGBUILD +++ b/extra/haskell-random/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A basic random number generation library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD index 31811e339..5a23030d5 100644 --- a/extra/haskell-text/PKGBUILD +++ b/extra/haskell-text/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=text pkgname=haskell-text -pkgver=0.11.2.1 +pkgver=0.11.2.3 pkgrel=1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('77245df79d10ed5f896a9d3f5b17ee74') +md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD index a216083a0..cc60818b6 100644 --- a/extra/haskell-transformers/PKGBUILD +++ b/extra/haskell-transformers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161660 2012-06-13 13:44:42Z tdziedzic $ +# $Id: PKGBUILD 168350 2012-10-09 04:09:36Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -6,12 +6,12 @@ _hkgname=transformers pkgname=haskell-transformers pkgver=0.3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=${pkgname}.install md5sums=('852dc0b79cc2bcb39136287d3dd385e5') diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD index 11767ab97..30834b3c1 100644 --- a/extra/haskell-zlib/PKGBUILD +++ b/extra/haskell-zlib/PKGBUILD @@ -6,18 +6,22 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.3 -pkgrel=4 +pkgrel=5 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'zlib' 'sh') +depends=('ghc=7.6.1-1' 'zlib' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('1649e56d13ce2c6a6a9210227401dbbc') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # ghc 7.6 includes bytestring 0.10 + sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index 009fe1136..50056ddf0 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $ +# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.3.1 -_pkgver=4.3.1 +pkgver=1.3.90 +_pkgver=4.3.90 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64') @@ -13,9 +13,9 @@ depends=('kdevelop-pg-qt') makedepends=('cmake' 'automoc4') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') -source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525' - '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0') +source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) +sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d' + 'f11194f5672d78406b6c54d53b10c02384e5bf99') build() { cd "${srcdir}" diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 7890cd561..6efc30aa5 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $ +# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.3.1 +pkgver=4.3.90 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('GPL') depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart') makedepends=('cmake' 'automoc4') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401') +source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a') build() { cd "${srcdir}" diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index a60d25716..c7370bce0 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $ +# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.3.1 -_pkgver=4.3.1 +pkgver=1.3.90 +_pkgver=4.3.90 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('kdelibs' 'subversion' 'qjson') optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37') +source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733') build() { cd "${srcdir}" diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD new file mode 100644 index 000000000..b11c9a7de --- /dev/null +++ b/extra/libva-intel-driver/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168383 2012-10-09 16:37:25Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> + +pkgname=libva-intel-driver +pkgver=1.0.18 +pkgrel=1 +pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." +arch=('i686' 'x86_64') +url="http://freedesktop.org/wiki/Software/vaapi" +license=('MIT') +depends=('libva') +options=('!libtool') +replaces=('libva-driver-intel') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2 + build-fix.patch) +sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256' + '447987d81800b2a5c434e6b6b19b6f8ec9c675d1') + +build() { + cd $pkgname-$pkgver + patch -Np1 -i ../build-fix.patch + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/libva-intel-driver/build-fix.patch b/extra/libva-intel-driver/build-fix.patch new file mode 100644 index 000000000..0127b06cf --- /dev/null +++ b/extra/libva-intel-driver/build-fix.patch @@ -0,0 +1,68 @@ +From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001 +From: Gwenole Beauchesne <gwenole.beauchesne@intel.com> +Date: Fri, 06 Apr 2012 15:24:36 +0000 +Subject: dri: cope with drm_state changes. + +Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> +--- +diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c +index 3bea253..20fed99 100644 +--- a/src/i965_drv_video.c ++++ b/src/i965_drv_video.c +@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx, + unsigned int flags) /* de-interlacing flags */ + { + struct i965_driver_data *i965 = i965_driver_data(ctx); +- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; ++ struct dri_state *dri_state = (struct dri_state *)ctx->drm_state; + struct i965_render_state *render_state = &i965->render_state; + struct dri_drawable *dri_drawable; + union dri_buffer *buffer; +@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx, + int pp_flag = 0; + + /* Currently don't support DRI1 */ +- if (dri_state->driConnectedFlag != VA_DRI2) ++ if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2) + return VA_STATUS_ERROR_UNKNOWN; + + /* Some broken sources such as H.264 conformance case FM2_SVA_C +diff --git a/src/intel_driver.c b/src/intel_driver.c +index 4e6df81..b34d9a1 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -29,7 +29,7 @@ + + #include <assert.h> + +-#include <va/va_dricommon.h> ++#include <va/va_drmcommon.h> + + #include "intel_batchbuffer.h" + #include "intel_memman.h" +@@ -50,15 +50,17 @@ Bool + intel_driver_init(VADriverContextP ctx) + { + struct intel_driver_data *intel = intel_driver_data(ctx); +- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; ++ struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state; + int has_exec2, has_bsd, has_blt; + +- assert(dri_state); +- assert(dri_state->driConnectedFlag == VA_DRI2 || +- dri_state->driConnectedFlag == VA_DRI1); ++ assert(drm_state); ++ assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 || ++ drm_state->auth_type == VA_DRM_AUTH_DRI2 || ++ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); + +- intel->fd = dri_state->fd; +- intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2); ++ intel->fd = drm_state->fd; ++ intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 || ++ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); + + if (!intel->dri2Enabled) { + return False; +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libva-vdpau-driver/PKGBUILD b/extra/libva-vdpau-driver/PKGBUILD new file mode 100644 index 000000000..4edf7b9c0 --- /dev/null +++ b/extra/libva-vdpau-driver/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168382 2012-10-09 16:32:34Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=libva-vdpau-driver +pkgver=0.7.4 +pkgrel=1 +pkgdesc="VDPAU backend for VA API" +arch=('i686' 'x86_64') +url="http://freedesktop.org/wiki/Software/vaapi" +license=('GPL') +depends=('libva' 'libvdpau') +makedepends=('mesa') +replaces=('vdpau-video') +options=('!libtool') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: + + diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 9317458cc..2922dc84a 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 161866 2012-06-16 00:18:39Z ibiru $ +# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64') url="http://freedesktop.org/wiki/Software/vaapi" license=('MIT') depends=('libegl' 'libgl' 'libdrm' 'libxfixes') makedepends=('mesa') -optdepends=('vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards') +optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' + 'libva-intel-driver: back-end for intel cards') options=('!libtool') -install=libva.install -source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b22179bd44137e91d5c77a43a0cb8063') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9') build() { cd "$pkgname-$pkgver" - ./autogen.sh ./configure --prefix=/usr make } diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 2bbe1b908..c6564337c 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153294 2012-03-12 20:52:27Z andyrtr $ +# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.8.1 +pkgver=1.9 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) @@ -14,13 +14,16 @@ options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f' +sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput + PYTHON=/usr/bin/python2 + ./autogen.sh --prefix=/usr \ + --enable-xinput \ + --disable-static make } diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 79ca5d5fb..804244272 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,24 +1,53 @@ -# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $ +# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') pkgver=3.5.0.15 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') -options=('!makeflags') +options=('!makeflags') # '!strip') makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz - nx-x11.ld.so.conf.d) + nx-x11.ld.so.conf.d + nx-cflags.patch) md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' - 'f2ec60c7e2d81bef2f7292d2b33681a6') + 'f2ec60c7e2d81bef2f7292d2b33681a6' + 'd0c5b88aac0473e19699cf62d84b9d5f') build() { cd "${srcdir}/nx-libs-$pkgver" + + # debug flags +# export CFLAGS="-march=x86-64 -O1 -g -pipe" +# export CXXFLAGS="-march=x86-64 -O1 -g -pipe" + + + # Gentoo hacks to honor cflags + patch -Np0 -i ${srcdir}/nx-cflags.patch + + # Run autoreconf in all neeed folders + for i in nxcomp nxcompext nxcompshad nxproxy; do + cd ${i} + autoreconf -vfi #${i} + cd .. + done + + # From xorg-x11-6.9.0-r3.ebuild + pushd "${srcdir}/nx-libs-$pkgver/nx-X11" + + HOSTCONF="config/cf/host.def" + echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} + echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} + # Respect LDFLAGS + echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF} + echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} + popd + make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch new file mode 100644 index 000000000..35562939c --- /dev/null +++ b/extra/nx/nx-cflags.patch @@ -0,0 +1,54 @@ +--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 ++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 +@@ -7,8 +7,7 @@ + + dnl Set our default compilation flags. + +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + dnl Reset default linking directives. + +--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 ++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(NXlib.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 ++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Shadow.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 ++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Main.c) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Prefer headers and libraries from nx-X11 if present. + + if test -d "../nx-X11/exports/include" ; then |