diff options
48 files changed, 1259 insertions, 994 deletions
diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD index 11355cca2..db1299234 100644 --- a/community/caph/PKGBUILD +++ b/community/caph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84258 2013-02-14 21:05:08Z arodseth $ +# $Id: PKGBUILD 84880 2013-02-25 19:41:45Z arodseth $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: jose <jose1711 [at] gmail (dot) com> diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD index d55759b58..0c572e9e8 100644 --- a/community/celt-0.7/PKGBUILD +++ b/community/celt-0.7/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61638 2012-01-05 08:56:24Z svenstaro $ +# $Id: PKGBUILD 84881 2013-02-25 19:42:06Z arodseth $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> @@ -6,16 +6,16 @@ pkgname=celt-0.7 _realname=celt pkgver=0.7.1 -pkgrel=3 -pkgdesc="Low-latency audio communication codec" +pkgrel=4 +pkgdesc='Low-latency audio communication codec' arch=('i686' 'x86_64') -url="http://www.celt-codec.org" +url='http://www.celt-codec.org' license=('BSD') depends=('libogg') #provides=('celt=$pkgver') conflicts=('celt') options=('!libtool') -source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz) +source=("http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz") md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0') build() { @@ -23,12 +23,12 @@ build() { ./configure --prefix=/usr make - make DESTDIR="$pkgdir/" install } package() { cd "$srcdir/$_realname-$pkgver" + make DESTDIR="$pkgdir/" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/BSD" } diff --git a/community/cx_freeze/FreezePython.sh b/community/cx_freeze/FreezePython.sh deleted file mode 100644 index 5bba21cac..000000000 --- a/community/cx_freeze/FreezePython.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /usr/share/cx-freeze -./FreezePython "$@" diff --git a/community/cx_freeze/PKGBUILD b/community/cx_freeze/PKGBUILD deleted file mode 100644 index 383748df3..000000000 --- a/community/cx_freeze/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 83132 2013-01-27 16:11:45Z pierre $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Roberto Alsina <ralsina@kde.org> - -pkgname=cx_freeze -_tarname=cx_Freeze -pkgver=4.2.3 -pkgrel=2 -pkgdesc="A set of utilities for freezing Python scripts into executables" -arch=('i686' 'x86_64') -url="http://www.python.net/crew/atuining/cx_Freeze/" -license=('custom') -depends=('python2') -provides=('cxfreeze') -source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz" - 'FreezePython.sh') -md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad' - '5cc60d1644eba12a57c22cc1348a4afd') - -package() { - cd "$srcdir/$_tarname-$pkgver" - - python2 setup.py install --root "$pkgdir/" --optimize 1 - - install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts} - install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases" - install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts" - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING" -} diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index 33e3ceb53..f5235a6df 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82304 2013-01-14 17:20:39Z spupykin $ +# $Id: PKGBUILD 84832 2013-02-25 10:36:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> @@ -8,9 +8,9 @@ # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc pkgname=fpc -pkgver=2.6.0 +pkgver=2.6.2 _gdbver=7.5.1 -pkgrel=4 +pkgrel=1 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64') url="http://www.freepascal.org/" @@ -22,25 +22,25 @@ options=(zipman) source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz http://ftp.gnu.org/gnu/gdb/gdb-${_gdbver}.tar.bz2 fpc-gdb.patch) -md5sums=('17375e665a4e1311f85812fe2754f609' +md5sums=('89c7e60db6280f3d5cc006a4a9ff43a9' '3f48f468b24447cf24820054ff6e85b1' '1e45ece6b5d4ee60b860e75926b4122d') build() { cd ${srcdir}/gdb-${_gdbver} - ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui - make - make -C gdb libgdb.a - cp libdecnumber/libdecnumber.a gdb/ +# ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui +# make +# make -C gdb libgdb.a +# cp libdecnumber/libdecnumber.a gdb/ cd ${srcdir}/fpcbuild-$pkgver - patch -p1 <$srcdir/fpc-gdb.patch +# patch -p1 <$srcdir/fpc-gdb.patch export GDBLIBDIR=${srcdir}/gdb-${_gdbver}/gdb export LIBGDBFILE=$GDBLIBDIR/libgdb.a pushd fpcsrc/compiler fpcmake -Tall popd - make build + make build NOGDB=1 } package() { diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 43586cdaf..836892a3b 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77120 2012-10-05 10:52:14Z spupykin $ +# $Id: PKGBUILD 84836 2013-02-25 10:38:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -35,7 +35,8 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius + --libdir=/usr/lib/freeradius \ + --with-udpfromto make } diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 1fefecc1a..3794a8361 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $ +# $Id: PKGBUILD 84862 2013-02-25 14:37:51Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' +pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime' - 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' - 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' - '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.4 -pkgrel=3 + 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' + 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map' + 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' + 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' + 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' '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.4.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -30,20 +30,18 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'gmime' 'glu') options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch' - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('ec3971de80901737dcc614059f441848' - '85b6b02bccd022bf0879fcbf21e83567' - 'b284be39d147ec799f1116a6abc068b4' - '6d9e080b66443e7246387b1716d24e31') + fix-xfce4-terminal.patch + uninstall-with-XDG_UTILS.patch) +md5sums=('e9d63bfaf351fc7e1705d1b80785b6af' + '543ffb3402485e0bcfc67ecf15b7b682' + 'abf7d298d301aef65ecc4d9a775ebd00') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # Fix build with LLVM 3.2 - patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch - # replace obsolete AM_CONFIG_HEADER - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 + # merged upstream + patch -Np1 -i ../uninstall-with-XDG_UTILS.patch + patch -Np0 -i ../fix-xfce4-terminal.patch ./reconf-all ./configure --prefix=/usr -C @@ -95,12 +93,21 @@ package_gambas3-runtime() { make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,chart.*,form.*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,chart.*,form.*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control ## } @@ -153,15 +160,15 @@ package_gambas3-script() { } package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt' - 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' + depends=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' + 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' + 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' + 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-image-io' 'gambas3-gb-map' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' - 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' + 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' - 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} @@ -171,6 +178,26 @@ package_gambas3-examples() { rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} } +package_gambas3-gb-args() { + depends=('gambas3-runtime') + pkgdesc="Command-line options analyzer component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-w]* + ## +} + package_gambas3-gb-cairo() { depends=('gambas3-runtime' 'cairo') pkgdesc="Cairo component" @@ -209,8 +236,8 @@ package_gambas3-gb-chart() { cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a*,d-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a*,d-w]* ## } @@ -296,8 +323,8 @@ package_gambas3-gb-db() { ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-c]*,gb.d{a,e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-c]*,gb.d{a,e}*,gb.[e-z]*} ## } @@ -416,6 +443,24 @@ package_gambas3-gb-db-sqlite3() { ## } +package_gambas3-gb-dbus() { + depends=('gambas3-runtime' 'dbus-core') + pkgdesc="DBUS component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-desktop() { depends=('gambas3-gb-image' 'libsm' 'libxtst') pkgdesc="Desktop component" @@ -462,24 +507,6 @@ package_gambas3-gb-desktop-gnome() { ## } -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - package_gambas3-gb-eval-highlight() { depends=('gambas3-runtime') pkgdesc="Expression evaluator highlight component" @@ -499,8 +526,8 @@ package_gambas3-gb-eval-highlight() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-d]*,[f-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-d]*,[f-z]*} rm -r ${pkgdir}/usr/share/gambas3/control ## } @@ -529,8 +556,8 @@ package_gambas3-gb-form() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}} ## } @@ -558,8 +585,8 @@ package_gambas3-gb-form-dialog() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,g*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,m*,s*}} ## } @@ -587,8 +614,8 @@ package_gambas3-gb-form-mdi() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-e]*,[g-w]*,form.{c*,d*,g*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,d*,s*}} ## } @@ -611,27 +638,22 @@ package_gambas3-gb-form-stock() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,[m-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,[m-w]*} ## } -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" +package_gambas3-gb-gsl() { + depends=('gambas3-runtime' 'gsl') + pkgdesc="The GNU Scientific Library component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -639,17 +661,20 @@ package_gambas3-gb-gtk() { ## } -package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') - pkgdesc="GTK+ toolkit OpenGL component" +package_gambas3-gb-gtk() { + depends=('gambas3-gb-image' 'gtk2' 'librsvg') + pkgdesc="GTK+ toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -657,16 +682,16 @@ package_gambas3-gb-gtk-opengl() { ## } -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" +package_gambas3-gb-gtk-opengl() { + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') + pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround @@ -779,6 +804,47 @@ package_gambas3-gb-libxml() { ## } +package_gambas3-gb-map() { + depends=('gambas3-gb-imageio' 'gambas3-gb-form') + pkgdesc="Display maps component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control/gb.{[d-f]*,[q-r]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*} + ## +} + package_gambas3-gb-media() { depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') pkgdesc="Simplified interface to the GStreamer library component" @@ -797,6 +863,39 @@ package_gambas3-gb-media() { ## } +package_gambas3-gb-memcached() { + depends=('gambas3-gb-net') + pkgdesc="Memcached client component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*} + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*} + ## +} + package_gambas3-gb-mime() { depends=('gambas3-runtime' 'gmime') pkgdesc="MIME message component" @@ -892,8 +991,8 @@ package_gambas3-gb-net-pop3() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*} ## } @@ -1123,8 +1222,8 @@ package_gambas3-gb-report() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*} ## } @@ -1179,8 +1278,8 @@ package_gambas3-gb-settings() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-r]*,[t-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-r]*,[t-w]*} ## } @@ -1234,6 +1333,26 @@ package_gambas3-gb-vb() { ## } +package_gambas3-gb-web() { + depends=('gambas3-runtime') + pkgdesc="CGI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-v]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-v]* + ## +} + package_gambas3-gb-xml() { depends=('gambas3-runtime' 'gcc-libs') pkgdesc="XML component" @@ -1328,22 +1447,3 @@ package_gambas3-gb-xml-xslt() { ## } -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community/gambas3/fix-xfce4-terminal.patch b/community/gambas3/fix-xfce4-terminal.patch new file mode 100644 index 000000000..c8fcc8f4f --- /dev/null +++ b/community/gambas3/fix-xfce4-terminal.patch @@ -0,0 +1,476 @@ +--- gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5536) ++++ gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5537) +@@ -1,6 +1,6 @@ + ' Gambas class file + +-Export ++Export + + Class _Desktop + +@@ -27,64 +27,64 @@ + Static Private $aImgExt As String[] + + Static Public Sub SendMail({To} As String[], Optional Cc As String[], Optional Bcc As String[], Optional Subject As String, Optional Body As String, Optional Attachment As String) +- ++ + Dim aArg As String[] + 'xdg-email [--utf8] [--cc address] [--bcc address] [--subject text] [--body text + ' ] [--attach file] { mailto-uri | address(es) } +- ++ + aArg = ["--utf8"] +- If CC And If CC.Count Then ++ If CC And If CC.Count Then + aArg.Add("--cc") + aArg.Insert(CC) + Endif +- If BCC And If BCC.Count Then ++ If BCC And If BCC.Count Then + aArg.Add("--bcc") + aArg.Insert(BCC) + Endif +- If Subject Then ++ If Subject Then + aArg.Add("--subject") + aArg.Add(Subject) +- Endif +- If Body Then ++ Endif ++ If Body Then + aArg.Add("--body") + aArg.Add(Body) + Endif +- If Attachment Then ++ If Attachment Then + aArg.Add("--attach") + aArg.Add(Attachment) +- Endif +- +- If {To} And If To.Count Then ++ Endif ++ ++ If {To} And If To.Count Then + aArg.Insert({To}) + Endif +- ++ + Main.RunXdgUtil("xdg-email", aArg) +- ++ + End + + Static Public Sub {Open}(URL As String, Optional {Wait} As Boolean) +- ++ + If URL = "~" Then + URL = User.Home + Else If URL Begins "~/" Then + URL = User.Home & Mid$(URL, 2) + Endif +- ++ + Main.RunXdgUtil("xdg-open", [URL], {Wait}) +- ++ + End + + ' Static Private Function Menus_Read() As _DesktopMenus +-' +-' Return _DesktopMenus +-' ++' ++' Return _DesktopMenus ++' + ' End +-' +-' ++' ++' + ' Static Private Function Icons_Read() As _DesktopIcons +-' ++' + ' Return _DesktopIcons +-' ++' + ' End + + Static Private Function ScreenSaver_Read() As _Desktop_ScreenSaver +@@ -96,20 +96,20 @@ + ' GB_STATIC_METHOD("Find", "Integer[]", CDESKTOP_find, "[(Title)s(Application)s(Role)s]"), + + Static Public Sub FindWindow(Optional Title As String, Application As String, Role As String) As Integer[] +- ++ + Return _Desktop.FindWindow(Title, Application, Role) +- ++ + End + + ' STATIC PRIVATE SUB InitKeys() +-' ++' + ' $cKeys = NEW Collection + ' $cKeys["é"] = "eacute" +-' ++' + ' END + + Static Public Sub SendKeys(Keys As String) +- ++ + Dim iInd As Integer + Dim sCar As String + Dim iPos As Integer +@@ -117,15 +117,15 @@ + Dim bHold As Boolean + Dim sErr As String + Dim iLen As Integer = String.Len(Keys) +- ++ + Do +- ++ + Inc iInd + If iInd > iLen Then Break +- ++ + sCar = String.Mid$(Keys, iInd, 1) +- +- If sCar = "[" Then ++ ++ If sCar = "[" Then + iPos = String.InStr(Keys, "]", iInd) + If iPos = 0 Then Break + sCar = String.Mid$(Keys, iInd + 1, iPos - iInd - 1) +@@ -134,7 +134,7 @@ + Else If sCar = "{" And If Not bHold Then + bHold = True + Continue +- Else If sCar = "}" And If bHold Then ++ Else If sCar = "}" And If bHold Then + bHold = False + aRelease.Reverse + For Each sCar In aRelease +@@ -144,11 +144,11 @@ + aRelease.Clear + Continue + Endif +- +- If Len(sCar) >= 2 Then ++ ++ If Len(sCar) >= 2 Then + Try sCar = Conv(sCar, "UTF-8", "LATIN1") + Endif +- ++ + If bHold Then + 'DEBUG sCar;; TRUE + _Desktop.SendKey(sCar, True) +@@ -159,25 +159,25 @@ + 'DEBUG sCar;; FALSE + _Desktop.SendKey(sCar, False) + Endif +- +- Loop +- +-Catch + ++ Loop ++ ++Catch ++ + sErr = Error.Text & ": '" & sCar & "'" +- ++ + For Each sCar In aRelease + _Desktop.SendKey(sCar, False) + Next + + Error.Raise(sErr) +- ++ + End + + Static Private Sub GetDesktop() As String +- ++ + If Not $sDesktop Then +- ++ + If Application.Env["KDE_FULL_SESSION"] Then + If Application.Env["KDE_SESSION_VERSION"] = "4" Then + $sDesktop = "KDE4" +@@ -204,24 +204,23 @@ + $sDesktop = "?" + End Select + Endif +- ++ + Endif +- ++ + '$sDesktop = "GNOME" + Return $sDesktop +- ++ + End + ++Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) + +-Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) +- + Dim sExec As String + Dim sCmd As String + Dim bNoDir As Boolean + Dim Command As String +- ++ + Select Case GetDesktop() +- ++ + Case "KDE" + sExec = "konsole" + Case "KDE4" +@@ -247,7 +246,7 @@ + Endif + If Command Then sExec &= " -x " & Shell$(Command) + Case "XFCE" +- sExec = "Terminal" ++ sExec = "xfce4-terminal" + If Command Then sExec &= " -x " & Shell$(Command) + Case "LXDE" + sExec = "lxterminal" +@@ -255,46 +254,43 @@ + Case Else + sExec = "xterm" + If Command Then sExec &= " -e " & Shell$(Command) +- ++ + End Select +- ++ + If {Dir} And If Not bNoDir Then + sCmd = "(cd " & Shell$({Dir}) & "; " & sExec & ")" + Else + sCmd = sExec + Endif +- ++ + Shell sCmd +- ++ + End + +- + Static Private Function Type_Read() As String + +- Return GetDesktop() ++ Return GetDesktop() + + End + +- + Static Public Sub _get(Index As Integer) As _DesktopVirtual + + Dim hVirtual As _DesktopVirtual +- ++ + If Not $cDesktop Then $cDesktop = New Collection +- ++ + hVirtual = $cDesktop[Index] + If Not hVirtual Then + hVirtual = New _DesktopVirtual(Index) + $cDesktop[Index] = hVirtual + Endif + Return hVirtual +- ++ + End + +- + Static Private Function Current_Read() As Integer + +- Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] ++ Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] + + End + +@@ -313,7 +309,7 @@ + + Static Private Sub Count_Write(Value As Integer) + +- _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) ++ _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) + + End + +@@ -343,40 +339,40 @@ + + Static Private Sub Showing_Write(Value As Boolean) + +- _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) ++ _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) + + End + + ' Static Private Function Width_Read() As Integer +-' ++' + ' Dim iWidth As Integer +-' ++' + ' Try iWidth = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0] + ' If iWidth = 0 Then iWidth = Super.Width + ' Return iWidth +-' ++' + ' End +-' ++' + ' Static Private Function Height_Read() As Integer +-' ++' + ' Dim iHeight As Integer +-' ++' + ' Try iHeight = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1] + ' If iHeight = 0 Then iHeight = Super.Height + ' Return iHeight +-' ++' + ' End + + ' Static Private Function W_Read() As Integer +-' ++' + ' Return Width_Read() +-' ++' + ' End +-' ++' + ' Static Private Function H_Read() As Integer +-' ++' + ' Return Height_Read() +-' ++' + ' End + + Static Private Function Passwords_Read() As _Desktop_Passwords +@@ -385,7 +381,6 @@ + + End + +- + Static Private Function Path_Read() As String + + Return Main.GetDesktopPath() +@@ -399,34 +394,33 @@ + End + + Static Public Sub RunAsRoot(Command As String) +- ++ + Main.RunXdgUtil("xdg-su", ["-c", Command]) +- + + End + + Static Public Sub GetFileIcon(Path As String, Size As Integer, Optional Preview As Boolean) As Picture +- ++ + Dim hImage As Image + Dim hIcon As Image + Dim sIcon As String + Dim hPict As Picture +- ++ + If IsDir(Path) Then Return Picture["icon:/" & CStr(Size) & "/directory"] +- ++ + If Preview And If $aImgExt.Exist(File.Ext(Path)) < 0 Then +- If Stat(Path).Size <= 65536 Then +- ++ If Stat(Path).Size <= 65536 Then ++ + Try hImage = Image.Load(Path) + If Not Error Then +- If Not (hImage.Width = Size And hImage.Height = Size) Then +- If hImage.Width > hImage.Height Then ++ If Not (hImage.Width = Size And hImage.Height = Size) Then ++ If hImage.Width > hImage.Height Then + hImage = hImage.Stretch(Size, (Size * hImage.Height) \ hImage.Width) + Else + hImage = hImage.Stretch((Size * hImage.Width) \ hImage.Height, Size) + Endif + Endif +- ++ + hIcon = New Image(hImage.W + 4, hImage.H + 4, Color.Transparent) + Paint.Begin(hIcon) + Paint.AntiAlias = False +@@ -435,38 +429,38 @@ + Paint.Stroke + Paint.End + hIcon.DrawImage(hImage, 2, 2) +- ++ + Return hIcon.Picture + Else +- Return Picture["icon:/" & Size & "/image"] ++ Return Picture["icon:/" & Size & "/image"] + Endif +- ++ + Endif +- ++ + Endif + + Try hPict = DesktopMime.FromFile(Path).GetIcon(Size).Picture + If hPict Then Return hPict +- ++ + If Not $cExt Then InitFileExt +- ++ + Try sIcon = $cExt[File.Ext(Path)] + If sIcon Then Return Picture["icon:/" & CStr(Size) &/ sIcon] +- ++ + With Stat(Path) +- ++ + If InStr(.Perm[System.User.Name], "x") Then Return Picture["icon:/" & CStr(Size) &/ "exec"] +- ++ + End With +- ++ + Catch +- ++ + Error "gb.desktop: unable to get icon for file: "; File.Name(Path) +- ++ + End + + Static Private Sub InitFileExt() +- ++ + $cExt = New Collection + $cExt["html"] = "html" + $cExt["htm"] = "html" +@@ -502,7 +496,7 @@ + $cExt["ico"] = "image" + $cExt["xcf"] = "image" + $cExt["svg"] = "image" +- ++ + $aImgExt = ["png", "jpeg", "jpg", "gif", "xpm", "bmp", "ico"] +- ++ + End diff --git a/community/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch new file mode 100644 index 000000000..0b7b9b8d7 --- /dev/null +++ b/community/gambas3/uninstall-with-XDG_UTILS.patch @@ -0,0 +1,13 @@ +diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am +--- gambas3-3.4.0/main/Makefile.am 2013-02-03 19:20:59.000000000 +0000 ++++ gambas3-3.4.0b/main/Makefile.am 2013-02-21 15:28:16.941250567 +0000 +@@ -27,5 +27,7 @@ + uninstall-local: + @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) + @rm -rf $(DESTDIR)$(gblibdir)/info +- @xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; +- @xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; ++ @if test x"$(XDG_UTILS)" != x; then \ ++ xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ ++ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ ++ fi diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 6a7b489f7..0546e39df 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z schiv $ +# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,13 +9,12 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.9.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'libffado' 'celt' - 'libsamplerate' 'dbus-core') +makedepends=('python2' 'libffado' 'celt' 'libsamplerate') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' '40-hpet-permissions.rules') @@ -79,10 +78,8 @@ package_jack2() { ! _isbuild jack2 && return 0 pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate' 'celt') - optdepends=('libffado: FireWire support' - 'dbus-core: jackdbus' - 'python2: jack_control') + depends=('libsamplerate' 'celt' 'libffado') + optdepends=('python2: jack_control') conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') @@ -106,9 +103,8 @@ package_jack2-dbus() { ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'celt' 'dbus-core') - optdepends=('libffado: FireWire support' - 'python2: jack_control') + depends=('libsamplerate' 'celt' 'libffado') + optdepends=('python2: jack_control') conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') diff --git a/community/jack2/ffado_setbuffsize-jack2.patch b/community/jack2/ffado_setbuffsize-jack2.patch deleted file mode 100644 index 0c74aad24..000000000 --- a/community/jack2/ffado_setbuffsize-jack2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Date: Sat, 17 Mar 2012 22:36:30 +0100 -Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size - -This is a port of Jonathan Woithe's patch from jackd1. -With sufficiently recent versions of FFADO, it allows to change -the buffersize at runtime. ---- - linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- - linux/firewire/JackFFADODriver.h | 6 ++++ - 2 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp -index b33e1cd..085b78a 100644 ---- a/linux/firewire/JackFFADODriver.cpp -+++ b/linux/firewire/JackFFADODriver.cpp -@@ -3,6 +3,7 @@ - Copyright (C) 2004 Grame - Copyright (C) 2007 Pieter Palmers - Copyright (C) 2009 Devin Anderson -+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth - - 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 -@@ -48,7 +49,10 @@ - namespace Jack - { - -+// Basic functionality requires API version 8. If version 9 or later -+// is present the buffers can be resized at runtime. - #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 -+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 - - #define jack_get_microseconds GetMicroSeconds - -@@ -281,19 +285,68 @@ - int - JackFFADODriver::SetBufferSize (jack_nframes_t nframes) - { -- printError("Buffer size change requested but not supported!!!"); -+ ffado_driver_t* driver = (ffado_driver_t*)fDriver; -+ signed int chn; -+ -+ // The speed of this function isn't critical; we can afford the -+ // time to check the FFADO API version. -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || -+ ffado_streaming_set_period_size == NULL) { -+ printError("unsupported on current version of FFADO; please upgrade FFADO"); -+ return -1; -+ } - -- /* - driver->period_size = nframes; - driver->period_usecs = - (jack_time_t) floor ((((float) nframes) / driver->sample_rate) - * 1000000.0f); -- */ -+ -+ -+ // Reallocate the null and scratch buffers. -+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->nullbuffer == NULL) { -+ printError("could not allocate memory for null buffer"); -+ return -1; -+ } -+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->scratchbuffer == NULL) { -+ printError("could not allocate memory for scratch buffer"); -+ return -1; -+ } -+ -+ // MIDI buffers need reallocating -+ for (chn = 0; chn < driver->capture_nchannels; chn++) { -+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { -+ // setup the midi buffer -+ if (driver->capture_channels[chn].midi_buffer != NULL) -+ free(driver->capture_channels[chn].midi_buffer); -+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ for (chn = 0; chn < driver->playback_nchannels; chn++) { -+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { -+ if (driver->playback_channels[chn].midi_buffer != NULL) -+ free(driver->playback_channels[chn].midi_buffer); -+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ -+ // Notify FFADO of the period size change -+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { -+ printError("could not alter FFADO device period size"); -+ return -1; -+ } -+ -+ // This is needed to give the shadow variables a chance to -+ // properly update to the changes. -+ sleep(1); - - /* tell the engine to change its buffer size */ -- //driver->engine->set_buffer_size (driver->engine, nframes); -+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails - -- return -1; // unsupported -+ UpdateLatencies(); -+ -+ return 0; - } - - typedef void (*JackDriverFinishFunction) (jack_driver_t *); -@@ -306,7 +359,7 @@ - - assert(params); - -- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { - printError("Incompatible libffado version! (%s)", ffado_get_version()); - return NULL; - } -diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h -index cb2a45d..790f4dd 100644 ---- a/linux/firewire/JackFFADODriver.h -+++ b/linux/firewire/JackFFADODriver.h -@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver - int Read(); - int Write(); - -+ // BufferSize can be changed -+ bool IsFixedBufferSize() -+ { -+ return false; -+ } -+ - int SetBufferSize(jack_nframes_t nframes); - }; - --- -1.7.10 - diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index ab2c866f7..c461ee73d 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78757 2012-10-24 10:01:02Z spupykin $ +# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('371519c1c24e4de84448d6624fc41aa8' +md5sums=('df890b982250711055f5cb6d948251bb' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 369ab9284..7336d6581 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78761 2012-10-24 10:02:27Z spupykin $ +# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('46fd776968ec1047cd2a5056a906cdf2') +md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 96971bee7..83036b32f 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78759 2012-10-24 10:01:48Z spupykin $ +# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.61 +pkgver=0.7.62 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('46fd776968ec1047cd2a5056a906cdf2') +md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 3e7a72a0c..a168f3f71 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 82738 2013-01-23 16:27:21Z spupykin $ +# $Id: PKGBUILD 84846 2013-02-25 10:40:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=5.0.0 -_rel=stable -#_rel=devel -pkgrel=2 +pkgver=5.1.0 +#_rel=stable +_rel=devel +pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686') url="http://www.parrotcode.org/" @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('4f16127f539e019a30d21b4d1ea7196f') +md5sums=('cf879f76d56f007107c143a1b63037c9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD index 0fb0d9ff3..ebf819493 100644 --- a/community/units/PKGBUILD +++ b/community/units/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $ +# $Id: PKGBUILD 84848 2013-02-25 10:40:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Steve Sansom <snsansom@gmail.com> pkgname=units -pkgver=2.00 -pkgrel=2 +pkgver=2.01 +pkgrel=1 pkgdesc="converts between different units" arch=('i686' 'x86_64') url="http://www.gnu.org/software/units/units.html" @@ -15,13 +15,17 @@ options=('!makeflags') install=units.install source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz build-fix.patch) -md5sums=('6d0518d493f9bab5aa318a3c7d0801b2' +md5sums=('81bf85937c56fbbd04b16f2f3f9d8526' 'dbb20e628ce0879fe82393f585e9dab6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/build-fix.patch +# patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr --datadir=/usr/share make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 51eead283..c87f12069 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 176849 2013-02-01 14:30:42Z andyrtr $ +# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.12 -pkgrel=1 +pkgver=1.12.14 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh') -makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind') # 'libdrm') -optdepends=('xcb-util: for XCB backend') # really needed? +# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') +makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' + # for the test suite: + 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm') +#optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82') +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,18 +27,30 @@ build() { --localstatedir=/var \ --disable-static \ --enable-tee \ - --disable-xlib-xcb \ + --enable-gl \ + --enable-egl \ + --enable-svg \ + --enable-ps \ + --enable-pdf \ + --enable-gobject #\ + # --enable-test-surfaces + + #--disable-xlib-xcb \ # --enable-test-surfaces \ takes ages #--enable-drm # breaks build + make } #check() { # cd "$srcdir/$pkgname-$pkgver" -# make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped +# make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped #} package() { + depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index b8e4ebbe7..ff6cd1239 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $ +# $Id: PKGBUILD 178619 2013-02-25 20:45:02Z andyrtr $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=15 +pkgrel=16 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' @@ -28,7 +28,7 @@ source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' '50c9de71b102507fb78b192ecc22a5fc3e031bc3' - 'fbd6e773edf3e8bb8e1272629984025e041da2ca' + 'd63d51c8fef5e521b4a9a8efa050a0c8ce6f94bf' '5fbbf7a5e2032878815fa055bfb5020f478d2b25' '35e56fe4c5f71685e64b13f448dcacc620166e06' '50e92950498463defb9149ffcf8cbc2e8cd1063b' @@ -48,9 +48,6 @@ build() { patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch - sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh - make -f admin/Makefile.common cvs - ./configure --prefix=/opt/kde \ --with-distribution='Arch Linux' \ --with-alsa \ diff --git a/extra/kdelibs3/kde3.profile b/extra/kdelibs3/kde3.profile index ef09631ff..61e7c43ca 100755 --- a/extra/kdelibs3/kde3.profile +++ b/extra/kdelibs3/kde3.profile @@ -1,6 +1 @@ export PATH=$PATH:/opt/kde/bin -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share -else - export XDG_DATA_DIRS=/opt/kde/share -fi diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index dfee94203..7f42658d7 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ +# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -11,12 +11,8 @@ depends=('libxcb' 'xproto' 'kbproto') makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh - xorg.csh) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' - '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' - '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') +source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86') build() { cd "${srcdir}/libX11-${pkgver}" @@ -24,7 +20,7 @@ build() { make } -package() { +check() { cd "${srcdir}/libX11-${pkgver}" make check } @@ -33,9 +29,6 @@ package() { cd "${srcdir}/libX11-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index e7c0a4029..51a0e0fe4 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,46 +1,29 @@ -# $Id: PKGBUILD 175899 2013-01-23 16:58:37Z andyrtr $ +# $Id: PKGBUILD 178616 2013-02-25 20:44:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') - -#_git=true -#_gitdate=20121006 -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=8.99.git_$_gitdate - else - pkgver=9.0.2 -fi -pkgrel=1 +pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') +pkgver=9.1 +pkgrel=2 arch=('i686' 'x86_64') -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-amdgpu-snapshot' 'systemd' 'libvdpau>=0.5') +makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' + 'libvdpau' 'wayland' 'llvm-amdgpu-snapshot') url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(LICENSE llvm32.patch) -if [ "${_git}" = "true" ]; then - # 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" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '5fe9ad0c5beed19bc98d8c34aaad4ade' - 'dc45d1192203e418163e0017640e1cfc') +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 + #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing + LICENSE) +md5sums=('d3891e02215422e120271d976ff1947e' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* - - patch -Np1 -i ${srcdir}/llvm32.patch - COMMONOPTS="--prefix=/usr \ + autoreconf -vfi # our automake is far too new for their build system :) + + ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ @@ -48,7 +31,7 @@ build() { --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ - --with-egl-platforms=x11,drm \ + --with-egl-platforms=x11,drm,wayland \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -59,240 +42,107 @@ build() { --enable-gles2 \ --enable-texture-float \ --enable-xa \ - --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 - - # fix a build break with new llvm - sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile + --enable-vdpau \ + # --help + # --with-llvm-shared-libs \ # enabling this would force us to move llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / Mesa 9.2/10.0 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.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" - - # 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 - - - 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=('libglapi' 'gcc-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library" - - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install - - 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 - - install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" -} - -package_libgbm() { - depends=('systemd' 'libglapi' 'libdrm') - pkgdesc="Mesa gbm library" - - # 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' 'libdrm' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - # 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() { - # check also egl.pc - depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${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() { - pkgdesc="Khronos platform development package" - - install -m755 -d "${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/" + # fake installation + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install } package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" + pkgdesc="Mesa drivers for AMD/ATI Radeon" + depends=("mesa-libgl=${pkgver}") 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,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 - 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/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ + + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/ + 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" + pkgdesc="Mesa drivers for Intel" + depends=("mesa-libgl=${pkgver}") - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ - 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" + pkgdesc="Mesa drivers for Nouveau" + depends=("mesa-libgl=${pkgver}") - # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ - # 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 + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ - # fix linking because of splitted package - cleanup - make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } package_svga-dri() { - depends=('gcc-libs' 'libdrm' 'expat') pkgdesc="Gallium3D VMware guest GL driver" + depends=('gcc-libs' 'libdrm' 'expat' 'libffi') + + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/ install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" } + +package_mesa() { + pkgdesc="an open-source implementation of the OpenGL specification" + depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') + + mv -v ${srcdir}/fakeinstall/* ${pkgdir} + # rename libgl.so to not conflict with blobs - may break gl.pc ? + mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0 + rm ${pkgdir}/usr/lib/libGL.so{,.1} + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} + +package_mesa-libgl() { + pkgdesc="Mesa 3-D graphics library" + depends=("mesa=${pkgver}") + provides=("libgl=${pkgver}") + replaces=('libgl') + + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" +} diff --git a/extra/mesa/llvm32.patch b/extra/mesa/llvm32.patch deleted file mode 100644 index 946c07849..000000000 --- a/extra/mesa/llvm32.patch +++ /dev/null @@ -1,284 +0,0 @@ -From 8d9778589f4b3a174e884338adb0fe1bdeca5eb7 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Thu, 10 May 2012 14:21:54 +0000 -Subject: radeon: Support LLVM 3.2 - -LLVM 3.2 and newer requires that the R600/SI backend be part of the -LLVM tree. ---- -diff --git a/configure.ac b/configure.ac -index 896f98a..32f412b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1661,6 +1661,7 @@ if test "x$enable_gallium_llvm" = xyes; then - if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then - LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit" - fi -+ LLVM_COMPONENTS="${LLVM_COMPONENTS} all-targets" - if test "x$enable_opencl" = xyes; then - LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation" - fi -@@ -1782,6 +1783,23 @@ gallium_require_drm_loader() { - fi - } - -+radeon_llvm_check() { -+ LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1` -+ if test "$LLVM_VERSION_MAJOR" -lt "3" -o "x$LLVM_VERSION" = "x3.0"; then -+ AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi llvm compiler.]) -+ fi -+ if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then -+ AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: -+ git://people.freedesktop.org/~tstellar/llvm master -+ and build with --enable-experimental-targets==AMDGPU]) -+ fi -+ if test "$LLVM_VERSION" = "3.2"; then -+ dnl LLVM 3.2 does not add experimental libraries to llvm-config's -+ dnl library list. -+ LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" -+ fi -+} -+ - dnl Gallium drivers - dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block - if test "x$with_gallium_drivers" != x; then -@@ -1812,9 +1830,7 @@ if test "x$with_gallium_drivers" != x; then - gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" - if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then -- if test "x$LLVM_VERSION" != "x3.1"; then -- AC_MSG_ERROR([LLVM 3.1 is required for the r600 llvm compiler.]) -- fi -+ radeon_llvm_check - NEED_RADEON_GALLIUM=yes; - fi - if test "x$enable_r600_llvm" = xyes; then -@@ -1829,9 +1845,7 @@ if test "x$with_gallium_drivers" != x; then - PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) - gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" -- if test "x$LLVM_VERSION" != "x3.1"; then -- AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.]) -- fi -+ radeon_llvm_check - NEED_RADEON_GALLIUM=yes; - gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" "" - ;; -diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile -index 7f1c613..bcc2646 100644 ---- a/src/gallium/drivers/radeon/Makefile -+++ b/src/gallium/drivers/radeon/Makefile -@@ -12,6 +12,12 @@ TBLGEN = $(LLVM_BINDIR)/llvm-tblgen - - CXXFLAGS+= $(LLVM_CXXFLAGS) - -+ifeq ($(LLVM_VERSION),3.1) -+ CPP_SOURCES += $(LLVM_CPP_SOURCES) -+else -+ CXXFLAGS+= -DEXTERNAL_LLVM -+endif -+ - include ../../Makefile.template - - CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS)) -diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources -index c5d1207..5e79342 100644 ---- a/src/gallium/drivers/radeon/Makefile.sources -+++ b/src/gallium/drivers/radeon/Makefile.sources -@@ -23,8 +23,7 @@ TD_FILES := \ - SIRegisterInfo.td \ - SISchedule.td - -- --GENERATED_SOURCES := \ -+LLVM_GENERATED_SOURCES := \ - R600Intrinsics.td \ - R600RegisterInfo.td \ - SIRegisterInfo.td \ -@@ -41,7 +40,7 @@ GENERATED_SOURCES := \ - AMDGPUGenMCCodeEmitter.inc \ - AMDGPUGenDFAPacketizer.inc - --CPP_SOURCES := \ -+LLVM_CPP_SOURCES := \ - AMDIL7XXDevice.cpp \ - AMDILCFGStructurizer.cpp \ - AMDILDevice.cpp \ -@@ -81,6 +80,8 @@ CPP_SOURCES := \ - MCTargetDesc/SIMCCodeEmitter.cpp \ - MCTargetDesc/R600MCCodeEmitter.cpp \ - TargetInfo/AMDGPUTargetInfo.cpp \ -+ -+CPP_SOURCES := \ - radeon_llvm_emit.cpp - - C_SOURCES := \ -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 1b67bfe..625b0b4 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -90,6 +90,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - /* XXX: Can we just initialize the AMDGPU target here? */ - InitializeAllTargets(); - InitializeAllTargetMCs(); -+ InitializeAllAsmPrinters(); - #else - LLVMInitializeAMDGPUTargetInfo(); - LLVMInitializeAMDGPUTarget(); --- -cgit v0.9.0.2-2-gbebe -From 67fcb3c2b4ecbd87e465b6c6b316be44811ea116 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Mon, 01 Oct 2012 21:00:00 +0000 -Subject: configure.ac: Use amdgpu component for LLVM 3.2 - -The amdgpu component actually does exist. I must have been using an -older version of llvm-config by accident when I first made this change. ---- -diff --git a/configure.ac b/configure.ac -index 32f412b..0de506d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1793,10 +1793,8 @@ radeon_llvm_check() { - git://people.freedesktop.org/~tstellar/llvm master - and build with --enable-experimental-targets==AMDGPU]) - fi -- if test "$LLVM_VERSION" = "3.2"; then -- dnl LLVM 3.2 does not add experimental libraries to llvm-config's -- dnl library list. -- LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" -+ if test "x$LLVM_VERSION" = "x3.2"; then -+ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" - fi - } - --- -cgit v0.9.0.2-2-gbebe -From 4cc530f452436a5304a628d1428ed7f07247a175 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 10 Oct 2012 21:00:13 +0000 -Subject: radeon/llvm: Fix build with LLVM 3.2 - ---- -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 2f2eb4c..21661a0 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -36,13 +36,16 @@ - #include <llvm/Support/TargetRegistry.h> - #include <llvm/Support/TargetSelect.h> - #include <llvm/Support/Threading.h> --#include <llvm/Target/TargetData.h> - #include <llvm/Target/TargetMachine.h> -- - #include <llvm/Transforms/Scalar.h> -- - #include <llvm-c/Target.h> - -+#if HAVE_LLVM < 0x0302 -+#include <llvm/Target/TargetData.h> -+#else -+#include <llvm/DataLayout.h> -+#endif -+ - #include <iostream> - #include <stdlib.h> - #include <stdio.h> -@@ -120,7 +123,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - )); - TargetMachine &AMDGPUTargetMachine = *tm.get(); - PassManager PM; -+#if HAVE_LLVM < 0x0302 - PM.add(new TargetData(*AMDGPUTargetMachine.getTargetData())); -+#else -+ PM.add(new DataLayout(*AMDGPUTargetMachine.getDataLayout())); -+#endif - PM.add(createPromoteMemoryToRegisterPass()); - AMDGPUTargetMachine.setAsmVerbosityDefault(true); - --- -cgit v0.9.0.2-2-gbebe -From b21455f27db6e55e708f8e264f4a15412ee8fa52 Mon Sep 17 00:00:00 2001 -From: Dmitry Cherkasov <dcherkassov@gmail.com> -Date: Wed, 17 Oct 2012 18:03:13 +0000 -Subject: configure.ac: Fix LLVM 3.2 r600/radeonsi error message - -Reviewed-by: Tom Stellard <thomas.stellard@amd.com> -Signed-off-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com> ---- -diff --git a/configure.ac b/configure.ac -index aefa142..ca24856 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1757,7 +1757,7 @@ radeon_llvm_check() { - if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then - AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: - git://people.freedesktop.org/~tstellar/llvm master -- and build with --enable-experimental-targets==AMDGPU]) -+ and build with --enable-experimental-targets=AMDGPU]) - fi - if test "x$LLVM_VERSION" = "x3.2"; then - LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" --- -cgit v0.9.0.2-2-gbebe -From d2b0338e3354fadc90a3751520f4aa44ba01954f Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 17 Oct 2012 19:21:48 +0000 -Subject: r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2 - -The 3.2 version of the backend now sets all the correct fields for -PRED_SET* instructions. ---- -diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c -index 053a988..58b7fb2 100644 ---- a/src/gallium/drivers/r600/r600_shader.c -+++ b/src/gallium/drivers/r600/r600_shader.c -@@ -330,6 +330,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, - alu.src[src_idx].sel += 512; - } - -+#if HAVE_LLVM < 0x0302 - if (alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE) || - alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE) || - alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT) || -@@ -340,6 +341,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, - alu.src[1].chan = 0; - alu.last = 1; - } -+#endif - - if (alu.execute_mask) { - alu.pred_sel = 0; --- -cgit v0.9.0.2-2-gbebe -From f2f17fc348c847bbf5c54bb75b76e1661e8ced60 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Mon, 01 Oct 2012 21:01:06 +0000 -Subject: radeon/llvm: Only initialize the AMDGPU target - ---- -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -index 625b0b4..2f2eb4c 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp -@@ -86,17 +86,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, - - Triple AMDGPUTriple(sys::getDefaultTargetTriple()); - --#ifdef EXTERNAL_LLVM -- /* XXX: Can we just initialize the AMDGPU target here? */ -- InitializeAllTargets(); -- InitializeAllTargetMCs(); -- InitializeAllAsmPrinters(); --#else - LLVMInitializeAMDGPUTargetInfo(); - LLVMInitializeAMDGPUTarget(); - LLVMInitializeAMDGPUTargetMC(); - LLVMInitializeAMDGPUAsmPrinter(); --#endif -+ - std::string err; - const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err); - if(!AMDGPUTarget) { --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 6cdba928d..b64174829 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $ +# $Id: PKGBUILD 178521 2013-02-25 01:06:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.14.4 +pkgver=1.15.1 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ conflicts=('mpg321') provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe' - '28ab232dd9bcec8bbb00026cc60960b719d14fed') +sha1sums=('824003a25f22dde5a03031cb658b6d6a160e8740' + 'ae0a4dfa3ca194641df2a6f5d165883f5a2a7093') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index d54b48cce..d77cfbd93 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178513 2013-02-24 20:21:43Z eric $ +# $Id: PKGBUILD 178526 2013-02-25 10:11:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') @@ -11,13 +11,16 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-recursive-indexing.patch') + 'fix-recursive-indexing.patch' + 'fix-crash-on-new-install.patch') sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264' - 'faa0f661fe642af01ac72eda7347dfc659e091e1') + 'faa0f661fe642af01ac72eda7347dfc659e091e1' + '5e3b84f0d0f8a868d4aafedf0f3c7ab631ee4263') build() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/fix-recursive-indexing.patch + patch -p1 -i "${srcdir}"/fix-crash-on-new-install.patch cd ../ mkdir build diff --git a/extra/nepomuk-core/fix-crash-on-new-install.patch b/extra/nepomuk-core/fix-crash-on-new-install.patch new file mode 100644 index 000000000..4e921fb52 --- /dev/null +++ b/extra/nepomuk-core/fix-crash-on-new-install.patch @@ -0,0 +1,37 @@ +commit b94e9f73bd86593928988e5626511acea805b7be +Author: Edward Toroshchin <kde@hades.name> +Date: Sun Feb 3 17:57:23 2013 +0100 + + fileindexer: initialize objects in correct order + + The IndexCleaner job created in IndexScheduler could complete before + m_eventMonitor is initialized, which leads to crash in slotCleaningDone. + + REVIEW: 108754 + +diff --git a/services/fileindexer/indexscheduler.cpp b/services/fileindexer/indexscheduler.cpp +index a13de1b..3ad7819 100644 +--- a/services/fileindexer/indexscheduler.cpp ++++ b/services/fileindexer/indexscheduler.cpp +@@ -51,10 +51,6 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + QFile::remove(KStandardDirs::locateLocal("data", QLatin1String("nepomuk/file-indexer-error-log"))); + } + +- m_cleaner = new IndexCleaner(this); +- connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); +- m_cleaner->start(); +- + FileIndexerConfig* indexConfig = FileIndexerConfig::self(); + connect( indexConfig, SIGNAL(includeFolderListChanged(QStringList,QStringList)), + this, SLOT(slotIncludeFolderListChanged(QStringList,QStringList)) ); +@@ -106,6 +102,10 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + connect( m_eventMonitor, SIGNAL(powerManagementStatusChanged(bool)), + this, SLOT(slotScheduleIndexing()) ); + ++ m_cleaner = new IndexCleaner(this); ++ connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); ++ m_cleaner->start(); ++ + // Special settings for the queues + KConfig config( "nepomukstrigirc" ); + KConfigGroup cfg = config.group( "Indexing" ); diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 8a6a11602..fd1b468b0 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176366 2013-01-31 08:04:09Z tpowa $ +# $Id: PKGBUILD 178542 2013-02-25 16:00:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.12 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.12 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -81,6 +81,9 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog mkdir -p ${pkgdir}/usr/include install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/lib/pkgconfig + install -m644 pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + install -m644 pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ mkdir -p ${pkgdir}/usr/share/man/man{1,7} for man in rpcclient smbcacls smbclient smbcquotas smbget \ smbtree smbtar nmblookup; do @@ -162,6 +165,9 @@ install='samba.install' # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf rm -rf ${pkgdir}/var/run + + mkdir -p ${pkgdir}/usr/lib/pkgconfig + install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/ } md5sums=('430fd21a1acd26964d3ccf366df8709a' '5697da77590ec092cc8a883bae06093c' diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index cb250d0d6..709d1e5c6 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177766 2013-02-08 09:03:19Z andrea $ +# $Id: PKGBUILD 178591 2013-02-25 17:12:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -10,14 +10,14 @@ arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') -makedepends=('cmake' 'openjdk6' 'doxygen') +makedepends=('cmake' 'java-environment' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('90134eaaf40b6663dd01cfaefdaba7fb') build() { mkdir build cd build - . /etc/profile.d/openjdk6.sh + . /etc/profile.d/jdk.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 8ffda0a95..4451a8cca 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168581 2012-10-13 11:45:24Z andyrtr $ +# $Id: PKGBUILD 178621 2013-02-25 21:00:20Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) license=('custom') @@ -15,11 +15,15 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') -source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') +source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 + fix_system_lock.diff) +sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83' + '539ba65df1755af97799f49410e4091b8d222eca') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # https://bugs.freedesktop.org/show_bug.cgi?id=53307 + patch -Np1 -i ${srcdir}/fix_system_lock.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-openchrome/fix_system_lock.diff b/extra/xf86-video-openchrome/fix_system_lock.diff new file mode 100644 index 000000000..a72369340 --- /dev/null +++ b/extra/xf86-video-openchrome/fix_system_lock.diff @@ -0,0 +1,59 @@ +From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001 +From: James Simmons <jsimmons@infradead.org> +Date: Sat, 12 Jan 2013 21:02:12 +0000 +Subject: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem. + +--- +diff --git a/src/via_display.c b/src/via_display.c +index 97473f0..aaf4267 100644 +--- a/src/via_display.c ++++ b/src/via_display.c +@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) + hwp->writeCrtc(hwp, 0x18, 0xFF); + ViaCrtcMask(hwp, 0x07, 0x10, 0x10); + ViaCrtcMask(hwp, 0x09, 0x40, 0x40); +- ViaCrtcMask(hwp, 0x33, 0x07, 0x06); ++ ViaCrtcMask(hwp, 0x33, 0x06, 0x07); + ViaCrtcMask(hwp, 0x35, 0x10, 0x10); + + /* zero Maximum scan line */ +diff --git a/src/via_id.c b/src/via_id.c +index 7764782..7321b26 100644 +--- a/src/via_id.c ++++ b/src/via_id.c +@@ -297,6 +297,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn) + (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && + (Id->Device == SUBSYS_ID(pVia->PciInfo))) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); ++ pVia->ActiveDevice = Id->Outputs; + pVia->Id = Id; + return; + } +diff --git a/src/via_outputs.c b/src/via_outputs.c +index 808e570..c07b1d2 100644 +--- a/src/via_outputs.c ++++ b/src/via_outputs.c +@@ -873,10 +873,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn) + /* + * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40) + * disables the panel on P4M900 +- * See via_tv_detect. + */ + /* TV encoder */ +- via_tv_init(pScrn); ++ if (pVia->ActiveDevice & VIA_DEVICE_TV) ++ via_tv_init(pScrn); + + if (pVia->ActiveDevice & VIA_DEVICE_DFP) { + switch (pVia->Chipset) { +@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode) + /* Enable MMIO & PCI burst (1 wait state) */ + ViaSeqMask(hwp, 0x1A, 0x06, 0x06); + +- if (pBIOSInfo->analog->status == XF86OutputStatusConnected) ++ if (pBIOSInfo->analog->status == XF86OutputStatusConnected) + ViaCrtcMask(hwp, 0x36, 0x30, 0x30); + else + ViaSeqMask(hwp, 0x16, 0x00, 0x40); +-- +cgit v0.9.0.2-2-gbebe diff --git a/kernels/linux-libre-pae/CVE-2013-1763.patch b/kernels/linux-libre-pae/CVE-2013-1763.patch new file mode 100644 index 000000000..82b59a6dc --- /dev/null +++ b/kernels/linux-libre-pae/CVE-2013-1763.patch @@ -0,0 +1,35 @@ +From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 +From: Mathias Krause <minipli@googlemail.com> +Date: Sat, 23 Feb 2013 01:13:47 +0000 +Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] + +Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY +with a family greater or equal then AF_MAX -- the array size of +sock_diag_handlers[]. The current code does not test for this +condition therefore is vulnerable to an out-of-bound access opening +doors for a privilege escalation. + +Signed-off-by: Mathias Krause <minipli@googlemail.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/core/sock_diag.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c +index 602cd63..750f44f 100644 +--- a/net/core/sock_diag.c ++++ b/net/core/sock_diag.c +@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + if (nlmsg_len(nlh) < sizeof(*req)) + return -EINVAL; + ++ if (req->sdiag_family >= AF_MAX) ++ return -EINVAL; ++ + hndl = sock_diag_lock_handler(req->sdiag_family); + if (hndl == NULL) + err = -ENOENT; +-- +1.7.6.5 + diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index b5fa1ce58..6f0c91586 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel _basekernel=3.8 #pkgver=${_basekernel}.9 pkgver=${_basekernel} -pkgrel=1 +pkgrel=2 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -21,12 +21,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'CVE-2013-1763.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '01e97ae92b25fa9d004ff589c7f56703' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + '420991808fe4cba143013427c0737aa9') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -41,6 +43,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Fix security vulnetability CVE-2013-1763.patch + # https://bugs.archlinux.org/task/34005 + patch -Np1 -i "${srcdir}/CVE-2013-1763.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -168,7 +174,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 8810c28e5..4a41ea6bb 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.0-1-LIBRE-PAE +KERNEL_VERSION=3.8.0-2-LIBRE-PAE # 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/kernels/linux-libre-xen/CVE-2013-1763.patch b/kernels/linux-libre-xen/CVE-2013-1763.patch new file mode 100644 index 000000000..82b59a6dc --- /dev/null +++ b/kernels/linux-libre-xen/CVE-2013-1763.patch @@ -0,0 +1,35 @@ +From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 +From: Mathias Krause <minipli@googlemail.com> +Date: Sat, 23 Feb 2013 01:13:47 +0000 +Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] + +Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY +with a family greater or equal then AF_MAX -- the array size of +sock_diag_handlers[]. The current code does not test for this +condition therefore is vulnerable to an out-of-bound access opening +doors for a privilege escalation. + +Signed-off-by: Mathias Krause <minipli@googlemail.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/core/sock_diag.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c +index 602cd63..750f44f 100644 +--- a/net/core/sock_diag.c ++++ b/net/core/sock_diag.c +@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + if (nlmsg_len(nlh) < sizeof(*req)) + return -EINVAL; + ++ if (req->sdiag_family >= AF_MAX) ++ return -EINVAL; ++ + hndl = sock_diag_lock_handler(req->sdiag_family); + if (hndl == NULL) + err = -ENOENT; +-- +1.7.6.5 + diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 0501e7d67..4d398b5f2 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel _basekernel=3.8 #pkgver=${_basekernel}.9 pkgver=${_basekernel} -pkgrel=1 +pkgrel=2 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -21,12 +21,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'CVE-2013-1763.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '208b90a9f3ccbaf2064f05163985bd46' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + '420991808fe4cba143013427c0737aa9') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -41,6 +43,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Fix security vulnetability CVE-2013-1763.patch + # https://bugs.archlinux.org/task/34005 + patch -Np1 -i "${srcdir}/CVE-2013-1763.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -168,7 +174,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 27176044a..8ea666d23 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.0-1-LIBRE-XEN +KERNEL_VERSION=3.8.0-2-LIBRE-XEN # 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/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 83cd9437c..94e5b00cb 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -17,8 +17,8 @@ else fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" pkgver=2.66 -pkgrel=1 -pkgaev=7 +pkgrel=2 +pkgaev=6 arch=( i686 x86_64 @@ -29,83 +29,21 @@ license=( ) url="http://www.${pkgbase%$pkgflag}.org" depends=( - # used by ldd software "glibc package software" - # dependencies tree of binaries software (root) # + desktop-file-utils ffmpeg fftw freetype2 + hicolor-icon-theme jack libpng libtiff openal openimageio - opencolorio - # external softwares dependencies # opencollada - # softwares dependencies for desktop files and mime types # - desktop-file-utils - hicolor-icon-theme + opencolorio + openshadinglanguage shared-mime-info xdg-utils - # dependencies tree of binaries software (child) # - #alsa-lib - #boost-libs - #bzip2 - #celt - #dbus-core - #flac - #gcc-libs - #glew - #glibc - #glu - #gsm - #icu - #ilmbase - #json-c - #lame - #libasyncns - #libdrm - #libgl - #libglapi - #libice - #libjpeg-turbo - #libogg - #libpulse - #libsndfile - #libsm - #libtheora - #libva - #libvorbis - #libvpx - #libx11 - #libxau - #libxcb - #libxdamage - #libxdmcp - #libxext - #libxfixes - #libxi - #libxml2 - #libxmu - #libxt - #libxxf86vm - #ocr - #openexr - #opencore-amr - #openjpeg - #openssl - #pcre - #python - #rtmpdump - #sdl-libre - #schroedinger - #speex - #util-linux - #x264 - #xvidcore - #xz - #v4l-utils - #zlib ) if [ $spacenav == true ]; then depends+=( @@ -161,6 +99,7 @@ build() { -DWITH_CODEC_SNDFILE=ON\ -DWITH_CYCLES=ON\ -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ -DWITH_IMAGE_REDCODE=OFF\ @@ -171,9 +110,7 @@ build() { -DWITH_PLAYER=ON\ -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON - setarch $CARCH make $MAKEFLAGS - setarch $CARCH make } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d64060918..33220b55a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> _kernver=3.8 -_kernrel=1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre/CVE-2013-1763.patch b/libre/linux-libre/CVE-2013-1763.patch new file mode 100644 index 000000000..82b59a6dc --- /dev/null +++ b/libre/linux-libre/CVE-2013-1763.patch @@ -0,0 +1,35 @@ +From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 +From: Mathias Krause <minipli@googlemail.com> +Date: Sat, 23 Feb 2013 01:13:47 +0000 +Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] + +Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY +with a family greater or equal then AF_MAX -- the array size of +sock_diag_handlers[]. The current code does not test for this +condition therefore is vulnerable to an out-of-bound access opening +doors for a privilege escalation. + +Signed-off-by: Mathias Krause <minipli@googlemail.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/core/sock_diag.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c +index 602cd63..750f44f 100644 +--- a/net/core/sock_diag.c ++++ b/net/core/sock_diag.c +@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + if (nlmsg_len(nlh) < sizeof(*req)) + return -EINVAL; + ++ if (req->sdiag_family >= AF_MAX) ++ return -EINVAL; ++ + hndl = sock_diag_lock_handler(req->sdiag_family); + if (hndl == NULL) + err = -ENOENT; +-- +1.7.6.5 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6842b2712..15bb939d0 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -13,7 +13,7 @@ _basekernel=3.8 #_sublevel=9 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=1 +pkgrel=2 #_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,16 +29,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'CVE-2013-1763.patch') #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd0ceaebf20b53184c50e7f4980ed45d1' - '0b483b23413dbc451f2b041b9a475c03' + '101e798e00fd9b66a4c86cd30d28b844' + '5f3338af83af116b99746eb8a3ca65e4' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + '420991808fe4cba143013427c0737aa9') #if [ "$CARCH" != "mips64el" ]; then # # Don't use the Loongson-specific patches on non-mips64el arches. # unset source[${#source[@]}-1] @@ -58,6 +60,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Fix security vulnetability CVE-2013-1763.patch + # https://bugs.archlinux.org/task/34005 + patch -Np1 -i "${srcdir}/CVE-2013-1763.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -246,7 +252,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 1491a2ff6..f6af7876a 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5866,7 +5866,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index dcf662c3c..5818aa984 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -5639,7 +5639,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index c94a54bcc..fb7fa81c2 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.8.0-1-LIBRE +KERNEL_VERSION=3.8.0-2-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/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 6d249b329..44ef6a542 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -32,7 +32,7 @@ replaces=( $pkgname ) source=( - "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" + "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" ) sha512sums=( f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017 diff --git a/pcr/coin/PKGBUILD b/pcr/coin/PKGBUILD new file mode 100644 index 000000000..c584949c9 --- /dev/null +++ b/pcr/coin/PKGBUILD @@ -0,0 +1,59 @@ +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: mickele +# Contributor: marcus fritzsch <fritschy@googlemail.com> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrières <aurelien@cwb.IO> + +pkgname=coin +pkgver=3.1.3 +pkgrel=9 +pkgdesc='A high-level 3D graphics toolkit on top of OpenGL' +url='http://www.coin3d.org/' +license=('GPL') +arch=('i686' 'x86_64') +depends=('mesa' 'expat') +makedepends=('doxygen') +optdepends=('openal: sound/dynamic linking support' + 'fontconfig: dynamic linking support' + 'zlib: dynamic linking support' + 'freetype2: dynamic linking support' + 'js: dynamic linking support' + 'simage: image format support') +options=('!libtool') +source=("https://bitbucket.org/Coin3D/coin/downloads/Coin-${pkgver}.tar.gz") + +build() { + cd Coin-${pkgver} + + # fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667139 + sed -i "/#include <Inventor\/C\/basic.h>/i #include <Inventor/C/errors/debugerror.h>" include/Inventor/SbBasic.h + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-optimization \ + --enable-3ds-import \ + --enable-javascript-api \ + --enable-threadsafe \ + --enable-exceptions \ + --enable-man \ + --with-mesa \ + --disable-debug \ + --enable-shared \ + --disable-maintainer-mode \ + --disable-dependency-tracking \ + --enable-system-expat + + make +} + +package() { + cd Coin-${pkgver} + + make DESTDIR=${pkgdir} install + + # final adjustments + for _FILE in threads deprecated errors events ; do + mv "${pkgdir}/usr/share/man/man3/${_FILE}.3" "${pkgdir}/usr/share/man/man3/coin-${_FILE}.3" + done +} diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD new file mode 100644 index 000000000..a1e186325 --- /dev/null +++ b/pcr/eigen3/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com> +# Contributor: Kringel +# This PKGBUILD is a modified version of eigen 2.x in extra/eigen +# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> + +pkgname=eigen3 +pkgver=3.1.2 +pkgrel=1 +pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra." +arch=('any') +url='http://eigen.tuxfamily.org' +license=('MPL2') +makedepends=('cmake' 'pkgconfig') +source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2") + +build() { + mkdir -p "$srcdir"/build + cd "$srcdir"/build + cmake ../eigen-eigen-* \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD index edd338097..619da3465 100644 --- a/pcr/nexuiz-data/PKGBUILD +++ b/pcr/nexuiz-data/PKGBUILD @@ -9,11 +9,11 @@ pkgname=nexuiz-data _pkgsourcename=nexuiz pkgver=2.5.2 _zipver=252 -pkgrel=1 +pkgrel=1.1 arch=('any') pkgdesc="Nexuiz game data" conflicts=('nexuiz<2.5.1-3') -url="http://www.nexuiz.com/" +url="http://www.alientrap.org/games/nexuiz" license=("GPL") source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip) md5sums=('d750bc328e58df8492f8d88bdcf818cb') diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD index 5c3b50899..0dc56d81b 100644 --- a/pcr/nexuiz/PKGBUILD +++ b/pcr/nexuiz/PKGBUILD @@ -8,10 +8,10 @@ pkgname=nexuiz pkgver=2.5.2 _zipver=252 -pkgrel=2.2 +pkgrel=2.3 arch=('i686' 'x86_64') pkgdesc="A free software first person shooter" -url="http://www.alientrap.org/games/nexuiz/" +url="http://www.alientrap.org/games/nexuiz" license=("GPL") depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0') makedepends=('mesa') diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD new file mode 100644 index 000000000..4cb83afd2 --- /dev/null +++ b/pcr/swig1/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=swig1 +_pkgname=swig +pkgver=1.3.40 +pkgrel=1 +pkgdesc="A compiler that integrates C and C++ code with scripting languages (legacy version)" +arch=('i686' 'x86_64') +url="http://www.swig.org/" +license=('custom') +depends=('gcc-libs' 'zlib') +conflicts=('swig' 'swig-pantheon') +provides=('swig') +source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} |