diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 11:58:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 11:58:19 -0300 |
| commit | eefed5e3db847eccce0207f89c7430b9ec4994b7 (patch) | |
| tree | 95f51b20a40ad67959cc9be5cdd7f0a5831a99d5 | |
| parent | c822e72767a8f7f3e97aa44f9c57d0d92fd98070 (diff) | |
| parent | 24633b6f6af8dc77ca77224448d226d8e99c9ce1 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Conflicts:
extra/graphite/PKGBUILD
1169 files changed, 55761 insertions, 3831 deletions
diff --git a/community/9base/9 b/community/9base/9 index de6a2d070..de6a2d070 100755..100644 --- a/community/9base/9 +++ b/community/9base/9 diff --git a/community/9base/plan9.sh b/community/9base/plan9.sh index 3fb0b9813..3fb0b9813 100755..100644 --- a/community/9base/plan9.sh +++ b/community/9base/plan9.sh diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD new file mode 100644 index 000000000..68924e839 --- /dev/null +++ b/community/abuse/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 64627 2012-02-17 12:45:02Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: jlvsimoes <jlvsimoes@oninet.pt> +# Contributor: kevin <kevin@archlinux.org> + +pkgname=abuse +pkgver=0.8 +pkgrel=2 +pkgdesc='A side-scroller action game that pits you against ruthless alien killers.' +arch=('i686' 'x86_64') +url='http://abuse.zoy.org/' +license=('GPL' 'custom') +depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer') +install='abuse.install' +source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('ec678b8dc8d00e0382d8c805c6438489') + +build() { + cd "${srcdir}/abuse-${pkgver}" + + ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x + make +} + +package() { + cd "${srcdir}/abuse-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/licenses/abuse" + sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license" +} diff --git a/community/abuse/abuse.install b/community/abuse/abuse.install new file mode 100644 index 000000000..4d28ebacd --- /dev/null +++ b/community/abuse/abuse.install @@ -0,0 +1,13 @@ +# arg 1: the new package version +post_install() { +# echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse" + echo "Abuse uses the original game levels by default. To use the frabs levels" + echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install +} + diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD new file mode 100644 index 000000000..e400f8b72 --- /dev/null +++ b/community/acetoneiso2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 61069 2011-12-21 20:50:25Z andrea $ +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Wes Brewer <brewerw@gmail.com> + +pkgname=acetoneiso2 +pkgver=2.3 +pkgrel=4 +pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" +arch=('i686' 'x86_64') +url="http://www.acetoneteam.org" +license=('GPL3') +depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') +optdepends=("p7zip: for ISO compress/decompress support") +conflicts=('acetoneiso') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) +md5sums=('225f7af687016690ff28b9771a1ce179') + +build() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + qmake + # needed for phonon + sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile + make +} + +package() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community/acetoneiso2/acetoneiso2.install b/community/acetoneiso2/acetoneiso2.install new file mode 100644 index 000000000..1a3984e24 --- /dev/null +++ b/community/acetoneiso2/acetoneiso2.install @@ -0,0 +1,11 @@ +post_install() { +cat << EOF + --> + --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf + --> +EOF +} + +post_upgrade() { + post_install $* +} diff --git a/community/adns/PKGBUILD b/community/adns/PKGBUILD index 46df37239..1ccd12a8e 100644 --- a/community/adns/PKGBUILD +++ b/community/adns/PKGBUILD @@ -5,7 +5,7 @@ pkgname=adns pkgver=1.4 -pkgrel=3 +pkgrel=3.1 pkgdesc="adns is an asyncronous replacement resolver library" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~ian/adns/" diff --git a/community/alienarena/PKGBUILD b/community/alienarena/PKGBUILD new file mode 100644 index 000000000..124c7aa7a --- /dev/null +++ b/community/alienarena/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 76630 2012-09-25 13:43:44Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Det <nimetonmaili at gmail a-dot com> +# Contributor: godane <slaxemulator@gmail.com> +# Contributor: damian01w <damian01w@gmail.com> + +pkgname=alienarena +pkgver=7.60.1 +pkgrel=1 +_verdate=20120823 +pkgdesc="Multiplayer retro sci-fi deathmatch game" +arch=('i686' 'x86_64') +url='http://icculus.org/alienarena/rpa/' +license=('GPL') +depends=('curl' 'freetype2' 'libgl' 'libjpeg' 'libvorbis' 'libxxf86dga' 'libxxf86vm' 'libgl' 'sdl' 'openal' 'alienarena-data') +makedepends=('gendesk' 'mesa') +source=(http://icculus.org/alienarena/Files/alienarena-${pkgver}-linux${_verdate}.tar.gz) +md5sums=('1e32455d8f6418c92b1b6f4d54becadd') +_name=('Alien Arena') + +build() { + cd "$srcdir" + gendesk -n + + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 "../$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + rm -rf "$pkgdir/usr/share/$pkgname" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD index 04f7dacbd..710f9437a 100644 --- a/community/amsn/PKGBUILD +++ b/community/amsn/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 71853 2012-06-02 11:00:55Z jlichtblau $ +# $Id: PKGBUILD 81685 2012-12-26 19:27:13Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <j@codemac.net> pkgname=amsn pkgver=0.98.9 -pkgrel=1 +pkgrel=2 pkgdesc="MSN client written in Tcl/Tk" arch=('i686' 'x86_64' 'mips64el') url="http://amsn.sourceforge.net/" license=('GPL2') depends=('tk' 'tls') makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l') -optdepends=('farstream: for video conferencing') +# not compatible with farstream 0.2 +#optdepends=('farstream: for video conferencing') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-$pkgver-v4l2.patch @@ -23,7 +24,7 @@ sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e' build() { cd ${srcdir}/$pkgname-$pkgver - + rm -f plugins/amsnplus/snapshot # patch for linux kernel header changes patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch # build patch diff --git a/community/angband/PKGBUILD b/community/angband/PKGBUILD new file mode 100644 index 000000000..af58de442 --- /dev/null +++ b/community/angband/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Maintainer: Mike Sampson <mike at sambodata dot com> +# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: KillaB <xGenoBlast@gmail.com> +# Contributor: Callan Barrett <wizzomafizzo@gmail.com> +# Contributor: Christian Schmidt <xmucknertx@googlemail.com> +# Contributor: Sebastian Sareyko <public@nooms.de> + +pkgname=angband +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien" +arch=('i686' 'x86_64') +url="http://rephial.org/" +license=('GPL2' 'custom') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade') +source=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz") + +build() { + + cd "${srcdir}/${pkgname}-v${pkgver}" + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --sysconfdir=/usr/share/angband \ + --with-configpath=/usr/share/angband \ + --with-libpath=/usr/share/angband \ + --enable-gtk \ + --enable-sdl \ + --enable-sdl-mixer + + make + +} + +package() { + + cd "${srcdir}/${pkgname}-v${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/share/angband/*/delete.me" + install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + +} + +md5sums=('3ea22e5caabc3de7b49bac13ba922a8c') diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd index 8a96e9b07..8a96e9b07 100755..100644 --- a/community/apcupsd/apcupsd +++ b/community/apcupsd/apcupsd diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index cbfb80cdd..b6478a5c5 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80774 2012-12-03 15:26:20Z bpiotrowski $ +# $Id: PKGBUILD 81793 2012-12-30 11:33:11Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -md5sums=('0a8e1dbfe1725a02de8271589d622739') +md5sums=('ad7e0575ce4a480eb54030e1d348e076') build() { cd $pkgname-$pkgver diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD index 589519c3f..5627f8c6e 100644 --- a/community/arm-elf-gcc-base/PKGBUILD +++ b/community/arm-elf-gcc-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75206 2012-08-16 01:56:31Z allan $ +# $Id: PKGBUILD 82198 2013-01-11 12:12:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=arm-elf-gcc-base -pkgver=4.7.0 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="The GNU Compiler Collection" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -11,7 +11,7 @@ url="http://gcc.gnu.org" depends=('arm-elf-binutils' 'libmpc' 'libelf') options=(!libtool !emptydirs zipman docs !strip) source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) -md5sums=('2a0f1d99fda235c29d40b561f81d9a77') +md5sums=('cc308a0891e778cfda7a151ab8a6e762') build() { cd $srcdir/gcc-$pkgver diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD index e8750b029..70bff7b10 100644 --- a/community/arpack/PKGBUILD +++ b/community/arpack/PKGBUILD @@ -5,7 +5,7 @@ pkgname=arpack pkgver=3.1.0 -pkgrel=2 +pkgrel=2.1 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Fortran77 subroutines designed to solve large scale eigenvalue problems" url="http://forge.scilab.org/index.php/p/arpack-ng/" diff --git a/community/assaultcube/PKGBUILD b/community/assaultcube/PKGBUILD new file mode 100644 index 000000000..bc05fbe4e --- /dev/null +++ b/community/assaultcube/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 64731 2012-02-18 03:18:55Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Rabyte <rabyte [at] gmail (dot) com> + +pkgname=assaultcube +pkgver=1.1.0.4 +pkgrel=4 +pkgdesc='A realistic team oriented multiplayer FPS based on the Cube engine' +arch=('i686' 'x86_64') +url='http://assault.cubers.net/' +license=('ZLIB' 'custom') +depends=('sdl' 'sdl_mixer' 'sdl_image' 'openal' 'zlib' 'gcc-libs' 'libgl' 'desktop-file-utils') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}.tar.bz2" + "http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}_source.tar.bz2" + 'assaultcube' + 'assaultcube-server' + 'assaultcube.desktop' + 'assaultcube.png') +md5sums=('a5eb79eaf564c5b4de1ffad0883e45e8' + '603b97a4262fb59ea86d483730b712e9' + 'd658ad3ee476bfe92afa5b5a04a7b4f5' + '553e2c3b38c4d13e5d77c23efd51a6a6' + 'a37dfbe8263f4ef8fe41120196194eae' + 'f688c59ecee2ebc5c589720aa1480765') +install=assaultcube.install + +build() { + cd ${pkgver}/source + + # We'll use official binaries for cheat protection or some stuff. + # Upstream is strange. + #make +} + +package() { + #cd ${pkgver}/source/src + + #install -Dm755 ac_client ${pkgdir}/usr/bin/ac_client + #install -Dm755 ac_server ${pkgdir}/usr/bin/ac_server + cd ${srcdir}/${pkgver} + + mkdir -p ${pkgdir}/usr/share/assaultcube/packages + mkdir -p ${pkgdir}/usr/bin + + if [[ $CARCH == "x86_64" ]]; then + cp bin_unix/linux_64_client ${pkgdir}/usr/bin/ac_client + cp bin_unix/linux_64_server ${pkgdir}/usr/bin/ac_server + else + cp bin_unix/linux_client ${pkgdir}/usr/bin/ac_client + cp bin_unix/linux_server ${pkgdir}/usr/bin/ac_server + fi + cp -rf config packages docs mods ${pkgdir}/usr/share/assaultcube + install -Dm644 ${srcdir}/assaultcube.png ${pkgdir}/usr/share/pixmaps/assaultcube.png + install -Dm644 ${srcdir}/assaultcube.desktop ${pkgdir}/usr/share/applications/assaultcube.desktop + install -Dm644 docs/package_copyrights.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm755 ${srcdir}/assaultcube ${pkgdir}/usr/bin/assaultcube + install -Dm755 ${srcdir}/assaultcube-server ${pkgdir}/usr/bin/assaultcube-server +} + +# vim: sw=2:ts=2 et: diff --git a/community/assaultcube/assaultcube b/community/assaultcube/assaultcube new file mode 100755 index 000000000..d982cb641 --- /dev/null +++ b/community/assaultcube/assaultcube @@ -0,0 +1,4 @@ +#!/bin/bash + +cd /usr/share/assaultcube +ac_client "--home=${HOME}/.assaultcube" "--init=${HOME}/.assaultcube/config/init.cfg" "$@" diff --git a/community/assaultcube/assaultcube-server b/community/assaultcube/assaultcube-server new file mode 100755 index 000000000..46d93c594 --- /dev/null +++ b/community/assaultcube/assaultcube-server @@ -0,0 +1,4 @@ +#!/bin/bash + +cd /usr/share/assaultcube +ac_server "$@" diff --git a/community/assaultcube/assaultcube.desktop b/community/assaultcube/assaultcube.desktop new file mode 100644 index 000000000..9449fc1f3 --- /dev/null +++ b/community/assaultcube/assaultcube.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=assaultcube +Icon=assaultcube +Type=Application +Terminal=false +MultipleArgs=false +Name=AssaultCube +GenericName=Realistic Multiplayer FPS +MimeType=text/html +StartupNotify=false +Categories=Game;ActionGame; diff --git a/community/assaultcube/assaultcube.install b/community/assaultcube/assaultcube.install new file mode 100644 index 000000000..724bfce00 --- /dev/null +++ b/community/assaultcube/assaultcube.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/assaultcube/assaultcube.png b/community/assaultcube/assaultcube.png Binary files differnew file mode 100644 index 000000000..a0915cb76 --- /dev/null +++ b/community/assaultcube/assaultcube.png diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD new file mode 100644 index 000000000..5a30eb34f --- /dev/null +++ b/community/asunder/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 66554 2012-02-26 05:35:59Z xyne $ +# Maintainer: Xyne <ac xunilhcra enyx, backwards> +# Contributor: Ronald van Haren <ronald.archlinux.org> +# Contributor: cs-cam - me.at.camdaniel.com +# Contributor: Sebastien Piccand <sebcactus gmail com> + +pkgname=asunder +pkgver=2.2 +pkgrel=1 +pkgdesc="a graphical CD ripper and encoder" +arch=('i686' 'x86_64') +url="http://littlesvr.ca/asunder/" +license=('GPL2') +depends=('gtk2' 'libcddb' 'cdparanoia') +makedepends=('pkgconfig') +optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \ + 'flac: for flac support') +source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2) +md5sums=('4996860f552879fd8abdc87d1c6c7530') +sha256sums=('bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc index 13976341c..13976341c 100755..100644 --- a/community/audit/auditd.rc +++ b/community/audit/auditd.rc diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index f670fd7dc..0fce1973e 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -4,19 +4,22 @@ pkgname=augeas pkgver=0.10.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64' 'mips64el') url="http://augeas.net" license=('LGPL') depends=('libxml2' 'gcc-libs') options=('!libtool') -source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz{,.sig}) +source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz{,.sig} + augeas-0.10.0-gets.patch) md5sums=('fe1834e90a066c3208ac0214622c7352' - 'efb3f1a90ff31320dcc4c499eba5a555') + 'efb3f1a90ff31320dcc4c499eba5a555' + '1dd66088ad8814f16cab9b6858df5af6') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ${srcdir}/augeas-0.10.0-gets.patch sed -i 's|Requires:.*|Requires: libxml-2.0|' augeas.pc.in ./configure --prefix=/usr make diff --git a/community/augeas/augeas-0.10.0-gets.patch b/community/augeas/augeas-0.10.0-gets.patch new file mode 100644 index 000000000..d66a46935 --- /dev/null +++ b/community/augeas/augeas-0.10.0-gets.patch @@ -0,0 +1,10 @@ +--- augeas-0.10.0.orig/gnulib/lib/stdio.in.h 2011-03-03 20:07:59.000000000 -0500 ++++ augeas-0.10.0/gnulib/lib/stdio.in.h 2012-12-23 07:26:24.774463902 -0500 +@@ -162,7 +162,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 6aee519ea..1786d8b8c 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60059 2011-12-04 15:21:41Z jelle $ +# $Id: PKGBUILD 81870 2013-01-02 15:51:02Z jelle $ # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=avrdude pkgver=5.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/avrdude/" diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index 5b3ff69a7..45dc2b35c 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81099 2012-12-12 00:47:25Z eric $ +# $Id: PKGBUILD 81846 2013-01-02 00:52:38Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Vesa Kaihlavirta pkgname=awesome -pkgver=3.4.13 +pkgver=3.5 pkgrel=2 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,12 @@ license=('GPL2') depends=( 'cairo' 'dbus' + 'gdk-pixbuf2' 'imlib2' - 'libev' + 'libxcursor' 'libxdg-basedir' - 'lua51' + 'lua' + 'lua-lgi' 'pango' 'startup-notification' 'xcb-util-image' @@ -30,26 +32,29 @@ makedepends=( 'cmake' 'docbook-xsl' 'doxygen' - 'gperf' 'imagemagick' - 'lua51-doc' + 'ldoc' 'xmlto' ) optdepends=( 'rlwrap: readline support for awesome-client' - 'feh: image background setter for awsetbg' 'dex: autostart your desktop files' 'vicious: widgets for the Awesome window manager' ) provides=('notification-daemon') source=("$url/download/$pkgname-$pkgver.tar.xz" "$pkgname.desktop") -md5sums=('8449fde51c08ca69fe4c5bb831b3c618' +md5sums=('ce998f19c80bd98f8d119a91f53526df' '0fdbeec43d211c6750041d7e37611a6a') build() { cd $pkgname-$pkgver - make CMAKE_ARGS=' -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' + cmake \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc \ + -DLUA_LIBRARY=/usr/lib/liblua.so.5.2 + make } package() { diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD index 59fd1bcdd..7ce9fca85 100644 --- a/community/awn-extras-applets/PKGBUILD +++ b/community/awn-extras-applets/PKGBUILD @@ -6,7 +6,7 @@ pkgname=awn-extras-applets _pkgname=awn-extras pkgver=0.4.0 -pkgrel=14 +pkgrel=15 pkgdesc="Collection of applets for avant-window-navigator" arch=('i686' 'x86_64') url="https://launchpad.net/awn-extras" @@ -37,6 +37,7 @@ source=(http://launchpad.net/$_pkgname/0.4/$pkgver/+download/$_pkgname-$pkgver.t fix-shinyswitcher-scrolling.patch fix-weather-applet.patch awn-extras-glib2.32.patch + cairo-menu-upower.patch check-dependencies.patch) md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0' '2df8dfd8f0f1d458c09b56983c7d049f' @@ -45,6 +46,7 @@ md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0' '755c57dfbb65a314f247277918ec95ac' 'bc22bb3e81aca0f651ae8acee1ce2f00' '1cfcd1e5dc92c4c7c306472d42a21c2d' + 'f9715f531947967d6549a358ea8d2979' '8f920c7dde987d66eef7d3739df1051d') build() { @@ -55,6 +57,7 @@ build() { patch -Np0 -i "$srcdir/fix-shinyswitcher-scrolling.patch" patch -Np1 -i "$srcdir/fix-weather-applet.patch" patch -Np0 -i "$srcdir/awn-extras-glib2.32.patch" + patch -Np1 -i "$srcdir/cairo-menu-upower.patch" patch -Np1 -i "$srcdir/check-dependencies.patch" # Python2 fix diff --git a/community/awn-extras-applets/cairo-menu-upower.patch b/community/awn-extras-applets/cairo-menu-upower.patch new file mode 100644 index 000000000..08e79a68d --- /dev/null +++ b/community/awn-extras-applets/cairo-menu-upower.patch @@ -0,0 +1,51 @@ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c +--- awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c 2010-04-10 01:26:19.000000000 +0200 ++++ awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c 2012-12-29 05:46:45.971364855 +0100 +@@ -104,7 +104,7 @@ + + if (have_gnome_session_manager) + { +- add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-save","--logout-dialog --gui"); ++ add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-quit","--logout"); + } + else if (dbus_service_exists ("org.xfce.SessionManager") ) + { +@@ -121,35 +121,13 @@ + { + add_special_item (menu,_("Lock Screen"),"system-lock-screen","xscreensaver-command","-lock"); + } +- if (dbus_service_exists ("org.freedesktop.PowerManagement")) +- { +- if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend")) +- { +- add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Suspend"); +- } +- +- if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate")) +- { +- add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Hibernate"); +- } + +- } +- else if (dbus_service_exists ("org.gnome.PowerManagement")) +- { +- if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend")) +- { +- +- } +- +- if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate")) +- { ++ add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Suspend"); ++ add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Hibernate"); + +- } +- } +- + if (have_gnome_session_manager) + { +- add_special_item (menu,_("Shutdown"),"gnome-logout","gnome-session-save","--shutdown-dialog --gui"); ++ add_special_item (menu,_("Shutdown"),"gnome-shutdown","gnome-session-quit","--power-off"); + } + gtk_widget_show_all (menu); + return FALSE; diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD new file mode 100644 index 000000000..c8c641216 --- /dev/null +++ b/community/blackbox/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: durbatuluk <dvdscripter@gmail.org> +# Contributor: Steve Ponsford <sp4d@lavabit.com> + +pkgname=blackbox +pkgver=0.70.1 +pkgrel=10 +pkgdesc="A window manager for X11" +url="http://blackboxwm.sourceforge.net/" +arch=('i686' 'x86_64') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') +license=('MIT') +options=('!libtool') +source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz + gcc4.3.patch + bbdock.patch + bsetbg-feh.patch + textpropertytostring-unconditional.patch) +md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' + 'bc7a1335d77cdeb6f85cba4d01e68e63' + '69c5a5e981b087b2d8267cab996b48dd' + 'e7fb0d5bfd95820c0194ec73df66dadc' + '3b92ad246f07126dd55ae9634d6e875e') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i ../gcc4.3.patch + patch -Np0 -i ../bbdock.patch + patch -Np0 -i ../bsetbg-feh.patch + patch -Np1 -i ../textpropertytostring-unconditional.patch + + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR=$pkgdir install + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/blackbox/bbdock.patch b/community/blackbox/bbdock.patch new file mode 100644 index 000000000..709b6cfe1 --- /dev/null +++ b/community/blackbox/bbdock.patch @@ -0,0 +1,16 @@ +--- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 ++++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 +@@ -248,6 +248,13 @@ + bt::PixmapCache::find(screen->screenNumber(), texture, + frame.rect.width(), frame.rect.height(), + frame.pixmap); ++/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ ++ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) ++ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); ++ else if ((texture.texture() & bt::Texture::Solid)) ++ XSetWindowBackground(display, frame.window, ++ texture.color1().pixel(screen->screenNumber())); ++/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ + XClearArea(display, frame.window, 0, 0, + frame.rect.width(), frame.rect.height(), True); + diff --git a/community/blackbox/bsetbg-feh.patch b/community/blackbox/bsetbg-feh.patch new file mode 100644 index 000000000..17a612ff0 --- /dev/null +++ b/community/blackbox/bsetbg-feh.patch @@ -0,0 +1,23 @@ +--- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 ++++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 +@@ -22,7 +22,7 @@ + + PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin + +-img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" ++img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" + + display_full_cmd="display -geometry 800x600 -window root" + display_tile_cmd="display -window root" +@@ -59,6 +59,11 @@ + xsetbg_center_cmd="xsetbg -center" + xsetbg_default_cmd="$xsetbg_center_cmd" + ++feh_full_cmd="feh --bg-scale" ++feh_tile_cmd="feh --bg-tile" ++feh_center_cmd="feh --bg-center" ++feh_default_cmd="$feh_center_cmd" ++ + ################################## + + me=`basename $0` diff --git a/community/blackbox/gcc4.3.patch b/community/blackbox/gcc4.3.patch new file mode 100644 index 000000000..40a9dcdef --- /dev/null +++ b/community/blackbox/gcc4.3.patch @@ -0,0 +1,111 @@ +diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc +--- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -45,6 +45,8 @@ + #include <stdio.h> + #include <stdlib.h> + ++#include <cstring> ++ + // #define COLORTABLE_DEBUG + // #define MITSHM_DEBUG + +diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc +--- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -30,6 +30,8 @@ + + #include <stdio.h> + ++#include <cstring> ++ + + bt::Resource::Resource(void) + : db(NULL) +diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc +--- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 ++++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -26,7 +26,7 @@ + #include "XDG.hh" + + #include <stdlib.h> +- ++#include <algorithm> + + // make sure directory names end with a slash + static std::string terminateDir(const std::string &string) +diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc +--- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 ++++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + #include <X11/Xutil.h> + #include <X11/cursorfont.h> + ++#include <cstring> ++ + + BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { + screen_resources = 0; +diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc +--- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 ++++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -48,6 +48,8 @@ + #include <ctype.h> + #include <dirent.h> + ++#include <cstring> ++ + + static bool running = true; + static int anotherWMRunning(Display *, XErrorEvent *) { +diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc +--- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 ++++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + + #include <assert.h> + ++#include <cstring> ++ + + static const int iconify_width = 9; + static const int iconify_height = 9; +diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc +--- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 ++++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -36,6 +36,8 @@ + + #include <stdio.h> + ++#include <cstring> ++ + + static void showHelp(int exitval) { + // print version - this should not be localized! +diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg +--- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) + # +diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc +--- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -27,11 +27,14 @@ + #include <Pen.hh> + #include <Texture.hh> + ++#include <cstdlib> + #include <cctype> + + #include <X11/Xatom.h> + #include <stdio.h> + ++#include <cstring> ++ + + // ignore all X errors + static int x11_error(::Display *, XErrorEvent *) diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/community/blackbox/textpropertytostring-unconditional.patch @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk <jwilk@debian.org> +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include <X11/Xutil.h> ++ + #include <limits.h> + #include <string> + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD new file mode 100644 index 000000000..7e24b51c0 --- /dev/null +++ b/community/boinc/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 79673 2012-11-11 01:08:11Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Michal Krenek <mikos@sg1.cz> + +pkgname=boinc +pkgver=7.0.28 +pkgrel=1 +pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop with X" +arch=('i686' 'x86_64') +url="http://boinc.berkeley.edu/" +license=('LGPL') +depends=('curl' 'wxgtk' 'libnotify' 'libxss' 'sqlite') +makedepends=('curl' 'libxslt' 'perl-xml-sax' 'subversion' 'wxgtk' 'libnotify') +options=('!libtool') +install=$pkgname.install +source=(boinc.rc boinc.bash boinc.desktop boinc.service boinc-AM_CONDITIONAL.patch) + +_svnroot="http://boinc.berkeley.edu/svn/tags" +_svnmod="boinc_core_release_${pkgver//./_}" + +build() { + cd ${srcdir} + + msg "Connecting to boinc.berkeley.edu SVN server..." + svn co ${_svnroot}/${_svnmod} || (error "SVN checkout failed" && return 1) + msg "SVN checkout done or server timeout" + + msg "Starting make..." + rm -fr ${_svnmod}-build + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + patch -p1 -i ${srcdir}/boinc-AM_CONDITIONAL.patch + + ./_autosetup + + ./configure --prefix=/usr --disable-server --enable-unicode --with-ssl \ + --with-wxdir=/usr/lib --with-wx-config=$(which wx-config) \ + --disable-static --enable-client --enable-manager --with-x LDFLAGS='-lX11' + make +} + +package() { + cd ${srcdir}/$_svnmod-build + + make DESTDIR=${pkgdir} install + +#install rc-script + install -D -m755 ${srcdir}/$pkgname.rc ${pkgdir}/etc/rc.d/$pkgname + +#install systemd unit + install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service + +#install bash-completion + install -D -m644 ${srcdir}/$pkgname.bash ${pkgdir}/usr/share/bash-completion/completions/$pkgname + +#install .desktop File + install -D -m644 ${srcdir}/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop + +#install icons + install -D -m644 ${srcdir}/${_svnmod}-build/clientgui/res/boincmgr.48x48.png \ + ${pkgdir}/usr/share/pixmaps/$pkgname.png + +#killing /etc/init.d directory + rm -rf ${pkgdir}/etc/init.d +} + +md5sums=('c6dadc333f982ea7b548602a70bd1e93' + '4d00e1aa4090a3f51feb20f5a541b9ee' + '17969d849f3cf27c2100b20a7b7a7e64' + '3d5cbab785cc8b004661b17c65883fd5' + 'e27047518dec54d4db38816487a28661') diff --git a/community/boinc/boinc-AM_CONDITIONAL.patch b/community/boinc/boinc-AM_CONDITIONAL.patch new file mode 100644 index 000000000..3ebf7c887 --- /dev/null +++ b/community/boinc/boinc-AM_CONDITIONAL.patch @@ -0,0 +1,19 @@ +--- A/configure.ac ++++ B/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_CXX + AC_PROG_F77 + AC_PROG_CPP ++AC_PROG_OBJCXX + AC_PROG_MAKE_SET + SAH_LINKS + AC_LANG_PUSH(C) +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) + ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++ + dnl ====================================================================== + dnl some more vodoo required for building portable client-binary (client, clientgui) + dnl ====================================================================== diff --git a/community/boinc/boinc.bash b/community/boinc/boinc.bash new file mode 100644 index 000000000..b614dd54c --- /dev/null +++ b/community/boinc/boinc.bash @@ -0,0 +1,99 @@ +# Source this file in BASH to get command completion (using tab) for +# boinc and boinccmd. Written by Frank S. Thomas <fst@debian.org>. +# See also: http://boinc.berkeley.edu/trac/wiki/BashCommandCompletion + +_boinc() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + opts="$(boinc_client --help | \ + sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')" + + # Handle options that require one or more arguments. + case "$prev" in + --attach_project|--detach_project|--reset_project|--update_prefs|\ + --gui_rpc_port) + return 0 + ;; + esac + + # Handle options that require two arguments. + if [[ COMP_CWORD -gt 1 ]]; then + pprev="${COMP_WORDS[COMP_CWORD-2]}" + + case "$pprev" in + --attach_project) + return 0 + ;; + esac + fi + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $(compgen -W "$opts" -- "$cur") ) + return 0 + fi +} +complete -F _boinc -o default boinc_client + +_boinccmd() +{ + local cur prev opts cmds + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + opts="--host --passwd -h --help -V --version" + cmds="$(boinc_cmd --help 2>&1 | \ + sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')" + + # The following construct assures that: + # - no command follows if one of $opts or $cmds was given + # - after --host follows only one command or --passwd and one command + # - after --passwd follows only one command + if [[ $COMP_CWORD -eq 1 ]]; then + COMPREPLY=( $(compgen -W "$opts $cmds" -- "$cur") ) + return 0 + else + if [[ "${COMP_WORDS[@]}" =~ ".* --host .* --passwd .*" ]]; then + if [[ $COMP_CWORD -eq 5 ]]; then + COMPREPLY=( $(compgen -W "$cmds" -- "$cur") ) + fi + elif [[ "${COMP_WORDS[@]}" =~ ".* --passwd .*" ]]; then + if [[ $COMP_CWORD -eq 3 ]]; then + COMPREPLY=( $(compgen -W "$cmds" -- "$cur") ) + fi + elif [[ "${COMP_WORDS[@]}" =~ ".* --host .*" ]]; then + if [[ $COMP_CWORD -eq 3 ]]; then + COMPREPLY=( $(compgen -W "--passwd $cmds" -- "$cur") ) + fi + fi + fi + + # Handle options/commands that require one or more arguments. + case "$prev" in + --get_messages|--passwd) + return 0 + ;; + + --host) + _known_hosts + return 0 + ;; + + --set_run_mode|--set_network_mode) + COMPREPLY=( $(compgen -W "always auto never" -- "$cur") ) + return 0 + ;; + + --set_screensaver_mode) + COMPREPLY=( $(compgen -W "on off" -- "$cur") ) + return 0 + ;; + esac +} +complete -F _boinccmd boinc_cmd + +# vim: syntax=sh
\ No newline at end of file diff --git a/community/boinc/boinc.desktop b/community/boinc/boinc.desktop new file mode 100644 index 000000000..267d56d6d --- /dev/null +++ b/community/boinc/boinc.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Exec=/usr/bin/boincmgr +Path=/var/lib/boinc +Icon=boincmgr +Categories=System;Monitor;GTK; +Name=BOINC Manager +GenericName=BOINC monitor and control utility +GenericName[cs]=Monitorovací a ovládací nástroj pro BOINC +GenericName[de]=BOINC Überwachungs- und Kontrollprogramm +GenericName[pt]=Monitorização BOINC e utilitário de controlo +Comment=Configure or monitor a BOINC core client +Comment[cs]=Monitoruje a nastavuje klienta BOINC +Comment[de]=BOINC Basis Client konfigurieren oder überwachen +Comment[pt]=Configurar ou monitorizar o cliente básico do BOINC diff --git a/community/boinc/boinc.install b/community/boinc/boinc.install new file mode 100644 index 000000000..b54002ada --- /dev/null +++ b/community/boinc/boinc.install @@ -0,0 +1,23 @@ +# arg 1: the new package version +post_install() { + /usr/sbin/groupadd boinc 2>/dev/null || true + /usr/sbin/useradd -s /bin/bash -g boinc -d /var/lib/boinc boinc 2>/dev/null || true + + if [ ! -d /var/lib/boinc ]; then + install -d /var/lib/boinc + fi + chown -R boinc:boinc /var/lib/boinc + + echo '>>> Client RPC password can be found in /var/lib/boinc/gui_rpc_auth.cfg' + echo '>>> (this file is generated after first run of /etc/rc.d/boinc start).' + echo '>>> Remove it from gui_rpc_auth.cfg if you do not want to use password.' + echo '>>> See more details on the Arch Linux BOINC wiki page.' +} + +# arg 1: the old package version +post_remove() { + /usr/sbin/userdel boinc + /usr/sbin/groupdel boinc + + echo '>>> If you really do not want to run Boinc in the future, you may completely remove the directory "/var/lib/boinc".' +} diff --git a/community/boinc/boinc.rc b/community/boinc/boinc.rc new file mode 100644 index 000000000..160043a04 --- /dev/null +++ b/community/boinc/boinc.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +BOINCUSER="boinc" +BOINCDIR="/var/lib/boinc" +PID=`pidof -o %PPID /usr/bin/boinc_client` +case "$1" in + attach) + echo "Enter the Project URL: " + read url + echo "Enter your Account Key: " + read key + echo "Attaching to project" + cd $BOINCDIR + su $BOINCUSER -c "boinccmd --project_attach $url $key" +;; + start) + stat_busy "Starting boinc" + if [ -z "$PID" ]; then + su $BOINCUSER -c "nice -n 19 /usr/bin/boinc_client --daemon --dir ${BOINCDIR} --redirectio" + else + false + fi + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon boinc + stat_done + fi + ;; + stop) + stat_busy "Stopping boinc" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon boinc + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {attach|start|stop|restart}" +esac +exit 0 diff --git a/community/boinc/boinc.service b/community/boinc/boinc.service new file mode 100644 index 000000000..12634ff5a --- /dev/null +++ b/community/boinc/boinc.service @@ -0,0 +1,10 @@ +[Unit] +Description=BOINC Daemon + +[Service] +User=boinc +Nice=19 +ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio + +[Install] +WantedBy=multi-user.target diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 2aa6fcb63..73e21fb18 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81205 2012-12-13 02:29:34Z giovanni $ +# $Id: PKGBUILD 81974 2013-01-05 08:10:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.13 +pkgver=2.0.14 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('9b505145b64903c684b6289af1f625e5') +md5sums=('84c7da0542bc60c093573c134e053c15') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD new file mode 100644 index 000000000..32dcab244 --- /dev/null +++ b/community/calibre/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 81470 2012-12-21 14:35:15Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Petrov Roman <nwhisper@gmail.com> +# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> + +pkgname=calibre +pkgver=0.9.11 +pkgrel=1 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-imaging' 'shared-mime-info' 'python2-dnspython' + 'libunrar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect') +makedepends=('python2-pycountry') +optdepends=('ipython2: to use calibre-debug') +install=calibre.install +source=("http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.xz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('07e620aed65d7bae2a27ccea123da4c9' + '42c07b43d575b5e7e7524bd7b9528f0e' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Fix for calibre-0.8.58 + sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + LANG='en_US.UTF-8' python2 setup.py translations +} + +package() { + cd "${srcdir}/${pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" + install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" +} diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper new file mode 100755 index 000000000..00cac4270 --- /dev/null +++ b/community/calibre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/community/calibre/calibre.install b/community/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch new file mode 100644 index 000000000..4c756f5d4 --- /dev/null +++ b/community/calibre/desktop_integration.patch @@ -0,0 +1,109 @@ +--- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 ++++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 +@@ -179,19 +179,6 @@ + self.setup_completion() + if islinux or isbsd: + self.setup_desktop_integration() +- self.create_uninstaller() +- +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- if islinux or isbsd: +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- import shutil +- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) +- + if warn is None and self.warnings: + self.info('There were %d warnings'%len(self.warnings)) + for args, kwargs in self.warnings: +@@ -237,7 +224,7 @@ + if isnetbsd: + f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') + else: +- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') ++ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') + if not os.path.exists(os.path.dirname(f)): + os.makedirs(os.path.dirname(f)) + self.manifest.append(f) +@@ -357,63 +344,39 @@ + + with TemporaryDirectory() as tdir, CurrentDir(tdir), \ + PreserveMIMEDefaults(): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('mimetypes/mobi.png', 'calibre-mobi.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) +- render_img('mimetypes/tpz.png', 'calibre-tpz.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) +- render_img('mimetypes/azw2.png', 'calibre-azw2.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) +- render_img('mimetypes/azw3.png', 'calibre-azw3.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) +- render_img('lt.png', 'calibre-gui.png', width=256, height=256) +- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- cc(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- cc(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes.xml', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes.xml') +- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/community/catalyst-utils/PKGBUILD b/community/catalyst-utils/PKGBUILD new file mode 100644 index 000000000..3fa6a4509 --- /dev/null +++ b/community/catalyst-utils/PKGBUILD @@ -0,0 +1,136 @@ +# $Id: PKGBUILD 77684 2012-10-13 13:37:15Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgbase=catalyst-utils +pkgname=('catalyst-utils' 'opencl-catalyst') +pkgver=12.9 +pkgrel=0.1 +pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation." +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz + fglrx-authfile-locations.patch + atieventsd + atieventsd.service) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' + '31ec3f0432dc2e9bf3203223aa75ce20' + 'f729bf913613f49b0b9759c246058a87' + '4bdb353dea68e33ac9e20ec30cc42082') + +if [ "${CARCH}" = "i686" ]; then + _ARCHDIR="x86" + _ARCHLIB="" + _ARCHXPIC="" +else + _ARCHDIR="x86_64" + _ARCHLIB="64" + _ARCHXPIC="_64a" +fi + +build() { + cd ${srcdir} + +# sh ./amd-driver-installer*.run --extract fglrx-install +# +# cd fglrx-install + patch -Np2 -i fglrx-authfile-locations.patch +} + +package_catalyst-utils() { + pkgdesc="AMD Catalyst drivers utilities and libraries." + provides=('libgl') + conflicts=('libgl' 'nvidia-utils') + depends=('xorg-server>=1.7.0' 'gcc-libs' 'libxinerama' 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger') + optdepends=('qt: amdcccle' + 'acpid: acpi event support') + + install -dm755 "${pkgdir}"/usr/{bin,sbin} + install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system} + install -dm755 "${pkgdir}"/usr/include/GL + install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d} + install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps} + + # binaries + cd ${srcdir} + install -m755 usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 usr/X11R6/bin/* "${pkgdir}/usr/bin/" + install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/" + + # headers + install -m644 usr/include/GL/* "${pkgdir}/usr/include/GL/" + + # xorg/dri/gl/... drivers + cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules + install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" + install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" + install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" + install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/" + ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + cd ${srcdir}/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB} + install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/" + ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/" + install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/" + install -m755 *.so* "${pkgdir}/usr/lib/" + install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/" + cd ${srcdir}/arch/${_ARCHDIR}/usr/lib${_ARCHLIB} + install -m755 *.so* "${pkgdir}/usr/lib/" + # needed symlinks + ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" + ln -s libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so" + ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" + + # various files + cd ${srcdir} + install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/" + install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/" + install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/" + install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" + install -m644 etc/ati/* "${pkgdir}/etc/ati/" + chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" + install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/" + install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/" + # use ACPI example files + install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" + install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" + # systemd and rc.d scripts + install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/" + + # provided in opencl-catalyst package + rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* + + # licenses + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/usr/share/doc/amdcccle/ccc_copyrights.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt" +} + +package_opencl-catalyst() { + pkgdesc="OpenCL implemention from AMD" + provides=('libcl') + conflicts=('libcl') + depends=('gcc-libs') + optdepends=('opencl-headers: headers necessary for OpenCL development') + + install -dm755 "${pkgdir}"/usr/{bin,lib} + install -dm755 "${pkgdir}/etc/OpenCL/vendors" + + cd ${srcdir}/arch/${_ARCHDIR} + + install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/" + install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/" + install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/" + install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/" + ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so" + + # license + install -Dm644 "${srcdir}//usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community/catalyst-utils/atieventsd b/community/catalyst-utils/atieventsd new file mode 100644 index 000000000..16bd9a4fa --- /dev/null +++ b/community/catalyst-utils/atieventsd @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` + +case "$1" in + start) + rc=0 + stat_busy "Starting ATI Events Daemon" + [ -z "$ATID_PID" ] && /usr/sbin/atieventsd + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon atieventsd + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping ATI Events Daemon" + kill $ATID_PID &>/dev/null + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + rm_daemon atieventsd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/catalyst-utils/atieventsd.service b/community/catalyst-utils/atieventsd.service new file mode 100644 index 000000000..90af165bd --- /dev/null +++ b/community/catalyst-utils/atieventsd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Catalyst event Daemon +Requires=acpid.socket + +[Service] +ExecStart=/usr/sbin/atieventsd --nodaemon + +[Install] +WantedBy=multi-user.target + diff --git a/community/catalyst-utils/fglrx-authfile-locations.patch b/community/catalyst-utils/fglrx-authfile-locations.patch new file mode 100644 index 000000000..3617e310b --- /dev/null +++ b/community/catalyst-utils/fglrx-authfile-locations.patch @@ -0,0 +1,16 @@ +Index: ati803/common/etc/ati/authatieventsd.sh +=================================================================== +--- ati803/common/etc/ati/authatieventsd.sh ++++ ati803/common/etc/ati/authatieventsd.sh 2008-04-18 23:25:27.000000000 +0300 +@@ -34,8 +34,9 @@ + + # Check xdm/kdm + +- XDM_AUTH_MASK=/var/lib/xdm/authdir/authfiles/A$1* +- XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file ++ XDM_AUTH_MASK=/var/lib/xdm/authfiles/A$1* ++ KDM_AUTH_MASK=/var/run/xauth/A$1* ++ XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK $KDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file + if [ -n "$XDM_AUTH_FILE" ]; then + SERVER_AUTH_FILE=$XDM_AUTH_FILE + DISP_SEARCH_STRING="#ffff#" diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index e5c328d9b..7f06d473d 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,63 +1,73 @@ -# $Id: PKGBUILD 73196 2012-07-03 19:16:11Z dreisner $ -# Maintainer: Ray Rashif <schiv@archlinux.org> +# $Id: PKGBUILD 81966 2013-01-05 03:16:00Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=cdemu-daemon -pkgver=1.5.0 -pkgrel=6 +pkgver=2.0.0 +pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver") +license=(GPL) +depends=(dbus "vhba-module>=20110915-5" libao "libmirage>=2.0.0") +makedepends=(cmake) optdepends=('alsa-lib: to enable the ALSA audio driver' 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemud' - 'etc/dbus-1/system.d/cdemud-dbus.conf') +backup=('etc/conf.d/cdemu-daemon' + 'etc/dbus-1/system.d/cdemu-daemon-dbus.conf') install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service' - 'cdemud-dbus.conf') -md5sums=('5ba780caa26d855942512b5b3c22405a' + 'cdemu-daemon.conf' 'system.patch' 'cdemu-daemon.service' + 'cdemu-daemon-dbus.conf') +md5sums=('8f6ad3a9f758938e1572046bccc30417' '6f31ad7a64d320cf4d6820432184070b' - 'cbc0937ef4ac50db3ce5cdbbe2e17a3b' - '90a2516639c05737fa10a110a1cba467' - 'be9a8f50da3f42129c0a0e3dea8cd56c' - 'afbf24bcdec382f58d95ba5de29bff71') + '60c41731d4dce7b67e1a30dc42d2f274' + '99f35b4640529d30ea40224386dd6f4f' + '55619a492de4ef06b0759b5e4358bcbb') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # make things Arch-friendly - patch -Np1 -i "$srcdir/system.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname + mkdir build; cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname \ + -DSYSTEM_BUS_SERVICE=on # This is disabled by default. Should we even ship it? make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver/build make DESTDIR="$pkgdir" install + install -d "$pkgdir/usr/lib/modules-load.d" + echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" + + # + # All the following stuff concerns the system bus service + # + + cd ../.. + + # make things Arch-friendly + patch "$pkgdir/usr/lib/cdemu-daemon/cdemu-daemon-system.sh" system.patch + # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 "$srcdir/cdemud-dbus.conf" \ - "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf" + install -m644 cdemu-daemon-dbus.conf \ + "$pkgdir/etc/dbus-1/system.d/cdemu-daemon-dbus.conf" - # the init stuff - install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" - install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" - install -d "$pkgdir/usr/lib/modules-load.d" - echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" + # the system daemon configuration + install -Dm644 cdemu-daemon.conf "$pkgdir/etc/conf.d/cdemu-daemon" # for systemd - install -Dm644 "$srcdir/cdemu-daemon.service" \ + install -Dm644 cdemu-daemon.service \ "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo "SystemdService=cdemu-daemon.service" >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service" + echo SystemdService=cdemu-daemon.service >> \ + "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service" } # vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon-dbus.conf b/community/cdemu-daemon/cdemu-daemon-dbus.conf new file mode 100644 index 000000000..ed14c6e39 --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon-dbus.conf @@ -0,0 +1,24 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + +<busconfig> + <!-- Only root can own the CDEmuDaemon service on bus --> + <policy user="root"> + <allow own="net.sf.cdemu.CDEmuDaemon"/> + </policy> + <policy group="root"> + <allow own="net.sf.cdemu.CDEmuDaemon"/> + </policy> + + <!-- Allow users at the console to invoke methods on the interface --> + <policy at_console="true"> + <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> + </policy> + + <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> + <policy group="cdemu"> + <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> + </policy> +</busconfig> + diff --git a/community/cdemu-daemon/cdemu-daemon.conf b/community/cdemu-daemon/cdemu-daemon.conf new file mode 100644 index 000000000..1d8c55fe6 --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon.conf @@ -0,0 +1,8 @@ +# how many optical drives to emulate +NUM_DEVICES=2 + +# audio backend (null, alsa or pulse) +AUDIO_DRIVER=null + +# log file +LOG_FILE=/var/log/cdemud.log diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install index ba34d1ea0..7a2384b47 100644 --- a/community/cdemu-daemon/cdemu-daemon.install +++ b/community/cdemu-daemon/cdemu-daemon.install @@ -1,25 +1,38 @@ post_install () { cat <<MSG - > The daemon is automatically started, but can be manually - started via /etc/rc.d/cdemud or cdemu-daemon.service. - > See /etc/conf.d/cdemud for further configuration. + > Only users with at a physical terminal or in the 'cdemu' + group can communicate with the system daemon or make use + of a session daemon. - > Only users at the console or in the 'cdemu' group can - communicate with the system daemon or use a session - daemon. + > If you want to output CD-Audio you need to use a session + daemon, e.g. via "cdemu -b session". If you use ALSA and + not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon + + > The daemons are usually started on-demand, but a system + daemon can be manually started via cdemu-daemon.service. + See /etc/conf.d/cdemu-daemon for further configuration. - > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or - AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session" - to control a session daemon. MSG + post_upgrade $1 $1 + return 0 } post_upgrade () { - # Repeat install message due to policy changes - # Added on 2012-06-19, remove after a grace period - post_install + if (( $(vercmp $2 2.0.0) < 0)); then + cat <<MSG + > Configuration files and log files have been renamed in + order to bring Arch closer to upstream. In particular, + this affects: + /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon + /var/log/cdemud.log --> /var/log/cdemu-daemon.log + ~/.cdemud --> ~/.cdemu-daemon + ~/.cdemud.log --> ~/.cdemu-daemon.log + Please move your configuration. + +MSG + fi return 0 } diff --git a/community/cdemu-daemon/cdemu-daemon.service b/community/cdemu-daemon/cdemu-daemon.service index 9879a3e6f..ab4834f60 100644 --- a/community/cdemu-daemon/cdemu-daemon.service +++ b/community/cdemu-daemon/cdemu-daemon.service @@ -3,7 +3,7 @@ Description=CDEmu Daemon [Service] Type=dbus -BusName=net.sf.cdemu.CDEMUD_Daemon +BusName=net.sf.cdemu.CDEmuDaemon ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh [Install] diff --git a/community/cdemu-daemon/system.patch b/community/cdemu-daemon/system.patch index 3c3d4b221..42812f6cf 100644 --- a/community/cdemu-daemon/system.patch +++ b/community/cdemu-daemon/system.patch @@ -1,26 +1,3 @@ -diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh ---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh 2012-03-25 16:35:40.577837996 +0800 -+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh 2012-03-25 16:39:12.180024983 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from ~/.cdemu-daemon -+# from ~/.cdemud - - # Default settings - NUM_DEVICES=2 --AUDIO_DRIVER=pulse --LOG_FILE=~/.cdemu-daemon.log -+AUDIO_DRIVER=null -+LOG_FILE=~/.cdemud.log - - # Read the settings --CONFIG_FILE=~/.cdemu-daemon -+CONFIG_FILE=~/.cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh --- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 +++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 @@ -29,17 +6,17 @@ diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5 # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional # configuration (number of devices, audio driver, log file) are read -# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemud ++# from /etc/conf.d/cdemu-daemon # Default settings NUM_DEVICES=2 AUDIO_DRIVER=null -LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemud.log ++LOG_FILE=/var/log/cdemu-daemon.log # Read the settings -CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemud ++CONFIG_FILE=/etc/conf.d/cdemu-daemon if [ -f ${CONFIG_FILE} ]; then . ${CONFIG_FILE}; diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index 365250991..1a3031f3c 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 80792 2012-12-03 18:56:26Z stativ $ +# $Id: PKGBUILD 81381 2012-12-19 11:23:36Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools -pkgver=3.01a09 +pkgver=3.01a10 pkgrel=1 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ provides=('cdrkit') options=(!makeflags) backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install -source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) -md5sums=('8d9fed38ce2705d6d227da65bfd93d48') +source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) +md5sums=('85abd7dc87ed9fdbcecca50ab6da7d7d') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD index 732ed1e12..48be6d113 100644 --- a/community/cgminer/PKGBUILD +++ b/community/cgminer/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 81049 2012-12-11 07:09:49Z fyan $ +# $Id: PKGBUILD 81884 2013-01-03 04:27:41Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: David Manouchehri <david@davidmanouchehri.com> pkgname=cgminer -pkgver=2.10.0 +pkgver=2.10.4 _build= -pkgrel=2 +pkgrel=1 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer." url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') @@ -50,7 +50,8 @@ package() { sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf } -md5sums=('93437f0a26a409d9c06f7361befe9d0f' + +md5sums=('f165e9060796d07b031aacc9468536f4' 'fe4a243fabe24608f5c05e40f0f118f6' 'ee39698273671fee0e98d4af16014c36' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index a6b13afe9..25067925a 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 80747 2012-12-01 21:09:55Z lcarlier $ +# $Id: PKGBUILD 82143 2013-01-09 14:21:16Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=1.99.15 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>=17.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>=18.0' 'xulrunner<=19.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip @@ -23,7 +23,7 @@ build() { cd ${srcdir}/chmsee-*/src cp Makefile.arch Makefile - #sed -i -e 's/15.*/17.*/g' ../application.ini + sed -i -e 's/17.*/18.*/g' ../application.ini make -j1 } diff --git a/community/cinelerra-cv/PKGBUILD b/community/cinelerra-cv/PKGBUILD new file mode 100644 index 000000000..339265f54 --- /dev/null +++ b/community/cinelerra-cv/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 80152 2012-11-16 23:35:55Z ioni $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> + +pkgname=cinelerra-cv +pkgver=2.2 +_gitrel=2.2.0 +pkgrel=12 +epoch=1 +pkgdesc="Professional video editing and compositing environment" +arch=('x86_64' 'i686') +url="http://cinelerra.org/" +license=('GPL') +depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2' + 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' + 'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase>=1.0.3') +makedepends=('git' 'nasm' 'mesa') +options=('!libtool') +source=('v4l1_removal.patch' + 'ffmpeg_api.patch') +md5sums=('bfa85e20809429d88eba4ab83e569612' + 'b05ec2fb54e7d02f6167525417802111') + +_gituri="git://git.cinelerra.org/CinelerraCV.git" +_gitdir="cinelerra" + +_confit() { + ./configure --prefix=/usr \ + --with-buildinfo=git/recompile \ + --with-external-ffmpeg \ + --enable-opengl \ + --disable-esd $@ +} + +build() { + msg "Connecting to GIT server...." + + if [ -d $_gitdir ] ; then + cd $_gitdir && git pull origin + msg "The local files are updated." + else + git clone $_gituri -b rel$_gitrel $_gitdir + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitdir-build" + cp -r "$srcdir/$_gitdir" "$srcdir/$_gitdir-build" + cd "$srcdir/$_gitdir-build" + + # gcc 4.6 workaround + export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS" + export CPPFLAGS="$CFLAGS" + + # remove executable stack + export LDFLAGS+=" -Wl,-z,noexecstack" + + # v4l1 removal patch + patch -Np1 -i "$srcdir/v4l1_removal.patch" + + # new ffmpeg api patch + patch -Np1 -i "$srcdir/ffmpeg_api.patch" + + sed -i -e '/Debian/d' admin/nasm + + # if you don't need OpenGL comment out the next line (and no glu/mesa dep) + sed -i '/\/X11R6/s///' configure.in + + ./autogen.sh + + if [ "$CARCH" = 'x86_64' ]; then + _confit --disable-mmx + else + _confit --enable-mmx + fi + + make +} + +package() { + cd "$srcdir/$_gitdir-build" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cinelerra-cv/ffmpeg_api.patch b/community/cinelerra-cv/ffmpeg_api.patch new file mode 100644 index 000000000..d9747476c --- /dev/null +++ b/community/cinelerra-cv/ffmpeg_api.patch @@ -0,0 +1,163 @@ +diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C +index 6ab6047..7cde503 100644 +--- a/cinelerra/ffmpeg.C ++++ b/cinelerra/ffmpeg.C +@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) { + + int FFMPEG::init(char *codec_string) { + +- avcodec_init(); + avcodec_register_all(); + + CodecID id = codec_id(codec_string); +@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) { + + // NOTE: frame must already have data space allocated + ++ AVPacket pkt; + got_picture = 0; +- int length = avcodec_decode_video(context, ++ av_init_packet( &pkt ); ++ pkt.data = data; ++ pkt.size = data_size; ++ int length = avcodec_decode_video2(context, + picture, + &got_picture, +- data, +- data_size); ++ &pkt); + + if (length < 0) { + printf("FFMPEG::decode error decoding frame\n"); +diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C +index a1ef61e..e56705f 100644 +--- a/cinelerra/fileac3.C ++++ b/cinelerra/fileac3.C +@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr) + + if(wr) + { +- avcodec_init(); + avcodec_register_all(); + codec = avcodec_find_encoder(CODEC_ID_AC3); + if(!codec) +diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c +index 81cb72b..67bcab8 100644 +--- a/quicktime/mpeg4.c ++++ b/quicktime/mpeg4.c +@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + context->error_resilience = FF_ER_CAREFUL; + #else +- context->error_recognition = FF_ER_CAREFUL; ++ context->err_recognition = AV_EF_CRCCHECK; + #endif + context->error_concealment = 3; + context->frame_skip_cmp = FF_CMP_DCTMAX; +@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + context->profile= FF_PROFILE_UNKNOWN; + context->rc_buffer_aggressivity = 1.0; + context->level= FF_LEVEL_UNKNOWN; +- context->flags |= CODEC_FLAG_H263P_UMV; + context->flags |= CODEC_FLAG_AC_PRED; + + // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... +@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + (codec->ffmpeg_id == CODEC_ID_MPEG4 || + codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO || + codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO || +- codec->ffmpeg_id == CODEC_ID_H263P || +- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) ++ codec->ffmpeg_id == CODEC_ID_H263P)) + { +- avcodec_thread_init(context, file->cpus); + context->thread_count = file->cpus; + } + +diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c +index 8c532c2..a2b51e9 100644 +--- a/quicktime/qtffmpeg.c ++++ b/quicktime/qtffmpeg.c +@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, + (ffmpeg_id == CODEC_ID_MPEG4 || + ffmpeg_id == CODEC_ID_MPEG1VIDEO || + ffmpeg_id == CODEC_ID_MPEG2VIDEO || +- ffmpeg_id == CODEC_ID_H263P || +- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) ++ ffmpeg_id == CODEC_ID_H263P)) + { +- avcodec_thread_init(context, cpus); + context->thread_count = cpus; + } + if(avcodec_open(context, +@@ -181,6 +178,7 @@ static int decode_wrapper(quicktime_t *file, + + if(!result) + { ++ AVPacket pkt; + + + // No way to determine if there was an error based on nonzero status. +@@ -189,11 +187,13 @@ static int decode_wrapper(quicktime_t *file, + ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */; + else + ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT; +- result = avcodec_decode_video(ffmpeg->decoder_context[current_field], ++ av_init_packet( &pkt ); ++ pkt.data = ffmpeg->work_buffer; ++ pkt.size = bytes + header_bytes; ++ result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], + &ffmpeg->picture[current_field], + &got_picture, +- ffmpeg->work_buffer, +- bytes + header_bytes); ++ &pkt); + + + +diff --git a/quicktime/wma.c b/quicktime/wma.c +index c045741..abc2dc8 100644 +--- a/quicktime/wma.c ++++ b/quicktime/wma.c +@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map, + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -195,11 +194,14 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk + chunk_size); + #else + bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE; +- result = avcodec_decode_audio2(codec->decoder_context, ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = codec->packet_buffer; ++ pkt.size = chunk_size; ++ result = avcodec_decode_audio3(codec->decoder_context, + (int16_t*)(codec->work_buffer + codec->output_size * sample_size), + &bytes_decoded, +- codec->packet_buffer, +- chunk_size); ++ &pkt); + #endif + + pthread_mutex_unlock(&ffmpeg_lock); diff --git a/community/cinelerra-cv/v4l1_removal.patch b/community/cinelerra-cv/v4l1_removal.patch new file mode 100644 index 000000000..9df4004fe --- /dev/null +++ b/community/cinelerra-cv/v4l1_removal.patch @@ -0,0 +1,125 @@ +http://bugs.cinelerra.org/ticket/949 +https://bugs.gentoo.org/show_bug.cgi?id=361709 + +diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C +--- cinelerra.orig//cinelerra/channelpicker.C 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/channelpicker.C 2011-02-17 13:31:30.147880002 -0500 +@@ -39,7 +39,7 @@ + #include "recordgui.h" + #include "recordmonitor.h" + #include "theme.h" +-#include "vdevicebuz.h" ++//#include "vdevicebuz.h" + #include "vdeviceprefs.h" + #include "videodevice.h" + +@@ -280,7 +280,7 @@ + // printf("PrefsChannelPicker::PrefsChannelPicker 1\n"); + this->mwindow = mwindow; + this->prefs = prefs; +- VDeviceBUZ::get_inputs(&input_sources); ++// VDeviceBUZ::get_inputs(&input_sources); + } + + PrefsChannelPicker::~PrefsChannelPicker() +diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am +--- cinelerra.orig//cinelerra/Makefile.am 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/Makefile.am 2011-02-17 13:31:30.147880002 -0500 +@@ -305,10 +305,8 @@ + vattachmentpoint.C \ + vautomation.C \ + vdevicebase.C \ +- vdevicebuz.C \ + vdevicedvb.C \ + vdeviceprefs.C \ +- vdevicev4l.C \ + vdevicev4l2.C \ + vdevicev4l2jpeg.C \ + vdevicex11.C \ +diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake +--- cinelerra.orig//cinelerra/reversemake 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/reversemake 2011-02-17 13:31:30.151880002 -0500 +@@ -32,10 +32,8 @@ + make $OBJDIR/vedits.o + make $OBJDIR/vedit.o + make $OBJDIR/vdevicex11.o +-make $OBJDIR/vdevicev4l.o + make $OBJDIR/vdeviceprefs.o + make $OBJDIR/vdevicelml.o +-make $OBJDIR/vdevicebuz.o + make $OBJDIR/vdevicebase.o + make $OBJDIR/vdevice1394.o + make $OBJDIR/vautomation.o +diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C +--- cinelerra.orig//cinelerra/videodevice.C 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/videodevice.C 2011-02-17 13:41:53.239880001 -0500 +@@ -39,9 +39,9 @@ + #ifdef HAVE_FIREWIRE + #include "vdevice1394.h" + #endif +-#include "vdevicebuz.h" ++//#include "vdevicebuz.h" + #include "vdevicedvb.h" +-#include "vdevicev4l.h" ++//#include "vdevicev4l.h" + #include "vdevicev4l2.h" + #include "vdevicev4l2jpeg.h" + #include "vdevicex11.h" +@@ -203,7 +203,6 @@ + result = input_base->open_input(); + break; + +- + #ifdef HAVE_VIDEO4LINUX2 + case VIDEO4LINUX2: + new_device_base(); +@@ -250,8 +249,8 @@ + { + switch(in_config->driver) + { +- case VIDEO4LINUX: +- return input_base = new VDeviceV4L(this); ++ //case VIDEO4LINUX: ++ // return input_base = new VDeviceV4L(this); + + #ifdef HAVE_VIDEO4LINUX2 + case VIDEO4LINUX2: +@@ -264,8 +263,8 @@ + case SCREENCAPTURE: + return input_base = new VDeviceX11(this, 0); + +- case CAPTURE_BUZ: +- return input_base = new VDeviceBUZ(this); ++ //case CAPTURE_BUZ: ++ // return input_base = new VDeviceBUZ(this); + + #ifdef HAVE_FIREWIRE + case CAPTURE_FIREWIRE: +@@ -662,9 +661,9 @@ + //printf("VideoDevice::open_output 1 %d\n", out_config->driver); + switch(out_config->driver) + { +- case PLAYBACK_BUZ: +- output_base = new VDeviceBUZ(this); +- break; ++ //case PLAYBACK_BUZ: ++ // output_base = new VDeviceBUZ(this); ++ // break; + case PLAYBACK_X11: + case PLAYBACK_X11_XV: + case PLAYBACK_X11_GL: +diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h +--- cinelerra.orig//cinelerra/videodevice.h 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/videodevice.h 2011-02-17 13:31:30.167880002 -0500 +@@ -40,9 +40,9 @@ + #include "thread.h" + #include "picture.inc" + #include "vdevicebase.inc" +-#include "vdevicebuz.inc" ++//#include "vdevicebuz.inc" + #include "vdevicelml.inc" +-#include "vdevicev4l.inc" ++//#include "vdevicev4l.inc" + #include "vdevicex11.inc" + #include "videoconfig.inc" + #include "videowindow.inc" diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD new file mode 100644 index 000000000..242d2122c --- /dev/null +++ b/community/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 81239 2012-12-14 02:06:27Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle <ike.devolder@gmail.com> +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=1.1.1 +pkgrel=2 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' + 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') +makedepends=('cmake' 'boost' 'mesa') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install new file mode 100644 index 000000000..2f0338d8a --- /dev/null +++ b/community/clementine/clementine.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index dff70a68f..db71c0a03 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 79561 2012-11-07 13:48:29Z bpiotrowski $ +# $Id: PKGBUILD 81962 2013-01-04 20:16:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' - 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') +makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' + 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' + 'faad2: for AAC input plugin support' 'ffmpeg: for ffmpeg input plugin support' - 'libmodplug: for modplug input plugin support' - 'faad2: for input AAC plugin support' + 'flac: for flac input plugin support' 'libmad: for mp3 input plugin support' + 'libmodplug: for modplug input plugin support' + 'libmp4v2: for mp4 input plugin support' 'libmpcdec: for musepack input plugin support' - 'wavpack: for wavpack input plugin support' 'libvorbis: for vorbis input plugin support' - 'flac: for flac input plugin support' - 'libmp4v2: for mp4 input plugin support') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2) -sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b') + 'opusfile: for opus input plugin support' + 'wavpack: for wavpack input plugin support') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 + cmus-2.5.0-opus-support.patch) +sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' + '5e524f54d565dfa30760562c223bc0e2e8ed00a0') build() { cd $srcdir/$pkgname-v$pkgver + patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch ./configure prefix=/usr make } diff --git a/community/cmus/cmus-2.5.0-opus-support.patch b/community/cmus/cmus-2.5.0-opus-support.patch new file mode 100644 index 000000000..80692e9da --- /dev/null +++ b/community/cmus/cmus-2.5.0-opus-support.patch @@ -0,0 +1,417 @@ +diff -rupN cmus-v2.5.0/Makefile cmus/Makefile +--- cmus-v2.5.0/Makefile 2012-11-07 09:46:17.000000000 +0100 ++++ cmus/Makefile 2013-01-04 07:15:35.293069953 +0100 +@@ -74,6 +74,7 @@ mikmod-objs := mikmod.lo + modplug-objs := modplug.lo + mpc-objs := mpc.lo + vorbis-objs := vorbis.lo ++opus-objs := opus.lo + wavpack-objs := wavpack.lo + wav-objs := wav.lo + mp4-objs := mp4.lo +@@ -88,6 +89,7 @@ ip-$(CONFIG_MIKMOD) += mikmod.so + ip-$(CONFIG_MODPLUG) += modplug.so + ip-$(CONFIG_MPC) += mpc.so + ip-$(CONFIG_VORBIS) += vorbis.so ++ip-$(CONFIG_OPUS) += opus.so + ip-$(CONFIG_WAVPACK) += wavpack.so + ip-$(CONFIG_WAV) += wav.so + ip-$(CONFIG_MP4) += mp4.so +@@ -102,6 +104,7 @@ $(mikmod-objs): CFLAGS += $(MIKMOD_CFLA + $(modplug-objs): CFLAGS += $(MODPLUG_CFLAGS) + $(mpc-objs): CFLAGS += $(MPC_CFLAGS) + $(vorbis-objs): CFLAGS += $(VORBIS_CFLAGS) ++$(opus-objs): CFLAGS += $(OPUS_CFLAGS) + $(wavpack-objs): CFLAGS += $(WAVPACK_CFLAGS) + $(mp4-objs): CFLAGS += $(MP4_CFLAGS) + $(aac-objs): CFLAGS += $(AAC_CFLAGS) +@@ -129,6 +132,9 @@ mpc.so: $(mpc-objs) $(libcmus-y) + vorbis.so: $(vorbis-objs) $(libcmus-y) + $(call cmd,ld_dl,$(VORBIS_LIBS)) + ++opus.so: $(opus-objs) $(libcmus-y) ++ $(call cmd,ld_dl,$(OPUS_LIBS)) ++ + wavpack.so: $(wavpack-objs) $(libcmus-y) + $(call cmd,ld_dl,$(WAVPACK_LIBS)) + +diff -rupN cmus-v2.5.0/configure cmus/configure +--- cmus-v2.5.0/configure 2012-11-07 09:46:17.000000000 +0100 ++++ cmus/configure 2013-01-04 07:15:35.293069953 +0100 +@@ -228,6 +228,12 @@ check_vorbis() + fi + } + ++check_opus() ++{ ++ pkg_config OPUS "opusfile" ++ return $? ++} ++ + check_wavpack() + { + pkg_config WAVPACK "wavpack" "" "-lwavpack" +@@ -425,6 +431,7 @@ Optional Features: y/n + CONFIG_MPC libmpcdec (Musepack .mpc, .mpp, .mp+) [auto] + CONFIG_VORBIS Ogg/Vorbis (.ogg, application/ogg, audio/x-ogg) [auto] + CONFIG_TREMOR Use Tremor as Ogg/Vorbis input plugin [n] ++ CONFIG_OPUS Opus (.opus) [auto] + CONFIG_WAV WAV [y] + CONFIG_WAVPACK WavPack (.wv, audio/x-wavpack) [auto] + CONFIG_MP4 MPEG-4 AAC (.mp4, .m4a, .m4b) [auto] +@@ -485,6 +492,7 @@ check check_mikmod CONFIG_MIKMOD + check check_modplug CONFIG_MODPLUG + check check_mpc CONFIG_MPC + check check_vorbis CONFIG_VORBIS ++check check_opus CONFIG_OPUS + check check_wavpack CONFIG_WAVPACK + check check_mp4 CONFIG_MP4 + check check_aac CONFIG_AAC +@@ -534,7 +542,7 @@ config_header config/cue.h CONFIG_CUE + CFLAGS="${CFLAGS} -DHAVE_CONFIG" + + makefile_vars bindir datadir libdir mandir exampledir +-makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE ++makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_OPUS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE + makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_AO CONFIG_ARTS CONFIG_OSS CONFIG_SUN CONFIG_WAVEOUT + + generate_config_mk +diff -rupN cmus-v2.5.0/opus.c cmus/opus.c +--- cmus-v2.5.0/opus.c 1970-01-01 01:00:00.000000000 +0100 ++++ cmus/opus.c 2013-01-04 07:15:35.493069945 +0100 +@@ -0,0 +1,335 @@ ++/* ++ * Copyright 2008-2012 Various Authors ++ * Copyright 2004-2005 Timo Hirvonen ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++#include "ip.h" ++#include "xmalloc.h" ++#include "read_wrapper.h" ++#include "debug.h" ++#include "comment.h" ++ ++#include <opusfile.h> ++ ++#include <errno.h> ++#include <string.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++#define SAMPLING_RATE 48000 ++#define CHANNELS 2 ++ ++struct opus_private { ++ OggOpusFile *of; ++ int current_link; ++}; ++ ++static int read_func(void *datasource, unsigned char *ptr, int size) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return read_wrapper(ip_data, ptr, size); ++} ++ ++static int seek_func(void *datasource, opus_int64 offset, int whence) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return lseek(ip_data->fd, offset, whence); ++} ++ ++static int close_func(void *datasource) ++{ ++ struct input_plugin_data *ip_data; ++ int rc; ++ ++ ip_data = datasource; ++ rc = close(ip_data->fd); ++ ip_data->fd = -1; ++ return rc; ++} ++ ++static opus_int64 tell_func(void *datasource) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return lseek(ip_data->fd, 0, SEEK_CUR); ++} ++ ++static OpusFileCallbacks callbacks = { ++ .read = read_func, ++ .seek = seek_func, ++ .tell = tell_func, ++ .close = close_func ++}; ++ ++static int opus_open(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ int rc; ++ void *source; ++ ++ priv = xnew(struct opus_private, 1); ++ priv->current_link = -1; ++ priv->of = NULL; ++ ++ source = op_fdopen(&callbacks, ip_data->fd, "r"); ++ if (source == NULL) { ++ free(priv); ++ return -IP_ERROR_INTERNAL; ++ } ++ ++ priv->of = op_open_callbacks(source, &callbacks, NULL, 0, &rc); ++ if (rc != 0) { ++ d_print("op_open_callbacks failed: %d:%s\n", rc, strerror(rc)); ++ free(priv); ++ /* ogg is a container format, so it is likely to contain ++ * something else if it isn't opus */ ++ return -IP_ERROR_UNSUPPORTED_FILE_TYPE; ++ } ++ ip_data->private = priv; ++ ++ ip_data->sf = sf_rate(SAMPLING_RATE) ++ | sf_channels(CHANNELS) ++ | sf_bits(16) ++ | sf_signed(1); ++#ifdef WORDS_BIGENDIAN ++ ip_data->sf |= sf_bigendian(1); ++#endif ++ return 0; ++} ++ ++static int opus_close(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv = ip_data->private; ++ /* this closes ip_data->fd! */ ++ op_free(priv->of); ++ ip_data->fd = -1; ++ free(priv); ++ ip_data->private = NULL; ++ return 0; ++} ++ ++/* ++ * -n ++ * indicates error ++ * 0 ++ * indicates EOF ++ * n ++ * indicates actual number of bytes read ++ */ ++static int opus_read(struct input_plugin_data *ip_data, char *buffer, int count) ++{ ++ struct opus_private *priv; ++ int samples, current_link, rc; ++ ++ priv = ip_data->private; ++ ++ /* samples = number of samples read per channel */ ++ samples = op_read_stereo(priv->of, (opus_int16*)buffer, ++ count / sizeof(opus_int16)); ++ if (samples < 0) { ++ switch (samples) { ++ case OP_HOLE: ++ errno = EAGAIN; ++ rc = -1; ++ break; ++ case OP_EREAD: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EFAULT: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EIMPL: ++ rc = -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ break; ++ case OP_EINVAL: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_ENOTFORMAT: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EBADHEADER: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EVERSION: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EBADPACKET: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EBADLINK: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EBADTIMESTAMP: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ default: ++ d_print("error: %d\n", samples); ++ rc = -IP_ERROR_FILE_FORMAT; ++ } ++ } else if (samples == 0) { ++ /* EOF or buffer too small */ ++ rc = 0; ++ } else { ++ current_link = op_current_link(priv->of); ++ if (current_link < 0) { ++ d_print("error: %d\n", current_link); ++ rc = -1; ++ } else { ++ if (ip_data->remote && current_link != priv->current_link) { ++ ip_data->metadata_changed = 1; ++ priv->current_link = current_link; ++ } ++ ++ /* bytes = samples * channels * sample_size */ ++ rc = samples * CHANNELS * sizeof(opus_int16); ++ } ++ } ++ ++ return rc; ++} ++ ++static int opus_seek(struct input_plugin_data *ip_data, double offset) ++{ ++ struct opus_private *priv; ++ int rc; ++ ++ priv = ip_data->private; ++ ++ rc = op_pcm_seek(priv->of, offset * SAMPLING_RATE); ++ switch (rc) { ++ case OP_ENOSEEK: ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ case OP_EINVAL: ++ return -IP_ERROR_INTERNAL; ++ case OP_EREAD: ++ return -IP_ERROR_INTERNAL; ++ case OP_EFAULT: ++ return -IP_ERROR_INTERNAL; ++ case OP_EBADLINK: ++ return -IP_ERROR_INTERNAL; ++ } ++ return 0; ++} ++ ++static int opus_read_comments(struct input_plugin_data *ip_data, ++ struct keyval **comments) ++{ ++ GROWING_KEYVALS(c); ++ struct opus_private *priv; ++ const OpusTags *ot; ++ int i; ++ ++ priv = ip_data->private; ++ ++ ot = op_tags(priv->of, -1); ++ if (ot == NULL) { ++ d_print("ot == NULL\n"); ++ *comments = keyvals_new(0); ++ return 0; ++ } ++ ++ for (i = 0; i < ot->comments; i++) { ++ const char *str = ot->user_comments[i]; ++ const char *eq = strchr(str, '='); ++ char *key; ++ ++ if (!eq) { ++ d_print("invalid comment: '%s' ('=' expected)\n", str); ++ continue; ++ } ++ ++ key = xstrndup(str, eq - str); ++ comments_add_const(&c, key, eq + 1); ++ free(key); ++ } ++ keyvals_terminate(&c); ++ *comments = c.keyvals; ++ return 0; ++} ++ ++static int opus_duration(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ ogg_int64_t samples; ++ ++ priv = ip_data->private; ++ ++ samples = op_pcm_total(priv->of, -1); ++ if (samples < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ ++ return samples / SAMPLING_RATE; ++} ++ ++static long opus_bitrate(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ opus_int32 bitrate; ++ ++ priv = ip_data->private; ++ ++ bitrate = op_bitrate(priv->of, -1); ++ if (bitrate < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ else ++ return bitrate; ++} ++ ++static long opus_current_bitrate(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ opus_int32 bitrate; ++ ++ priv = ip_data->private; ++ ++ bitrate = op_bitrate_instant(priv->of); ++ if (bitrate < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ else ++ return bitrate; ++} ++ ++static char *opus_codec(struct input_plugin_data *ip_data) ++{ ++ return xstrdup("opus"); ++} ++ ++static char *opus_codec_profile(struct input_plugin_data *ip_data) ++{ ++ return NULL; ++} ++ ++const struct input_plugin_ops ip_ops = { ++ .open = opus_open, ++ .close = opus_close, ++ .read = opus_read, ++ .seek = opus_seek, ++ .read_comments = opus_read_comments, ++ .duration = opus_duration, ++ .bitrate = opus_bitrate, ++ .bitrate_current = opus_current_bitrate, ++ .codec = opus_codec, ++ .codec_profile = opus_codec_profile ++}; ++ ++const int ip_priority = 50; ++const char * const ip_extensions[] = { "opus", NULL }; ++const char * const ip_mime_types[] = { NULL }; ++const char * const ip_options[] = { NULL }; diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index 14cc92378..14cc92378 100755..100644 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index d6ebde28b..81dc7df10 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 79133 2012-10-31 00:23:46Z dwallace $ +#$Id: PKGBUILD 82130 2013-01-09 02:21:52Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.9 -pkgrel=2 +pkgver=1.10 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') @@ -18,6 +18,9 @@ options=('!libtool') source=('connmand-daemon' "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') +md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' + '95a87fdccab7b63390c1c38ebba2883b' + 'a8d22ee089fb0ed725130d16ad393047') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -42,6 +45,3 @@ package(){ install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl" } -md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '8196824f400719dd172222a355ad9592' - 'a8d22ee089fb0ed725130d16ad393047') diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index d7656d5e3..5edbe1e2e 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80235 2012-11-18 10:29:50Z andrea $ +# $Id: PKGBUILD 82191 2013-01-11 10:20:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb -pkgver=1.2.0 -pkgrel=6 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -16,15 +16,15 @@ options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} +source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "rc-script.patch") -md5sums=('a5cbbcaac288831b3d8a08b725657f10' - '890a85b22219ea113a4901a289c442f8' + "couchdb.rc") +md5sums=('df75b03e56c2431ede7625200f0d44a7' + 'e6e943c1da93cfcb41a4286daa80195d' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - '8a3b1a1ff98a6411827ad991db7a355b') + 'a75ee9b310a950eea13b07274b7a0669') build() { cd "$srcdir/apache-$pkgname-$pkgver" @@ -33,8 +33,6 @@ build() { --sysconfdir=/etc \ --localstatedir=/var make - - patch -R etc/init/couchdb <$srcdir/rc-script.patch } package() { @@ -42,9 +40,10 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb - sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb + install -Dm755 $srcdir/couchdb.rc $pkgdir/etc/rc.d/couchdb + rm -rf $pkgdir/etc/default/ $pkgdir/var/run install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/couchdb/couchdb.rc b/community/couchdb/couchdb.rc new file mode 100644 index 000000000..af41c6460 --- /dev/null +++ b/community/couchdb/couchdb.rc @@ -0,0 +1,157 @@ +#!/bin/bash +. /etc/rc.conf +. /etc/rc.d/functions + +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. + +### BEGIN INIT INFO +# Provides: couchdb +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Apache CouchDB init script +# Description: Apache CouchDB init script for the database server. +### END INIT INFO + +SCRIPT_OK=0 +SCRIPT_ERROR=1 + +DESCRIPTION="database server" +NAME=couchdb +SCRIPT_NAME=`basename $0` +COUCHDB=/usr/bin/couchdb +CONFIGURATION_FILE=/etc/conf.d/couchdb +RUN_DIR=/var/run/couchdb +LSB_LIBRARY=/lib/lsb/init-functions + +if test ! -x $COUCHDB; then + exit $SCRIPT_ERROR +fi + +if test -r $CONFIGURATION_FILE; then + . $CONFIGURATION_FILE +fi + +log_daemon_msg () { + stat_busy $@ +} + +log_end_msg () { + if test "$1" != "0"; then + stat_fail + else + stat_done + fi + return $1 +} + +if test -r $LSB_LIBRARY; then + . $LSB_LIBRARY +fi + +run_command () { + command="$1" + if test -n "$COUCHDB_OPTIONS"; then + command="$command $COUCHDB_OPTIONS" + fi + if test -n "$COUCHDB_USER"; then + if su $COUCHDB_USER -s /bin/bash -c "$command"; then + return $SCRIPT_OK + else + return $SCRIPT_ERROR + fi + else + if $command; then + return $SCRIPT_OK + else + return $SCRIPT_ERROR + fi + fi +} + +start_couchdb () { + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" + chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" + fi + if test -n "$COUCHDB_STDERR_FILE"; then + command="$command -e $COUCHDB_STDERR_FILE" + fi + if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then + command="$command -r $COUCHDB_RESPAWN_TIMEOUT" + fi + run_command "$command" > /dev/null +} + +stop_couchdb () { + # Stop the running Apache CouchDB process. + + run_command "$COUCHDB -d" > /dev/null +} + +display_status () { + # Display the status of the running Apache CouchDB process. + + run_command "$COUCHDB -s" +} + +parse_script_option_list () { + # Parse arguments passed to the script and take appropriate action. + + case "$1" in + start) + log_daemon_msg "Starting $DESCRIPTION" $NAME + if start_couchdb; then + log_end_msg $SCRIPT_OK + else + log_end_msg $SCRIPT_ERROR + fi + ;; + stop) + log_daemon_msg "Stopping $DESCRIPTION" $NAME + if stop_couchdb; then + log_end_msg $SCRIPT_OK + else + log_end_msg $SCRIPT_ERROR + fi + ;; + restart) + log_daemon_msg "Restarting $DESCRIPTION" $NAME + if stop_couchdb; then + if start_couchdb; then + log_end_msg $SCRIPT_OK + else + log_end_msg $SCRIPT_ERROR + fi + else + log_end_msg $SCRIPT_ERROR + fi + ;; + status) + display_status + ;; + *) + cat << EOF >&2 +Usage: $SCRIPT_NAME {start|stop|restart|status} +EOF + exit $SCRIPT_ERROR + ;; + esac +} + +parse_script_option_list $@ diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index d952ae791..418c89ff0 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80879 2012-12-05 10:04:35Z spupykin $ +# $Id: PKGBUILD 81958 2013-01-04 19:09:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.17.2 +pkgver=0.17.4 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('09dfd4f5f82046f85025a391f084d8f9') +md5sums=('cb11463e3a0c8d063e578db64ff61dde') build() { true diff --git a/community/dangerdeep/PKGBUILD b/community/dangerdeep/PKGBUILD new file mode 100644 index 000000000..c08272acf --- /dev/null +++ b/community/dangerdeep/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 77850 2012-10-15 09:46:31Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=dangerdeep +pkgver=0.3.0 +pkgrel=7 +pkgdesc="submarine simulator" +arch=(i686 x86_64) +url="http://dangerdeep.sourceforge.net" +license=('GPL') +depends=('libgl' 'sdl_net' 'fftw' 'sdl_image' 'sdl_mixer' 'dangerdeep-data' 'glu') +makedepends=('scons' 'mesa') +source=("http://downloads.sourceforge.net/sourceforge/dangerdeep/dangerdeep-$pkgver.tar.gz" + "build-fix.patch") +md5sums=('8a1d19326a9a0bd8bb91a652bfa51bd9' + 'a4487f079e844ec6b093ef97c151dcd7') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch + scons installbindir=$pkgdir/usr/bin datadir=/usr/share/dangerdeep install +} diff --git a/community/dangerdeep/build-fix.patch b/community/dangerdeep/build-fix.patch new file mode 100644 index 000000000..f77e07c5a --- /dev/null +++ b/community/dangerdeep/build-fix.patch @@ -0,0 +1,102 @@ +diff -wbBur dangerdeep-0.3.0/src/bspline_test.cpp dangerdeep-0.3.0.my/src/bspline_test.cpp +--- dangerdeep-0.3.0/src/bspline_test.cpp 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/bspline_test.cpp 2012-10-08 17:33:01.034909571 +0400 +@@ -1,6 +1,8 @@ + // some test code for the 2d bsplines! + #include "bspline.h" + #include <fstream> ++#include <cstdlib> ++ + using namespace std; + + double rnd() { return double(rand())/RAND_MAX; } +diff -wbBur dangerdeep-0.3.0/src/convoy.h dangerdeep-0.3.0.my/src/convoy.h +--- dangerdeep-0.3.0/src/convoy.h 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/convoy.h 2012-10-08 17:33:01.034909571 +0400 +@@ -26,6 +26,7 @@ + #include "ai.h" + #include "vector2.h" + #include <new> ++#include <memory> + #include <list> + class ship; + +diff -wbBur dangerdeep-0.3.0/src/date.cpp dangerdeep-0.3.0.my/src/date.cpp +--- dangerdeep-0.3.0/src/date.cpp 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/date.cpp 2012-10-08 17:33:01.034909571 +0400 +@@ -20,6 +20,8 @@ + // date + // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE + ++#include <stdio.h> ++#include <stdlib.h> + #include <iomanip> + #include "date.h" + #include "texts.h" +diff -wbBur dangerdeep-0.3.0/src/faulthandler.h dangerdeep-0.3.0.my/src/faulthandler.h +--- dangerdeep-0.3.0/src/faulthandler.h 2007-06-11 22:29:30.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/faulthandler.h 2012-10-08 17:33:23.264909316 +0400 +@@ -50,6 +50,7 @@ + #include <signal.h> + #include <string> + #include <sstream> ++#include <unistd.h> + + // Note: use --export-dynamic as linker option or you won't get function names here. + +diff -wbBur dangerdeep-0.3.0/src/filehelper.cpp dangerdeep-0.3.0.my/src/filehelper.cpp +--- dangerdeep-0.3.0/src/filehelper.cpp 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/filehelper.cpp 2012-10-08 17:33:01.034909571 +0400 +@@ -23,6 +23,7 @@ + #include "filehelper.h" + #include "error.h" + #include <vector> ++#include <stdio.h> + using namespace std; + + #ifdef WIN32 +diff -wbBur dangerdeep-0.3.0/src/ocean_wave_generator.h dangerdeep-0.3.0.my/src/ocean_wave_generator.h +--- dangerdeep-0.3.0/src/ocean_wave_generator.h 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/ocean_wave_generator.h 2012-10-08 17:33:01.034909571 +0400 +@@ -29,6 +29,7 @@ + #include "environment.h" + #include <complex> + #include <vector> ++#include <cstdlib> + + // use float fftw (faster) or double (default) ? + #ifdef WITH_FLOAT_FFTW +diff -wbBur dangerdeep-0.3.0/src/ptrlist.h dangerdeep-0.3.0.my/src/ptrlist.h +--- dangerdeep-0.3.0/src/ptrlist.h 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/ptrlist.h 2012-10-08 17:33:01.034909571 +0400 +@@ -25,6 +25,7 @@ + + #include <list> + #include <stdexcept> ++#include <memory> + + // same as std::list regarding the interface (partly), but handles pointers. + template <class T> +diff -wbBur dangerdeep-0.3.0/src/ptrvector.h dangerdeep-0.3.0.my/src/ptrvector.h +--- dangerdeep-0.3.0/src/ptrvector.h 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/ptrvector.h 2012-10-08 17:33:01.034909571 +0400 +@@ -25,6 +25,7 @@ + + #include <vector> + #include <stdexcept> ++#include <memory> + + // same as std::vector regarding the interface, but handles pointers. + template <class T> +diff -wbBur dangerdeep-0.3.0/src/widget.cpp dangerdeep-0.3.0.my/src/widget.cpp +--- dangerdeep-0.3.0/src/widget.cpp 2007-06-11 19:16:23.000000000 +0400 ++++ dangerdeep-0.3.0.my/src/widget.cpp 2012-10-08 17:33:01.034909571 +0400 +@@ -32,6 +32,8 @@ + #include "datadirs.h" + #include <set> + #include <sstream> ++#include <algorithm> ++ + using std::vector; + using std::list; + using std::string; diff --git a/community/dante/sockd.rc b/community/dante/sockd.rc index 00ea5a7d4..00ea5a7d4 100755..100644 --- a/community/dante/sockd.rc +++ b/community/dante/sockd.rc diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index ffae5b5c2..cdd6f2493 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81093 2012-12-11 19:04:34Z spupykin $ +# $Id: PKGBUILD 82166 2013-01-10 09:21:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,15 +6,15 @@ pkgname=darktable pkgver=1.1.1 _pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt') + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' + 'libsoup') makedepends=('intltool>=0.40' 'cmake' 'librsvg') -# 'gnome-doc-utils' 'libxslt' 'fop') optdepends=('librsvg') install=darktable.install options=(!libtool) diff --git a/community/darktable/darktable.install b/community/darktable/darktable.install index 9fd6af293..8ea5d73af 100644 --- a/community/darktable/darktable.install +++ b/community/darktable/darktable.install @@ -1,8 +1,5 @@ -pkgname=darktable - post_install() { -# usr/sbin/gconfpkg --install ${pkgname} - [ -x `which update-desktop-database` ] && update-desktop-database -q + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } pre_upgrade() { @@ -13,11 +10,6 @@ post_upgrade() { post_install } -pre_remove() { -# usr/sbin/gconfpkg --uninstall ${pkgname} - true -} - post_remove() { - [ -x `which update-desktop-database` ] && update-desktop-database -q + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index e8cc28731..ed33f7837 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -17,13 +17,15 @@ makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" - "dia-overflow-fix.patch") + "dia-overflow-fix.patch" + "dia-0.97.2-glib.patch") md5sums=('1e1180a513fb567709b09bc19f12105e' - '8fd9a2ad35b5a6fd8c758d7c73dbfe66') + '8fd9a2ad35b5a6fd8c758d7c73dbfe66' + '430d39de524c112f39a4bd9801038b05') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + patch -Np1 -i ${srcdir}/dia-0.97.2-glib.patch export PYTHON=/usr/bin/python2 for file in `find -type f -name '*.py'`; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" diff --git a/community/dia/dia-0.97.2-glib.patch b/community/dia/dia-0.97.2-glib.patch new file mode 100644 index 000000000..dcda07392 --- /dev/null +++ b/community/dia/dia-0.97.2-glib.patch @@ -0,0 +1,40 @@ +--- dia-0.97.2.orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-12-19 13:59:45.985417287 -0500 +@@ -27,8 +27,7 @@ + #include "custom_util.h" + #include <string.h> + #include <stdarg.h> +-#include <glib/gstrfuncs.h> +-#include <glib/gstdio.h> ++#include <glib.h> + #include <libxml/parser.h> + + /* +--- dia-0.97.2.orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500 ++++ dia-0.97.2/tests/test-boundingbox.c 2012-12-19 14:01:03.115674866 -0500 +@@ -26,11 +26,6 @@ + #define G_LOG_DOMAIN "Dia" + + #include <glib.h> +-#include <glib-object.h> +- +-#if GLIB_CHECK_VERSION(2,16,0) +-#include <glib/gtestutils.h> +-#endif + #include "dialib.h" + + /* +--- dia-0.97.2.orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500 ++++ dia-0.97.2/tests/test-objects.c 2012-12-19 14:01:43.978961390 -0500 +@@ -26,11 +26,6 @@ + #define G_LOG_DOMAIN "Dia" + + #include <glib.h> +-#include <glib-object.h> +- +-#if GLIB_CHECK_VERSION(2,16,0) +-#include <glib/gtestutils.h> +-#endif + + #include "object.h" + #include "plug-ins.h" diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 86070b157..741d4beef 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81014 2012-12-10 10:16:44Z spupykin $ +# $Id: PKGBUILD 81575 2012-12-24 15:00:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=distcc pkgver=3.1 -pkgrel=9 +pkgrel=10 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/distcc/" @@ -14,7 +14,8 @@ depends=('gcc' 'popt' 'avahi') makedepends=('gtk2' 'pkgconfig' 'python2' 'dbus') optdepends=('gtk2: for distccmon-gnome' 'python2') -backup=(etc/conf.d/distccd) +backup=('etc/conf.d/distccd' + 'etc/distcc/hosts') source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 distccd distccd.conf.d diff --git a/community/distcc/distccd b/community/distcc/distccd index 4702d6820..4702d6820 100755..100644 --- a/community/distcc/distccd +++ b/community/distcc/distccd diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index ecdb153f1..b206344cd 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74747 2012-08-03 04:26:36Z svenstaro $ +# $Id: PKGBUILD 81927 2013-01-03 14:59:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,15 +7,15 @@ pkgname=('dmd' 'libphobos') pkgbase=dmd -pkgver=2.060 +pkgver=2.061 pkgrel=1 arch=('i686' 'x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) license=('custom') -md5sums=('6cf237d16625bf37a757a413963fa999' - '1e75b64dbf725dc8f6fc9e60ded5bef8') +md5sums=('823aba8a7e0fbb242bb2a2d922ced5c6' + '2e301d06071fb24c7c2d504c8ddbbc39') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" @@ -40,7 +40,7 @@ build() { package_dmd() { pkgdesc="The Digital Mars D compiler" backup=('etc/dmd.conf') - depends=('libphobos' 'gcc-libs') + depends=('libphobos' 'gcc') install -Dm755 $srcdir/dmd2/src/dmd/dmd $pkgdir/usr/bin/dmd diff --git a/community/dosemu/PKGBUILD b/community/dosemu/PKGBUILD new file mode 100644 index 000000000..4c9fb31f6 --- /dev/null +++ b/community/dosemu/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 81027 2012-12-10 10:25:41Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: Bob Finch <w9ya@arrl.net> + +pkgname=dosemu +pkgver=1.4.0 +pkgrel=9 +pkgdesc="DOS emulator" +arch=('i686' 'x86_64') +url="http://www.dosemu.org/" +license=('GPL' 'custom') +depends=('gpm' 'slang' 'sdl' 'libxxf86vm' 'libsndfile' 'sh' 'xorg-mkfontdir' 'xorg-bdftopcf' 'xorg-xlsfonts') +backup=('etc/dosemu/dosemu.conf' + 'etc/dosemu/dosemu.users' + 'etc/dosemu/global.conf') +install=dosemu.install +source=(http://downloads.sourceforge.net/sourceforge/dosemu/$pkgname-$pkgver.tgz + http://downloads.sourceforge.net/sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz + kernel_version.patch + fix-infinite-loop.patch + cpu-support.patch) +md5sums=('0bba530637266f99d404ba15e3f118d4' + '2e09774fe91cff4372cb4a393eb467f5' + '15af2ca86b2e7d8835f0f837ea663c3d' + 'e8ea87d46c613130b26724facb5aa297' + 'ebb17406a7d302f6c4ad2b67304f31b6') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i ${srcdir}/kernel_version.patch + patch -Np1 -i ${srcdir}/fix-infinite-loop.patch + patch -Np1 -i ${srcdir}/cpu-support.patch + sed -i 's|extern int yyget_leng|extern size_t yyget_leng|' src/base/init/lexer.h + + unset CFLAGS + ./configure --prefix=/usr --with-fdtarball=$srcdir/dosemu-freedos-1.0-bin.tgz --mandir=/usr/share/man + make +} + +package(){ + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + + ln -s /usr/share/dosemu/drive_z $pkgdir/etc/dosemu/drives/z + install -dm0755 $pkgdir/etc/sysctl.d + echo "vm.mmap_min_addr = 0" >$pkgdir/etc/sysctl.d/dosemu.conf + + install -D -m 644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -D -m 644 COPYING.DOSEMU $pkgdir/usr/share/licenses/$pkgname/COPYING.DOSEMU +} diff --git a/community/dosemu/cpu-support.patch b/community/dosemu/cpu-support.patch new file mode 100644 index 000000000..6a8d84148 --- /dev/null +++ b/community/dosemu/cpu-support.patch @@ -0,0 +1,12 @@ +diff -Naur orig/dosemu-1.4.0/src/base/init/config.c modified/dosemu-1.4.0/src/base/init/config.c +--- orig/src/base/init/config.c 2007-05-04 22:19:41.000000000 +0800 ++++ modified/src/base/init/config.c 2012-12-06 10:05:31.780346032 +0800 +@@ -480,6 +480,8 @@ + case 5: case 586: + case 6: case 686: + case 15: ++ case 16: ++ case 17: + config.realcpu = CPU_586; + cpuflags = get_proc_string_by_key("features"); + if (!cpuflags) { diff --git a/community/dosemu/dosemu.install b/community/dosemu/dosemu.install new file mode 100644 index 000000000..b5ed385d1 --- /dev/null +++ b/community/dosemu/dosemu.install @@ -0,0 +1,7 @@ +post_install() { + sysctl -p etc/sysctl.d/dosemu.conf +} + +post_upgrade() { + post_install +} diff --git a/community/dosemu/fix-infinite-loop.patch b/community/dosemu/fix-infinite-loop.patch new file mode 100644 index 000000000..7f12d9985 --- /dev/null +++ b/community/dosemu/fix-infinite-loop.patch @@ -0,0 +1,13 @@ +--- trunk/src/plugin/translate/translate.c 2011/05/24 02:28:24 2032 ++++ trunk/src/plugin/translate/translate.c 2011/10/03 23:37:46 2058 +@@ -466,7 +466,9 @@ + while (list->next) { + list = list->next; + } +- list->next = set; ++ if (list != set) { ++ list->next = set; ++ } + } + initialize_charset(set); + } diff --git a/community/dosemu/kernel_version.patch b/community/dosemu/kernel_version.patch new file mode 100644 index 000000000..0351922d4 --- /dev/null +++ b/community/dosemu/kernel_version.patch @@ -0,0 +1,12 @@ +diff -wbBur dosemu-1.4.0/src/base/init/init.c dosemu-1.4.0.my/src/base/init/init.c +--- dosemu-1.4.0/src/base/init/init.c 2007-05-04 09:59:48.000000000 +0400 ++++ dosemu-1.4.0.my/src/base/init/init.c 2011-08-15 12:39:42.000000000 +0400 +@@ -280,7 +280,7 @@ + char version[80]; + + uname((struct utsname *)&unames); +-#ifdef __linux__ ++#if 0 + strcpy(version,unames.release); + running_kversion = atoi(strtok(version,".")) *1000000; + running_kversion += atoi(strtok(NULL,".")) *1000; diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index db2f57ea5..b55158cfd 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79527 2012-11-06 17:22:36Z giovanni $ +# $Id: PKGBUILD 81976 2013-01-05 08:19:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=efax-gtk -pkgver=3.2.10 +pkgver=3.2.11 pkgrel=1 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('heirloom-mailx: to use the mail_fax script') backup=('etc/efax-gtkrc') install=efax-gtk.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('24a21ac319b6074390f296e3fb7d4f23') +md5sums=('237dddbc6d208565f2860319314f4392') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 2c9b93cb2..ff1108c9b 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80020 2012-11-15 13:56:56Z spupykin $ +# $Id: PKGBUILD 82170 2013-01-10 09:34:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=7 +pkgrel=8 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -22,7 +22,7 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${ md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' '2338a6230ce5f9f60be6dddcfa39bc7e' - 'bd18cb1034df9ef1b699214f0e3b4567') + 'df32aa17e40a7bc5d9946d3ba6fe5e16') build() { cd "$srcdir/$pkgname-$pkgver/src" diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service index e7cef53b2..036cc7c53 100644 --- a/community/ejabberd/ejabberd.service +++ b/community/ejabberd/ejabberd.service @@ -5,7 +5,6 @@ After=network.target [Service] Type=forking User=ejabberd -Group=jabber LimitNOFILE=16000 RestartSec=5 ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\" diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch new file mode 100644 index 000000000..e077a15cf --- /dev/null +++ b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch @@ -0,0 +1,60 @@ +From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001 +From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> +Date: Tue, 5 Jul 2011 09:23:38 +0000 +Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and + red channels, otherwise the colors (other than black + and white) looked wierd. + +git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e +--- + src/PDFDocument.cxx | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx +index df5d75f..63b3513 100644 +--- a/src/PDFDocument.cxx ++++ b/src/PDFDocument.cxx +@@ -20,6 +20,7 @@ + #include <time.h> + #include <poppler.h> + #include <unistd.h> ++#include <algorithm> + #include "epdfview.h" + + using namespace ePDFView; +@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout); + static PageMode convertPageMode (gint pageMode); + static gchar *getAbsoluteFileName (const gchar *fileName); + ++namespace ++{ ++ void ++ convert_bgra_to_rgba (guint8 *data, int width, int height) ++ { ++ using std::swap; ++ ++ for (int y = 0; y < height; y++) ++ { ++ for (int x = 0; x < width; x++) ++ { ++ swap(data[0], data[2]); ++ data += 4; ++ } ++ } ++ } ++} ++ + /// + /// @brief Constructs a new PDFDocument object. + /// +@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum) + poppler_page_render (page, context); + cairo_destroy(context); + cairo_surface_destroy (surface); ++ convert_bgra_to_rgba(renderedPage->getData (), width, height); + #else // !HAVE_POPPLER_0_17_0 + // Create the pixbuf from the data and render to it. + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (), +-- +1.7.7 + diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD new file mode 100644 index 000000000..81ab34ff6 --- /dev/null +++ b/community/epdfview/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 72969 2012-06-25 18:50:56Z foutrelis $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Tom K <tomk@runbox.com> +# Contributor: Thayer Williams <thayer@archlinux.org> + +pkgname=epdfview +pkgver=0.1.8 +pkgrel=4 +pkgdesc="A free lightweight PDF document viewer." +url="http://www.emma-soft.com/projects/epdfview/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2') +makedepends=('pkgconfig') +install='epdfview.install' +source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2" + "${pkgname}.desktop.patch" + "glib2_headers.patch" + "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch" + patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch" + patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116 + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + for size in 24 32 48; do + install -Dm644 data/icon_${pkgname}-${size}.png \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" + done +} + +md5sums=('e50285b01612169b2594fea375f53ae4' + 'fbf22bbabdbb7544db615ac5775d57e2' + '2fffa9c7cd4c5f0744803591c2f162a3' + '7f9ea101a41f5b4e999fd024f423d41f') diff --git a/community/epdfview/epdfview.desktop.patch b/community/epdfview/epdfview.desktop.patch new file mode 100644 index 000000000..d86fc3088 --- /dev/null +++ b/community/epdfview/epdfview.desktop.patch @@ -0,0 +1,11 @@ +--- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700 ++++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700 +@@ -7,7 +7,7 @@ + GenericName=PDF Viewer + GenericName[ca]=Visor PDF + GenericName[es]=Visor PDF +-Icon=icon_epdfview-48 ++Icon=epdfview + Name=ePDFViewer + Name[ca]=ePDFViewer + Name[es]=ePDFViewer diff --git a/community/epdfview/epdfview.install b/community/epdfview/epdfview.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community/epdfview/epdfview.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/epdfview/glib2_headers.patch b/community/epdfview/glib2_headers.patch new file mode 100644 index 000000000..e9f0983b5 --- /dev/null +++ b/community/epdfview/glib2_headers.patch @@ -0,0 +1,13 @@ +diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h +index c142a7a..58fcf2e 100644 +--- a/src/gtk/StockIcons.h ++++ b/src/gtk/StockIcons.h +@@ -18,7 +18,7 @@ + #if !defined (__STOCK_ICONS_H__) + #define __STOCK_ICONS_H__ + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/community/espeakup/espeakup b/community/espeakup/espeakup index 94a71701a..94a71701a 100755..100644 --- a/community/espeakup/espeakup +++ b/community/espeakup/espeakup diff --git a/community/exim/exim b/community/exim/exim index 8e9640b32..8e9640b32 100755..100644 --- a/community/exim/exim +++ b/community/exim/exim diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index a9ef5470d..a13168cf5 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77630 2012-10-13 11:42:09Z allan $ +# $Id: PKGBUILD 81603 2012-12-25 00:34:08Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=extremetuxracer pkgver=0.4 -pkgrel=4 +pkgrel=5 pkgdesc="Downhill racing game starring Tux" arch=('i686' 'x86_64' 'mips64el') url="http://www.extremetuxracer.com" diff --git a/community/extundelete/PKGBUILD b/community/extundelete/PKGBUILD index be39273c9..70591c45d 100644 --- a/community/extundelete/PKGBUILD +++ b/community/extundelete/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 66632 2012-02-26 16:13:47Z jlichtblau $ +# $Id: PKGBUILD 82017 2013-01-05 17:22:04Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: snuo pkgname=extundelete -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc="Utility for recovering deleted files from ext2, ext3 or ext4 partitions by parsing the journal" arch=('i686' 'x86_64' 'mips64el') url="http://extundelete.sourceforge.net" license=('GPL') makedepends=('e2fsprogs') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 \ - $pkgname-build.patch) -sha256sums=('0f6a3004d8ddcafe63059a104c174f753c7fc95455081f3ff5aaf3b8c100f97b' - '6e59a025b98838f43146a9309f5c84b09ca8a314e90a6c9f68837d23ee4d9443') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +sha256sums=('a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4') build() { cd ${srcdir}/$pkgname-$pkgver -#http://patch-tracker.debian.org/package/extundelete/0.2.0-2 - patch -Np1 -i ${srcdir}/$pkgname-build.patch - ./configure --prefix=/usr make } diff --git a/community/extundelete/extundelete.changelog b/community/extundelete/extundelete.changelog index ff334face..56d6fd153 100644 --- a/community/extundelete/extundelete.changelog +++ b/community/extundelete/extundelete.changelog @@ -1,3 +1,9 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * extundelete 0.2.4-1 + +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * extundelete 0.2.1-1 + 2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * extundelete 0.2.0-2 package signed diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 4e51fa705..3b223561c 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 73988 2012-07-18 01:06:25Z ibiru $ +# $Id: PKGBUILD 81376 2012-12-19 10:52:03Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=1 +pkgrel=2 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" license=('GPL') -depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion' 'qtwebkit') optdepends=('geoip: GeoIP support') makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz) diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 3117d9d46..710522eb2 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') url="http://paste.xinu.at" @@ -9,8 +9,8 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('32551de21b82d2dbd1bb96ad2ecb5fc7' - '04357f4b0d6a84f1de51e275220a042b') +md5sums=('0dc4cc4637b4503cb0c0cf1f1b09975a' + 'ff74200e97a0184109cd1eee9c0dc099') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fbterm/PKGBUILD b/community/fbterm/PKGBUILD new file mode 100644 index 000000000..e0244aa84 --- /dev/null +++ b/community/fbterm/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 81466 2012-12-21 12:36:51Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: noonov <noonov@gmail.com> + +pkgname=fbterm +pkgver=1.7.0 +pkgrel=5 +pkgdesc="A fast terminal emulator for linux with frame buffer device or VESA video card" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/fbterm/" +license=('GPL2') +depends=('gcc-libs' 'fontconfig') +optdepends=('libx86: for VESA video card support') +install=fbterm.install +source=("http://fbterm.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver%.?}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver%.?}" + + install -Dm644 terminfo/fbterm "${pkgdir}/usr/share/terminfo/f/fbterm" + + make DESTDIR="${pkgdir}" TERMINFO="${pkgdir}/usr/share/terminfo" install +} + +md5sums=('c36bae75a450df0519b4527cccaf7572') diff --git a/community/fbterm/fbterm.install b/community/fbterm/fbterm.install new file mode 100644 index 000000000..9b4d7ebd1 --- /dev/null +++ b/community/fbterm/fbterm.install @@ -0,0 +1,22 @@ +post_install() { + cat <<EOF + +==> To run fbterm as a non-root user, do: + +sudo gpasswd -a YOUR_USERNAME video + + +==> To enable keyboard shortcuts for non-root users, do: + +sudo setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm + +or + +sudo chmod u+s /usr/bin/fbterm + +EOF +} + +post_upgrade() { + post_install $1 +} diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD index 9c1632d33..f074d1953 100644 --- a/community/fceux/PKGBUILD +++ b/community/fceux/PKGBUILD @@ -1,45 +1,48 @@ -# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $ +# $Id: PKGBUILD 82066 2013-01-07 08:30:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Eric Belanger <eric@archlinux.org> +# Contriutor: Eric Belanger <eric@archlinux.org> # Contributor: Jo Christian Bergskås <jcberg@gmail.com> + pkgname=fceux -pkgver=2.1.5 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 +url='http://www.fceux.com/' +pkgdesc='Fast and ultra-compatible NES/Famicom emulator' arch=('x86_64' 'i686' 'mips64el') -url="http://fceux.com/" -pkgdesc="Fast and ultra-compatible NES/Famicom emulator" license=('GPL') -depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils') -makedepends=('scons' 'mesa' 'lua') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl') +makedepends=('scons' 'mesa' 'glu') optdepends=('xchm: for viewing the manual') -provides=('fceu' 'gfceux') -replaces=('fceu' 'gfceux') -install=fceux.install -source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2" - "fceux.desktop" - "fceux.png") -md5sums=('e8b20e62bbbb061b1a59d51b47c827bd' - '3c6a259d88825ff1b9387d191a6c970e' - '3fe753731ac46b5fee528b1f73abd3e3') +install=$pkgname.install +source=("https://sourceforge.net/projects/fceultra/files/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz") +sha256sums=('31ad7b478d5c0911a67a4eaeae9de915d44fc95844148a135114e27d7fd1a694') build() { - cd "$srcdir/fceu${pkgver}" + cd "$srcdir/$pkgname" - sed -i "s|/usr/local|$pkgdir/usr|" SConstruct - scons OPENGL=0 install + msg2 'Compiling...' + scons --prefix="$pkgdir/usr" } package() { - cd "$srcdir/fceu${pkgver}" + cd "$srcdir/$pkgname" + + msg2 'Packaging binaries, data and man-pages...' + scons install --prefix="$pkgdir/usr" - install -Dm644 bin/$pkgname.chm \ + msg2 'Packaging documentation...' + install -Dm644 "src/drivers/win/help/$pkgname.chm" \ "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm" - install -Dm644 $srcdir/fceux.desktop \ - "$pkgdir/usr/share/applications/fceux.desktop" - install -Dm644 $srcdir/fceux.png \ - "$pkgdir/usr/share/pixmaps/fceux.png" - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" + cp -r documentation/* "$pkgdir/usr/share/doc/$pkgname/" + # Removing manpages that are already placed in the right location + rm -f "$pkgdir/usr/share/doc/$pkgname/*.6" + install -Dm644 changelog.txt "$pkgdir/usr/share/doc/$pkgname/" + + msg2 'Packaging desktop shortcut and icon...' + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" } # vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux-2.1.5-gcc46.patch b/community/fceux/fceux-2.1.5-gcc46.patch new file mode 100644 index 000000000..540382278 --- /dev/null +++ b/community/fceux/fceux-2.1.5-gcc46.patch @@ -0,0 +1,11 @@ +--- fceu2.1.5.orig/src/file.cpp 2010-09-18 19:05:09.000000000 -0500 ++++ fceu2.1.5/src/file.cpp 2012-12-19 10:47:44.065106719 -0500 +@@ -310,7 +310,7 @@ + if(magic==0x088b1f) {
+ // maybe gzip...
+
+- void* gzfile = gzopen(fileToOpen.c_str(),"rb");
++ gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
+ if(gzfile) {
+ delete fp;
+
diff --git a/community/fceux/fceux-2.1.5-gcc47.patch b/community/fceux/fceux-2.1.5-gcc47.patch new file mode 100644 index 000000000..8d6891dfa --- /dev/null +++ b/community/fceux/fceux-2.1.5-gcc47.patch @@ -0,0 +1,22 @@ +--- fceu2.1.5.orig/src/utils/endian.h 2010-11-07 18:33:11.000000000 -0500 ++++ fceu2.1.5/src/utils/endian.h 2012-12-19 10:36:45.076124554 -0500 +@@ -93,19 +93,5 @@ + }
+ }
+
+-template<typename T>
+-int writele(T *Bufo, EMUFILE*os)
+-{
+- CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);
+- switch(sizeof(T)) {
+- case 1: return write8le((uint8*)Bufo,os);
+- case 2: return write16le((uint16*)Bufo,os);
+- case 4: return write32le((uint32*)Bufo,os);
+- case 8: return write64le((uint64*)Bufo,os);
+- default:
+- return 0;
+- }
+-}
+-
+ #endif //__FCEU_ENDIAN
+
diff --git a/community/fceux/fceux-2.1.5-underlink.patch b/community/fceux/fceux-2.1.5-underlink.patch new file mode 100644 index 000000000..c08137a51 --- /dev/null +++ b/community/fceux/fceux-2.1.5-underlink.patch @@ -0,0 +1,13 @@ +--- fceu2.1.5.orig/SConstruct 2011-06-07 21:33:28.876609681 +0200 ++++ fceu2.1.5/SConstruct 2011-06-07 21:34:11.420368249 +0200 +@@ -70,6 +70,10 @@ + env.ParseConfig('pkg-config --cflags --libs gtk+-3.0') + env.Append(CPPDEFINES=["_GTK3"]) + env.Append(CCFLAGS = ["-D_GTK"]) ++ env.Append(LIBS =["-lz"]) ++ env.Append(LIBS =["-ldl"]) ++ env.Append(LIBS =["-lX11"]) ++ + ### Lua platform defines + ### Applies to all files even though only lua needs it, but should be ok + if env['LUA']: diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD index 0adcca773..bbbd3720e 100644 --- a/community/fcitx-anthy/PKGBUILD +++ b/community/fcitx-anthy/PKGBUILD @@ -1,18 +1,18 @@ -# $Id$ +# $Id: PKGBUILD 81663 2012-12-26 08:40:15Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-anthy pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fcitx Wrapper for anthy." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.5' 'anthy') makedepends=('cmake' 'intltool') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -install='fcitx-anthy.install' +install=fcitx-anthy.install build(){ cd "$srcdir"/${pkgname}-${pkgver} diff --git a/community/fcitx-anthy/fcitx-anthy.install b/community/fcitx-anthy/fcitx-anthy.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-anthy/fcitx-anthy.install +++ b/community/fcitx-anthy/fcitx-anthy.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-chewing/PKGBUILD b/community/fcitx-chewing/PKGBUILD index bb6154d8a..9151c7066 100644 --- a/community/fcitx-chewing/PKGBUILD +++ b/community/fcitx-chewing/PKGBUILD @@ -1,19 +1,23 @@ -# $Id: PKGBUILD 79762 2012-11-12 02:32:12Z fyan $ +# $Id: PKGBUILD 81444 2012-12-21 04:32:29Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-chewing pkgver=0.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Fcitx Wrapper for chewing" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/fcitx-chewing" license=('GPL') depends=('libchewing' 'fcitx>=4.2.6') makedepends=('cmake' 'intltool') -source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz" + "https://github.com/fcitx/fcitx-chewing/commit/3395ef29e7c43187dcd556f3396fec8aa8c1f60a.patch") build() { cd "$srcdir"/${pkgname}-${pkgver} + + patch -Np1 -i "$srcdir/3395ef29e7c43187dcd556f3396fec8aa8c1f60a.patch" + rm -rf build mkdir build cd build @@ -26,4 +30,5 @@ package() { cd "$srcdir"/${pkgname}-${pkgver}/build make DESTDIR="$pkgdir" install } -md5sums=('052e3f146b6e2805918c008005fc9591') +md5sums=('052e3f146b6e2805918c008005fc9591' + '60f54d8ef94f66f00f8e7982ddbbde6f') diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD index af265a976..4623f566d 100644 --- a/community/fcitx-cloudpinyin/PKGBUILD +++ b/community/fcitx-cloudpinyin/PKGBUILD @@ -6,7 +6,7 @@ pkgname=fcitx-cloudpinyin pkgver=0.3.0 pkgrel=2 pkgdesc="Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/csslayer/fcitx-cloudpinyin" license=('GPL') depends=('curl' 'fcitx>=4.2.6') diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD index fa2fa3280..0f6946a8c 100644 --- a/community/fcitx-configtool/PKGBUILD +++ b/community/fcitx-configtool/PKGBUILD @@ -5,7 +5,7 @@ pkgname=fcitx-configtool pkgver=0.4.5.1 pkgrel=2 pkgdesc="GTK based config tool for Fcitx" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://fcitx.googlecode.com/" license=('GPL2') depends=("fcitx>=4.2.6" "gtk3" "iso-codes") diff --git a/community/fcitx-fbterm/PKGBUILD b/community/fcitx-fbterm/PKGBUILD new file mode 100644 index 000000000..67fa435c5 --- /dev/null +++ b/community/fcitx-fbterm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Author: CSSlayer <wengxt@gmail.com> +# Contributor: Yangtse <yangtsesu@gmail.com> + +pkgname=fcitx-fbterm +pkgver=0.2.0 +pkgrel=2 +pkgdesc="Fbterm support for Fcitx." +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/fcitx" +license=('GPL2') +depends=('fcitx>=4.1.0' 'fbterm') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +install=fcitx-fbterm.install + +build(){ + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package () +{ + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('a7eb80fde3e0d1cab27e230c912849da') diff --git a/community/fcitx-fbterm/fcitx-fbterm.install b/community/fcitx-fbterm/fcitx-fbterm.install new file mode 100644 index 000000000..cca516725 --- /dev/null +++ b/community/fcitx-fbterm/fcitx-fbterm.install @@ -0,0 +1,16 @@ +post_install() { + echo "$ sudo setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm" + echo "or" + echo "$ sudo chmod u+s /usr/bin/fbterm" + + echo "Do above once,Then launch fbterm with fcitx" + echo "$ fcitx-fbterm-helper -l" +} +post_upgrade() { + echo "$ sudo setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm" + echo "or" + echo "$ sudo chmod u+s /usr/bin/fbterm" + + echo "Do above once,Then launch fbterm with fcitx" + echo "$ fcitx-fbterm-helper -l" +} diff --git a/community/fcitx-googlepinyin/PKGBUILD b/community/fcitx-googlepinyin/PKGBUILD index 8e15d8c38..05e1f1783 100644 --- a/community/fcitx-googlepinyin/PKGBUILD +++ b/community/fcitx-googlepinyin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 80519 2012-11-23 12:06:38Z fyan $ +# $Id: PKGBUILD 81673 2012-12-26 11:44:06Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-googlepinyin pkgver=0.1.6 -pkgrel=2 +pkgrel=3 pkgdesc="Fcitx Wrapper for googlepinyin" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.0' 'libgooglepinyin>=0.1.2') makedepends=('cmake' 'intltool') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -install='fcitx-googlepinyin.install' +install=fcitx-googlepinyin.install md5sums=('7ee33bbb66d29536819b0d2f73b69713') build() { diff --git a/community/fcitx-googlepinyin/fcitx-googlepinyin.install b/community/fcitx-googlepinyin/fcitx-googlepinyin.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-googlepinyin/fcitx-googlepinyin.install +++ b/community/fcitx-googlepinyin/fcitx-googlepinyin.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD index 9cadde6a5..a89c72a12 100644 --- a/community/fcitx-hangul/PKGBUILD +++ b/community/fcitx-hangul/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81140 2012-12-12 01:20:35Z fyan $ +# $Id: PKGBUILD 81667 2012-12-26 11:35:33Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-hangul pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Hangul (Korean) support for fcitx" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL2') depends=('fcitx>=4.2.3' 'libhangul') @@ -31,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } - md5sums=('168b51487797879cf41ed6f6d086694a') diff --git a/community/fcitx-hangul/fcitx-hangul.install b/community/fcitx-hangul/fcitx-hangul.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-hangul/fcitx-hangul.install +++ b/community/fcitx-hangul/fcitx-hangul.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index cfa311719..7209e0699 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 80511 2012-11-23 11:30:00Z fyan $ +# $Id: PKGBUILD 81661 2012-12-26 06:37:02Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-libpinyin pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') depends=('fcitx>=4.2.0' 'libpinyin>=0.3.0') diff --git a/community/fcitx-libpinyin/fcitx-libpinyin.install b/community/fcitx-libpinyin/fcitx-libpinyin.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-libpinyin/fcitx-libpinyin.install +++ b/community/fcitx-libpinyin/fcitx-libpinyin.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD index e571815a7..863119aed 100644 --- a/community/fcitx-m17n/PKGBUILD +++ b/community/fcitx-m17n/PKGBUILD @@ -5,7 +5,7 @@ pkgname=fcitx-m17n pkgver=0.1.3 pkgrel=1 pkgdesc="Fcitx Wrapper for m17n." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.1' 'm17n-lib') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD new file mode 100644 index 000000000..36865e625 --- /dev/null +++ b/community/fcitx-mozc/PKGBUILD @@ -0,0 +1,100 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> + +## Mozc compile option +_bldtype=Release + +_zipcoderel=201211 +_protobuf_ver=2.4.1 + +_pkgbase=mozc +pkgname=fcitx-mozc +pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" +pkgver=1.6.1187.102 +_patchver=${pkgver}.2 +pkgrel=4 +groups=('mozc-im') +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/mozc/" +license=('custom') +depends=('qt' 'fcitx' 'zinnia') +makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2') +replaces=('mozc-fcitx') +conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') +source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip + http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip + http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 + http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch +) + +build() { + cd "$srcdir" + ln -sf `which python2` ./python + PATH="${srcdir}:${PATH}" + + cd "${srcdir}/${_pkgbase}-${pkgver}" + + rm unix/fcitx -rf + patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch + + # Generate zip code seed + msg "Generating zip code seed..." + python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt + msg "Done." + + # Copy protobuf to be linked statically + cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files + + msg "Starting make..." + + _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc" + _qmnames="qmake-qt4 qmake4 qmake" + + QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0 + python2 build_mozc.py build_tools -c $_bldtype + python2 build_mozc.py build -c $_bldtype $_targets + + # Extract license part of mozc + head -n 28 server/mozc_server.cc > LICENSE +} + +package() { + cd "${srcdir}/${_pkgbase}-${pkgver}" + install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server" + install -m 755 out_linux/${_bldtype}/mozc_tool "${pkgdir}/usr/lib/mozc/mozc_tool" + install -d "${pkgdir}/usr/lib/mozc/documents/" + install -m 644 data/installer/*.html "${pkgdir}/usr/lib/mozc/documents/" + + install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo + do + filename=`basename $mofile` + lang=${filename/.mo/} + install -D -m 644 "$mofile" "${pkgdir}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo" + done + + install -D -m 755 out_linux/${_bldtype}/fcitx-mozc.so "${pkgdir}/usr/lib/fcitx/fcitx-mozc.so" + install -D -m 644 unix/fcitx/fcitx-mozc.conf "${pkgdir}/usr/share/fcitx/addon/fcitx-mozc.conf" + install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf" + + install -d "${pkgdir}/usr/share/fcitx/mozc/icon" + install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png" + install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png" + install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png" + install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png" + install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png" + install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png" + install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png" + install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" + install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" + install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" +} + +md5sums=('e5246d17a81d2e942e9e8de0c3240c95' + 'e61df4b5754f3869ca504d269dc9641d' + '59c5f7e9c734b40197454318f228859f' + 'ed436802019c9e1f40cc750eaf78f318' + 'a70fa7d5cef505c14f61e739b0502444') diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD index 6d9cee68c..28648adfd 100644 --- a/community/fcitx-rime/PKGBUILD +++ b/community/fcitx-rime/PKGBUILD @@ -1,13 +1,13 @@ -# $Id$ +# $Id: PKGBUILD 81659 2012-12-26 06:28:38Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-rime pkgver=0.1.2 -pkgrel=2 +pkgrel=3 _rimever=0.9.3 pkgdesc="Fcitx Wrapper for librime" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.0' "librime>=$_rimever" "brise") diff --git a/community/fcitx-rime/fcitx-rime.install b/community/fcitx-rime/fcitx-rime.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-rime/fcitx-rime.install +++ b/community/fcitx-rime/fcitx-rime.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD index 25539e1ff..fb68f6422 100644 --- a/community/fcitx-sunpinyin/PKGBUILD +++ b/community/fcitx-sunpinyin/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 80506 2012-11-23 11:24:07Z fyan $ +# $Id: PKGBUILD 81910 2013-01-03 12:33:35Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-sunpinyin pkgver=0.3.9 -pkgrel=2 +pkgrel=4 pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') -install='fcitx-sunpinyin.install' -depends=('fcitx>=4.2.5' 'sunpinyin>2.0.3') +install=fcitx-sunpinyin.install +depends=('fcitx>=4.2.5' 'sunpinyin>2.0.3' 'sunpinyin-data' 'gtk-update-icon-cache') makedepends=('cmake' 'intltool') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") md5sums=('de221daa7b3790b22f5a95d7091d0e38') diff --git a/community/fcitx-sunpinyin/fcitx-sunpinyin.install b/community/fcitx-sunpinyin/fcitx-sunpinyin.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-sunpinyin/fcitx-sunpinyin.install +++ b/community/fcitx-sunpinyin/fcitx-sunpinyin.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx-ui-light/PKGBUILD b/community/fcitx-ui-light/PKGBUILD new file mode 100644 index 000000000..88a45c1a4 --- /dev/null +++ b/community/fcitx-ui-light/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 81498 2012-12-22 12:52:08Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Author: CSSlayer <wengxt@gmail.com> +# Contributor: Yangtse <yangtsesu@gmail.com> + +pkgname=fcitx-ui-light +pkgver=0.1.3 +pkgrel=2 +pkgdesc="Light weight xlib and xft based ui for fcitx." +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/fcitx" +license=('GPL2') +depends=('fcitx>=4.1.0' 'libxpm') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") + +build(){ + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package () +{ + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('633e8b018da9c8f09f99567b5479cf18') diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD index b2cd0abf7..3fad437e1 100644 --- a/community/fcitx-unikey/PKGBUILD +++ b/community/fcitx-unikey/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 80099 2012-11-16 03:00:26Z fyan $ +# $Id: PKGBUILD 81669 2012-12-26 11:38:22Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-unikey pkgver=0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Fcitx Wrapper for unikey" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.3') optdepends=('qt: To run the fcitx unikey macro editor') makedepends=('cmake' 'intltool' 'qt') -source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) -install='fcitx-unikey.install' +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +install=fcitx-unikey.install build(){ cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/fcitx-unikey/fcitx-unikey.install b/community/fcitx-unikey/fcitx-unikey.install index c0797237a..6b1b64bdd 100644 --- a/community/fcitx-unikey/fcitx-unikey.install +++ b/community/fcitx-unikey/fcitx-unikey.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 77f532c14..d21a0fe9c 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80275 2012-11-19 02:35:00Z fyan $ +# $Id: PKGBUILD 81502 2012-12-22 13:42:19Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> @@ -6,8 +6,9 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') pkgver=4.2.6.1 -pkgrel=3 -arch=('i686' 'x86_64') +pkgrel=4 +groups=('fcitx-im') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \ @@ -36,11 +37,31 @@ check() { } package_fcitx() { - pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system" + pkgdesc="Flexible Context-aware Input Tool with eXtension" depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ 'libxfixes' 'dbus-core' 'icu') - optdepends=('enchant: for word predication support') + optdepends=('enchant: for word predication support' + 'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method' + 'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese' + 'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' + 'fcitx-configtool: GTK based config tool for Fcitx' + 'fcitx-fbterm: Fbterm support for Fcitx' + 'fcitx-googlepinyin: A fork from google pinyin on android for Fcitx' + 'fcitx-gtk2: GTK2 IM Module for fcitx' + 'fcitx-gtk3: GTK3 IM Module for fcitx' + 'fcitx-hangul: Hangul (Korean) support for fcitx' + 'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin' + 'fcitx-m17n: Multilingual text processing library' + 'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)' + 'fcitx-qt: QT IM Module for fcitx' + 'fcitx-rime: Rime input method engine (Traditional Chinese)' + 'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun' + 'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5' + 'fcitx-table-other: Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables' + 'fcitx-ui-light: Light weight xlib and xft based ui for fcitx' + 'fcitx-unikey: Fcitx Wrapper for unikey' + 'kcm-fcitx: KDE Config Module for Fcitx') install=fcitx.install cd "${srcdir}"/build diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 0e6d688ad..0e6d688ad 100755..100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD diff --git a/community/fcron/fcron.rc b/community/fcron/fcron.rc index 880439a1d..880439a1d 100755..100644 --- a/community/fcron/fcron.rc +++ b/community/fcron/fcron.rc diff --git a/community/fcron/run-cron b/community/fcron/run-cron index 51007a15a..51007a15a 100755..100644 --- a/community/fcron/run-cron +++ b/community/fcron/run-cron diff --git a/community/fcron/systab b/community/fcron/systab Binary files differindex 11c7e2fd0..11c7e2fd0 100755..100644 --- a/community/fcron/systab +++ b/community/fcron/systab diff --git a/community/fmodex/PERMISSION b/community/fmodex/PERMISSION new file mode 100644 index 000000000..be7e15ff8 --- /dev/null +++ b/community/fmodex/PERMISSION @@ -0,0 +1,25 @@ +Hi Sven, +sounds ok to me. +regards, + +Brett Paterson | CEO +FMOD by Firelight Technologies Pty Ltd +Interactive Audio Middleware | www.fmod.org +PH: +61 3 96635947 Fax: +61 3 96635951 + + +-----Original Message----- +From: Sven-Hendrik Haase [mailto:sh@lutzhaase.com] +Sent: Thursday, 15 July 2010 9:51 AM +To: sales@fmod.org +Subject: Redistribution for Arch Linux + + Hello, + + I'm a packager for the Arch Linux project (http://www.archlinux.org) and + I would like to ask you for permission for redistributing FMOD in binary + form in our project. Arch Linux is a free operating system and is run + entirely by volunteers. There is no commercial context. + + Regards, + Sven-Hendrik Haase diff --git a/community/fmodex/PKGBUILD b/community/fmodex/PKGBUILD new file mode 100644 index 000000000..8bb9b7e2c --- /dev/null +++ b/community/fmodex/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 80347 2012-11-20 11:44:56Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +# Note: This packae is proprietary and distribution is limited. However, we +# have written permission to by the FMOD CEO to distribute this in binary form. +pkgname=fmodex +pkgver=4.44.01 +pkgrel=1 +pkgdesc="An advanced audio engine" +arch=('i686' 'x86_64') +url="http://www.fmod.org/" +license=('custom') +source=("http://www.fmod.org/index.php/release/version/fmodapi${pkgver//./}linux.tar.gz") +md5sums=('3f32d8e74ac5cc6e581f7c32c71f4d20') + +build() { + cd fmodapi${pkgver//./}linux + + mkdir -p ${pkgdir}/usr/lib + mkdir -p ${pkgdir}/usr/include/fmodex + + cp -d api/lib/* ${pkgdir}/usr/lib/ + [[ $CARCH == "i686" ]] && rm ${pkgdir}/usr/lib/*64* + + if [[ $CARCH == "x86_64" ]]; then + cd ${pkgdir}/usr/lib + ln -sf libfmodex64-${pkgver}.so libfmodex-${pkgver}.so + ln -sf libfmodexL64-${pkgver}.so libfmodexL-${pkgver}.so + cd ${srcdir}/fmodapi${pkgver//./}linux + fi + + cp api/inc/* ${pkgdir}/usr/include/fmodex/ + + install -Dm644 documentation/LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + mkdir -p ${pkgdir}/usr/share/doc/fmodex + cp -r documentation examples ${pkgdir}/usr/share/doc/fmodex +} + +# vim:set ts=2 sw=2 et: diff --git a/community/freeradius/radiusd b/community/freeradius/radiusd index bf872b6f2..bf872b6f2 100755..100644 --- a/community/freeradius/radiusd +++ b/community/freeradius/radiusd diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 74636c729..0104917e1 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74850 2012-08-07 11:38:18Z spupykin $ +# $Id: PKGBUILD 81895 2013-01-03 10:03:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp -pkgver=1.0.1 -pkgrel=8 +pkgver=1.0.2 +pkgrel=1 pkgdesc="Free RDP client" arch=('i686' 'x86_64' 'mips64el') url="http://freerdp.sourceforge.net" @@ -15,14 +15,11 @@ makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') -source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz - https://github.com/FreeRDP/FreeRDP/commit/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch) -md5sums=('c843185e0ff22ce8409954651718f338' - '194fd599d0f706ecce772d5187e08385') +source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz) +md5sums=('c260051a94caff590def5caa4fcf59d6') build() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - patch -Np1 <$srcdir/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch + cd $srcdir/FreeRDP-$pkgver cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -32,6 +29,6 @@ build() { } package() { - cd `find ${srcdir}/ -type d -name freerdp-\*` + cd $srcdir/FreeRDP-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD new file mode 100644 index 000000000..dd0d29b6b --- /dev/null +++ b/community/frogatto/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 78929 2012-10-27 23:44:28Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Tom Wambold <tom5760@gmail.com> + +pkgname='frogatto' +arch=('i686' 'x86_64') +pkgver=1.2 +pkgrel=7 +pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" +url="http://www.frogatto.com" +license=('GPL') +depends=('glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data') +makedepends=('mesa' 'boost') +source=("frogatto-$pkgver.tar.gz::https://github.com/frogatto/frogatto/tarball/$pkgver" + frogatto + frogatto.desktop) +md5sums=('b60924f384e04728eb6e76cdd48ab8f9' + '9ed2c9ea59e95fe3c0b3ad49e58f8890' + 'e31563b04748a39292a59aaad633ff58') + +build() { + cd "$srcdir/$pkgname-$pkgname"* + + sed -i 's/ccache //g' Makefile + sed -i 's/-lprofiler//g' Makefile + sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp + sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile + sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile + sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile + sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile + make game server +} + +package() { + cd "$srcdir/$pkgname-$pkgname"* + + install -D -m755 game $pkgdir/opt/frogatto/game + install -D -m755 server $pkgdir/opt/frogatto/server + + install -D -m644 src/LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE + + cd $srcdir + install -DT -m755 frogatto $pkgdir/usr/bin/frogatto + install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop +} + +# vim:set ts=2 sw=2 et: diff --git a/community/frogatto/frogatto b/community/frogatto/frogatto new file mode 100644 index 000000000..0d741e0de --- /dev/null +++ b/community/frogatto/frogatto @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/frogatto +exec /opt/frogatto/game $* diff --git a/community/frogatto/frogatto.desktop b/community/frogatto/frogatto.desktop new file mode 100644 index 000000000..b0795467a --- /dev/null +++ b/community/frogatto/frogatto.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Frogatto +GenericName=Old-school 2D platformer +Comment=Old-school 2D platformer +Exec=/usr/bin/frogatto +Terminal=false +MultipleArgs=false +Type=Application +Icon=/opt/frogatto/images/window-icon.png +Categories=Game;ArcadeGame diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index f61078339..813d5bf74 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78485 2012-10-19 15:50:56Z bpiotrowski $ +# $Id: PKGBUILD 81934 2013-01-03 21:00:53Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=galculator -pkgver=2.0 +pkgver=2.0.1 pkgrel=1 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) -md5sums=('2bec5c1cdab9c5421855f878f8018929') +md5sums=('c4436478adfef4f3a7d6c42ce8286d34') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 619d80c04..c151e3d18 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80351 2012-11-20 13:26:38Z lcarlier $ +# $Id: PKGBUILD 81800 2012-12-30 15:21:02Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba '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=1.1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -30,14 +30,19 @@ 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') 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 + ./reconf-all ./configure --prefix=/usr -C diff --git a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch new file mode 100644 index 000000000..61224b9b0 --- /dev/null +++ b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch @@ -0,0 +1,45 @@ +diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp gambas3-3.3.4/gb.jit/src/jit_codegen.cpp +--- gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp 2012-09-25 17:04:41.000000000 +0300 ++++ gambas3-3.3.4/gb.jit/src/jit_codegen.cpp 2012-12-25 03:55:54.000000000 +0200 +@@ -3614,7 +3614,7 @@ void TryExpression::codegen(){ + create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0)); + + llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); +- f->addFnAttr(llvm::Attribute::ReturnsTwice); ++ f->addFnAttr(llvm::Attributes::ReturnsTwice); + + llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); + +@@ -3665,7 +3665,7 @@ void LargeTryExpression::codegen(){ + create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0)); + + llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); +- f->addFnAttr(llvm::Attribute::ReturnsTwice); ++ f->addFnAttr(llvm::Attributes::ReturnsTwice); + + llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); + +diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp +--- gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp 2012-09-25 17:04:41.000000000 +0300 ++++ gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp 2012-12-25 03:38:36.000000000 +0200 +@@ -25,7 +25,7 @@ + + #include "llvm/Pass.h" + #include "llvm/Function.h" +-#include "llvm/Support/IRBuilder.h" ++#include "llvm/IRBuilder.h" + #include "llvm/Support/raw_ostream.h" + + #include "main.h" +diff -upr gambas3-3.3.4.orig/gb.jit/src/jit.h gambas3-3.3.4/gb.jit/src/jit.h +--- gambas3-3.3.4.orig/gb.jit/src/jit.h 2012-09-25 17:04:41.000000000 +0300 ++++ gambas3-3.3.4/gb.jit/src/jit.h 2012-12-25 03:38:23.000000000 +0200 +@@ -39,7 +39,7 @@ + #include "llvm/Support/TargetSelect.h" + #include "llvm/Support/ManagedStatic.h" + #include "llvm/Support/raw_ostream.h" +-#include "llvm/Support/IRBuilder.h" ++#include "llvm/IRBuilder.h" + #include "llvm/Support/DynamicLibrary.h" + #include "llvm/Support/CFG.h" + #include "llvm/PassManager.h" diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD index 2435ad7ca..d4289b1c8 100644 --- a/community/gdk-pixbuf/PKGBUILD +++ b/community/gdk-pixbuf/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gdk-pixbuf pkgver=0.22.0 -pkgrel=9 +pkgrel=9.1 pkgdesc="Image loading and manipulation library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 1c6f29bdb..35c7e297d 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81106 2012-12-12 00:47:32Z eric $ +# $Id: PKGBUILD 81735 2012-12-27 22:27:45Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.22 -pkgrel=4 +pkgrel=5 pkgdesc='Combined plugins release for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache') +depends=('geany=1.22' 'lua51' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') options=('!libtool') @@ -22,7 +22,8 @@ sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib --disable-geanylua + # the geanylua plugin currently doesn't work with lua 5.2, only 5.1 + ./configure --prefix=/usr --libexecdir=/usr/lib # --disable-geanylua make } diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install index bce670aff..c7a5da359 100644 --- a/community/geany-plugins/geany-plugins.install +++ b/community/geany-plugins/geany-plugins.install @@ -10,3 +10,5 @@ post_upgrade() { post_remove() { post_install } + +# vim:set ts=2 sw=2 et: diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index a35c6bf2b..b8491a756 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -1,36 +1,37 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 81849 2013-01-02 03:07:05Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac pkgver=1.6.2 -pkgrel=1 -pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.' +pkgrel=2 +pkgdesc="C++ library for symbolic calculations" arch=('i686' 'x86_64' 'mips64el') -url='http://www.ginac.de' +url='http://www.ginac.de/' license=('GPL') depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') -options=('!libtool') -source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9') +source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('c93913c4c543874b2ade4f0390030641be7e0c41') +install=${pkgname}.install build() { - cd ginac-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr + ./configure --prefix=/usr --disable-static make } check() { - cd ginac-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd ginac-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/ginac/ginac.install b/community/ginac/ginac.install new file mode 100644 index 000000000..3de7910d0 --- /dev/null +++ b/community/ginac/ginac.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(ginac.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD index ca0b404fb..928cb04b8 100644 --- a/community/glee/PKGBUILD +++ b/community/glee/PKGBUILD @@ -6,7 +6,7 @@ pkgname=glee pkgver=5.4 pkgrel=4 pkgdesc="Free cross-platform extension loading library for OpenGL." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://elf-stone.com/glee.php" license=('BSD') depends=('gcc-libs' 'libgl') @@ -17,7 +17,7 @@ md5sums=('0bd03db136dbc075488b6c6e83f326ae') build() { cd "$srcdir" - [ "$CARCH" = 'x86_64' ] && export CXXFLAGS="$CXXFLAGS -fPIC" + [ "$CARCH" != 'i686' ] && export CXXFLAGS="$CXXFLAGS -fPIC" ./configure --prefix=/usr make diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD index 6d108c6a6..08f90c370 100644 --- a/community/gloox/PKGBUILD +++ b/community/gloox/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gloox pkgver=1.0 -pkgrel=3 +pkgrel=3.1 pkgdesc="C++ libraries for development of Jabber client/component/server" arch=(i686 x86_64 'mips64el') url="http://camaya.net/gloox" diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index c8cadf107..5df0d8411 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79553 2012-11-07 10:36:11Z spupykin $ +# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('cf4c949c20033fe2b392f1b478ce2522') +md5sums=('2e48a1e92de99b14c936a270bb05309a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index bb716752f..913043f8a 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79549 2012-11-07 09:34:47Z spupykin $ +# $Id: PKGBUILD 81577 2012-12-24 15:00:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,12 @@ makedepends=('gettext' 'pkgconfig') backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') install=gnunet.install -source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz{,.sig} +source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz gnunet.rc gnunet.service gnunet.conf.d defaults.conf) -md5sums=('ad4fa34cea8a9e905f1353b68db179ea' +md5sums=('9f617b1d5955283e5487e30bd661d3b5' '5baf691913b007fb33e365239e3f7217' '54cce3d2415d95b2e5bd1bd88db3a0ea' 'f161b46915736e4017e77ad735521453' @@ -42,9 +42,3 @@ package() { rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } -md5sums=('ad4fa34cea8a9e905f1353b68db179ea' - '3db767d31239430cc22afb81596a4d5d' - '5baf691913b007fb33e365239e3f7217' - '54cce3d2415d95b2e5bd1bd88db3a0ea' - 'f161b46915736e4017e77ad735521453' - '0fe23b2ca5b3fc47a0b5645e04406da0') diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index 446334bb4..7c4689184 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gnustep-base pkgver=1.24.0 -pkgrel=3 +pkgrel=3.1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD index 6bbfa795b..c8b5c5d40 100644 --- a/community/gnustep-make/PKGBUILD +++ b/community/gnustep-make/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gnustep-make pkgver=2.6.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="The GNUstep make package" arch=('mips64el') url="http://www.gnustep.org/" diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index d06fce73b..81aee4a30 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,81 +1,83 @@ -#$Id: PKGBUILD 81231 2012-12-13 21:58:59Z arodseth $ +#$Id: PKGBUILD 81475 2012-12-21 17:01:26Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> + pkgname=golangide -pkgver=14.0 -pkgrel=2 -_hgrev=828 -pkgdesc='Simple IDE for Go to edit code and build projects' +pkgver=15 +pkgrel=1 +pkgdesc='IDE for editing and building projects written in the Go programming language' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'glib2') +depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit') makedepends=('gendesk') -if [ "$CARCH" == "x86_64" ]; then - source=("http://$pkgname.googlecode.com/files/liteidex${pkgver}.linux-amd64.hg${_hgrev}.tar.bz2" - 'golangide.png' - 'golangide.sh') - sha256sums=('8f166ae5b97c4484bfa47932a716e28c78547944db4f2d0e222d21694c510e5b' - '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - '79eaede6c031e87a94627fb126a0aefab1feb971995d648436f142b3d684f1b2') -else - source=("http://$pkgname.googlecode.com/files/liteidex${pkgver}.linux-386.hg${_hgrev}.tar.bz2" - 'golangide.png' - 'golangide.sh') - sha256sums=('3b2e565aecc141affc7d10d3aa3e2efe06866559091690b6fe13b9a664eb81c0' - '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - '79eaede6c031e87a94627fb126a0aefab1feb971995d648436f142b3d684f1b2') -fi options=('!strip') _name=('Golang IDE') -_genericname=('Integrated development environment') +source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" + 'golangide.png' + 'golangide.sh') +sha256sums=('23158d09d5d3c439a07d12532dc8cdbc963c65dde1739f2e19b611a7d2f8944e' + '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' + '9b1844a1e3a611760c2d2072b539cca0d2eed1584e1bf04a7fdd8d171e3cd775') build() { cd "$srcdir" + + msg2 'Generating .desktop file' gendesk -n - cd "liteide" - # Fixing insecure RPATH + msg2 'Compiling...' + cd "liteide-master/build" + chmod +x build_linux.sh webkit_linux.sh + QTDIR=/usr ./build_linux.sh + QTDIR=/usr ./webkit_linux.sh + + # Fixing insecure RPATH, need to test if this is still needed + msg2 'Fixing...' + cd "../liteidex" find . -name "*.so" -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; find . -name liteide -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; } package() { - cd "$srcdir/liteide" + cd "$srcdir/liteide-master/liteidex" - msg2 "Creating directories..." + msg2 'Creating directories...' mkdir -p "$pkgdir/usr/lib/liteide" mkdir -p "$pkgdir/usr/share/liteide" mkdir -p "$pkgdir/usr/share/doc/$pkgname" - msg2 "Packaging executables..." - for binary in goastview goapi goexec godocview liteide; do + msg2 'Packaging executables...' + for binary in goastview goapi goexec godocview liteidex; do install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" done install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - msg2 "Packaging resources..." - cp -r share/liteide/* "$pkgdir/usr/share/liteide" + msg2 'Packaging resources...' + cp -r deploy/* "$pkgdir/usr/share/liteide" + cp -r os_deploy/* "$pkgdir/usr/share/liteide" - msg2 "Packaging libraries and plugins..." - cp -r lib/liteide/* "$pkgdir/usr/lib/liteide" + msg2 'Packaging libraries and plugins...' + cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide" + cp -r liteide/bin/libliteapp.* "$pkgdir/usr/lib/" + chmod -x "$pkgdir/usr/lib/liteide/plugins/"* - msg2 "Packaging license and license exception..." + msg2 'Packaging license and license exception...' install -Dm644 LICENSE.LGPL \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE.LGPL" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 LGPL_EXCEPTION.TXT \ - "$pkgdir/usr/share/licenses/$pkgname/LGPL_EXCEPTION.TXT" + "$pkgdir/usr/share/licenses/$pkgname/LGPL_EXCEPTION" - cd .. + cd ../.. - msg2 "Packaging menu entry and icon..." + msg2 'Packaging menu entry and icon...' install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "$pkgname.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" - msg2 "Cleaning up..." + msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/$pkgname/doc" } diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh index 824126c45..70705e5f3 100644 --- a/community/golangide/golangide.sh +++ b/community/golangide/golangide.sh @@ -1,6 +1,7 @@ #!/bin/sh +# The libqjson issue has been reported upstream if [ ! -z $GOROOT -a -e $GOROOT ]; then - /usr/bin/liteide $@ + LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ else - GOROOT=/usr/lib/go /usr/bin/liteide $@ + GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ fi diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD index 4def76d2d..045129c22 100644 --- a/community/goocanvas1/PKGBUILD +++ b/community/goocanvas1/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56150 2011-10-02 11:40:26Z ibiru $ +# $Id: PKGBUILD 81872 2013-01-02 15:56:34Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=goocanvas1 pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A cairo canvas widget for GTK+" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GooCanvas" @@ -24,3 +24,8 @@ package() { cd $srcdir/goocanvas-$pkgver make DESTDIR=$pkgdir install } +check() { + cd $srcdir/goocanvas-$pkgver + make check + +} diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD index 5fd36fbb9..5fd36fbb9 100755..100644 --- a/community/goocanvasmm/PKGBUILD +++ b/community/goocanvasmm/PKGBUILD diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD index 0236d453a..312c95c5d 100644 --- a/community/gpsmanshp/PKGBUILD +++ b/community/gpsmanshp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67943 2012-03-16 11:12:57Z giovanni $ +# $Id: PKGBUILD 81604 2012-12-25 00:34:09Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gpsmanshp pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Tcl package to read and write shapefiles" arch=('i686' 'x86_64' 'mips64el') url="http://gpsmanshp.sourceforge.net/" @@ -24,8 +24,8 @@ build() { # set install path sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|${pkgdir}/usr/lib/gpsmanshp|g" Makefile sed -i -e "s|tclsh\$(TCLVERSION)|tclsh|g" Makefile - sed -i "s|package-8.3.tcl|/usr/lib/tcl8.5/package.tcl|g" Makefile - sed -i "s|8.4|8.5|g" Makefile + sed -i "s|package-8.3.tcl|/usr/lib/tcl8.6/package.tcl|g" Makefile + sed -i "s|8.4|8.6|g" Makefile make } diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD index fe63cb019..921304117 100644 --- a/community/gstreamermm/PKGBUILD +++ b/community/gstreamermm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 59618 2007-01-01 00:29:08Z jlichtblau $ +# $Id: PKGBUILD 81906 2013-01-03 11:48:18Z jelle $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=gstreamermm -pkgver=0.10.10 +pkgver=0.10.11 pkgrel=1 pkgdesc="C++ interface for GStreamer" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ depends=('glibmm' 'gstreamer0.10-base>=0.10.25' 'libsigc++2.0' 'libxml++') makedepends=('doxygen' 'pkgconfig') options=('!libtool') changelog=$pkgname.changelog -source=(http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.10/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f8c31a7d3035d0dada60d27bdd01da04265439364f4469a981ee50d65218d638') +source=(http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.10/${pkgname}-${pkgver}.tar.xz) +sha256sums=('12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6') build() { cd ${srcdir}/${pkgname}-${pkgver} - + patch -Np1 -i ${srcdir}/gstreamermm-0.10.10-glib.patch ./configure --prefix=/usr make } @@ -27,3 +27,10 @@ package() { make DESTDIR=${pkgdir} install } + +check() { + cd ${srcdir}/${pkgname}-${pkgver} +# Make check won't work, since it checks mic input/capture which don't exists on pkgbuild.com +# make check + +} diff --git a/community/gstreamermm/gstreamermm-0.10.10-glib.patch b/community/gstreamermm/gstreamermm-0.10.10-glib.patch new file mode 100644 index 000000000..f21dea635 --- /dev/null +++ b/community/gstreamermm/gstreamermm-0.10.10-glib.patch @@ -0,0 +1,12 @@ +--- gstreamermm-0.10.10.orig/gstreamer/gstreamermm/wrap.cc 2010-02-11 16:32:18.000000000 -0500 ++++ gstreamermm-0.10.10/gstreamer/gstreamermm/wrap.cc 2013-01-05 18:43:27.815010415 -0500 +@@ -20,8 +20,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <glib/gtypes.h> +-#include <glib/gmacros.h> ++#include <glib.h> + + #include <vector> + #include <gstreamermm/miniobject.h> diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD index efc2ab416..c77f111ed 100644 --- a/community/gtest/PKGBUILD +++ b/community/gtest/PKGBUILD @@ -8,7 +8,7 @@ pkgname=gtest pkgver=1.6.0 pkgrel=7 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/googletest/" license=('custom:BSD3') options=('!libtool') diff --git a/community/gtkhotkey/PKGBUILD b/community/gtkhotkey/PKGBUILD new file mode 100644 index 000000000..62f8d5f78 --- /dev/null +++ b/community/gtkhotkey/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 81675 2012-12-26 12:18:55Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: kiefer <jorgelmadrid@gmail.com> +# Contributor: Alessio Sergi <asergi at archlinux dot us> +# Contributor: Gaute Hope <eg@gaute.vetsj.com> +# Contributor: Marcos Heredia <chelqo@gmail.com> + +pkgname=gtkhotkey +pkgver=0.2.1 +pkgrel=8 +pkgdesc="Platform independent hotkey handling for Gtk+ applications" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/gtkhotkey" +license=('LGPL3') +depends=('gtk2') +makedepends=('intltool') +options=('!libtool') +source=("http://launchpad.net/$pkgname/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz") +md5sums=('bfdc73e68e9adbe0d506d31a25862914') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # doc path fix + sed -i '/gtkhotkeydocdir/s/\${prefix}/\${datadir}/g' Makefile.{am,in} + + # glib2 fix + sed -i 's|glib/gquark\.h|glib.h|' src/gtk-hotkey-error.h + sed -i 's|glib/gtypes\.h|glib.h|' src/x11/tomboykeybinder.h + + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD index 020dae4da..772cdf873 100644 --- a/community/gtksourceviewmm/PKGBUILD +++ b/community/gtksourceviewmm/PKGBUILD @@ -1,15 +1,16 @@ -#$Id: PKGBUILD 56144 2011-10-02 10:45:47Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> +#$Id: PKGBUILD 82071 2013-01-07 09:40:20Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceviewmm pkgver=3.2.0 -pkgrel=1 -pkgdesc="provides C++ bindings for gtksourceview library" -arch=(i686 x86_64 mips64el) -url="http://gnome.org" +pkgrel=2 +pkgdesc='C++ bindings for the gtksourceview library' +arch=('x86_64' 'i686' 'mips64el') +url='http://projects.gnome.org/gtksourceviewmm/' license=('LGPL2.1') depends=('gtkmm3' 'gtksourceview3') -options=(!libtool) +options=('!libtool') source=("http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz") sha256sums=('9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66') diff --git a/community/guake/guake.install b/community/guake/guake.install index 8084333b1..8084333b1 100755..100644 --- a/community/guake/guake.install +++ b/community/guake/guake.install diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD new file mode 100644 index 000000000..cae37825b --- /dev/null +++ b/community/guvcview/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 81531 2012-12-23 08:58:59Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> + +pkgname=guvcview +pkgver=1.6.1 +pkgrel=2 +pkgdesc="A video viewer and capturer for the linux uvc driver" +arch=('i686' 'x86_64' 'mips64el') +url="http://guvcview.sourceforge.net/" +license=('GPL') +depends=('portaudio' 'ffmpeg' 'gtk3') +makedepends=('pkg-config' 'intltool') +optdepends=('pulseaudio: for PulseAudio support') +options=('!docs') +source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") +md5sums=('b3dfd04d8aae0c807d5f5d6ba035580f') + +build() { + cd "${srcdir}/${pkgname}-src-${pkgver}" + + ./configure --prefix=/usr \ + --disable-debian-menu + make +} + +package() { + cd "${srcdir}/${pkgname}-src-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/handbrake/PKGBUILD b/community/handbrake/PKGBUILD new file mode 100644 index 000000000..b70180a97 --- /dev/null +++ b/community/handbrake/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sebastien Piccand <sebcactus gmail com> + +pkgname=('handbrake' 'handbrake-cli') +pkgver=0.9.8 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://handbrake.fr/" +license=('GPL') +makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify' + 'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi') +source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2) +sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798') + +build() { + cd "$srcdir/HandBrake-$pkgver" + + # Use Python 2 + sed -i 's/python /python2 /' gtk/src/Makefile.am + + ./configure --prefix=/usr --force --disable-gtk-update-checks + cd build + make +} + +package_handbrake() { + pkgdesc="Multithreaded video transcoder" + depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib' + 'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') + install=$pkgname.install + + cd "$srcdir/HandBrake-$pkgver/build" + + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/bin/HandBrakeCLI" +} + +package_handbrake-cli() { + pkgdesc="Multithreaded video transcoder (CLI)" + depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi') + + cd "$srcdir/HandBrake-$pkgver/build" + install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/handbrake/handbrake.install b/community/handbrake/handbrake.install new file mode 100644 index 000000000..87c29e4db --- /dev/null +++ b/community/handbrake/handbrake.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/hardinfo/PKGBUILD b/community/hardinfo/PKGBUILD new file mode 100644 index 000000000..432b9bda3 --- /dev/null +++ b/community/hardinfo/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 70023 2012-04-28 09:24:14Z allan $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=hardinfo +pkgver=0.5.1 +pkgrel=5 +pkgdesc="A system information and benchmark tool." +arch=('i686' 'x86_64') +url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" +license=('GPL2') +depends=('gtk2' 'libsoup') +options=('!emptydirs') +source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \ + fixsensors.patch hardinfo.distro) +sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' + 'd2151dce76dca238102937d0e15541f172bca530' + '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../fixsensors.patch + sed -i 's|/usr/lib64|/usr/lib|' configure + ./configure --prefix=/usr + sed -i 's|lib64|lib|' binreloc.c + sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "arch" },{ DB_PREFIX "debian_version", "deb" },|' computer.h + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" +} diff --git a/community/hardinfo/fixsensors.patch b/community/hardinfo/fixsensors.patch new file mode 100644 index 000000000..812c29458 --- /dev/null +++ b/community/hardinfo/fixsensors.patch @@ -0,0 +1,13 @@ + diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c +--- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200 ++++ hardinfo-0.4.2.2/util.c 2007-07-26 10:15:32.000000000 +0200 +@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo + if (source) { + retn = g_strconcat(source, buffer, NULL); + g_free(buffer); +- g_free(source); ++ if(strlen(source)) ++ g_free(source); + } else { + retn = buffer; + } diff --git a/community/hardinfo/hardinfo.distro b/community/hardinfo/hardinfo.distro new file mode 100644 index 000000000..850183eeb --- /dev/null +++ b/community/hardinfo/hardinfo.distro @@ -0,0 +1 @@ +Arch Linux diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD index a77ea64ff..431c03627 100644 --- a/community/hashcash/PKGBUILD +++ b/community/hashcash/PKGBUILD @@ -15,10 +15,10 @@ md5sums=('31fae207061841dffc7b90ee18e3d0fa') build() { cd ${srcdir}/${pkgname}-${pkgver} - if [ "${CARCH}" = "x86_64" ]; then - make generic-openssl - else + if [ "${CARCH}" = "i686" ]; then make x86-openssl + else + make generic-openssl fi install -Dm755 hashcash ${pkgdir}/usr/bin/hashcash install -Dm755 sha1 ${pkgdir}/usr/bin/sha1 diff --git a/community/hevea/PKGBUILD b/community/hevea/PKGBUILD index d988b2cec..f8bcefdb9 100644 --- a/community/hevea/PKGBUILD +++ b/community/hevea/PKGBUILD @@ -18,6 +18,7 @@ md5sums=('5cf0070c7cf5c7c020a657c513eaa0b5') build() { cd $srcdir/$pkgname-$pkgver sed -i 's:usr/local:usr:' Makefile + [ "$CARCH" = "mips64el" ] && (sed -i 's:TARGET=opt:TARGET=byte:' Makefile) make } diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 497291cc2..77b142f7a 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81109 2012-12-12 00:47:35Z eric $ +# $Id: PKGBUILD 81704 2012-12-27 07:55:09Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) pkgver=3.12 -pkgrel=2 +pkgrel=3 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ build() { package_highlight() { pkgdesc="Fast and flexible source code highlighter (CLI version)" - depends=('lua') + depends=('lua51') cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/hostapd/hostapd b/community/hostapd/hostapd index b4709d7bf..b4709d7bf 100755..100644 --- a/community/hostapd/hostapd +++ b/community/hostapd/hostapd diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index ccba4b0c7..318020e6a 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81166 2012-12-12 17:43:14Z ttoepper $ +# $Id: PKGBUILD 81566 2012-12-24 12:23:53Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=4.4 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -48,6 +48,17 @@ package() { ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 install -Dm644 man/i3-nagbar.1 \ ${pkgdir}/usr/share/man/man1/i3-nagbar.1 + install -Dm644 man/i3-dmenu-desktop.1 \ + ${pkgdir}/usr/share/man/man1/i3-dmenu-desktop.1 + install -Dm644 man/i3-dump-log.1 \ + ${pkgdir}/usr/share/man/man1/i3-dump-log.1 + install -Dm644 man/i3-sensible-editor.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-editor.1 + install -Dm644 man/i3-sensible-pager.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-pager.1 + install -Dm644 man/i3-sensible-terminal.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-terminal.1 + install -Dm644 LICENSE \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index ef42954e5..b7fd947a8 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 79278 2012-11-02 10:15:38Z bpiotrowski $ +# $Id: PKGBUILD 81882 2013-01-03 03:41:12Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.4.99.20121006 +pkgver=1.5.0 pkgrel=1 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url='http://ibus.googlecode.com' -depends=('ibus' 'anthy' 'python2' 'pygtk') +depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache') makedepends=('swig' 'intltool') options=('!libtool') +install=$pkgname.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('518aa503ce40054e0027f2a79c9df640') build() { cd $srcdir/$pkgname-$pkgver @@ -32,3 +33,5 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } + +md5sums=('4ff000bec3c342f5cd5a6d9e05a4abdf') diff --git a/community/ibus-anthy/ibus-anthy.install b/community/ibus-anthy/ibus-anthy.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/community/ibus-anthy/ibus-anthy.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 389aa38f8..9c57068b0 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 79159 2012-10-31 05:32:23Z ebelanger $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 81828 2013-01-01 03:38:39Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák <hvizdakr at gmail dot com> pkgname=ibus-hangul pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://ibus.googlecode.com' license=('GPL') -depends=('ibus' 'libhangul') +depends=('ibus' 'libhangul' 'iso-codes' 'pygtk' 'gtk-update-icon-cache') makedepends=('intltool') install=ibus-hangul.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('659899cf942a983fbd2ffbb4bd4f5ecd883f5c0a') build() { diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index c71e18106..e08eacb28 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81110 2012-12-12 00:47:35Z eric $ +# $Id: PKGBUILD 81402 2012-12-19 16:41:48Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.maRS<leemars at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-pinyin -pkgver=1.4.99.20120808 +pkgver=1.5.0 pkgrel=2 pkgdesc='Pinyin (Chinese) input method for the IBus framework' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,6 @@ url='http://ibus.googlecode.com' depends=('ibus' 'pyzy' 'lua51') makedepends=('intltool') source=("https://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('aa298212d9f63acab48cf9f6370c94cdc6920c2a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,3 +33,4 @@ package() { make NO_INDEX=true DESTDIR="${pkgdir}" install } +md5sums=('f7728b5b785fae58e2b4de8dfda45612') diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index 7507f1ec7..73a1a7f7b 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -7,7 +7,7 @@ pkgname=ibus-rime pkgver=0.9.4 pkgrel=2 pkgdesc="Rime input method engine for ibus" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rimeime/" license=('GPL3') depends=('ibus' 'libnotify' 'librime>=0.9.3' 'brise') diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD index d15c4ae9c..b2943696f 100644 --- a/community/ibus-sunpinyin/PKGBUILD +++ b/community/ibus-sunpinyin/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 79729 2012-11-11 16:11:46Z fyan $ +# $Id: PKGBUILD 81918 2013-01-03 13:12:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-sunpinyin -pkgver=2.0.3.20121107 -_commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b -pkgrel=2 +pkgver=2.0.3.20130103 +_commit=baf4da89ac04c3eb6ea3b8fb1a10f13bf23f3d87 +pkgrel=1 pkgdesc="IBus Wrapper for sunpinyin." arch=('i686' 'x86_64' 'mips64el') url="http://sunpinyin.googlecode.com" license=('LGPL') -depends=('sunpinyin>2.0.3' 'ibus') +depends=('sunpinyin>2.0.3' 'sunpinyin-data' 'ibus') makedepends=('git' 'scons') __gitroot=git://github.com/sunpinyin/sunpinyin.git diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index a165a0676..8cc8f2ceb 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 81111 2012-12-12 00:47:36Z eric $ +# $Id: PKGBUILD 81383 2012-12-19 12:10:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 -pkgdesc="instead quest interpreter" +pkgdesc="a quest interpreter" arch=('i686' 'x86_64' 'mips64el') url="http://instead.googlecode.com/" license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz) -md5sums=('a26dd0b2785787639dd1bbfed66af77a') +md5sums=('1f20344594e9a360d335203e4305f7a8') build() { cd "${srcdir}/instead-${pkgver}" @@ -23,4 +23,6 @@ build() { package() { cd "${srcdir}/instead-${pkgver}" make DESTDIR="${pkgdir}" PREFIX=/usr install + + cp -a doc/*.{html,txt,pdf} doc/examples $pkgdir/usr/share/doc/instead/ } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 2c42ff610..01afab866 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80913 2012-12-06 17:28:21Z stativ $ +# $Id: PKGBUILD 81483 2012-12-22 10:23:17Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.0 -_pkgver=123.72 +pkgver=12.0.1 +_pkgver=123.94 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('d684a654b38285504fdc8a923d604d89') +md5sums=('0641de81781cfb2f122df3b327a902fb') build() { cd "$srcdir" diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index e727d5644..bf47cf2b2 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78385 2012-10-17 16:23:33Z spupykin $ +# $Id: PKGBUILD 82168 2013-01-10 09:22:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=5 +pkgrel=6 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" @@ -21,7 +21,7 @@ md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' '90d0810267cbd847383ae3101699b192' '1632fce55ba5592dea1f8bf661106e7d' - 'bc05a2b85e41bf89dac809657e857730') + '5bf7478590c751b465617681a31619fe') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/ipsec-tools/ipsec.rc b/community/ipsec-tools/ipsec.rc index cff472c59..cff472c59 100755..100644 --- a/community/ipsec-tools/ipsec.rc +++ b/community/ipsec-tools/ipsec.rc diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service index 63db40b22..3a6dea38b 100644 --- a/community/ipsec-tools/ipsec.service +++ b/community/ipsec-tools/ipsec.service @@ -3,7 +3,8 @@ Description=Load IPSec Security Policy Database After=syslog.target network.target [Service] -Type=simple +Type=oneshot +RemainAfterExit=true ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc index 1a67dcac5..1a67dcac5 100755..100644 --- a/community/ipsec-tools/racoon.rc +++ b/community/ipsec-tools/racoon.rc diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index d3e1155a9..26d285379 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -14,9 +14,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'celt' +makedepends=('python2' 'libffado' 'celt' 'libsamplerate' 'dbus-core') -[ "$CARCH" != "mips64el" ] && makedepends+=('libffado') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' '40-hpet-permissions.rules') diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index e7c33a05f..ecf2f92a5 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -39,6 +39,9 @@ build() { sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=x86-64 -DJOHN_SYSTEMWIDE=1|' Makefile sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile sed -i -e 's|-m486||g' Makefile + elif [ "$CARCH" == "mips64el" ]; then + sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=loongson2f -DJOHN_SYSTEMWIDE=1|' Makefile + #sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile else sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=i686 -DJOHN_SYSTEMWIDE=1|' Makefile fi sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile @@ -51,6 +54,8 @@ build() { # build john if [ "$CARCH" == "x86_64" ]; then make linux-x86-64 + elif [ "$CARCH" == "mips64el" ]; then + make generic else make linux-x86-mmx fi } diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD index d0cd583ab..d0cd583ab 100755..100644 --- a/community/kcheckers/PKGBUILD +++ b/community/kcheckers/PKGBUILD diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD index be4430d4e..85d839665 100644 --- a/community/kcm-fcitx/PKGBUILD +++ b/community/kcm-fcitx/PKGBUILD @@ -6,7 +6,7 @@ pkgname=kcm-fcitx pkgver=0.4.1 pkgrel=2 pkgdesc="KDE Config Module for Fcitx" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/kcm-fcitx" license=('GPL') depends=('fcitx>=4.2.6' 'kdebase-runtime') diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD index e28e6d131..aff471889 100644 --- a/community/keybinder2/PKGBUILD +++ b/community/keybinder2/PKGBUILD @@ -5,7 +5,7 @@ _offname=keybinder pkgver=0.3.0 pkgrel=1 pkgdesc='Library for registering global keyboard shortcuts' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://kaizer.se/wiki/keybinder/' license=('GPL') makedepends=('pygtk') diff --git a/community/krusader/PKGBUILD b/community/krusader/PKGBUILD new file mode 100644 index 000000000..0443763d4 --- /dev/null +++ b/community/krusader/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> + +pkgname=krusader +pkgver=2.4.0beta3 +_pkgver=2.4.0-beta3 +pkgrel=2 +pkgdesc="An alternative file manager for KDE resembling Midnight Commander" +arch=('i686' 'x86_64') +url="http://krusader.sourceforge.net/" +license=('GPL') +depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-katepart') +makedepends=('cmake' 'automoc4' 'kdeutils-ark') +optdepends=('kdebase-keditbookmarks: to edit bookmarks' + 'kdeutils-ark: extract archive with right-click' + 'kdebase-konsole: open an embedded terminal') +install=$pkgname.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") +md5sums=('62a02db3f213bb76805ca6c958e9e263') + +build() { + cd "$srcdir/$pkgname-$_pkgver" + + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/krusader/krusader.install b/community/krusader/krusader.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community/krusader/krusader.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index 147671737..2c532795a 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -12,12 +12,18 @@ license=("GPL") depends=('kdelibs' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4') install=kvpnc.install -source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2) -md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7') +source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2 + kvpnc-0.9.6a-scriptsec.patch + kvpnc-0.9.6a-gcc47.patch) +md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7' + 'a0ee8caabf56732b8481a426e02f881b' + '9725f5a005dca1e3d1cba86a8e52360a') build() { export LDFLAGS=-lX11 - + cd $srcdir/$pkgname-$pkgver-kde4 + patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-scriptsec.patch + patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-gcc47.patch cd $srcdir mkdir build cd build diff --git a/community/kvpnc/kvpnc-0.9.6a-gcc47.patch b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch new file mode 100644 index 000000000..db59b5baa --- /dev/null +++ b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch @@ -0,0 +1,11 @@ +diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp +--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp 2012-06-25 22:16:25.395420711 +0200 ++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp 2012-06-25 22:17:41.598424971 +0200 +@@ -75,6 +75,7 @@ + #include <cstdlib> + #include <ctime> + #include <iomanip> ++#include <unistd.h> + + #include "ui_mainviewbase4.h" + #include "ciscocertificateenrollment.h" diff --git a/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch new file mode 100644 index 000000000..4e8b4d6d9 --- /dev/null +++ b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch @@ -0,0 +1,15 @@ +diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp +--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp 2010-03-08 11:26:33.000000000 +0100 ++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp 2012-06-25 22:12:51.454408816 +0200 +@@ -6030,7 +6030,10 @@ + } + + +- if (GlobalConfig->OpenvpnNeedSecurityParameter || (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")|| ( OpenvpnMajor == 2 && OpenvpnMinor == 1 ) || (OpenvpnMajor > 2 && OpenvpnMinor >= 2)) { ++ if (GlobalConfig->OpenvpnNeedSecurityParameter || ++ (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")|| ++ (OpenvpnMajor == 2 && OpenvpnMinor >= 1 ) || ++ (OpenvpnMajor > 2)) { + if (GlobalConfig->KvpncDebugLevel > 3) + GlobalConfig->appendLogEntry(i18n("OpenVPN >= 2.1-rc9 detected, adding script security parameter to config."), KVpncEnum::info); + diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 7418a0219..4db3ef56e 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 81323 2012-12-17 23:11:03Z svenstaro $ +# $Id: PKGBUILD 81801 2012-12-30 15:21:03Z foutrelis $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20121218 +pkgver=20121225 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -10,8 +10,8 @@ license=('BSD') depends=('llvm' 'libconfig') makedepends=('git' 'cmake') backup=('etc/ldc2.conf') -source=() -md5sums=() +source=(fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch) +md5sums=('0dacd8e4b8f88030c107dbb2a35bcc42') _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc @@ -37,7 +37,10 @@ build() { rm -rf "$srcdir/$_gitname-build" git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build" cd "$srcdir/$_gitname-build" - + + # llvm/Support/IRBuilder.h was relocated in LLVM 3.2 + patch -Np1 -i "$srcdir/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch" + mkdir build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -49,7 +52,7 @@ build() { package() { cd "$srcdir/$_gitname-build" - + cd build make DESTDIR=$pkgdir install cd .. diff --git a/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch b/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch new file mode 100644 index 000000000..f5977e4a4 --- /dev/null +++ b/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch @@ -0,0 +1,25 @@ +From 984207e348fe9ef1444cbec897cb8c429859a9c0 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Tue, 25 Dec 2012 04:55:30 +0200 +Subject: [PATCH] Fix llvm/IRBuilder.h include when using LLVM 3.2 + +--- + gen/passes/GarbageCollect2Stack.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp +index f20bdd4..9927615 100644 +--- a/gen/passes/GarbageCollect2Stack.cpp ++++ b/gen/passes/GarbageCollect2Stack.cpp +@@ -27,7 +27,7 @@ + #include "llvm/Intrinsics.h" + #include "llvm/Support/CallSite.h" + #include "llvm/Support/CommandLine.h" +-#if LDC_LLVM_VER >= 303 ++#if LDC_LLVM_VER >= 302 + #include "llvm/IRBuilder.h" + #else + #include "llvm/Support/IRBuilder.h" +-- +1.8.0.2 + diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD new file mode 100644 index 000000000..093562a04 --- /dev/null +++ b/community/lgi/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 81847 2013-01-02 00:52:50Z seblu $ +# Maintainer: speps <speps at aur dot archlinux dot org> +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> + +pkgbase=lgi +pkgname=(lua-lgi) +pkgver=0.6.2 +pkgrel=1 +pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library' +arch=(i686 x86_64 mips64el) +url='https://github.com/pavouk/lgi' +license=('custom:MIT') +depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection') +replaces=('lgi') +conflicts=('lgi') +source=("https://github.com/downloads/pavouk/lgi/$pkgbase-$pkgver.tar.gz") +md5sums=('9ae2c0740e9ea536b6b6afacea5bd21b') + +build() { + cd $pkgbase-$pkgver + make +} + +package_lua-lgi() { + cd $pkgbase-$pkgver + make \ + LUA_LIBDIR=/usr/lib/lua/5.2 \ + LUA_SHAREDIR=/usr/share/lua/5.2 \ + DESTDIR="$pkgdir/" install + + # dump typelib tool + install -Dm755 tools/dump-typelib.lua \ + "$pkgdir/usr/bin/dump-typelib" + + # docs + install -d "$pkgdir/usr/share/doc/$pkgname" + install -Dm644 docs/* \ + "$pkgdir/usr/share/doc/$pkgname" + + # samples + install -d "$pkgdir/usr/share/$pkgname/samples/gtk-demo" + install -Dm644 samples/*.lua \ + "$pkgdir/usr/share/$pkgname/samples" + install -Dm644 samples/gtk-demo/* \ + "$pkgdir/usr/share/$pkgname/samples/gtk-demo" + + # license + install -Dm644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index 5ff11d482..23340fed6 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79487 2012-11-06 04:11:07Z bgyorgy $ +# $Id: PKGBUILD 81730 2012-12-27 21:37:34Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -14,22 +14,13 @@ options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz fix-docdir.patch make-tests-optional.patch) -sha1sums=('a2bd07082e9e9235103051f6574b154182745aee' +sha1sums=('d5c9683a6d48b977fc85523575f00b9e9cd3daa0' '94291a58dbbd36f524538adbf6d0c5a55024a34c' '35732dc134c32af6ad1684d6388bad8ffe3f4dcc') build() { cd "$srcdir/$pkgname-$pkgver" - # Use the standard docdir location - # http://code.google.com/p/accounts-sso/issues/detail?id=123 - patch -Np1 -i "$srcdir/fix-docdir.patch" - - # Build tests optionally - # http://code.google.com/p/accounts-sso/issues/detail?id=124 - patch -Np1 -i "$srcdir/make-tests-optional.patch" - - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static \ PYTHON=python2 diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD index 3a98fcec1..a65adf1f7 100644 --- a/community/libev/PKGBUILD +++ b/community/libev/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libev pkgver=4.11 -pkgrel=1 +pkgrel=1.1 pkgdesc="A full-featured and high-performance event loop" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/libev.html" diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 969cb6ecb..969cb6ecb 100755..100644 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index b973bbccb..e44c6fb7c 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 74838 2012-08-06 23:09:09Z andrea $ +# $Id: PKGBUILD 81868 2013-01-02 15:41:00Z jelle $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 -pkgver=0.4.1 -pkgrel=3 +pkgver=0.5.0 +pkgrel=1 pkgdesc="GObject-based wrapper around the Exiv2 library." arch=('i686' 'x86_64' 'mips64el') url="http://redmine.yorba.org/projects/gexiv2" license=('GPL2') depends=('exiv2' 'glib2') options=('!libtool') -source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') +source=("http://yorba.org/download/gexiv2/0.5/$pkgname-$pkgver.tar.xz") +md5sums=('655528168648fd681a061bddaabc79ee') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libgoom2/PKGBUILD b/community/libgoom2/PKGBUILD index f53df6f20..c7725410f 100644 --- a/community/libgoom2/PKGBUILD +++ b/community/libgoom2/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libgoom2 pkgver=2k4 -pkgrel=2 +pkgrel=2.1 pkgdesc="Shared library part of the Goom visualization plugin" arch=('i686' 'x86_64' 'mips64el') url="http://www.fovea.cc/?page=details_produits&id=goom" diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 9dc92493a..c7cce110c 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80762 2012-12-03 10:11:15Z spupykin $ +# $Id: PKGBUILD 81709 2012-12-27 13:15:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.23 -pkgrel=2 +pkgver=0.9.24 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('efd038d93836adc0149beaa1c2927f61') +md5sums=('2891c82cc85a92e6944cacf9ae413f7c') build() { cd ${pkgname}-${pkgver} diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD index d87125886..bb8819802 100644 --- a/community/libmirage/PKGBUILD +++ b/community/libmirage/PKGBUILD @@ -1,27 +1,36 @@ -# $Id: PKGBUILD 66729 2012-02-27 20:41:55Z heftig $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 81967 2013-01-05 03:16:01Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=libmirage -pkgver=1.5.0 +pkgver=2.0.0 pkgrel=1 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('glib2' 'libsndfile' 'zlib') -makedepends=('bison' 'flex' 'gtk-doc') -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2) +license=(GPL) +depends=(glib2 libsndfile zlib bzip2 shared-mime-info) +makedepends=(bison flex gtk-doc cmake gobject-introspection) options=(!libtool) -md5sums=('b60d9baa754efee6e0f6a584ec033fff') +install=libmirage.install +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2 + soname.diff) +md5sums=('72007f3364cbf3aea782aaa1fdade238' + '72b5af3d5baf8e9b1ec6afa629373799') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static + cd $pkgname-$pkgver + patch -Np2 -i ../soname.diff # Produce correct symlinks + mkdir build; cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver/build + make DESTDIR="$pkgdir" install } diff --git a/community/libmirage/libmirage.install b/community/libmirage/libmirage.install new file mode 100644 index 000000000..78659c470 --- /dev/null +++ b/community/libmirage/libmirage.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/libmirage/soname.diff b/community/libmirage/soname.diff new file mode 100644 index 000000000..213f788ef --- /dev/null +++ b/community/libmirage/soname.diff @@ -0,0 +1,10 @@ +--- a/libmirage/CMakeLists.txt ++++ b/libmirage/CMakeLists.txt +@@ -112,7 +112,8 @@ + COMPILE_DEFINITIONS "${mirage_DEFS}" + LINK_FLAGS ${mirage_LDFLAGS_STR} + LIBRARY_OUTPUT_NAME mirage +- SOVERSION ${MIRAGE_SOVERSION} ++ VERSION ${MIRAGE_SOVERSION} ++ SOVERSION ${MIRAGE_LT_CURRENT} + ) diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD index b0493cd1f..8dc497fb9 100644 --- a/community/libnewt/PKGBUILD +++ b/community/libnewt/PKGBUILD @@ -1,35 +1,39 @@ +# $Id: PKGBUILD 81605 2012-12-25 00:34:10Z foutrelis $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libnewt pkgver=0.52.12 -pkgrel=4 +_tclver=8.6 +pkgrel=5 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang" arch=('i686' 'x86_64' 'mips64el') -url="http://www.redhat.com" +url='http://www.redhat.com/' license=('GPL') depends=('slang' 'popt' 'gpm') -makedepends=('tcl' 'python2') +makedepends=("tcl>=$_tclver" 'python2') optdepends=('tcl: whiptcl support' \ 'python2: libnewt api through _snack module') options=('!makeflags') -source=(https://fedorahosted.org/releases/n/e/newt/newt-${pkgver}.tar.gz) -md5sums=('51b04128d9e1bf000fa769c417b74486') +source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz") +sha256sums=('2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529') build() { - cd ${srcdir}/newt-${pkgver} - - sed -i "s:tcl8.4:tcl8.5:" Makefile.in - sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:" *.py - sed -i "s:/usr/bin/install:/bin/install:" po/Makefile - - ./configure --prefix=/usr --with-gpm-support - make + cd "$srcdir/newt-$pkgver" + + sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in + sed -i 's:bin/python:bin/python2:' *.py + ./configure --prefix=/usr --with-gpm-support + echo '#define USE_INTERP_RESULT 1' >> config.h + make } package() { - cd ${srcdir}/newt-${pkgver} - - make prefix=${pkgdir}/usr install + cd "$srcdir/newt-$pkgver" + + make prefix="$pkgdir/usr" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index b40eac3cf..233f2bdf3 100644 --- a/community/libopenraw/PKGBUILD +++ b/community/libopenraw/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: <boromil@gmail.com> pkgname=libopenraw pkgver=0.0.9 -pkgrel=2 +pkgrel=2.1 pkgdesc="Library for decoding RAW files" arch=('i686' 'x86_64' 'mips64el') url="http://libopenraw.freedesktop.org/" diff --git a/community/libquicktime/PKGBUILD b/community/libquicktime/PKGBUILD new file mode 100644 index 000000000..3003dbd3a --- /dev/null +++ b/community/libquicktime/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 80154 2012-11-16 23:35:56Z ioni $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=libquicktime +pkgver=1.2.4 +pkgrel=3 +pkgdesc="A library for reading and writing quicktime files" +arch=('i686' 'x86_64') +license=('GPL') +url="http://libquicktime.sourceforge.net/" +depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'faad2' 'faac') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-gpl \ + --with-ffmpeg \ + --with-x264 \ + --without-doxygen + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + diff --git a/community/librcd/PKGBUILD b/community/librcd/PKGBUILD index 61d787d4e..4c28958e6 100644 --- a/community/librcd/PKGBUILD +++ b/community/librcd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=librcd pkgver=0.1.11 -pkgrel=3 +pkgrel=3.1 pkgdesc="Charset Detection Library" arch=(i686 x86_64 'mips64el') url="http://rusxmms.sourceforge.net/" diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..0419da5e8 --- /dev/null +++ b/community/libtxc_dxtn/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=3 +arch=(i686 x86_64 mips64el) +pkgdesc="Texture compression library for Mesa" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(mesa) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index 3100b34fb..3100b34fb 100755..100644 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d index 193bffa9c..193bffa9c 100755..100644 --- a/community/libvirt/libvirtd.rc.d +++ b/community/libvirt/libvirtd.rc.d diff --git a/community/libxkbcommon/PKGBUILD b/community/libxkbcommon/PKGBUILD new file mode 100644 index 000000000..e65cefa7d --- /dev/null +++ b/community/libxkbcommon/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Mladen Pejakovic <pejakm@gmail.com> + +pkgname=libxkbcommon +pkgver=0.2.0 +pkgrel=3 +pkgdesc="Keyboard handling library using XKB data" +arch=(i686 x86_64) +url="http://xkbcommon.org/" +license=('custom') +depends=(glibc) +makedepends=(doxygen xorg-util-macros) +source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2") +md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a') +options=('!libtool') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 1fcea5c41..774a8ebc1 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -30,7 +30,7 @@ build() { rm -rf python/out/ - PYTHON=/usr/bin/python2 ./configure --prefix=/usr + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-documentation make } diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD index 3f821cb23..9f749da53 100644 --- a/community/lorcon/PKGBUILD +++ b/community/lorcon/PKGBUILD @@ -10,7 +10,7 @@ pkgrel=2 pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" url='http://802.11ninja.net/' license=('GPL') -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') depends=('libpcap') makedepends=('subversion') replaces=('lorcon-old-svn') diff --git a/community/lout/lout.install b/community/lout/lout.install index f05b4b601..f05b4b601 100755..100644 --- a/community/lout/lout.install +++ b/community/lout/lout.install diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD index 06647f867..74b724175 100644 --- a/community/luabitop/PKGBUILD +++ b/community/luabitop/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 81112 2012-12-12 00:47:37Z eric $ +# $Id: PKGBUILD 81388 2012-12-19 13:22:34Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Lucas Hermann Negri <kkndrox@gmail.com> pkgbase=luabitop pkgname=(lua-bitop lua51-bitop) pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='C extension adding bitwise operations on numbers' arch=(i686 x86_64 mips64el) url='http://bitop.luajit.org/index.html' makedepends=('lua' 'lua51') -conflicts=('luabitop') -replaces=('luabitop') source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz") md5sums=('d0c1080fe0c844e8477279668e2d0d06') license=('MIT') @@ -36,6 +34,8 @@ package_lua-bitop() { package_lua51-bitop() { depends=('lua51') + conflicts=('luabitop') + replaces=('luabitop') cd LuaBitOp51-$pkgver install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.1/bit.so" install -dm 755 "$pkgdir/usr/share/licenses/$pkgname" diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD index 3dbe1304d..8492a8b80 100644 --- a/community/luaexpat/PKGBUILD +++ b/community/luaexpat/PKGBUILD @@ -1,18 +1,16 @@ -# $Id: PKGBUILD 81199 2012-12-13 02:04:44Z seblu $ +# $Id: PKGBUILD 81392 2012-12-19 13:28:13Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Lucas Hermann Negri <kkndrox@gmail.com> pkgbase=luaexpat pkgname=(lua-expat lua51-expat) pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc='SAX XML parser based on the Expat library' arch=('i686' 'x86_64' 'mips64el') url='http://matthewwild.co.uk/projects/luaexpat/' license=('MIT') makedepends=('gcc' 'lua' 'lua51' 'expat') -replaces=(luaexpat) -conflicts=(luaexpat) source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" 'config.51' 'config.52' @@ -39,6 +37,7 @@ build() { package_lua-expat() { depends=('lua' 'expat') + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install mv usr "$pkgdir" @@ -47,6 +46,9 @@ package_lua-expat() { package_lua51-expat() { depends=('lua51' 'expat') + replaces=('luaexpat') + conflicts=('luaexpat') + cd $pkgbase-$pkgver-51 make DESTDIR="$pkgdir" install mv usr "$pkgdir" diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index 8ace811c0..07bad5022 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81115 2012-12-12 00:47:40Z eric $ +# $Id: PKGBUILD 81391 2012-12-19 13:27:48Z seblu $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> @@ -6,13 +6,11 @@ pkgbase=luafilesystem pkgname=(lua-filesystem lua51-filesystem) pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luafilesystem/' license=('MIT') -replaces=(luafilesystem) -conflicts=(luafilesystem) makedepends=(lua lua51) source=(http://github.com/downloads/keplerproject/$pkgbase/$pkgbase-$pkgver.tar.gz LICENSE) @@ -39,6 +37,8 @@ package_lua-filesystem() { package_lua51-filesystem() { depends=('lua51') + conflicts=('luafilesystem') + replaces=('luafilesystem') cd $pkgbase-$pkgver-51 make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index fce0bdcff..c25ee30e0 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81118 2012-12-12 00:49:30Z eric $ +# $Id: PKGBUILD 81399 2012-12-19 13:39:36Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> @@ -7,14 +7,12 @@ pkgbase=luaposix pkgname=('lua-posix' 'lua51-posix') pkgver=5.1.23 -pkgrel=1 +pkgrel=2 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64' 'mips64el') url='http://luaforge.net/projects/luaposix/' license=('GPL' 'LGPL') makedepends=('lua' 'lua51' 'lua51-bitop') -conflicts=('luaposix') -replaces=('luaposix') options=('!libtool') source=("https://github.com/downloads/$pkgbase/$pkgbase/$pkgbase-$pkgver.tar.gz") md5sums=('ebe7d335741ca736e003a6844a0fbf92') @@ -49,6 +47,8 @@ package_lua-posix() { package_lua51-posix() { depends=('lua51' 'lua51-bitop') + conflicts=('luaposix') + replaces=('luaposix') cd $pkgbase-$pkgver/build_51 make DESTDIR="$pkgdir/" install diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index f8c3089bc..f3276cc50 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81272 2012-12-15 14:51:01Z seblu $ +# $Id: PKGBUILD 81569 2012-12-24 14:48:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> @@ -11,9 +11,8 @@ pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' arch=('i686' 'x86_64' 'mips64el') url='http://luasec.luaforge.net/' license=('MIT') -makedepends=('openssl' 'lua' 'lua51' 'lua51-socket') -conflicts=('luasec') -replaces=('luasec') +#makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') +makedepends=('openssl' 'lua51' 'lua51-socket') source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz") md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12') @@ -38,6 +37,8 @@ build() { package_lua51-sec() { depends=('openssl' 'lua51' 'lua51-socket') + conflicts=('luasec') + replaces=('luasec') install -dm755 "$pkgdir/usr/lib/lua/5.1" cd luasec-$pkgver-51 diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD index eabd1833e..a52f2da10 100644 --- a/community/luasql/PKGBUILD +++ b/community/luasql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81122 2012-12-12 00:49:33Z eric $ +# $Id: PKGBUILD 81397 2012-12-19 13:39:14Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> @@ -6,11 +6,10 @@ pkgbase=luasql pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite') pkgver=2.2.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luasql/' license=('MIT') -conflicts=('luasql-mysql') makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite') source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz" 'lua52.patch') @@ -32,6 +31,7 @@ build() { package_lua-sql-mysql() { pkgdesc='MySQL module for Lua' depends=('lua' 'libmysqlclient') + conflicts=('luasql-mysql') replaces=('luasql-mysql') cd $pkgbase-$pkgver diff --git a/community/lxrandr/PKGBUILD b/community/lxrandr/PKGBUILD index e3cbc06ad..06ef73b84 100644 --- a/community/lxrandr/PKGBUILD +++ b/community/lxrandr/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 64887 2012-02-18 19:34:23Z bpiotrowski $ +# $Id: PKGBUILD 82107 2013-01-08 18:48:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxrandr pkgver=0.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Monitor configuration tool (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2' 'xorg-server-utils') +depends=('gtk2' 'xorg-xrandr') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('8a7391581541bba58839ac11dbf5b575') diff --git a/community/mac/PKGBUILD b/community/mac/PKGBUILD new file mode 100644 index 000000000..3e9bef667 --- /dev/null +++ b/community/mac/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: stonecrest <stonecrest[at]gmail[dot]com> + +pkgname=mac +pkgver='3.99u4b5' +_pkgver='3.99-u4-b5-s7' +pkgrel=5 +pkgdesc='APE codec and decompressor' +arch=('i686' 'x86_64') +url='http://etree.org/shnutils/shntool/' +license=('custom') +depends=('gcc-libs') +makedepends=('yasm') +_baseurl='http://etree.org/shnutils/shntool/support/formats/ape/unix' +source=("${_baseurl}/${_pkgver}/${pkgname}-${_pkgver}.tar.gz") +md5sums=('74df3c96476636387ddd12255b03bebe') + +build() { + cd "${srcdir}"/${pkgname}-${_pkgver} + + ./configure --prefix=/usr --enable-assembly=yes + make +} +package() { + cd "${srcdir}"/${pkgname}-${_pkgver} + + make DESTDIR="${pkgdir}" install + install -Dm644 src/License.htm \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.htm +} diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD index 22f3a5697..2a6cc72c7 100644 --- a/community/madman/PKGBUILD +++ b/community/madman/PKGBUILD @@ -8,7 +8,7 @@ pkgname=madman pkgver=0.94beta1.20060611 pkgrel=3 pkgdesc="I-tunes like music player" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://madman.sourceforge.net/" license=('GPL') depends=('qt3' 'xmms' 'gtk' 'taglib') diff --git a/community/madman/fake-g++.sh b/community/madman/fake-g++.sh index af424f5ca..af424f5ca 100755..100644 --- a/community/madman/fake-g++.sh +++ b/community/madman/fake-g++.sh diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 7707de2df..7707de2df 100755..100644 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init index ba9fe90b2..ba9fe90b2 100755..100644 --- a/community/mediaproxy/mediaproxy.init +++ b/community/mediaproxy/mediaproxy.init diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 147dd70eb..147dd70eb 100755..100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD index 7923acf6b..d3e5bd500 100644 --- a/community/metamail/PKGBUILD +++ b/community/metamail/PKGBUILD @@ -5,7 +5,7 @@ pkgname=metamail pkgver=2.7 -pkgrel=6 +pkgrel=6.1 pkgdesc="Used to display and process MIME messages" arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/stable/mail/metamail" diff --git a/community/mfs/mfscgiserv b/community/mfs/mfscgiserv index 2f176d239..2f176d239 100755..100644 --- a/community/mfs/mfscgiserv +++ b/community/mfs/mfscgiserv diff --git a/community/mfs/mfschunkserver b/community/mfs/mfschunkserver index 606d00f48..606d00f48 100755..100644 --- a/community/mfs/mfschunkserver +++ b/community/mfs/mfschunkserver diff --git a/community/mfs/mfsmaster b/community/mfs/mfsmaster index b0cfd8299..b0cfd8299 100755..100644 --- a/community/mfs/mfsmaster +++ b/community/mfs/mfsmaster diff --git a/community/mfs/mfsmetalogger b/community/mfs/mfsmetalogger index a870cc5a7..a870cc5a7 100755..100644 --- a/community/mfs/mfsmetalogger +++ b/community/mfs/mfsmetalogger diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD index 9cffc5ea9..ec36251a7 100644 --- a/community/ming/PKGBUILD +++ b/community/ming/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ming pkgver=0.4.4 pkgrel=1 pkgdesc="SWF output library" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.libming.net/" license=('GPL' 'LGPL') depends=('freetype2' 'libpng' 'flex') diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc index dd5910544..dd5910544 100755..100644 --- a/community/minidlna/minidlna.rc +++ b/community/minidlna/minidlna.rc diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 215b5012f..6d7c2ce1c 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc pkgver=1.6 -pkgrel=2 +pkgrel=2.1 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" diff --git a/community/mod_wsgi/PKGBUILD b/community/mod_wsgi/PKGBUILD index 22c403936..fd45657dc 100644 --- a/community/mod_wsgi/PKGBUILD +++ b/community/mod_wsgi/PKGBUILD @@ -7,7 +7,7 @@ pkgname=mod_wsgi pkgver=3.4 pkgrel=2 pkgdesc='Python WSGI adapter module for Apache' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.modwsgi.org/' license=('APACHE') depends=('apache' 'python') diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD index b408192d8..07d26f45f 100644 --- a/community/mod_wsgi2/PKGBUILD +++ b/community/mod_wsgi2/PKGBUILD @@ -7,7 +7,7 @@ pkgname=mod_wsgi2 pkgver=3.4 pkgrel=2 pkgdesc='Python2 WSGI adapter module for Apache' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.modwsgi.org/' license=('APACHE') depends=('apache' 'python2') diff --git a/community/mongodb/mongodb.install b/community/mongodb/mongodb.install index 2ea94553c..2ea94553c 100755..100644 --- a/community/mongodb/mongodb.install +++ b/community/mongodb/mongodb.install diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc index 30f2bbf79..30f2bbf79 100755..100644 --- a/community/mongodb/mongodb.rc +++ b/community/mongodb/mongodb.rc diff --git a/community/motion/rc.motion b/community/motion/rc.motion index 5b4c65500..5b4c65500 100755..100644 --- a/community/motion/rc.motion +++ b/community/motion/rc.motion diff --git a/community/mp3info/PKGBUILD b/community/mp3info/PKGBUILD index b12d249ca..2a929de11 100644 --- a/community/mp3info/PKGBUILD +++ b/community/mp3info/PKGBUILD @@ -17,7 +17,7 @@ build() { cd ${srcdir}/$pkgname-$pkgver sed -i "s:-O2:${CFLAGS}:" Makefile - sed -i "s:/usr/bin/install:/bin/install:" Makefile + #sed -i "s:/usr/bin/install:/bin/install:" Makefile make diff --git a/community/mpck/PKGBUILD b/community/mpck/PKGBUILD new file mode 100644 index 000000000..a1b381592 --- /dev/null +++ b/community/mpck/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 81980 2013-01-05 08:44:35Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=mpck +pkgver=0.19 +pkgrel=2 +license=('GPL') +pkgdesc="Reads MP3 files and tries to determine if they are correct" +arch=('i686' 'x86_64') +url="http://checkmate.gissen.nl/" +depends=('glibc') +source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz") +md5sums=('f72114b0982a101b68ddeb65f99b84f7') + +build() { + cd "${srcdir}/checkmate-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/checkmate-${pkgver}" + + make prefix="${pkgdir}/usr" install +} diff --git a/community/mplayer-vaapi/PKGBUILD b/community/mplayer-vaapi/PKGBUILD new file mode 100644 index 000000000..ddc3302cb --- /dev/null +++ b/community/mplayer-vaapi/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 80155 2012-11-16 23:35:57Z ioni $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=mplayer-vaapi +pkgver=35107 +pkgrel=3 +pkgdesc="A movie player, compiled with vaapi support" +arch=('i686' 'x86_64') +url="http://gitorious.org/vaapi/mplayer" +license=('GPL') +depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' + 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' + 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' + 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' + 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' + 'libbluray' 'libva' 'libass' 'desktop-file-utils') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') +provides=("mplayer=$pkgver") +conflicts=('mplayer') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz + tweak-desktop-file.patch) +options=('!buildflags' '!emptydirs') +install=mplayer-vaapi.install +sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') + +build() { + cd "$srcdir/mplayer-vaapi-$pkgver" + + patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" + + ./configure \ + --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-cdparanoia \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --enable-xvmc \ + --enable-radio \ + --enable-radio-capture \ + --disable-vdpau \ + --enable-vaapi \ + --language=all \ + --confdir=/etc/mplayer + + [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak + + make +} + +package() { + cd "$srcdir/mplayer-vaapi-$pkgver" + + make DESTDIR="$pkgdir" install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" + install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop" + install -d "$pkgdir/usr/share/mplayer/" + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" + rm -rf "$pkgdir/usr/share/mplayer/font" + install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/mplayer-vaapi.install b/community/mplayer-vaapi/mplayer-vaapi.install new file mode 100644 index 000000000..a44f19aef --- /dev/null +++ b/community/mplayer-vaapi/mplayer-vaapi.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} +post_upgrade() { + post_install +} +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/tweak-desktop-file.patch b/community/mplayer-vaapi/tweak-desktop-file.patch new file mode 100644 index 000000000..606e356b0 --- /dev/null +++ b/community/mplayer-vaapi/tweak-desktop-file.patch @@ -0,0 +1,14 @@ +--- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300 ++++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300 +@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques + Comment[it]=Riproduce filmati e musica + Comment[ja]=動画や音声のファイルを再生します + Icon=mplayer +-TryExec=gmplayer +-Exec=gmplayer %F ++TryExec=mplayer ++Exec=mplayer -really-quiet %F + Terminal=false ++NoDisplay=true + Categories=GTK;AudioVideo;Audio;Video;Player;TV; + MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; diff --git a/community/mrtg/PKGBUILD b/community/mrtg/PKGBUILD new file mode 100644 index 000000000..ac3238d72 --- /dev/null +++ b/community/mrtg/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 81983 2013-01-05 08:47:24Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=mrtg +pkgver=2.17.4 +pkgrel=1 +pkgdesc="Multi Router Traffic Grapher." +arch=('i686' 'x86_64') +url="http://oss.oetiker.ch/mrtg/" +license=('GPL') +depends=('gd' 'perl') +source=("http://oss.oetiker.ch/mrtg/pub/${pkgname}-${pkgver}.tar.gz") +md5sums=('197565e97f97212eef7b414463c8d40c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed 's|LD_RUN_PATH=$(LD_RUN_PATH) ||g' -i Makefile.in + ./configure --prefix=/usr + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix=${pkgdir}/usr install +} diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index ff3cf3c67..fb733c493 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80194 2012-11-17 14:32:27Z bpiotrowski $ +# $Id: PKGBUILD 81789 2012-12-30 08:24:14Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,7 +6,7 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=11 +pkgrel=12 pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64' 'mips64el') url="http://christophe.varoqui.free.fr/" @@ -14,7 +14,7 @@ license=('GPL') depends=('bash' 'libaio' 'device-mapper') backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install -options=(!emptydirs !strip) +options=(!emptydirs) source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 rc.d service multipath.conf multipath.conf.annotated fix-build.patch buffer-overflows.patch log_enquery_overflow.patch @@ -45,11 +45,15 @@ build() { } package() { - make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install + make LIB='usr/lib' \ + DESTDIR="$pkgdir" \ + bindir='/usr/bin' \ + libudevdir='/usr/lib/udev' install + install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service - find $pkgdir -type f -exec sed 's/sbin/bin/g' -i {} \; + sed -i 's/sbin/bin/g' "$pkgdir"/usr/lib/udev/rules.d/*.rules } diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD index 9a19820bf..28090b541 100644 --- a/community/multitail/PKGBUILD +++ b/community/multitail/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 75717 2012-08-29 11:07:06Z bisson $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 81978 2013-01-05 08:30:36Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.9 +pkgver=5.2.11 pkgrel=1 pkgdesc="Lets you view one or multiple files like the original tail program" arch=('i686' 'x86_64') @@ -12,17 +13,17 @@ url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=('etc/multitail.conf') source=("${url}/${pkgname}-${pkgver}.tgz") -md5sums=('871cb6a9a0d4f599b9cbd9f603da4c51') +md5sums=('2dc525c718ed99265ad3f6e09e6d2e4a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m 755 multitail ${pkgdir}/usr/bin/multitail - install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 - install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf + cd "$srcdir/$pkgname-$pkgver" + install -D -m 755 multitail "$pkgdir/usr/bin/multitail" + install -D -m 644 multitail.1 "$pkgdir/usr/share/man/man1/multitail.1" + install -D -m 644 multitail.conf "$pkgdir/etc/multitail.conf" } # vim: ts=2 sw=2 et ft=sh diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD new file mode 100644 index 000000000..c7835c0f0 --- /dev/null +++ b/community/mupen64plus/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 78487 2012-10-19 16:17:59Z jelle $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Zephyr + +pkgname=mupen64plus +pkgver=1.99.5 +pkgrel=3 +pkgdesc='Nintendo64 Emulator' +arch=('i686' 'x86_64') +url='http://code.google.com/p/mupen64plus/' +license=('GPL') +depends=('glu' 'libgl' 'libsamplerate' 'libpng' 'sdl' 'freetype2') +makedepends=('mesa') +source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz") +md5sums=('93772a6d6fc6a63353462deae8a6db71') + +build() { + cd mupen64plus-bundle-src-${pkgver} + + sh m64p_build.sh +} + +package() { + cd mupen64plus-bundle-src-$pkgver + + # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid + ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true' +} + +# vim: ts=2:sw=2:et diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index aa13363d6..d2e827884 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73303 2012-07-06 03:27:30Z svenstaro $ +# $Id: PKGBUILD 81777 2012-12-29 07:18:42Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=8 +pkgrel=9 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64' 'mips64el') url="http://mumble.sourceforge.net" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index ecd116a82..562ec4171 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,7 +1,5 @@ post_install() { - # bug: dbus reload here doesn't work - # workaround: it seems to work if you do it a few seconds later, manually - /etc/rc.d/dbus reload > /dev/null + systemd-tmpfiles --create usr/lib/tmpfiles.d/murmur.conf getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null @@ -9,23 +7,13 @@ post_install() { chown -R murmur:murmur /var/lib/murmur chown -R murmur:murmur /var/log/murmur - echo - echo '==> Set the SuperUser password with (as root):' - echo '==> murmurd -ini /etc/murmur.ini -supw PASSWORD' -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -f /var/run/daemons/murmur ] && /etc/rc.d/murmur stop > /dev/null - killall -u murmur -5 - sleep 1 + echo "You might have to reload dbus before launching murmur:" + echo " systemctl reload bus" + echo "Don't forget to set the superuser password:" + echo " murmurd -ini /etc/murmur.ini -supw <your-password>" } post_remove() { - /etc/rc.d/dbus reload > /dev/null getent passwd murmur > /dev/null && userdel murmur 1>/dev/null getent group murmur > /dev/null && groupdel murmur 1>/dev/null } diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index 17925b8a5..40218b43d 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 63672 2012-02-05 12:05:19Z ibiru $ +# $Id: PKGBUILD 81897 2013-01-03 10:04:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint -pkgver=1.0.0 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://mypaint.intilinux.com/" license=('GPL' 'LGPL') -depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') +depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2' 'json-c' 'lcms2') makedepends=('scons>=0.97' 'swig>=1.3.39') install=mypaint.install source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('dcd43933746a4579e7994f506e097823') +md5sums=('7846a8406259d0fc81c9a2157a2348bf') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD index 82dedc3a9..18e5e9b5f 100755..100644 --- a/community/nbtscan/PKGBUILD +++ b/community/nbtscan/PKGBUILD @@ -17,7 +17,7 @@ md5sums=('85bb085077c380b82a6ff73e0de0c154' build() { cd $srcdir/$pkgname-${pkgver}a - ./configure --prefix=/usr + ./configure --prefix=/usr --build=$CHOST make # Copy the binary diff --git a/community/ndiswrapper/PKGBUILD b/community/ndiswrapper/PKGBUILD new file mode 100644 index 000000000..873b2ab9b --- /dev/null +++ b/community/ndiswrapper/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 79177 2012-10-31 07:25:04Z tpowa $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +_extramodules=extramodules-3.6-ARCH +pkgname=ndiswrapper +pkgver=1.57 +pkgrel=26 +pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors." +license=('GPL') +arch=('i686' 'x86_64') +url="http://ndiswrapper.sourceforge.net" +install=ndiswrapper.install +depends=('linux>=3.6' 'linux<3.7' 'wireless_tools' 'perl') +makedepends=('linux-headers') +provides=("$pkgname-utils" "$pkgname-bin") +replaces=("$pkgname-utils" "$pkgname-bin") +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "linux33.patch") +options=('!strip') +md5sums=('7a401dc540938bf07893c67f418b6152' + '061e59a934ca3ae4be55a86d86b2c1f5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + _kver="$(cat /usr/lib/modules/${_extramodules}/version)" + + # modinfo path fix + sed -i "/modinfo/s/s/usr\//" driver/Makefile + patch -i "$srcdir/linux33.patch" -N -p0 + + # make sure we point to the right build directory + sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f /usr/lib/modules/$_kver/build)," driver/Makefile + + make KVERS=$_kver +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + _kver="$(cat /usr/lib/modules/${_extramodules}/version)" + + make INST_DIR="usr/lib/modules/$_extramodules" \ + KVERS=$_kver DESTDIR="$pkgdir/" install + + gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/ndiswrapper/linux33.patch b/community/ndiswrapper/linux33.patch new file mode 100644 index 000000000..3998c8450 --- /dev/null +++ b/community/ndiswrapper/linux33.patch @@ -0,0 +1,50 @@ +--- driver/ndis.c 2011-12-31 21:30:16.000000000 +0100 ++++ driver/ndis.c.new 2012-04-08 11:14:16.746614153 +0200 +@@ -2654,9 +2654,15 @@ + (ULONG *idle, ULONG *kernel_user, ULONG *index) + { + int cpu = smp_processor_id(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE]; ++ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] + ++ kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; ++#else + *idle = kstat_cpu(cpu).cpustat.idle; + *kernel_user = kstat_cpu(cpu).cpustat.system + + kstat_cpu(cpu).cpustat.user; ++#endif + *index = cpu; + } + +--- driver/wrapndis.c 2011-12-31 21:30:16.000000000 +0100 ++++ driver/wrapndis.c.new 2012-04-08 11:13:00.574116936 +0200 +@@ -1684,6 +1684,7 @@ + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) + static u32 ndis_get_rx_csum(struct net_device *dev) + { + struct ndis_device *wnd = netdev_priv(dev); +@@ -1735,18 +1736,21 @@ + else + return -EOPNOTSUPP; + } ++#endif + + static struct ethtool_ops ndis_ethtool_ops = { + .get_drvinfo = ndis_get_drvinfo, + .get_link = ndis_get_link, + .get_wol = ndis_get_wol, + .set_wol = ndis_set_wol, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) + .get_tx_csum = ndis_get_tx_csum, + .get_rx_csum = ndis_get_rx_csum, + .set_tx_csum = ndis_set_tx_csum, + .set_rx_csum = ndis_set_rx_csum, + .get_sg = ndis_get_sg, + .set_sg = ndis_set_sg, ++#endif + }; + + static int notifier_event(struct notifier_block *notifier, unsigned long event, diff --git a/community/ndiswrapper/ndiswrapper.install b/community/ndiswrapper/ndiswrapper.install new file mode 100644 index 000000000..ef505811a --- /dev/null +++ b/community/ndiswrapper/ndiswrapper.install @@ -0,0 +1,17 @@ +post_install() +{ + post_upgrade +} + +post_upgrade() +{ + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() +{ + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index 2c029f51f..dfe40f45f 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/neatx/" license=('GPL') depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') -makedepends=('docutils') +makedepends=('python2-docutils') optdepends=('xorg-xdm: if you want to use KDE or GNOME session' 'xorg-fonts-misc: to use default font' 'xterm: if you want console session') diff --git a/community/nemesis/PKGBUILD b/community/nemesis/PKGBUILD index 064ed2db9..87f022f58 100644 --- a/community/nemesis/PKGBUILD +++ b/community/nemesis/PKGBUILD @@ -35,7 +35,7 @@ build() { patch -Np1 <$srcdir/nemesis-proto_tcp.c.diff [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man \ --with-libnet-includes=$srcdir/libnet/include \ - --with-libnet-libraries=$srcdir/libnet/lib + --with-libnet-libraries=$srcdir/libnet/lib --build=$CHOST make make DESTDIR=$pkgdir install install -D -m0644 LICENSE $pkgdir/usr/share/licenses/nemesis/LICENSE diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 641b13b5f..41af771dc 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -6,7 +6,7 @@ pkgname=nemiver pkgver=0.9.3 pkgrel=2 pkgdesc="C/C++ debugger for GNOME" -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/nemiver/" depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index b0fee1ae2..beddbb3d3 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://0ldsk00l.ca/nestopia.html' license=('GPL') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=('sdl' 'alsa-lib' 'gtk3' 'glu') makedepends=('unzip' 'mesa') source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" diff --git a/community/netperf/PKGBUILD b/community/netperf/PKGBUILD new file mode 100644 index 000000000..9ff232229 --- /dev/null +++ b/community/netperf/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 73456 2012-07-08 00:07:29Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> + +pkgname=netperf +pkgver=2.6.0 +pkgrel=1 +pkgdesc='Benchmarking tool for many different types of networking' +url='http://www.netperf.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('glibc' 'libsmbios' 'lksctp-tools') +install=$pkgname.install +source=( + "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" + "$pkgname.rc" + "$pkgname.conf" + "$pkgname.service") +md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236' + '4f11bf24fcd7a44c17bbe27cdc7dae01' + '14836578ba49bbfa9e928feeca8346f1' + '9a8b47101fb2b0bf8fb9bbfb73ba6486') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --enable-demo \ + --enable-unixdomain \ + --enable-dccp \ + --enable-sctp + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # install license + install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + # install initscripts & systemd files + install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + install -D -m 644 ../$pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/netperf/netperf.conf b/community/netperf/netperf.conf new file mode 100644 index 000000000..b8e36c203 --- /dev/null +++ b/community/netperf/netperf.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +#DAEMON_OPTS='-d' diff --git a/community/netperf/netperf.install b/community/netperf/netperf.install new file mode 100644 index 000000000..fcb9ba6ae --- /dev/null +++ b/community/netperf/netperf.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(netperf.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in "${filelist[@]}"; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in "${filelist[@]}"; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/community/netperf/netperf.rc b/community/netperf/netperf.rc new file mode 100644 index 000000000..f2a2de582 --- /dev/null +++ b/community/netperf/netperf.rc @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +DAEMON=/usr/bin/netserver +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && + </dev/null &>/dev/null $DAEMON $DAEMON_OPTS && + add_daemon ${0##*/} && + stat_done && + exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && + kill $PID &> /dev/null && + rm_daemon ${0##*/} && + stat_done && + exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/netperf/netperf.service b/community/netperf/netperf.service new file mode 100644 index 000000000..ce3c9cab8 --- /dev/null +++ b/community/netperf/netperf.service @@ -0,0 +1,8 @@ +[Unit] +Description=Netperf Benchmark Server + +[Service] +ExecStart=/usr/bin/netserver -D + +[Install] +WantedBy=multi-user.target diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index 72106748b..fa0e14dca 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -15,12 +15,14 @@ optdepends=('ruby') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825') +source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz + newsbeuter-2.5-gcc47.patch) +sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825' + 'c48029c63cfc45d5df3bdbc4c9fd345463a61ad97f6eac797db62d63c49c6af8') build() { cd ${srcdir}/$pkgname-$pkgver - + patch -Np1 -i ${srcdir}/newsbeuter-2.5-gcc47.patch make prefix=/usr } diff --git a/community/newsbeuter/newsbeuter-2.5-gcc47.patch b/community/newsbeuter/newsbeuter-2.5-gcc47.patch new file mode 100644 index 000000000..48ed1682a --- /dev/null +++ b/community/newsbeuter/newsbeuter-2.5-gcc47.patch @@ -0,0 +1,61 @@ +--- newsbeuter-2.5/src/controller.cpp ++++ newsbeuter-2.5/src/controller.cpp +@@ -30,6 +30,7 @@ + #include <ctime> + #include <cassert> + #include <signal.h> ++#include <unistd.h> + #include <sys/utsname.h> + #include <langinfo.h> + #include <libgen.h> +--- newsbeuter-2.5/src/google_api.cpp ++++ newsbeuter-2.5/src/google_api.cpp +@@ -7,6 +7,8 @@ + #include <config.h> + #include <utils.h> + ++#include <unistd.h> ++ + #include <curl/curl.h> + + #define GREADER_LOGIN "https://www.google.com/accounts/ClientLogin" +--- newsbeuter-2.5/src/pb_controller.cpp ++++ newsbeuter-2.5/src/pb_controller.cpp +@@ -12,6 +12,7 @@ + #include <pwd.h> + #include <cstdlib> + #include <signal.h> ++#include <unistd.h> + + #include <keymap.h> + #include <configcontainer.h> +--- newsbeuter-2.5/src/queueloader.cpp ++++ newsbeuter-2.5/src/queueloader.cpp +@@ -8,6 +8,8 @@ + #include <config.h> + #include <libgen.h> + ++#include <unistd.h> ++ + using namespace newsbeuter; + + namespace podbeuter { +--- newsbeuter-2.5/src/reloadthread.cpp ++++ newsbeuter-2.5/src/reloadthread.cpp +@@ -1,5 +1,6 @@ + #include <reloadthread.h> + #include <logger.h> ++#include <unistd.h> + + namespace newsbeuter { + +--- newsbeuter-2.5/src/utils.cpp ++++ newsbeuter-2.5/src/utils.cpp +@@ -11,6 +11,7 @@ + #include <libgen.h> + #include <sys/utsname.h> + ++#include <unistd.h> + #include <sstream> + #include <locale> + #include <cwchar> diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index 74966547e..68b402fa9 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75302 2012-08-18 11:54:08Z kkeen $ +# $Id: PKGBUILD 81560 2012-12-24 04:07:48Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ngircd -pkgver=19.2 -pkgrel=2 +pkgver=20 +pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('i686' 'x86_64' 'mips64el') backup=(etc/ngircd.conf) @@ -15,7 +15,7 @@ depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" ngircd.sh ngircd.service) -sha256sums=('bf1d5bc7554863e295d3175483f5bb01ccb0acf06a64ba9bb222150b808cf34d' +sha256sums=('948b6ee9217bf0833958390513ba1ca2b2e8ddef809c226b889e7591f680c3d8' 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5' '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 40ab6e4e6..2d9bf318a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81270 2012-12-15 14:07:11Z bpiotrowski $ +# $Id: PKGBUILD 82204 2013-01-11 18:56:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.16 +pkgver=0.8.17 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ depends=('openssl' 'python2' 'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -md5sums=('62ff446972ab02980465f60f9920705d') +sha256sums=('8f070b42ffb84fde9d3ed2f802b08664b94dda327a36bf08a80c8b7efcf8b29e') build() { cd node-v${pkgver} diff --git a/community/normalize/PKGBUILD b/community/normalize/PKGBUILD new file mode 100644 index 000000000..62f0a5766 --- /dev/null +++ b/community/normalize/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 81986 2013-01-05 08:50:13Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=normalize +pkgver=0.7.7 +pkgrel=6 +pkgdesc="A tool for adjusting the volume of WAV files to a standard level" +arch=('i686' 'x86_64') +url="http://normalize.nongnu.org" +license=('GPL') +depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123') +makedepends=('pkg-config' 'intltool') +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'normalize-0.7.7-audiofile-pkgconfig.patch' + 'normalize-0.7.7-m4.patch') +md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436' + '77d565e29bef11837e80347adfd42b58' + '0b4bca7bf183275b9f939576ebad4233') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/normalize-0.7.7-audiofile-pkgconfig.patch" + patch -Np0 -i "${srcdir}/normalize-0.7.7-m4.patch" + + touch AUTHORS NEWS ChangeLog + libtoolize --force --copy + aclocal -I m4 + autoreconf + automake --add-missing + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-audiofile \ + --with-mad + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/normalize/normalize-0.7.7-audiofile-pkgconfig.patch b/community/normalize/normalize-0.7.7-audiofile-pkgconfig.patch new file mode 100644 index 000000000..09f211cdf --- /dev/null +++ b/community/normalize/normalize-0.7.7-audiofile-pkgconfig.patch @@ -0,0 +1,55 @@ +Use pkgconfig to check for audiofile since the audiofile-config script was +removed from >=audiofile-0.3.0. + +--- normalize-0.7.7/configure.ac.orig ++++ normalize-0.7.7/configure.ac +@@ -248,33 +248,16 @@ + + + dnl *** Stuff for audiofile library *** +-dnl v0.2.1 and before have bugs with 24-bit LE files +-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ]) +-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true) ++AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile], ++ [use the audiofile library (default yes)])) + AH_TEMPLATE([USE_AUDIOFILE], + [Define if you want to use the audiofile library.]) +-AC_ARG_WITH(audiofile, +- AC_HELP_STRING([--with-audiofile], +- [use the audiofile library (default yes)]), +- [ case "$withval" in +- no) with_audiofile=false ;; +- *) with_audiofile=true ;; +- esac ]) + +-use_audiofile=false +-if test x$with_audiofile != xfalse; then +- if test x$have_audiofile = xtrue; then +- AC_DEFINE(USE_AUDIOFILE) +- use_audiofile=true +-dnl AUDIOFILELIBS="-laudiofile" +- elif test x$with_audiofile = xtrue; then +- AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found]) +- fi +-fi +-dnl AC_SUBST(AUDIOFILELIBS) +-test x$use_audiofile = xfalse && AUDIOFILE_LIBS= +-test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS= +-AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue) ++AS_IF([test "x$with_audiofile" = "xyes"], [ ++ PKG_CHECK_MODULES([AUDIOFILE], [audiofile]) ++ AC_DEFINE(USE_AUDIOFILE) ++]) ++AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes) + + + dnl *** Stuff for mad mpeg audio decoder library *** +@@ -330,7 +313,7 @@ + + echo + echo "Configuration:" +-echo " audiofile library: $use_audiofile" ++echo " audiofile library: $with_audiofile" + echo " mpeg audio support: $use_mad" + echo " xmms volume adjust plugin: $use_xmms" + echo diff --git a/community/normalize/normalize-0.7.7-m4.patch b/community/normalize/normalize-0.7.7-m4.patch new file mode 100644 index 000000000..2aeb3e451 --- /dev/null +++ b/community/normalize/normalize-0.7.7-m4.patch @@ -0,0 +1,553 @@ +--- m4/extra.m4 ++++ m4/extra.m4 +@@ -0,0 +1,550 @@ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++# Configure paths for GLIB ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or ++dnl gthread is specified in MODULES, pass to glib-config ++dnl ++AC_DEFUN(AM_PATH_GLIB, ++[dnl ++dnl Get the cflags and libraries from the glib-config script ++dnl ++AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], ++ glib_config_prefix="$withval", glib_config_prefix="") ++AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], ++ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ if test x$glib_config_exec_prefix != x ; then ++ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config ++ fi ++ fi ++ if test x$glib_config_prefix != x ; then ++ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_prefix/bin/glib-config ++ fi ++ fi ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ glib_config_args="$glib_config_args gmodule" ++ ;; ++ gthread) ++ glib_config_args="$glib_config_args gthread" ++ ;; ++ esac ++ done ++ ++ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) ++ min_glib_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++ else ++ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` ++ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` ++ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of glib-config to some extent ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If glib-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); ++ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the glib-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); ++ printf("*** correct copy of glib-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GLIB_CONFIG" = "no" ; then ++ echo "*** The glib-config script installed by GLIB could not be found" ++ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GLIB_CONFIG environment variable to the" ++ echo "*** full path to glib-config." ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB was incorrectly installed" ++ echo "*** or that you have moved GLIB since it was installed. In the latter case, you" ++ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ rm -f conf.glibtest ++]) ++ ++# Configure paths for GTK+ ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS ++dnl ++AC_DEFUN(AM_PATH_GTK, ++[dnl ++dnl Get the cflags and libraries from the gtk-config script ++dnl ++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], ++ gtk_config_prefix="$withval", gtk_config_prefix="") ++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], ++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") ++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], ++ , enable_gtktest=yes) ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gthread) ++ gtk_config_args="$gtk_config_args gthread" ++ ;; ++ esac ++ done ++ ++ if test x$gtk_config_exec_prefix != x ; then ++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ++ fi ++ fi ++ if test x$gtk_config_prefix != x ; then ++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) ++ min_gtk_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++ else ++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gtktest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$GTK_LIBS $LIBS" ++dnl ++dnl Now check if the installed GTK is sufficiently new. (Also sanity ++dnl checks the results of gtk-config to some extent ++dnl ++ rm -f conf.gtktest ++ AC_TRY_RUN([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gtktest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_gtk_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gtk_version"); ++ exit(1); ++ } ++ ++ if ((gtk_major_version != $gtk_config_major_version) || ++ (gtk_minor_version != $gtk_config_minor_version) || ++ (gtk_micro_version != $gtk_config_micro_version)) ++ { ++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf ("*** was found! If gtk-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); ++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) ++ else if ((gtk_major_version != GTK_MAJOR_VERSION) || ++ (gtk_minor_version != GTK_MINOR_VERSION) || ++ (gtk_micro_version != GTK_MICRO_VERSION)) ++ { ++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ } ++#endif /* defined (GTK_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((gtk_major_version > major) || ++ ((gtk_major_version == major) && (gtk_minor_version > minor)) || ++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); ++ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gtk" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GTK_CONFIG" = "no" ; then ++ echo "*** The gtk-config script installed by GTK could not be found" ++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GTK_CONFIG environment variable to the" ++ echo "*** full path to gtk-config." ++ else ++ if test -f conf.gtktest ; then ++ : ++ else ++ echo "*** Could not run GTK test program, checking why..." ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ AC_TRY_LINK([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GTK was incorrectly installed" ++ echo "*** or that you have moved GTK since it was installed. In the latter case, you" ++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ rm -f conf.gtktest ++]) ++ ++# CFLAGS and library paths for XMMS ++# written 15 December 1999 by Ben Gertzfield <che@debian.org> ++ ++dnl Usage: ++dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl ++dnl Example: ++dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) ++dnl ++dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, ++dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, ++dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, ++dnl and XMMS_VERSION for your plugin pleasure. ++dnl ++ ++dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) ++AC_DEFUN(XMMS_TEST_VERSION, [ ++ ++# Determine which version number is greater. Prints 2 to stdout if ++# the second number is greater, 1 if the first number is greater, ++# 0 if the numbers are equal. ++ ++# Written 15 December 1999 by Ben Gertzfield <che@debian.org> ++# Revised 15 December 1999 by Jim Monty <monty@primenet.com> ++ ++ AC_PROG_AWK ++ xmms_got_version=[` $AWK ' \ ++BEGIN { \ ++ print vercmp(ARGV[1], ARGV[2]); \ ++} \ ++ \ ++function vercmp(ver1, ver2, ver1arr, ver2arr, \ ++ ver1len, ver2len, \ ++ ver1int, ver2int, len, i, p) { \ ++ \ ++ ver1len = split(ver1, ver1arr, /\./); \ ++ ver2len = split(ver2, ver2arr, /\./); \ ++ \ ++ len = ver1len > ver2len ? ver1len : ver2len; \ ++ \ ++ for (i = 1; i <= len; i++) { \ ++ p = 1000 ^ (len - i); \ ++ ver1int += ver1arr[i] * p; \ ++ ver2int += ver2arr[i] * p; \ ++ } \ ++ \ ++ if (ver1int < ver2int) \ ++ return 2; \ ++ else if (ver1int > ver2int) \ ++ return 1; \ ++ else \ ++ return 0; \ ++}' $1 $2`] ++ ++ if test $xmms_got_version -eq 2; then # failure ++ ifelse([$4], , :, $4) ++ else # success! ++ ifelse([$3], , :, $3) ++ fi ++]) ++ ++AC_DEFUN(AM_PATH_XMMS, ++[ ++AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], ++ xmms_config_prefix="$withval", xmms_config_prefix="") ++AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], ++ xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") ++ ++if test x$xmms_config_exec_prefix != x; then ++ xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" ++ if test x${XMMS_CONFIG+set} != xset; then ++ XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config ++ fi ++fi ++ ++if test x$xmms_config_prefix != x; then ++ xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" ++ if test x${XMMS_CONFIG+set} != xset; then ++ XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config ++ fi ++fi ++ ++AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) ++min_xmms_version=ifelse([$1], ,0.9.5.1, $1) ++ ++if test "$XMMS_CONFIG" = "no"; then ++ no_xmms=yes ++else ++ XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` ++ XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` ++ XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` ++ XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` ++ XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` ++ XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ ++ --visualization-plugin-dir` ++ XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` ++ XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` ++ XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` ++ XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` ++ ++ XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) ++fi ++ ++AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) ++ ++if test "x$no_xmms" = x; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++else ++ AC_MSG_RESULT(no) ++ ++ if test "$XMMS_CONFIG" = "no" ; then ++ echo "*** The xmms-config script installed by XMMS could not be found." ++ echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the XMMS_CONFIG environment variable to the" ++ echo "*** full path to xmms-config." ++ else ++ if test "$no_xmms" = "version"; then ++ echo "*** An old version of XMMS, $XMMS_VERSION, was found." ++ echo "*** You need a version of XMMS newer than $min_xmms_version." ++ echo "*** The latest version of XMMS is always available from" ++ echo "*** http://www.xmms.org/" ++ echo "***" ++ ++ echo "*** If you have already installed a sufficiently new version, this error" ++ echo "*** probably means that the wrong copy of the xmms-config shell script is" ++ echo "*** being found. The easiest way to fix this is to remove the old version" ++ echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" ++ echo "*** correct copy of xmms-config. (In this case, you will have to" ++ echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" ++ echo "*** so that the correct libraries are found at run-time)" ++ fi ++ fi ++ XMMS_CFLAGS="" ++ XMMS_LIBS="" ++ ifelse([$3], , :, [$3]) ++fi ++AC_SUBST(XMMS_CFLAGS) ++AC_SUBST(XMMS_LIBS) ++AC_SUBST(XMMS_VERSION) ++AC_SUBST(XMMS_DATA_DIR) ++AC_SUBST(XMMS_PLUGIN_DIR) ++AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) ++AC_SUBST(XMMS_INPUT_PLUGIN_DIR) ++AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) ++AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) ++AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) ++]) diff --git a/community/notify-osd/PKGBUILD b/community/notify-osd/PKGBUILD index 431581ae0..616750522 100644 --- a/community/notify-osd/PKGBUILD +++ b/community/notify-osd/PKGBUILD @@ -6,7 +6,7 @@ pkgname=notify-osd pkgver=0.9.34 pkgrel=1 pkgdesc="Canonical's on-screen-display notification agent, implementing the freedesktop.org Desktop Notifications Specification with semi-transparent click-through bubbles" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/notify-osd" license=('GPL') depends=('libwnck3' 'dbus-glib' 'dconf' 'gsettings-desktop-schemas') diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index 837d08626..6090f1189 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=notmuch pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') pkgver=0.14 pkgrel=4 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://notmuchmail.org/" license=('GPL3') makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc') diff --git a/community/ntop/ntop b/community/ntop/ntop index 2f0dbcbdd..2f0dbcbdd 100755..100644 --- a/community/ntop/ntop +++ b/community/ntop/ntop diff --git a/community/nvidia-cg-toolkit/PKGBUILD b/community/nvidia-cg-toolkit/PKGBUILD new file mode 100644 index 000000000..ed07e852e --- /dev/null +++ b/community/nvidia-cg-toolkit/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 74692 2012-08-02 07:39:38Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Adam Griffiths +# Contributor: Nick B <Shirakawasuna at gmail _dot_ com> +pkgname=nvidia-cg-toolkit +pkgver=3.1 +_date="April2012" +pkgrel=2 +pkgdesc="NVIDIA Cg libraries" +arch=('i686' 'x86_64') +url="http://developer.nvidia.com/object/cg_toolkit.html" +license=('custom') +depends=('glibc' 'mesa') +source=(http://developer.download.nvidia.com/cg/Cg_${pkgver}/Cg-${pkgver}_${_date}_${CARCH/i686/x86}.tgz) +[ "$CARCH" = "i686" ] && + md5sums=('9a9fc5108154808f3b10eafa54df1c74') +[ "$CARCH" = "x86_64" ] && +md5sums=('88ba727cdbe0261fac465c4d84f44762') + +build() { + return 0 +} + +package() { + install -Dm755 ${srcdir}/usr/bin/cgc ${pkgdir}/usr/bin/cgc + install -dm755 ${pkgdir}/usr/include/Cg + install -m644 ${srcdir}/usr/include/Cg/* ${pkgdir}/usr/include/Cg + install -dm755 ${pkgdir}/usr/lib + [ "$CARCH" = "i686" ] && install -m644 ${srcdir}/usr/lib/* ${pkgdir}/usr/lib + [ "$CARCH" = "x86_64" ] && install -m644 ${srcdir}/usr/lib64/* ${pkgdir}/usr/lib + install -Dm644 ${srcdir}/usr//local/Cg/docs/license.txt ${pkgdir}/usr/share/licenses/nvidia-cg-toolkit/license.txt + cp -r ${srcdir}/usr/local/Cg ${pkgdir}/usr/share/ + find $pkgdir/usr/share/ -type d -exec chmod -R 755 '{}' ';' + find $pkgdir/usr/share/ -type f -exec chmod -R 644 '{}' ';' +} + +# vim: sw=2:ts=2 et: diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index c850f379d..53d299fea 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70376 2012-05-05 12:41:24Z jlichtblau $ +# $Id: PKGBUILD 82027 2013-01-05 19:59:03Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget -pkgver=0.8.0 +pkgver=9.0 pkgrel=1 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686' 'mips64el') @@ -12,22 +12,21 @@ license=('GPL') depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt') makedepends=('autoconf' 'automake') changelog=$pkgname.changelog -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.gz) +sha256sums=('40f9baefcd090f81a000149a79358a2639c5154579c026dba4317c566dd19ee4') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr --enable-parcheck make CXXFLAGS="-lsigc-2.0" } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -d "$pkgdir/usr/share/$pkgname" - install -m644 -t "$pkgdir/usr/share/$pkgname" \ - AUTHORS postprocess-example.sh postprocess-example.conf \ - ChangeLog nzbget.conf.example README + make DESTDIR=${pkgdir} install + + install -d ${pkgdir}/usr/share/$pkgname + install -m644 -t ${pkgdir}/usr/share/$pkgname AUTHORS ChangeLog README } diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 80220e1a4..c048dac67 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 9.0-1 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * nzbget 0.8.0-1 diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index df45494ad..40aa1d916 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78852 2012-10-25 22:57:45Z seblu $ +# $Id: PKGBUILD 82117 2013-01-08 20:25:25Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL3') depends=('glibc' 'pam' 'xmlsec') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('529e5995ae0d95a94daa16f9b9c25e3c') +md5sums=('35232dfcaf0e77377f926d561fe5086d') build() { cd $pkgname-$pkgver @@ -34,4 +34,4 @@ package() { install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index 77528d596..83a8cf36a 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -20,7 +20,11 @@ build() { cd "$srcdir/findlib-$pkgver" ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man - make all opt + if [ "${CARCH}" = "mips64el" ]; then + make all + else + make all opt + fi } package () { @@ -32,6 +36,6 @@ package () { sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' \ "${pkgdir}/etc/findlib.conf" - install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/" + [ $CARCH != 'mips64el' ] && (install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/") install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD new file mode 100644 index 000000000..78d169da2 --- /dev/null +++ b/community/ogre/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 77653 2012-10-13 11:44:20Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgbase=ogre +pkgname=('ogre' 'ogre-docs') +pkgver=1.8.1 +pkgrel=2 +pkgdesc="A scene-oriented, flexible 3D engine written in C++" +arch=('i686' 'x86_64') +url='http://www.ogre3d.org' +license=('custom:MIT') +depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' + 'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') +optdepends=('cppunit: unit testing' + 'intel-tbb: better threading support' + 'poco: portability' + 'boost: for developing using ogre') +install=ogre.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2") +md5sums=('b85e3dcf370a46b3a8624d4fdd722d39') + +build() { + cd ${srcdir}/${pkgname}_src_v${pkgver//./-} + + # get a clean build dir + [[ -d build ]] && rm -rf build + mkdir build && cd build + + # generate CMake Makefile + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ + -DOGRE_INSTALL_SAMPLES=TRUE \ + -DOGRE_INSTALL_DOCS=TRUE \ + -DOGRE_INSTALL_MEDIA=TRUE \ + -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + + # compile + make + + # generate docs + if [[ $(which dot) && $(which doxygen) ]]; then + make doc + fi +} + +package_ogre() { + optdepends=('ogre-docs: documentation') + + cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build + + # install the bugger + make DESTDIR=${pkgdir} install + + # fix up samples + install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/ + mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/ + mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/ + + # make sample launcher + echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser + echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser + chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser + + # install license + install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html + + # move docs out of this package + mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs +} + +package_ogre-docs() { + pkgdesc="Documentation for ogre" + depends=() + + cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build + + # move docs into this package + install -dm755 ${pkgdir}/usr/share/doc + mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/ + + # symlink for docs + install -dm755 ${pkgdir}/usr/share/OGRE/ + cd ${pkgdir}/usr/share + ln -s doc/OGRE/ OGRE/docs +} + +# vim:set ts=2 sw=2 et: diff --git a/community/ogre/ogre.install b/community/ogre/ogre.install new file mode 100644 index 000000000..5db668d9e --- /dev/null +++ b/community/ogre/ogre.install @@ -0,0 +1,4 @@ +post_install() { + echo "To view the OGRE samples just run OgreSampleBrowser or launch" + echo "it directly in /opt/OGRE/samples/" +} diff --git a/community/ois/PKGBUILD b/community/ois/PKGBUILD index eeac3678f..484a72e92 100644 --- a/community/ois/PKGBUILD +++ b/community/ois/PKGBUILD @@ -10,11 +10,14 @@ arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/wgois" license=('custom:zlib/libpng') makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'libxaw') -source=("http://downloads.sourceforge.net/project/wgois/Source%20Release/${pkgver}/ois_v${_oisver}.tar.gz") -md5sums=('9697fead17eac6025151cd2e1fca1518') +source=("http://downloads.sourceforge.net/project/wgois/Source%20Release/${pkgver}/ois_v${_oisver}.tar.gz" + "ois-1.3-gcc47.patch") +md5sums=('9697fead17eac6025151cd2e1fca1518' + 'e5cb7a504cf30a382d0b0420aedaa953') build() { cd ${srcdir}/${pkgname}-v${_oisver} + patch -Np1 -i ${srcdir}/ois-1.3-gcc47.patch chmod +x bootstrap ./bootstrap ./configure --prefix=/usr diff --git a/community/ois/ois-1.3-gcc47.patch b/community/ois/ois-1.3-gcc47.patch new file mode 100644 index 000000000..f77c741c7 --- /dev/null +++ b/community/ois/ois-1.3-gcc47.patch @@ -0,0 +1,49 @@ +--- ois-v1-3.orig/demos/FFConsoleDemo.cpp 2010-03-31 22:38:04.000000000 -0500 ++++ ois-v1-3/demos/FFConsoleDemo.cpp 2012-12-24 00:33:49.240616817 -0500 +@@ -7,6 +7,7 @@ + #include <ios>
+ #include <sstream>
+ #include <vector>
++#include <unistd.h>
+
+ using namespace std;
+
+--- ois-v1-3.orig/demos/OISConsole.cpp 2010-08-15 17:51:34.000000000 -0500 ++++ ois-v1-3/demos/OISConsole.cpp 2012-12-24 00:44:27.697240229 -0500 +@@ -12,6 +12,7 @@ + #include <iostream>
+ #include <vector>
+ #include <sstream>
++#include <unistd.h>
+
+ ////////////////////////////////////Needed Windows Headers////////////
+ #if defined OIS_WIN32_PLATFORM
+@@ -77,7 +78,7 @@ + }
+ bool keyReleased( const KeyEvent &arg ) {
+ if( arg.key == KC_ESCAPE || arg.key == KC_Q )
+- appRunning = false; ++ appRunning = false;
+ std::cout << "KeyReleased {" << ((Keyboard*)(arg.device))->getAsString(arg.key) << "}\n";
+ return true;
+ }
+--- ois-v1-3.orig/src/linux/LinuxJoyStickEvents.cpp 2010-07-25 20:28:41.000000000 -0500 ++++ ois-v1-3/src/linux/LinuxJoyStickEvents.cpp 2012-12-24 00:36:18.360998563 -0500 +@@ -33,6 +33,7 @@ + #include <fcntl.h> //Needed to Open a file descriptor
+ #include <cassert>
+ #include <linux/input.h>
++#include <unistd.h>
+
+
+ #include <sstream>
+--- ois-v1-3.orig/src/linux/LinuxForceFeedback.cpp 2010-03-31 22:06:55.000000000 -0500 ++++ ois-v1-3/src/linux/LinuxForceFeedback.cpp 2012-12-24 00:36:54.023723000 -0500 +@@ -26,6 +26,7 @@ + #include <cstdlib>
+ #include <errno.h>
+ #include <memory.h>
++#include <unistd.h>
+
+ using namespace OIS;
+
diff --git a/community/omniorb/PKGBUILD b/community/omniorb/PKGBUILD index 97dfd8f24..81e07273c 100644 --- a/community/omniorb/PKGBUILD +++ b/community/omniorb/PKGBUILD @@ -29,7 +29,7 @@ build() { src/lib/omniORB/orbcore/ssl/sslContext.cc \ include/omniORB4/sslContext.h ./configure --prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \ - --with-omniNames-logdir=/var/log/omniORB --with-openssl=/usr + --with-omniNames-logdir=/var/log/omniORB --with-openssl=/usr --build=$CHOST make } package(){ diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 6fe9a87ba..7fc8d3e93 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 71988 2012-06-05 00:13:47Z svenstaro $ +# $Id: PKGBUILD 82164 2013-01-09 22:25:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite -pkgver=1.76.1 -pkgrel=2 +pkgver=1.77 +pkgrel=1 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" license=('GPL2') -depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu' 'gnustep-base') -makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') +depends=('gnustep-gui' 'sdl_mixer' 'glu' 'espeak' 'nspr' 'python2' 'icu' 'gnustep-base') +makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip' 'mesa') options=(!makeflags) source=(oolite http://download.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2) md5sums=('b182976fade9b64a3b3702e2a8c72bf0' - 'a9ae79f4006a0993a822ca40740f4e67') + '78e0f1da12d1478534eb2af4d0983b01') build() { cd $srcdir diff --git a/community/oolite/oolite b/community/oolite/oolite index 6c9de2446..6c9de2446 100755..100644 --- a/community/oolite/oolite +++ b/community/oolite/oolite diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd index 59fa8107d..59fa8107d 100755..100644 --- a/community/openntpd/openntpd +++ b/community/openntpd/openntpd diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 8669ec0c6..807f3888d 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -8,7 +8,7 @@ pkgname=openocd pkgver=0.6.1 pkgrel=2 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://openocd.berlios.de' license=('GPL') depends=('libftdi') diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 5233250fd..2f066b791 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -26,7 +26,7 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.init opensips.service) -md5sums=('ec3d0f13bf8198a74aed91e5c38ec445' +md5sums=('4a7cc708a5fba6ab3d1a3aa0aaa85d77' '685fbe00826df1285b410d4610dcbb0c' '0d80ef75b5c10324e6db790b7741c2eb') diff --git a/community/opera/PKGBUILD b/community/opera/PKGBUILD new file mode 100644 index 000000000..cc9bb472c --- /dev/null +++ b/community/opera/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 81340 2012-12-18 09:39:07Z idevolder $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Mateusz Herych <heniekk@gmail.com> +# Contributor: ruario <ruario AT opera DOT com> +# Contributor: Daniel Isenmann <daniel AT archlinux DOT org> +# Contributor: dorphell <dorphell AT archlinux DOT org> +# Contributor: Sigitas Mazaliauskas <sigis AT gmail DOT com> + +pkgname=opera +_ver=12.12 +_build=1707 +pkgver=$_ver.$_build +pkgrel=1 +pkgdesc='Fast and secure web browser and Internet suite' +arch=('i686' 'x86_64') +url='http://www.opera.com/browser/' +license=('custom:opera') +depends=('gcc-libs' 'libxt' 'freetype2' 'libxext' 'glib2' + 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') +optdepends=('gstreamer0.10-base-plugins: HTML5 Video support' + 'gstreamer0.10-good: HTML5 Video support') +install=$pkgname.install +options=(!strip !zipman) + +if [[ $CARCH == i686 ]]; then + _arch=i386 + source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz) + sha256sums=('7f766faa08d62be616ea43cf4bb026c8b6afb5a51fa8eae1227f16d5658779ca') +elif [[ $CARCH == x86_64 ]]; then + _arch=$CARCH + source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz) + sha256sums=('1ba428bd5acf4f17a8ef0f970fb9e1334477468abbf21612dd8c2eec5fff9129') +fi + +package() { + opera-${_ver}-${_build}.${_arch}.linux/install --prefix /usr --repackage $pkgdir/usr + install -Dm 644 $pkgdir/usr/share/$pkgname/defaults/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt +} diff --git a/community/opera/opera.install b/community/opera/opera.install new file mode 100644 index 000000000..1190e6fd6 --- /dev/null +++ b/community/opera/opera.install @@ -0,0 +1,20 @@ +available() { + which "$1" >/dev/null 2>&1 +} + +post_install() { + update-mime-database /usr/share/mime >/dev/null + update-desktop-database -q /usr/share/applications + + if available gtk-update-icon-cache; then + gtk-update-icon-cache -q /usr/share/icons/hicolor + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD new file mode 100644 index 000000000..b711af87f --- /dev/null +++ b/community/opus-tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 81947 2013-01-04 06:03:54Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Michael Düll <mail@akurei.me> +# Contributor: pumbur + +pkgname=opus-tools +pkgver=0.1.6 +pkgrel=1 +pkgdesc='Collection of tools for Opus audio codec' +arch=('i686' 'x86_64') +url='http://wiki.xiph.org/Opus-tools' +license=('BSD') +depends=('opus' 'libogg') +source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz) + +build(){ + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +sha512sums=('547828082c4838643eeda513f65316b60b0e44c4a0826ef39cbfa3fe81df71b30651c03ceee7729aeb74258c259014bf95ca5f01aba097a4de8334e58c8e7ce6') diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD new file mode 100644 index 000000000..d7a625073 --- /dev/null +++ b/community/opusfile/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 81936 2013-01-03 21:13:51Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> + +pkgname=opusfile +pkgver=0.2 +pkgrel=2 +pkgdesc='Library for opening, seeking, and decoding .opus files' +arch=('i686' 'x86_64') +url='http://www.opus-codec.org/' +license=('custom') +depends=('libogg' 'openssl' 'opus') +options=('!libtool') +source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz) +md5sums=('454375f51fb2f84bef9bf2fbf9535bb1') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 COPYING $pkgdir/usr/share/licenses/opusfile/LICENSE +} diff --git a/community/osdlyrics/PKGBUILD b/community/osdlyrics/PKGBUILD new file mode 100644 index 000000000..d1bb7e13f --- /dev/null +++ b/community/osdlyrics/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 81442 2012-12-21 03:27:19Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Auguste Pop <auguste [at] gmail [dot] com> + +pkgname=osdlyrics +pkgver=0.4.3 +pkgrel=2 +pkgdesc="A lyric show compatible with various media players" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/osd-lyrics/" +license=('GPL3') +depends=('gtk2' 'dbus-glib' 'curl' 'libnotify' 'libmpd' 'xmms2' + 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool') +install=$pkgname.install +source=("http://osd-lyrics.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('a14a3fbfe07eb7137074126db63b9aa2') + +build() +{ + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() +{ + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/osdlyrics/osdlyrics.install b/community/osdlyrics/osdlyrics.install new file mode 100644 index 000000000..54854a1fe --- /dev/null +++ b/community/osdlyrics/osdlyrics.install @@ -0,0 +1,15 @@ +post_upgrade() +{ + usr/bin/update-desktop-database -q + usr/bin/gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_install() +{ + post_upgrade +} + +post_remove() +{ + post_upgrade +} diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index b3ca2cb1a..2c27c4d2e 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -29,7 +29,7 @@ build() { install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt mkdir -p $pkgdir/etc/rc.d - ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname + ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname --build=$CHOST make all # Arch-ify install locations diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init index 8262d902e..8262d902e 100755..100644 --- a/community/osiris/osirisd.init +++ b/community/osiris/osirisd.init diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init index 0bdae5e10..0bdae5e10 100755..100644 --- a/community/osiris/osirismd.init +++ b/community/osiris/osirismd.init diff --git a/community/paco/PKGBUILD b/community/paco/PKGBUILD index 1d02f5eba..4b0c5e107 100644 --- a/community/paco/PKGBUILD +++ b/community/paco/PKGBUILD @@ -12,11 +12,14 @@ license=('GPL') #NOTE: You may disable gtk frontend in configure depends=(gtk2 gtkmm) backup=(etc/pacorc) -source=(http://downloads.sourceforge.net/sourceforge/paco/$pkgname-$pkgver.tar.bz2) -md5sums=('d2debbea1b11156470f7fd849bb93c80') +source=(http://downloads.sourceforge.net/sourceforge/paco/$pkgname-$pkgver.tar.bz2 + paco-2.0.9-glib.patch) +md5sums=('d2debbea1b11156470f7fd849bb93c80' + '734d0170691cd6b500bfa99fdd09771a') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/paco-2.0.9-glib.patch ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR=$pkgdir install diff --git a/community/paco/paco-2.0.9-glib.patch b/community/paco/paco-2.0.9-glib.patch new file mode 100644 index 000000000..fba19d3a7 --- /dev/null +++ b/community/paco/paco-2.0.9-glib.patch @@ -0,0 +1,11 @@ +--- paco-2.0.9.orig/gpaco/gconfig.h 2010-06-25 14:51:00.000000000 -0500 ++++ paco-2.0.9/gpaco/gconfig.h 2012-12-25 02:51:26.449929758 -0500 +@@ -11,7 +11,7 @@ + + #include "paco/baseconfig.h" + #include <glibmm/ustring.h> +-#include <glib/gkeyfile.h> ++#include <glib.h> + #include <vector> + + diff --git a/community/paintown/PKGBUILD b/community/paintown/PKGBUILD new file mode 100644 index 000000000..8fe359267 --- /dev/null +++ b/community/paintown/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 75859 2012-09-03 17:14:58Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jschares <jacob.schares@gmail.com> +# Contributor: celmir <scibecelmir@tuxfamily.org> +# Contributor: Feufochmar <guill.delacourt@gmail.com> + +pkgname=paintown +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles" +arch=('i686' 'x86_64') +url="http://paintown.sourceforge.net/" +license=('GPL') +depends=('python2' 'freetype2' 'sdl' 'libpng' 'mpg123' 'libogg' 'libvorbis') +makedepends=('cmake' 'gendesk') +#install=paintown.install +source=(http://downloads.sourceforge.net/sourceforge/paintown/$pkgname-$pkgver.tar.bz2 + paintown.png) +md5sums=('5c1160bee51fe2011a1141c490a5d368' + 'ed547f1377212ea079cf9b0a1ad2d587') + +build() { + cd "$srcdir" + gendesk + + cd "$pkgname-$pkgver" + + # fix python2 header + for file in $(find . -name '*.py' -print); do + sed -i "s#/usr/bin/python#/usr/bin/env python2#" $file + done + + #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_png.c + #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_savepng.c + + mkdir -p build && cd build + cmake .. + make + cp bin/paintown .. +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p $pkgdir/usr/{bin,share/{paintown,pixmaps,applications,licenses/paintown}} + sh install.sh -d $pkgdir/usr/share/paintown -b $pkgdir/usr/bin + # correct the gnerated file to remove the wrong path (because $pkgdir/usr/bin is written in the file) + sed -i "s#$pkgdir##g" $pkgdir/usr/bin/paintown + install -m644 $srcdir/paintown.desktop $pkgdir/usr/share/applications/paintown.desktop + install -m644 $srcdir/paintown.png $pkgdir/usr/share/pixmaps/paintown.png + install -m644 LICENSE $pkgdir/usr/share/licenses/paintown/LICENSE + install -m644 LEGAL $pkgdir/usr/share/licenses/paintown/LEGAL +} + +# vim:set ts=2 sw=2 et: diff --git a/community/paintown/libpng15.patch b/community/paintown/libpng15.patch new file mode 100644 index 000000000..516c3ec01 --- /dev/null +++ b/community/paintown/libpng15.patch @@ -0,0 +1,343 @@ +------------------------------------------------------------------------ +r7015 | kazzmir | 2012-02-18 22:19:01 +0100 (Sa, 18 Feb 2012) | 1 line + +patch for sdl image to work with libpng1.4+ + +Index: src/util/sdl/image/IMG_png.c +=================================================================== +--- src/util/sdl/image/IMG_png.c (revision 7014) ++++ src/util/sdl/image/IMG_png.c (revision 7015) +@@ -71,6 +71,10 @@ + #endif + #include <png.h> + ++/* Check for the older version of libpng */ ++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) ++#define LIBPNG_VERSION_12 ++#endif + + static struct { + int loaded; +@@ -80,6 +84,8 @@ + void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); + png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); + png_voidp (*png_get_io_ptr) (png_structp png_ptr); ++ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); ++ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); + png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); + png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); + void (*png_read_image) (png_structp png_ptr, png_bytepp image); +@@ -91,6 +97,9 @@ + void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); + void (*png_set_strip_16) (png_structp png_ptr); + int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); ++#ifndef LIBPNG_VERSION_12 ++ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); ++#endif + } lib; + + #ifdef LOAD_PNG_DYNAMIC +@@ -129,6 +138,13 @@ + SDL_UnloadObject(lib.handle); + return -1; + } ++ lib.png_get_channels = ++ (png_byte (*) (png_structp, png_infop)) ++ SDL_LoadFunction(lib.handle, "png_get_channels"); ++ if ( lib.png_get_channels == NULL ) { ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } + lib.png_get_io_ptr = + (png_voidp (*) (png_structp)) + SDL_LoadFunction(lib.handle, "png_get_io_ptr"); +@@ -136,6 +152,13 @@ + SDL_UnloadObject(lib.handle); + return -1; + } ++ lib.png_get_PLTE = ++ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) ++ SDL_LoadFunction(lib.handle, "png_get_PLTE"); ++ if ( lib.png_get_PLTE == NULL ) { ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } + lib.png_get_tRNS = + (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) + SDL_LoadFunction(lib.handle, "png_get_tRNS"); +@@ -213,6 +236,15 @@ + SDL_UnloadObject(lib.handle); + return -1; + } ++#ifndef LIBPNG_VERSION_12 ++ lib.png_set_longjmp_fn = ++ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) ++ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); ++ if ( lib.png_set_longjmp_fn == NULL ) { ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } ++#endif + } + ++lib.loaded; + +@@ -236,7 +268,9 @@ + lib.png_create_read_struct = png_create_read_struct; + lib.png_destroy_read_struct = png_destroy_read_struct; + lib.png_get_IHDR = png_get_IHDR; ++ lib.png_get_channels = png_get_channels; + lib.png_get_io_ptr = png_get_io_ptr; ++ lib.png_get_PLTE = png_get_PLTE; + lib.png_get_tRNS = png_get_tRNS; + lib.png_get_valid = png_get_valid; + lib.png_read_image = png_read_image; +@@ -248,6 +282,9 @@ + lib.png_set_read_fn = png_set_read_fn; + lib.png_set_strip_16 = png_set_strip_16; + lib.png_sig_cmp = png_sig_cmp; ++#ifndef LIBPNG_VERSION_12 ++ lib.png_set_longjmp_fn = png_set_longjmp_fn; ++#endif + } + ++lib.loaded; + +@@ -347,7 +384,12 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in png_create_read_struct() earlier. + */ +- if ( setjmp(png_ptr->jmpbuf) ) { ++#ifndef LIBPNG_VERSION_12 ++ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) ++#else ++ if ( setjmp(png_ptr->jmpbuf) ) ++#endif ++ { + error = "Error reading the PNG file."; + goto done; + } +@@ -416,9 +458,9 @@ + Rmask = 0x000000FF; + Gmask = 0x0000FF00; + Bmask = 0x00FF0000; +- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; ++ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; + } else { +- int s = (info_ptr->channels == 4) ? 0 : 8; ++ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; + Rmask = 0xFF000000 >> s; + Gmask = 0x00FF0000 >> s; + Bmask = 0x0000FF00 >> s; +@@ -426,7 +468,7 @@ + } + } + surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, +- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); ++ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); + if ( surface == NULL ) { + error = "Out of memory"; + goto done; +@@ -444,7 +486,7 @@ + + /* Create the array of pointers to image data */ + row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*height); +- if ( (row_pointers == NULL) ) { ++ if (row_pointers == NULL) { + error = "Out of memory"; + goto done; + } +@@ -467,6 +509,9 @@ + /* Load the palette, if any */ + palette = surface->format->palette; + if ( palette ) { ++ int png_num_palette; ++ png_colorp png_palette; ++ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); + if(color_type == PNG_COLOR_TYPE_GRAY) { + palette->ncolors = 256; + for(i = 0; i < 256; i++) { +@@ -474,12 +519,12 @@ + palette->colors[i].g = i; + palette->colors[i].b = i; + } +- } else if (info_ptr->num_palette > 0 ) { +- palette->ncolors = info_ptr->num_palette; +- for( i=0; i<info_ptr->num_palette; ++i ) { +- palette->colors[i].b = info_ptr->palette[i].blue; +- palette->colors[i].g = info_ptr->palette[i].green; +- palette->colors[i].r = info_ptr->palette[i].red; ++ } else if (png_num_palette > 0 ) { ++ palette->ncolors = png_num_palette; ++ for( i=0; i<png_num_palette; ++i ) { ++ palette->colors[i].b = png_palette[i].blue; ++ palette->colors[i].g = png_palette[i].green; ++ palette->colors[i].r = png_palette[i].red; + } + } + } +Index: src/util/sdl/image/sdl-image-1.2.10-libpng15.patch +=================================================================== +--- src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 0) ++++ src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 7015) +@@ -0,0 +1,160 @@ ++--- IMG_png.c +++++ IMG_png.c ++@@ -71,6 +71,10 @@ ++ #endif ++ #include <png.h> ++ +++/* Check for the older version of libpng */ +++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) +++#define LIBPNG_VERSION_12 +++#endif ++ ++ static struct { ++ int loaded; ++@@ -80,6 +84,8 @@ ++ void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); ++ png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); ++ png_voidp (*png_get_io_ptr) (png_structp png_ptr); +++ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); +++ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); ++ png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); ++ png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); ++ void (*png_read_image) (png_structp png_ptr, png_bytepp image); ++@@ -91,6 +97,9 @@ ++ void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); ++ void (*png_set_strip_16) (png_structp png_ptr); ++ int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); +++#ifndef LIBPNG_VERSION_12 +++ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); +++#endif ++ } lib; ++ ++ #ifdef LOAD_PNG_DYNAMIC ++@@ -129,6 +138,13 @@ ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } +++ lib.png_get_channels = +++ (png_byte (*) (png_structp, png_infop)) +++ SDL_LoadFunction(lib.handle, "png_get_channels"); +++ if ( lib.png_get_channels == NULL ) { +++ SDL_UnloadObject(lib.handle); +++ return -1; +++ } ++ lib.png_get_io_ptr = ++ (png_voidp (*) (png_structp)) ++ SDL_LoadFunction(lib.handle, "png_get_io_ptr"); ++@@ -136,6 +152,13 @@ ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } +++ lib.png_get_PLTE = +++ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) +++ SDL_LoadFunction(lib.handle, "png_get_PLTE"); +++ if ( lib.png_get_PLTE == NULL ) { +++ SDL_UnloadObject(lib.handle); +++ return -1; +++ } ++ lib.png_get_tRNS = ++ (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) ++ SDL_LoadFunction(lib.handle, "png_get_tRNS"); ++@@ -213,6 +236,15 @@ ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } +++#ifndef LIBPNG_VERSION_12 +++ lib.png_set_longjmp_fn = +++ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) +++ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); +++ if ( lib.png_set_longjmp_fn == NULL ) { +++ SDL_UnloadObject(lib.handle); +++ return -1; +++ } +++#endif ++ } ++ ++lib.loaded; ++ ++@@ -236,7 +268,9 @@ ++ lib.png_create_read_struct = png_create_read_struct; ++ lib.png_destroy_read_struct = png_destroy_read_struct; ++ lib.png_get_IHDR = png_get_IHDR; +++ lib.png_get_channels = png_get_channels; ++ lib.png_get_io_ptr = png_get_io_ptr; +++ lib.png_get_PLTE = png_get_PLTE; ++ lib.png_get_tRNS = png_get_tRNS; ++ lib.png_get_valid = png_get_valid; ++ lib.png_read_image = png_read_image; ++@@ -248,6 +282,9 @@ ++ lib.png_set_read_fn = png_set_read_fn; ++ lib.png_set_strip_16 = png_set_strip_16; ++ lib.png_sig_cmp = png_sig_cmp; +++#ifndef LIBPNG_VERSION_12 +++ lib.png_set_longjmp_fn = png_set_longjmp_fn; +++#endif ++ } ++ ++lib.loaded; ++ ++@@ -347,7 +384,12 @@ ++ * the normal method of doing things with libpng). REQUIRED unless you ++ * set up your own error handlers in png_create_read_struct() earlier. ++ */ ++- if ( setjmp(png_ptr->jmpbuf) ) { +++#ifndef LIBPNG_VERSION_12 +++ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) +++#else +++ if ( setjmp(png_ptr->jmpbuf) ) +++#endif +++ { ++ error = "Error reading the PNG file."; ++ goto done; ++ } ++@@ -416,9 +458,9 @@ ++ Rmask = 0x000000FF; ++ Gmask = 0x0000FF00; ++ Bmask = 0x00FF0000; ++- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; +++ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; ++ } else { ++- int s = (info_ptr->channels == 4) ? 0 : 8; +++ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; ++ Rmask = 0xFF000000 >> s; ++ Gmask = 0x00FF0000 >> s; ++ Bmask = 0x0000FF00 >> s; ++@@ -426,7 +468,7 @@ ++ } ++ } ++ surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, ++- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); +++ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); ++ if ( surface == NULL ) { ++ error = "Out of memory"; ++ goto done; ++@@ -467,6 +509,9 @@ ++ /* Load the palette, if any */ ++ palette = surface->format->palette; ++ if ( palette ) { +++ int png_num_palette; +++ png_colorp png_palette; +++ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); ++ if(color_type == PNG_COLOR_TYPE_GRAY) { ++ palette->ncolors = 256; ++ for(i = 0; i < 256; i++) { ++@@ -474,12 +519,12 @@ ++ palette->colors[i].g = i; ++ palette->colors[i].b = i; ++ } ++- } else if (info_ptr->num_palette > 0 ) { ++- palette->ncolors = info_ptr->num_palette; ++- for( i=0; i<info_ptr->num_palette; ++i ) { ++- palette->colors[i].b = info_ptr->palette[i].blue; ++- palette->colors[i].g = info_ptr->palette[i].green; ++- palette->colors[i].r = info_ptr->palette[i].red; +++ } else if (png_num_palette > 0 ) { +++ palette->ncolors = png_num_palette; +++ for( i=0; i<png_num_palette; ++i ) { +++ palette->colors[i].b = png_palette[i].blue; +++ palette->colors[i].g = png_palette[i].green; +++ palette->colors[i].r = png_palette[i].red; ++ } ++ } ++ } + +------------------------------------------------------------------------ diff --git a/community/paintown/paintown.png b/community/paintown/paintown.png Binary files differnew file mode 100644 index 000000000..c7e4830e4 --- /dev/null +++ b/community/paintown/paintown.png diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index d652fe0c3..dc77371c8 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -6,7 +6,7 @@ pkgname=pam_mount pkgver=2.13 pkgrel=4 pkgdesc="A PAM module that can mount volumes for a user session" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://pam-mount.sourceforge.net/" license=('GPL') depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup>=1.1.2') diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD index ca894ea87..4ae03a936 100644 --- a/community/pam_pwcheck/PKGBUILD +++ b/community/pam_pwcheck/PKGBUILD @@ -9,11 +9,14 @@ arch=(i686 x86_64 'mips64el') url="http://www.thkukuk.de/pam/pam_pwcheck/" depends=('pam') license=('GPL') -source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) -md5sums=('27be63338af88d14610d182b6a161cd1') +source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2 + pam_pwcheck-3.9-pthread.patch) +md5sums=('27be63338af88d14610d182b6a161cd1' + '0978c56f1321febb5b4fa584f1054773') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/pam_pwcheck-3.9-pthread.patch ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib make make DESTDIR=$pkgdir install diff --git a/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch b/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch new file mode 100644 index 000000000..ef007b469 --- /dev/null +++ b/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch @@ -0,0 +1,58 @@ +--- pam_pwcheck-3.9.orig/src/read-files.c 2005-10-10 13:38:30.000000000 -0500 ++++ pam_pwcheck-3.9/src/read-files.c 2012-12-25 05:23:41.175269985 -0500 +@@ -30,8 +30,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <nss.h> +-#include <bits/libc-lock.h> +-#define __libc_lock_t pthread_mutex_t ++#include <pthread.h> + + #include "read-files.h" + +@@ -341,11 +340,11 @@ + char *buffer, size_t buflen, int *errnop) + { + /* Locks the static variables in this file. */ +- __libc_lock_define_initialized (static, lock); ++ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + enum nss_status status; + FILE *stream = NULL; + +- __libc_lock_lock (lock); ++ pthread_mutex_lock (&lock); + + status = internal_setent (&stream, "/shadow"); + if (status == NSS_STATUS_SUCCESS) +@@ -361,7 +360,7 @@ + internal_endent (&stream); + } + +- __libc_lock_unlock (lock); ++ pthread_mutex_unlock (&lock); + + return status; + } +@@ -371,11 +370,11 @@ + char *buffer, size_t buflen, int *errnop) + { + /* Locks the static variables in this file. */ +- __libc_lock_define_initialized (static, lock); ++ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + enum nss_status status; + FILE *stream = NULL; + +- __libc_lock_lock (lock); ++ pthread_mutex_lock (&lock); + + status = internal_setent (&stream, "/passwd"); + if (status == NSS_STATUS_SUCCESS) +@@ -391,7 +390,7 @@ + internal_endent (&stream); + } + +- __libc_lock_unlock (lock); ++ pthread_mutex_unlock (&lock); + + return status; + } diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index 7d7a812ff..50bebc680 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -12,15 +12,18 @@ license=('GPL3') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz - history_menu_crash_patch) -md5sums=('e7c818b93c7303daadf6093c6ebe79f9' - '8fd6e07fa907865ca4db7b3e13441ce6') + history_menu_crash_patch + parcellite-1.0.2rc5-glib.patch) +md5sums=('fa2d3ac8ec70df47e425695919bbc097' + '8fd6e07fa907865ca4db7b3e13441ce6' + '5fad7f05a198bb9ff8b79544b42d51ff') build() { cd "$srcdir/parcellite-$pkgver" (cd src && patch -p0 <$srcdir/history_menu_crash_patch) - make distclean + patch -Np1 -i ${srcdir}/parcellite-1.0.2rc5-glib.patch ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR="$pkgdir" install + make distclean } diff --git a/community/parcellite/parcellite-1.0.2rc5-glib.patch b/community/parcellite/parcellite-1.0.2rc5-glib.patch new file mode 100644 index 000000000..d4e1312e2 --- /dev/null +++ b/community/parcellite/parcellite-1.0.2rc5-glib.patch @@ -0,0 +1,11 @@ +--- parcellite-1.0.2rc5.orig/src/keybinder.h 2011-09-09 18:02:32.000000000 -0500 ++++ parcellite-1.0.2rc5/src/keybinder.h 2012-12-26 09:30:05.145148674 -0500 +@@ -20,7 +20,7 @@ + #ifndef __KEY_BINDER_H__ + #define __KEY_BINDER_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 9a057f50b..31e5c98d8 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75524 2012-08-26 20:10:27Z spupykin $ +# $Id: PKGBUILD 82109 2013-01-08 18:48:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.3.0.3 +pkgver=0.4.0 pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') @@ -18,13 +18,12 @@ options=('!libtool') install=parole.install #source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('19b57753085c1effb3157df0f1373f4c') +md5sums=('df05ff037c6063c905e5bb40a50b6e0f') build() { cd "$srcdir/$pkgname-$pkgver" - # Work around DSO linking issue -# LDFLAGS+=' -lX11' + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac.in [ -x configure ] || ./autogen.sh diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 8b5d0ee43..be2a6ff67 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80699 2012-11-29 16:18:21Z spupykin $ +# $Id: PKGBUILD 81903 2013-01-03 10:07:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.10.0 +pkgver=4.11.0 #_rel=stable _rel=devel pkgrel=1 @@ -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=('aab3d07aecfe821a792421fb4fb88a4f') +md5sums=('fd2e9c0145e224ca022783e61caf6fc5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD index f8fee5daa..8f06f9a2e 100644 --- a/community/partclone/PKGBUILD +++ b/community/partclone/PKGBUILD @@ -9,7 +9,7 @@ pkgname=partclone pkgver=0.2.48 pkgrel=4 pkgdesc="Back up and restore used-blocks of a partition" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://partclone.org" license=('GPL') depends=('progsreiserfs' 'ntfs-3g') diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD new file mode 100644 index 000000000..8533aab0f --- /dev/null +++ b/community/pcsxr/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 66302 2012-02-23 13:44:59Z allan $ +## Maintainer: schuay <jakob.gruber@gmail.com> +## Contributor: quantax -- contact via Arch Linux forum or AUR +## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=pcsxr +pkgver=1.9.92 +pkgrel=4 +pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project' +arch=('i686' 'x86_64') +url='http://pcsxr.codeplex.com/' +license=('GPL') +depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa') +conflicts=('pcsx-df') +_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)" +source=($pkgname-$pkgver.tar.bz2::$_pkgurl) +md5sums=('28411aed0b4424f97227d94bdefaec83') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-libcdio --enable-opengl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index 19e4172e7..2e7c4248c 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=6 pkgdesc='PowerDNS recursor' url='http://www.powerdns.com' license=('GPL') -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') depends=('gcc-libs') # 'lua') makedepends=('boost') backup=('etc/powerdns/recursor.conf') diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index 1d52dd8af..b7b6b609e 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pdns pkgver=3.1 pkgrel=5 pkgdesc="Modern, advanced and high performance authoritative-only nameserver" -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.powerdns.com/' license=('GPL') depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua' 'boost-libs') diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index 231e2e1b8..751bd58af 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,49 +1,54 @@ -# $Id: PKGBUILD 80631 2012-11-27 14:08:01Z fyan $ -# Maintainer: +# $Id: PKGBUILD 81762 2012-12-28 23:22:15Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm pkgver=0.1.16 -pkgrel=1 -pkgdesc="A small, fast, functional, and flexible window manager" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc='Small, fast, functional, and flexible window manager' +arch=('x86_64' 'i686' 'mips64el') license=('GPL') url='https://www.pekwm.org/projects/pekwm' depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr') +makedepends=('gendesk') +optdepends=('lxappearance: feature-rich GTK+ theme switcher' + 'nitrogen: background browser and setter' + 'tint2: basic, good-looking task manager') backup=(etc/pekwm/autoproperties etc/pekwm/autoproperties_typerules - etc/pekwm/config - etc/pekwm/config_system - etc/pekwm/keys - etc/pekwm/menu - etc/pekwm/mouse - etc/pekwm/mouse_click + etc/pekwm/config + etc/pekwm/config_system + etc/pekwm/keys + etc/pekwm/menu + etc/pekwm/mouse + etc/pekwm/mouse_click etc/pekwm/mouse_sloppy etc/pekwm/mouse_system - etc/pekwm/start + etc/pekwm/start etc/pekwm/vars) source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" - 'pekwm.desktop') + "${pkgname}_kdm.desktop") +sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96' + '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Default settings: - # --enable-shape --enable-xinerama --enable-menus \ - # --enable-harbour --disable-debug --disable-pedantic \ - # --enable-xft --enable-image-xpm --enable-image-jpeg \ - # --enable-image-png --enable-xrandr - ./configure --prefix=/usr --sysconfdir=/etc + cd "$srcdir" + gendesk + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/xsessions/$pkgname.desktop" + install -Dm644 "$srcdir/${pkgname}_kdm.desktop" \ + "$pkgdir//usr/share/apps/kdm/sessions/$pkgname.desktop" } -# vim: ts=2 sw=2 et ft=sh -md5sums=('ec9bce332d0545c28f74ca4bf6b69cbb' - '5a78fc6653fbb0b7282ecf7f1f81e2c5') + +# vim: ts=2 sw=2 et diff --git a/community/pekwm/pekwm_kdm.desktop b/community/pekwm/pekwm_kdm.desktop new file mode 100644 index 000000000..b77722d03 --- /dev/null +++ b/community/pekwm/pekwm_kdm.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=XSession +Exec=pekwm +TryExec=pekwm +Name=PekWM diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f652bae14..b4c8507e2 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81055 2012-12-11 09:51:48Z mtorromeo $ +# $Id: PKGBUILD 82183 2013-01-11 08:38:38Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.28_rel29.2 +pkgver=5.5.28_rel29.3 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') @@ -102,7 +102,7 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -sha256sums=('4f2ca2b4bf8ebdde0d5c643cc382fd7242492c084715b5c7d83619a9ff7a40a4' +sha256sums=('f131fb20de0a349cc354da7eb0156fe0d5c3c66506a99ea7d8edb8319e9e4922' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD index 4a1ee0bc0..980328c48 100644 --- a/community/perl-term-readline-gnu/PKGBUILD +++ b/community/perl-term-readline-gnu/PKGBUILD @@ -9,7 +9,7 @@ pkgname=perl-term-readline-gnu pkgver=1.20 pkgrel=4 pkgdesc="GNU Readline XS library wrapper" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl>=5.7') diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD index ced5668d1..e0f140e60 100644 --- a/community/perl-xml-fast/PKGBUILD +++ b/community/perl-xml-fast/PKGBUILD @@ -6,7 +6,7 @@ pkgname=perl-xml-fast pkgver=0.11 pkgrel=3 pkgdesc="Simple and very fast XML to hash conversion." -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url="http://search.cpan.org/dist/XML-Fast/" license=('GPL' 'PerlArtistic') depends=('perl') diff --git a/community/pidgin-gfire/PKGBUILD b/community/pidgin-gfire/PKGBUILD index c3f268c1a..04b0adcc9 100644 --- a/community/pidgin-gfire/PKGBUILD +++ b/community/pidgin-gfire/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pidgin-gfire pkgver=0.9.4 pkgrel=4 pkgdesc="Gfire is an Plugin for the Pidgin IM client which allows you to connect the Xfire network." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://gfireproject.org/" license=('GPL') depends=('glib2' 'pidgin' 'libnotify' 'gtk2') diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD index bd2130cab..c62910921 100644 --- a/community/pidgin-hotkeys/PKGBUILD +++ b/community/pidgin-hotkeys/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pidgin-hotkeys pkgver=0.2.4 pkgrel=2 pkgdesc="A Pidgin plugin that allows you to define global hotkeys." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://pidgin-hotkeys.sourceforge.net" license=('GPL') depends=('pidgin') diff --git a/community/pidgin-lwqq/0.1a_fix.patch b/community/pidgin-lwqq/0.1a_fix.patch new file mode 100644 index 000000000..63f2adfd0 --- /dev/null +++ b/community/pidgin-lwqq/0.1a_fix.patch @@ -0,0 +1,12 @@ +--- a/src/liblwqq/http.c ++++ b/src/liblwqq/http.c +@@ -515,7 +515,9 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, void *userp) + } + if(g->still_running){ + lwqq_log(LOG_NOTICE,"still running:%d,timeout:%ld\n",g->still_running,timeout_ms); ++ #if USE_DEBUG + if(g->still_running>1)lwqq_gdb_whats_running(); ++ #endif + } + //close time clock + //this should always return 0 this is curl!! diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD new file mode 100644 index 000000000..ccac379d4 --- /dev/null +++ b/community/pidgin-lwqq/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 81655 2012-12-26 06:16:37Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=pidgin-lwqq +pkgver=0.1a +_pkgver=0.1-a +pkgrel=3 +pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" +arch=('i686' 'x86_64' 'mips64el') +url="https://github.com/xiehuc/pidgin-lwqq" +license=('GPL3') +depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme' 'gtk-update-icon-cache') +optdepends=('telepathy-haze: Empathy plugin support') +makedepends=('git' 'cmake') +install=$pkgname.install +source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz" + 0.1a_fix.patch) + +build() +{ + cd "${srcdir}/$pkgname-${_pkgver}" + patch -Np1 -i "$srcdir/0.1a_fix.patch" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBEV=On .. + make +} + +package() +{ + cd "$srcdir/$pkgname-${_pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('d0efece1c2b2301f49c68f8a2b7bae95' + '18baf836e3a1198cdd9dbed287bf6609') diff --git a/community/pidgin-lwqq/pidgin-lwqq.install b/community/pidgin-lwqq/pidgin-lwqq.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/community/pidgin-lwqq/pidgin-lwqq.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD index da52e82c9..da52e82c9 100755..100644 --- a/community/pigz/PKGBUILD +++ b/community/pigz/PKGBUILD diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD new file mode 100644 index 000000000..a17922d7d --- /dev/null +++ b/community/pion/PKGBUILD @@ -0,0 +1,46 @@ +# $Id:$ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=pion +pkgver=4.0.13.1 +# use the git snapshot until a new version is out +_pkgver=dddce5e02d8a60f958e466e690d38eee924475b0 +pkgrel=1 +pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" +url="http://www.cloudmeter.com/pion/support/" +arch=('i686' 'x86_64' 'mips64el') +license=('custom:Boost') +depends=('boost-libs' 'openssl' 'log4cpp') +makedepends=('boost') +provides=('pion-net') +conflicts=('pion-net') +replaces=('pion-net') +source=(https://github.com/cloudmeter/pion/archive/${_pkgver}.zip) +md5sums=('87b710deb5e526a2c7f045d25eba2bee') + +build() { + cd "$srcdir/$pkgname-$_pkgver" + + sh autogen.sh + + # override configure bug (forces debug even when nobody asked for it) + sed -i "s/ -ggdb//g" configure + # override Makefile bug + sed -i "/docs:/ s/doxygen-doc//" Makefile.in + + ./configure --prefix=/usr --disable-doxygen-doc + + make +} + +check() { + cd "$srcdir/$pkgname-$_pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" +} diff --git a/community/plan9port/plan9.sh b/community/plan9port/plan9.sh index 84c3d7ef4..84c3d7ef4 100755..100644 --- a/community/plan9port/plan9.sh +++ b/community/plan9port/plan9.sh diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index 890dc66c0..eb93e0d1d 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75051 2012-08-13 05:24:10Z bpiotrowski $ +# $Id: PKGBUILD 82111 2013-01-08 18:49:13Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.5.2 +pkgver=1.5.4 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') makedepends=('pkgconfig' 'boost') install=poedit.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d58ff8b5a821d68258699b2697ec9041') +md5sums=('708991f73368f2ea7a24134058d2caf2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 4e91a7f0f..09e5ae176 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,33 +1,26 @@ -# $Id: PKGBUILD 74006 2012-07-18 01:08:18Z ibiru $ +# $Id: PKGBUILD 81929 2013-01-03 15:09:22Z svenstaro $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH -pkgver=0.9.5 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" license=('GPL' 'custom') -depends=('curl' 'boost-libs' 'gsasl' 'gnutls' +depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('4bdea98bfc142a825c64b77feb4667d0') +md5sums=('1d8686b8968475cfc76e873a17a53efc') build() { cd "$srcdir/$_realname-$pkgver-src" - sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp - - sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp - - # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' - sed \ - -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ - -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + sed -i '31 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp qmake $pkgname.pro make @@ -38,8 +31,6 @@ package() { make INSTALL_ROOT="$pkgdir" install - install -D "$pkgname" "$pkgdir/usr/bin/$pkgname" install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" - rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" } diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 8fd3a5ca0..236448537 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76606 2012-09-24 15:07:54Z dan $ +# $Id: PKGBUILD 82020 2013-01-05 17:33:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxm changelog=$pkgname.changelog options=('!libtool') source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('32d181bbf0e648fe31c95b3dd23f7e4e49094d93cb4278fdf71c8feed4e9593c') +sha256sums=('57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make @@ -28,9 +28,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install cd utils - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install } diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 4e12d69f7..23a3034f8 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * postgis-2.0.2-1 + 2012-09-24 Dan McGee <dan@archlinux.org> * Rebuild for PostgreSQL 9.2.x * Update to minor release 2.0.1 @@ -10,10 +13,10 @@ * Update to major release 2.0.0-1 2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#26159 fix in postgis-1.5.3-2 + * FS#26159 fix in postgis-1.5.3-2 2010-10-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.5.2 + * Update to major release 1.5.2 2010-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.5.1 + * Update to major release 1.5.1 diff --git a/community/pound/pound.init b/community/pound/pound.init index b8187c81f..b8187c81f 100755..100644 --- a/community/pound/pound.init +++ b/community/pound/pound.init diff --git a/community/pound/pound.runit b/community/pound/pound.runit index ed59ea046..ed59ea046 100755..100644 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit diff --git a/community/povray/LICENSE b/community/povray/LICENSE new file mode 100644 index 000000000..8a22b9e7e --- /dev/null +++ b/community/povray/LICENSE @@ -0,0 +1,237 @@ + POV-Ray Licence Agreement + GENERAL LICENSE AGREEMENT + FOR PERSONAL USE + Persistence of Vision Ray Tracer (POV-Ray) + Version 3.6 License and Terms & Conditions of Use + version of 1 February 2005 + (also known as POVLEGAL.DOC) + +Please read through the terms and conditions of this license carefully. This +license is a binding legal agreement between you, the 'User' (an individual +or single entity) and Persistence of Vision Raytracer Pty. Ltd. ACN 105 891 +870 (herein also referred to as the "Company"), a company incorporated in the +state of Victoria, Australia, for the product known as the "Persistence of +Vision Ray Tracer", also referred to herein as 'POV-Ray'. + +YOUR ATTENTION IS PARTICULARLY DRAWN TO THE DISCLAIMER OF WARRANTY AND NO +LIABILITY AND INDEMNITY PROVISIONS. TO USE THE PERSISTENCE OF VISION RAY +TRACER ("POV-RAY") YOU MUST AGREE TO BE BOUND BY THE TERMS AND CONDITIONS SET +OUT IN THIS DOCUMENT. IF YOU DO NOT AGREE TO ALL THE TERMS AND CONDITIONS OF +USE OF POV-RAY SET OUT IN THIS LICENSE AGREEMENT, OR IF SUCH TERMS AND +CONDITIONS ARE NOT BINDING ON YOU IN YOUR JURISDICTION, THEN YOU MAY NOT USE +POV-RAY IN ANY MANNER. THIS GENERAL LICENSE AGREEMENT MUST ACCOMPANY ALL +POV-RAY FILES WHETHER IN THEIR OFFICIAL OR CUSTOM VERSION FORM. IT MAY NOT BE +REMOVED OR MODIFIED. THIS GENERAL LICENSE AGREEMENT GOVERNS THE USE OF +POV-RAY WORLDWIDE. THIS DOCUMENT SUPERSEDES AND REPLACES ALL PREVIOUS GENERAL +LICENSES. + +INTRODUCTION + +This document pertains to the use of the Persistence of Vision Ray Tracer +(also known as POV-Ray). It applies to all POV-Ray program source files, +executable (binary) files, scene files, documentation files, help files, +bitmaps and other POV-Ray files contained in official Company archives, +whether in full or any part thereof, and are herein referred to as the +"Software". The Company reserves the right to revise these rules in future +versions and to make additional rules to address new circumstances at any +time. Such rules, when made, will be posted in a revised license file, the +latest version of which is available from the Company website at +http://www.povray.org/povlegal.html. + +USAGE PROVISIONS + +Subject to the terms and conditions of this agreement, permission is granted +to the User to use the Software and its associated files to create and render +images. The creator of a scene file retains all rights to any scene files +they create, and any images generated by the Software from them. Subject to +the other terms of this license, the User is permitted to use the Software in +a profit-making enterprise, provided such profit arises primarily from use of +the Software and not from distribution of the Software or a work including +the Software in whole or part. + +Please refer to http://www.povray.org/povlegal.html for licenses covering +distribution of the Software and works including the Software. + +The User is also granted the right to use the scene files, fonts, bitmaps, +and include files distributed in the INCLUDE and SCENES\INCDEMO sub- +directories of the Software in their own scenes. Such permission does not +extend to any other files in the SCENES directory or its sub-directories. The +SCENES files are for the User's enjoyment and education but may not be the +basis of any derivative works unless the file in question explicitly grants +permission to do such. + +This licence does not grant any right of re-distribution or use in any manner +other than the above. The Company has separate license documents that apply +to other uses (such as re-distribution via the internet or on CD) ; please +visit http://www.povray.org/povlegal.html for links to these. In particular +you are advised that the sale, lease, or rental of the Software in any form +without written authority from the Company is explicitly prohibited. + +Notwithstanding anything in the the balance of this licence agreement, +nothing in this licence agreement permits the installation or use of the +Software in conjunction with any product (including software) produced +or distributed by any party who is, or has been, in violation of this +licence agreement or of the distribution licence + (http://www.povray.org/distribution-license.html) +(or any earlier or later versions of those documents) unless: + + a. the Company has explicitly released that party in writing from the + consequences of their non compliance; or + b. both of the following are true: + i. the installation or use of the Software is without the User + being aware of the abovementioned violation; and + ii. the installation or use of the Software is not a result (whether + direct or indirect) of any request or action of the abovementioned + party (or any of its products), any agent of that party (or any of + their products), or any person(s) involved in supplying any such + product to the User. + +COPYRIGHT + +Copyright 1991-2003, Persistence of Vision Team. +Copyright 2003-2004, Persistence of Vision Raytracer Pty. Ltd. +Windows version Copyright 1996-2003, Christopher Cason. + +Copyright subsists in this Software which is protected by Australian and +international copyright laws. The Software is NOT PUBLIC DOMAIN. + +Nothing in this agreement shall give you any rights in respect of the +intellectual property of the Company and you acknowledge that you do not +acquire any rights in respect of such intellectual property rights. You +acknowledge that the Software is the valuable intellectual property of the +Company and that if you use, modify or distribute the Software for +unauthorized purposes or in an unauthorized manner (or cause or allow the +forgoing to occur), you will be liable to the Company for any damages it may +suffer (and which you acknowledge it may suffer) as well as statutory damages +to the maximum extent permitted by law and also that you may be liable to +criminal prosecution. You indemnify the Company and the authors of the +Software for every single consequence flowing from the aforementioned events. + +DISCLAIMER OF WARRANTY + +This Software is provided on an "AS IS" basis, without warranty of any kind, +express or implied, including without limitation, any implied warranties of +merchantability, fitness for a particular purpose and non-infringement of +intellectual property of any third party. This Software has inherent +limitations including design faults and programming bugs. The entire risk as +to the quality and performance of the Software is borne by you, and it is +your responsibility to ensure that it does what you require it to do prior to +using it for any purpose (other than testing it), and prior to distributing +it in any fashion. Should the Software prove defective, you agree that you +alone assume the entire cost resulting in any way from such defect. + +This disclaimer of warranty constitutes an essential and material term of +this agreement. If you do not or cannot accept this, or if it is +unenforceable in your jurisdiction, then you may not use the Software in any +manner. + +NO LIABILITY + +When you use the Software you acknowledge and accept that you do so at your +sole risk. You agree that under no circumstances shall you have any claim +against the Company or anyone associated directly or indirectly with the +Company whether as employee, subcontractor, agent, representative, +consultant, licensee or otherwise ("Company Associates") for any loss, +damages, harm, injury, expense, work stoppage, loss of business information, +business interruption, computer failure or malfunction which may be suffered +by you or by any third party from any cause whatsoever, howsoever arising, in +connection with your use or distribution of the Software even where the +Company were aware, or ought to have been aware, of the potential of such +loss. Damages referred to above shall include direct, indirect, general, +special, incidental, punitive and/or consequential. + +This disclaimer of liability constitutes an essential and material term of +this agreement. If you do not or cannot accept this, or if it is +unenforceable in your jurisdiction, then you may not use the Software. + +INDEMNITY + +You indemnify the Company and Company Associates and hold them harmless +against any claims which may arise from any loss, damages, harm, injury, +expense, work stoppage, loss of business information, business interruption, +computer failure or malfunction, which may be suffered by you or any other +party whatsoever as a consequence of any act or omission of the Company +and/or Company Associates, whether negligent or not, arising out of your use +and/or distribution of the Software, or from any other cause whatsoever, +howsoever arising, in connection with the Software. These provisions are +binding on your estate, heirs, executors, legal successors, administrators, +parents and/or guardians. + +This indemnification constitutes an essential and material term of this +agreement. If you do not or cannot accept this, or if it is unenforceable in +your jurisdiction, then you may not use the Software. + +HIGH RISK ACTIVITIES + +This Software and the output produced by this Software is not fault-tolerant +and is not designed, manufactured or intended for use as on-line control +equipment in hazardous environments requiring fail-safe performance, in which +the failure of the Software could lead or directly or indirectly to death, +personal injury, or severe physical or environmental damage ("High Risk +Activities"). The Company specifically disclaims any express or implied +warranty of fitness for High Risk Activities and explicitly prohibits the use +of the Software for such purposes. + +CRYPTOGRAPHIC SIGNING OF DOCUMENTS + +Changes to this Agreement and documents issued under its authority may be +cryptographically signed by the POV-Ray Team Co-ordinator's private PGP key. +In the absence of evidence to the contrary, such documents shall be considered, +under the terms of this Agreement, to be authentic provided the signature is +valid. The master copy of this Agreement at http://www.povray.org/povlegal.html +will also be signed by the current version of the team-coordinator's key. + +The public key for the POV-Ray Team-coordinator can be retrieved from the +location https://secure.povray.org/keys/. The current fingerprint for it is +B4DD 932A C080 C3A3 6EA2 9952 DB04 4A74 9901 4518. + +MISCELLANEOUS + +This Agreement constitutes the complete agreement concerning this license. +Any changes to this agreement must be in writing and may take the form of +notifications by the Company to you, or through posting notifications on the +Company website. THE USE OF THIS SOFTWARE BY ANY PERSON OR ENTITY IS +EXPRESSLY MADE CONDITIONAL ON THEIR ACCEPTANCE OF THE TERMS SET FORTH HEREIN. + +Except where explicitly stated otherwise herein, if any provision of this +Agreement is found to be invalid or unenforceable, the invalidity or +unenforceability of such provision shall not affect the other provisions of +this agreement, and all provisions not affected by such invalidity or +unenforceability shall remain in full force and effect. In such cases you +agree to attempt to substitute for each invalid or unenforceable provision a +valid or enforceable provision which achieves to the greatest extent +possible, the objectives and intention of the invalid or unenforceable +provision. The validity and interpretation of this agreement will be governed +by the laws of Australia in the state of Victoria (except for conflict of law +provisions). + +CONTACT INFORMATION + +License inquiries can be made via email; please use the following address +(but see below prior to emailing) : + + team-coord-[three-letter month]-[four-digit year]@povray.org + +for example, team-coord-jun-2004@povray.org should be used if at the time you +send the email it is the month of June 2004. The changing email addresses are +necessary to combat spam and email viruses. Old email addresses may be deleted +at our discretion. + +Note that the above address may change for reasons other than that given above; +please check the version of this document at http://www.povray.org/povlegal.html +for the current address. Note that your inability or failure to contact us +for any reason is not an excuse for violating this licence. + +Do NOT send any attachments of any sort other than by prior arrangement. +EMAIL MESSAGES INCLUDING ATTACHMENTS WILL BE DELETED UNREAD. + +The following postal address is only for official license business. Please +note that it is preferred that initial queries about licensing be made via +email ; postal mail should only be used when email is not possible, or when +written documents are being exchanged by prior arrangement. + + Persistence of Vision Raytracer Pty. Ltd. + PO Box 407 + Williamstown, + Victoria 3016 + Australia diff --git a/community/povray/PKGBUILD b/community/povray/PKGBUILD new file mode 100644 index 000000000..34f7a22cb --- /dev/null +++ b/community/povray/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 74007 2012-07-18 01:08:29Z ibiru $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: red_over_blue +# Contributor: neri + +pkgname=povray +pkgver=3.7.0.RC6 +pkgrel=4 +pkgdesc="Script based raytracer for creating 3D graphics" +arch=('x86_64' 'i686') +license=('custom') +url="http://povray.org/" +depends=('libtiff' 'libpng' 'boost-libs') +makedepends=('boost') +backup=("etc/povray/${pkgver%.*.*}/povray.conf" + "etc/povray/${pkgver%.*.*}/povray.ini") +source=("http://www.povray.org/redirect/www.povray.org/beta/source/$pkgname-$pkgver.tar.gz" + 'povray3.7.0_rc3-user-conf.patch' + 'distribution-license.txt' + 'LICENSE' + 'source-license.txt') +sha256sums=('374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3' + '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0' + 'bcf6893c741568bbff6839bb7310b0c43af8cb54bae792da21123e1026f91ae9' + '9162060797de4f7f91ccf5e1fac5ec3378a0b0fed382393797ba3f4f27896402' + '7d80992314f7947f5f672a4ad8b1d072a6179f01fb0228a88e4224a8bd45de96') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:=no:=yes:' unix/config/ax_boost_thread.m4 + sed -i 's:AC_MSG_FAILURE(\[c:AC_MSG_RESULT(\[:' configure.ac + sed -i 's:TIME_UTC:TIME_UTC_:' \ + source/backend/scene/view.cpp \ + vfe/vfepovms.cpp \ + vfe/vfesession.cpp + ./bootstrap + patch -p1 < ../povray3.7.0_rc3-user-conf.patch + COMPILED_BY="Arch Linux" ./configure --prefix=/usr --sysconfdir=/etc + # --disable-optimiz #--with-boost-thread=boost_thread-gcc-mt + make CXXFLAGS+="-lboost_system" + gzip povray.1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/share/$pkgname-3.7" + cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-3.7" + mkdir -p "$pkgdir/usr/share/doc/$pkgname-3.7" + cp -r doc "$pkgdir/usr/share/doc/$pkgname-3.7" + install -Dm755 unix/povray "$pkgdir/usr/bin/povray" + install -Dm644 povray.conf "$pkgdir/etc/povray/3.7/povray.conf" + install -Dm644 povray.ini "$pkgdir/etc/povray/3.7/povray.ini" + install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz" + install -Dm644 ../LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 ../distribution-license.txt \ + "$pkgdir/usr/share/licenses/$pkgname/distribution-license.txt" + install -Dm644 ../source-license.txt \ + "$pkgdir/usr/share/licenses/$pkgname/source-license.txt" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/povray/distribution-license.txt b/community/povray/distribution-license.txt new file mode 100644 index 000000000..16615f148 --- /dev/null +++ b/community/povray/distribution-license.txt @@ -0,0 +1,532 @@ + POV-Ray License Agreement + DISTRIBUTOR'S LICENCE AGREEMENT + Persistence of Vision Raytracer(tm) (POV-Ray(tm)) + 13 August 2004 + +Licensed Versions: Versions 3.5 and 3.6 + +Please read through the terms and conditions of this license carefully. + +This is a binding legal agreement between you, the "Distributor" and +Persistence of Vision Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a +company incorporated in the state of Victoria, Australia, for the +product known as the "Persistence of Vision Raytracer(tm)", also +referred to herein as "POV-Ray(tm)". + +The terms of this agreement are set out at http://www.povray.org/distribution-license.html +("Official Terms"). The Official Terms take precedence over this document to the extent +of any inconsistency. + +1. INTRODUCTION + +1.1. In this agreement, except to the extent the context requires + otherwise, the following capitalised terms have the following + meanings: + + (a) Distribution means: + + (i) a single item of a distribution medium, including a CD Rom or + DVD Rom, containing software programs and/or data; + + (ii) a set of such items; + + (iii) a data file in a generally accepted data format from which + such an item can be created using generally available standard + tools; + + (iv) a number of such data files from which a set of such items can + be created; or + + (v) a data file in a generally accepted data storage format which is + an archive of software programs and/or data; + + (b) Derived Code means all software which is derived from or is an + adaptation of any part of the Software other than a scene file; + + (c) Intellectual Rights means: + + (i) all copyright, patent, trade mark, trade secret, design, and + circuit layout rights; + + (ii) all rights to the registration of such rights; and + + (iii) all rights of a similar nature + + which exist anywhere in the world; + + (d) Licensed Version means the version set out at the top of this + agreement against the heading "Licensed Version" and all minor + releases of this version (ie releases of the form x.y.z); + + (e) POV Associate means any person associated directly or indirectly + with POV whether as a director, officer, employee, subcontractor, + agent, representative, consultant, licensee or otherwise; + + (f) Modification Terms means the most recent version from time to time + of the document of that name made available from the Site + + (g) Revocation List means the list of that name linked to from the + Official Terms; + + (h) Site means www.povray.org; + + (i) Software means the Licensed Version of the Persistence of Vision + Raytracer(tm) (also known as POV-Ray(tm)) (including all POV-Ray + program source files, executable (binary) files, scene files, + documentation files, help files, bitmaps and other POV-Ray files + associated with the Licensed Version) in a form made available by + POV on the Site; + + (j) User Licence means the most recent version from time to time of + the document of that name made available from the Site. + +2. OPEN SOURCE DISTRIBUTIONS + +2.1. In return for the Distributor agreeing to be bound by the terms of + this agreement, POV grants the Distributor permission to make a + copy of the Software by including the Software in a generally + recognised Distribution of a recognised operating system where the + kernel of that operating system is made available under licensing + terms: + + (a) which are approved by the Open Source Initiative + (www.opensource.org) as complying with the "Open Source + Definition" put forward by the Open Source Initiative; or + + (b) which comply with the "free software definition" of the Free + Software Foundation (www.fsf.org). + +2.2. As at June 2004, and without limiting the generality of the term, + each of the following is a "generally recognised Distribution" for + the purposes of clause 2.1: Debian, Red Hat (Enterprise and + Fedora), SuSE, Mandrake, Xandros, Gentoo and Knoppix Linux + distributions, and officially authorized distributions of the + FreeBSD, OpenBSD, and NetBSD projects. + +2.3. Clause 2.1 also applies to the Software being included in the above + distributions 'package' and 'ports' systems, where such exist; + +2.4. Where the Distributor reproduces the Software in accordance with + clause 2.1: + + (a) the Distributor may rename, reorganise or repackage (without + omission) the files comprising the Software where such + renaming, reorganisation or repackaging is necessary to + conform to the naming or organisation scheme of the target + operating environment of the Distribution or of an established + package management system of the target operating environment + of the Distribution; and + + (b) the Distributor must not otherwise rename, reorganise or + repackage the Software. + +3. DISTRIBUTION LICENCE + +3.1. Subject to the terms and conditions of this agreement, and in + return for Distributor agreeing to be bound by the terms of this + agreement, POV grants the Distributor permission to make a copy of + the Software in any of the following circumstances: + + (a) in the course of providing a mirror of the POV-Ray Site (or + part of it), which is made available generally over the + internet to each person without requiring that person to + identify themselves and without any other restriction other + than restrictions designed to manage traffic flows; + + (b) by placing it on a local area network accessible only by + persons authorized by the Distributor whilst on the + Distributor's premises; + + (c) where that copy is provided to a staff member or student + enrolled at a recognised educational institution; + + (d) by including the Software as part of a Distribution where: + + (i) neither the primary nor a substantial purpose of the + distribution of the Distribution is the distribution of + the Software. That is, the distribution of the Software + is merely incidental to the distribution of the + Distribution; and + + (ii) if the Software was not included in the Distribution, + the remaining software and data included within the + Distribution would continue to function effectively and + according to its advertised or intended purpose; + + (e) by including the Software as part of a Distribution where: + + (i) there is no data, program or other files apart from the + Software on the Distribution; + + (ii) the Distribution is distributed by a person to another + person known to that person; or + + (iii) the Distributor has obtained explicit written + authority from POV to perform the distribution, citing + this clause number, prior to the reproduction being + made. + +3.2. In each case where the Distributor makes a copy of the Software in + accordance with clause 3.1, the Distributor must, unless no payment + or other consideration of any type is received by Distributor in + relation to the Distribution: + + (a) ensure that each person who receives a copy of the Software + from the Distributor is aware prior to acquiring that copy: + + (i) of the full name and contact details of the Distributor, + including the Distributor's web site, street address, mail + address, and working email address; + + (ii) that the Software is available without charge from the + Site; + + (iii) that no charge is being made for the granting of a + licence over the Software. + + (b) include a copy of the User Licence and this Distribution + License with the copy of the Software. These licences must be + stored in the same subdirectory on the distribution medium as + the Software and named in such a way as to prominently + identify their purpose; + +3.3. The Distributor must not rename, reorganise or repackage any of the + files comprising the Software without the prior written authority + of POV. + +3.4. Except as explicitly set out in this agreement, nothing in this + agreement permits Distributor to make any modification to any part + of the Software. + +4. RESTRICTIONS ON DISTRIBUTION + +4.1. Nothing in this agreement gives the Distributor: + + (a) any ability to grant any licence in respect of the use of the + Software or any part of it to any person; + + (b) any rights or permissions in respect of, including rights or + permissions to distribute or permit the use of, any Derived + Code; + + (c) any right to bundle a copy of the Software (or part thereof), + whether or not as part of a Distribution, with any other + items, including books and magazines. POV may, in response to + a request, by notice in writing and in its absolute + discretion, permit such bundling on a case by case basis. + This clause 4.1(c) does not apply to Distributions permitted + under clause 2; + + (d) any right, permission or authorisation to infringe any + Intellectual Right held by any third party. + +4.2. Distributor may charge a fee for the making or the provision of a + copy of the Software. + +4.3. Where the making, or the provision, of a copy of the Software is + authorised under the terms of clause 3 but not under those of + clause 2 of this agreement, the total of all fees charged in + relation to such making or provision and including all fees + (including shipping and handling fees) which are charged in respect + of any software, hardware or other material provided in conjunction + with or in any manner which is reasonably connected with the + making, or the provision, of a copy of the Software must not exceed + the reasonable costs incurred by the Distributor in making the + reproduction, or in the provision, of that copy for which the fee + is charged. + +4.4. Notwithstanding anything else in this agreement, nothing in this + agreement permits the reproduction of any part of the Software by, + or on behalf of: + + (a) Any person currently listed on the Revocation List from time + to time; + + (b) Any related body corporate (as that term is defined in section + 50 of the Corporations Law 2001 (Cth)) of any person referred + to in clause 4.4(a); + + (c) Any person in the course of preparing any publication in any + format (including books, magazines, CD Roms or on the + internet) for any of the persons identified in paragraph (a); + + (d) Any person who is, or has been, in breach of this Agreement + and that breach has not been waived in writing signed by POV; + or + + (e) Any person to whom POV has sent a notice in writing or by + email stating that that person may not distribute the + Software. + +4.5. From the day two years after a version of the Software more recent + than the Licensed Version is made available by POV on the Site + clause 3 only permits reproduction of the Software where the + Distributor ensures that each recipient of such a reproduction is + aware, prior to obtaining that reproduction, that that reproduction + of the Software is an old version of the Software and that a more + recent version of the Software is available from the Site. + +5. COPYRIGHT AND NO LITIGATION + +5.1. Copyright subsists in the Software and is protected by Australian + and international copyright laws. + +5.2. Nothing in this agreement gives Distributor any rights in respect + of any Intellectual Rights in respect of the Software or which are + held by or on behalf of POV. Distributor acknowledges that it does + not acquire any rights in respect of such Intellectual Rights. + +5.3. Distributor acknowledges that if it performs out any act in respect + of the Software without the permission of POV it will be liable to + POV for all damages POV may suffer (and which Distributor + acknowledges it may suffer) as well as statutory damages to the + maximum extent permitted by law and that it may also be liable to + criminal prosecution. + +5.4. Distributor must not commence any action against any person alleging + that the Software or the use or distribution of the Software infringes + any rights, including Intellectual Rights of the Distributor or of any + other person. If Distributor provides one or more copies of the + Software to any other person in accordance with the agreement, + Distributor waives all rights it has, or may have in the future, to + bring any action, directly or indirectly, against any person to the + extent that such an action relates to an infringement of any rights, + including Intellectual Rights of any person in any way arising from, or + in relation to, the use, or distribution, (including through the + authorisation of such use or distribution) of: + (a) the Software; + (b) any earlier or later version of the Software; or + (c) any other software to the extent it incorporates elements of the + software referred to in paragraphs (a) or (b) of this clause + 5.4. + +6. DISCLAIMER OF WARRANTY + +6.1. To the extent permitted by law, all implied terms and conditions + are excluded from this agreement. Where a term or condition is + implied into this agreement and that term cannot be legally + excluded, that term has effect as a term or condition of this + agreement. However, to the extent permitted by law, the liability + of POV for a breach of such an implied term or condition is limited + to the fullest extent permitted by law. + +6.2. To the extent permitted by law, this Software is provided on an "AS + IS" basis, without warranty of any kind, express or implied, + including without limitation, any implied warranties of + merchantability, fitness for a particular purpose and + non-infringement of intellectual property of any third party. The + Software has inherent limitations including design faults and + programming bugs. + +6.3. The entire risk as to the quality and performance of the Software + is borne by Distributor, and it is Distributor's responsibility to + ensure that the Software fulfils Distributor's requirements prior + to using it in any manner (other than testing it for the purposes + of this paragraph in a non-critical and non-production + environment), and prior to distributing it in any fashion. + +6.4. This clause 6 is an essential and material term of, and cannot be + severed from, this agreement. If Distributor does not or cannot + agree to be bound by this clause, or if it is unenforceable, then + Distributor must not, at any time, make any reproductions of the + Software under this agreement and this agreement gives the + Distributor no rights to make any reproductions of any part of the + Software. + +7. NO LIABILITY + +7.1. When you distribute or use the Software you acknowledge and accept + that you do so at your sole risk. Distributor agrees that under no + circumstances will it have any claim against POV or any POV + Associate for any loss, damages, harm, injury, expense, work + stoppage, loss of business information, business interruption, + computer failure or malfunction which may be suffered by you or by + any third party from any cause whatsoever, howsoever arising, in + connection with your use or distribution of the Software even where + POV was aware, or ought to have been aware, of the potential of + such loss. + +7.2. Neither POV nor any POV Associate has any liability to Distributor + for any indirect, general, special, incidental, punitive and/or + consequential damages arising as a result of a breach of this + agreement by POV or which arises in any way related to the Software + or the exercise of a licence granted to Distributor under this + agreement. + +7.3. POV's total aggregate liability to the Distributor for all loss or + damage arising in any way related to this agreement is limited to + the lesser of: (a) AU$100, and (b) the amount received by POV from + Distributor as payment for the grant of a licence under this + agreement. + +7.4. Distributor must bring any action against POV in any way related to + this agreement or the Software within 3 months of the cause of + action first arising. Distributor waives any right it has to bring + any action against POV and releases POV from all liability in + respect of a cause of action if initiating process in relation to + that action is not served on POV within 3 months of the cause of + action arising. Where a particular set of facts give rise to more + than one cause of action this clause 7.4 applies as if all such + causes of action arise at the time the first such cause of action + arises. + +7.5. This clause 7 is an essential and material term of, and cannot be + severed from, this agreement. If Distributor does not or cannot + agree to be bound by this clause, or if it is unenforceable, then + Distributor must not, at any time, make any reproductions of the + Software under this agreement and this agreement gives the + Distributor no rights to make any reproductions of any part of the + Software. + +8. INDEMNITY + +8.1. Distributor indemnifies POV and each POV Associate and holds each + of them harmless against all claims which arise from any loss, + damages, harm, injury, expense, work stoppage, loss of business + information, business interruption, computer failure or + malfunction, which may be suffered by Distributor or any other + party whatsoever as a consequence of: + + (a) any act or omission of POV and/or any POV Associate, whether + negligent or not; + + (b) Distributor's use and/or distribution of the Software; or + + (c) any other cause whatsoever, howsoever arising, in connection + with the Software. + + This clause 8 is binding on Distributor's estate, heirs, executors, + legal successors, administrators, parents and/or guardians. + +8.2. Distributor indemnifies POV, each POV Associate and each of the + authors of any part of the Software against all loss and damage and + for every other consequence flowing from any breach by Distributor + of any Intellectual Right held by POV. + +8.3. This clause 8 constitutes an essential and material term of, and + cannot be severed from, this agreement. If Distributor does not or + cannot agree to be bound by this clause, or if it is unenforceable, + then Distributor must not, at any time, make any reproductions of + the Software under this agreement and this agreement gives the + Distributor no rights to make any reproductions of any part of the + Software. + +9. HIGH RISK ACTIVITIES + +9.1. This Software and the output produced by this Software is not + fault-tolerant and is not designed, manufactured or intended for + use as on-line control equipment in hazardous environments + requiring fail-safe performance, in which the failure of the + Software could lead or directly or indirectly to death, personal + injury, or severe physical or environmental damage ("High Risk + Activities"). POV specifically disclaims all express or implied + warranty of fitness for High Risk Activities and, notwithstanding + any other term of this agreement, explicitly prohibits the use or + distribution of the Software for such purposes. + +10. ENDORSEMENT PROHIBITION + +10.1. Distributor must not, without explicit written permission from + POV, claim or imply in any way that: + + (a) POV or any POV Associate officially endorses or supports the + Distributor or any product (such as CD, book, or magazine) + associated with the Distributor or any reproduction of the + Software made in accordance with this agreement; or + + (b) POV derives any benefit from any reproduction made in + accordance with this agreement. + +11. TRADEMARKS + +11.1. "POV-Ray(tm)", "Persistence of Vision Raytracer(tm)" and + "POV-Team(tm)" are trademarks of Persistence of Vision Raytracer + Pty. Ltd. Any other trademarks referred to in this agreement are + the property of their respective holders. Distributor must not + use, apply for, or register anywhere in the world, any word, name + (including domain names), trade mark or device which is + substantially identical or deceptively or confusingly similar to + any of Persistence of Vision Raytracer Pty. Ltd's trade marks. + +12. MISCELLANEOUS + +12.1. The Official Terms, including those documents incorporated by + reference into the Official Terms, and the Modification Terms + constitute the entire agreement between the parties relating to + the distribution of the Software and, except where stated to the + contrary in writing signed by POV, supersedes all previous + negotiations and correspondence in relation to it. + +12.2. POV may modify this agreement at any time by making a revised + licence available from the Site at http://www.povray.org/distribution-license.html. + This agreement is modified by replacing the terms in this + agreement with those of the revised licence from the time that the + revised licence is so made available. It is your responsibility to + ensure that you have read and agreed to the current version of + this agreement prior to distributing the Software. + +12.3. Except where explicitly stated otherwise herein, if any provision + of this Agreement is found to be invalid or unenforceable, the + invalidity or unenforceability of such provision shall not affect + the other provisions of this agreement, and all provisions not + affected by such invalidity or unenforceability shall remain in + full force and effect. In such cases Distributor agrees to + attempt to substitute for each invalid or unenforceable provision + a valid or enforceable provision which achieves to the greatest + extent possible, the objectives and intention of the invalid or + unenforceable provision. + +12.4. A waiver of a right under this agreement is not effective unless + given in writing signed by the party granting that waiver. Unless + otherwise stipulated in the waiver, a waiver is only effective in + respect of the circumstances in which it is given and is not a + waiver in respect of any other rights or a waiver in respect of + future rights or actions. + +12.5. The validity and interpretation of this agreement is governed by + the laws in force in the State of Victoria, Australia. + Distributor submits to the exclusive jurisdiction of the courts of + that State and courts located within that State exercising federal + jurisdiction. + +12.6. References in this agreement to "written" and "writing" mean on + paper or by fax and expressly exclude email and other forms of + electronic communication. + +13. CONTACT INFORMATION + +13.1. This clause 13 does not form part of the agreement. License + inquiries can be made via email; please use the following address + (but see 13.2 below prior to emailing) : + + team-coord-[three-letter month]-[four-digit year]@povray org. + + for example, team-coord-jun-2004@povray.org should be used if at + the time you send the email it is the month of June 2004. The + changing email addresses are necessary to combat spam. Old email + addresses may be deleted at POV's discretion. + +13.2. Note that the address referred to in 13.1 may change for reasons + other than those referred to in that clause; please check the + current version of this document at http://www.povray.org/distribution-license.html. + for the current address. Your inability or failure to contact us + is no excuse for violating the licence. + +13.3. Do NOT send any email attachments of any sort other than by prior + arrangement. Do not send email in HTML format. EMAIL MESSAGES + INCLUDING ATTACHMENTS WILL BE DELETED UNREAD. + +13.4. The following postal address is only for official license + business. Please note that it is preferred that initial queries + about licensing be made via email; postal mail should only be used + when email is not possible, or when written documents are being + exchanged by prior arrangement. While it is unlikely this address + will change in the short term it would be advisable to check + http://www.povray.org/distribution-license.html for the current + one prior to sending postal mail. + + Persistence of Vision Raytracer Pty. Ltd. + PO Box 407 + Williamstown, + Victoria 3016 + Australia diff --git a/community/povray/povray3.7.0_rc3-user-conf.patch b/community/povray/povray3.7.0_rc3-user-conf.patch new file mode 100644 index 000000000..f20d9b506 --- /dev/null +++ b/community/povray/povray3.7.0_rc3-user-conf.patch @@ -0,0 +1,27 @@ + Makefile.am | 13 ------------- + 1 files changed, 0 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 76b394c..9822c52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -107,19 +107,6 @@ install-data-local: + for f in $$filelist ; do \ + $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ + done +- @echo "Creating user directories..."; \ +- for p in $(povuser) $(povconfuser) ; do \ +- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ +- done +- @echo "Copying user configuration and INI files..."; \ +- for f in povray.conf povray.ini ; do \ +- if test -f $(povconfuser)/$$f; then \ +- echo "Creating backup of $(povconfuser)/$$f"; \ +- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ +- fi; \ +- done; \ +- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ +- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) + + # Remove data, config, and empty folders for 'make uninstall'. + # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). diff --git a/community/povray/source-license.txt b/community/povray/source-license.txt new file mode 100644 index 000000000..aaf3dbaa1 --- /dev/null +++ b/community/povray/source-license.txt @@ -0,0 +1,360 @@ + POV-Ray Licence Agreement + MODIFICATION TERMS + Persistence of Vision Raytracer(tm) (POV-Ray(tm)) + 5 July 2004 + +Licensed Version: Version 3.6 + +Please read through the terms and conditions of this agreement carefully. + +This is a binding legal agreement between you and Persistence of Vision +Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a company incorporated in the +state of Victoria, Australia, for the product known as the "Persistence of +Vision Raytracer(tm)", also referred to herein as "POV-Ray(tm)". In these +terms "Licensed Version" means the version of POV-Ray identified at the start +of these terms and all minor releases (ie releases of the form x.y.z) of that +version. + +The terms of this agreement are set out at: + http://www.povray.org/source-license.html +("Official Terms"). The Official Terms take precedence over this document to +the extent of any inconsistency. Except where POV has agreed with you in +writing to the contrary, the Official Terms are a complete statement of your +ability to modify the source code of the Licensed Version, to use any +modifications of the Licensed Version, and to distribute any modifications of +the Licensed Version. You may accept these terms by making any modification +to the Licensed Version, or by distributing any modification to the Licensed +Version. If you do not agree to be bound by these terms you must not make any +modifications to the source code of the Licensed Version and must not +distribute any modifications of the Licensed Version. + + 1. PERMITTED MODIFICATION AND USE + + 1.1. The source code of POV-Ray is provided to: promote the porting of + POV-Ray to hardware and operating systems which POV does not support; + promote experimentation and development of new features to the core + code which might eventually be incorporated into the official version; + and provide insight into the inner workings of the program for + educational purposes. + + 1.2. Except as expressly set out in this agreement, or permitted by another + agreement between you and POV, any use or modification of any POV-Ray + source code is expressly prohibited. + + 1.3. Subject to this clause 1.3 and the balance of this clause 1, you are + granted the privilege to modify and compile the source code of the + Licensed Version for your own personal use if such modification + fulfils one or more purposes set out in clause 1.1. Each output of + such a modification or compilation is called a "Modified Version" in + these terms and conditions. Nothing in these terms and conditions + gives you any rights or permissions to use, reproduce or modify any + part of the source code for any version of POV-Ray other than in a + modified version of POV-Ray. In particular, no portion of the source + code for the Licensed Version may, under any circumstances, be + incorporated into any other program (or separated out to form an + independent program) and all Modified Versions that you create must, + in substance, be modifications of the Licensed Version. + + 1.4. You may use any Modified Version that you alone have created only under + the conditions granted in the standard POV end-user license for the + Licensed Version from which the Modified Version was created. As at + July 2004, this licence may be found at: + http://www.povray.org/povlegal.doc. + Nothing in these terms permits any other person to use any Modified Version. + + 1.5. Neither the Licensed Version nor any Modified Version may be linked + into any other software package either at compile-time using (for + example) an object code linker nor at run-time as (for example) a DLL, + ActiveX control, OLE server, COM/DCOM server, or other remoting system + including, without limitation, any linkage that could blur the + end-user's perception of which program provides which functions. + + 1.6. To allow POV-Ray to communicate with outside programs, the official + versions of POV-Ray may include internal communication "hooks", often + called an Application Programming Interface, or API. Modification to + these APIs or other officially supported communication mechanisms (or + the addition of any new code or feature) for the purpose of avoidance + (or to assist others to avoid) the intent of this or any other POV + license is expressly prohibited. + + 2. CUSTOM VERSIONS + + 2.1. Strict conditions and restrictions are imposed if you wish to + distribute a modified version of POV-Ray, its documentation or other + parts of the package, including any translation of the documentation + into other languages or file formats. + + 2.2. For the purposes of these terms and conditions, a "Custom Version" + means a Modified Version which has all of the following characteristics: + + (a). it must have all of the functions of the Licensed Version with all + existing features, copyright notices, author attributions, all + Licence Agreements, etc., intact; + + (b). any reference to the software being an "Official Version" in any + files included in the Modified Version must be altered to clearly + state that it is not an official but an unofficial version; + + (c). when used by a user it must be clear to that user: + + (i). that the Modified Version is a version of POV-Ray that has + been modified, and does not appear to be another program + that happens to have POV-Ray or POV-Ray functionality + built-in; + + (ii). that the Modified Version is an unofficial version of + POV-Ray; + + (iii). who is the creator of the Modified Version; + + (d). the Modified Version must include accurate information in the + DISTRIBUTION_MESSAGE macros in the source file OPTOUT.H and must + prominently display this information. This information must at + least correctly identify who made the custom version. + + (e). It must display each copyright notice and credit screen which is + displayed by the Licensed Version and do so in a similar manner to + that of the Licensed Version. When each such notice or screen is + displayed, the Modified Version must indicate that the version is + a modified and unofficial version. In particular, if it is a + version of POV-Ray that contains splash screens or about boxes + (e.g. Windows, Macintosh) each splash screen and about box in the + Licensed Version must be present in the Modified Version and must + be rendered and presented in a similar manner; + + (f). if the Modified Version contains any feature that would cause a + POV-Ray scene source file that works on the Modified Version to + fail or otherwise work incorrectly on either the current official + version of POV-Ray, or on the Licensed Version, then the Modified + Version must check that the scene source file has a #version + directive that includes the 'unofficial' token, and must only + activate any variations from the Licensed Version (including, but + not limited to, new keywords) if that #version directive is + present. If that directive is not present, the Modified Version + must work in the same way as the Licensed Version. An example of a + correct 'unofficial' #version declaration is '#version unofficial + megapov 0.7 ;'. + + 2.3. It is the intent of POV to permit modifications to the Licensed Version + which are Custom Versions within the meaning of clause 2.2 and which + incorporate a means of being controlled by other software where that + other software has as its express primary purpose the ability to + control or co-ordinate POV-Ray (or other programs in general) remotely + for parallel or network rendering purposes. + + 3. CONDITIONS FOR DISTRIBUTION OF CUSTOM VERSIONS + + 3.1. You must not distribute any Modified Version to any person if that + Modified Version is not a Custom Version as defined by section 2.2. + + 3.2. You may distribute a Custom Version on the terms of the Distributor's + Licence Agreement for the Licensed Version as modified by this clause 3 + and with: + + (a). references to the Licensed Version read as references to the + Custom Version; and + + (b). references to the Software read as references to the Custom + Version; + + 3.3. The distribution licence is available from: + http://www.povray.org/. + As at July 2004, this licence is available at: + http://www.povray.org/distribution-license.html. + + 3.4. You must ensure that each user of the Custom Version is aware that it + is an unofficial build of POV-Ray which is not supported by POV and + that the POV-Ray developers are not in any way responsible for it; + + 3.5. You must either: + + (a). accompany each object code version of the Custom Version which is + distributed with the full source code for that Custom Version and + full documentation describing all modifications that you have made + to the Licensed Version; or + + (b). for a period of at least 3 years following the first distribution + of an object code version of the Custom Version make available for + download over the internet to each person who receives an object + code version of the Custom Version the full source code for the + Custom Version and full documentation describing all modifications + that you have made to the Licensed Version and you must make each + person who receives an object code version of the Custom Version + aware that the source code and documentation is available for + download, and the location from which it can be downloaded; + + and, in either case, + + (c). that source code must be licensed to each person who receives it + under the same terms as these Modification Terms. + + 3.6. You may, at your option: + + (a). waive clause 4.5 of the standard distribution licence with respect + to distribution of the Custom Version; and + + (b). include as additional clauses, and without affecting any of the + existing provisions of the licence, limitation of liability + provisions in favour of yourself in the same terms as clauses 6 + and 7 of the standard distribution licence. + + 3.7. Where a Custom Version is distributed in accordance with the terms of + this agreement: + + (a). You must license each recipient of that Custom Version to use + those portions of the Custom Version in respect of which you hold + copyright on the terms of the standard POV end-user license for + the Licensed Version from which the Modified Version was created; + + (b). POV agrees to licence each recipient of that Custom Version to use + those portions of the Custom Version in respect of which POV holds + copyright on the terms of the standard POV end-user license for + the Licensed Version from which the Modified Version was created. + + 4. CONTRIBUTING BUG FIXES AND ENHANCEMENTS + + 4.1. POV is not obliged to accept enhancements and bug fixes that you submit + to it. However, if it does so, it does so in accordance with the then + current Contribution Terms. POV may require you to complete and send + documentation to POV prior to accepting a bug fix and, in particular, + will require a copyright assignment of each contribution. + + 5. COPYRIGHT AND INTELLECTUAL PROPERTY + + 5.1. Copyright subsists in the Licensed Version and it is protected by + Australian and international copyright laws. + + 5.2. Nothing in this agreement gives you any rights in respect of any + Intellectual Rights in respect of the Licensed Version or which are + held by or on behalf of POV. You acknowledge that you do not acquire + any rights in respect of such Intellectual Rights. + + 5.3. You acknowledge that if you perform any act in respect of the Software + without the permission of POV you will be liable to POV for all damages + POV may suffer (and which you acknowledge POV may suffer) as well as + statutory damages to the maximum extent permitted by law and that you + may also be liable to criminal prosecution. + + 5.4. For the purposes of this clause 5 Intellectual Rights means: + + (a). all copyright, patent, trade mark, trade secret, design, and + circuit layout rights; + + (b). all rights to the registration of such rights; and + + (c). all rights of a similar nature + + which exist anywhere in the world; + + 6. DISCLAIMER OF WARRANTY + + 6.1. To the extent permitted by law, all implied terms and conditions are + excluded from this agreement. Where a term or condition is implied into + this agreement and that term cannot be legally excluded, that term has + effect as a term or condition of this agreement. However, to the extent + permitted by law, the liability of POV for a breach of such an implied + term or condition is limited to the fullest extent permitted by law. + + 6.2. To the extent permitted by law, the Licensed Version is provided on an + "AS IS" basis, without warranty of any kind, express or implied, + including without limitation, any implied warranties of merchantability, + fitness for a particular purpose and non-infringement of intellectual + property of any third party. The Licensed Program has inherent + limitations including design faults and programming bugs. + + 6.3. The entire risk as to the quality and performance of the Licensed + Software, and of any Custom Version is borne by you, and it is your + responsibility to ensure that it fulfils your requirements prior to + using it in any manner. + + 6.4. This clause 6 is an essential and material term of, and cannot be + severed from, this agreement. If you do not or cannot agree to be + bound by this clause, or if it is unenforceable, then you must not, at + any time, make any use or reproductions of the Licensed Version under + this agreement and this agreement gives you no rights to deal in any + way with any part of the Licensed Version. + + 7. NO LIABILITY + + 7.1. When you use or modify the Licensed Version you acknowledge and accept + that you do so at your sole risk. You agree that under no circumstances + will you have any claim against POV or any POV Associate for any loss, + damages, harm, injury, expense, work stoppage, loss of business + information, business interruption, computer failure or malfunction + which may be suffered by you or by any third party from any cause what- + soever, howsoever arising, in connection with your use, modification or + distribution of the Software even where POV was aware, or ought to have + been aware, of the potential of such loss. + + 7.2. Neither POV nor any POV Associate has any liability to you for any + indirect, general, special, incidental, punitive and/or consequential + damages arising as a result of a breach of this agreement by POV or + which arises in any way related to the Licensed Version or the exercise + of a licence granted to you under this agreement. + + 7.3. POV's total aggregate liability to you for all loss or damage arising + in any way related to this agreement is limited to the lesser of: (a) + AU$100, and (b) the amount received by POV from you as payment for the + grant of a licence under this agreement. + + 7.4. You must bring any action against POV in any way related to this + agreement or the Licensed Version within 3 months of the cause of + action first arising. You waive any right you have to bring any action + against POV and release POV from all liability in respect of a cause + of action if initiating process in relation to that action is not + served on POV within 3 months of the cause of action arising. Where a + particular set of facts give rise to more than one cause of action this + clause 7.4 applies as if all such causes of action arise at the time + the first such cause of action arises. + + 7.5. This clause 7 is an essential and material term of, and cannot be + severed from, this agreement. If you does not or cannot agree to be + bound by this clause, or if it is unenforceable, then you must not, at + any time, make any use or reproductions of the Licensed Version under + this agreement and this agreement gives you no rights to deal in any + way with any part of the Licensed Version. + + 8. MISCELLANEOUS + + 8.1. POV may modify this agreement at any time by making a revised licence + available from: + http://www.povray.org/source-license.html. + This agreement is modified by replacing the terms in this agreement + with those of the revised licence from the time that the revised + licence is so made available. It is your responsibility to ensure that + you have read and agreed to the current version of this agreement prior + to making any modification to the Licensed Version. + + 8.2. Except where explicitly stated otherwise herein, if any provision of + this agreement is found to be invalid or unenforceable, the invalidity + or unenforceability of such provision shall not affect the other + provisions of this agreement, and all provisions not affected by such + invalidity or unenforceability shall remain in full force and effect. + In such cases you agree to attempt to substitute for each invalid or + unenforceable provision a valid or enforceable provision which achieves + to the greatest extent possible, the objectives and intention of the + invalid or unenforceable provision. + + 8.3. A waiver of a right under this agreement is not effective unless given + in writing signed by the party granting that waiver. Unless otherwise + stipulated in the waiver, a waiver is only effective in respect of the + circumstances in which it is given and is not a waiver in respect of + any other rights or a waiver in respect of future rights or actions. + + 8.4. The validity and interpretation of this agreement is governed by the + laws in force in the State of Victoria, Australia. You submit to the + exclusive jurisdiction of the courts of that State and courts located + within that State exercising federal jurisdiction. + + 8.5. References in this agreement to "written" and "writing" mean on paper + or by fax and expressly exclude email and other forms of electronic + communication. + + 8.6. "POV Associate" means any person associated directly or indirectly with + POV whether as a director, officer, employee, subcontractor, agent, + representative, consultant, licensee or otherwise. + + 8.7. "Distributor's Licence Agreement" in respect of a Licensed Version, + means the agreement of that name for that Licensed Version made + available from: + http://www.povray.org/. diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 2b93da6e3..8990ce749 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78981 2012-10-28 15:59:46Z jlichtblau $ +# $Id: PKGBUILD 81993 2013-01-05 11:39:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop -pkgver=2.1.1 +pkgver=2.2 pkgrel=1 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64' 'mips64el') diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog index 9a53fc3d3..d543c3517 100644 --- a/community/powertop/powertop.changelog +++ b/community/powertop/powertop.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * powertop 2.2-1 + 2012-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> * powertop 2.1.1-1 diff --git a/community/pptpd/pptpd b/community/pptpd/pptpd index 08c4de496..08c4de496 100755..100644 --- a/community/pptpd/pptpd +++ b/community/pptpd/pptpd diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 079899c3d..079899c3d 100755..100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD diff --git a/community/pragha/pragha.install b/community/pragha/pragha.install index ff5a644bd..ff5a644bd 100755..100644 --- a/community/pragha/pragha.install +++ b/community/pragha/pragha.install diff --git a/community/print-manager/PKGBUILD b/community/print-manager/PKGBUILD index c377ad94d..bbce85f35 100644 --- a/community/print-manager/PKGBUILD +++ b/community/print-manager/PKGBUILD @@ -5,7 +5,7 @@ pkgname=print-manager pkgver=0.2.0 pkgrel=1 pkgdesc="A KDE tool for managing print jobs and printers" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/base/print-manager" license=('GPL') depends=('kdebase-workspace' 'libcups') diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy index 754453de5..754453de5 100755..100644 --- a/community/privoxy/privoxy +++ b/community/privoxy/privoxy diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD index 6e8733da7..07e567b83 100644 --- a/community/psimedia/PKGBUILD +++ b/community/psimedia/PKGBUILD @@ -14,14 +14,17 @@ depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins' makedepends=('pkgconfig') source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2 videodev.h - psimedia-svn20110621.diff.gz) + psimedia-svn20110621.diff.gz + psimedia-1.0.3-glib.patch) md5sums=('1be71c37d71c655ffc2c53cf86c77a7a' '427e5832466726a86e5b55b1329d2e9e' - 'b571639d854c90c758f40a44054c6e06') + 'b571639d854c90c758f40a44054c6e06' + 'c9fd9764e470a1cb0a7371bf21f8f437') build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/psimedia-svn20110621.diff + patch -Np1 -i ${srcdir}/psimedia-1.0.3-glib.patch sed -i 's|# include <linux/videodev.h>|# include "../../../videodev.h"|' gstprovider/deviceenum/deviceenum_unix.cpp ./configure make diff --git a/community/psimedia/psimedia-1.0.3-glib.patch b/community/psimedia/psimedia-1.0.3-glib.patch new file mode 100644 index 000000000..4d02058e2 --- /dev/null +++ b/community/psimedia/psimedia-1.0.3-glib.patch @@ -0,0 +1,44 @@ +--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h 2009-01-16 16:59:25.000000000 -0500 ++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h 2012-12-27 04:13:38.548921262 -0500 +@@ -21,7 +21,7 @@ + #ifndef PSI_GSTELEMENTS_H + #define PSI_GSTELEMENTS_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + +--- psimedia-1.0.3.orig/gstprovider/gstthread.h 2008-11-24 22:56:15.000000000 -0500 ++++ psimedia-1.0.3/gstprovider/gstthread.h 2012-12-27 04:15:19.216656784 -0500 +@@ -22,7 +22,7 @@ + #define PSI_GSTTHREAD_H + + #include <QThread> +-#include <glib/gmain.h> ++#include <glib.h> + + namespace PsiMedia { + +--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h 2009-02-16 19:20:50.000000000 -0500 ++++ psimedia-1.0.3/gstprovider/rwcontrol.h 2012-12-27 04:15:50.818833887 -0500 +@@ -28,7 +28,7 @@ + #include <QMutex> + #include <QWaitCondition> + #include <QTimer> +-#include <glib/gmain.h> ++#include <glib.h> + #include "psimediaprovider.h" + #include "rtpworker.h" + +--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h 2009-01-16 13:09:25.000000000 -0500 ++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h 2012-12-27 04:16:49.326164945 -0500 +@@ -21,7 +21,7 @@ + #ifndef GSTCUSTOMELEMENTS_H + #define GSTCUSTOMELEMENTS_H + +-#include <glib/gthread.h> ++#include <glib.h> + #include <gst/gst.h> + #include <gst/base/gstpushsrc.h> + #include <gst/video/video.h> diff --git a/community/pypy/LICENSE b/community/pypy/LICENSE new file mode 100644 index 000000000..7fc6952b0 --- /dev/null +++ b/community/pypy/LICENSE @@ -0,0 +1,154 @@ +License for files in the pypy/ directory +================================================== + +Except when otherwise stated (look for LICENSE files in directories or +information at the beginning of each file) all software and +documentation in the 'pypy' directories is licensed as follows: + + The MIT License + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + +PyPy Copyright holders 2003-2010 +----------------------------------- + +Except when otherwise stated (look for LICENSE files or information at +the beginning of each file) the files in the 'pypy' directory are each +copyrighted by one or more of the following people and organizations: + + Armin Rigo + Maciej Fijalkowski + Carl Friedrich Bolz + Samuele Pedroni + Antonio Cuni + Michael Hudson + Christian Tismer + Holger Krekel + Eric van Riet Paap + Richard Emslie + Anders Chrigstrom + Amaury Forgeot d Arc + Aurelien Campeas + Anders Lehmann + Niklaus Haldimann + Seo Sanghyeon + Leonardo Santagada + Lawrence Oluyede + Jakub Gustak + Guido Wesdorp + Benjamin Peterson + Alexander Schremmer + Niko Matsakis + Ludovic Aubry + Alex Martelli + Toon Verwaest + Stephan Diehl + Adrien Di Mascio + Stefan Schwarzer + Tomek Meka + Patrick Maupin + Jacob Hallen + Laura Creighton + Bob Ippolito + Camillo Bruni + Simon Burton + Bruno Gola + Alexandre Fayolle + Marius Gedminas + Guido van Rossum + Valentino Volonghi + Adrian Kuhn + Paul deGrandis + Gerald Klix + Wanja Saatkamp + Anders Hammarquist + Oscar Nierstrasz + Eugene Oden + Lukas Renggli + Guenter Jantzen + Dinu Gherman + Bartosz Skowron + Georg Brandl + Ben Young + Jean-Paul Calderone + Nicolas Chauvat + Rocco Moretti + Michael Twomey + boria + Jared Grubb + Olivier Dormond + Stuart Williams + Jens-Uwe Mager + Justas Sadzevicius + Mikael Schönenberg + Brian Dorsey + Jonathan David Riehl + Beatrice During + Elmo Mäntynen + Andreas Friedge + Alex Gaynor + Anders Qvist + Alan McIntyre + Bert Freudenberg + + Heinrich-Heine University, Germany + Open End AB (formerly AB Strakt), Sweden + merlinux GmbH, Germany + tismerysoft GmbH, Germany + Logilab Paris, France + DFKI GmbH, Germany + Impara, Germany + Change Maker, Sweden + + +License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' +============================================================== + +Except when otherwise stated (look for LICENSE files or +copyright/license information at the beginning of each file) the files +in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories +are all copyrighted by the Python Software Foundation and licensed under +the Python Software License of which you can find a copy here: +http://www.python.org/doc/Copyright.html + +License for 'pypy/translator/jvm/src/jna.jar' +============================================= + +The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU +Lesser General Public License of which you can find a copy here: +http://www.gnu.org/licenses/lgpl.html + +License for 'pypy/translator/jvm/src/jasmin.jar' +================================================ + +The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer +and distributed with permission. The use of Jasmin by PyPy does not imply +that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors. Furthermore, +the following disclaimer applies to Jasmin: + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/pypy/PKGBUILD b/community/pypy/PKGBUILD new file mode 100644 index 000000000..63663c276 --- /dev/null +++ b/community/pypy/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 80543 2012-11-24 13:43:13Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=pypy +pkgver=2.0beta1 +pkgrel=1 +pkgdesc="A Python implementation written in Python, JIT enabled" +url="http://codespeak.net/pypy/" +arch=('i686' 'x86_64') +depends=('libffi') +provides=('python2') +makedepends=('python2') +optdepends=('openssl: openssl module' + 'expat: pyexpat module' + 'ncurses: ncurses module' + 'zlib: zlib module' + 'bzip2: bz2 module') +license=('custom:MIT') +source=(https://bitbucket.org/pypy/pypy/get/release-2.0-beta1.tar.bz2) +md5sums=('a7e3e15c51e8f42af9f0c168b6c2750e') + +build() { + cd ${srcdir}/pypy-pypy-*/pypy/translator/goal + + python2 translate.py -Ojit +} + +package() { + cd ${srcdir}/pypy-pypy-*/pypy/translator/goal + + install -Dm755 pypy-c ${pkgdir}/opt/pypy/pypy-c + mkdir -p ${pkgdir}/opt/pypy/{lib-python,pypy} + + cd ${srcdir}/pypy-pypy-* + cp -r lib-python/2.7 ${pkgdir}/opt/pypy/lib-python/ + cp -r lib_pypy ${pkgdir}/opt/pypy/ + cp -r include ${pkgdir}/opt/pypy/ + + mkdir -p ${pkgdir}/usr/bin + ln -s /opt/pypy/pypy-c ${pkgdir}/usr/bin/pypy + + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/pypy/LICENSE +} +# vim: ts=2 sw=2 et: diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 01edb1144..7ac1e01d5 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -7,16 +7,19 @@ pkgname=pyqt3 pkgver=3.18.1 pkgrel=11 pkgdesc="A set of Python bindings for the Qt3 toolkit" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/pyqt/intro" depends=('python2-sip' 'qscintilla-qt3') makedepends=('glu') license=('GPL') -source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('f1d120495d1aaf393819e988c0a7bb7e') +source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz" + "PyQt-x11-gpl-3.18.1-configure.patch") +md5sums=('f1d120495d1aaf393819e988c0a7bb7e' + 'd0e3e6b5bd20ace9e567a5ebaeed83e1') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} + patch -Np1 -i ${srcdir}/PyQt-x11-gpl-3.18.1-configure.patch . /etc/profile.d/qt3.sh echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ diff --git a/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch b/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch new file mode 100644 index 000000000..66150ba72 --- /dev/null +++ b/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch @@ -0,0 +1,37 @@ +--- PyQt-x11-gpl-3.18.1.orig/configure.py 2009-06-16 03:47:29.000000000 -0500 ++++ PyQt-x11-gpl-3.18.1/configure.py 2012-12-27 08:45:18.859375913 -0500 +@@ -258,27 +258,27 @@ + } + + def code(self, extra_include_dirs, extra_lib_dir, extra_libs): +- generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs) ++ generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void") + + if "qtext" in pyqt_modules: +- generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags) ++ generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void") + + if "qtgl" in pyqt_modules: +- generate_code("qtgl", opengl=1) ++ generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void") + + if "qtpe" in pyqt_modules: +- generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags) ++ generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void") + + if "qtui" in pyqt_modules: +- generate_code("qtui", extra_libs=["qui"]) ++ generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void") + + if "qtaxcontainer" in pyqt_modules: +- generate_code("qtaxcontainer", extra_libs=["qaxcontainer"]) ++ generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void") + + # The rest don't need special handling. + for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"): + if m in pyqt_modules: +- generate_code(m) ++ generate_code(m, extra_cxxflags="-DANY=void") + + def tools(self): + tool_dirs = [] diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD index ac36b156f..0b6bb965c 100644 --- a/community/python-cchardet/PKGBUILD +++ b/community/python-cchardet/PKGBUILD @@ -10,7 +10,7 @@ url="http://pypi.python.org/pypi/cchardet/" depends=('python') makedepends=('cython' 'python-distribute') license=('MIT') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) build() { diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index d47ac8e7a..4762d80cc 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80710 2012-11-30 12:11:12Z stephane $ +# $Id: PKGBUILD 81606 2012-12-25 00:34:11Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -7,9 +7,9 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.2.0 -pkgrel=6 +pkgrel=8 pkgdesc="A python plotting library, making publication quality plots" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://matplotlib.org' license=('custom') makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python-numpy' 'pyqt' diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD index 0267a6a14..0267a6a14 100755..100644 --- a/community/python-psycopg1/PKGBUILD +++ b/community/python-psycopg1/PKGBUILD diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index f3d2e9e36..45d87f49e 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 78238 2012-10-17 10:26:30Z allan $ +# $Id: PKGBUILD 82158 2013-01-09 17:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.4.5 -pkgrel=2 +pkgver=2.4.6 +pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64' 'mips64el') url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) -md5sums=('075e4df465e9a863f288d5bdf6e6887e') +md5sums=('79d7f05e67bf70a0ecc6e9103ccece5f') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/community/python-pycuda/PKGBUILD b/community/python-pycuda/PKGBUILD new file mode 100644 index 000000000..ada4857bb --- /dev/null +++ b/community/python-pycuda/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 82154 2013-01-09 16:03:12Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgbase=python-pycuda +pkgname=('python-pycuda' 'python2-pycuda' 'pycuda-headers') +pkgver=2012.1 +pkgrel=1 +pkgdesc="Python wrapper for Nvidia CUDA" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/pycuda" +license=('MIT') +source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) +makedepends=('ctags' 'python2-distribute' 'python-distribute' 'python2-numpy' 'python-numpy' 'mesa' 'cuda' 'boost' 'nvidia-utils') +sha1sums=('dd52ee697ae9f6256efac3bca682be9c6e7c9649') + +build() { + cd "${srcdir}" + + _arch='' + [ "$CARCH" = "x86_64" ] && _arch='64' + + cp -a pycuda-${pkgver}{,-python2} + + cd "${srcdir}"/pycuda-${pkgver} + python3 ./configure.py \ + --cuda-root=/opt/cuda \ + --cuda-inc-dir=/opt/cuda/include \ + --cudadrv-lib-dir=/opt/cuda/lib${_arch} \ + --cudart-lib-dir=/opt/cuda/lib${_arch} \ + --no-use-shipped-boost \ + --boost-python-libname=boost_python3 + make + + cd "${srcdir}"/pycuda-${pkgver}-python2 + python2 ./configure.py \ + --cuda-root=/opt/cuda \ + --cuda-inc-dir=/opt/cuda/include \ + --cudadrv-lib-dir=/opt/cuda/lib${_arch} \ + --cudart-lib-dir=/opt/cuda/lib${_arch} \ + --no-use-shipped-boost + make +} + +package_python-pycuda() { + depends=('cuda' 'nvidia-utils' 'python-numpy' 'python-pytools' 'python' 'boost-libs' 'pycuda-headers') + cd "${srcdir}"/pycuda-${pkgver} + python3 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 + + rm -fr "${pkgdir}"/usr/include +} + +package_python2-pycuda() { + depends=('cuda' 'nvidia-utils' 'python2-numpy' 'python2-pytools' 'python2' 'boost-libs' 'pycuda-headers') + cd "${srcdir}"/pycuda-${pkgver}-python2 + python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 + + rm -fr "${pkgdir}"/usr/include +} + +package_pycuda-headers() { + cd "${srcdir}"/pycuda-${pkgver} + install -dm755 "${pkgdir}"/usr/include/pycuda + + for file in $(ls -1 src/cuda/*.hpp); do + install -m644 ${file} "${pkgdir}"/usr/include/pycuda + done +} diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD index 61f8d8e78..560cc01c2 100644 --- a/community/python-pyopencl/PKGBUILD +++ b/community/python-pyopencl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78243 2012-10-17 10:26:44Z allan $ +# $Id: PKGBUILD 82124 2013-01-09 01:12:19Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyopencl pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') pkgver=2012.1 -pkgrel=5 +pkgrel=6 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" @@ -21,7 +21,7 @@ build() { cp -a pyopencl-$pkgver{,-python2} cd "${srcdir}/pyopencl-${pkgver}" - python3 ./configure.py --cl-enable-gl --no-use-shipped-boost + python3 ./configure.py --cl-enable-gl --no-use-shipped-boost --boost-python-libname=boost_python3 python3 setup.py build cd "$srcdir/pyopencl-$pkgver-python2" diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD index 70ccf4529..a166db2e1 100644 --- a/community/python-pyproj/PKGBUILD +++ b/community/python-pyproj/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('python-pyproj' 'python2-pyproj') pkgver=1.9.2 pkgrel=1 pkgdesc="Python interfaces to PROJ.4 library" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/pyproj" license=('custom') source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index a0426cee3..a0426cee3 100755..100644 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD diff --git a/community/python2-cchardet/PKGBUILD b/community/python2-cchardet/PKGBUILD index c9c108873..f24cbc0ac 100644 --- a/community/python2-cchardet/PKGBUILD +++ b/community/python2-cchardet/PKGBUILD @@ -10,7 +10,7 @@ url="http://pypi.python.org/pypi/cchardet/" depends=('python2') makedepends=('cython2' 'python2-distribute') license=('MIT') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) build() { diff --git a/community/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD index ea307d2f5..dbd2bd8b2 100644 --- a/community/python2-fonttools/PKGBUILD +++ b/community/python2-fonttools/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Converts OpenType and TrueType fonts to and from XML" url="http://sourceforge.net/projects/fonttools/" license=("BSD") -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=("python2-numpy") makedepends=("python2-distribute") provides=('fonttools') # temporary compatibility because of rename diff --git a/community/python2-fuse/PKGBUILD b/community/python2-fuse/PKGBUILD index ef79aceef..a94045b45 100644 --- a/community/python2-fuse/PKGBUILD +++ b/community/python2-fuse/PKGBUILD @@ -7,7 +7,7 @@ pkgname=python2-fuse pkgver=0.2.1 pkgrel=4 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') pkgdesc="Python bindings for FUSE" url="http://fuse.sourceforge.net/wiki/index.php/FusePython" license=('LGPL') diff --git a/community/python2-gevent/PKGBUILD b/community/python2-gevent/PKGBUILD index c1944be02..5b62ecde1 100644 --- a/community/python2-gevent/PKGBUILD +++ b/community/python2-gevent/PKGBUILD @@ -5,7 +5,7 @@ pkgname=python2-gevent pkgver=0.13.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency" license=("MIT") diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD index a4c727873..a583ae718 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78281 2012-10-17 10:28:39Z allan $ +# $Id: PKGBUILD 81687 2012-12-26 19:34:45Z foutrelis $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=python2-imaging pkgver=1.1.7 -pkgrel=5 +pkgrel=7 pkgdesc="PIL. Provides image processing capabilities for python" arch=('i686' 'x86_64' 'mips64el') url="http://www.pythonware.com/products/pil/index.htm" diff --git a/community/python2-lcms/PKGBUILD b/community/python2-lcms/PKGBUILD index 3b75364ab..47c6d4ad4 100644 --- a/community/python2-lcms/PKGBUILD +++ b/community/python2-lcms/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.19 _mver=1.19 pkgrel=4 pkgdesc="LittleCMS Python bindings" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) license=('CUSTOM') depends=('libtiff' 'python2' 'lcms') url="http://www.littlecms.com" diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD index a68c5a35d..3a744e587 100644 --- a/community/python2-m2crypto/PKGBUILD +++ b/community/python2-m2crypto/PKGBUILD @@ -7,7 +7,7 @@ pkgname=python2-m2crypto pkgver=0.21.1 pkgrel=2 pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') diff --git a/community/python2-numexpr/PKGBUILD b/community/python2-numexpr/PKGBUILD index 3c5a1630d..a59c784ba 100644 --- a/community/python2-numexpr/PKGBUILD +++ b/community/python2-numexpr/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.0.1 pkgrel=2 pkgdesc="A JIT compiler for Python expressions" url="http://code.google.com/p/numexpr/" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('python2-numpy') makedepends=('python2-distribute') diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD index 6007614a6..26ec8b3df 100644 --- a/community/python2-pybluez/PKGBUILD +++ b/community/python2-pybluez/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python2-pybluez pkgver=0.18 pkgrel=4 pkgdesc="Python wrapper for the BlueZ Bluetooth stack" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/pybluez/" license=('GPL') provides=('pybluez') diff --git a/community/python2-pychm/PKGBUILD b/community/python2-pychm/PKGBUILD index 3b53d9005..c7c4b06ba 100644 --- a/community/python2-pychm/PKGBUILD +++ b/community/python2-pychm/PKGBUILD @@ -8,7 +8,7 @@ pkgname=python2-pychm pkgver=0.8.4 pkgrel=1 pkgdesc="Python bindings for chmlib" -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url="http://gnochm.sourceforge.net/" license=('GPL') depends=('chmlib' 'python2') diff --git a/community/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD new file mode 100644 index 000000000..37049dea1 --- /dev/null +++ b/community/python2-pycuda/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=python2-pycuda +pkgver=2011.2.2 +pkgrel=1 +pkgdesc="Python wrapper for Nvidia CUDA" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/pycuda" +license=('MIT/X Consortium') +source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) +depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2') +optdepends=('python2-pytest') +makedepends=('ctags' 'python2-distribute' 'mesa') +provides=('pycuda') +replaces=('pycuda') +conflicts=('pycuda') +sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b') + +build() { + cd "${srcdir}/pycuda-${pkgver}" + python2 ./configure.py \ + --cuda-root=/opt/cuda-toolkit \ + --boost-compiler=gcc \ + --cuda-enable-gl \ + --cuda-inc-dir=/opt/cuda-toolkit/include \ + --cudadrv-lib-dir=/opt/cuda-toolkit/lib \ + --cudart-lib-dir=/opt/cuda-toolkit/lib + + make +} + +package() { + cd "${srcdir}/pycuda-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 +} diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD index 6fdb5bb66..ee2618605 100644 --- a/community/python2-pysqlite-legacy/PKGBUILD +++ b/community/python2-pysqlite-legacy/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python2-pysqlite-legacy pkgver=1.0.1 pkgrel=1 pkgdesc="A Python DB-API 2.0 interface for the legacy SQLite 2" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://initd.org/tracker/pysqlite" replaces=('python-pysqlite-legacy') license=('custom') diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD index 38eecfb91..2f94dcd3f 100644 --- a/community/python2-pytables/PKGBUILD +++ b/community/python2-pytables/PKGBUILD @@ -5,7 +5,7 @@ pkgname=python2-pytables pkgver=2.4.0 pkgrel=2 -arch=("i686" "x86_64") +arch=("i686" "x86_64" "mips64el") pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" license=("BSD") diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD index 49096a86f..06204ebb2 100644 --- a/community/python2-pyxmpp/PKGBUILD +++ b/community/python2-pyxmpp/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python2-pyxmpp pkgver=1.1.2 pkgrel=2 pkgdesc="A Python XMPP and Jabber implementation based on libxml2" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://pyxmpp.jajcus.net/" license=('LGPL') depends=('python2-dnspython' 'libxml2' 'python2-m2crypto') diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD index d300ee192..8908b6b9d 100644 --- a/community/python2-simplejson/PKGBUILD +++ b/community/python2-simplejson/PKGBUILD @@ -8,7 +8,7 @@ pkgver=2.6.2 pkgrel=1 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" license=('MIT') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://undefined.org/python/#simplejson" depends=('python2') makedepends=('python2-distribute') diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD index 8c6e51e36..842eb0e8d 100644 --- a/community/python2-traits/PKGBUILD +++ b/community/python2-traits/PKGBUILD @@ -6,7 +6,7 @@ pkgver=4.2.0 _githubtag=0afc79d pkgrel=2 pkgdesc="Explicitly typed attributes for Python" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.enthought.com/projects/traits/" license=('BSD') depends=('python2-numpy') diff --git a/community/python2-vorbissimple/PKGBUILD b/community/python2-vorbissimple/PKGBUILD index ba0a8be63..8af21e504 100644 --- a/community/python2-vorbissimple/PKGBUILD +++ b/community/python2-vorbissimple/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python2-vorbissimple pkgver=0.0.2 pkgrel=6 pkgdesc="Python bindings for vorbissimple" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://kamaelia.sourceforge.net" license=('MPL') depends=('python2' 'vorbissimple') diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD new file mode 100644 index 000000000..d38cf43d5 --- /dev/null +++ b/community/python2-xapian/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 81458 2012-12-21 10:08:56Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: DonVla <donvla/users.sourceforge/net> +# Contributor: Hervé Cauwelier <herve/oursours/net> + +pkgname=python2-xapian +_realname=xapian-bindings +pkgver=1.2.12 +pkgrel=1 +pkgdesc="Python bindings for Xapian" +arch=(i686 x86_64 mips64el) +url="http://xapian.org/docs/bindings/python/" +license=('GPL') +groups=(xapian) +depends=('python2' 'xapian-core') +source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") + +build() { + cd "$srcdir/${_realname}-$pkgver" + + ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ + --prefix=/usr --with-python \ + PYTHON=/usr/bin/python2 + + make +} + + +package() { + cd "$srcdir/${_realname}-$pkgver" + + make DESTDIR="$pkgdir" install +} +# vim:set ts=2 sw=2 et: +md5sums=('9331d7885a68470184ba3d3e8c2b57d5') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 610f3b6a4..453b8ee2d 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -8,7 +8,7 @@ pkgname=qcad pkgver=2.0.5.0 pkgrel=11 pkgdesc="A 2D CAD package based upon Qt" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') depends=('qt3') diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD index 88a1c96f0..d015bc085 100644 --- a/community/qgo/PKGBUILD +++ b/community/qgo/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qgo pkgver=1.5.4 pkgrel=5 pkgdesc="Go client and full featured SGF editor" -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url="http://qgo.sourceforge.net/" license=('GPL') depends=('qt3' 'libsm') @@ -23,7 +23,7 @@ build() { . /etc/profile.d/qt3.sh patch -Np1 -i "$srcdir/gcc43.patch" patch -Np1 -i "$srcdir/gcc45.patch" - ./configure --prefix=/usr + ./configure --prefix=/usr --build=$CHOST make } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 01d4b872f..67151e969 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 79921 2012-11-14 19:18:29Z jlichtblau $ +#$Id: PKGBUILD 81996 2013-01-05 13:30:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -36,3 +36,4 @@ package() { make DESTDIR=${pkgdir} install } +sha256sums=('7a53af8228e0062eda5df5d34c00221587a1a3764e614b5d8b12541c2c75f080') diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 4d1e9351a..5e0dc389a 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.5-1 + 2012-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.4-1 diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 8b724e727..00451f775 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63724 2012-02-05 12:09:25Z ibiru $ +# $Id: PKGBUILD 81901 2013-01-03 10:05:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool -pkgver=0.7.1_002 -pkgrel=3 +pkgver=0.7.2 +pkgrel=1 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64' 'mips64el') url="http://qpxtool.sourceforge.net/" @@ -12,7 +12,7 @@ license=('GPL') depends=('qt') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 libpng15.patch) -md5sums=('755321a0196b16d06857550aac74ff50' +md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a' 'ab9af7610277652c77c6d114422b2266') build() { diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index adff401de..462e749c7 100755..100644 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -12,12 +12,14 @@ license=('GPL2') depends=('qt') provides=('stardict') changelog=$pkgname.changelog -source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f') +source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2 + qstardict-1.0.1-glib.patch) +sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f' + '30878282698dc90bf615ca383f4c01357ce49dfcdddd12c2e0b113ee51822c57') build() { cd ${srcdir}/$pkgname-$pkgver - + patch -Np1 -i ${srcdir}/qstardict-1.0.1-glib.patch qmake ENABLED_PLUGINS="stardict web swac" make } diff --git a/community/qstardict/qstardict-1.0.1-glib.patch b/community/qstardict/qstardict-1.0.1-glib.patch new file mode 100644 index 000000000..9b163a025 --- /dev/null +++ b/community/qstardict/qstardict-1.0.1-glib.patch @@ -0,0 +1,12 @@ +--- qstardict-1.0.1.orig/plugins/stardict/stardict.cpp 2011-12-05 07:40:49.000000000 -0500 ++++ qstardict-1.0.1/plugins/stardict/stardict.cpp 2012-12-28 18:52:39.636340322 -0500 +@@ -28,8 +28,7 @@ + #include <QFile> + #include <QSettings> + #include <QStack> +-#include <glib/gmem.h> +-#include <glib/gstrfuncs.h> ++#include <glib.h> + #include "lib.h" + #include "file.hpp" + #include "settingsdialog.h" diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 37dfaba92..7c2995e0d 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80545 2012-11-24 16:43:17Z svenstaro $ +# $Id: PKGBUILD 81404 2012-12-19 17:43:39Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,12 +7,12 @@ # Contributor: delor <bartekpiech gmail com> pkgname="qtcreator" -pkgver=2.6.0 -_pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +_pkgver=2.6.1 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64' 'mips64el') -url='http://qt.nokia.com/products/developer-tools' +url='http://qt-project.org' license=('LGPL') depends=('qt') makedepends=('qt-private-headers' 'git') @@ -28,7 +28,7 @@ optdepends=('qt-doc: for the integrated Qt documentation' install=qtcreator.install source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop') -md5sums=('9bf01098f84a0fe930b2718d11124204' +md5sums=('e4d6373335a80ddf7ffcacf92442e43c' '82888d4be900e7833d768050a135cd37') build() { @@ -39,7 +39,7 @@ build() { qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro make - make docs + make docs -j1 } package() { diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD index 128762693..9ab19a4c7 100644 --- a/community/qucs/PKGBUILD +++ b/community/qucs/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qucs pkgver=0.0.16 pkgrel=2 pkgdesc="An integrated circuit simulator with a graphical user interface" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://qucs.sourceforge.net" license=('GPL') depends=('qt3') diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 8d0e09399..8d614fd80 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qupzilla pkgver=1.3.5 pkgrel=3 pkgdesc="Cross-platform QtWebKit browser" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" license=('GPL3') depends=('qtwebkit') diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD new file mode 100644 index 000000000..b583690e0 --- /dev/null +++ b/community/r8168/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 80376 2012-11-21 09:11:48Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.034.00 +pkgrel=1 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' 'linux') +makedepends=('linux-headers') +source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + + cd "$pkgname-$pkgver" + + # avoid using the Makefile directly -- it doesn't understand + # any kernel but the current. + make -C /usr/lib/modules/$KERNEL_RELEASE/build \ + SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$pkgname-$pkgver" + install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + +sha256sums=('97f3f342f9f24a3c3346641babde82f52f87b6ef5976c8f4481515f247116206') diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install new file mode 100644 index 000000000..ab5f9f5c8 --- /dev/null +++ b/community/r8168/r8168.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD index fbff09e27..5f3a72978 100644 --- a/community/ragel/PKGBUILD +++ b/community/ragel/PKGBUILD @@ -10,16 +10,18 @@ pkgname=ragel pkgver=6.7 pkgrel=1 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.complang.org/ragel/" license=('GPL') depends=('gcc-libs') -source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('f4423e0d8a6538dd4e61498fcfad3cec') +source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz" + "ragel-6.7-gcc-4.7.patch") +md5sums=('f4423e0d8a6538dd4e61498fcfad3cec' + 'bcbc047873e09eef04900142fefa75f1') build() { cd "$srcdir/$pkgname-$pkgver" - + patch -Np1 -i ${srcdir}/ragel-6.7-gcc-4.7.patch ./configure --prefix=/usr make } diff --git a/community/ragel/ragel-6.7-gcc-4.7.patch b/community/ragel/ragel-6.7-gcc-4.7.patch new file mode 100644 index 000000000..6837280d8 --- /dev/null +++ b/community/ragel/ragel-6.7-gcc-4.7.patch @@ -0,0 +1,143 @@ +--- ragel-6.7.orig/aapl/avlcommon.h 2011-02-10 23:14:44.000000000 -0500 ++++ ragel-6.7/aapl/avlcommon.h 2012-12-30 00:53:33.879074778 -0500 +@@ -881,9 +881,9 @@ + } + + #ifdef AVL_BASIC +- keyRelation = compare( *element, *curEl ); ++ keyRelation = this->compare( *element, *curEl ); + #else +- keyRelation = compare( element->BASEKEY(getKey()), ++ keyRelation = this->compare( element->BASEKEY(getKey()), + curEl->BASEKEY(getKey()) ); + #endif + +@@ -920,7 +920,7 @@ + long keyRelation; + + while (curEl) { +- keyRelation = compare( *element, *curEl ); ++ keyRelation = this->compare( *element, *curEl ); + + /* Do we go left? */ + if ( keyRelation < 0 ) +@@ -969,7 +969,7 @@ + return element; + } + +- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); ++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); + + /* Do we go left? */ + if ( keyRelation < 0 ) { +@@ -1023,7 +1023,7 @@ + return element; + } + +- keyRelation = compare(key, curEl->getKey()); ++ keyRelation = this->compare(key, curEl->getKey()); + + /* Do we go left? */ + if ( keyRelation < 0 ) { +@@ -1058,7 +1058,7 @@ + long keyRelation; + + while (curEl) { +- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); ++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); + + /* Do we go left? */ + if ( keyRelation < 0 ) +--- ragel-6.7.orig/aapl/bstcommon.h 2011-02-10 23:14:44.000000000 -0500 ++++ ragel-6.7/aapl/bstcommon.h 2012-12-30 00:56:22.903385157 -0500 +@@ -361,7 +361,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -373,12 +373,12 @@ + + lower = mid - 1; + while ( lower != lowEnd && +- compare(key, GET_KEY(*lower)) == 0 ) ++ this->compare(key, GET_KEY(*lower)) == 0 ) + lower--; + + upper = mid + 1; + while ( upper != highEnd && +- compare(key, GET_KEY(*upper)) == 0 ) ++ this->compare(key, GET_KEY(*upper)) == 0 ) + upper++; + + low = (Element*)lower + 1; +@@ -419,7 +419,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -457,7 +457,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -508,7 +508,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -603,7 +603,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); ++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -662,7 +662,7 @@ + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); ++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +--- ragel-6.7.orig/aapl/mergesort.h 2011-02-10 23:14:44.000000000 -0500 ++++ ragel-6.7/aapl/mergesort.h 2012-12-30 00:57:00.423165601 -0500 +@@ -110,7 +110,7 @@ + } + else { + /* Both upper and lower left. */ +- if ( compare(*lower, *upper) <= 0 ) ++ if ( this->compare(*lower, *upper) <= 0 ) + memcpy( dest++, lower++, sizeof(T) ); + else + memcpy( dest++, upper++, sizeof(T) ); +--- ragel-6.7.orig/aapl/bubblesort.h 2011-02-10 23:14:44.000000000 -0500 ++++ ragel-6.7/aapl/bubblesort.h 2012-12-30 00:58:36.667806744 -0500 +@@ -72,7 +72,7 @@ + changed = false; + for ( long i = 0; i < len-pass; i++ ) { + /* Do we swap pos with the next one? */ +- if ( compare( data[i], data[i+1] ) > 0 ) { ++ if ( this->compare( data[i], data[i+1] ) > 0 ) { + char tmp[sizeof(T)]; + + /* Swap the two items. */ diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD index ae2c80833..b6a8bed1d 100644 --- a/community/raptor1/PKGBUILD +++ b/community/raptor1/PKGBUILD @@ -6,7 +6,7 @@ pkgname=raptor1 pkgver=1.4.21 -pkgrel=4 +pkgrel=4.1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD new file mode 100644 index 000000000..c50ff5d41 --- /dev/null +++ b/community/recorditnow/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 81949 2013-01-04 08:45:38Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Yichao Yu <yyc1992@gmail.com> +# Contributor: Weng Xuetian <wengxt@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> +# Contributor: Callea Gaetano Andrea <callea:gaetano:andrea/gmail:com> + +pkgname=recorditnow +pkgver=0.8.1 +pkgrel=4 +pkgdesc="A plugin based desktop recorder for KDE SC 4" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php/RecordItNow?content=114610" +license=('GPL') +depends=('kdebase-runtime' 'recordmydesktop' 'ffmpeg' 'xdg-utils') +makedepends=('cmake' 'automoc4') +optdepends=('mencoder: for mencoder encoder plugin') +provides=('recorditnow' 'joschy') +conflicts=('joschy-git') +install=recorditnow.install +source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2" + "cmake.patch") +md5sums=('6619b4048545adbab1d13a790189e80f' + '74ea0ababc2291e2a62e5d045c62616a') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + patch -i "${srcdir}/cmake.patch" -p0 + + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DLINGUAS="de hu cs pt_BR fr it" .. + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + + if [[ "$CARCH" == "x86_64" ]]; then + cd "$pkgdir/usr" + mv lib64/* lib + rmdir lib64 + fi +} diff --git a/community/recorditnow/cmake.patch b/community/recorditnow/cmake.patch new file mode 100644 index 000000000..c9f067646 --- /dev/null +++ b/community/recorditnow/cmake.patch @@ -0,0 +1,13 @@ +--- src/CMakeLists.txt.orig 2012-03-17 19:36:44.834973898 +0800 ++++ src/CMakeLists.txt 2012-03-17 19:40:00.894972395 +0800 +@@ -121,6 +121,10 @@ + recorditnow_recorder + recorditnow_encoder + recorditnow_keymon ++ recorditnow_plugin ++ ${X11_X11_LIB} ++ ${X11_Xext_LIB} ++ ${X11_Xfixes_LIB} + ${X11_Xcursor_LIB}) + + if (BUILD_WITH_JOSCHY) diff --git a/community/recorditnow/recorditnow.install b/community/recorditnow/recorditnow.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/recorditnow/recorditnow.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index dadf3dd2a..83916d8ca 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80794 2012-12-03 19:51:33Z spupykin $ +# $Id: PKGBUILD 82193 2013-01-11 10:21:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.6.7 +pkgver=2.6.8 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.service" "redis.logrotate") -md5sums=('9c3db210faff9fea3c17f2b71c2760f4' +md5sums=('a41dcfb0ed537f4a6dd7afd8c60df623' '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 4674a473b..c54d0f03a 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79425 2012-11-04 20:15:12Z plewis $ +# $Id: PKGBUILD 81783 2012-12-29 12:37:02Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=1.3 +pkgver=2.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('8db67e674b3dd013a6511f9612829f958ca95a2d515f89fb999f5568bfed7ffb') +sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84') build(){ mkdir build diff --git a/community/renameutils/PKGBUILD b/community/renameutils/PKGBUILD index 143afa37b..38e6b1c3a 100644 --- a/community/renameutils/PKGBUILD +++ b/community/renameutils/PKGBUILD @@ -6,7 +6,7 @@ pkgname=renameutils pkgver=0.12.0 pkgrel=2 pkgdesc="A set of programs designed to make renaming of files faster and less cumbersome" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/renameutils/" license=('GPL') depends=('readline') diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD index 8e886488a..830f2e8fa 100644 --- a/community/rng-tools/PKGBUILD +++ b/community/rng-tools/PKGBUILD @@ -5,7 +5,7 @@ pkgname=rng-tools pkgver=4 pkgrel=1 pkgdesc="Random number generator related utilities" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/gkernel/" license=('GPL') backup=(etc/conf.d/rngd) diff --git a/community/rogue/PKGBUILD b/community/rogue/PKGBUILD index 98de5901e..ee4cb2650 100644 --- a/community/rogue/PKGBUILD +++ b/community/rogue/PKGBUILD @@ -4,7 +4,7 @@ pkgname=rogue pkgver=5.4.4 pkgrel=2 pkgdesc="The original dungeon crawl game." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://rogue.rogueforge.net/rogue-5-4/" license=('custom') depends=('ncurses') diff --git a/community/rsyslog/rsyslog b/community/rsyslog/rsyslog index ee0145418..ee0145418 100755..100644 --- a/community/rsyslog/rsyslog +++ b/community/rsyslog/rsyslog diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD new file mode 100644 index 000000000..7ef335c9e --- /dev/null +++ b/community/rt3562sta/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 79180 2012-10-31 07:25:39Z tpowa $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=20 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.mediatek.com/en/Products/support.php?sn=501" +license=('GPL') +depends=('linux') +makedepends=('linux-headers') +install=$pkgname.install +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch +) + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + + # this Makefile is far too strict... + echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile + + make +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + +sha256sums=('71cd27784009894198f03470ec88e77f2cd176bf5f8d93b4dd984d3a3e543d5a' + 'b1465fceaac99f26cc0e7db0562d2bf103b57656f0b7b57e404f59efb3373b27' + 'd013ed5981a02be27b4aaf1e03670d68dbb16f40d9eb84930e58a96fc38ef947' + 'c962d014ea6e84a8c3398ff13e4709cc309c29134cac0b5c702eab1026799887' + 'e966d96026baee0447d6ad26742bcc40baa3f94530573d58f4eca842e107f809' + '7d2a83edfe6664a8e923dcda636c871220efc7ff4a82ab76a62fc97a11f2fcaa' + 'd672b58cdb278e3ecaeb46f3e5e477e1da7d2fd5dbf896521a4d0993743b9ab9' + '4d1d5eb5c22d356af62f4f55d12b04eb8a557ea9c664edfbc79c9e0454ccca4e' + 'a888d045b142127070c2c23ed1a84306d5202896265c828cf7e125ec2dd52389') diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch new file mode 100644 index 000000000..caf2b1c6a --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch new file mode 100644 index 000000000..dc245e38e --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch new file mode 100644 index 000000000..5ec4d5028 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch new file mode 100644 index 000000000..a53dbde86 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch new file mode 100644 index 000000000..6754f214d --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch new file mode 100644 index 000000000..a0d00d6e3 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch new file mode 100644 index 000000000..b17ba5a12 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch new file mode 100644 index 000000000..7416a31f9 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install new file mode 100644 index 000000000..c3b988aa6 --- /dev/null +++ b/community/rt3562sta/rt3562sta.install @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index 2cd445945..5f87ac170 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81041 2012-12-10 21:47:51Z kkeen $ +# $Id: PKGBUILD 82015 2013-01-05 17:18:56Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Michael Düll <mail@akurei.me> pkgname=rtl-sdr -pkgver=20121210 -_commit="562fd7e8e3200fa876312e58427b3c9a7575d3fa" +pkgver=20130105 +_commit="5673a562230a88787bed74c02ea9955901763271" pkgrel=1 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." arch=('i686' 'x86_64') diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index f9f20d47d..cdcd4c69c 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 71847 2012-06-02 10:32:52Z bluewind $ +# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.15 -pkgrel=3 +pkgver=9.16 +pkgrel=1 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -19,7 +19,7 @@ source=( 'urxvtc.desktop' 'urxvt-tabbed.desktop' ) -md5sums=('15595aa326167ac5eb68c28d95432faf' +md5sums=('2e2942e8367624affebc0568e3671b66' '88d8786d74b819450adf722180db09fd' 'bebf5b6b399b74b557fcedbdb47cc387' '2604896bb107fbb5511bfd6f46d65894') diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index 681e3500a..40be1228e 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80273 2012-11-18 23:53:28Z bgyorgy $ +# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.16.3 +pkgver=0.16.4 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a0325afabb6a91cbe958864183adce80ad88bcaa0fc8f8ed3f434ee0d09935bf') +sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index a0f739560..feea10efe 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81283 2012-12-16 01:26:32Z dwallace $ +# $Id: PKGBUILD 81694 2012-12-27 00:16:01Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.4.1 +pkgver=5.5 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -23,6 +23,8 @@ options=('!makeflags') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" 'SAGE-notebook.desktop') +md5sums=('1162b607cf42859e31e81591600960d3' + 'b82f94383829eee26648feb977e2d89b') build() { cd sage-${pkgver} @@ -95,5 +97,3 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('069fa0c705a253710a66f76ee9d6168e' - 'b82f94383829eee26648feb977e2d89b') diff --git a/community/sauerbraten/PKGBUILD b/community/sauerbraten/PKGBUILD new file mode 100644 index 000000000..ed3520ba6 --- /dev/null +++ b/community/sauerbraten/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 75284 2012-08-17 21:27:10Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Christoph Siegenthaler <csi@gmx.ch> +# Contributor: Jesse Young <jesse@eon.jlyo.org> + +pkgname=sauerbraten +pkgver=2010_07_28_justice_edition +pkgrel=5 +pkgdesc="FPS that uses an improved version of the Cube engine" +arch=('i686' 'x86_64') +url="http://www.sauerbraten.org/" +license=('ZLIB') +makedepends=('sdl_mixer' 'sdl_image' 'libgl' 'mesa' 'gendesk') +install=sauerbraten.install +backup=('etc/conf.d/sauerbraten') +source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2 + sauerbraten-client + sauerbraten-server + sauerbraten.confd + sauerbraten.rcd + sauerbraten.png + sauerbraten.install + sauerbraten.service + license.txt + fix-indirect-linking.diff) +md5sums=('0947cb37b628873063270be1fcce27f6' + 'ac66ef9e80d6fc1b4b047df1c36c07c0' + '4a42c314d01ccdc4c76fad38d18c7434' + '8e26aeba1ef178c24e22723d3c48d7e1' + 'e0a2e0679c34b39623964ee68e6fae1e' + '3e602f421f7342cf8c3ed16314523d6f' + '2f7b423f49491359ff776a91414db4d8' + '3c964cdd0906461c0404641b1eb52d96' + 'cf46cd0148f03b7477f7c54aec865abe' + 'a9a9b658affd933ad354be45da998354') +_exec=('sauerbraten-client %u') + +build() { + cd "$srcdir" + gendesk + + cd "$pkgname/src" + + patch -Np1 -i ../../fix-indirect-linking.diff + + make + + # remove cvs directories + find ${srcdir}/$pkgname -type d -name CVS -exec rm -rf '{}' \; 2> /dev/null +} + +package() { + depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data') + + cd ${srcdir}/$pkgname/src + + make DESTDIR="${pkgdir}" install + + cd .. + install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client + install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server + + install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client + install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server + install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten + install -Dm755 ${srcdir}/sauerbraten.rcd ${pkgdir}/etc/rc.d/sauerbraten + install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service + install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop + install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png + install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt +} diff --git a/community/sauerbraten/fix-indirect-linking.diff b/community/sauerbraten/fix-indirect-linking.diff new file mode 100644 index 000000000..56ed8825b --- /dev/null +++ b/community/sauerbraten/fix-indirect-linking.diff @@ -0,0 +1,20 @@ +Index: sauerbraten/Makefile +=================================================================== +--- sauerbraten.orig/Makefile 2010-07-29 21:24:21.000000000 -0400 ++++ sauerbraten/Makefile 2010-07-29 21:26:15.717746486 -0400 +@@ -21,11 +21,14 @@ + CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm + else + CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` +-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL ++CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 + endif + ifeq ($(PLATFORM),Linux) + CLIENT_LIBS+= -lrt + endif ++ifeq ($(PLATFORM),GNU/kFreeBSD) ++CLIENT_LIBS+= -lrt ++endif + CLIENT_OBJS= \ + shared/crypto.o \ + shared/geom.o \ diff --git a/community/sauerbraten/license.txt b/community/sauerbraten/license.txt new file mode 100644 index 000000000..f38792c76 --- /dev/null +++ b/community/sauerbraten/license.txt @@ -0,0 +1,34 @@ +LICENSE +======= + +Sauerbraten game engine source code, any release. + +Copyright (C) 2001-2006 Wouter van Oortmerssen. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + + +LICENSE NOTES +============= +The license covers the source code found in the "src" directory of this +archive, the included enet network library which sauerbraten uses is covered by +an MIT-style license, which is however compatible with the above license for all +practical purposes. + +Game media included in the game (maps, textures, sounds, models etc.) +are NOT covered by this license, and may have individual copyrights and +distribution restrictions (see individual readmes). diff --git a/community/sauerbraten/sauerbraten-client b/community/sauerbraten/sauerbraten-client new file mode 100755 index 000000000..8a9b354f3 --- /dev/null +++ b/community/sauerbraten/sauerbraten-client @@ -0,0 +1,14 @@ +#!/bin/sh + +WIDTH=1024 +HEIGHT=768 +[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten + +cd /opt/sauerbraten +if [ -f /usr/bin/aoss ]; then + aoss bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r +else + bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r +fi + + diff --git a/community/sauerbraten/sauerbraten-server b/community/sauerbraten/sauerbraten-server new file mode 100755 index 000000000..b4c79cb7f --- /dev/null +++ b/community/sauerbraten/sauerbraten-server @@ -0,0 +1,22 @@ +#!/bin/sh + +SAUER_USER=nobody +LOGDIR=/var/log/sauerbraten +[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten + +cd /opt/sauerbraten + +if [ "$(id -u)" == "0" ]; then + if [ ! -d "$LOGDIR" ]; then + mkdir -p "$LOGDIR" + chown "$SAUER_USER:log" "$LOGDIR" + fi + + sudo -Hu "$SAUER_USER" \ + nohup /opt/sauerbraten/bin/linux_server \ + >> "$LOGDIR/main.log" \ + 2>> "$LOGDIR/error.log" \ + < /dev/null & +else + bin/linux_server +fi diff --git a/community/sauerbraten/sauerbraten.confd b/community/sauerbraten/sauerbraten.confd new file mode 100644 index 000000000..93cd32de7 --- /dev/null +++ b/community/sauerbraten/sauerbraten.confd @@ -0,0 +1,7 @@ +# Client options +WIDTH=1024 +HEIGHT=768 + +# Server options +SAUER_USER=sauerbraten +LOGDIR=/var/log/sauerbraten diff --git a/community/sauerbraten/sauerbraten.install b/community/sauerbraten/sauerbraten.install new file mode 100644 index 000000000..2ee7689ab --- /dev/null +++ b/community/sauerbraten/sauerbraten.install @@ -0,0 +1,22 @@ +# arg 1: the new package version +post_install() { + getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten + if getent passwd sauerbraten > /dev/null 2>&1; then + usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1 + else + usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten + fi + passwd -l sauerbraten > /dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten +} + diff --git a/community/sauerbraten/sauerbraten.png b/community/sauerbraten/sauerbraten.png Binary files differnew file mode 100644 index 000000000..5ec7606bc --- /dev/null +++ b/community/sauerbraten/sauerbraten.png diff --git a/community/sauerbraten/sauerbraten.rcd b/community/sauerbraten/sauerbraten.rcd new file mode 100644 index 000000000..fb95aae16 --- /dev/null +++ b/community/sauerbraten/sauerbraten.rcd @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting sauerbraten-server" + [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server + if [ $? -gt 0 ]; then + stat_fail + else + pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid + add_daemon sauerbraten + stat_done + fi + ;; + + stop) + stat_busy "Stopping sauerbraten-server" + [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid` + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sauerbraten + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/sauerbraten/sauerbraten.service b/community/sauerbraten/sauerbraten.service new file mode 100644 index 000000000..a3982a50c --- /dev/null +++ b/community/sauerbraten/sauerbraten.service @@ -0,0 +1,13 @@ +[Unit] +Description=Sauerbraten dedicated server +After=network.target + +[Service] +User=nobody +ExecStart=/opt/sauerbraten/bin/linux_server +Restart=on-abort +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target + diff --git a/community/sbxkb/PKGBUILD b/community/sbxkb/PKGBUILD index 0b261587a..63f25e8bd 100644 --- a/community/sbxkb/PKGBUILD +++ b/community/sbxkb/PKGBUILD @@ -5,7 +5,7 @@ pkgname=sbxkb pkgver=0.7.6 pkgrel=1 pkgdesc="Simple tray XKB indicator" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://downloads.sourceforge.net/project/staybox" depends=('gtk2') diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index d9728ce84..1093b1bc1 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80475 2012-11-22 15:02:06Z spupykin $ +# $Id: PKGBUILD 81583 2012-12-24 15:02:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -21,25 +21,28 @@ backup=('etc/schroot/schroot.conf' 'etc/schroot/arch32/nssdatabases') options=(!libtool) source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - 'pam.d.schroot.patch' 'arch32-example' 'arch32-config' 'arch32-copyfiles' 'arch32-mount' 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'colon-completion.patch' 'fix-bash-completion.patch') md5sums=('f6b1badef213ce8e9ef37bb3fc213390' - 'a8d77cac806a0a9adef3f93cdbeb280a' '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' 'ddb2f09c02b24dab777110f9808472e1' 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '8502fcc9112c2971bcae35373d2ff42f' '5ba775d4f401e2c167414caa548b71e5') build() { cd ${pkgname}-${pkgver} patch -p1 -i ${srcdir}/fix-bash-completion.patch + patch -p1 -i ${srcdir}/colon-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ diff --git a/community/schroot/colon-completion.patch b/community/schroot/colon-completion.patch new file mode 100644 index 000000000..5cd8f8996 --- /dev/null +++ b/community/schroot/colon-completion.patch @@ -0,0 +1,38 @@ +From 1563e1ba9bc2b317390ef305ae9af56a4b976940 Mon Sep 17 00:00:00 2001 +From: Peter Wu <lekensteyn@gmail.com> +Date: Sat, 22 Dec 2012 16:37:00 +0100 +Subject: [PATCH] etc: make bash completion work for colon values + +--chroot (and -c) accept values like chroot:foo and session:foo-abc. Standard +bash completion treats colons as whitespace, hence we need a way to force that +off. + +Fix based on http://stackoverflow.com/q/10528695/427545 (thanks Radu Gasler!) +--- + etc/bash_completion/schroot | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/bash_completion/schroot b/etc/bash_completion/schroot +index 035f0b3..7cda29b 100644 +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -21,14 +21,14 @@ _schroot() + local cur prev options + + COMPREPLY=() +- cur=${COMP_WORDS[COMP_CWORD]} +- prev=${COMP_WORDS[COMP_CWORD-1]} ++ _get_comp_words_by_ref -n : cur prev + + # Select precisely the tokens from schroot --help that begin with a dash + options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') + + if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then + COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) ++ __ltrim_colon_completions "$cur" + else + COMPREPLY=( $(compgen -W "$options" -- $cur) ) + fi +-- +1.8.0.2 + diff --git a/community/scponly/setup_chroot.sh b/community/scponly/setup_chroot.sh index 1af9807e0..1af9807e0 100755..100644 --- a/community/scponly/setup_chroot.sh +++ b/community/scponly/setup_chroot.sh diff --git a/community/scrot/PKGBUILD b/community/scrot/PKGBUILD new file mode 100644 index 000000000..7282f7869 --- /dev/null +++ b/community/scrot/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 81818 2012-12-31 15:37:13Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=scrot +pkgver=0.8 +pkgrel=6 +pkgdesc="A simple command-line screenshot utility for X" +arch=('i686' 'x86_64') +url="http://scrot.sourcearchive.com/" +license=('MIT') +depends=('giblib') +source=("http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz") +md5sums=('ccae904d225609571bdd3b03445c1e88') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/sdlmame/PKGBUILD b/community/sdlmame/PKGBUILD new file mode 100644 index 000000000..33fcdb0f3 --- /dev/null +++ b/community/sdlmame/PKGBUILD @@ -0,0 +1,96 @@ +# $Id: PKGBUILD 81410 2012-12-20 12:14:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: robb_force <robb_force@holybuffalo.net> +# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> + +_patchlevel=4 +_basever=0.147 + +pkgname=sdlmame +if [ ${_patchlevel} -ne 0 ]; then + pkgver=${_basever}.u${_patchlevel} +else + pkgver=${_basever} +fi +pkgrel=1 +pkgdesc="A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support." +url="http://mamedev.org/" +license=('custom:MAME License') +arch=('i686' 'x86_64') +depends=('sdl>=1.2.11' 'libxinerama' 'gconf' 'sdl_ttf' 'gtk2') +makedepends=('unzip' 'nasm' 'mesa' 'glu' 'wget' 'python2') +DLAGENTS=('http::/usr/bin/wget -U "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.2) Gecko/20090804 Shiretoko/3.5.2" -c -t 3 --waitretry=3 -O %o %u') +install=sdlmame.install + +for i in `seq 1 ${_patchlevel}`; do + _patches="${_patches} sdlmame-${_basever/./}u${i}_diff.zip::http://mamedev.org/updates/${_basever/./}u${i}_diff.zip" +done + +source=("mame${_basever/./}s.zip::http://mamedev.org/downloader.php?file=releases/mame${_basever/./}s.zip" + "sdlmame.sh" + "extras.tar.gz" + ${_patches}) +md5sums=('b5fc953ee0351f5145b9d704603f2ee3' + 'e11a7d26704a9e2cff223b9b867d6a05' + '420b61240bf5ae11615ba7c6100ee00d' + '7f2dbea383138a6ae2bbaac3b32376d6' + 'c0306cbf583309d23549529f441e97f2' + '8851533ae3f692e436bc399b773c4fcb' + '3d5fc211f98454f857e58f9100d09e19') + +build() { + cd $srcdir/ + if [ $NOEXTRACT -eq 0 ]; then + unzip mame.zip + find . -type f -not -name \*.png | xargs perl -pi -e 's/\r\n?/\n/g' + for i in `seq 1 ${_patchlevel}`; do + msg "Patch#$i" + patch -p0 -E <${_basever/./}u$i.diff || true # FIXME: + done + fi + make NOWERROR=1 OPTIMIZE=2 PYTHON=python2 + make tools NOWERROR=1 OPTIMIZE=2 PYTHON=python2 +} + +package() { + cd $srcdir/ + # Install the sdlmame script + install -Dm755 $srcdir/${pkgname}.sh $pkgdir/usr/bin/${pkgname} + + # Install the applications and the UI font in /usr/share + install -Dm755 mame $pkgdir/usr/share/${pkgname}/${pkgname} || \ + install -Dm755 mame64 $pkgdir/usr/share/${pkgname}/${pkgname} + + install -m755 chdman $pkgdir/usr/share/${pkgname}/chdman + install -m755 jedutil $pkgdir/usr/share/${pkgname}/jedutil + install -m755 regrep $pkgdir/usr/share/${pkgname}/regrep + install -m755 romcmp $pkgdir/usr/share/${pkgname}/romcmp + install -m755 testkeys $pkgdir/usr/share/${pkgname}/testkeys + install -m755 src2html $pkgdir/usr/share/${pkgname}/src2html + install -m755 srcclean $pkgdir/usr/share/${pkgname}/srcclean + install -m755 ldverify $pkgdir/usr/share/${pkgname}/ldverify + install -m755 ldresample $pkgdir/usr/share/${pkgname}/ldresample + + # Install the extra bits + install -d $pkgdir/usr/share/${pkgname}/{artwork,ctrlr,keymaps,shader} + install -d $pkgdir/usr/share/man/man1 + install -d $pkgdir/usr/share/man/man6 + install -m644 src/osd/sdl/shader/glsl*.*h $pkgdir/usr/share/${pkgname}/shader/ + install -m644 src/osd/sdl/man/*.1* $pkgdir/usr/share/man/man1/ + install -m644 src/osd/sdl/man/*.6* $pkgdir/usr/share/man/man6/ + + install -m644 $srcdir/artwork/* $pkgdir/usr/share/${pkgname}/artwork/ + install -m644 $srcdir/ctrlr/* $pkgdir/usr/share/${pkgname}/ctrlr/ + install -m644 src/osd/sdl/keymaps/* $pkgdir/usr/share/${pkgname}/keymaps/ + + # Include the license + install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/${pkgname}/license.txt + + # FS#28203 + sed -i 's|KEYCODE_2_PAD|KEYCODE_2PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg + sed -i 's|KEYCODE_4_PAD|KEYCODE_4PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg + sed -i 's|KEYCODE_6_PAD|KEYCODE_6PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg + sed -i 's|KEYCODE_8_PAD|KEYCODE_8PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg + + find $pkgdir -type f -exec strip {} \; +} diff --git a/community/sdlmame/extras.tar.gz b/community/sdlmame/extras.tar.gz Binary files differnew file mode 100644 index 000000000..ae0bc2a39 --- /dev/null +++ b/community/sdlmame/extras.tar.gz diff --git a/community/sdlmame/sdlmame.install b/community/sdlmame/sdlmame.install new file mode 100644 index 000000000..0d3fab800 --- /dev/null +++ b/community/sdlmame/sdlmame.install @@ -0,0 +1,8 @@ +post_install() +{ + echo " SDLMAME and the additional MAME utilities have been installed" + echo " in /usr/share/sdlmame However, SDLMAME can be run by" + echo " typing sdlmame and it's options. Try running SDLMAME with" + echo " these options:" + echo " sdlmame <rom> -nowindow -noswitchres" +} diff --git a/community/sdlmame/sdlmame.sh b/community/sdlmame/sdlmame.sh new file mode 100644 index 000000000..336f71690 --- /dev/null +++ b/community/sdlmame/sdlmame.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +# Create a variable equal to $HOME that will be used later in the ini creation +home=('$HOME') + +if [ "$1" != "" ] && [ "$1" = "--newini" ]; then + echo "Rebuilding the ini file at $HOME/.mame/mame.ini" + echo "Modify this file for permanent changes to your SDLMAME" + echo "options and paths before running SDLMAME again." + cd $HOME/.mame + if [ -e mame.ini ]; then + echo "Your old ini file has been renamed to mameini.bak" + mv mame.ini mameini.bak + fi + /usr/share/sdlmame/sdlmame \ + -artpath "$home/.mame/artwork;artwork" \ + -ctrlrpath "$home/.mame/ctrlr;ctrlr" \ + -inipath $home/.mame/ini \ + -rompath $home/.mame/roms \ + -samplepath $home/.mame/samples \ + -cfg_directory $home/.mame/cfg \ + -comment_directory $home/.mame/comments \ + -diff_directory $home/.mame/diff \ + -input_directory $home/.mame/inp \ + -memcard_directory $home/.mame/memcard \ + -nvram_directory $home/.mame/nvram \ + -snapshot_directory $home/.mame/snap \ + -state_directory $home/.mame/sta \ + -video opengl \ + -createconfig +elif [ ! -e $HOME/.mame ]; then + echo "Running SDLMAME for the first time..." + echo "Creating an ini file for SDLMAME at $HOME/.mame/mame.ini" + echo "Modify this file for permanent changes to your SDLMAME" + echo "options and paths before running SDLMAME again." + mkdir $HOME/.mame + mkdir $HOME/.mame/{artwork,cfg,comments,ctrlr,diff,ini,inp,memcard,nvram,samples,snap,sta} + cd $HOME/.mame + /usr/share/sdlmame/sdlmame \ + -artpath "$home/.mame/artwork;artwork" \ + -ctrlrpath "$home/.mame/ctrlr;ctrlr" \ + -inipath $home/.mame/ini \ + -rompath $home/.mame/roms \ + -samplepath $home/.mame/samples \ + -cfg_directory $home/.mame/cfg \ + -comment_directory $home/.mame/comments \ + -diff_directory $home/.mame/diff \ + -input_directory $home/.mame/inp \ + -memcard_directory $home/.mame/memcard \ + -nvram_directory $home/.mame/nvram \ + -snapshot_directory $home/.mame/snap \ + -state_directory $home/.mame/sta \ + -video opengl \ + -createconfig +else + cd /usr/share/sdlmame + ./sdlmame "$@" +fi diff --git a/community/seamonkey/PKGBUILD b/community/seamonkey/PKGBUILD new file mode 100644 index 000000000..2fbb4de62 --- /dev/null +++ b/community/seamonkey/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 80730 2012-12-01 17:20:47Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +pkgname=seamonkey +pkgver=2.14.1 +pkgrel=1 +pkgdesc="SeaMonkey internet suite" +arch=('i686' 'x86_64') +license=('MPL') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake') +install=$pkgname.install +url="http://www.seamonkey-project.org/" +source=(ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 + mozconfig + seamonkey.desktop + seamonkey-2.0-lang.patch) +md5sums=('19463b718446552d04130d01d25d7330' + 'dabc8f517fbff67b8599064bedd32606' + '6119a2254716752c9d08e366f8d4c048' + '25b6fe16ac24cd5c852213e5c1adb272') + +build() { + cd comm-release + cp ../mozconfig .mozconfig + patch -Np1 -i ../seamonkey-2.0-lang.patch + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + # Don't exit with error when some libs are missing which we have in + # system. + sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ + -i suite/installer/Makefile.in + + make -j1 -f client.mk build +} + +package() { + cd comm-release + + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation" + + install -m755 -d "$pkgdir/usr/share/applications" + install -m755 -d "$pkgdir/usr/share/pixmaps" + install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \ + "$pkgdir/usr/share/pixmaps/" + install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/" + + rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc + rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl} +} diff --git a/community/seamonkey/mozconfig b/community/seamonkey/mozconfig new file mode 100644 index 000000000..2131e894f --- /dev/null +++ b/community/seamonkey/mozconfig @@ -0,0 +1,31 @@ +ac_add_options --enable-application=suite + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-safe-browsing +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer + +export MOZILLA_OFFICIAL=1 diff --git a/community/seamonkey/seamonkey-2.0-lang.patch b/community/seamonkey/seamonkey-2.0-lang.patch new file mode 100644 index 000000000..b9f4a5cde --- /dev/null +++ b/community/seamonkey/seamonkey-2.0-lang.patch @@ -0,0 +1,11 @@ +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/community/seamonkey/seamonkey.desktop b/community/seamonkey/seamonkey.desktop new file mode 100644 index 000000000..dd92a2432 --- /dev/null +++ b/community/seamonkey/seamonkey.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=seamonkey %u +Icon=seamonkey +Type=Application +Terminal=false +MultipleArgs=false +Name=SeaMonkey internet suite +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto; +StartupNotify=false +Categories=Application;Network; diff --git a/community/seamonkey/seamonkey.install b/community/seamonkey/seamonkey.install new file mode 100644 index 000000000..709ad81f2 --- /dev/null +++ b/community/seamonkey/seamonkey.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index a1d895fc1..4e95f1cb2 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80671 2012-11-29 00:06:53Z bgyorgy $ +# $Id: PKGBUILD 81732 2012-12-27 21:40:51Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('74b4c31fcadf35b19c058c85b2e8f5566fcb281d') +sha1sums=('348c59af181c28ab3ac7b5fc76cd6758fc6b63e6') build() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index 4e84fe2d1..64b1b7032 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 78374 2012-10-17 15:45:43Z spupykin $ +# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=8 +pkgrel=9 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl>=7.6' 'tk>=4.2' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop build-fix.patch) md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' 'bbf6f10b8155838eede93b5abed724f5' - 'de144f0193cf1cd61771ce7bc782dba2') + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') build() { local _tclver=`pacman -Q tcl` diff --git a/community/sk1/build-fix.patch b/community/sk1/build-fix.patch index 37bc8e135..caf3369ee 100644 --- a/community/sk1/build-fix.patch +++ b/community/sk1/build-fix.patch @@ -8,7 +8,7 @@ diff -wbBur sK1-0.9.1pre/setup.py sK1-0.9.1pre.my/setup.py - tcl_include_dirs = [] - tcl_ver='' + tcl_include_dirs = ['/usr/include'] -+ tcl_ver='8.5' ++ tcl_ver='8.6' if os.path.isdir('/usr/include/tcl8.5'): tcl_include_dirs = ['/usr/include/tcl8.5'] tcl_ver ='8.5' diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index fd54d9020..30f4671f2 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 75946 2012-09-06 19:40:02Z jlichtblau $ +# $Id: PKGBUILD 82001 2013-01-05 15:34:09Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> pkgname=skrooge -pkgver=1.3.3 +pkgver=1.4.0 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://skrooge.org/" license=('GPL') depends=('kdebase-runtime' 'libofx' 'qca-ossl') -makedepends=('cmake' 'automoc4' 'docbook-xsl') +makedepends=('cmake' 'automoc4' 'docbook-xsl' 'boost' 'kdepim-libkdepim') +optdepends=('kdepim-libkdepim: for KDE PIM integration') install=$pkgname.install changelog=$pkgname.changelog source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('251ffca5ad8e3696901fb29df2714fcb30541fe9e3107b9de2c2cb9f6b47cee9') +sha256sums=('71df527bea98b7a998deeeed009bdf381ff890a5743a84b93db4f007223974f9') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index 9c6ad4384..ae5e60b99 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * skrooge 1.4.0-1 + 2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.3.3-1 diff --git a/community/skype-call-recorder/PKGBUILD b/community/skype-call-recorder/PKGBUILD new file mode 100644 index 000000000..8dcbcb072 --- /dev/null +++ b/community/skype-call-recorder/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 55494 2011-09-13 05:27:31Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Tarinaky <tarinaky@hunity.co.uk> + +pkgname=skype-call-recorder +pkgver=0.8 +pkgrel=2 +pkgdesc="Open source tool that allows you to record your Skype calls on Linux" +arch=('i686' 'x86_64') +url="http://atdot.ch/scr/" +license=('GPL') +depends=('qt' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme') +makedepends=('cmake') +install=skype-call-recorder.install +source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('b8faade2d893628fd7a5deac5056d6dfaf7082c4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + cmake -DCMAKE_INSTALL_PREFIX=/usr . +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/skype-call-recorder/skype-call-recorder.install b/community/skype-call-recorder/skype-call-recorder.install new file mode 100644 index 000000000..e4f8fd06c --- /dev/null +++ b/community/skype-call-recorder/skype-call-recorder.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index cd4453461..a2fcec295 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67511 2012-03-12 21:57:54Z lcarlier $ +# $Id: PKGBUILD 82022 2013-01-05 17:48:30Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=3.2.3 -pkgrel=2 +pkgver=4.0.1 +pkgrel=1 pkgdesc='File system and media management forensic analysis tools' arch=('i686' 'x86_64' 'mips64el') url='http://www.sleuthkit.org/sleuthkit' @@ -13,13 +13,13 @@ depends=('perl') options=('!libtool') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62') +sha256sums=('719d9a702f74c30302840301fe573c5bb5af5b88471b48657114eba6b0d76f12') build() { cd ${pkgname}-${pkgver} - ./configure --without-afflib --without-ewf --prefix=/usr - make LDFLAGS+="-lpthread -ldl" + ./configure --prefix=/usr + make } package() { diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog index 8931cc656..5b68610bb 100644 --- a/community/sleuthkit/sleuthkit.changelog +++ b/community/sleuthkit/sleuthkit.changelog @@ -1,2 +1,5 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sleuthkit 4.0.1-1 + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * sleuthkit 3.2.3-1 diff --git a/community/slrn/PKGBUILD b/community/slrn/PKGBUILD index a2f51379d..cb243eb12 100644 --- a/community/slrn/PKGBUILD +++ b/community/slrn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65449 2012-02-21 05:51:03Z spupykin $ +# $Id: PKGBUILD 81585 2012-12-24 15:02:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=slrn -pkgver=0.9.9p1 -pkgrel=7 +pkgver=1.0.1 +pkgrel=1 pkgdesc="An open source text-based news client" arch=('i686' 'x86_64' 'mips64el') url="http://www.slrn.org/" @@ -15,7 +15,7 @@ optdepends=('metamail') options=('!makeflags' 'docs' 'zipman') backup=(etc/slrnrc) source=(http://downloads.sourceforge.net/slrn/$pkgname-$pkgver.tar.gz) -md5sums=('6cc8ac6baaff7cc2a8b78f7fbbe3187f') +md5sums=('232670ab76a045967b137e5124b3d681') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index 33c81da15..d6f876680 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70029 2012-04-28 09:24:19Z allan $ +# $Id: PKGBUILD 81609 2012-12-25 00:34:14Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> @@ -6,14 +6,14 @@ pkgname=smalltalk pkgver=3.2.4 -pkgrel=7 +pkgrel=8 pkgdesc='Implementation of Smalltalk-80' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool' '!emptydirs') depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') -makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip') +makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip') install=smalltalk.install source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3') @@ -37,21 +37,20 @@ build() { --with-tk \ --with-x \ --without-emacs - + echo '#define USE_INTERP_RESULT 1' >> config.h make } check() { cd "$srcdir/$pkgname-$pkgver" -# make check + #make check } package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # fix manpage symlink rm -f "$pkgdir/usr/share/man/man1/gst-reload.1" ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1" diff --git a/community/snes9x/PKGBUILD b/community/snes9x/PKGBUILD new file mode 100644 index 000000000..d7d424871 --- /dev/null +++ b/community/snes9x/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 78959 2012-10-28 04:11:03Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=snes9x +pkgname=('snes9x' 'snes9x-gtk') +pkgver=1.53 +pkgrel=5 +arch=('i686' 'x86_64') +url="https://code.google.com/p/snes9x-gtk/" +license=('custom') +makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' \ + 'desktop-file-utils' 'gnome-icon-theme') +source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 + snes9x-gtk2.24.diff.gz) +sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' + '680dbe0a70f1821bc7931539e72f5a1a95e3938c') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}-src" + patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" + cd unix + ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay + make + + cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" + ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl + make +} + +package_snes9x() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" + depends=('gcc-libs' 'libpng' 'libxext' 'libsm') + + cd "${srcdir}/${pkgbase}-${pkgver}-src/unix" + install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_snes9x-gtk() { + pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" + license=('custom' 'LGPL') + depends=('sdl' 'libgl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') + install=snes9x-gtk.install + + cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ + "${pkgdir}/usr/share/doc/${pkgname}/" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/snes9x/snes9x-gtk.install b/community/snes9x/snes9x-gtk.install new file mode 100644 index 000000000..2c88492dd --- /dev/null +++ b/community/snes9x/snes9x-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove () { + post_install $1 +} diff --git a/community/snes9x/snes9x-gtk2.24.diff.gz b/community/snes9x/snes9x-gtk2.24.diff.gz Binary files differnew file mode 100644 index 000000000..f8e86d7f2 --- /dev/null +++ b/community/snes9x/snes9x-gtk2.24.diff.gz diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index d2158b718..70abb0e20 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81186 2012-12-12 20:10:52Z bpiotrowski $ +# $Id: PKGBUILD 81564 2012-12-24 11:13:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' @@ -21,7 +21,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('247165245bb3d6f5afbff07649fe8f57') +md5sums=('6ba8170c61c6cbe81b3daa67e617068a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD index bc31421a9..acade57ec 100644 --- a/community/splint/PKGBUILD +++ b/community/splint/PKGBUILD @@ -18,7 +18,7 @@ options=('!makeflags') build() { cd "${srcdir}"/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST make } diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index b0e199b98..eccbec2f5 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,31 +1,26 @@ -# $Id: PKGBUILD 74012 2012-07-18 01:09:14Z ibiru $ +# $Id: PKGBUILD 82075 2013-01-07 10:25:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.147 -pkgrel=2 +pkgver=0.159 +pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') url="http://springlobby.info/" license=('GPL2') -depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') +depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' 'alure') optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1dd17f3f573d40b10b66bdbdc77181f0') +md5sums=('9a8e89c32dd49a51332e446e47dc1be1') build() { cd $srcdir/${pkgname}-$pkgver - #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOPTION_SOUND=false + -DCMAKE_INSTALL_PREFIX=/usr make } @@ -33,12 +28,6 @@ package() { cd $srcdir/${pkgname}-$pkgver make DESTDIR=$pkgdir install - # - # install -m755 -d $pkgdir/usr/share/applications - # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications - - # install -m755 -d -p $pkgdir/usr/share/pixmaps - # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps } # vim: sw=2:ts=2 et: diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index b559c9b6c..f318834d2 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 81053 2012-12-11 09:28:38Z spupykin $ +# $Id: PKGBUILD 82172 2013-01-10 09:49:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.2.5 -pkgrel=1 +pkgver=3.2.6 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' depends=('openssl' 'pam' 'cron' 'perl' 'libltdl') makedepends=('libcap') @@ -24,8 +24,8 @@ source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('ddb329f92056aa58a56db6a2eeea0c02' - '02f7b5bd793f778e40834fd6457d2199' +md5sums=('87915ad83aebafc7af6871c770b23339' + 'e90895ce22c0b618c89a46a9a181fe6c' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' 'b499c2b725aefd7bd60bec2f1a9de392' diff --git a/community/squid/squid b/community/squid/squid index da5534427..ea80aaa2e 100644 --- a/community/squid/squid +++ b/community/squid/squid @@ -8,8 +8,9 @@ pidfile=/run/squid.pid { read -r PID </run/squid.pid; } 2>/dev/null -if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then +if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then rm /run/squid.pid + unset PID fi case $1 in diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc index dbd95c9ea..dbd95c9ea 100755..100644 --- a/community/sshguard/sshguard.rc +++ b/community/sshguard/sshguard.rc diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 7c6210b0c..e61cc9832 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 81431 2012-12-20 23:33:39Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.13b +pkgver=1.14 pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') @@ -15,13 +15,12 @@ backup=('etc/conf.d/sslh' 'etc/sslh.conf') source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' 'sslh.conf') -md5sums=('fbd8934e6f799437c562866f09afee5b' +md5sums=('36e64bd6c7d0a299d5acd1109988099b' 'c2a0c7c58d091acf5b4672f58066ee8f' 'c51c63d2b28080bae4c1c7a0c469bab7') build() { - #cd $pkgname-$pkgver - cd $pkgname-1.13 + cd $pkgname-$pkgver # fix archlinux path in manpage sed -i 's/init.d/rc.d/' sslh.pod sed -i 's+/etc/default+/etc/conf.d+' sslh.pod @@ -33,8 +32,7 @@ package() { install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" # manually install to have both ssl-fork and ssl-select - #cd $pkgname-$pkgver - cd $pkgname-1.13 + cd $pkgname-$pkgver install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" ln -s sslh-fork "$pkgdir/usr/bin/sslh" diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD new file mode 100644 index 000000000..542675e54 --- /dev/null +++ b/community/stardict/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 82064 2013-01-07 06:51:59Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: Neil Lin <neil@vip.url.com.tw> +# Contributor: Cravix < dr dot neemous at gmail dot com > + +pkgbase=stardict +pkgname=(stardict stardict-lite) +pkgver=3.0.4 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.stardict.org/' +license=('GPL') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') +options=('!libtool' '!emptydirs') +source=("http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2" + 'gcc46.patch' + 'glib2.patch' + 'zlib.patch') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -p1 -i ../gcc46.patch + patch -p1 -i ../glib2.patch + patch -p1 -i ../zlib.patch + + cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgbase}-${pkgver}-lite" + + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure \ + PKG_CONFIG=/usr/bin/pkg-config \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-schemas-install \ + --disable-gucharmap \ + --disable-festival \ + --disable-updateinfo + make + + cd "${srcdir}/${pkgbase}-${pkgver}-lite" + LDFLAGS="$LDFLAGS -lgmodule-2.0" + ./configure \ + PKG_CONFIG=/usr/bin/pkg-config \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-gnome-support \ + --disable-schemas-install \ + --disable-espeak \ + --disable-gucharmap \ + --disable-festival \ + --disable-updateinfo + make +} + +package_stardict() { + pkgdesc='International dictionary software' + depends=('enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_stardict-lite() { + pkgdesc='International dictionary software - lite version without gnome and espeak support' + depends=('enchant' 'gtk2' 'libsigc++' 'libsm') + provides=(stardict) + conflicts=(stardict) + + cd "${srcdir}/${pkgbase}-${pkgver}-lite" + make DESTDIR="${pkgdir}" install +} + +md5sums=('0a9abf1936c43a3ee255802c75267f1a' + '52ff47441c503de07add4b7688510bc5' + 'b2f216897c9053c7e4666c3d78705cf1' + 'ee26dce70fc83b3ce86e5100fede7fad') diff --git a/community/stardict/gcc46.patch b/community/stardict/gcc46.patch new file mode 100644 index 000000000..944b9635c --- /dev/null +++ b/community/stardict/gcc46.patch @@ -0,0 +1,11 @@ +diff -aur old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h +--- old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h 2011-07-18 06:58:58.519404744 -0700 ++++ new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h 2011-07-18 07:01:10.739734313 -0700 +@@ -26,6 +26,7 @@ + #ifndef __TYPES_H__ + #define __TYPES_H__ + ++#include <cstddef> + #include <math.h> + + typedef float single; diff --git a/community/stardict/glib2.patch b/community/stardict/glib2.patch new file mode 100644 index 000000000..bd0f6bac8 --- /dev/null +++ b/community/stardict/glib2.patch @@ -0,0 +1,36 @@ +diff -Naur old/dict/configure.ac new/dict/configure.ac +--- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000 +@@ -266,6 +266,9 @@ + fi + AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR) + ++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0` ++AC_SUBST([GMODULE2_LIBS]) ++ + dnl ================================================================ + dnl main program checks. + dnl ================================================================ +diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am +--- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000 +@@ -33,7 +33,7 @@ + stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE) + stardict_LDFLAGS = + ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail +-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) ++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS) + + if !GNOME_SUPPORT + if MAEMO_SUPPORT +diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h +--- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000 +@@ -21,7 +21,6 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include <glib.h> + + G_BEGIN_DECLS + diff --git a/community/stardict/zlib.patch b/community/stardict/zlib.patch new file mode 100644 index 000000000..eb5a9a12a --- /dev/null +++ b/community/stardict/zlib.patch @@ -0,0 +1,35 @@ +diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp +--- old/lib/src/libcommon.cpp 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 +0000 +@@ -614,7 +614,7 @@ + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h +--- old/lib/src/libcommon.h 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.h 2012-07-12 11:34:05.006568754 +0000 +@@ -187,8 +187,9 @@ + typedef ResourceWrapper<FILE, FILE*, int, fclose> File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper<void, void*, int, gzclose> gzFile; ++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD index 2ef02256a..5deb338e0 100644 --- a/community/stfl/PKGBUILD +++ b/community/stfl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=stfl pkgver=0.22 -pkgrel=1 +pkgrel=1.1 pkgdesc="Library implementing a curses-based widget set for text terminals" arch=('i686' 'x86_64' 'mips64el') url="http://clifford.at/stfl/" diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD index 7d857334f..b7f8f2441 100644 --- a/community/stk/PKGBUILD +++ b/community/stk/PKGBUILD @@ -32,7 +32,7 @@ build() { sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp # run actual build - ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack + ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack --build=$CHOST make # fix executable scripts diff --git a/community/subtitleeditor/PKGBUILD b/community/subtitleeditor/PKGBUILD index e5abd0bc4..45a420910 100644 --- a/community/subtitleeditor/PKGBUILD +++ b/community/subtitleeditor/PKGBUILD @@ -17,12 +17,14 @@ optdepends=('gstreamer0.10-ffmpeg: to be able to view movies inside the subtitle options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://download.gna.org/$pkgname/0.40/$pkgname-$pkgver.tar.gz) -sha256sums=('b8d948f3e770524bf63fe632600aa94fcbd4edba772cad2aec4fdb3b3335b02d') +source=(http://download.gna.org/$pkgname/0.40/$pkgname-$pkgver.tar.gz + subtitleeditor-0.40.0-glib.patch) +sha256sums=('b8d948f3e770524bf63fe632600aa94fcbd4edba772cad2aec4fdb3b3335b02d' + '152883d00195c86ee04db2c8aa22b0c82255c328c31acfd55877ca403779d2e0') build() { cd ${srcdir}/$pkgname-$pkgver - + patch -Np1 -i ${srcdir}/subtitleeditor-0.40.0-glib.patch ./configure --prefix=/usr make } diff --git a/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch b/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch new file mode 100644 index 000000000..1215a7112 --- /dev/null +++ b/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch @@ -0,0 +1,11 @@ +--- subtitleeditor-0.40.0.orig/plugins/actions/findandreplace/findandreplace.cc 2012-02-22 14:02:05.000000000 -0500 ++++ subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc 2013-01-05 20:24:07.887899963 -0500 +@@ -26,7 +26,7 @@ + #include <gui/dialogutility.h> + #include <gtkmm_utility.h> + #include <widget_config_utility.h> +-#include <glib/gregex.h> ++#include <glib.h> + + /* + * FIXME: diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD index ca1ba26bc..a6adc1a1f 100644 --- a/community/sunpinyin/PKGBUILD +++ b/community/sunpinyin/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 79715 2012-11-11 14:12:03Z fyan $ +# $Id: PKGBUILD 81888 2013-01-03 05:18:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=sunpinyin -pkgver=2.0.3.20121107 -_commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b +pkgver=2.0.3.20130103 +_commit=baf4da89ac04c3eb6ea3b8fb1a10f13bf23f3d87 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Statistical Language Model based pinyin IME by Sun" -license=('LGPL' 'APACHE') +license=('LGPL') url="http://sunpinyin.googlecode.com" depends=('sqlite' 'make' 'gcc-libs') +optdepends=('sunpinyin-data: Statistical language model data from open-gram project for sunpinyin') makedepends=('git' 'scons' 'intltool') -source=('http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2' - 'http://open-gram.googlecode.com/files/dict.utf8-20120830.tar.bz2') __gitroot=git://github.com/sunpinyin/sunpinyin.git __gitname=$pkgname @@ -37,21 +36,10 @@ build() { cd "$srcdir/$__gitname-build" git checkout "$_commit" - # Build sunpinyin sed -i -e "1s|python|python2|" python/*.py python/importer/*.py scons \ --prefix=/usr - - # Build sunpinyin-data - mkdir -p "$srcdir/$__gitname-build/raw" - ln -sf "$srcdir/lm_sc.t3g.arpa" "$srcdir/$__gitname-build/raw/lm_sc.t3g.arpa" - ln -sf "$srcdir/dict.utf8" "$srcdir/$__gitname-build/raw/dict.utf8" - - ln -sf "$srcdir/$__gitname-build/doc/SLM-inst.mk" "$srcdir/$__gitname-build/raw/Makefile" - cd "$srcdir/$__gitname-build/raw" - PATH="$srcdir/$__gitname-build/src:$PATH" - make } package() { @@ -61,10 +49,5 @@ package() { --prefix=/usr \ --install-sandbox="$pkgdir" \ install - - cd "$srcdir/$__gitname-build/raw" - make DESTDIR="$pkgdir" install } -md5sums=('0586241ca33359ad176c842c90bf563e' - '52b9a47861bef707f65b682d52e8117f') diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 64062b8a4..c62eeca72 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80709 2012-11-30 03:35:13Z speps $ +# $Id: PKGBUILD 82202 2013-01-11 18:53:55Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('9ac8f563d885cef66b2365949eb666d1') +md5sums=('b160930f01c2b00df303f8112bbe2f3f') build() { cd "$srcdir/$_name-Source" diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD index 9e6d613f0..a31909eef 100644 --- a/community/supertuxkart/PKGBUILD +++ b/community/supertuxkart/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81266 2012-12-15 06:19:59Z svenstaro $ +# $Id: PKGBUILD 81785 2012-12-29 16:57:50Z arodseth $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,19 +6,25 @@ pkgname=supertuxkart pkgver=0.8 -pkgrel=2 -pkgdesc="A kart racing game featuring Tux and his friends" -arch=('i686' 'x86_64' 'mips64el') -url="http://supertuxkart.sourceforge.net/" +pkgrel=3 +pkgdesc='Kart racing game featuring Tux and his friends' +arch=('i686' 'x86_64') +url='http://supertuxkart.sourceforge.net/' license=('GPL2') depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl') -makedepends=('cmake' 'subversion' 'mesa') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2) +makedepends=('cmake' 'subversion' 'mesa' 'imagemagick' 'setconf') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2") md5sums=('0b939ce601374758938119e0b0dd1fec') build() { cd ${srcdir}/SuperTuxKart-${pkgver} + convert "data/${pkgname}_64.xpm" "data/$pkgname.png" + _fn="data/${pkgname}_desktop.template" + setconf "$_fn" Exec "$pkgname --log=file" + setconf "$_fn" TryExec "$pkgname" + setconf "$_fn" Icon "$pkgname" + cd lib/irrlicht/source/Irrlicht NDEBUG=1 make @@ -43,7 +49,8 @@ package() { cd build make DESTDIR=${pkgdir} install - sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop + cd ../data + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" } # vim:set ts=2 sw=2 et: diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD new file mode 100644 index 000000000..6d4b26753 --- /dev/null +++ b/community/synapse/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 81698 2012-12-27 01:23:31Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Alessio Sergi <asergi at archlinux dot us> + +pkgname=synapse +pkgver=0.2.10 +pkgrel=3 +pkgdesc="A semantic file launcher" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/synapse-project" +license=('GPL3') +depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \ + 'libunique' 'libzeitgeist' 'rest' 'xdg-utils') +makedepends=('intltool' 'vala') +optdepends=('banshee: banshee plugin' + 'bc: calculator plugin' + 'devhelp: documentation plugin' + 'gnome-screensaver: screensaver plugin' + 'gnome-utils: dictionary plugin' + 'openssh: ssh plugin' + 'pastebinit: pastebin plugin' + 'rhythmbox: rhythmbox plugin' + 'xnoise: xnoise plugin') +install=$pkgname.install +source=("https://launchpad.net/$pkgname-project/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz" + "fix-check-desktop.patch" + "check-null-exec.patch") +sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff' + 'b64fa4efc4efd01f77f84d19a7a63c10186d0211' + 'f494e5b36a77421114ce04b7085369abe5c00d68') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # XDG_CURRENT_DESKTOP fix + patch -Np1 -i "$srcdir"/fix-check-desktop.patch + + # don't crash on empty Exec field + patch -Np1 -i "$srcdir"/check-null-exec.patch + + # DSO fix + export LDFLAGS="$LDFLAGS -lm" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/synapse/check-null-exec.patch b/community/synapse/check-null-exec.patch new file mode 100644 index 000000000..77820ecbb --- /dev/null +++ b/community/synapse/check-null-exec.patch @@ -0,0 +1,16 @@ +diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala +--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100 ++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-12-26 18:07:55.962276823 +0100 +@@ -125,7 +125,11 @@ + } + + name = app_info.get_name (); +- exec = app_info.get_executable (); ++ exec = app_info.get_commandline (); ++ if (exec == null) ++ { ++ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name)); ++ } + + // check for hidden desktop files + if (keyfile.has_key (GROUP, "Hidden") && diff --git a/community/synapse/fix-check-desktop.patch b/community/synapse/fix-check-desktop.patch new file mode 100644 index 000000000..16e039b48 --- /dev/null +++ b/community/synapse/fix-check-desktop.patch @@ -0,0 +1,30 @@ +diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala +--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100 ++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-03-19 12:06:43.080443401 +0100 +@@ -248,13 +248,23 @@ + + private void get_environment_type () + { +- unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION"); +- ++ unowned string? session_var; ++ session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP"); ++ if (session_var == null) ++ { ++ session_var = Environment.get_variable ("DESKTOP_SESSION"); ++ } ++ + if (session_var == null) return; + + string session = session_var.down (); + +- if (session.has_prefix ("kde")) ++ if (session.has_prefix ("unity")) ++ { ++ session_type = DesktopFileInfo.EnvironmentType.UNITY; ++ session_type_str = "Unity"; ++ } ++ else if (session.has_prefix ("kde")) + { + session_type = DesktopFileInfo.EnvironmentType.KDE; + session_type_str = "KDE"; diff --git a/community/synapse/synapse.install b/community/synapse/synapse.install new file mode 100644 index 000000000..704cb339e --- /dev/null +++ b/community/synapse/synapse.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null +} + +post_upgrade() { + post_install "$1" +} + +post_remove() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 1552be656..e4bce6f69 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $ +# $Id: PKGBUILD 81587 2012-12-24 15:03:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.2 +pkgver=10.1.3 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat sysstat.service) -md5sums=('c40626b96cc2b4cf303cbcf1efc96eba' +md5sums=('e08b5665956930ad12b10ed6e0a08b10' '3ce41ebf7330aba01e70b38658afed1f' '12ba479c606620193e8b7c6e982d5088') diff --git a/community/tarsnap/PKGBUILD b/community/tarsnap/PKGBUILD new file mode 100644 index 000000000..a5186baa7 --- /dev/null +++ b/community/tarsnap/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 75035 2012-08-12 08:25:53Z jelle $ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +pkgname=tarsnap +pkgver=1.0.33 +pkgrel=1 +pkgdesc='An online encrypted snapshotted backup service' +arch=('i686' 'x86_64') +url='http://www.tarsnap.com/' +license=('custom') +depends=('bzip2' 'openssl' 'xz>=5.0.0') +makedepends=('e2fsprogs') +source=("https://www.tarsnap.com/download/$pkgname-autoconf-$pkgver.tgz") +md5sums=('a6267972d834198716b9fe09680e47e2') +sha256sums=('0c0d825a8c9695fc8d44c5d8c3cd17299c248377c9c7b91fdb49d73e54ae0b7d') + +build() { + cd "$srcdir/$pkgname-autoconf-$pkgver" + + ./configure --prefix=/usr --sysconfdir="/etc/$pkgname" + make +} + +package() { + cd "$srcdir/$pkgname-autoconf-$pkgver" + + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/community/tdfsb/tdfsb.desktop b/community/tdfsb/tdfsb.desktop index 7167e022a..7167e022a 100755..100644 --- a/community/tdfsb/tdfsb.desktop +++ b/community/tdfsb/tdfsb.desktop diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 74342dab5..0238e2885 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81096 2012-12-11 19:14:52Z spupykin $ +# $Id: PKGBUILD 81589 2012-12-24 15:03:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=33.4.0 +pkgver=33.5.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('5e553e3061b978b368e1dc70ee369c8d' +md5sums=('7a55b22b1ce0fda61d6be6244ec4c3db' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy index 5580ea804..5580ea804 100755..100644 --- a/community/tinyproxy/tinyproxy +++ b/community/tinyproxy/tinyproxy diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD index bbb1b64c1..501e1087f 100644 --- a/community/tksystray/PKGBUILD +++ b/community/tksystray/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65405 2012-02-21 03:27:16Z spupykin $ +# $Id: PKGBUILD 81610 2012-12-25 00:34:16Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Pavel Borzenkov <pavel.borzenkov@gmail.com> pkgname=tksystray pkgver=0.1 -pkgrel=5 +pkgrel=6 pkgdesc="tksystray is compatible with freedesktop.org standarts systray for Tk" arch=('i686' 'x86_64' 'mips64el') url="http://tkabber.jabber.ru/tksystray" diff --git a/community/tktheme/PKGBUILD b/community/tktheme/PKGBUILD index 75e103881..dad5be087 100644 --- a/community/tktheme/PKGBUILD +++ b/community/tktheme/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65407 2012-02-21 03:28:00Z spupykin $ +# $Id: PKGBUILD 81611 2012-12-25 00:34:17Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: slubman <slubman@slubman.net> pkgname=tktheme pkgver=0.23 -pkgrel=7 +pkgrel=8 pkgdesc="A library to allow Tkabber docking in the system tray." arch=('i686' 'x86_64' 'mips64el') depends=('tk' 'libxpm' 'libxmu') diff --git a/community/toolame/PKGBUILD b/community/toolame/PKGBUILD index 7e975d169..e824c46b5 100644 --- a/community/toolame/PKGBUILD +++ b/community/toolame/PKGBUILD @@ -20,6 +20,7 @@ build() { cd $srcdir/$pkgname-$pkgver patch -p0 < ../toolame-02l.patch [ "$CARCH" = "x86_64" ] && sed -i "s|-march=i686|-march=x86-64|g" Makefile + [ "$CARCH" = "mips64el" ] && sed -i "s|-march=i686|-march=loongson2f|g" Makefile make install -D -m755 toolame $pkgdir/usr/bin/toolame } diff --git a/community/tp_smapi-lts/PKGBUILD b/community/tp_smapi-lts/PKGBUILD new file mode 100644 index 000000000..1d74c5df3 --- /dev/null +++ b/community/tp_smapi-lts/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com> +# Contributor: Nick B <Shirakawasuna ð gmail đ com> +# Contributor: Christof Musik <christof ð senfdax đ de> +# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de> +# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com> + +pkgname=tp_smapi-lts +_pkgname=tp_smapi +_extramodules=/usr/lib/modules/extramodules-3.0-lts +pkgver=0.41 +pkgrel=9 +pkgdesc="linux-lts modules for ThinkPad's SMAPI functionality" +arch=('i686' 'x86_64') +url='https://github.com/evgeni/tp_smapi' +license=('GPL') +depends=('linux-lts>=3.0' 'linux-lts<3.1') +makedepends=('linux-lts-headers>=3.0' 'linux-lts-headers<3.1') +install="${pkgname}.install" +source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('63c683415c764568f6bf17c7eabe4752') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + _kernver=$(< "${_extramodules}/version") + + sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ + -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile + + make HDAPS=1 +} + +package() { + _kernver=$(< "${_extramodules}/version") + + make -C "${_extramodules%/*}/${_kernver}/build" \ + INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ + M="${srcdir}/${_pkgname}-${pkgver}" modules_install + + cd "${pkgdir}/${_extramodules%/*}" + mv "${_kernver}/extra" "${_extramodules##*/}" + rmdir "${_kernver}" + + # compress kernel modules + find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + + + # load module on startup + echo tp_smapi > "${srcdir}/${pkgname}.conf" + install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" + + # update kernel version in install file + sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install" +} diff --git a/community/tp_smapi-lts/tp_smapi-lts.install b/community/tp_smapi-lts/tp_smapi-lts.install new file mode 100644 index 000000000..4d671007d --- /dev/null +++ b/community/tp_smapi-lts/tp_smapi-lts.install @@ -0,0 +1,13 @@ +extramodules=/usr/lib/modules/extramodules-3.0-lts + +post_install() { + depmod -v $(< "$extramodules/version") &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/trayion/PKGBUILD b/community/trayion/PKGBUILD index e9b1ff964..e3576f50d 100644 --- a/community/trayion/PKGBUILD +++ b/community/trayion/PKGBUILD @@ -16,6 +16,7 @@ md5sums=('6e1123121ed83bd7f9759a71d4ef9307') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i "s:/bin/install:/usr/bin/install:" Makefile make make prefix="$pkgdir/usr" install } diff --git a/community/twolame/PKGBUILD b/community/twolame/PKGBUILD index 0eda2c079..fc4253da1 100644 --- a/community/twolame/PKGBUILD +++ b/community/twolame/PKGBUILD @@ -5,7 +5,7 @@ pkgname=twolame pkgver=0.3.13 -pkgrel=6 +pkgrel=6.1 pkgdesc="An optimized MPEG Audio Layer 2 (MP2) encoder" arch=('i686' 'x86_64' 'mips64el') url="http://www.twolame.org/" diff --git a/community/ufoai/PKGBUILD b/community/ufoai/PKGBUILD new file mode 100644 index 000000000..670deb600 --- /dev/null +++ b/community/ufoai/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 70141 2012-04-30 15:53:06Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=ufoai +pkgver=2.4 +pkgrel=2 +pkgdesc="In UFO: Alien Invasion you fight aliens trying to capture Earth" +arch=('i686' 'x86_64') +url="http://ufoai.ninex.info/" +license=('GPL') +depends=('libjpeg' 'libgl' 'libpng' 'curl' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'xvidcore' 'ufoai-data') +makedepends=('mesa') +source=(http://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$pkgver/ufoai-$pkgver-source.tar.bz2) +md5sums=('d7e88aee0ea94149c8b9d90eb6c21ba9') + +build() { + cd "$srcdir"/$pkgname-$pkgver-source + + ./configure --prefix=/usr --datadir=/usr/share/ufoai --enable-release --localedir=/usr/share/ufoai/base/i18n/ + make + make lang +} + +package() { + cd "$srcdir"/$pkgname-$pkgver-source + + install -Dm755 ufo "$pkgdir"/usr/bin/ufo + install -Dm755 ufoded "$pkgdir"/usr/bin/ufoded + install -Dm755 ufo2map "$pkgdir"/usr/bin/ufo2map + install -Dm755 ufomodel "$pkgdir"/usr/bin/ufomodel + + mkdir -p "$pkgdir"/usr/share/ufoai + cp -r base "$pkgdir"/usr/share/ufoai/ + + install -Dm644 debian/ufoai.desktop "$pkgdir"/usr/share/applications/ufoai.desktop + install -Dm644 debian/ufoai-safe.desktop "$pkgdir"/usr/share/applications/ufoai-safe.desktop + install -Dm644 debian/ufoded.desktop "$pkgdir"/usr/share/applications/ufoded.desktop + + sed -i 's|/usr/games/||' "$pkgdir"/usr/share/applications/* + + install -Dm644 debian/ufoai.xpm "$pkgdir"/usr/share/pixmaps/ufoai.xpm + install -Dm644 debian/ufoded.xpm "$pkgdir"/usr/share/pixmaps/ufoded.xpm +} + +# vim: sw=2:ts=2 et: diff --git a/community/ufoai/ufo-ai-2.3.1-libpng15.patch b/community/ufoai/ufo-ai-2.3.1-libpng15.patch new file mode 100644 index 000000000..2099f7ab7 --- /dev/null +++ b/community/ufoai/ufo-ai-2.3.1-libpng15.patch @@ -0,0 +1,10 @@ +--- src/shared/images.c.old 2011-04-02 19:31:52.000000000 +0200 ++++ src/shared/images.c 2011-04-02 19:32:13.000000000 +0200 +@@ -32,6 +32,7 @@ + + #include <jpeglib.h> + #include <png.h> ++#include <zlib.h> + + /** image formats, tried in this order */ + static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL }; diff --git a/community/unace/01-makefiles.dpatch b/community/unace/01-makefiles.dpatch new file mode 100644 index 000000000..798c226e0 --- /dev/null +++ b/community/unace/01-makefiles.dpatch @@ -0,0 +1,52 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-makefiles.dpatch by Fabian Greffrath <fabian@debian-unofficial.org> +## +## DP: Fix upstream makefiles + +@DPATCH@ + +diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk +--- unace-nonfree-2.5.orig/base.mk 2003-11-27 20:16:20.000000000 +0100 ++++ unace-nonfree-2.5/base.mk 2006-01-31 09:33:04.000000000 +0100 +@@ -427,9 +427,7 @@ + ############################################################################## + + ifndef ISWMAKE
+-include $(MAKE_DIR)baseace.mk
+ include $(MAKE_DIR)baseuace.mk
+ else
+-!include $(MAKE_DIR)baseace.mk
+ !include $(MAKE_DIR)baseuace.mk
+ endif
+diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile +--- unace-nonfree-2.5.orig/makefile 2003-11-24 00:24:24.000000000 +0100 ++++ unace-nonfree-2.5/makefile 2006-01-31 09:40:17.000000000 +0100 +@@ -18,6 +18,6 @@ + INCLDIR = //usr/include
+
+-DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__
++DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__
+
+ ifdef DEBUG
+ LSWITCHES =
+@@ -47,7 +47,7 @@ + $(APPS_UNACEEXE_CFILES)
+
+ unace: $(UNACEEXELIN_CFILES)
+- gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace ++ gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace + ifndef DEBUG
+ tar cfvz linunace25.tgz unace file_id.diz licence + #sh linpack.sh
+diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk +--- unace-nonfree-2.5.orig/unace.mk 2003-11-27 20:17:46.000000000 +0100 ++++ unace-nonfree-2.5/unace.mk 2006-01-31 09:33:21.000000000 +0100 +@@ -27,8 +27,6 @@ +
+ ifndef ISWMAKE
+ include $(MAKE_DIR)unaceexe.mk
+-include $(MAKE_DIR)unacedll.mk
+ else
+ !include $(MAKE_DIR)unaceexe.mk
+-!include $(MAKE_DIR)unacedll.mk
+ endif
diff --git a/community/unace/04-64bit.dpatch b/community/unace/04-64bit.dpatch new file mode 100644 index 000000000..7aad590be --- /dev/null +++ b/community/unace/04-64bit.dpatch @@ -0,0 +1,119 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-64bit.dpatch by Michael Karcher +## <debian@mkarcher.dialup.fu-berlin.de> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace declare.h by a generic stdint based version. + +@DPATCH@ +diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h +--- unace-nonfree-2.5~/source/base/all/declare.h 2007-11-06 00:11:47.000000000 +0100 ++++ unace-nonfree-2.5/source/base/all/declare.h 2007-11-06 00:13:18.498574104 +0100 +@@ -7,76 +7,47 @@ + #ifndef _DECLARE_H_INCLUDED
+ #define _DECLARE_H_INCLUDED
+
+-#if !defined(__OS2__) && !defined(_WINDOWS_)
+- typedef int BOOL;
+-
+- typedef char CHAR;
+- typedef unsigned char UCHAR;
+- typedef UCHAR *PUCHAR;
+- typedef char *PSZ;
+-
+- typedef short SHORT;
+- typedef unsigned short USHORT;
+- typedef USHORT *PUSHORT;
+-
+- typedef long LONG;
+- typedef unsigned long ULONG;
+-
+- typedef ULONG *PULONG;
+-
+- typedef int INT;
+- typedef unsigned int UINT;
+- typedef unsigned int *PUINT;
++#include <stdint.h>
+
+- typedef CHAR *LPSTR;
+-#endif
++typedef int BOOL;
++typedef BOOL *PBOOL;
+
+-#if __WATCOMC__==1060
+- typedef long __int64[2];
+- typedef __int64 LONGLONG;
+- typedef LONGLONG *PLONGLONG;
+- typedef __int64 ULONGLONG;
+- typedef ULONGLONG DWORDLONG;
+-#else
+- #if !defined(_WINDOWS_)
+- #if !defined(__WATCOMC__) && !defined(__int64)
+- #define __int64 long long
+- #endif
++typedef char CHAR;
++typedef CHAR *PCHAR;
++typedef unsigned char UCHAR;
++typedef UCHAR *PUCHAR;
++typedef signed char SCHAR;
++typedef CHAR *PSZ;
++typedef CHAR *LPSTR;
+
+- typedef __int64 LONGLONG;
+- typedef LONGLONG *PLONGLONG;
+- typedef unsigned __int64 ULONGLONG;
+- typedef ULONGLONG DWORDLONG;
+- #endif
+-#endif
++typedef int INT;
++typedef INT *PINT;
++typedef unsigned int UINT;
++typedef unsigned int *PUINT;
+
++typedef int16_t SHORT;
++typedef SHORT *PSHORT;
++typedef uint16_t USHORT;
++typedef USHORT *PUSHORT;
+
+-#if !defined(_WINDOWS_)
+- typedef BOOL *PBOOL;
+- typedef INT *PINT;
+-#endif
++typedef int32_t LONG;
++typedef LONG *PLONG;
++typedef uint32_t ULONG;
++typedef ULONG *PULONG;
+
+-#if !defined(__wtypes_h__)
+- typedef void *PVOID;
+- typedef CHAR *PCHAR;
+- typedef SHORT *PSHORT;
+- typedef LONG *PLONG;
+- typedef ULONGLONG *PULONGLONG;
+-#endif
++typedef int64_t LONGLONG;
++typedef LONGLONG *PLONGLONG;
++typedef uint64_t ULONGLONG;
++typedef ULONGLONG *PULONGLONG;
+
+-#if defined(_GNU_H_WINDOWS32_BASE)
+- typedef LONGLONG ULONGLONG;
+- typedef ULONGLONG *PULONGLONG;
+-#endif
++typedef void *PVOID;
+
+-typedef signed char SCHAR;
++/* Dear ACE team, please clean your code to remove the following types */
++typedef LONGLONG __int64;
++typedef ULONGLONG DWORDLONG;
+
+ #ifndef NULL
+- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)
+- #define NULL 0
+- #else
+- #define NULL 0L
+- #endif
++#include <stdlib.h>
+ #endif
+
+
diff --git a/community/unace/ChangeLog b/community/unace/ChangeLog new file mode 100644 index 000000000..41533eb7b --- /dev/null +++ b/community/unace/ChangeLog @@ -0,0 +1,9 @@ +2008-04-04 Eric Belanger <eric@archlinux.org> + + * unace-2.5-5.1 + * fixed seg faults on x86_64 + +2007-05-28 Alessio 'mOLOk' Bolognino <themolok@gmail.com> + * unace-2.5-5 + moved in [community] + now it's built from source (from debian) diff --git a/community/unace/PKGBUILD b/community/unace/PKGBUILD new file mode 100644 index 000000000..8a5c338f3 --- /dev/null +++ b/community/unace/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 67507 2012-03-12 21:46:37Z lcarlier $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: lowercase + +pkgname=unace +pkgver=2.5 +pkgrel=7 +pkgdesc="An extraction tool for the proprietary ace archive format" +arch=('i686' 'x86_64') +url="http://www.winace.com/" +license=("custom") +depends=(ncurses) +install=unace.install +source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \ + 01-makefiles.dpatch 04-64bit.dpatch) +md5sums=('59013e74e5ac2ee15c1e92026ec1e3cc' '6a1498f24d6430723acf556e0d1cc72b'\ + 'c46de484cf5dc0e04c342062139a8aaf') +sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42' + '83b2b84223072b6f456d7255c80bec4e01572be0' + 'cccd98f1b99218ec69f27425b56b44d23c75eb1e') + +build() { + cd ${srcdir}/unace-$pkgver + + patch -p1 < ../01-makefiles.dpatch + [ "$CARCH" = "x86_64" ] && (patch -p1 < ../04-64bit.dpatch) + make +} + +package() { + cd ${srcdir}/unace-$pkgver + + install -D -m755 unace ${pkgdir}/usr/bin/unace + install -D -m644 licence ${pkgdir}/usr/share/licenses/unace/license +} diff --git a/community/unace/unace.install b/community/unace/unace.install new file mode 100644 index 000000000..68408ad40 --- /dev/null +++ b/community/unace/unace.install @@ -0,0 +1,14 @@ +# arg 1: the new package version +post_install() { + +cat << EOM + +==> unace post-install message: +==> to use this software, you have to accept the Public UnAce Licence, +==> ( it's in /usr/share/licenses/unace/license ) +==> otherwise, remove this package! + +EOM + +} + diff --git a/community/unarj/LICENSE b/community/unarj/LICENSE new file mode 100644 index 000000000..944334a7a --- /dev/null +++ b/community/unarj/LICENSE @@ -0,0 +1,86 @@ + * Copyright (c) 1991-2000 by ARJ Software, Inc. All rights reserved. + * + * This code may be freely used in programs that are NOT ARJ archivers + * (both compress and extract ARJ archives). + * + * If you wish to distribute a modified version of this program, you + * MUST indicate that it is a modified version both in the program and + * source code. + * + * We are holding the copyright on the source code, so please do not + * delete our name from the program files or from the documentation. + * + * We wish to give credit to Haruhiko Okumura for providing the + * basic ideas for ARJ and UNARJ in his program AR. Please note + * that UNARJ is significantly different from AR from an archive + * structural point of view. + * + + + + UNARJ LICENSE POLICY FOR ALL USERS: + + The UNARJ program, source code, and the associated documentation + are copyright (c) 1990-2000 ARJ Software, Inc. all rights reserved. + + If you distribute this software to others, you are required to + distribute the ENTIRE package consisting of the following files: + + README.DOC + UNARJ.EXE + UNARJ.DOC + UNARJ.C + DECODE.C + ENVIRON.C + UNARJ.H + UNARJ.DEF + TCCUNARJ.MAK + BCCUNARJ.MAK + BCC32.MAK + QCLUNARJ.MAK + OS2UNARJ.MAK + TECHNOTE.DOC + + We strongly prefer that the files be distributed in the format + originally released: UNARJ243.EXE with the ARJ-SECURITY envelope as + created by the author. If you must distribute the UNARJ archive in + another archive format, please archive the UNARJ243.EXE as one file + inside the other archive. Re-archival of the software as separate + files means losing the ARJ security envelope. + + You may freely use the UNARJ C source code. If you wish to + distribute a modified version of UNARJ.EXE, you MUST indicate that it + is a modified version both in the program and source code. + + We are holding the copyright on the source code, so please do not + delete our name from the program files or the documentation. + + The UNARJ.EXE program is built from this source using Borland C++ 3.1. + + You may freely use, copy, and distribute UNARJ.EXE, provided that no + fee is charged for such use, copying or distribution. + + You may use UNARJ.EXE in a commercial software package provided that + no additional fee is charged for using UNARJ.EXE and provided that + the user fully understands that NO warranty or support is provided + for UNARJ.EXE by ARJ Software. Moreover, the user must fully + understand that UNARJ does not have the long usage history that ARJ + does. + + This source code is intended to promote the building of utilities to + support the use of ARJ and ARJ archives. + + DISCLAIMER: + + This software UNARJ is provided on an "as is" basis without warranty + of any kind, expressed or implied, including but not limited to the + implied warranties of merchantability and fitness for a particular + purpose. The person using the software bears all risk as to the + quality and performance of the software. Should the software prove + defective, the user assumes the entire cost of all necessary repair, + servicing, or correction. ARJ Software, Inc. will not be liable + for any special, incidental, consequential, indirect or similar + damages due to loss of data or any other reason, even if ARJ + Software, Inc. or its agents have been advised of the possibility + of such damages. + diff --git a/community/unarj/PKGBUILD b/community/unarj/PKGBUILD new file mode 100644 index 000000000..e0baa00e3 --- /dev/null +++ b/community/unarj/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 55533 2011-09-14 07:44:04Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.co> +# Contributor: dale <dale@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=unarj +pkgver=2.63a +pkgrel=3 +pkgdesc="An utility to extract, test and view the contents of archives created with the ARJ archiver" +arch=('i686' 'x86_64') +url="http://www.ibiblio.org/pub/Linux/utils/compress/" +license=('custom') +depends=('glibc') +source=("http://ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz" + 'LICENSE') +md5sums=('a83d139c245f911f22cb1b611ec9768f' + 'c2467ee8c1cb61d843bc2c16cc5e2a2d') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + install -D -m755 unarj $pkgdir/usr/bin/unarj + install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD new file mode 100644 index 000000000..6f068c62d --- /dev/null +++ b/community/unetbootin/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 75751 2012-08-30 19:02:00Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Det <nimetonmaili at gmail a-dot com> +# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com> + +pkgname=unetbootin +pkgver=581 +pkgrel=1 +arch=('x86_64' 'i686') +license=('GPL') +pkgdesc="Create bootable Live USB drives" +url="http://unetbootin.sourceforge.net/" +depends=('syslinux' 'p7zip' 'qt' 'mtools' 'xorg-xmessage' 'desktop-file-utils' 'gtk-update-icon-cache') +optdepends=('gksu: GUI authentication' + 'kdebase-runtime: GUI authentication') +install=$pkgname.install +source=("http://downloads.sourceforge.net/project/$pkgname/UNetbootin/$pkgver/$pkgname-source-$pkgver.tar.gz" + "$pkgname.sh") +sha256sums=('b8bf5972653c023c159358f0e4c743dfaf1c6c27f28fd15cd97739d08c751509' + 'c35329011559288b964cc4c927c969fe35cb8cb3f88020583affe359fc72de10') + +build() { + cd "$srcdir" + + lupdate "$pkgname.pro" + lrelease "$pkgname.pro" + qmake + make +} + +package() { + cd "$srcdir" + + install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname.elf" + mkdir -p "$pkgdir/usr/share/$pkgname" + install -m644 "$pkgname"_*.qm "$pkgdir/usr/share/$pkgname/" + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + for i in 16 22 24 32 48 256; do + install -D "${pkgname}_${i}.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" + done +} + +# vim:set ts=2 sw=2 et: diff --git a/community/unetbootin/unetbootin.install b/community/unetbootin/unetbootin.install new file mode 100644 index 000000000..f95667aa4 --- /dev/null +++ b/community/unetbootin/unetbootin.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/unetbootin/unetbootin.sh b/community/unetbootin/unetbootin.sh new file mode 100644 index 000000000..a6c8969b6 --- /dev/null +++ b/community/unetbootin/unetbootin.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# wrapper script for starting unetbootin with root permissions +ELF=/usr/bin/unetbootin.elf +if [ -e /usr/bin/pkexec ]; then + pkexec $ELF && exit 0 +fi +if [ -z "$KDE_FULL_SESSION" ]; then + if [ -e /usr/bin/gksudo ]; then + gksudo $ELF && exit 0 + fi + if [ -e /usr/bin/gksu ]; then + gksu $ELF && exit 0 + fi + echo "Could not use pkexec, gksudo or gksu" + $ELF && exit 0 || exit 1 +fi +if [ -e /usr/bin/kdesudo ]; then + kdesudo $ELF && exit 0 +fi +if [ -e /usr/bin/kdesu ]; then + kdesu $ELF && exit 0 +fi +echo "Could not use kdesudo or kdesu" +$ELF && exit 0 || exit 1 diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 4b19e62fd..e3adb060e 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78622 2012-10-22 09:20:20Z spupykin $ +# $Id: PKGBUILD 82103 2013-01-08 15:57:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.9 -pkgrel=4 +pkgver=3.2.10 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -18,7 +18,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc unrealircd.service arch-fixes.patch) -md5sums=('bde023695347969f545ce5f2a9ac9aed' +md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' '07ffa1e82a01f319a8b997e155d2af1d' '2103ce8a4a4e79f6955920bfebea0202' '77807313c4578f2c30286b9f9e3fb21c') @@ -26,7 +26,7 @@ md5sums=('bde023695347969f545ce5f2a9ac9aed' build() { mkdir -p $pkgdir/etc/unrealircd mkdir -p $pkgdir/usr/bin - cd $srcdir/Unreal3.2 + cd $srcdir/Unreal$pkgver patch -p1 <$srcdir/arch-fixes.patch @@ -46,8 +46,8 @@ build() { make make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install - mv $srcdir/Unreal3.2/src/ircd $pkgdir/usr/bin/unrealircd - mv $srcdir/Unreal3.2/doc/example.conf $pkgdir/etc/unrealircd/unrealircd.conf + mv $srcdir/Unreal$pkgver/src/ircd $pkgdir/usr/bin/unrealircd + mv $srcdir/Unreal$pkgver/doc/example.conf $pkgdir/etc/unrealircd/unrealircd.conf mkdir -p $pkgdir/usr/lib/unrealircd mv $pkgdir/etc/unrealircd/modules $pkgdir/usr/lib/unrealircd/ ln -s /usr/lib/unrealircd/modules $pkgdir/etc/unrealircd/modules diff --git a/community/unrealircd/unrealircd.rc b/community/unrealircd/unrealircd.rc index 2cede46c8..2cede46c8 100755..100644 --- a/community/unrealircd/unrealircd.rc +++ b/community/unrealircd/unrealircd.rc diff --git a/community/urbanterror/PKGBUILD b/community/urbanterror/PKGBUILD new file mode 100644 index 000000000..598a1b5ba --- /dev/null +++ b/community/urbanterror/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 81627 2012-12-25 03:43:56Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: grimi <grimi at poczta dot fm> + +pkgname=urbanterror +pkgver=4.2.009 +pkgrel=1 +epoch=2 +pkgdesc="A team-based tactical shooter based on the Quake 3 Engine" +arch=('i686' 'x86_64') +url="http://www.urbanterror.net" +license=('GPL2') +depends=('sdl' 'openal' 'curl' 'urbanterror-data') +makedepends=('mesa') +source=("http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip" + "urbanterror.sh" + "urbanterror-server.sh" + "urbanterror.desktop" + "urbanterror.png") +md5sums=('434d4b10713d8efa09d8c36a2b254929' + '7812ece92ab71986ef038b3291adc412' + 'fbd3059497cf68769c0cbf02545c6bec' + '08a99f4d7ad63024bc886e118ddcbc0f' + 'f9a57d898df73f43c6a85c8d8cc455ba') + +package() { + install -d $pkgdir/opt/urbanterror + + cd $pkgdir/opt/urbanterror + + # Copy binaries. + [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.i386 urbanterror + [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.i386 urbanterror-ded + [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.x86_64 urbanterror + [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.x86_64 urbanterror-ded + + # Copy desktop launcher. + install -Dm644 $srcdir/urbanterror.desktop $pkgdir/usr/share/applications/urbanterror.desktop + install -Dm644 $srcdir/urbanterror.png $pkgdir/usr/share/pixmaps/urbanterror.png + + # Copy launch scripts. + install -Dm755 $srcdir/urbanterror.sh $pkgdir/usr/bin/urbanterror + install -Dm755 $srcdir/urbanterror-server.sh $pkgdir/usr/bin/urbanterror-server +} + +# vim: sw=2:ts=2 et: diff --git a/community/urbanterror/urbanterror-server.sh b/community/urbanterror/urbanterror-server.sh new file mode 100644 index 000000000..8d3f14959 --- /dev/null +++ b/community/urbanterror/urbanterror-server.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd /opt/urbanterror/ +exec ./urbanterror-ded "$@" diff --git a/community/urbanterror/urbanterror.desktop b/community/urbanterror/urbanterror.desktop new file mode 100644 index 000000000..f4d359dfa --- /dev/null +++ b/community/urbanterror/urbanterror.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Urban Terror +Type=Application +Categories=Game; +Terminal=false +Exec=urbanterror +Icon=urbanterror diff --git a/community/urbanterror/urbanterror.png b/community/urbanterror/urbanterror.png Binary files differnew file mode 100644 index 000000000..df596c29b --- /dev/null +++ b/community/urbanterror/urbanterror.png diff --git a/community/urbanterror/urbanterror.sh b/community/urbanterror/urbanterror.sh new file mode 100644 index 000000000..65c222b4a --- /dev/null +++ b/community/urbanterror/urbanterror.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd /opt/urbanterror/ +exec ./urbanterror "$@" diff --git a/community/usbview/PKGBUILD b/community/usbview/PKGBUILD new file mode 100644 index 000000000..8a0a59b05 --- /dev/null +++ b/community/usbview/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 81972 2013-01-05 07:30:40Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=usbview +pkgver=2.0 +pkgrel=2 +pkgdesc="Display the topology of devices on the USB bus" +arch=('i686' 'x86_64') +url="http://www.kroah.com/linux/usb/" +license=('GPL') +depends=('gtk3' 'desktop-file-utils') +makedepends=('pkg-config' 'gendesk') +install=${pkgname}.install +source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz") +md5sums=('565f2e79f3924d14ab5b4d8aced557e5') + +build() { + cd "${srcdir}" + gendesk -n + sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop + + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" \ + sysconfdir="${pkgdir}/etc" \ + localstatedir="${pkgdir}/var" install + + install -Dm0644 "${srcdir}"/${pkgname}.desktop \ + "${pkgdir}"/usr/share/applications/${pkgname}.desktop + + install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \ + "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm +} diff --git a/community/usbview/usbview.install b/community/usbview/usbview.install new file mode 100644 index 000000000..b7f7e849b --- /dev/null +++ b/community/usbview/usbview.install @@ -0,0 +1,16 @@ +post_install() { + update-desktop-database -q + echo ">>> Debugfs must be mounted in order to use usbview." + echo ">>> As root execute:" + echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add" + echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\"" + echo ">>> to /etc/fstab" +} + +post_upgrade() { + post_install +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/ushare/ushare b/community/ushare/ushare index b545b85d4..b545b85d4 100755..100644 --- a/community/ushare/ushare +++ b/community/ushare/ushare diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD index 4db74b450..a29c75190 100644 --- a/community/virtkey/PKGBUILD +++ b/community/virtkey/PKGBUILD @@ -4,14 +4,14 @@ pkgbase=virtkey pkgname=('python2-virtkey' 'python-virtkey') -pkgver=0.62.0 +pkgver=0.63.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/virtkey" license=('LGPL') -makedepends=('python2' 'python' 'libxtst' 'gtk2') +makedepends=('python2' 'python' 'libxtst' 'libxkbfile' 'gtk2') source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) -md5sums=('2c6f2e5941501f74d754554c545a2186') +md5sums=('c1569fbb143692aafba00758041fad98') build() { cd "$srcdir" @@ -29,7 +29,7 @@ build() { package_python2-virtkey() { pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server" - depends=('python2' 'libxtst' 'gtk2') + depends=('python2' 'libxtst' 'libxkbfile' 'gtk2') cd "$srcdir/python2-$pkgbase-$pkgver" @@ -38,7 +38,7 @@ package_python2-virtkey() { package_python-virtkey() { pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" - depends=('python' 'libxtst' 'gtk2') + depends=('python' 'libxtst' 'libxkbfile' 'gtk2') cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index e172e043a..c1fcbe5c5 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 78917 2012-10-27 18:38:36Z seblu $ +# $Id: PKGBUILD 81642 2012-12-25 14:12:06Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.4 -pkgrel=1 +pkgver=4.2.6 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-lts-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" - 'expac') + "virtualbox-host-dkms>=$pkgver" + "virtualbox-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel version _kernver=$(expac -Q '%v' linux-lts-headers)-lts + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -30,16 +31,16 @@ build() { } package_virtualbox-host-modules-lts(){ + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + pkgdesc='Host kernel modules for VirtualBox' - depends=('linux-lts>=3.0' 'linux-lts<3.1') + depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-modules-lts') conflicts=('virtualbox-modules-lts') provides=("virtualbox-host-modules=$pkgver") install=virtualbox-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-lts-headers)-lts - _extraver=extramodules-${_kernver%.*}-lts - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -48,17 +49,17 @@ package_virtualbox-host-modules-lts(){ } package_virtualbox-guest-modules-lts(){ + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux-lts>=3.0' 'linux-lts<3.1') + depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-archlinux-modules-lts') conflicts=('virtualbox-archlinux-modules-lts') provides=("virtualbox-host-modules=$pkgver") install=virtualbox-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-lts-headers)-lts - _extraver=extramodules-${_kernver%.*}-lts - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh index bbf855c1a..961a6afab 100755 --- a/community/virtualbox-modules-lts/build.sh +++ b/community/virtualbox-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 338b4763d..8dd813d13 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 79182 2012-10-31 07:25:55Z tpowa $ +# $Id: PKGBUILD 81643 2012-12-25 14:12:31Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.4 -pkgrel=2 +pkgver=4.2.6 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" - 'expac') + "virtualbox-host-dkms>=$pkgver" + "virtualbox-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel version _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -30,16 +30,15 @@ build() { } package_virtualbox-host-modules(){ + _kernver=$(expac -Q '%v' linux-headers)-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.6' 'linux<3.7') + depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - _kernver=$(expac -Q '%v' linux-headers)-ARCH - # _kernver=3.6.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -48,17 +47,16 @@ package_virtualbox-host-modules(){ } package_virtualbox-guest-modules(){ + _kernver=$(expac -Q '%v' linux-headers)-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.6' 'linux<3.7') + depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 371c9b982..476449541 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index e5d1038af..110042ad7 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 3f2ed4a10..b32e5c46e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox/001-vboxdrv-reference.patch b/community/virtualbox/001-vboxdrv-reference.patch new file mode 100644 index 000000000..00faa35cb --- /dev/null +++ b/community/virtualbox/001-vboxdrv-reference.patch @@ -0,0 +1,57 @@ +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " + "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " + "module by executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "as root. If it is available in your distribution, you should install the " +- "DKMS package first. This package keeps track of Linux kernel changes and " +- "recompiles the vboxdrv kernel module if necessary." ++ " <font color=blue>'pacman -S virtualbox-host-modules'</font><br/><br/>" ++ "as root. If you don't use our stock kernel, install virtualbox-host-source and " ++ "execute dkms autoinstall ." + ); + + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +@@ -90,11 +89,8 @@ + + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( + "The VirtualBox kernel modules do not match this version of " +- "VirtualBox. The installation of VirtualBox was apparently not " +- "successful. Executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "may correct this. Make sure that you do not mix the " +- "OSE version and the PUEL version of VirtualBox." ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " ++ " <font color=blue>'dkms autoinstall'</font><br/><br/>" + ); + + QString g_QStrHintOtherNoDriver = QApplication::tr( +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 +@@ -32,17 +32,18 @@ + cat << EOF + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to +- load. Please recompile the kernel module and install it by ++ load. Please reinstall the kernel module virtualbox-host-modules or ++ if you don't use our stock kernel compile the modules with + +- sudo /etc/init.d/vboxdrv setup ++ sudo dkms autoinstall + + You will not be able to start VMs until this problem is fixed. + EOF + elif [ ! -c /dev/vboxdrv ]; then + cat << EOF +-WARNING: The character device /dev/vboxdrv does not exist. Try ++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module + +- sudo /etc/init.d/vboxdrv restart ++ sudo modprobe vboxdrv + + and if that is not successful, try to re-install the package. + diff --git a/community/virtualbox/002-change_default_driver_dir.patch b/community/virtualbox/002-change_default_driver_dir.patch new file mode 100644 index 000000000..d8531499d --- /dev/null +++ b/community/virtualbox/002-change_default_driver_dir.patch @@ -0,0 +1,18 @@ +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000 +@@ -36,13 +36,8 @@ + //#define DEBUG_DRI_CALLS + + //@todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community/virtualbox/10-vboxdrv.rules b/community/virtualbox/10-vboxdrv.rules new file mode 100644 index 000000000..37403ae2f --- /dev/null +++ b/community/virtualbox/10-vboxdrv.rules @@ -0,0 +1,5 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" +SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community/virtualbox/60-vboxguest.rules b/community/virtualbox/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/community/virtualbox/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk new file mode 100644 index 000000000..6eca06d9b --- /dev/null +++ b/community/virtualbox/LocalConfig.kmk @@ -0,0 +1,20 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD new file mode 100644 index 000000000..bba389c0c --- /dev/null +++ b/community/virtualbox/PKGBUILD @@ -0,0 +1,305 @@ +# $Id: PKGBUILD 81600 2012-12-24 17:28:55Z seblu $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=virtualbox +pkgname=('virtualbox' + 'virtualbox-host-dkms' + 'virtualbox-guest-dkms' + 'virtualbox-sdk' + 'virtualbox-guest-utils' + 'virtualbox-ext-vnc') +pkgver=4.2.6 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL' 'custom') +makedepends=('alsa-lib' + 'bin86' + 'cdrkit' + 'curl' + 'dev86' + 'gsoap' + 'iasl' + 'jdk7-openjdk' + 'libidl2' + 'libpulse' + 'libstdc++5' + 'libvncserver' + 'libxcursor' + 'libxinerama' + 'libxml2' + 'libxmu' + 'libxrandr' + 'libxslt' + 'libxtst' + 'linux-headers' + 'mesa' + 'glu' + 'python2' + 'qt' + 'sdl' + 'sdl_ttf' + 'vde2' + 'xalan-c') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2" + "UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/$pkgver/UserManual.pdf" + '10-vboxdrv.rules' + '60-vboxguest.rules' + 'LocalConfig.kmk' + 'vboxservice.conf' + 'vboxservice.rc' + 'vboxservice.service' + 'vboxweb.conf' + 'vboxweb.rc' + 'vboxweb.service' + '001-vboxdrv-reference.patch' + '002-change_default_driver_dir.patch') +md5sums=('d680aeb3b4379b8281527aeb012b2df5' + '5cdffabb7ffacfd49dcc93d747ede762' + '5f85710e0b8606de967716ded7b2d351' + 'ed1341881437455d9735875ddf455fbe' + '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' + '3c08ad30b89add47d3f45121200a5360' + '7d9823507206de9b8528a72af2f18d74' + '07c5f6d86c4b7839d719c8ee0c53653b' + '7e9483b1069a54f181546083ac7e5469' + 'c159d683ba1947290fc2ad2c64194150' + 'bc9efed88e0469cd7fc460d5a5cd7b4b' + '6dbd16b9d1530fc42ff6904cd80be91d' + '97e193f050574dd272a38e5ee5ebe62b') + +build() { + cd "VirtualBox-$pkgver" + + # Apply patches + for _p in "$srcdir"/*.patch; do + [[ -e $_p ]] || continue + msg2 "Appy patch ${_p##*/}" + patch -Np1 -i "$_p" + done + + cp "$srcdir/LocalConfig.kmk" . + + # fake makeself binary to compile without nofatal + ln -s /bin/echo makeself + export PATH="$CWD:$PATH" + + ./configure --disable-docs \ + --enable-webservice \ + --enable-vde \ + --enable-vnc \ + --disable-kmods + source ./env.sh + kmk all + + # fix python2 + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + + # build rdesktop-vrdp (broken from LocalConfig.kmk) + pushd src/VBox/RDP/client + cp "$srcdir/LocalConfig.kmk" . + # fix keymap path FS#32548 + sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk + kmk all + popd + + # build VNC pack + pushd src/VBox/ExtPacks/VNC + kmk packing + popd +} + +package_virtualbox() { + pkgdesc='Powerful x86 virtualization for enterprise as well as home use' + depends=('curl' + 'libpng' + 'libxcursor' + 'libxinerama' + 'libxml2' + 'libxmu' + 'sdl' + 'shared-mime-info' + 'virtualbox-host-modules') + optdepends=('qt: VirtualBox GUI support' + 'vde2: Virtual Distributed Ethernet support' + 'virtualbox-sdk: Developer kit' + 'virtualbox-host-dkms: Host kernel source modules for non-stock kernels' + 'net-tools: Host-only or bridged networking support') + backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') + replaces=('virtualbox-ose') + conflicts=('virtualbox-ose') + install=virtualbox.install + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps} + + #doc + install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" + + #Binaries and Wrapper with Launchers + install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" + + for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do + ln -sf VBox "$pkgdir/usr/bin/$i" + ln -sf VBox "$pkgdir/usr/bin/${i,,}" + done + install -m 0755 VBoxTunctl "$pkgdir/usr/bin" + install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin" + + #components + install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" + + #lib + install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" + install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" + + #setuid root binaries + install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" + #other binaries + install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" + + #language + install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" + + #rdesktop keymaps + install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" + + #useless scripts + install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" + + #icons + install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" + + pushd icons + for i in *; do + install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + done + popd + + #desktop + install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" + install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" + + #install configuration + mkdir -p "$pkgdir/etc/vbox" + echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" + + #udev and licence + install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \ + "$pkgdir/usr/share/licenses/virtualbox/LICENSE" + install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ + "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules" + + # install rc.d script + install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb" + # install systemd service + install -D -m644 "$srcdir/vboxweb.service" \ + "$pkgdir/usr/lib/systemd/system/vboxweb.service" + # install sample config + install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb" + +} + +package_virtualbox-sdk() { + pkgdesc='VirtualBox Software Developer Kit (SDK)' + depends=('python2') + + install -dm755 "$pkgdir/usr/lib/virtualbox" + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" + #python sdk + pushd sdk/installer + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir" + popd + rm -rf sdk/installer + mv sdk "$pkgdir/usr/lib/virtualbox" +} + +package_virtualbox-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' + depends=('dkms' 'gcc' 'make') + provides=('virtualbox-host-modules') + replaces=('virtualbox-source' 'virtualbox-host-source') + conflicts=('virtualbox-source' 'virtualbox-host-source') + optdepends=('linux-headers' + 'linux-lts-headers') + install=virtualbox-host-dkms.install + + install -dm755 "$pkgdir/usr/src" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" +} + +package_virtualbox-guest-dkms() { + pkgdesc='VirtualBox Guest kernel modules sources' + depends=('dkms' 'gcc' 'make') + provides=('virtualbox-guest-modules') + replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source') + conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source') + optdepends=('linux-headers' + 'linux-lts-headers') + install=virtualbox-guest-dkms.install + + install -dm755 "$pkgdir/usr/src" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + cp -r src "$pkgdir/usr/src/vboxguest-$pkgver" +} + +package_virtualbox-guest-utils() { + pkgdesc='VirtualBox Guest userspace utilities' + depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') + optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels') + replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') + conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') + backup=('etc/conf.d/vboxservice') + install=virtualbox-guest-utils.install + + source "VirtualBox-$pkgver/env.sh" + pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + install -d "$pkgdir"/{usr/bin,sbin} + install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" + install -m755 mount.vboxsf "$pkgdir/sbin" + install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + "$pkgdir"/usr/bin/VBoxClient-all + install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + "$pkgdir"/etc/xdg/autostart/vboxclient.desktop + install -D vboxvideo_drv_113.so \ + "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" + install -d "$pkgdir/usr/lib/xorg/modules/dri" + install -m755 VBoxOGL*.so "$pkgdir/usr/lib" + ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" + install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" + popd + # install udev rules + install -D -m 0644 60-vboxguest.rules \ + "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" + # install rc.d script + install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice" + # install sample config + install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice" + # install systemd service file + install -D -m644 vboxservice.service \ + "$pkgdir/usr/lib/systemd/system/vboxservice.service" +} + +package_virtualbox-ext-vnc() { + pkgdesc='VirtualBox VNC extension pack' + depends=('virtualbox' 'libvncserver') + optdepends=('vncviewver: vnc client') + install=virtualbox-ext-vnc.install + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" + install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" +} + +# vim:set ts=4 sw=4 et: diff --git a/community/virtualbox/vboxservice.conf b/community/virtualbox/vboxservice.conf new file mode 100644 index 000000000..9d4ec629f --- /dev/null +++ b/community/virtualbox/vboxservice.conf @@ -0,0 +1,2 @@ +# VBoxService -h +VBOX_SERVICE_OPTION="" diff --git a/community/virtualbox/vboxservice.rc b/community/virtualbox/vboxservice.rc new file mode 100644 index 000000000..5a62d69a3 --- /dev/null +++ b/community/virtualbox/vboxservice.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +name=VBoxService +PID=$(pidof -o %PPID $name) + +case "$1" in + start) + stat_busy 'Starting VirtualBox Guest Service' + [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ + && { add_daemon ${0##*/}; stat_done; } \ + || { stat_fail; exit 1; } + ;; + stop) + stat_busy 'Stopping VirtualBox Guest Service' + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon ${0##*/}; stat_done; } \ + || { stat_fail; exit 1; } + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + status) + stat_busy 'Checking VirtualBox Guest Service status' + ck_status ${0##*/} + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|status}" >&2 + exit 1 +esac + +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/vboxservice.service b/community/virtualbox/vboxservice.service new file mode 100644 index 000000000..bbd61617d --- /dev/null +++ b/community/virtualbox/vboxservice.service @@ -0,0 +1,9 @@ +[Unit] +Description=VirtualBox Guest Service +ConditionVirtualization=oracle + +[Service] +ExecStart=/usr/bin/VBoxService -f + +[Install] +WantedBy=multi-user.target diff --git a/community/virtualbox/vboxweb.conf b/community/virtualbox/vboxweb.conf new file mode 100644 index 000000000..c36f6a143 --- /dev/null +++ b/community/virtualbox/vboxweb.conf @@ -0,0 +1,11 @@ +# WebService Mandatory Variables +#VBOXWEB_USER= + +# WebService Variables +#VBOXWEB_LOGFILE= +#VBOXWEB_HOST= +#VBOXWEB_PORT= +#VBOXWEB_TIMEOUT= +#VBOXWEB_CHECK_INTERVAL= +#VBOXWEB_THREADS= +#VBOXWEB_KEEPALIVE= diff --git a/community/virtualbox/vboxweb.rc b/community/virtualbox/vboxweb.rc new file mode 100644 index 000000000..97273e3c7 --- /dev/null +++ b/community/virtualbox/vboxweb.rc @@ -0,0 +1,86 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/vbox/vbox.cfg +. /etc/conf.d/vboxweb + +BINARY="$INSTALL_DIR/vboxwebsrv" + +start() { + stat_busy "Starting VirtualBox Web Service"; + if ! pidof -o %PPID $BINARY >/dev/null; then + [[ "$VBOXWEB_USER" ]] || stat_die + lsmod | grep -q "vboxdrv[^_-]" || stat_die + PARAMS="--background" + [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST" + [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT" + [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT" + [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL" + [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS" + [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE" + [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE" + # prevent inheriting this setting to VBoxSVC + unset VBOX_RELEASE_LOG_DEST + su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null + # ugly: wait until the final process has forked + sleep .2 + if pidof -o %PPID $BINARY >/dev/null; then + add_daemon vboxweb + stat_done + else + stat_die + fi + else + stat_die + fi +} + +stop() { + stat_busy "Stopping VirtualBox Web Service" + PID=$(pidof -o %PPID $BINARY) + [[ $PID ]] && kill $PID &>/dev/null + if ! pidof -o %PPID $BINARY >/dev/null; then + rm_daemon vboxweb + stat_done + else + stat_die + fi +} + +restart() { + stop && start +} + +status() { + stat_busy "Checking for VirtualBox Web Service" + if pidof -o %PPID $BINARY >/dev/null; then + stat_done + else + stat_fail + false + fi +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart) + restart + ;; +force-reload) + restart + ;; +status) + status + ;; +*) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/vboxweb.service b/community/virtualbox/vboxweb.service new file mode 100644 index 000000000..303381597 --- /dev/null +++ b/community/virtualbox/vboxweb.service @@ -0,0 +1,11 @@ +[Unit] +Description=VirtualBox Web Service +After=network.target + +[Service] +Type=forking +PIDFile=/run/vboxweb.pid +ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background + +[Install] +WantedBy=multi-user.target diff --git a/community/virtualbox/virtualbox-ext-vnc.install b/community/virtualbox/virtualbox-ext-vnc.install new file mode 100644 index 000000000..828a16a1d --- /dev/null +++ b/community/virtualbox/virtualbox-ext-vnc.install @@ -0,0 +1,25 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + VBoxManage extpack uninstall 'VNC' >/dev/null +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-guest-dkms.install b/community/virtualbox/virtualbox-guest-dkms.install new file mode 100644 index 000000000..2d62eae43 --- /dev/null +++ b/community/virtualbox/virtualbox-guest-dkms.install @@ -0,0 +1,30 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxguest/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxguest/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-guest-utils.install b/community/virtualbox/virtualbox-guest-utils.install new file mode 100644 index 000000000..38bbe807d --- /dev/null +++ b/community/virtualbox/virtualbox-guest-utils.install @@ -0,0 +1,31 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + getent group vboxsf > /dev/null || groupadd -g 109 vboxsf + true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" + # rename /etc/rc.d/vboxservice + if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then + cat << EOF +==> rc.d vbox-service script was renamed to vboxservice. +EOF + fi + # fix gid of vboxsf + if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then + groupmod -g 109 vboxsf + fi + true +} + +# arg 1: the old package version +post_remove() { + groupdel vboxsf >/dev/null 2>&1 || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-host-dkms.install b/community/virtualbox/virtualbox-host-dkms.install new file mode 100644 index 000000000..8028cb7e0 --- /dev/null +++ b/community/virtualbox/virtualbox-host-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxhost/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxhost/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install new file mode 100644 index 000000000..6913fe2ed --- /dev/null +++ b/community/virtualbox/virtualbox.install @@ -0,0 +1,45 @@ +#!/bin/sh + +utils() { + if [ -x usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime > /dev/null 2>&1 + fi + + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 + fi + + if [ -x usr/bin/update-desktop-database ]; then + usr/bin/update-desktop-database -q + fi + + if [ -x usr/bin/udevadm ]; then + usr/bin/udevadm control --reload + fi +} + +# arg 1: the new package version +post_install() { + getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers + utils +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" + if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then + cat << EOF +===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. +===> Use virtualbox-source package if you don't use our stock linux package. +EOF + fi +} + +# arg 1: the old package version +post_remove() { + groupdel vboxusers >/dev/null 2>&1 || true + utils +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/visualboyadvance/1.7.2-deprecatedsigc++.patch b/community/visualboyadvance/1.7.2-deprecatedsigc++.patch new file mode 100644 index 000000000..4bb1787cb --- /dev/null +++ b/community/visualboyadvance/1.7.2-deprecatedsigc++.patch @@ -0,0 +1,692 @@ +--- src/gtk/sigccompat.h.old 2008-05-02 10:46:45.000000000 +0200 ++++ src/gtk/sigccompat.h 2008-05-02 10:47:08.000000000 +0200 +@@ -20,7 +20,7 @@ + #ifndef __VBA_SIGCCOMPAT_H__ + #define __VBA_SIGCCOMPAT_H__ + +-#undef LIBSIGC_DISABLE_DEPRECATED ++#define LIBSIGC_DISABLE_DEPRECATED + #include <sigc++/bind.h> + #include <sigc++/connection.h> + +@@ -28,9 +28,679 @@ + #include <sigc++/object.h> + #include <sigc++/functors/mem_fun.h> + +-namespace SigC ++ ++// From sigc++/bind.h ++namespace SigC { ++ ++template <class T_bound1, class T_functor> ++inline ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type> ++bind(const T_functor& _A_functor, T_bound1 _A_b1) ++{ return ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type> ++ (_A_functor, _A_b1); ++} ++ ++template <class T_bound1, class T_bound2, class T_functor> ++inline ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type, ++ typename ::sigc::unwrap_reference<T_bound2>::type> ++bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2) ++{ return ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type, ++ typename ::sigc::unwrap_reference<T_bound2>::type> ++ (_A_functor, _A_b1, _A_b2); ++} ++ ++template <class T_bound1, class T_bound2, class T_bound3, class T_functor> ++inline ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type, ++ typename ::sigc::unwrap_reference<T_bound2>::type, ++ typename ::sigc::unwrap_reference<T_bound3>::type> ++bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2,T_bound3 _A_b3) ++{ return ::sigc::bind_functor<-1, T_functor, ++ typename ::sigc::unwrap_reference<T_bound1>::type, ++ typename ::sigc::unwrap_reference<T_bound2>::type, ++ typename ::sigc::unwrap_reference<T_bound3>::type> ++ (_A_functor, _A_b1, _A_b2, _A_b3); ++} ++ ++} ++ ++// From sigc++/connection.h ++namespace SigC { ++ ++/** Convinience class for safe disconnection. ++ * Iterators must not be used beyond the lifetime of the list ++ * they work on. A connection object can be created from a ++ * slot list iterator and may safely be used to disconnect ++ * the referred slot at any time (disconnect()). If the slot ++ * has already been destroyed, disconnect() does nothing. empty() or ++ * operator bool() can be used to test whether the connection is ++ * still active. The connection can be blocked (block(), unblock()). ++ * ++ * This is possible because the connection object gets notified ++ * when the referred slot dies (notify()). ++ * ++ * @deprecated Use sigc::connection instead. ++ * @ingroup compat ++ */ ++typedef ::sigc::connection Connection; ++ ++} ++ ++// From sigc++/slot.h ++namespace SigC { ++ ++// SlotN ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot0 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return> ++class Slot0 ++ : public ::sigc::slot<T_return> ++{ ++public: ++ typedef ::sigc::slot<T_return> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot0() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot0(const T_functor& _A_func) ++ : ::sigc::slot<T_return>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot0(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot0& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot1 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1> ++class Slot1 ++ : public ::sigc::slot<T_return, T_arg1> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot1() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot1(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot1(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot1& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot2 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2> ++class Slot2 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot2() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot2(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot2(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot2& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot3 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * - @e T_arg3 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3> ++class Slot3 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot3() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot3(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot3(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot3& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot4 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * - @e T_arg3 Argument type used in the definition of operator()(). ++ * - @e T_arg4 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> ++class Slot4 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot4() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot4(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot4(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot4& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot5 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * - @e T_arg3 Argument type used in the definition of operator()(). ++ * - @e T_arg4 Argument type used in the definition of operator()(). ++ * - @e T_arg5 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> ++class Slot5 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot5() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot5(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot5(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot5& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot6 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * - @e T_arg3 Argument type used in the definition of operator()(). ++ * - @e T_arg4 Argument type used in the definition of operator()(). ++ * - @e T_arg5 Argument type used in the definition of operator()(). ++ * - @e T_arg6 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> ++class Slot6 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> ++{ ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot6() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot6(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot6(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot6& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++/** Converts an arbitrary functor to a unified type which is opaque. ++ * Slot7 itself is a functor or to be more precise a closure. It contains ++ * a single, arbitrary functor (or closure) that is executed in operator()(). ++ * ++ * The template arguments determine the function signature of operator()(): ++ * - @e T_return The return type of operator()(). ++ * - @e T_arg1 Argument type used in the definition of operator()(). ++ * - @e T_arg2 Argument type used in the definition of operator()(). ++ * - @e T_arg3 Argument type used in the definition of operator()(). ++ * - @e T_arg4 Argument type used in the definition of operator()(). ++ * - @e T_arg5 Argument type used in the definition of operator()(). ++ * - @e T_arg6 Argument type used in the definition of operator()(). ++ * - @e T_arg7 Argument type used in the definition of operator()(). ++ * ++ * To use simply assign the slot to the desired functor. If the functor ++ * is not compatible with the parameter list defined with the template ++ * arguments compiler errors are triggered. When called the slot ++ * will invoke the functor with minimal copies. ++ * block() and unblock() can be used to block the functor's invocation ++ * from operator()() temporarily. ++ * ++ * @par Example: ++ * @code ++ * #include <sigc++/slot.h> ++ * void foo(int) {} ++ * SigC::Slot1<void, long> s = SigC::slot(&foo); ++ * s(19); ++ * @endcode ++ * ++ * @deprecated Use the unnumbered template sigc::slot instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> ++class Slot7 ++ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> + { ++public: ++ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> parent_type; ++ ++ /// Constructs an empty slot. ++ Slot7() {} ++ ++ /** Constructs a slot from an arbitrary functor. ++ * @param _A_func The desired functor the new slot should be assigned to. ++ */ ++ template <class T_functor> ++ Slot7(const T_functor& _A_func) ++ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func) {} ++ ++ /** Constructs a slot, copying an existing one. ++ * @param src The existing slot to copy. ++ */ ++ Slot7(const parent_type& src) ++ : parent_type(src) {} ++ ++ /** Overrides this slot making a copy from another slot. ++ * @param src The slot from which to make a copy. ++ * @return @p this. ++ */ ++ Slot7& operator=(const parent_type& src) ++ { parent_type::operator=(src); return *this; } ++}; ++ ++ ++ ++#ifndef DOXYGEN_SHOULD_SKIP_THIS ++/* gcc 3.2 reports a strange conflict between SigC::slot() and sigc::slot<> ++ * when "using namespace SigC" and later using a slot(obj,func) overload ++ * without the prefix "SigC::". Probably a compiler bug. I will investigate. ++ * ++ * This ugly hack avoids the error: ++ */ ++// #define slot(...) make_slot(__VA_ARGS__) /* only works for gcc */ ++#endif + ++ ++// slot() ++/** Creates a functor of type SigC::Slot0 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return> ++inline Slot0<T_return> ++slot(T_return (*_A_func)()) ++{ return Slot0<T_return>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot1 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1> ++inline Slot1<T_return, T_arg1> ++slot(T_return (*_A_func)(T_arg1)) ++{ return Slot1<T_return, T_arg1>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot2 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2> ++inline Slot2<T_return, T_arg1,T_arg2> ++slot(T_return (*_A_func)(T_arg1,T_arg2)) ++{ return Slot2<T_return, T_arg1,T_arg2>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot3 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3> ++inline Slot3<T_return, T_arg1,T_arg2,T_arg3> ++slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3)) ++{ return Slot3<T_return, T_arg1,T_arg2,T_arg3>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot4 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> ++inline Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4> ++slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4)) ++{ return Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot5 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> ++inline Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> ++slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5)) ++{ return Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot6 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> ++inline Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> ++slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6)) ++{ return Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func); } ++ ++/** Creates a functor of type SigC::Slot7 that wraps an existing non-member function. ++ * ++ * @param _A_func Pointer to function that should be wrapped. ++ * @return Functor that executes _A_func on invokation. ++ * ++ * @deprecated Use sigc::ptr_fun() instead. ++ * @ingroup compat ++ */ ++template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> ++inline Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> ++slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7)) ++{ return Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func); } ++ ++ ++ ++} ++ ++// From sigc++/object.h ++namespace SigC { ++ ++// Object ++typedef ::sigc::trackable Object; ++ ++} ++ ++namespace SigC ++{ + template <class T_return, class T_obj1, class T_obj2> + inline Slot0<T_return> + slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)() ) diff --git a/community/visualboyadvance/1.7.2-gcc34.patch b/community/visualboyadvance/1.7.2-gcc34.patch new file mode 100644 index 000000000..8fa4fbf8d --- /dev/null +++ b/community/visualboyadvance/1.7.2-gcc34.patch @@ -0,0 +1,41 @@ +diff -ur src/gtk/joypadconfig.h src/gtk/joypadconfig.h +--- src/gtk/joypadconfig.h 2004-05-10 16:43:21.000000000 +0200 ++++ src/gtk/joypadconfig.h 2004-08-12 22:30:20.838039064 +0200 +@@ -22,8 +22,8 @@ + + #include <vector> + +-#include <libglademm.h> + #include <gtkmm.h> ++#include <libglademm.h> + + #ifndef GTKMM20 + # include "sigccompat.h" +diff -ur src/gtk/main.cpp src/gtk/main.cpp +--- src/gtk/main.cpp 2004-05-21 18:02:35.000000000 +0200 ++++ src/gtk/main.cpp 2004-08-12 22:39:08.633801912 +0200 +@@ -22,10 +22,10 @@ + + #include <list> + +-#include <libglademm.h> + #include <gtkmm/main.h> + #include <gtkmm/window.h> + #include <gtkmm/messagedialog.h> ++#include <libglademm.h> + + #include "images/vba-wm-pixbufs.h" + +diff -ur src/gtk/window.h src/gtk/window.h +--- src/gtk/window.h 2004-05-21 15:25:41.000000000 +0200 ++++ src/gtk/window.h 2004-08-12 22:30:58.650290728 +0200 +@@ -23,8 +23,8 @@ + #include <sys/types.h> + #include <stdarg.h> + +-#include <libglademm.h> + #include <gtkmm.h> ++#include <libglademm.h> + + #ifndef GTKMM20 + # include "sigccompat.h" diff --git a/community/visualboyadvance/1.7.2-gcc41.patch b/community/visualboyadvance/1.7.2-gcc41.patch new file mode 100644 index 000000000..cacf8e251 --- /dev/null +++ b/community/visualboyadvance/1.7.2-gcc41.patch @@ -0,0 +1,27 @@ +diff -ru src/prof/prof.cpp src/prof/prof.cpp +--- src/prof/prof.cpp 2004-05-14 00:31:58.000000000 +1000 ++++ src/prof/prof.cpp 2006-06-03 13:49:41.000000000 +1000 +@@ -266,7 +266,7 @@ + for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) { + if(profWrite8(fd, GMON_TAG_CG_ARC) || + profWrite32(fd, (u32)frompc) || +- profWrite32(fd, (u32)tos[toindex].selfpc) || ++ profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) || + profWrite32(fd, tos[toindex].count)) { + systemMessage(0, "mcount: arc"); + fclose(fd); +diff -ru src/sdl/debugger.cpp src/sdl/debugger.cpp +--- src/sdl/debugger.cpp 2004-05-14 00:13:14.000000000 +1000 ++++ src/sdl/debugger.cpp 2006-06-03 13:49:57.000000000 +1000 +@@ -950,9 +950,9 @@ + { + u32 address = 0; + if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff]) +- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]); ++ address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]); + else +- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]); ++ address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]); + + if(size == 2) + printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", diff --git a/community/visualboyadvance/1.7.2-glibc.patch b/community/visualboyadvance/1.7.2-glibc.patch new file mode 100644 index 000000000..5211b3623 --- /dev/null +++ b/community/visualboyadvance/1.7.2-glibc.patch @@ -0,0 +1,76 @@ +--- src/GBA.cpp ++++ src/GBA.cpp +@@ -1130,7 +1130,7 @@ + bool CPUIsZipFile(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -1145,7 +1145,7 @@ + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1169,7 +1169,7 @@ + bool CPUIsGBABios(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1189,7 +1189,7 @@ + bool CPUIsELF(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".elf") == 0) +--- src/Util.cpp ++++ src/Util.cpp +@@ -478,7 +478,7 @@ + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -502,7 +502,7 @@ + bool utilIsGBImage(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gb") == 0) +@@ -522,7 +522,7 @@ + bool utilIsZipFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -552,7 +552,7 @@ + bool utilIsGzipFile(const char *file) + { + if(strlen(file) > 3) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gz") == 0) diff --git a/community/visualboyadvance/1.7.2-homedir.patch b/community/visualboyadvance/1.7.2-homedir.patch new file mode 100644 index 000000000..e93d32cf5 --- /dev/null +++ b/community/visualboyadvance/1.7.2-homedir.patch @@ -0,0 +1,11 @@ +--- src/sdl/SDL.cpp.orig 2004-08-15 02:43:28.232750688 -0400 ++++ src/sdl/SDL.cpp 2004-08-15 02:44:01.557684528 -0400 +@@ -887,7 +887,7 @@ + + if(home != NULL) { + fprintf(stderr, "Searching home directory: %s\n", home); +- sprintf(path, "%s%c%s", home, FILE_SEP, name); ++ sprintf(path, "%s%c.%s%c%s", home, FILE_SEP, EXE_NAME, FILE_SEP, name); + f = fopen(path, "r"); + if(f != NULL) + return f; diff --git a/community/visualboyadvance/1.7.2-uninit.patch b/community/visualboyadvance/1.7.2-uninit.patch new file mode 100644 index 000000000..b54c2e8ab --- /dev/null +++ b/community/visualboyadvance/1.7.2-uninit.patch @@ -0,0 +1,13 @@ +diff -ru src/gtk/window.cpp src/gtk/window.cpp +--- src/gtk/window.cpp 2004-05-14 00:31:58.000000000 +1000 ++++ src/gtk/window.cpp 2007-03-17 14:57:22.000000000 -0500 +@@ -91,7 +91,8 @@ + m_iFilterIBMin (FirstFilterIB), + m_iFilterIBMax (LastFilterIB), + m_iJoypadMin (1), +- m_iJoypadMax (4) ++ m_iJoypadMax (4), ++ m_poKeymap (NULL) + { + m_poXml = _poXml; + m_poFileOpenDialog = NULL; diff --git a/community/visualboyadvance/PKGBUILD b/community/visualboyadvance/PKGBUILD new file mode 100644 index 000000000..4ae2014b7 --- /dev/null +++ b/community/visualboyadvance/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 63767 2012-02-05 12:13:21Z ibiru $ +# Maintainer: Daenyth +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: Shahar Weiss <sweiss4@gmx.net> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +pkgname=visualboyadvance +pkgver=1.7.2 +pkgrel=9 +pkgdesc="Emulator for Gameboy and Gameboy Advance systems" +arch=('x86_64' 'i686') +url="http://vba.ngemu.com/" +license=("GPL") +depends=('libglademm' 'sdl') +makedepends=('nasm') +backup=('etc/VisualBoyAdvance.cfg') +source=("http://downloads.sourceforge.net/sourceforge/vba/VisualBoyAdvance-src-$pkgver.tar.gz" + '1.7.2-deprecatedsigc++.patch' '1.7.2-gcc34.patch' '1.7.2-gcc41.patch' + '1.7.2-glibc.patch' '1.7.2-homedir.patch' '1.7.2-uninit.patch') +md5sums=('cc02339e3fd8efd9f23121b0a2f81fd8' + '95596fbe499c23b8154142b5789cd630' + 'e7c816ac1adf832c8bd3f6b899d6b935' + '22c90f2d75856c8407f70b19038105a4' + 'e7a5188b483e2c4d2fee2a5efb088908' + 'ef02d9be59ab74afa9a8f12e17e359d4' + '004c269a9cdbfa0f4b7fd51978f78705') + +build() { + cd "$srcdir/VisualBoyAdvance-$pkgver" + + sed -i 's:setjmp(png_ptr->jmpbuf):1+1==3:' src/Util.cpp + + patch -Np0 < "$srcdir/$pkgver-homedir.patch" + patch -Np0 < "$srcdir/$pkgver-gcc34.patch" + patch -Np0 < "$srcdir/$pkgver-gcc41.patch" + patch -Np0 < "$srcdir/$pkgver-deprecatedsigc++.patch" + patch -Np0 < "$srcdir/$pkgver-uninit.patch" + patch -Np0 < "$srcdir/$pkgver-glibc.patch" + ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk=2.4 + make +} + +package() { + cd "$srcdir/VisualBoyAdvance-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD new file mode 100644 index 000000000..f14b16d91 --- /dev/null +++ b/community/vor/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 82073 2013-01-07 10:20:03Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: tdy <tdy@gmx.com> +# Contributor: nut543 <kfs1@online.no> + +pkgname=vor +pkgver=0.5.5 +pkgrel=1 +pkgdesc='Classic spaceship versus asteroid field arcade game' +arch=('i686' 'x86_64') +url="http://jasonwoof.org/vor?" +license=('GPL') +depends=('sdl_image' 'sdl_mixer') +makedepends=('gendesk') +optdepends=('netpbm: for customizing game graphics' + 'povray: for customizing game graphics') +options=('!emptydirs') +source=("http://qualdan.com/$pkgname/$pkgname-$pkgver.tar.bz2" + "$pkgname.png") +sha256sums=('ead1b9786741e26d37ff7c5185b7fe1e91f90f76ebed3785225312e323b7c7da' + '07a805928f5cf2b3351e2b9ff820ea69352ad80faad43311889ffbd5f62da872') +_exec=('vor -f') + +build() { + cd "$srcdir" + gendesk + + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make LDFLAGS=-lm +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/bin" + make prefix=/usr DESTDIR="$pkgdir" install + install -Dm644 "../$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/vor/vor.png b/community/vor/vor.png Binary files differnew file mode 100644 index 000000000..0fbfc72d3 --- /dev/null +++ b/community/vor/vor.png diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6b53c1faf..b322bb75a 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79495 2012-11-06 06:33:11Z aginiewicz $ +# $Id: PKGBUILD 81612 2012-12-25 00:34:18Z foutrelis $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -10,7 +10,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -24,18 +24,20 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" - ffmpeg-0.8.diff ffmpeg-0.11.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff tcl-8.6.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' - '81922ea61989e5591135f233a0400694') + '81922ea61989e5591135f233a0400694' + 'a804a9f034e24ef1a8b28542c15ce1a1') build() { cd "${srcdir}"/VTK$pkgver - # fix compilation error: + # fix compilation errors: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff" + patch -Np1 -i "${srcdir}/tcl-8.6.diff" cd "${srcdir}" diff --git a/community/vtk/tcl-8.6.diff b/community/vtk/tcl-8.6.diff new file mode 100644 index 000000000..6152a8fa7 --- /dev/null +++ b/community/vtk/tcl-8.6.diff @@ -0,0 +1,13 @@ +--- VTK5.10.1/Common/vtkTcl.h 2012-10-15 22:33:21.000000000 +0200 ++++ VTK5.10.1/Common/vtkTcl.h.new 2012-12-22 12:27:56.176482722 +0100 +@@ -17,6 +17,10 @@ + + #include "vtkConfigure.h" + ++// see http://paraview.org/Bug/view.php?id=11810 ++#define USE_INTERP_RESULT ++#define USE_INTERP_ERRORLINE ++ + #ifdef VTK_TCL_TK_STATIC + # ifndef STATIC_BUILD + # define STATIC_BUILD diff --git a/community/wesnoth/wesnothd.rc.d b/community/wesnoth/wesnothd.rc.d index 95e312b7b..95e312b7b 100755..100644 --- a/community/wesnoth/wesnothd.rc.d +++ b/community/wesnoth/wesnothd.rc.d diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD index 113071c32..70a0796f4 100644 --- a/community/xbindkeys/PKGBUILD +++ b/community/xbindkeys/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 64683 2012-02-17 18:32:53Z bluewind $ -# Maintainer: +# $Id: PKGBUILD 82045 2013-01-06 10:49:31Z bluewind $ +# Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Thayer Williams <thayer@archlinux.org> pkgname=xbindkeys pkgver=1.8.5 -pkgrel=2 +pkgrel=3 pkgdesc="Launch shell commands with your keyboard or your mouse under X" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/xbindkeys/xbindkeys.html" license=('GPL') -depends=('libx11' 'guile' 'tk') +depends=('libx11' 'guile') +optdepends=('tk: xbindkeys_show') source=(http://www.nongnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('4b66a05594dbc6888c0a6439351aa66d') diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 8e0309a83..e3d81614f 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65237 2012-02-20 12:28:08Z spupykin $ +# $Id: PKGBUILD 81613 2012-12-25 00:34:18Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit pkgver=3.7.26 -pkgrel=2 +pkgrel=3 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') url="http://opencircuitdesign.com/xcircuit" diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index ce1655f78..685e896b6 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78989 2012-10-28 17:25:41Z jlichtblau $ +# $Id: PKGBUILD 82018 2013-01-05 17:22:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs -pkgver=21.5.32 +pkgver=21.5.33 pkgrel=1 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('xbitmaps') install=$pkgname.install source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz xemacs.desktop) -sha256sums=('5d7473fd4b9ca3278de44882ef004b0028e3ff130ed714831c885893a9cd5e7d' +sha256sums=('448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94' 'd6dc802cf07519584aa28f3b5f4ae84d5e18b619ddd7e89a04da2f6783125f34') build() { diff --git a/community/xl2tpd/xl2tpd.rc b/community/xl2tpd/xl2tpd.rc index a06e0d41e..a06e0d41e 100755..100644 --- a/community/xl2tpd/xl2tpd.rc +++ b/community/xl2tpd/xl2tpd.rc diff --git a/community/xmldiff/PKGBUILD b/community/xmldiff/PKGBUILD index 657718686..a2a86362a 100644 --- a/community/xmldiff/PKGBUILD +++ b/community/xmldiff/PKGBUILD @@ -5,7 +5,7 @@ pkgname=xmldiff pkgver=0.6.10 -pkgrel=2 +pkgrel=2.1 pkgdesc="A python tool that figures out the differences between two similar XML files, in the same way the diff utility does it" arch=('i686' 'x86_64' 'mips64el') url="http://www.logilab.org/project/xmldiff/" diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD index f10c67071..7b95c0191 100644 --- a/community/xmlstarlet/PKGBUILD +++ b/community/xmlstarlet/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79551 2012-11-07 10:18:04Z spupykin $ +# $Id: PKGBUILD 81711 2012-12-27 13:15:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: PyroPeter <abi1789@googlemail.com> # Contributor: BlackEagle <ike.devolder@scarlet.be> # Contributor: chochem <chochem@gmail.com> pkgname=xmlstarlet -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A set of tools to transform, query, validate, and edit XML documents" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://xmlstar.sourceforge.net/" license=('MIT') depends=('libxslt>=1.1.9') source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('9f1d8e23f6f3d4a688fe0c05610caff4') +md5sums=('fd78564417634583692b04193bc0bbc6') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc index 5387448d9..5387448d9 100755..100644 --- a/community/xmms2/xmms2d.rc +++ b/community/xmms2/xmms2d.rc diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 0952d3da1..3dc3faf32 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80796 2012-12-03 20:58:24Z jelle $ +# $Id: PKGBUILD 81878 2013-01-02 19:55:16Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar pkgver=0.16 -pkgrel=3 +pkgrel=4 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') @@ -13,20 +13,18 @@ depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz -0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) -md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' - '149583c19ac3d0ad829f3138342bb9db') +source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) +md5sums=('4742f1556a8e9b292f18df1176dcd378') + build() { - cd ${srcdir}/xmobar - patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch + cd ${srcdir}/xmobar-$pkgver - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_threaded with_utf8 with_xft with_iwlib" + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" runhaskell Setup build } package() { - cd ${srcdir}/xmobar + cd ${srcdir}/xmobar-$pkgver runhaskell Setup copy --destdir=${pkgdir} install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 2a849dfd9..a2aeac512 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 77365 2012-10-09 04:19:28Z tdziedzic $ +# $Id: PKGBUILD 81836 2013-01-01 13:44:05Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib -pkgver=0.10 -pkgrel=5 +pkgver=0.11 +pkgrel=1 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') +depends=('ghc=7.6.1' 'xmonad=0.11' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) -md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' - '32163aaeb3424cf73bf831640c162a8a') +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('05fba258ac6063e49b50786a0869bd1f') build() { cd $srcdir/$pkgname-$pkgver - # Patch xmonad-contrib to support haskell-x11 - patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index f53853afc..a5a2542e4 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77364 2012-10-09 04:19:21Z tdziedzic $ +# $Id: PKGBUILD 81832 2013-01-01 11:47:18Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad -pkgver=0.10 -pkgrel=5 +pkgver=0.11 +pkgrel=1 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" @@ -16,6 +16,9 @@ optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad.svg xmonad-0.10-x11-1.6.patch) +md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1' + '72bfa5e62e4e44fe7fa59b6a7593d993' + '22d29900d71f09a8f9fa6f0d2f3fed32') build() { cd "$srcdir" @@ -24,7 +27,7 @@ build() { cd $srcdir/$pkgname-$pkgver # Patch XMonad so we support haskell 1.6 - patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch + # patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ @@ -40,6 +43,7 @@ package() { install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh runhaskell Setup.lhs copy --destdir=$pkgdir + #runhaskell util/GenerateManpage.hs install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 @@ -48,6 +52,3 @@ package() { install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg } -md5sums=('f8381e1ec15137863558a454d4466467' - '72bfa5e62e4e44fe7fa59b6a7593d993' - '22d29900d71f09a8f9fa6f0d2f3fed32') diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index 3d5894c84..298bc0a9a 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67919 2012-03-16 09:51:24Z giovanni $ +# $Id: PKGBUILD 82003 2013-01-05 15:43:50Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.12 +pkgver=3.15 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gtk2' 'libgnomeui' 'libxtst') makedepends=('texinfo') options=('!libtool' '!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('bc7ea43e62f4aed6148d1439b0061da613c364e9f981d44d8e52506023b07d83') +sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index f3e20ccfe..b93cdf5b5 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.15-1 + 2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.10-1 diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD new file mode 100755 index 000000000..d8be5e354 --- /dev/null +++ b/community/xnoise/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: archtux <antonio dot arias99999 at gmail dot com> + +pkgname=xnoise +pkgver=0.2.14 +pkgrel=5 +pkgdesc="Media player with a slick GUI, great speed and lots of features." +arch=('i686' 'x86_64' 'mips64el') +url="http://www.xnoise-media-player.com/" +license=('GPL2') +depends=('desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-base-plugins' 'gtk3' 'libsoup' 'sqlite' 'taglib') +makedepends=('gettext' 'intltool') +options=('!libtool') +install=$pkgname.install +source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz") +md5sums=('774b52c94d5b1d3de963307835ade35b') + + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # Remove obsolete files + rm -rf $pkgdir/usr/include $pkgdir/usr/share/vala +} diff --git a/community/xnoise/xnoise.install b/community/xnoise/xnoise.install new file mode 100644 index 000000000..8f2bcd263 --- /dev/null +++ b/community/xnoise/xnoise.install @@ -0,0 +1,13 @@ + +post_install() { + gtk-update-icon-cache -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD index 42d8a1c85..525ea5aaf 100644 --- a/community/xosd/PKGBUILD +++ b/community/xosd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=xosd pkgver=2.2.14 -pkgrel=5 +pkgrel=5.1 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools" arch=("i686" "x86_64" 'mips64el') license=('GPL2') diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD index 338d5972d..300054866 100644 --- a/community/xpad/PKGBUILD +++ b/community/xpad/PKGBUILD @@ -14,13 +14,16 @@ url="http://mterry.name/xpad/" license=('GPL') install=xpad.install source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2 - xpad-gtk-2.20.patch) + xpad-gtk-2.20.patch + xpad-4.1-glib.patch) md5sums=('e37bfbe2331d810124c28150fdf30b3f' - '6a3d2952b469d65ec333714991ba8284') + '6a3d2952b469d65ec333714991ba8284' + '69a2792b9cf4791aa733d1034a28c84b') build() { cd $srcdir/$pkgname-$pkgver # patch -p1 <$srcdir/xpad-gtk-2.20.patch + patch -Np1 -i ${srcdir}/xpad-4.1-glib.patch ./configure --prefix=/usr /usr/bin/make /usr/bin/make DESTDIR=$pkgdir install diff --git a/community/xpad/xpad-4.1-glib.patch b/community/xpad/xpad-4.1-glib.patch new file mode 100644 index 000000000..c90f961c3 --- /dev/null +++ b/community/xpad/xpad-4.1-glib.patch @@ -0,0 +1,10 @@ +--- xpad-4.1.orig/src/xpad-undo.c 2011-11-15 12:17:05.000000000 -0500 ++++ xpad-4.1/src/xpad-undo.c 2013-01-03 02:30:45.683705231 -0500 +@@ -23,7 +23,6 @@ + #include "../config.h" + #include <stdlib.h> + #include <glib.h> +-#include <glib/glist.h> + #include "xpad-undo.h" + #include "xpad-text-buffer.h" + diff --git a/community/xv/PKGBUILD b/community/xv/PKGBUILD new file mode 100644 index 000000000..bbb0fdc18 --- /dev/null +++ b/community/xv/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 63794 2012-02-05 12:15:48Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xv +pkgver=3.10a +pkgrel=15 +pkgdesc="A nice image viewer" +arch=('i686' 'x86_64') +url="http://www.trilon.com/xv/" +license=('custom') +depends=('libpng' 'libx11' 'libtiff') +makedepends=('libxt' 'jasper') +options=('!emptydirs') +source=(ftp://ftp.trilon.com/pub/xv/${pkgname}-${pkgver}.tar.gz \ + http://downloads.sourceforge.net/sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz \ + license.txt xv-3.10a-libpng15.patch) +sha1sums=('092f8eb100f16d6b91c88b126c2b2b998eb09b99' + 'd00308c1687d9d803d26ef40c73d19a0f593c626' + '4561344e8f2c30eee9c55b14a14f062d89d6e7b7' + '3d19aa0c6ecc8b554081906babe0b4f9a6946da3') + +build() { + cd "${srcdir}" + tar -cJf xv-${pkgver}-source.tar.xz xv-${pkgver} + cd ${pkgname}-${pkgver} + patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt + patch -p0 < ../xv-3.10a-libpng15.patch + make JP2KDIR=/usr/lib +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/{bin,lib,share/man/man1} + make DESTDIR="${pkgdir}" PREFIX=/usr install + install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" + +# installing source tarball (to comply with license) + install -D -m644 "${srcdir}/xv-${pkgver}-source.tar.xz" "${pkgdir}/usr/share/doc/xv/xv-${pkgver}-source.tar.xz" + ln -s "/usr/share/licenses/${pkgname}/license.txt" "${pkgdir}/usr/share/doc/xv/license.txt" +} diff --git a/community/xv/license.txt b/community/xv/license.txt new file mode 100644 index 000000000..7dd87c233 --- /dev/null +++ b/community/xv/license.txt @@ -0,0 +1,139 @@ +XV Licensing Information +------------------------ +XV IS SHAREWARE FOR PERSONAL USE ONLY. + +You may use XV for your own amusement, and if you find it nifty, +useful, generally cool, or of some value to you, your registration fee +would be greatly appreciated. $25 is the standard registration fee, +though of course, larger amounts are quite welcome. Folks who donate +$40 or more can receive a printed, bound copy of the XV manual for no +extra charge. If you want one, just ask. BE SURE TO SPECIFY THE +VERSION OF XV THAT YOU ARE USING! + +COMMERCIAL, GOVERNMENT, AND INSTITUTIONAL USERS MUST REGISTER THEIR +COPIES OF XV. + +This does *not* mean that you are required to register XV just because +you play with it on the workstation in your office. This falls under +the heading of 'personal use'. If you are a sysadmin, you can put XV +up in a public directory for your users amusement. Again, 'personal +use', albeit plural. + +On the other hand, if you use XV in the course of doing your work, +whatever your 'work' may happen to be, you *must* register your +copy of XV. (Note: If you are a student, and you use XV to do +classwork or research, you should get your professor/teacher/advisor +to purchase an appropriate number of copies.) + +XV licenses are $25 each. You should purchase one license per +workstation, or one per XV user, whichever is the smaller number. XV +is *not* sold on a 'number of concurrent users' basis. If XV was some +$1000 program, yes, that would be a reasonable request, but at $25, +it's not. Also, given that XV is completely unlocked, there is no way +to enforce any 'number of concurrent users' limits, so it isn't sold +that way. + +Printed and bound copies of the 100-odd page XV manual are available +for $15 each. Note that manuals are *only* sold with, at minimum, an +equal number of licenses. (e.g. if you purchase 5 licenses, you can +also purchase *up to* 5 copies of the manual) + +The source code to the program can be had (as a compressed 'tar' file +split over a couple 3.5" MS-DOS formatted floppies) for $15, for those +who don't have ftp capabilities. + +Orders outside the US and Canada must add an additional $5 per manual +ordered to cover the additional shipping charges. + +Checks, money orders, and purchase orders are accepted. Credit cards +are not. All forms of payment must be payable in US Funds. Checks +must be payable through a US bank (or a US branch of a non-US bank). +Purchase orders for less than $50, while still accepted, are not +encouraged. + +All payments should be payable to 'John Bradley', and mailed to: + John Bradley + 1053 Floyd Terrace + Bryn Mawr, PA 19010 + USA + + +Site Licenses +------------- +If you are planning to purchase 10 or more licenses, site licenses are +available, at a substantial discount. Site licenses let you run XV on +any and all computing equipment at the site, for any purpose +whatsoever. The site license covers the current version of XV, and +any versions released within one year of the licensing date. You are +also allowed to duplicate and distribute an unlimited number of copies +of the XV manual, but only for use within the site. Covered versions +of the software may be run in perpetuity. + +Also, it should be noted that a 'site' can be defined as anything +you'd like. It can be a physical location (a room, building, +location, etc.), an organizational grouping (a workgroup, department, +division, etc.) or any other logical grouping ("the seventeen +technical writers scattered about our company", etc.). + +The site license cost will be based on your estimate of the number of +XV users or workstations at your site, whichever is the smaller +number. + +If you are interested in obtaining a site license, please contact the +author via electronic mail or FAX (see below for details). Send +information regarding your site (the name or definition of the 'site', +a physical address, a fax number, and an estimate of the number of +users or workstations), and we'll get a site license out to you for +your examination. + + +Copyright Notice +---------------- +XV is Copyright 1989, 1994 by John Bradley + +Permission to copy and distribute XV in its entirety, for +non-commercial purposes, is hereby granted without fee, provided that +this license information and copyright notice appear in all copies. + +If you redistribute XV, the *entire* contents of this distribution +must be distributed, including the README, and INSTALL files, the +sources, and the complete contents of the 'docs' directory. + +Note that distributing XV 'bundled' in with any product is considered +to be a 'commercial purpose'. + +Also note that any copies of XV that are distributed MUST be built +and/or configured to be in their 'unregistered copy' mode, so that it +is made obvious to the user that XV is shareware, and that they should +consider registering, or at least reading this information. + +The software may be modified for your own purposes, but modified +versions may not be distributed without prior consent of the author. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the author be held liable for any damages +arising from the use of this software. + +If you would like to do something with XV that this copyright +prohibits (such as distributing it with a commercial product, using +portions of the source in some other program, distributing registered +copies, etc.), please contact the author (preferably via email). +Arrangements can probably be worked out. + + +The author may be contacted via: + US Mail: John Bradley + 1053 Floyd Terrace + Bryn Mawr, PA 19010 + + FAX: (610) 520-2042 + +Electronic Mail regarding XV should be sent to one of these three addresses: + xv@devo.dccs.upenn.edu - general XV questions + xvbiz@devo.dccs.upenn.edu - all XV licensing questions + xvtech@devo.dccs.upenn.edu - bug reports, technical questions + +Please do *not* send electronic mail directly to the author, as he +gets more than enough as it is. + + diff --git a/community/xv/xv-3.10a-libpng15.patch b/community/xv/xv-3.10a-libpng15.patch new file mode 100644 index 000000000..43c517668 --- /dev/null +++ b/community/xv/xv-3.10a-libpng15.patch @@ -0,0 +1,520 @@ +--- xvinfo.c ++++ xvinfo.c +@@ -26,7 +26,7 @@ + #define INFOHIGH 270 + + /* max length of an Info String */ +-#define ISTRLEN 80 ++#define ISTRLEN 256 + + /* baseline of top line of text */ + #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT) +--- xvpng.c ++++ xvpng.c +@@ -31,6 +31,7 @@ + + #ifdef HAVE_PNG + ++#include "zlib.h" + #include "png.h" + + /*** Stuff for PNG Dialog box ***/ +@@ -41,7 +42,9 @@ + #define COMPRESSION 6 /* default zlib compression level, not max + (Z_BEST_COMPRESSION) */ + +-#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) ++/* old ++#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) */ ++#define HAVE_tRNS png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS) + + #define DWIDE 86 + #define DHIGH 104 +@@ -444,6 +447,10 @@ + byte *p, *png_line; + char software[256]; + char *savecmnt; ++ /* for storing values until all are accumulated, so that the image header can be set in full */ ++ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type; ++ png_uint_32 _width,_height; ++ png_time _mod_time; + + if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, + png_xv_error, png_xv_warning)) == NULL) { +@@ -458,7 +465,7 @@ + FatalError(software); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return -1; + } +@@ -489,8 +496,8 @@ + png_set_filter(png_ptr, 0, filter); + } + +- info_ptr->width = w; +- info_ptr->height = h; ++ _width = w; ++ _height = h; + if (w <= 0 || h <= 0) { + SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", + fbasename, w, h); +@@ -498,7 +505,7 @@ + return -1; + } + +- info_ptr->interlace_type = interCB.val ? 1 : 0; ++ _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE; + + linesize = 0; /* quiet a compiler warning */ + +@@ -542,40 +549,44 @@ + png_destroy_write_struct(&png_ptr, &info_ptr); + return -1; + } +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- info_ptr->bit_depth = 8; ++ _color_type = PNG_COLOR_TYPE_RGB; ++ _bit_depth = 8; + } else /* ptype == PIC8 */ { + linesize = w; +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; ++ _color_type = PNG_COLOR_TYPE_PALETTE; + if (numuniqcols <= 2) +- info_ptr->bit_depth = 1; ++ _bit_depth = 1; + else + if (numuniqcols <= 4) +- info_ptr->bit_depth = 2; ++ _bit_depth = 2; + else + if (numuniqcols <= 16) +- info_ptr->bit_depth = 4; ++ _bit_depth = 4; + else +- info_ptr->bit_depth = 8; ++ _bit_depth = 8; + + for (i = 0; i < numuniqcols; i++) { + palette[i].red = r1[i]; + palette[i].green = g1[i]; + palette[i].blue = b1[i]; + } +- info_ptr->num_palette = numuniqcols; +- info_ptr->palette = palette; ++/* cannot find a setter for this, unsure if it is necessary anymore... + info_ptr->valid |= PNG_INFO_PLTE; ++*/ ++ /* set the header just in case it's needed */ ++ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, ++ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); ++ png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols); + } + } + + else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) { +- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; ++ _color_type = PNG_COLOR_TYPE_GRAY; + if (colorType == F_BWDITHER) { + /* shouldn't happen */ + if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()"); + +- info_ptr->bit_depth = 1; ++ _bit_depth = 1; + if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) { + remap[0] = 1; + remap[1] = 0; +@@ -595,7 +606,7 @@ + png_destroy_write_struct(&png_ptr, &info_ptr); + return -1; + } +- info_ptr->bit_depth = 8; ++ _bit_depth = 8; + } + else /* ptype == PIC8 */ { + int low_precision; +@@ -617,7 +628,7 @@ + for (; i < 256; i++) + remap[i]=0; /* shouldn't be necessary, but... */ + +- info_ptr->bit_depth = 8; ++ _bit_depth = 8; + + /* Note that this fails most of the time because of gamma */ + /* (and that would be a bug: GRR FIXME) */ +@@ -636,7 +647,7 @@ + for (i = 0; i < numuniqcols; i++) { + remap[i] &= 0xf; + } +- info_ptr->bit_depth = 4; ++ _bit_depth = 4; + + /* try to adjust to 2-bit precision grayscale */ + +@@ -652,7 +663,7 @@ + for (i = 0; i < numuniqcols; i++) { + remap[i] &= 3; + } +- info_ptr->bit_depth = 2; ++ _bit_depth = 2; + + /* try to adjust to 1-bit precision grayscale */ + +@@ -668,7 +679,7 @@ + for (i = 0; i < numuniqcols; i++) { + remap[i] &= 1; + } +- info_ptr->bit_depth = 1; ++ _bit_depth = 1; + } + } + } +@@ -677,6 +688,9 @@ + else + png_error(png_ptr, "Unknown colorstyle in WritePNG"); + ++ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, ++ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); ++ + if ((text = (png_textp)malloc(sizeof(png_text)))) { + sprintf(software, "XV %s", REVDATE); + +@@ -685,20 +699,22 @@ + text->text = software; + text->text_length = strlen(text->text); + +- info_ptr->max_text = 1; +- info_ptr->num_text = 1; +- info_ptr->text = text; ++/* max_text seems to be internal only now, do not set ++ info_ptr->max_text = 1; */ ++ png_set_text(png_ptr,info_ptr,text,1); + } + + Display_Gamma = gDial.val; /* Save the current gamma for loading */ + + // GRR FIXME: add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox +- info_ptr->gamma = 1.0/gDial.val; +- info_ptr->valid |= PNG_INFO_gAMA; ++ png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val); ++/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. ++ info_ptr->valid |= PNG_INFO_gAMA; */ + ++/* might need to be png_write_info_before_PLTE() ... */ + png_write_info(png_ptr, info_ptr); + +- if (info_ptr->bit_depth < 8) ++ if (_bit_depth < 8) + png_set_packing(png_ptr); + + pass=png_set_interlace_handling(png_ptr); +@@ -711,13 +727,13 @@ + int j; + p = pic; + for (j = 0; j < h; ++j) { +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) { ++ if (_color_type == PNG_COLOR_TYPE_GRAY) { + int k; + for (k = 0; k < w; ++k) + png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) : + remap[pc2nc[p[k]]]; + png_write_row(png_ptr, png_line); +- } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { ++ } else if (_color_type == PNG_COLOR_TYPE_PALETTE) { + int k; + for (k = 0; k < w; ++k) + png_line[k] = pc2nc[p[k]]; +@@ -739,28 +755,31 @@ + (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) { + png_textp tp; + char *comment, *key; ++ int nt; ++ int mt; + + strcpy(savecmnt, picComments); + key = savecmnt; ++ png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */ + tp = text; +- info_ptr->num_text = 0; ++ nt = 0; + + comment = strchr(key, ':'); + + do { + /* Allocate a larger structure for comments if necessary */ +- if (info_ptr->num_text >= info_ptr->max_text) ++ if (nt >= mt) + { + if ((tp = +- realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL) ++ realloc(text, (nt + 2)*sizeof(png_text))) == NULL) + { + break; + } + else + { + text = tp; +- tp = &text[info_ptr->num_text]; +- info_ptr->max_text += 2; ++ tp = &text[nt]; ++ mt += 2; + } + } + +@@ -810,7 +829,7 @@ + } + + tp->compression = tp->text_length > 640 ? 0 : -1; +- info_ptr->num_text++; ++ nt++; + tp++; + } + } +@@ -834,27 +853,29 @@ + tp->text = key; + tp->text_length = q - key; + tp->compression = tp->text_length > 750 ? 0 : -1; +- info_ptr->num_text++; ++ nt++; + key = NULL; + } + } while (key && *key); ++ png_set_text(png_ptr,info_ptr,text,nt); + } + else { +- info_ptr->num_text = 0; ++ png_set_text(png_ptr,info_ptr,text,0); + } + } +- info_ptr->text = text; + +- png_convert_from_time_t(&(info_ptr->mod_time), time(NULL)); +- info_ptr->valid |= PNG_INFO_tIME; ++ png_convert_from_time_t(&_mod_time, time(NULL)); ++ png_set_tIME(png_ptr,info_ptr,&_mod_time); ++/* dunno how to set validity ++ info_ptr->valid |= PNG_INFO_tIME; */ + + png_write_end(png_ptr, info_ptr); + fflush(fp); /* just in case we core-dump before finishing... */ + + if (text) { + free(text); +- /* must do this or png_destroy_write_struct() 0.97+ will free text again: */ +- info_ptr->text = (png_textp)NULL; ++ /* must do this or png_destroy_write_struct() 0.97+ will free text again: ++ info_ptr->text = (png_textp)NULL; */ + if (savecmnt) + { + free(savecmnt); +@@ -886,6 +907,14 @@ + int pass; + int gray_to_rgb; + size_t commentsize; ++ /* temp storage vars for libpng15 migration */ ++ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette; ++ png_uint_32 _width,_height; ++ png_timep _mod_time; ++ double _gamma; ++ png_textp _text; ++ png_colorp _palette; ++ png_color_16p _background; + + fbasename = BaseName(fname); + +@@ -921,7 +950,7 @@ + FatalError("malloc failure in LoadPNG"); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + fclose(fp); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if (!read_anything) { +@@ -945,8 +974,10 @@ + #endif + png_read_info(png_ptr, info_ptr); + +- pinfo->w = pinfo->normw = info_ptr->width; +- pinfo->h = pinfo->normh = info_ptr->height; ++ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); ++ ++ pinfo->w = pinfo->normw = _width; ++ pinfo->h = pinfo->normh = _height; + if (pinfo->w <= 0 || pinfo->h <= 0) { + SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", + fbasename, pinfo->w, pinfo->h); +@@ -957,9 +988,9 @@ + pinfo->frmType = F_PNG; + + sprintf(pinfo->fullInfo, "PNG, %d bit ", +- info_ptr->bit_depth * info_ptr->channels); ++ _bit_depth * png_get_channels(png_ptr,info_ptr)); + +- switch(info_ptr->color_type) { ++ switch(_color_type) { + case PNG_COLOR_TYPE_PALETTE: + strcat(pinfo->fullInfo, "palette color"); + break; +@@ -983,15 +1014,17 @@ + + sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo), + ", %sinterlaced. (%d bytes)", +- info_ptr->interlace_type ? "" : "non-", filesize); ++ _interlace_type ? "" : "non-", filesize); + +- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height); ++ sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height); + +- if (info_ptr->bit_depth < 8) ++ if (_bit_depth < 8) + png_set_packing(png_ptr); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma); ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) { ++ png_get_gAMA(png_ptr,info_ptr,&_gamma); ++ png_set_gamma(png_ptr, Display_Gamma, _gamma); ++ } + /* + *else + * png_set_gamma(png_ptr, Display_Gamma, 0.45); +@@ -1000,7 +1033,7 @@ + gray_to_rgb = 0; /* quiet a compiler warning */ + + if (have_imagebg) { +- if (info_ptr->bit_depth == 16) { ++ if (_bit_depth == 16) { + my_background.red = imagebgR; + my_background.green = imagebgG; + my_background.blue = imagebgB; +@@ -1013,8 +1046,8 @@ + } + png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN, + 0, Display_Gamma); +- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA || +- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && ++ if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA || ++ (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && + (imagebgR != imagebgG || imagebgR != imagebgB)) /* i.e., colored bg */ + { + png_set_gray_to_rgb(png_ptr); +@@ -1022,8 +1055,9 @@ + gray_to_rgb = 1; + } + } else { +- if (info_ptr->valid & PNG_INFO_bKGD) { +- png_set_background(png_ptr, &info_ptr->background, ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { ++ png_get_bKGD(png_ptr,info_ptr,&_background); ++ png_set_background(png_ptr, _background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); + } else { + my_background.red = my_background.green = my_background.blue = +@@ -1033,13 +1067,13 @@ + } + } + +- if (info_ptr->bit_depth == 16) ++ if (_bit_depth == 16) + png_set_strip_16(png_ptr); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || +- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (_color_type == PNG_COLOR_TYPE_GRAY || ++ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { +- if (info_ptr->bit_depth == 1) ++ if (_bit_depth == 1) + pinfo->colType = F_BWDITHER; + else + pinfo->colType = F_GREYSCALE; +@@ -1049,9 +1083,11 @@ + pass=png_set_interlace_handling(png_ptr); + + png_read_update_info(png_ptr, info_ptr); ++ /* get HIDR again just in case the info_ptr changed */ ++ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB || +- info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) ++ if (_color_type == PNG_COLOR_TYPE_RGB || ++ _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) + { + linesize = 3 * pinfo->w; + if (linesize/3 < pinfo->w) { /* know pinfo->w > 0 (see above) */ +@@ -1065,16 +1101,17 @@ + } else { + linesize = pinfo->w; + pinfo->type = PIC8; +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || +- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { ++ if (_color_type == PNG_COLOR_TYPE_GRAY || ++ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + for (i = 0; i < 256; i++) + pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i; + } else { + pinfo->colType = F_FULLCOLOR; +- for (i = 0; i < info_ptr->num_palette; i++) { +- pinfo->r[i] = info_ptr->palette[i].red; +- pinfo->g[i] = info_ptr->palette[i].green; +- pinfo->b[i] = info_ptr->palette[i].blue; ++ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette); ++ for (i = 0; i < _num_palette; i++) { ++ pinfo->r[i] = _palette[i].red; ++ pinfo->g[i] = _palette[i].green; ++ pinfo->b[i] = _palette[i].blue; + } + } + } +@@ -1092,7 +1129,7 @@ + png_error(png_ptr, "can't allocate space for PNG image"); + } + +- png_start_read_image(png_ptr); ++ /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */ + + for (i = 0; i < pass; i++) { + byte *p = pinfo->pic; +@@ -1106,22 +1143,23 @@ + + png_read_end(png_ptr, info_ptr); + +- if (info_ptr->num_text > 0) { ++ png_get_text(png_ptr,info_ptr,&_text,&_num_text); ++ if (_num_text > 0) { + commentsize = 1; + +- for (i = 0; i < info_ptr->num_text; i++) +- commentsize += strlen(info_ptr->text[i].key) + 1 + +- info_ptr->text[i].text_length + 2; ++ for (i = 0; i < _num_text; i++) ++ commentsize += strlen(_text[i].key) + 1 + ++ _text[i].text_length + 2; + + if ((pinfo->comment = malloc(commentsize)) == NULL) { + png_warning(png_ptr,"can't allocate comment string"); + } + else { + pinfo->comment[0] = '\0'; +- for (i = 0; i < info_ptr->num_text; i++) { +- strcat(pinfo->comment, info_ptr->text[i].key); ++ for (i = 0; i < _num_text; i++) { ++ strcat(pinfo->comment, _text[i].key); + strcat(pinfo->comment, "::"); +- strcat(pinfo->comment, info_ptr->text[i].text); ++ strcat(pinfo->comment, _text[i].text); + strcat(pinfo->comment, "\n"); + } + } +@@ -1143,7 +1181,7 @@ + { + SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); + +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD index ee9bd7c19..44511d671 100644 --- a/community/xxkb/PKGBUILD +++ b/community/xxkb/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('c2e5c7f3285033f0e26b358ef95a7c89' build() { cd "${srcdir}"/${pkgname} xmkmf - make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' + make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm -lX11' } package() { diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD new file mode 100644 index 000000000..8318e4eff --- /dev/null +++ b/community/zinnia/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 81446 2012-12-21 04:42:33Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Humbert Julien <julroy67 [AT] gmail.com> + +pkgname=zinnia +pkgver=0.06 +pkgrel=2 +pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines" +arch=('i686' 'x86_64' 'mips64el') +url="http://zinnia.sourceforge.net/" +license=('BSD') +depends=('gcc-libs') +makedepends=('libtool') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index be2f06dcb..0cbac9901 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80926 2012-12-07 02:04:08Z seblu $ +# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=1.0 -pkgrel=2 +pkgrel=4 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') diff --git a/community/znc/znc.install b/community/znc/znc.install index 92bc0572a..e5dd6575a 100644 --- a/community/znc/znc.install +++ b/community/znc/znc.install @@ -3,7 +3,19 @@ # arg 1: the new package version post_install() { getent group znc >/dev/null || groupadd -g 136 znc - getent passwd znc >/dev/null || useradd -d /var/empty -u 136 -g 136 znc + getent passwd znc >/dev/null || useradd -r -d /var/lib/znc -u 136 -g 136 znc + [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc + echo "==> Use 'znc --makeconf' as user znc to generate your first config" + true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "`vercmp $2 1.0-4`" -lt 0 ]; then + [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc + usermod -d /var/lib/znc znc 2>/dev/null && echo '==> znc home directory has moved to /var/lib/znc' + fi true } diff --git a/core/b43-fwcutter/PKGBUILD b/core/b43-fwcutter/PKGBUILD new file mode 100644 index 000000000..6cf85f49c --- /dev/null +++ b/core/b43-fwcutter/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgname=b43-fwcutter +pkgver=015 +pkgrel=1 +pkgdesc="firmware extractor for the bcm43xx kernel module" +url="http://linuxwireless.org/en/users/Drivers/b43" +depends=('glibc') +license=('GPL') +arch=('i686' 'x86_64') +source=("http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2") +md5sums=('628e030565222a107bc40300313cbe76') + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m755 b43-fwcutter $pkgdir/usr/bin/b43-fwcutter + install -D -m644 b43-fwcutter.1 $pkgdir/usr/share/man/man1/b43-fwcutter.1 +} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 34389323e..b8946099e 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170164 2012-11-04 00:51:49Z allan $ +# $Id: PKGBUILD 174629 2013-01-05 10:20:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=039 #prepare for some patches +_patchlevel=042 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -157,4 +157,10 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '9ef3c308cde413e95866c1266cfb4e98' 'afbb94e04dab29bd4ce92199892f2b5e' 'cd48f57a404498d4e5c73a3501c4b1a5' - 'd2693a2728b5a0448947d23ce47cb4b3') + 'd2693a2728b5a0448947d23ce47cb4b3' + '00a2371b6c05acbfce6bc850c6d982f8' + '72744ac844a1dfd15dddbba7f73ec45c' + '7bc4942a66ca4024ee964db7ede07896' + '7e97f02d9dd1436eed278f2732542ecf' + '1cf7701017ebfc8e129de92c8f8b798c' + '4ef8b5af440bf7b939b7955ce68b4dc7') diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 944d72d0b..ec8ce9d04 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $ +# $Id: PKGBUILD 174628 2013-01-05 10:20:45Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.23.1 -pkgrel=1 +pkgrel=3 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base-devel') -depends=('glibc>=2.16' 'zlib') +depends=('glibc>=2.17' 'zlib') checkdepends=('dejagnu' 'bc') options=('!libtool' '!distcc' '!ccache') install=binutils.install @@ -27,29 +27,14 @@ build() { --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://bugs.archlinux.org/ \ --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads --enable-shared \ + --enable-plugins --enable-threads \ + --with-pic --enable-shared \ --disable-werror --disable-multilib # check the host environment and makes sure all the necessary tools are available make configure-host make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic } check() { @@ -68,20 +53,13 @@ package() { install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib + # Install PIC libiberty.a + install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib - # Remove Windows/Novell specific man pages + # Remove unwanted files rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # why are these distributed with binutils? rm ${pkgdir}/usr/share/info/{configure,standards}.info - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. + # No shared linking to these files outside binutils rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so } diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD index 127481e59..543b1012a 100644 --- a/core/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 162068 2012-06-19 12:27:34Z allan $ +# $Id: PKGBUILD 173940 2012-12-28 13:11:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=cloog -pkgver=0.17.0 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64' 'mips64el') url="http://www.bastoul.net/cloog/" license=('GPL') depends=('isl' 'gmp') -conflicts=('cloog-ppl<0.15.10-2') options=('!libtool') source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('0aa3302c81f65ca62c114e5264f8a802') +md5sums=('be78a47bd82523250eb3e91646db5b3d') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-isl=system --with-gmp=system + ./configure --prefix=/usr --with-isl=system make } diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index ebac97c6d..795b8882e 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,14 +3,15 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('pam' 'bash' 'run-parts') -optdepends=('pm-utils: defer anacron when on battery power' - 'smtp-server: sending cron job output via email') +optdepends=('pm-utils: defer anacron on battery power' + 'smtp-server: send job output via email' + 'smtp-forwarder: forward job output to email server') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' @@ -19,7 +20,7 @@ source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.t 'rc.d') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' - '3038a05476829f72fc4918bee9176b273ce10340' + 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0' '5eff7fb31f6bc0a924243ff046704726cf20c221' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') diff --git a/core/cronie/service b/core/cronie/service index 5ae193bfc..4fa4d4593 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -4,6 +4,7 @@ Description=Periodic Command Scheduler [Service] ExecStart=/usr/sbin/crond -n ExecReload=/bin/kill -HUP $MAINPID +KillMode=process Restart=always [Install] diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index c34903a99..3410f3914 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171912 2012-11-23 13:37:09Z ronald $ +# $Id: PKGBUILD 174850 2013-01-07 21:57:19Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.6.3 -pkgrel=2 +pkgver=5.6.4 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service') -sha1sums=('d64b589d15821aa5851fda81078183cc61a3e45a' +sha1sums=('18a09d8fabf926e5d32bd6315b40d77247b11596' 'b67b9ce6a2faaca75fea356966a16be2283b7db0' 'd5304eb00828d4ee2fd879addce473ea09c47635' 'e49e01041f831281a1cd0c97ca21204e0aa07fda') diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index a925e8ae1..91063cf9a 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $ +# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=7 +pkgrel=8 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '2297d23cee1aef23ec6ad8d6d1870356' + 'dea048cc09b49b02da1009adae563866' 'faec669dc85f87187b45b5d3968efe2c' '56a8bb0ece8d206cd8efb504ee072ddd' - 'de0af1fdb9ed4c109b8119160167d2e9') + '1cd201496e52bd05c1c3048bf6dd809f') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service index 1fd142ff2..a31f8b39f 100644 --- a/core/dmraid/dmraid.service +++ b/core/dmraid/dmraid.service @@ -7,9 +7,8 @@ Before=basic.target shutdown.target Conflicts=shutdown.target [Service] -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z Type=oneshot -TimeoutSec=0 +ExecStart=/sbin/dmraid --ignorelocking --activate y -Z RemainAfterExit=true [Install] diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index d3238c1f7..2003b5cdf 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -9,6 +9,7 @@ build() { add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" add_runscript } diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 725dd5a84..8909ba8b7 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172178 2012-12-01 00:07:10Z dreisner $ +# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed pkgver=1.7 -pkgrel=1 +pkgrel=2 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,6 +12,7 @@ url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) +install='ed.install' md5sums=('0aa4e2428e325203d0d7c3e86c961b1c') build() { @@ -32,7 +33,4 @@ check() { package() { make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install - - # nuke info pages - rm -r "$pkgdir/usr/share/info" } diff --git a/core/ed/ed.install b/core/ed/ed.install new file mode 100644 index 000000000..2be95d935 --- /dev/null +++ b/core/ed/ed.install @@ -0,0 +1,18 @@ +infodir=usr/share/info +filelist=(ed.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2>/dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2>/dev/null + done +} diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index c64e2a802..7563c2580 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,38 +1,35 @@ -# $Id: PKGBUILD 155835 2012-04-07 08:07:16Z allan $ +# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=4.0.1 -pkgrel=1.1 +pkgver=4.0.2 +pkgrel=1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/directory/GNU/gawk.html" license=('GPL') -groups=('base') +groups=('base' 'base-devel') depends=('sh' 'glibc') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('bab2bda483e9f32be65b43b8dab39fa5' - '7cf4e4896509c655dd00ecd4ca9098ef') +md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a' + '131f79e5aa1528649c90ccf0440db0a6') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make check } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install install -dm755 ${pkgdir}/bin diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index a19046150..47f33edef 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169769 2012-10-28 11:11:42Z allan $ +# $Id: PKGBUILD 173936 2012-12-28 13:10:57Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,7 +10,7 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.7.2 -pkgrel=2 +pkgrel=3 #_snapshot=4.7-20120721 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -127,7 +127,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.16') + depends=('glibc>=2.17') install=gcc-libs.install cd ${srcdir}/gcc-build @@ -175,10 +175,10 @@ package_gcc() # -f makes rm return 0 if the archive doesn't exist rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} rm -f $pkgdir/usr/lib/*.so* - rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc}.a rm -f $pkgdir/usr/lib/libgfortran.spec rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a rm -fr $pkgdir/usr/lib/go @@ -236,18 +236,15 @@ package_gcc-fortran() install=gcc-fortran.install cd ${srcdir}/gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=$pkgdir install-target-libgfortran make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm -f ${pkgdir}/usr/share/info/libquadmath.info - ln -s gfortran ${pkgdir}/usr/bin/f95 + rm ${pkgdir}/usr/lib/libgfortran.so* + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index b5a5cedfd..cd0d4251c 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $ +# $Id: PKGBUILD 174268 2013-01-03 13:58:09Z allan $ # Maintainer: pkgname=gettext -pkgver=0.18.1.1 -pkgrel=4.1 +pkgver=0.18.2 +pkgrel=1 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gettext/" license=('GPL') -groups=('base') +groups=('base' 'base-devel') depends=('gcc-libs' 'acl' 'sh' 'glib2') optdepends=('cvs: for autopoint tool') options=(!libtool !docs) install=gettext.install -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz - gnulib-no-gets.patch) -md5sums=('3dd55b952826d2b32f51308f2f91aa89' - 'ca29994ca712580744feda170999e7ae') +source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('0c86e5af70c195ab8bd651d17d783928' + '1a658e29a03ab42da6d2d468b0583407') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "$srcdir/gnulib-no-gets.patch" - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --build=$CHOST --prefix=/usr --enable-csharp + ./configure --prefix=/usr make } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 4130bedcf..c6bf5c57f 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 169771 2012-10-28 11:11:49Z allan $ +# $Id: PKGBUILD 173938 2012-12-28 13:11:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version pkgname=glibc -pkgver=2.16.0 -pkgrel=5 +pkgver=2.17 +pkgrel=1 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.5' 'tzdata') +depends=('linux-api-headers>=3.7' 'tzdata') makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen @@ -20,31 +20,12 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} - http://ftp.gnu.org/gnu/libc/${pkgname}-ports-${pkgver}.tar.xz{,.sig} - glibc-2.15-fix-res_query-assert.patch - glibc-2.16-unlock-mutex.patch - glibc-2.16-rpcgen-cpp-path.patch - glibc-2.16-strncasecmp-segfault.patch - glibc-2.16-strtod-overflow.patch - glibc-2.16-detect-fma.patch - glibc-2.16-glob-use-size_t.patch - nscd.rcd nscd.service nscd.tmpfiles locale.gen.txt locale-gen) -md5sums=('80b181b02ab249524ec92822c0174cf7' - '2a1221a15575820751c325ef4d2fbb90' - '9a2439641be7ca8b01a3175324013031' - '218fc97a9f8777ac2688174d431e7722' - '31f415b41197d85d3bbee3d1eecd06a3' - '0afcd8c6020d61684aba63ed5f26bd91' - 'ea6a43915474e8276e9361eed6a01280' - 'f042d37cc8ca3459023431809039bc88' - '61d322f7681a85d3293ada5c3ccc2c7e' - '2426f593bc43f5499c41d21b57ee0e30' - 'a441353901992feda4b15a11a20140a1' - '589d79041aa767a5179eaa4e2737dd3f' +md5sums=('87bf675c8ee523ebda4803e8e1cec638' + '6db4d1661cf34282755dc90330465f6d' 'c1e07c0bec0fe89791bfd9d13fc85edf' 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' @@ -54,44 +35,9 @@ md5sums=('80b181b02ab249524ec92822c0174cf7' build() { cd ${srcdir}/${pkgname}-${pkgver} - # fix res_query assertion - # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 - patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch - - # prevent hang by locked mutex - # http://sourceware.org/git/?p=glibc.git;a=patch;h=c30e8edf - patch -p1 -i ${srcdir}/glibc-2.16-unlock-mutex.patch - - # prevent need for /lib/cpp symlink - # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a - patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch - - # strncasecmp segfault on i686 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737 - patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch - - # strtod integer/buffer overflow - # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319 - patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch - - # detect FMA supprt - # http://sourceware.org/git/?p=glibc.git;a=commit;h=a5cfcf08 - patch -p1 -i ${srcdir}/glibc-2.16-detect-fma.patch - - # prevent overflow in globc - # http://sourceware.org/git/?p=glibc.git;a=commit;h=6c62f108 - patch -p1 -i ${srcdir}/glibc-2.16-glob-use-size_t.patch - # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h - if [ "${CARCH}" = "mips64el" ]; then - ln -s ../glibc-ports-${pkgver} ports - - # Fix typo making util-linux build fail. - sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile - fi - cd ${srcdir} mkdir glibc-build cd glibc-build @@ -101,7 +47,7 @@ build() { # TODO: make separate glibc-xen package for i686 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" elif [[ ${CARCH} = "mips64el" ]]; then - # mips64el is only supported out of tree. + # mips64el is only supported in ports. extra_addons=",ports" fi @@ -136,6 +82,9 @@ build() { } check() { + # bug to file - the linker commands need to be reordered + LDFLAGS=${LDFLAGS/--as-needed,/} + cd ${srcdir}/glibc-build make check } @@ -156,8 +105,6 @@ package() { install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf @@ -168,7 +115,7 @@ package() { # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ - ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen if [[ ${CARCH} = "x86_64" ]]; then # fix paths and compliance with binary blobs... diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index ae2801d91..8dff4f0b0 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158748 2012-05-09 01:14:08Z allan $ +# $Id: PKGBUILD 173657 2012-12-20 11:11:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.0.5 +pkgver=5.1.0 pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,9 @@ depends=('gcc-libs' 'sh') license=('LGPL3') options=(!libtool) install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig}) -md5sums=('8aef50959acec2a1ad41d144ffe0f3b5' - '406e8878aadc51b134d1b3dd845261ee') +source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig}) +md5sums=('69fd511e435f81a0334f14f00c7d77b3' + '7a02b99dc7edd9822c210f78d88140e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,8 +22,7 @@ build() { [ "${CARCH}" = "i686" ] && export ABI="32" [ "${CARCH}" = "mips64el" ] && export ABI="n32" ./configure --build=${CHOST} \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx + --prefix=/usr --enable-cxx make } diff --git a/core/grub/20_memtest86+ b/core/grub/20_memtest86+ new file mode 100644 index 000000000..1d3096f6b --- /dev/null +++ b/core/grub/20_memtest86+ @@ -0,0 +1,29 @@ +#! /bin/sh -e +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix="/usr" +exec_prefix="${prefix}" + +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then + # image exists, create menu entry + echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 + cat << EOF +menuentry "Memory test (memtest86+)" $CLASS { +EOF + prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" + cat << EOF + linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` +} +EOF +fi diff --git a/core/grub/PKGBUILD b/core/grub/PKGBUILD new file mode 100644 index 000000000..6b1457a4e --- /dev/null +++ b/core/grub/PKGBUILD @@ -0,0 +1,249 @@ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +_grub_lua_ver=24 +_grub_ntldr_ver=21 +_grub_915_ver=9 + +pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') +pkgbase=grub +pkgver=2.00 +pkgrel=1 +url="https://www.gnu.org/software/grub/" +arch=('i686' 'x86_64') +license=('GPL3') +makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') + +source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" + 'archlinux_grub_mkconfig_fixes.patch' + 'grub.default' + 'grub.cfg' + '20_memtest86+' + 'grub_bzr_export.sh') + +noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") + +sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' + '89290031b974780c6df76893836d2477d4add895' + 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' + 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' + '26e4e946190bea1f03632658cf08ba90e11dec57' + 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5' + '76ae862a945a8848e6999adf8ad1847f0f7008b9' + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' + '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') + +_build_grub-common_and_bios() { + + ## copy the source for building the common/bios package + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}" + cd "${srcdir}/grub_bios-${pkgver}" + + ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs + patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" + echo + + ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files + sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" + + ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" + + ## add the grub-extra sources + export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/" + install -d "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + ## Requires python2 + # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh" + + ## start the actual build process + cd "${srcdir}/grub_bios-${pkgver}" + ./autogen.sh + echo + + CFLAGS="" ./configure \ + --with-platform="pc" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + "${_EFIEMU}" \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + echo + + CFLAGS="" make + echo + +} + +_build_grub-efi-i386() { + + ## copy the source for building the efi package + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}" + cd "${srcdir}/grub_efi-${pkgver}" + + export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/" + install -d "${srcdir}/grub_efi-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_efi-${pkgver}/grub-extras" + + cd "${srcdir}/grub_efi-${pkgver}" + ./autogen.sh + echo + + CFLAGS="" ./configure \ + --with-platform="efi" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + --disable-efiemu \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + echo + + CFLAGS="" make + echo + +} + +build() { + + ## set architecture dependent variables + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + _HOST="${CARCH}" + + cd "${srcdir}/grub-${pkgver}" + # _get_locale_files + + _build_grub-common_and_bios + echo + + _build_grub-efi-i386 + echo + +} + +package_grub-common() { + + pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files" + depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') + conflicts=('grub-legacy' 'grub') + replaces=('grub2-common') + provides=('grub2-common') + backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') + optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: for grub-mkrescue FAT FS support') + install="grub.install" + options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') + + cd "${srcdir}/grub_bios-${pkgver}" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + echo + + ## install extra /etc/grub.d/ files + install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + + ## install /etc/default/grub (used by grub-mkconfig) + install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + + ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) + install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" + + # remove platform specific files + rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" + +} + +package_grub-bios() { + + pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules" + depends=("grub-common=${pkgver}") + options=('!strip' '!emptydirs') + replaces=('grub2-bios') + provides=('grub2-bios') + + cd "${srcdir}/grub_bios-${pkgver}" + make DESTDIR="${pkgdir}/" install + echo + + ## remove non platform-specific files + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + +} + +package_grub-efi-i386() { + + pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules" + depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr') + options=('!strip' '!emptydirs') + replaces=('grub2-efi-i386') + provides=('grub2-efi-i386') + + cd "${srcdir}/grub_efi-${pkgver}" + make DESTDIR="${pkgdir}/" install + echo + + ## remove non platform-specific files + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + +} diff --git a/core/grub/archlinux_grub_mkconfig_fixes.patch b/core/grub/archlinux_grub_mkconfig_fixes.patch new file mode 100644 index 000000000..c8bd3e41f --- /dev/null +++ b/core/grub/archlinux_grub_mkconfig_fixes.patch @@ -0,0 +1,143 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 516be86..5f37db2 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 765bfdc..b148558 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -115,6 +115,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 14402e8..64c9bb5 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -87,6 +87,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -100,7 +102,7 @@ linux_entry () + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | sed -e "s/^/\t/" + fi + +@@ -132,7 +134,8 @@ linux_entry () + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ ++ message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$message' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + ++ if test -e "/etc/arch-release" ; then ++ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then ++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" ++ ++ if [ "x${version}" = "x" ] ; then ++ version="core repo kernel" ++ else ++ version="`echo "${version}" | sed -e 's,-,,g'`" ++ version="${version} kernel" ++ fi ++ fi ++ fi ++ + initrd= ++ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" ++ + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ +@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ +- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ ++ "${initrd_arch}.img" ; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break +@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do + linux_root_device_thisversion=${GRUB_DEVICE} + fi + ++ if test -e "/etc/arch-release" ; then ++ is_first_entry="false" ++ ++ linux_entry "${OS}" "${version}" true \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do ++ if test -e "${dirname}/${i}" ; then ++ initrd="${i}" ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ break ++ fi ++ done ++ fi ++ + if [ "x$is_first_entry" = xtrue ]; then + linux_entry "${OS}" "${version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" +@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + fi + ++ if ! test -e "/etc/arch-release" ; then + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +@@ -252,8 +290,10 @@ done + + # If at least one kernel was found, then we need to + # add a closing '}' for the submenu command. ++if ! test -e "/etc/arch-release" ; then + if [ x"$is_first_entry" != xtrue ]; then + echo '}' + fi ++fi + + echo "$title_correction_code" diff --git a/core/grub/grub.cfg b/core/grub/grub.cfg new file mode 100644 index 000000000..1f08102c2 --- /dev/null +++ b/core/grub/grub.cfg @@ -0,0 +1,139 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +insmod part_gpt +insmod part_msdos +if [ -s $prefix/grubenv ]; then + load_env +fi +set default="0" + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else +insmod part_msdos +insmod ext2 +set root='hd0,msdos5' +if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 +else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 +fi + font="/usr/share/grub/unicode.pf2" +fi + +if loadfont $font ; then + set gfxmode=auto + load_video + insmod gfxterm + set locale_dir=$prefix/locale + set lang=en_US + insmod gettext +fi +terminal_input console +terminal_output gfxterm +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Arch GNU/Linux, with Linux core repo kernel' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod ext2 + set root='hd0,msdos5' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 + else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 + fi + echo 'Loading Linux core repo kernel ...' + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initramfs-linux.img +} +menuentry 'Arch GNU/Linux, with Linux core repo kernel (Fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod ext2 + set root='hd0,msdos5' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 + else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 + fi + echo 'Loading Linux core repo kernel ...' + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initramfs-linux-fallback.img +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_memtest86+ ### +### END /etc/grub.d/20_memtest86+ ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/core/grub/grub.default b/core/grub/grub.default new file mode 100644 index 000000000..fdd1fc381 --- /dev/null +++ b/core/grub/grub.default @@ -0,0 +1,47 @@ +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Arch" +GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX="" + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable Hidden Menu, and optionally hide the timeout count +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +#GRUB_COLOR_NORMAL="light-blue/black" +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/path/to/wallpaper" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" + +#GRUB_SAVEDEFAULT="true" diff --git a/core/grub/grub.install b/core/grub/grub.install new file mode 100644 index 000000000..9188b357a --- /dev/null +++ b/core/grub/grub.install @@ -0,0 +1,33 @@ +infodir="usr/share/info" +filelist=('grub.info' 'grub-dev.info') + +post_install() { + if [ -f /boot/grub/grub.cfg.pacsave ]; then + echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" + install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg + fi + + cat << 'EOM' +Generating grub.cfg.example config file... +This may fail on some machines running a custom kernel. +EOM + + grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null + echo "done." + + for file in ${filelist[@]}; do + install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null + done +} + +post_upgrade() { + for file in ${filelist[@]}; do + install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null + done +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null + done +} diff --git a/core/grub/grub_bzr_export.sh b/core/grub/grub_bzr_export.sh new file mode 100644 index 000000000..ff8f99ecc --- /dev/null +++ b/core/grub/grub_bzr_export.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +## For actual repos + +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution + +## For launchpad mirror + +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution + +## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. + +_WD="${PWD}/" +_OUTPUT_DIR="${_WD}/" + +_ACTUAL_PKGVER="2.00" + +_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" +_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" +_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" + +_MAIN_SNAPSHOT() { + + cd "${_GRUB_BZR_REPO_DIR}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + + xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" + echo + +} + +_EXP_SNAPSHOT() { + + cd "${_GRUB_BZR_EXP_REPO_DIR}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + + xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" + echo + +} + +_EXTRAS_SNAPSHOT() { + + cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" + bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + echo + + xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" + echo + +} + +echo + +set -x -e + +echo + +_MAIN_SNAPSHOT + +echo + +# _EXP_SNAPSHOT + +echo + +_GRUB_EXTRAS_NAME="lua" +_EXTRAS_SNAPSHOT + +# _GRUB_EXTRAS_NAME="gpxe" +# _EXTRAS_SNAPSHOT + +_GRUB_EXTRAS_NAME="ntldr-img" +_EXTRAS_SNAPSHOT + +_GRUB_EXTRAS_NAME="915resolution" +_EXTRAS_SNAPSHOT + +echo + +set +x +e + +echo + +unset _WD +unset _OUTPUT_DIR +unset _GRUB_BZR_REPO_DIR +unset _GRUB_EXTRAS_REPOS_DIR +unset _GRUB_EXTRAS_NAME diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 6c4055ba6..f3345c08e 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170004 2012-10-30 23:08:48Z thomas $ +# $Id: PKGBUILD 174851 2013-01-07 21:57:24Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.16.2 +pkgver=1.4.16.3 pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') @@ -28,11 +28,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('6fd368c4f6c31752011a716cccd951601157a493' +sha1sums=('819949fdf4276a04c5061b82898b515f139b0117' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' - '9907f9e815592837abc7fa3264a401567b7606ab' + 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' 'cdb830137192bbe002c6d01058656bd053ed0ddd' 'd9f9f06b46b4187648e860afa0552335aafe3ce4' 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' @@ -40,9 +40,10 @@ sha1sums=('6fd368c4f6c31752011a716cccd951601157a493' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' - 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' + '5f2e76985a751f635a45612565a6e1bc9547398a' + 'fe6bbe214b3a13bd084f62a8ee9631fd8326c464' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -74,8 +75,9 @@ package() { install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables - mkdir -p "${pkgdir}"/var/lib/iptables + mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables} install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/ip6tables # install systemd files install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service index 9a695f31e..60d76becf 100644 --- a/core/iptables/ip6tables.service +++ b/core/iptables/ip6tables.service @@ -4,6 +4,7 @@ Description=IPv6 Packet Filtering Framework [Service] Type=oneshot ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecReload=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules ExecStop=/usr/lib/systemd/scripts/iptables-flush 6 RemainAfterExit=yes diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service index 3084f53b7..eb1a967f3 100644 --- a/core/iptables/iptables.service +++ b/core/iptables/iptables.service @@ -4,6 +4,7 @@ Description=Packet Filtering Framework [Service] Type=oneshot ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules +ExecReload=/usr/sbin/iptables-restore /etc/iptables/iptables.rules ExecStop=/usr/lib/systemd/scripts/iptables-flush RemainAfterExit=yes diff --git a/core/iptables/simple_firewall.rules b/core/iptables/simple_firewall.rules index e1604cc36..63426b083 100644 --- a/core/iptables/simple_firewall.rules +++ b/core/iptables/simple_firewall.rules @@ -3,7 +3,7 @@ :FORWARD DROP [0:0] :OUTPUT ACCEPT [0:0] -A INPUT -p icmp -j ACCEPT --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT +-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -A INPUT -i lo -j ACCEPT -A INPUT -p tcp -j REJECT --reject-with tcp-reset -A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable diff --git a/core/isdn4k-utils/PKGBUILD b/core/isdn4k-utils/PKGBUILD new file mode 100644 index 000000000..a51dacfcf --- /dev/null +++ b/core/isdn4k-utils/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 162997 2012-07-05 06:49:53Z tpowa $ +# Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org>, dorphell <dorphell@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=isdn4k-utils +pkgver=3.25_20120630 +pkgrel=1 +pkgdesc="User space administration programs and tools for ISDN" +arch=('i686' 'x86_64') +url="http://www.isdn4linux.de/" +license=('GPL') +depends=('ncurses' 'sh') +backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options}) +options=('!makeflags' '!libtool') +source=(ftp://ftp.archlinux.org/other/isdn4k-utils/${pkgname}-${pkgver}.tar.gz + config) +replaces=('capi4k-utils') + +build() { + cd $srcdir/$pkgname-$pkgver + cp $srcdir/config ./.config + cd capifax + aclocal + automake --add-missing + autoreconf + cd $srcdir/$pkgname-$pkgver + make subconfig + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -dm755 $pkgdir/usr/sbin + make DESTDIR=$pkgdir install + chmod 755 $pkgdir/usr/sbin/* +} +md5sums=('02167f8bd8629f8ef7c12ece3b8722ac' + 'be387b5e03b744452dea7571600f83aa') diff --git a/core/isdn4k-utils/config b/core/isdn4k-utils/config new file mode 100644 index 000000000..d5e93c657 --- /dev/null +++ b/core/isdn4k-utils/config @@ -0,0 +1,102 @@ +# +# Automatically generated by make menuconfig: don't edit +# + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y + +# +# General configuration +# +# CONFIG_BUILDX11 is not set +CONFIG_KERNELDIR='/usr/src/linux' +CONFIG_BINDIR='/usr/bin' +CONFIG_SBINDIR='/usr/sbin' +CONFIG_LIBDIR='/usr/lib' +CONFIG_MANDIR='/usr/share/man' +CONFIG_RUNDIR='/var/run' +CONFIG_LOCKDIR='/var/lock' +CONFIG_LOCKFILE='LCK..' +CONFIG_I4LCONFDIR='/etc/isdn' +CONFIG_CONFFILE='isdn.conf' +CONFIG_CALLERIDFILE='callerid.conf' +CONFIG_USERCONFFILE='~/.isdn' +CONFIG_COUNTRYCODE='49' +CONFIG_AREACODE='' +CONFIG_COUNTRY_PREFIX='+' +CONFIG_AREA_PREFIX='0' +CONFIG_DATADIR='/usr/lib/isdn' +CONFIG_LIB_AREACODE=y + + +# +# Runtime configuration tools +# +CONFIG_ISDNCTRL=y +CONFIG_ISDNCTRL_CONF=y +CONFIG_ISDNCTRL_TIMRU=y +CONFIG_IPROFD=y + +# +# Card configuration tools +# +# CONFIG_TELESCTRL is not set +CONFIG_HISAXCTRL=y +CONFIG_ICNCTRL=y +# CONFIG_ICNCTRL_DEBUG is not set +CONFIG_PCBITCTL=y +CONFIG_AVMCAPICTRL=y +# CONFIG_LOOPCTRL is not set +# CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop' +# CONFIG_LOOPCTRL_DEBUG is not set + + +# +# Tools for monitoring activity +# +CONFIG_IMON=y +CONFIG_IMONTTY=y +CONFIG_ISDNLOG=y + +# +# Options for isdnlog package +# +CONFIG_ISDNLOG_SERV_PORT=20011 +CONFIG_ISDNLOG_USERFILE='isdnlog.users' +CONFIG_ISDNLOG_CHARGEFILE='charge.dat' +CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' +CONFIG_ISDNLOG_RELOADCMD='reload' +CONFIG_ISDNLOG_STOPCMD='stop' +CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' +CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' +CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' +# CONFIG_ISDNLOG_POSTGRES is not set +# CONFIG_ISDNLOG_MYSQLDB is not set +CONFIG_ISDN_LOG_DE=y +CONFIG_IPPPSTATS=y +# CONFIG_XISDNLOAD is not set +# CONFIG_XMONISDN is not set + +# +# Applications +# +# CONFIG_VBOX is not set +CONFIG_IPPPD=y + +# +# Options for ipppd +# +CONFIG_IPPPD_MSCHAP=y +# CONFIG_IPPPD_RADIUS is not set +# CONFIG_RADIUS_WTMP_LOGGING is not set +RADIUS_CLIENT_CONFIG_FILE='' +CONFIG_CAPIFAX=y +CONFIG_RCAPID=y + +# +# Documentation +# +CONFIG_GENMAN=y +# CONFIG_FAQ is not set diff --git a/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch b/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch new file mode 100644 index 000000000..63239fcad --- /dev/null +++ b/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch @@ -0,0 +1,2028 @@ +diff -Naur isdn4k-utils-orig//eicon/eiconctrl.c isdn4k-utils/eicon/eiconctrl.c +--- isdn4k-utils-orig//eicon/eiconctrl.c 2001-06-22 02:34:45.000000000 +1000 ++++ isdn4k-utils/eicon/eiconctrl.c 2010-12-04 20:44:11.093338893 +1000 +@@ -1970,7 +1970,7 @@ + val = strtol(p, &q, 16); + p = q; + val = strtol(p, &q, 16); +- (unsigned short) *buffer = (unsigned short) val; ++ *buffer = (unsigned short) val; + pos = 2; + while ((p != q) && (*q != 0)) { + p = q; +diff -Naur isdn4k-utils-orig//hisax/hisaxctrl.c isdn4k-utils/hisax/hisaxctrl.c +--- isdn4k-utils-orig//hisax/hisaxctrl.c 2000-06-30 19:37:38.000000000 +1000 ++++ isdn4k-utils/hisax/hisaxctrl.c 2010-12-04 20:44:11.093338893 +1000 +@@ -43,7 +43,8 @@ + fprintf(stderr, "cannot open file %s\n", fname); + exit(-1); + } +- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4); ++ buffer = (unsigned char *) malloc(MAX_SIZE+4); ++ p = (int *) buffer; + if (!buffer) { + fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4); + exit(-1); +diff -Naur isdn4k-utils-orig//hisax/Makefile.in isdn4k-utils/hisax/Makefile.in +--- isdn4k-utils-orig//hisax/Makefile.in 2002-07-20 05:03:51.000000000 +1000 ++++ isdn4k-utils/hisax/Makefile.in 2010-12-04 20:44:03.726672225 +1000 +@@ -30,7 +30,7 @@ + #.SUFFIXES: + #.SUFFIXES: .c .o + +-%.8: %.man ++%.8: %.man.in + cp $< $@ + + all: $(PROGRAMS) $(MANPAGES) +diff -Naur isdn4k-utils-orig//ipppd/main.c isdn4k-utils/ipppd/main.c +--- isdn4k-utils-orig//ipppd/main.c 2002-07-18 10:06:21.000000000 +1000 ++++ isdn4k-utils/ipppd/main.c 2010-12-04 20:44:11.093338893 +1000 +@@ -1041,9 +1041,14 @@ + static char line[256]; /* line to be logged accumulated here */ + static char *linep; + ++#ifdef __STDC__ ++static void pr_log(void *arg, char *fmt, ...); ++#else /* __STDC__ */ ++static void pr_log(arg, fmt, va_alist); ++#endif ++ + void log_packet(u_char *p,int len,char *prefix,int linkunit) + { +- static void pr_log __P((void *, char *, ...)); + + int i, n; + u_short proto; +diff -Naur isdn4k-utils-orig//ipppd/options.c isdn4k-utils/ipppd/options.c +--- isdn4k-utils-orig//ipppd/options.c 2002-07-06 10:34:08.000000000 +1000 ++++ isdn4k-utils/ipppd/options.c 2010-12-04 20:43:57.890005560 +1000 +@@ -479,26 +479,24 @@ + #define IMPLEMENTATION "" + #endif + +-static char *usage_string = "\ +-ipppd version %s patch level %d%s\n\ +-Usage: %s [ options ], where options are:\n\ +-\t<device> Communicate over the named device\n\ ++static char *usage_string = "ipppd version %s patch level %d%s\n" ++"Usage: %s [ options ], where options are:\n" ++"\t<device> Communicate over the named device\n" + #ifdef INCLUDE_OBSOLETE_FEATURES +-\tcrtscts Use hardware RTS/CTS flow control\n\ +-\t<speed> Set the baud rate to <speed>\n\ +-\tmodem Use modem control lines\n\ ++"\tcrtscts Use hardware RTS/CTS flow control\n" ++"\t<speed> Set the baud rate to <speed>\n" ++"\tmodem Use modem control lines\n" + #endif +-\t<loc>:<rem> Set the local and/or remote interface IP\n\ +-\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ +-\tasyncmap <n> Set the desired async map to hex <n>\n\ +-\tauth Require authentication from peer\n\ +-\tconnect <p> Invoke shell command <p> to set up the serial line\n\ +-\tdefaultroute Add default route through interface\n\ +-\tfile <f> Take options from file <f>\n\ +-\tmru <n> Set MRU value to <n> for negotiation\n\ +-\tnetmask <n> Set interface netmask to <n>\n\ +-See ipppd(8) for more options.\n\ +-"; ++"\t<loc>:<rem> Set the local and/or remote interface IP\n" ++"\t\t\taddresses. (you also may use the option 'useifip' to get IPs).\n" ++"\tasyncmap <n> Set the desired async map to hex <n>\n" ++"\tauth Require authentication from peer\n" ++"\tconnect <p> Invoke shell command <p> to set up the serial line\n" ++"\tdefaultroute Add default route through interface\n" ++"\tfile <f> Take options from file <f>\n" ++"\tmru <n> Set MRU value to <n> for negotiation\n" ++"\tnetmask <n> Set interface netmask to <n>\n" ++"See ipppd(8) for more options.\n"; + + static char *current_option; /* the name of the option being parsed */ + +diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h isdn4k-utils/isdnlog/isdnlog/isdnlog.h +--- isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h 2001-06-22 02:34:56.000000000 +1000 ++++ isdn4k-utils/isdnlog/isdnlog/isdnlog.h 2010-12-04 20:44:03.780005559 +1000 +@@ -460,7 +460,7 @@ + + _EXTERN void dotrace(void); + _EXTERN int morectrl(int card); +-_EXTERN void moreinfo(void); ++extern void moreinfo(void); + _EXTERN void morekbd(void); + _EXTERN void processcint(void); + _EXTERN void processflow(void); +diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/processor.c isdn4k-utils/isdnlog/isdnlog/processor.c +--- isdn4k-utils-orig//isdnlog/isdnlog/processor.c 2002-04-02 04:06:10.000000000 +1000 ++++ isdn4k-utils/isdnlog/isdnlog/processor.c 2010-12-04 20:44:03.783338893 +1000 +@@ -5293,7 +5293,7 @@ + tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */ + + if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */ +- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */ ++ /*static void moreinfo(); */ /* soviel zu Objektorientiertem Denken ;-) */ + moreinfo(); + } /* if */ + +diff -Naur isdn4k-utils-orig//isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in +--- isdn4k-utils-orig//isdnlog/Makefile.in 2002-07-20 05:03:55.000000000 +1000 ++++ isdn4k-utils/isdnlog/Makefile.in 2010-12-04 20:44:03.730005560 +1000 +@@ -1842,9 +1842,6 @@ + $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \ + echo Installing $(DESTDIR)$(DATADIR)/$$f; \ + done +- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \ +- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \ +- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE)) + + install-strip: + $(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \ +diff -Naur isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c isdn4k-utils/isdnlog/tools/cdb/cdbmake.c +--- isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c 2002-02-22 21:10:25.000000000 +1000 ++++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2010-12-04 20:44:03.786672226 +1000 +@@ -3,8 +3,6 @@ + #include "freecdbmake.h" + #include <unistd.h> + +-extern char *malloc(); +- + void diesys(why) char *why; { perror(why); exit(111); } + + void writeerror() { diesys("cdbmake: fatal: unable to write"); } +diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c isdn4k-utils/isdnlog/tools/isdnrate.c +--- isdn4k-utils-orig//isdnlog/tools/isdnrate.c 2001-06-22 02:34:56.000000000 +1000 ++++ isdn4k-utils/isdnlog/tools/isdnrate.c 2010-12-04 20:44:11.096672226 +1000 +@@ -304,7 +304,7 @@ + + static void print_header(void); + +-static char *myname, *myshortname; ++char *myname, *myshortname; + static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; + static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; + +@@ -313,7 +313,7 @@ + static int usestat = 0; + static int duration = LCR_DURATION; + static time_t start; +-static int day, month, year, hour, min, sec; ++int day, month, year, hour, min, sec; + static char ignore[MAXPROVIDER]; + static char *fromarea = 0; + static char wanted_day; +diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig isdn4k-utils/isdnlog/tools/isdnrate.c.orig +--- isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig 1970-01-01 10:00:00.000000000 +1000 ++++ isdn4k-utils/isdnlog/tools/isdnrate.c.orig 2001-06-22 02:34:56.000000000 +1000 +@@ -0,0 +1,1806 @@ ++/* $Id: isdnrate.c,v 1.38 2001/03/01 14:59:16 paul Exp $ ++ ++ * ISDN accounting for isdn4linux. (rate evaluation) ++ * ++ * Copyright 1995 .. 2000 by Andreas Kool (akool@isdn4linux.de) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * $Log: isdnrate.c,v $ ++ * Revision 1.38 2001/03/01 14:59:16 paul ++ * Various patches to fix errors when using the newest glibc, ++ * replaced use of insecure tempnam() function ++ * and to remove warnings etc. ++ * ++ * Revision 1.37 2000/07/17 16:34:23 akool ++ * isdnlog-4.32 ++ * - added new Prefixes 0160 (D1) and 0162 (D2) to "country-de.dat" ++ * - corrected all german mobil phone numbers (many thank's to ++ * Tobias Becker <i4l-projects@talypso.de> for the tool "fix_rates.pl") ++ * - isdnlog/tools/rate.c ... New R:-tag ++ * - isdnlog/tools/isdnrate.c ... print warnings from getRate if verbose ++ * - isdnlog/tools/rate-files.man ... New R:-tag ++ * - isdnlog/tools/NEWS ... New R:-tag ++ * - isdnlog/README ... New R:-tag ++ * - isdnlog/samples/rtest.dat ... example rate-file for testing R: ++ * ++ * Revision 1.36 2000/03/09 18:50:03 akool ++ * isdnlog-4.16 ++ * - isdnlog/samples/isdn.conf.no ... changed VBN ++ * - isdnlog/isdnlog/isdnlog.c .. ciInterval ++ * - isdnlog/isdnlog/processor.c .. ciInterval ++ * - isdnlog/tools/tools.h .. ciInterval, abclcr conf option ++ * - isdnlog/tools/isdnconf.c .. ciInterval, abclcr conf option ++ * - isdnlog/tools/isdnrate.c .. removed a warning ++ * - isdnlog/NEWS ... updated ++ * - isdnlog/README ... updated ++ * - isdnlog/isdnlog/isdnlog.8.in ... updated ++ * - isdnlog/isdnlog/isdnlog.5.in ... updated ++ * - isdnlog/samples/provider ... NEW ++ * ++ * ==> Please run a make clean, and be sure to read isdnlog/NEWS for changes ++ * ==> and new features. ++ * ++ * Revision 1.35 2000/03/06 07:03:21 akool ++ * isdnlog-4.15 ++ * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h ++ * ==> DO A 'make clean' PLEASE ++ * - isdnlog/tools/telnum.c ... fixed a small typo ++ * - isdnlog/isdnrep/rep_main.c ... incl. dest.h ++ * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L ++ * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here ++ * ++ * Support for Norway added. Many thanks to Tore Ferner <torfer@pvv.org> ++ * - isdnlog/rate-no.dat ... NEW ++ * - isdnlog/holiday-no.dat ... NEW ++ * - isdnlog/samples/isdn.conf.no ... NEW ++ * - isdnlog/samples/rate.conf.no ... NEW ++ * ++ * Revision 1.34 2000/02/28 19:53:56 akool ++ * isdnlog-4.14 ++ * - Patch from Roland Rosenfeld <roland@spinnaker.de> fix for isdnrep ++ * - isdnlog/tools/rate.c ... epnum ++ * - isdnlog/tools/rate-at.c ... new rates ++ * - isdnlog/rate-at.dat ++ * - isdnlog/tools/rate-files.man ... %.3f ++ * - doc/Configure.help ... unknown cc ++ * - isdnlog/configure.in ... unknown cc ++ * - isdnlog/.Config.in ... unknown cc ++ * - isdnlog/Makefile.in ... unknown cc ++ * - isdnlog/tools/dest/Makefile.in ... LANG => DEST_LANG ++ * - isdnlog/samples/rate.conf.pl ... NEW ++ * - isdnlog/samples/isdn.conf.pl ... NEW ++ * - isdnlog/rate-pl.dat ... NEW ++ * - isdnlog/tools/isdnrate.c ... fixed -P pid_dir, restarts on HUP now ++ * - isdnlog/tools/isdnrate.man ... SIGHUP documented ++ * ++ * Revision 1.33 2000/02/12 16:40:24 akool ++ * isdnlog-4.11 ++ * - isdnlog/Makefile.in ... sep install-targets, installs samples, no isdnconf ++ * - isdnlog/samples/rate.conf.{lu,nl} ... NEW ++ * - isdnlog/samples/isdn.conf.lu ... chg provider ++ * - isdnlog/samples/stop ... chg \d,\d => \d.\d ++ * - isdnlog/samples/isdnlog.isdnctrl0.options ... NEW ++ * - isdnlog/samples/isdnlog.users ... NEW ++ * - isdnlog/country-de.dat ... _DEMF again ++ * - isdnlog/isdnlog/processor.c ... LCR ++ * - isdnlog/tools/isdnrate.c ... fmt of s ++ * ++ * Old config is not installed anymore, to acomplish this do ++ * ++ * make install-old-conf ++ * make install ++ * ++ * A running isdnlog is now HUP-ed not KILL-ed ++ * ++ * Revision 1.32 2000/02/03 18:24:51 akool ++ * isdnlog-4.08 ++ * isdnlog/tools/rate.c ... LCR patch again ++ * isdnlog/tools/isdnrate.c ... LCR patch again ++ * isdnbill enhanced/fixed ++ * DTAG AktivPlus fixed ++ * ++ * Revision 1.31 1999/12/31 13:57:20 akool ++ * isdnlog-4.00 (Millenium-Edition) ++ * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) ++ * - resolved *any* warnings against rate-de.dat ++ * - Many new rates ++ * - CREDITS file added ++ * ++ * Revision 1.30 1999/12/24 14:17:05 akool ++ * isdnlog-3.81 ++ * - isdnlog/tools/NEWS ++ * - isdnlog/tools/telrate/info.html.in ... bugfix ++ * - isdnlog/tools/telrate/telrate.cgi.in ... new Service query ++ * - isdnlog/tools/telrate/Makefile.in ... moved tmp below telrate ++ * - isdnlog/samples/rate.conf.at ... fixed ++ * - isdnlog/tools/rate-at.c ... some changes ++ * - isdnlog/rate-at.dat ... ditto ++ * - isdnlog/tools/Makefile ... added path to pp_rate ++ * - isdnlog/tools/rate.{c,h} ... getServiceNames, Date-Range in T:-Tag ++ * - isdnlog/tools/isdnrate.c ... fixed sorting of services, -X52 rets service names ++ * - isdnlog/tools/rate-files.man ... Date-Range in T:-Tag, moved from doc ++ * - isdnlog/tools/isdnrate.man ... moved from doc ++ * - doc/Makefile.in ... moved man's from doc to tools ++ * - isdnlog/Makefile.in ... man's, install isdn.conf.5 ++ * - isdnlog/configure{,.in} ... sed, awk for man's ++ * - isdnlog/tools/zone/Makefile.in ... dataclean ++ * - isdnlog/tools/dest/Makefile.in ... dataclean ++ * - isdnlog/isdnlog/isdnlog.8.in ... upd ++ * - isdnlog/isdnlog/isdn.conf.5.in ... upd ++ * ++ * Revision 1.29 1999/12/17 22:51:55 akool ++ * isdnlog-3.79 ++ * - isdnlog/isdnrep/isdnrep.{c,h} ... error -handling, print_msg ++ * - isdnlog/isdnrep/rep_main.c ++ * - isdnlog/isdnrep/isdnrep.1.in ++ * - isdnlog/tools/rate.c ... dupl entry in rate.conf ++ * - isdnlog/tools/NEWS ++ * - isdnlog/tools/isdnrate.c ++ * - isdnlog/tools/dest/configure{,.in} ++ * - isdnlog/tools/zone/configure{,.in} ++ * ++ * Revision 1.28 1999/12/16 23:08:28 akool ++ * isdnlog-3.78 ++ * - isdnlog/tools/isdnrate.c ... new sOcket option ++ * - isdnlog/tools/NEWS ... new sOcket option ++ * - doc/isdnrate.man ... ditto ++ * - isdnlog/tools/telrate/config.in ... ditto ++ * - isdnlog/tools/telrate/telrate.cgi.in ... ditto ++ * - isdnlog/tools/telrate/README-telrate ditto ++ * ++ * Revision 1.27 1999/12/02 19:28:02 akool ++ * isdnlog-3.73 ++ * - isdnlog/tools/telrate/telrate.cgi.in faster ++ * - doc/isdnrate.man ... -P ++ * - isdnlog/tools/isdnrate.c ... -P ++ * - isdnlog/tools/NEWS ... -P ++ * - isdnlog/tools/rate-at.c ... 194040 ++ * - isdnlog/rate-at.dat ++ * - isdnlog/tools/rate.c ... SIGSEGV ++ * ++ * Revision 1.26 1999/12/01 21:47:25 akool ++ * isdnlog-3.72 ++ * - new rates for 01051 ++ * - next version of isdnbill ++ * ++ * - isdnlog/tools/telnum.c ... cleanup ++ * - isdnlog/tools/isdnrate.c ... -s Service ++ * - isdnlog/tools/rate.{c,h} ... -s ++ * - isdnlog/tools/NEWS ... -s ++ * - doc/isdnrate.man .. updated -o, -s ++ * - doc/rate-files.man ... updated ++ * - isdnlog/tools/dest/README.makedest ... updt. ++ * - isdnlog/isdnlog/isdnlog.8.in .. updt. ++ * ++ * Telrate ++ * - isdnlog/tools/telrate/README-telrate ++ * - isdnlog/tools/telrate/config.in NEW ++ * - isdnlog/tools/telrate/configure NEW ++ * - isdnlog/tools/telrate/Makefile.in NEW ++ * - isdnlog/tools/telrate/index.html.in was index.html ++ * - isdnlog/tools/telrate/info.html.in was info.html ++ * - isdnlog/tools/telrate/telrate.cgi.in was telrate.cgi ++ * - isdnlog/tools/telrate/leo.sample NEW sample config ++ * - isdnlog/tools/telrate/alex.sample NEW sample config ++ * ++ * Revision 1.25 1999/11/08 21:09:41 akool ++ * isdnlog-3.65 ++ * - added "B:" Tag to "rate-xx.dat" ++ * ++ * Revision 1.24 1999/11/07 13:29:28 akool ++ * isdnlog-3.64 ++ * - new "Sonderrufnummern" handling ++ * ++ * Revision 1.22 1999/10/26 18:17:14 akool ++ * isdnlog-3.62 ++ * - many new rates ++ * - next try to fix "Sonderrufnummern" ++ * ++ * isdnlog-3.58 ++ * - big cleanup ( > 1.3 Mb removed!) ++ * - v0.02 of destination support - better, but not perfect ++ * (does't work with gcc-2.7.2.3 yet - use egcs!) ++ * ++ * Revision 1.21 1999/10/25 18:30:03 akool ++ * isdnlog-3.57 ++ * WARNING: Experimental version! ++ * Please use isdnlog-3.56 for production systems! ++ * ++ * Revision 1.20 1999/09/19 14:16:27 akool ++ * isdnlog-3.53 ++ * ++ * Revision 1.19 1999/09/16 20:27:21 akool ++ * isdnlog-3.52 ++ * ++ * Revision 1.18 1999/09/13 09:09:44 akool ++ * isdnlog-3.51 ++ * - changed getProvider() to not return NULL on unknown providers ++ * many thanks to Matthias Eder <mateder@netway.at> ++ * - corrected zone-processing when doing a internal -> world call ++ * ++ * Revision 1.17 1999/09/09 11:21:05 akool ++ * isdnlog-3.49 ++ * ++ * Revision 1.16 1999/08/04 23:06:52 akool ++ * Better codeall for .at ++ * ++ * Revision 1.15 1999/07/31 09:25:36 akool ++ * getRate() speedup ++ * ++ * Revision 1.14 1999/07/26 16:28:41 akool ++ * getRate() speedup from Leo ++ * ++ * Revision 1.13 1999/07/25 15:57:46 akool ++ * isdnlog-3.43 ++ * added "telnum" module ++ * ++ * Revision 1.12 1999/07/24 08:45:17 akool ++ * isdnlog-3.42 ++ * rate-de.dat 1.02-Germany [18-Jul-1999 10:44:21] ++ * better Support for Ackermann Euracom ++ * WEB-Interface for isdnrate ++ * many small fixes ++ * ++ * Revision 1.11 1999/07/15 16:42:04 akool ++ * small enhancement's and fixes ++ * ++ * Revision 1.10 1999/07/07 19:44:07 akool ++ * patches from Michael and Leo ++ * ++ * Revision 1.9 1999/07/04 20:47:05 akool ++ * rate-de.dat V:1.02-Germany [04-Jul-1999 22:56:37] ++ * ++ * Revision 1.8 1999/07/03 10:24:14 akool ++ * fixed Makefile ++ * ++ * Revision 1.7 1999/07/02 19:18:00 akool ++ * rate-de.dat V:1.02-Germany [02-Jul-1999 21:27:20] ++ * ++ * Revision 1.6 1999/07/02 18:20:50 akool ++ * rate-de.dat V:1.02-Germany [02-Jul-1999 20:29:21] ++ * country-de.dat V:1.02-Germany [02-Jul-1999 19:13:54] ++ * ++ * Revision 1.5 1999/07/01 20:40:07 akool ++ * isdnrate optimized ++ * ++ * Revision 1.4 1999/06/30 20:53:28 akool ++ * added "-t" option to "isdnrate" ++ * ++ * Revision 1.3 1999/06/30 17:17:37 akool ++ * isdnlog Version 3.39 ++ * ++ * Revision 1.2 1999/06/29 20:11:25 akool ++ * now compiles with ndbm ++ * (many thanks to Nima <nima_ghasseminejad@public.uni-hamburg.de>) ++ * ++ * Revision 1.1 1999/06/28 19:16:33 akool ++ * isdnlog Version 3.38 ++ * - new utility "isdnrate" started ++ * ++ */ ++ ++#include "isdnlog.h" ++#include "tools/zone.h" ++#include <unistd.h> ++#include "dest.h" ++ ++#define WIDTH 19 ++#define _MAXLAST 20 /* the real max */ ++#define MAXLAST ((best>=_MAXLAST||best<=2)?5:best) ++ ++ ++static void print_header(void); ++ ++static char *myname, *myshortname; ++static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; ++static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; ++ ++static int header = 0, best = MAXPROVIDER, table = 0, explain = 0; ++int verbose = 0; ++static int usestat = 0; ++static int duration = LCR_DURATION; ++static time_t start; ++static int day, month, year, hour, min, sec; ++static char ignore[MAXPROVIDER]; ++static char *fromarea = 0; ++static char wanted_day; ++static int list = 0; ++static char *comment; ++static char **providers = 0; /* incl these */ ++static int n_providers = 0; ++static int business = 0; ++static char **xproviders = 0; /* excl these */ ++static int nx_providers = 0; ++static int xbusiness = 0; ++static int all = 0; ++static int booked = 0; ++static int service = 0; ++ ++#define SOCKNAME "/tmp/isdnrate" ++static int is_daemon = 0; ++static int is_client = 0; ++static int we_are_daemon = 0; ++static int takt = 99999; ++static char sortby; ++static int need_dest; ++static int h_param = 0; ++static int lcr = 0; ++static TELNUM srcnum, destnum; ++static char *pid_dir = 0; ++static char *pid_file = 0; ++static char *socket_file = 0; ++static char **hup_argv; /* args to restart with */ ++ ++typedef struct { ++ int prefix; ++ double rate; ++ char *name; ++ char *explain; ++} SORT; ++ ++typedef struct { ++ int weight; ++ int index; ++} SORT2; ++ ++static SORT sort[MAXPROVIDER]; ++ ++#undef MAXPROVIDER ++#define MAXPROVIDER getNProvider() ++ ++#undef BUFSIZ /* sorry but 8192 is too much for me */ ++#define BUFSIZ 256 ++ ++int print_msg(int Level, const char *fmt,...) ++{ ++ auto va_list ap; ++ auto char String[BUFSIZ * 3]; ++ ++ if ((Level > PRT_ERR && !verbose) || (Level > PRT_WARN && verbose < 2)) ++ return (1); ++ ++ va_start(ap, fmt); ++ (void) vsnprintf(String, BUFSIZ * 3, fmt, ap); ++ va_end(ap); ++ ++ fprintf(stderr, "%s", String); ++ ++ return (0); ++} /* print_msg */ ++ ++ ++static void init() ++{ ++ auto char *version, **message; ++ ++ if (readconfig(myshortname) < 0) ++ exit(1); ++ ++ if (verbose) ++ message = &version; ++ else ++ message = NULL; ++ ++ initHoliday(holifile, message); ++ ++ if (verbose && *version) ++ print_msg(PRT_V, "%s\n", version); ++ initDest(destfile, message); ++ if (verbose && *version) ++ print_msg(PRT_V, "%s\n", version); ++ ++ initRate(rateconf, ratefile, zonefile, message); ++ ++ if (verbose && *version) ++ print_msg(PRT_V, "%s\n", version); ++ ++} /* init */ ++ ++#if 0 ++static void deinit(void) ++{ ++ exitRate(); ++ exitDest(); ++ exitHoliday(); ++} ++#endif ++ ++/* calc a day/time W | E | H */ ++static void get_day(char d) ++{ ++ struct tm *tm; ++ bitfield mask; ++ int what = 0; ++ ++ tm = localtime(&start); /* now */ ++ switch (d) { ++ case 'W': /* we need a normal weekday, so we take ++ today and inc. day if today is ++ holiday */ ++ what = WORKDAY; ++ if (!h_param) ++ hour = 10; ++ break; ++ case 'N': ++ what = WORKDAY; ++ if (!h_param) ++ hour = 23; ++ break; ++ case 'E': ++ what = SUNDAY; ++ if (!h_param) ++ hour = 10; ++ break; ++ } ++ mask = 1 << what; ++ while (isDay(tm, mask, 0) != what) { ++ tm->tm_mday++; ++ } ++ min = sec = 0; ++ day = tm->tm_mday; ++ month = tm->tm_mon + 1; ++ year = tm->tm_year + 1900; ++} ++ ++static void post_init() ++{ ++ ++ clearNum(&srcnum); ++ if (fromarea) { ++ Strncpy(srcnum.area, fromarea, TN_MAX_AREA_LEN); ++ free(fromarea); ++ fromarea = 0; ++ } ++ initNum(&srcnum); ++ ++ if (wanted_day) ++ get_day(wanted_day); ++} /* post_init */ ++ ++static int opts(int argc, char *argv[]) ++{ ++ register int c; ++ register char *p; ++ int x; ++ ++ h_param = 0; ++ ++ optind = 0; /* make it repeatable */ ++ need_dest = 1; ++ while ((c = getopt(argc, argv, options)) != EOF) { ++ switch (c) { ++ case 'a': /* all rates old/newer */ ++ all++; ++ break; ++ case 'b': ++ best = strtol(optarg, NIL, 0); ++ break; ++ ++/* case 'c': country */ ++ break; ++ ++ case 'd': ++ for (p = optarg; *p && isspace(*p); p++) ; ++ if (isdigit(*p)) { ++ wanted_day = '\0'; ++ day = atoi(optarg); ++ if ((p = strchr(optarg, '.'))) { ++ month = atoi(p + 1); ++ if ((p = strchr(p + 1, '.'))) { ++ year = atoi(p + 1); ++ if (year < 50) ++ year += 2000; ++ else if (year < 100) ++ year += 1900; ++ } ++ } ++ } /* isdigit */ ++ else { ++ wanted_day = *p; ++ } ++ break; ++ ++ case 'f': ++ if (optarg) { /* from */ ++ for (p = optarg; (isspace(*p) || *p == '0') && *p; p++) ; ++ fromarea = strdup(p); ++ } ++ break; ++ ++ case 'h': ++ hour = atoi(optarg); ++ h_param++; ++ sec = 0; ++ if ((p = strchr(optarg + 1, ':'))) { ++ min = atoi(p + 1); ++ if ((p = strchr(p + 1, ':'))) ++ sec = atoi(p + 1); ++ } ++ else ++ min = 0; ++ break; ++ ++ case 'l': ++ duration = strtol(optarg, NIL, 0); /* l wie lt */ ++ break; ++ ++ case 'o': /* booked only */ ++ booked++; ++ break; ++ ++ case 's': /* service */ ++ service++; ++ break; ++ ++ case 't': ++ x = strtol(optarg, NIL, 0); ++ if (x > 0) ++ takt = x; ++ break; ++ ++ case 'x': /* eXclude Poviders */ ++ { ++ char *arg = strdup(optarg); ++ ++ p = strtok(arg, ","); ++ while (p) { ++ if (*p == 'B') { /* Business Provider */ ++ xbusiness = 1; ++ p = strtok(0, ","); ++ continue; ++ } ++ xproviders = realloc(xproviders, (nx_providers + 1) * sizeof(char *)); ++ ++ xproviders[nx_providers] = strdup(p); ++ p = strtok(0, ","); ++ nx_providers++; ++ } ++ free(arg); ++ } ++ break; ++ ++ case 'p': /* Providers ... */ ++ { ++ char *arg = strdup(optarg); ++ ++ p = strtok(arg, ","); ++ while (p) { ++ if (*p == 'B') { /* Business Provider */ ++ business = 1; ++ p = strtok(0, ","); ++ continue; ++ } ++ providers = realloc(providers, (n_providers + 1) * sizeof(char *)); ++ ++ providers[n_providers] = strdup(p); ++ p = strtok(0, ","); ++ n_providers++; ++ } ++ free(arg); ++ } ++ break; ++ ++ case 'v': ++ verbose++; ++ if (optarg && (x = atoi(optarg))) ++ verbose = x; ++ break; ++/* Uppercase options are for output format */ ++ ++ case 'C': ++ is_client = 1; ++ break; ++ ++ case 'D': ++ is_daemon = 1; ++ need_dest = 0; ++ if (optarg) { ++ x = atoi(optarg); ++ is_daemon = x; ++ if (we_are_daemon && x == 3) { ++ kill(getppid(), SIGTERM); ++ exit(EXIT_SUCCESS); ++ } ++ } ++ break; ++ ++ case 'G': ++ explain = atoi(optarg); ++ break; ++ case 'H': ++ header++; ++ break; ++ case 'L': ++ list++; ++ explain = 9; ++ break; ++ case 'N': ++ explain = 55; ++ break; ++ case 'P': ++ pid_dir = strdup(optarg); ++ break; ++ case 'O': ++ free(socket_file); ++ socket_file = strdup(optarg); ++ break; ++ case 'S': ++ sortby = *optarg; ++ break; ++ case 'T': ++ table++; ++ break; ++/* Fixme: check/warn illegal kombinations of options */ ++ case 'U': ++ usestat++; ++ break; ++ ++ case 'V': ++ print_version(myshortname); ++ exit(0); ++ ++ case 'X': ++ if (explain == 0) { ++ explain++; ++ if (optarg && isdigit(*optarg) && (x = atoi(optarg))) { ++ explain = x; ++ if (x == 50 || x == 51 || x == 52) ++ need_dest = 0; ++ } ++ else if (optarg) { ++ comment = strdup(optarg); ++ explain = 8; ++ need_dest = 0; ++ } ++ break; ++ } ++ /* fallthrough */ ++ case '?': ++ print_msg(PRT_A, usage, myshortname, myshortname, options); ++ break; ++ ++ case 'Z': ++ lcr++; ++ break; ++ } /* switch */ ++ } /* while */ ++ if (is_client && is_daemon != 3 && is_daemon) { ++ is_daemon = 0; ++ print_msg(PRT_V, "Conflicting options, -D disabled\n"); ++ } ++ if (list && table) { ++ table = 0; ++ print_msg(PRT_V, "Conflicting options, -T disabled\n"); ++ } ++ if (usestat && !table) ++ print_msg(PRT_V, "Conflicting options, -U ignored\n"); ++ if ((list || table) && explain >= 10) { ++ list = table = 0; ++ print_msg(PRT_V, "Conflicting options, -T, -L disabled\n"); ++ } ++ if (best < 1) { ++ best = MAXPROVIDER; ++ print_msg(PRT_V, "Illegal options, -b ignored\n"); ++ } ++ if ((explain == 50 || explain == 51 || explain == 52) && header) { ++ print_msg(PRT_V, "Conflicting options, -H ignored\n"); ++ } ++ if (explain >= 10 && service) { ++ print_msg(PRT_V, "Conflicting options, -s ignored\n"); ++ service = 0; ++ } ++ if (argc > optind) ++ return (optind); ++ else ++ return (0); ++} /* opts */ ++ ++ ++static int (*compare_func) (const void *s1, const void *s2); ++static int compare(const void *s1, const void *s2) ++{ ++ return (((SORT *) s1)->rate > ((SORT *) s2)->rate); ++} /* compare */ ++static int compare_vbn(const void *s1, const void *s2) ++{ ++ return (((SORT *) s1)->prefix > ((SORT *) s2)->prefix); ++} ++static int compare_name(const void *s1, const void *s2) ++{ ++ return strcasecmp(((SORT *) s1)->name, ((SORT *) s2)->name); ++} ++ ++static int compare2(const void *s1, const void *s2) ++{ ++ return (((SORT2 *) s1)->weight < ((SORT2 *) s2)->weight); ++} /* compare2 */ ++ ++char *short_explainRate(RATE * Rate) ++{ ++ ++ static char buffer[BUFSIZ]; ++ char *p = buffer; ++ ++ if (service && Rate->dst[1] && *Rate->dst[1]) ++ p += sprintf(p, "%s, ", Rate->dst[1]); ++ ++ if (Rate->Zone && *Rate->Zone) ++ p += sprintf(p, "%s", Rate->Zone); ++ else ++ p += sprintf(p, "Zone %d", Rate->zone); ++ ++ if (!Rate->domestic && Rate->Country && *Rate->Country) ++ p += sprintf(p, " (%s)", Rate->Country); ++ ++ if (Rate->Day && *Rate->Day) ++ p += sprintf(p, ", %s", Rate->Day); ++ ++ if (Rate->Hour && *Rate->Hour) ++ p += sprintf(p, ", %s", Rate->Hour); ++ ++ return buffer; ++} ++ ++static char *printrate(RATE * Rate) ++{ ++ static char message[BUFSIZ]; ++ ++ if (Rate->Basic > 0) ++ sprintf(message, "%s + %s/%.1fs = %s + %s/Min (%s)", ++ printRate(Rate->Basic), ++ printRate(Rate->Price), ++ Rate->Duration, ++ printRate(Rate->Basic), ++ printRate(60 * Rate->Price / Rate->Duration), ++ short_explainRate(Rate)); ++ else ++ sprintf(message, "%s/%.1fs = %s/Min (%s)", ++ printRate(Rate->Price), ++ Rate->Duration, ++ printRate(60 * Rate->Price / Rate->Duration), ++ short_explainRate(Rate)); ++ ++ return (message); ++} /* printrate */ ++ ++ ++static void buildtime() ++{ ++ auto struct tm tm; ++ ++ tm.tm_sec = sec; ++ tm.tm_min = min; ++ tm.tm_hour = hour; ++ tm.tm_mday = day; ++ tm.tm_mon = month - 1; ++ tm.tm_year = year - 1900; /* ja, ja, ich wei ;-) */ ++ tm.tm_isdst = -1; ++ ++ start = mktime(&tm); ++} /* buildtime */ ++ ++ ++static void splittime() ++{ ++ auto struct tm *tm; ++ ++ tm = localtime(&start); ++ sec = tm->tm_sec; ++ min = tm->tm_min; ++ hour = tm->tm_hour; ++ day = tm->tm_mday; ++ month = tm->tm_mon + 1; ++ year = tm->tm_year + 1900; ++} /* splittime */ ++ ++static char *Provider(int prefix) ++{ ++ register char *p, *p1; ++ register int l; ++ static char s[BUFSIZ]; ++ char prov[TN_MAX_PROVIDER_LEN]; ++ ++ if (prefix == UNKNOWN) ++ return ("?"); ++ ++ p = getProvider(prefix); ++ ++ l = max(WIDTH, strlen(p)) - strlen(p); ++ ++ p1 = prefix2provider_variant(prefix, prov); ++ ++ l += (8 - strlen(p1)); ++ ++ sprintf(s, "%s:%s%*s", p1, p, l, ""); ++ ++ return (s); ++} /* Provider */ ++ ++static char *takt_str(RATE * Rate) ++{ ++ static char s[BUFSIZ]; ++ ++ if (floor(Rate->Rhythm[0]) == Rate->Rhythm[0]) ++ sprintf(s, "%.0f/", Rate->Rhythm[0]); ++ else ++ sprintf(s, "%.3f/", Rate->Rhythm[0]); ++ if (floor(Rate->Rhythm[1]) == Rate->Rhythm[1]) ++ sprintf(s + strlen(s), "%.0f", Rate->Rhythm[1]); ++ else ++ sprintf(s + strlen(s), "%.3f", Rate->Rhythm[1]); ++ return s; ++} ++ ++static inline char *P_EMPTY(char *s) ++{ ++ char *p = s; ++ ++ return p ? p : ""; ++} ++ ++#define DEL ';' ++static int compute(char *num) ++{ ++ register int i, n = 0; ++ register int low = 0, high = MAXPROVIDER - 1; ++ auto RATE Rate; ++ auto char s[BUFSIZ]; ++ struct tm *tm; ++ char prov[TN_MAX_PROVIDER_LEN]; ++ int first = 1; ++ static char BUSINESS[] = "Business"; /* in C:GT:Tag */ ++ ++ if (destnum.nprovider != UNKNOWN) { ++ low = high = destnum.nprovider; ++ } /* if */ ++ compare_func = compare; ++ switch (sortby) { ++ case 'v': ++ compare_func = compare_vbn; ++ break; ++ case 'n': ++ compare_func = compare_name; ++ break; ++ } ++ ++ buildtime(); ++ if (explain == 98 || explain == 97) { /* Minutenpreis fuer ++ diese Woche */ ++ tm = localtime(&start); ++ tm->tm_hour = 0; ++ tm->tm_min = 1; ++ tm->tm_sec = 0; ++ start = mktime(tm); ++ if (explain == 98) { ++ while (tm->tm_wday) { /* find last monday */ ++ start -= (60 * 60 * 24); ++ tm = localtime(&start); ++ } /* while */ ++ start += (60 * 60 * 24); ++ } ++ } ++ if (service) { ++ num = getServiceNum(num); ++ if (!num || !*num) { ++ return 0; ++ } ++ } ++ do { ++ for (i = low; i <= high; i++) { ++ int found, p; ++ char *t; ++ ++ if (ignore[i]) /* Fixme: */ ++ continue; ++ if (booked && !isProviderBooked(i)) ++ continue; ++ if (!all && !isProviderValid(i, start)) ++ continue; ++ t = getProvider(i); ++ if (!t || t[strlen(t) - 1] == '?') /* UNKNOWN Provider */ ++ continue; ++ ++ t = getComment(i, "GT"); /* get Geb. Text comment */ ++ if (business) { /* only business wanted */ ++ if (t == 0) ++ continue; ++ else if (strstr(t, BUSINESS) == 0) ++ continue; ++ } ++ if (xbusiness) { /* no business wanted */ ++ if (t && strstr(t, BUSINESS) > 0) ++ continue; ++ } ++ found = 0; ++ if (n_providers) { ++ for (p = 0; p < n_providers; p++) ++ if (pnum2prefix_variant(providers[p], start) == i) { ++ found = 1; ++ break; ++ } ++ if (!found) ++ continue; ++ } ++ if (nx_providers) { ++ for (p = 0; p < nx_providers; p++) ++ if (pnum2prefix_variant(xproviders[p], start) == i) { ++ found = 1; ++ break; ++ } ++ if (found) ++ continue; ++ } ++ clearRate(&Rate); ++ Rate.src[0] = srcnum.country; ++ Rate.src[1] = srcnum.area; ++ Rate.src[2] = ""; ++ ++ destnum.nprovider = i; ++ Strncpy(destnum.provider, getProvider(i), TN_MAX_PROVIDER_LEN); ++ if (normalizeNumber(num, &destnum, TN_ALL) == UNKNOWN) { ++ continue; ++ } ++ ++ Rate.dst[0] = destnum.country; ++ Rate.dst[1] = destnum.area; ++ Rate.dst[2] = destnum.msn; ++ /* Rate.Service = "Internet by call"; */ ++ ++ Rate.prefix = i; ++ ++ Rate.start = start; ++ Rate.now = start + duration - 1; ++ if (explain == 99) { ++ int j; ++ double oldCharge = -1.0; ++ ++ if (first && header) ++ print_header(); ++ first = 0; ++ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); ++ Rate.now = start + 1; ++ for (j = 1; j < duration; j++) { ++ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { ++ if (Rate.Charge != oldCharge || j == duration - 1) { ++ printf("%d %.4f\n", j, Rate.Charge); ++ oldCharge = Rate.Charge; ++ } ++ } ++ else ++ break; ++ Rate.now++; ++ } ++ if (Rate.Duration <= takt) ++ printf("@----- %s %s\n", currency, Rate.Provider); ++ } ++ if (explain == 98 || explain == 97) { /* Minutenpreis fuer ++ diese Woche/Tag */ ++ int j; ++ ++ if (first && header) ++ print_header(); ++ first = 0; ++ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); ++ for (j = 0; j < (explain == 98 ? 7 * 24 : 24); j++) { ++ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { ++ printf("%d %.4f\n", j, Rate.Charge); ++ } ++ else ++ break; ++ Rate.now += 3600; ++ Rate.start += 3600; ++ } ++ if (Rate.Duration <= takt) ++ printf("@----- %s %s\n", currency, Rate.Provider); ++ } ++ else if (explain == 50 || explain == 51) { ++ int fi = 1; ++ ++ while (getZoneRate(&Rate, explain - 50, fi) == 0) { ++ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; ++ ++ if (Rate.Price == 0) ++ cpm = Rate.Basic; ++ ++ fi = 0; ++ if (Rate.Price != 99.99) ++ printf("%s%c%s%c%s%c%.2f%c%.2f%c%s\n", prefix2provider(Rate.prefix, prov), DEL, ++ Rate.Provider, DEL, currency, DEL, Rate.Charge, DEL, cpm, DEL, ++ P_EMPTY(Rate.Country)); ++ free(Rate.Country); ++ } ++ } ++ else { ++ /* kludge to suppress "impossible" Rates */ ++ char **message, *msg; ++ if(verbose) ++ message = &msg; ++ else ++ message = NULL; ++ if (!getRate(&Rate, message) && (Rate.Price != 99.99)) { ++ if (!(Rate.Duration <= takt)) ++ continue; ++ sort[n].prefix = Rate.prefix; ++ sort[n].rate = Rate.Charge; ++ sort[n].name = Rate.Provider; ++ switch (explain) { ++ case 1: ++ if (service) ++ sprintf(s, " (%s, %s)", P_EMPTY(Rate.dst[1]), Rate.Zone); ++ else ++ sprintf(s, " (%s)", Rate.Zone); ++ sort[n].explain = strdup(s); ++ break; ++ case 2: ++ sprintf(s, " (%s)", printrate(&Rate)); ++ sort[n].explain = strdup(s); ++ break; ++ case 8: ++ sort[n].explain = strdup(P_EMPTY(getComment(i, comment))); ++ break; ++ case 9: /* used by list */ ++ { ++ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; ++ ++ if (Rate.Price == 0) ++ cpm = Rate.Basic; ++ ++ sprintf(s, "%s%c" ++ "%s%c%s%c%s%c%s%c" ++ "%s%c" ++ "%.3f%c%.4f%c%.4f%c%.2f%c%.3f%c" ++ "%s%c%.2f", ++ prefix2provider_variant(Rate.prefix, prov), DEL, ++ Rate.Provider, DEL, P_EMPTY(Rate.Zone), DEL, P_EMPTY(Rate.Day), DEL, P_EMPTY(Rate.Hour), DEL, ++ currency, DEL, /* Fixme: global or per ++ Provider?? wg. EURO */ ++ Rate.Charge, DEL, Rate.Basic, DEL, Rate.Price, DEL, Rate.Duration, DEL, cpm, DEL, ++ takt_str(&Rate), DEL, Rate.Sales); ++ sort[n].explain = strdup(s); ++ } ++ break; ++ default: ++ sort[n].explain = strdup(""); ++ break; ++ } ++ ++ n++; ++ } /* if */ ++ else if(verbose && *msg) ++ print_msg(PRT_V, "%s\n", msg); ++ ++ } /* else 99 */ ++ } /* for i */ ++ if (service) ++ num = getServiceNum(0); /* get next service num */ ++ else ++ num = 0; ++ } while (num && *num); ++ if (explain < 10) { ++ qsort((void *) sort, n, sizeof(SORT), compare_func); ++ if (lcr && n) { ++ RATE Cheap; ++ int res = getLeastCost(&Rate, &Cheap, booked, -1); ++ ++ if (res != UNKNOWN) { ++ sort[n].prefix = Cheap.prefix; ++ sort[n].rate = Cheap.Charge; ++ sort[n].name = Cheap.Provider; ++ sprintf(s, "(Cheapest: %s %s %s %s)", Cheap.dst[0], Cheap.dst[1], Cheap.dst[2], P_EMPTY(Cheap.Zone)); ++ sort[n].explain = strdup(s); ++ n++; ++ } /* res */ ++ } /* lcr */ ++ } /* explain */ ++ return (n); ++} /* compute */ ++ ++static void print_header(void) ++{ ++ printf("Eine %d Sekunden lange Verbindung von %s nach %s kostet am %s\n", ++ duration, formatNumber("%F", &srcnum), formatNumber("%F", &destnum), ++ ctime(&start)); ++} ++ ++static void printList(int n) ++{ ++ int i; ++ ++ if (header) ++ print_header(); ++ if (n > best) ++ n = best; ++ ++ for (i = 0; i < n; i++) ++ printf("%s\n", sort[i].explain); ++} ++ ++static void result(int n) ++{ ++ ++ register int i; ++ ++ if (header) ++ print_header(); ++ ++ if (n > best) ++ n = best; ++ for (i = 0; i < n; i++) ++ printf("%s %s %8.3f %s\n", ++ Provider(sort[i].prefix), currency, sort[i].rate, sort[i].explain); ++} /* result */ ++ ++ ++static void purge(int n) ++{ ++ register int i; ++ ++ for (i = 0; i < n; i++) ++ if (sort[i].explain) ++ free(sort[i].explain); ++} /* purge */ ++ ++/* ++ Werktag ++ Wochenende ++ Ortszone ++ Regionalzone ++ Fernzone ++ Handy ++ Internet ++ 0..23 Uhr ++ */ ++ ++#define STARTHOUR 8 ++ ++static void printTable(char *num) ++{ ++ register int n, d, i, h, lasthour; ++ auto struct tm *tm; ++ auto SORT last[_MAXLAST]; ++ auto int used[MAXPROVIDER]; ++ auto int hours[MAXPROVIDER]; ++ auto int weight[MAXPROVIDER]; ++ auto int useds = 0, maxhour; ++ auto SORT2 wsort[MAXPROVIDER]; ++ static int firsttime = 1; ++ int first; ++ int prefix; ++ ++ memset(used, 0, sizeof(used)); ++ memset(hours, 0, sizeof(hours)); ++ memset(weight, 0, sizeof(weight)); ++ ++ for (d = 0; d < 3; d++) { /* Werktag, Samstag, Sonntag */ ++ last[0].prefix = UNKNOWN; ++ lasthour = UNKNOWN; ++ ++ buildtime(); ++ tm = localtime(&start); ++ ++ if (!d) { /* first time */ ++ while (tm->tm_wday != 5) { /* find next Friday */ ++ start += (60 * 60 * 24); ++ tm = localtime(&start); ++ } /* while */ ++ } ++ else /* erst Samstag, dann */ ++ start += (60 * 60 * 24); /* Sonntag */ ++ ++ splittime(); ++ buildtime(); ++ ++ hour = STARTHOUR; ++ min = 0; ++ ++ first = 1; ++ ++ while (1) { ++ destnum.nprovider = UNKNOWN; ++ if (provider2prefix(num, &prefix)) /* set provider if it is in number */ ++ normalizeNumber(num, &destnum, TN_PROVIDER); ++ n = compute(num); ++ ++ if (header && first && d == 0 && firsttime) ++ print_header(); ++ ++ if (header && first) { ++ switch (d) { ++ case 0 : printf("\nWerktag:\n"); break; ++ case 1 : printf("\nSamstag:\n"); break; ++ case 2 : printf("\nSonntag:\n"); break; ++ } /* switch */ ++ ++ first = 0; ++ } /* if */ ++ ++ if (last[0].prefix == UNKNOWN) { ++ for (i = 0; i < min(n, MAXLAST); i++) { ++ if (sort[i].prefix) { ++ last[i].prefix = sort[i].prefix; ++ last[i].rate = sort[i].rate; ++ last[i].explain = strdup(sort[i].explain); ++ } /* if */ ++ } /* for */ ++ } /* if */ ++ ++ if (lasthour == UNKNOWN) ++ lasthour = hour; ++ ++ if (sort[0].prefix != last[0].prefix) { ++ for (i = 0; i < min(n, MAXLAST); i++) { ++ ++ if (!i) ++ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", ++ lasthour, hour - 1, Provider(last[i].prefix), ++ currency, ++ double2str(last[i].rate, 5, 3, DEB), ++ last[i].explain); ++ else ++ printf(" %s = %s %s%s\n", ++ Provider(last[i].prefix), ++ currency, ++ double2str(last[i].rate, 5, 3, DEB), ++ last[i].explain); ++ } /* for */ ++ ++ used[last[0].prefix]++; ++ ++ if (lasthour >= hour) ++ h = ((24 - lasthour) + hour); ++ else ++ h = hour - lasthour; ++ ++ hours[last[0].prefix] += h; ++ ++ if ((lasthour > 8) && (lasthour < 21)) ++ h *= 2; ++ ++ weight[last[0].prefix] += h * (d ? 1 : 5); ++ ++ for (i = 0; i < min(n, MAXLAST); i++) { ++ last[i].prefix = sort[i].prefix; ++ last[i].rate = sort[i].rate; ++ last[i].explain = strdup(sort[i].explain); ++ } /* for */ ++ ++ lasthour = hour; ++ } /* if */ ++ ++ purge(n); ++ ++ hour++; ++ ++ if (hour == 24) ++ hour = 0; ++ else if (hour == STARTHOUR) ++ break; ++ } /* while */ ++ ++ for (i = 0; i < min(n, MAXLAST); i++) { ++ ++ if (!i) { ++ if ((lasthour == STARTHOUR) && (hour == STARTHOUR)) ++ printf(" immer %s = %s %s%s\n", ++ Provider(last[i].prefix), ++ currency, ++ double2str(last[i].rate, 5, 3, DEB), ++ last[i].explain); ++ else ++ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", ++ lasthour, hour - 1, Provider(last[i].prefix), ++ currency, ++ double2str(last[i].rate, 5, 3, DEB), ++ last[i].explain); ++ } ++ else ++ printf(" %s = %s %s%s\n", ++ Provider(last[i].prefix), ++ currency, ++ double2str(last[i].rate, 5, 3, DEB), ++ last[i].explain); ++ } /* for */ ++ ++ used[last[0].prefix]++; ++ ++ if (lasthour >= hour) ++ h = ((24 - lasthour) + hour); ++ else ++ h = hour - lasthour; ++ ++ hours[last[0].prefix] += h; ++ ++ if ((lasthour > 8) && (lasthour < 21)) ++ h *= 2; ++ ++ weight[last[0].prefix] += h * (d ? 1 : 5); ++ ++ } /* for */ ++ ++ if (usestat) { ++ printf("\nProvider(s) used:\n"); ++ ++ maxhour = 9999999; ++ useds = 0; ++ ++ for (i = 0; i < MAXPROVIDER; i++) ++ if (used[i]) { ++ printf("%s %d times, %d hours, weight = %d\n", ++ Provider(i), used[i], hours[i], weight[i]); ++ ++ wsort[useds].weight = weight[i]; ++ wsort[useds].index = i; ++ ++ useds++; ++ ++ if (hours[i] < maxhour) ++ maxhour = hours[i]; ++ } /* if */ ++ ++ if ((best < MAXPROVIDER) && (best < useds)) { ++ printf("Retrying with only %d provider(s), eliminating %d provider(s)\n", best, useds - best); ++ ++ qsort((void *) wsort, useds, sizeof(SORT2), compare2); ++ ++ for (i = 0; i < useds; i++) { ++ printf("%s %d times, %d hours, weight = %d\n", ++ Provider(wsort[i].index), used[wsort[i].index], hours[wsort[i].index], weight[wsort[i].index]); ++ ++ if (i == best - 1) ++ printf("\n"); ++ ++ if (i >= best - 1) ++ ignore[wsort[i].index]++; ++ } /* for */ ++ ++ if (firsttime) ++ printTable(num); ++ ++ firsttime = 0; ++ ++ } /* if */ ++ } /* if */ ++} /* printTable */ ++ ++ ++static void clean_up() ++{ ++ if (providers) ++ free(providers); ++ providers = 0; ++ fromarea = 0; ++ table = list = header = explain = 0; ++ usestat = 0; ++ duration = LCR_DURATION; ++ wanted_day = '\0'; ++ takt = 99999; ++ if (comment) ++ free(comment); ++ comment = 0; ++ sortby = 0; ++ need_dest = 1; ++} ++ ++static char * sub_sp(char *p) ++{ ++ char *o = p; ++ int allupper=1; ++ for (; *p; p++) ++ if(!isupper(*p) && *p != '_' && !isdigit(*p)) { /* e.g. _DEMD1 */ ++ allupper = 0; ++ break; ++ } ++ if (!allupper) ++ for (p = o; *p; p++) ++ if(*p == '_') ++ *p = ' '; ++ return o; ++} ++static void doit(int i, int argc, char *argv[]) ++{ ++ int n; ++ int prefix; ++ char *num; ++ ++ post_init(); ++ memset(ignore, 0, sizeof(ignore)); ++ if (!need_dest && i == 0) { ++ i = 0; ++ argc = 1; ++ argv[0] = "2345"; ++ } ++ while (i < argc) { ++ num = sub_sp(argv[i]); ++ if (explain == 55) { ++ if (n_providers) { ++ destnum.nprovider = pnum2prefix_variant(providers[0], 0); ++ Strncpy(destnum.provider, getProvider(destnum.nprovider), TN_MAX_PROVIDER_LEN); ++ normalizeNumber(num, &destnum, TN_NO_PROVIDER); ++ } ++ else ++ normalizeNumber(num, &destnum, TN_ALL); ++ printf("%s => %s \n", num, formatNumber("%l - %p", &destnum)); ++ i++; ++ continue; ++ } ++ else if (explain == 52) { // enum Servce names ++ ++ int first = 1; ++ char *p; ++ ++ do { ++ p = getServiceNames(first); ++ if (p) ++ printf("%s\n", p); ++ first = 0; ++ } ++ while (p); ++ return; ++ } ++ destnum.nprovider = UNKNOWN; ++ if (provider2prefix(num, &prefix)) /* set provider if it is in ++ number */ ++ normalizeNumber(num, &destnum, TN_PROVIDER); ++ if (table) ++ printTable(num); ++ else { ++ n = compute(num); ++ if (list) ++ printList(n); ++ else if (explain < 10) ++ result(n); ++ purge(n); ++ } ++ i++; ++ } /* while */ ++ clean_up(); ++} ++ ++static void err(char *s) ++{ ++ print_msg(PRT_A, "%s - '%s'\n", s, strerror(errno)); ++ if (is_daemon == 2) ++ kill(getppid(), SIGTERM); ++ exit(2); ++} ++ ++static int handle_client(int fd) ++{ ++ char buffer[BUFSIZ]; ++ int argc, n, i; ++ char **argv; ++ char *p; ++ ++ if ((n = read(fd, buffer, BUFSIZ)) < 0) ++ err("Read"); ++ if (n) { ++ argv = calloc(sizeof(char *), 20); ++ ++ buffer[n] = '\0'; ++ if (verbose) ++ fprintf(stderr, "got '%s'\n", buffer); ++ argc = 0; ++ argv[argc++] = strdup(myname); ++ p = strtok(buffer, "\t\n "); ++ while (p) { ++ argv[argc++] = strdup(p); ++ p = strtok(0, "\t\n "); ++ if (argc >= 20) ++ break; ++ } ++ time(&start); /* set time of call */ ++ splittime(); /* date time my be overridden by opts */ ++ we_are_daemon = 1; ++ if ((i = opts(argc, argv)) || need_dest == 0) { ++ if (shutdown(fd, 0) < 0) /* no read any more */ ++ err("shutdown"); ++ if (dup2(fd, STDOUT_FILENO) < 0) /* stdout to sock */ ++ err("dup"); ++ doit(i, argc, argv); ++ fflush(stdout); ++ fclose(stdout); ++ } ++ for (i = 0; i < argc; i++) ++ free(argv[i]); ++ free(argv); ++ } ++ return n == 0 ? -1 : 0; ++} ++ ++void catch_sig(int sig) ++{ ++ print_msg(PRT_A, "Signal %d\n", sig); ++ unlink(socket_file); ++ if (pid_dir) ++ unlink(pid_file); ++ err("Sig"); ++} ++ ++static void del_sock(void) ++{ ++ if (getppid() > 0) { ++ unlink(socket_file); ++ if (pid_dir) ++ unlink(pid_file); ++ } ++} ++ ++static volatile sig_atomic_t stopped = 0; ++static volatile sig_atomic_t reinit = 0; ++ ++static void catch_term(int sig) ++{ ++ stopped = 1; ++} ++ ++static void catch_hup(int sig) ++{ ++ print_msg(PRT_A, "Signal %d restarting %s\n", sig, myname); ++ del_sock(); ++ execvp(myname, hup_argv); ++ print_msg(PRT_A, "- failed\n"); ++} ++ ++static void do_reinit(void) ++{ ++ /* deinit(), init() doesn't */ ++ reinit=0; ++} ++ ++/* thank's to Jochen Erwied for this: */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) \ ++ ++#endif ++ ++static void setup_daemon() ++{ ++ int sock; ++ struct sockaddr_un sa; ++ struct sockaddr_in client; ++ fd_set active_fd_set, read_fd_set; ++ char *sock_name = socket_file; ++ socklen_t size; ++ struct stat stat_buf; ++ int i; ++ pid_t pid; ++ char pidname[] = "isdnrate.pid"; ++ FILE *fp; ++ ++ if (verbose) ++ fprintf(stderr, "Setup sockets\n"); ++ signal(SIGTERM, catch_term); ++ signal(SIGINT, catch_sig); ++ signal(SIGHUP, catch_hup); ++ ++ if (is_daemon == 2) { /* go background */ ++ ++ fprintf(stderr, "Going background\n"); ++ verbose = 0; ++ pid = fork(); ++ if (pid < 0) ++ err("Going bg failed"); ++ else if (pid > 0) { ++ exit(EXIT_SUCCESS); ++ } ++ } ++ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) ++ err("Can't open socket"); ++ sa.sun_family = AF_UNIX; ++ strcpy(sa.sun_path, sock_name); ++ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; ++ ++ if (bind(sock, (struct sockaddr *) &sa, size) < 0) ++ err("Can't bind sock"); ++ ++ stat(sock_name, &stat_buf); ++ chmod(sock_name, stat_buf.st_mode | S_IWOTH | S_IWGRP); ++/* should better have perm wwwrun.nogroup */ ++ ++ if (listen(sock, SOMAXCONN) < 0) ++ err("Can't listen"); ++ if (pid_dir) { ++ pid_file = malloc(strlen(pid_dir) + strlen(pidname) + 2); ++ strcpy(pid_file, pid_dir); ++ if (pid_file[strlen(pid_file) - 1] != '/') ++ strcat(pid_file, "/"); ++ strcat(pid_file, pidname); ++ if ((fp = fopen(pid_file, "w")) == 0) ++ fprintf(stderr, "Can't write %s\n", pid_file); ++ else { ++ fprintf(fp, "%d\n", getpid()); ++ fclose(fp); ++ } ++ } ++ atexit(del_sock); ++ FD_ZERO(&active_fd_set); ++ FD_SET(sock, &active_fd_set); ++ while (!stopped) { ++ if (reinit) ++ do_reinit(); ++ read_fd_set = active_fd_set; ++ if (TEMP_FAILURE_RETRY(select(FD_SETSIZE, &read_fd_set, 0, 0, 0)) < 0) ++ err("select"); ++ for (i = 0; i < FD_SETSIZE; i++) ++ if (FD_ISSET(i, &read_fd_set)) { ++ if (i == sock) { /* request on orig */ ++ int new; ++ ++ size = sizeof(client); ++ if ((new = accept(sock, (struct sockaddr *) &client, &size)) < 0) ++ err("accept"); ++ if (verbose) ++ fprintf(stderr, "Accepted %d\n", new); ++ FD_SET(new, &active_fd_set); ++ } ++ else { /* already connected */ ++ pid_t pid; ++ int status; ++ ++ if (verbose) ++ fprintf(stderr, "Handle client %d\n", i); ++ pid = fork(); ++ if (pid == 0) { ++ handle_client(i); ++ _exit(EXIT_SUCCESS); ++ } ++ else if (pid < 0) ++ err("fork"); ++ else { ++ if (waitpid(pid, &status, 0) != pid) ++ err("waitpid"); ++ close(i); ++ FD_CLR(i, &active_fd_set); ++ } ++ } /* if i */ ++ } /* if ISSET */ ++ } /* while */ ++ del_sock(); ++ exit(EXIT_SUCCESS); ++} ++ ++static int connect_2_daemon(int argc, char *argv[]) ++{ ++ int sock; ++ struct sockaddr_un sa; ++ char *sock_name = socket_file; ++ size_t size; ++ int i, c, len; ++ char *p, *q, buffer[BUFSIZ]; ++ ++ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) ++ err("Can't open socket"); ++ sa.sun_family = AF_UNIX; ++ strcpy(sa.sun_path, sock_name); ++ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; ++ ++ if (connect(sock, (struct sockaddr *) &sa, size) < 0) ++ err("Can't connect sock"); ++ p = buffer; ++ optind = 0; /* reinit */ ++ len = 0; ++ while ((c = getopt(argc, argv, options)) != EOF && len < BUFSIZ - 10) { ++ switch (c) { ++ case '?': ++ case 'C': ++ break; ++ case 'D': ++ if (optarg && atoi(optarg) == 3) ; /* goon, kill a running ++ daemon */ ++ else ++ break; ++ default: ++ *p++ = '-'; ++ *p++ = c; ++ len += 3; ++ if (optarg) ++ for (q = optarg; *q && len < BUFSIZ - 10; len++) ++ *p++ = *q++; ++ *p++ = ' '; ++ break; ++ } ++ } ++ for (i = optind; i < argc; i++) { ++ for (q = argv[i]; *q && len < BUFSIZ - 10; len++) ++ *p++ = *q++; ++ *p++ = ' '; ++ len++; ++ } ++ *--p = '\x0'; ++ i = write(sock, buffer, strlen(buffer) + 1); ++ if (i < 0) ++ err("Write sock"); ++ while ((i = read(sock, buffer, BUFSIZ)) > 0) ++ write(1, buffer, i); ++ close(sock); ++ return EXIT_SUCCESS; ++} ++ ++ ++int main(int argc, char *argv[], char *envp[]) ++{ ++ register int i; ++ sigset_t unblock_set; ++ ++ myname = argv[0]; ++ myshortname = basename(myname); ++ ++ time(&start); ++ splittime(); ++ socket_file = strdup(SOCKNAME); ++ /* borrowed from isdnlog.c, thanks */ ++ hup_argv = argv; ++ sigemptyset(&unblock_set); ++ sigaddset(&unblock_set, SIGHUP); ++ sigprocmask(SIG_UNBLOCK, &unblock_set, NULL); ++ ++ if ((i = opts(argc, argv)) || need_dest == 0) { ++ if (is_client) ++ exit(connect_2_daemon(argc, argv)); ++ else ++ init(); ++ if (is_daemon) { ++ clean_up(); ++ setup_daemon(); ++ } ++ else ++ doit(i, argc, argv); ++ } ++ else { ++ print_msg(PRT_A, usage, myshortname, myshortname, options); ++ print_msg(PRT_A, "\n"); ++ print_msg(PRT_A, "\t-a \tall=show old and newer rates (default actual only)\n", MAXPROVIDER); ++ print_msg(PRT_A, "\t-b best\tshow only the first <best> provider(s) (default %d)\n", MAXPROVIDER); ++ print_msg(PRT_A, "\t-d d[.m[.y]] | {W|N|E}\tstart date of call (default now)\n"); ++ print_msg(PRT_A, "\t-f areacode\tyou are calling from <areacode>\n"); ++ print_msg(PRT_A, "\t-h h[:m[:s]]\tstart time of call (default now)\n"); ++ print_msg(PRT_A, "\t-l duration\tduration of call in seconds (default %d seconds)\n", LCR_DURATION); ++ print_msg(PRT_A, "\t-o \t show only booked providers\n"); ++ print_msg(PRT_A, "\t-p prov|B[,prov...]\t show only these providers\n"); ++ print_msg(PRT_A, "\t-s \t consider 'Destination' as a service name\n"); ++ print_msg(PRT_A, "\t-t takt\t\tshow providers if chargeduration<=takt\n"); ++ print_msg(PRT_A, "\t-v [level]\tverbose\n"); ++ print_msg(PRT_A, "\t-x prov|B[,prov...]\t exclude these providers\n"); ++ ++ print_msg(PRT_A, "\tOutput and run options\n"); ++ print_msg(PRT_A, "\t-C\trun as client, connecting to a running daemon\n"); ++ print_msg(PRT_A, "\t-CD3\tkill a running daemon\n"); ++ print_msg(PRT_A, "\t-D\trun as daemon\n"); ++ print_msg(PRT_A, "\t-D2\trun as daemon & go background\n"); ++ print_msg(PRT_A, "\t-G which\tshow raw data\n"); ++ print_msg(PRT_A, "\t-H\tshow a header\n"); ++ print_msg(PRT_A, "\t-L\tshow a detailed list\n"); ++ print_msg(PRT_A, "\t-O sOcket-path\twrite socket to this file (def:tmp/isdnrate)\n"); ++ print_msg(PRT_A, "\t-P pid-dir\twrite own PID to pid-dir/isdnrate.pid\n"); ++ print_msg(PRT_A, "\t-N\tparse the given telefon numbers\n"); ++ print_msg(PRT_A, "\t-S[v|n]\tsort by v=VBN, n=Name, default=Charge\n"); ++ print_msg(PRT_A, "\t-T\tshow a table of day/night week/weekend\n"); ++ print_msg(PRT_A, "\t-U\tshow usage stats for table\n"); ++ print_msg(PRT_A, "\t-V\tshow version info\n"); ++ print_msg(PRT_A, "\t-X\texplain each rate\n"); ++ print_msg(PRT_A, "\t-X2\texplain more\n"); ++ print_msg(PRT_A, "\t-X comment\tprint <comment> from C:tag\n"); ++ print_msg(PRT_A, "\t-Z show entry from getLeastCost\n"); ++ print_msg(PRT_A, "\n\te.g.\t%s -b5 -f30 -TH -t1 Zaire\n", myshortname); ++ } /* else */ ++/* deinit(); Fixme: this SIGSEGVs in exitHoliday */ ++ return (0); ++} /* isdnrate */ +diff -Naur isdn4k-utils-orig//isdnlog/tools/rate.c isdn4k-utils/isdnlog/tools/rate.c +--- isdn4k-utils-orig//isdnlog/tools/rate.c 2002-07-06 09:22:33.000000000 +1000 ++++ isdn4k-utils/isdnlog/tools/rate.c 2010-12-04 20:44:03.786672226 +1000 +@@ -1773,6 +1773,7 @@ + number=realloc(number, numbers*sizeof(int)); + number[numbers-1]=i; + skip: ++ ; + } + + while (isblank(*s)) s++; +@@ -2344,6 +2345,7 @@ + } + return UNKNOWN; + done: ++ ; + } + } + } +diff -Naur isdn4k-utils-orig//lib/libtools.c isdn4k-utils/lib/libtools.c +--- isdn4k-utils-orig//lib/libtools.c 1999-11-04 02:13:36.000000000 +1000 ++++ isdn4k-utils/lib/libtools.c 2010-12-04 20:44:03.786672226 +1000 +@@ -711,6 +711,7 @@ + case 'r': _mode |= R_OK; + break; + default : ++ ; + } + } + +diff -Naur isdn4k-utils-orig//Makefile isdn4k-utils/Makefile +--- isdn4k-utils-orig//Makefile 2002-07-20 05:03:49.000000000 +1000 ++++ isdn4k-utils/Makefile 2010-12-04 20:43:57.890005560 +1000 +@@ -132,12 +132,6 @@ + + install: rootperm + set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done +- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ +- then \ +- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ +- else \ +- sh scripts/makedev.sh $(DESTDIR) ; \ +- fi + + uninstall: rootperm + set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index b2d9349dd..5f7a75608 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165136 2012-08-11 13:41:56Z stephane $ +# $Id: PKGBUILD 174452 2013-01-04 16:47:52Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.10.3 -pkgrel=1 +pkgver=1.11 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -11,8 +11,8 @@ license=('custom') depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar - krb5-1.10.1-gcc47.patch +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar + krb5-config_LDFLAGS.patch krb5-kadmind krb5-kadmind.service krb5-kdc @@ -21,8 +21,8 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-si krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb' - '78b759d566b1fdefd9bbcd06df14f07f12effe96' +sha1sums=('dcdc305bd2b63cf8b8cb698cb9ea28f0a6282136' + '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' @@ -37,10 +37,9 @@ build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${pkgver}/src" - # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized - # in this function [-Werror=maybe-uninitialized] - # As this is generated code, just ignore the complaint. - patch -Np2 -i ../../krb5-1.10.1-gcc47.patch + # cf https://bugs.gentoo.org/show_bug.cgi?id=448778 + patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch + rm lib/krb5/krb/deltat.c # FS#25384 diff --git a/core/krb5/krb5-config_LDFLAGS.patch b/core/krb5/krb5-config_LDFLAGS.patch new file mode 100644 index 000000000..0b300cb44 --- /dev/null +++ b/core/krb5/krb5-config_LDFLAGS.patch @@ -0,0 +1,12 @@ +Bug #448778 +--- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 ++++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 +@@ -217,7 +217,7 @@ + -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ +- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ ++ -e 's#\$(LDFLAGS)##' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)##'` + diff --git a/core/lilo/PKGBUILD b/core/lilo/PKGBUILD new file mode 100644 index 000000000..8202e1853 --- /dev/null +++ b/core/lilo/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 134681 2011-08-07 15:40:03Z tpowa $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=lilo +pkgver=23.2 +pkgrel=3 +pkgdesc="A bootloader for Linux" +arch=('i686' 'x86_64') +url="https://alioth.debian.org/projects/lilo/" +license=('BSD') +# While lilo should stay in the base category, +# it usually makes no sense if it is installed +# with pacman -S base, therefore, don't add +# the base group here. +#groups=('base') +backup=('etc/lilo.conf') +depends=('device-mapper' 'coreutils') +makedepends=('bin86' 'sharutils') +optdepends=('perl: to use keytab-lilo') +install=lilo.install +options=('!makeflags') +source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" + 'lilo.conf') +md5sums=('51b9b9db665d3b8724919e3d46054d12' + 'ca2d8cd9b63f11444861939b42df29c1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LC_ALL=C + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/core/lilo/lilo.conf b/core/lilo/lilo.conf new file mode 100644 index 000000000..9d42a2333 --- /dev/null +++ b/core/lilo/lilo.conf @@ -0,0 +1,28 @@ +# +# /etc/lilo.conf +# + +boot=/dev/hda +# This line often fixes L40 errors on bootup +# disk=/dev/hda bios=0x80 + +default=arch +timeout=50 +lba32 +prompt + +image=/boot/vmlinuz-linux + label=arch + root=/dev/hda3 + initrd=/boot/initramfs-linux.img + read-only + +image=/boot/vmlinuz-linux + label=arch-fallback + root=/dev/hda3 + initrd=/boot/initramfs-linux-fallback.img + read-only + +#other=/dev/hda1 +# label=dos + diff --git a/core/lilo/lilo.install b/core/lilo/lilo.install new file mode 100644 index 000000000..7375fddf8 --- /dev/null +++ b/core/lilo/lilo.install @@ -0,0 +1,5 @@ +post_upgrade() { + echo + echo "If you use the LILO bootloader, you should run 'lilo' after upgrading." + echo +} diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD new file mode 100644 index 000000000..04f9e30ef --- /dev/null +++ b/core/linux-api-headers/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 173939 2012-12-28 13:11:06Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=linux-api-headers +pkgver=3.7.1 +_basever=3.7 +pkgrel=1 +pkgdesc="Kernel headers sanitized for use in userspace" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL2') +source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz + http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz) + # NOTE: signatures are not automatically verified by makepkg + #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign + #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign +md5sums=('21223369d682bcf44bcdfe1521095983' + '48f5f530b048e387e978e3e49de7742a') + +build() { + cd ${srcdir}/linux-${_basever} + [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} + + make mrproper + make headers_check +} + +package() { + cd ${srcdir}/linux-${_basever} + make INSTALL_HDR_PATH=${pkgdir}/usr headers_install + + # use headers from libdrm + rm -r ${pkgdir}/usr/include/drm + + # clean-up unnecessary files generated during install + find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete +} diff --git a/core/linux-lts/3.0.54-ptrace-i686-build.patch b/core/linux-lts/3.0.54-ptrace-i686-build.patch new file mode 100644 index 000000000..6ef275bda --- /dev/null +++ b/core/linux-lts/3.0.54-ptrace-i686-build.patch @@ -0,0 +1,41 @@ +From: H. Peter Anvin <hpa@linux.intel.com> +Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800) +Subject: x86-32: Export kernel_stack_pointer() for modules +X-Git-Tag: v3.6.9~50 +X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43 + +x86-32: Export kernel_stack_pointer() for modules + +commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream. + +Modules, in particular oprofile (and possibly other similar tools) +need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL(). + +Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com +Cc: Yang Wei <wei.yang@windriver.com> +Cc: Robert Richter <robert.richter@amd.com> +Cc: Jun Zhang <jun.zhang@intel.com> +Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + +diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c +index 947cf90..9ee1787 100644 +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -21,6 +21,7 @@ + #include <linux/signal.h> + #include <linux/perf_event.h> + #include <linux/hw_breakpoint.h> ++#include <linux/module.h> + + #include <asm/uaccess.h> + #include <asm/pgtable.h> +@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs) + + return (unsigned long)regs; + } ++EXPORT_SYMBOL_GPL(kernel_stack_pointer); + + static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) + { diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD new file mode 100644 index 000000000..78e46c067 --- /dev/null +++ b/core/linux-lts/PKGBUILD @@ -0,0 +1,317 @@ +# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgbase=linux-lts # Build stock -lts kernel +#pkgbase=linux-custom # Build kernel with a different name +_srcname=linux-3.0 +pkgver=3.0.57 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.kernel.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl') +options=('!strip') +source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + # the main kernel config files + 'config' 'config.x86_64' + # standard config files for mkinitcpio ramdisk + 'linux-lts.preset' + 'change-default-console-loglevel.patch' + 'i915-fix-ghost-tv-output.patch' + 'ext4-options.patch' + 'module-symbol-waiting-3.0.patch' + 'module-init-wait-3.0.patch') +md5sums=('ecf932280e2441bdd992423ef3d55f8f' + 'ec95efbcf6399d0c3fd64c89fd91bef8' + 'af692c789cae37d98a8927cc8f5842bf' + '5307498e3164b48ce7ed2ae70c6e80f3' + '232b52576a62c7a333e9fe7a1e1ca359' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + 'c8299cf750a84e12d60b372c8ca7e1e8' + '670931649c60fcb3ef2e0119ed532bd4' + '8a71abc4224f575008f974a099b5cf6f') + +_kernelname=${pkgbase#linux} + +build() { + cd "${srcdir}/${_srcname}" + + # add upstream patch + patch -p1 -i "${srcdir}/patch-${pkgver}" + + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + + # Some chips detect a ghost TV output + # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html + # Arch Linux bug report: FS#19234 + # + # It is unclear why this patch wasn't merged upstream, it was accepted, + # then dropped because the reasoning was unclear. However, it is clearly + # needed. + patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.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) + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + + # fix module initialisation + # https://bugs.archlinux.org/task/32122 + patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch" + patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch" + + if [ "${CARCH}" = "x86_64" ]; then + cat "${srcdir}/config.x86_64" > ./.config + else + cat "${srcdir}/config" > ./.config + fi + + if [ "${_kernelname}" != "" ]; then + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config + fi + + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + + # get kernel version + make prepare + + # load configuration + # Configure the kernel. Replace the line below with one of your choice. + #make menuconfig # CLI menu for configuration + #make nconfig # new CLI menu for configuration + #make xconfig # X-based configuration + #make oldconfig # using old config from previous kernel version + # ... or manually edit .config + + # rewrite configuration + yes "" | make config >/dev/null + + # save configuration for later reuse + if [ "${CARCH}" = "x86_64" ]; then + cat .config > "${startdir}/config.x86_64.last" + else + cat .config > "${startdir}/config.last" + fi + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build"; return 1 + #################### + + # build! + make ${MAKEFLAGS} LOCALVERSION= bzImage modules +} + +_package() { + pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers" + depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + optdepends=('crda: to set the correct wireless channels of your country') + provides=("kernel26${_kernelname}=${pkgver}") + conflicts=("kernel26${_kernelname}") + replaces=("kernel26${_kernelname}" "nouveau-drm${_kernelname}") + backup=("etc/mkinitcpio.d/${pkgbase}.preset") + install=linux-lts.install + + cd "${srcdir}/${_srcname}" + + KARCH=x86 + + # get kernel version + _kernver="$(make LOCALVERSION= kernelrelease)" + _basekernel=${_kernver%%-*} + _basekernel=${_basekernel%.*} + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + + # add vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/linux-lts.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # set correct depmod command for install + sed \ + -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ + -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ + -i "${startdir}/linux-lts.install" + sed \ + -e "1s|'linux.*'|'${pkgbase}'|" \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ + -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # remove build and source links + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} + # remove the firmware + rm -rf "${pkgdir}/lib/firmware" + # gzip -9 all modules to save 100MB of space + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building modules and running depmod from post_install/upgrade + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" +} + +_package-headers() { + pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" + provides=("kernel26${_kernelname}-headers=${pkgver}") + conflicts=("kernel26${_kernelname}-headers") + replaces=("kernel26${_kernelname}-headers") + + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build + + cd "${srcdir}/${_srcname}" + install -D -m644 Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" + install -D -m644 kernel/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" + install -D -m644 .config \ + "${pkgdir}/usr/src/linux-${_kernver}/.config" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media mtd net pcmcia scsi sound trace video xen; do + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" + done + + # copy arch includes for external modules + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" + cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + + # copy files necessary for later builds, like nvidia and vmware + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + + # fix permissions on scripts dir + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" + + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + if [ "${CARCH}" = "i686" ]; then + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + fi + + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" + + # add headers for lirc package + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" + + cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" + + for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + done + + # add docbook makefile + install -D -m644 Documentation/DocBook/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" + + # add dm headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + + # add inotify.h + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" + + # add wireless headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/9912 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" + cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + # and... + # http://bugs.archlinux.org/task/11194 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + # in reference to: + # http://bugs.archlinux.org/task/13146 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" + cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" + cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" + cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + + # add xfs and shmem for aufs building + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + + # copy in Kconfig files + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" + done + + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; + + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "${binary}")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip ${STRIP_SHARED} "${binary}";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip ${STRIP_STATIC} "${binary}";; + *application/x-executable*) # Binaries + /usr/bin/strip ${STRIP_BINARIES} "${binary}";; + esac + done + + # remove unneeded architectures + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa} +} + +pkgname=("${pkgbase}" "${pkgbase}-headers") +for _p in ${pkgname[@]}; do + eval "package_${_p}() { + _package${_p#${pkgbase}} + }" +done + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/core/linux-lts/change-default-console-loglevel.patch b/core/linux-lts/change-default-console-loglevel.patch new file mode 100644 index 000000000..63435d84f --- /dev/null +++ b/core/linux-lts/change-default-console-loglevel.patch @@ -0,0 +1,12 @@ +diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c +--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea + + /* We show everything that is MORE important than this.. */ + #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ +-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + diff --git a/core/linux-lts/config b/core/linux-lts/config new file mode 100644 index 000000000..e93b68f51 --- /dev/null +++ b/core/linux-lts/config @@ -0,0 +1,5575 @@ +# +# Automatically generated make config: don't edit +# Linux/i386 3.0.54-1 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-lts" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +# CONFIG_XEN_PRIVILEGED_GUEST is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_CMPXCHG_LOCAL=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +CONFIG_IOMMU_API=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_CLEANCACHE=y +# CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=m +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y +CONFIG_X86_APM_BOOT=y +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +CONFIG_APM_DO_ENABLE=y +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_GX_SUSPMOD=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_OLPC=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +CONFIG_PCI_IOV=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +CONFIG_OLPC=y +CONFIG_OLPC_XO1=m +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_DEBUG=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +CONFIG_OF_PROMTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_MDIO=m +CONFIG_OF_PCI=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +# CONFIG_PNPBIOS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_MISC_DEVICES=y +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=m +# CONFIG_PCH_PHUB is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ARCMSR_AER=y +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_WINBOND_VLB=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set +CONFIG_TCM_FC=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +# CONFIG_ARCNET is not set +CONFIG_MII=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRA=m +CONFIG_SMC9194=m +CONFIG_ETHOC=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_LP486E=m +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_AC3200=m +CONFIG_KSZ884X_PCI=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +CONFIG_CS89x0=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_DUAL_MAC=y +CONFIG_PCH_GBE=m +CONFIG_NETDEV_10000=y +CONFIG_MDIO=m +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_BNA=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +# CONFIG_TR is not set +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLAGN=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_IWLWIFI_DEVICE_SVTOOL=y +CONFIG_IWL_P2P=y +CONFIG_IWLWIFI_LEGACY=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set +# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWL4965=m +CONFIG_IWL3945=m +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_IWM_TRACING=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_HT=y +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLHC=m +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_NET_FC is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +CONFIG_VMXNET3=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_0=y +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_AVM_A1=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_IX1MICROR2=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_ASUSCOM=y +CONFIG_HISAX_TELEINT=y +CONFIG_HISAX_HFCS=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_SPORTSTER=y +CONFIG_HISAX_MIC=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_ISURF=y +CONFIG_HISAX_HSTSAPHIR=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_DRV_ICN=m +CONFIG_ISDN_DRV_PCBIT=m +CONFIG_ISDN_DRV_SC=m +CONFIG_ISDN_DRV_ACT2000=m +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_OLPC=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +# CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AB8500_PONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_OF_PLATFORM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_RAMOOPS=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m +CONFIG_I2C_EG20T=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_STUB is not set +CONFIG_SCx200_ACB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_BASIC_MMIO_CORE=m +CONFIG_GPIO_BASIC_MMIO=m +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_OLPC is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_GPIO is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_ABX500_CORE=y +CONFIG_AB8500_CORE=y +# CONFIG_AB8500_DEBUG is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_TIMBERDALE=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV6650=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MIROPCM20=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_ZOLTRIX=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_I810 is not set +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_PLATFORM is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT1605=m +CONFIG_SND_AZT2316=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWII_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +CONFIG_HID_ROCCAT_PYRA=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_CI13XXX_PCI is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_EG20T is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_AB8500_USB=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_CLKGATE=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_OF=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_NFC_DEVICES=y +CONFIG_PN544_NFC=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_MCE=y +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB8500=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_STAGING=y +# CONFIG_DIGIEPCA is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_COMPUTONE is not set +CONFIG_ET131X=m +# CONFIG_ET131X_DEBUG is not set +CONFIG_SLICOSS=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_DVB_CXD2099=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +# CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m +# CONFIG_FB_OLPC_DCON is not set +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8712_AP=y +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_POHMELFS=m +# CONFIG_POHMELFS_DEBUG is not set +CONFIG_POHMELFS_CRYPTO=y +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_USB_SERIAL_QUATECH_USB2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_MOUSE=m +# CONFIG_VME_BUS is not set +CONFIG_DX_SEP=m +# CONFIG_IIO is not set +CONFIG_CS5535_GPIO=m +CONFIG_XVMALLOC=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=m +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m +CONFIG_EASYCAP=m +CONFIG_EASYCAP_SND=y +# CONFIG_EASYCAP_OSS is not set +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_SOLO6X10=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_MACH_NO_WESTBRIDGE=y +CONFIG_ATH6K_LEGACY=m +CONFIG_AR600x_SD31_XXX=y +# CONFIG_AR600x_WB31_XXX is not set +# CONFIG_AR600x_SD32_XXX is not set +# CONFIG_AR600x_CUSTOM_XXX is not set +CONFIG_ATH6KL_ENABLE_COEXISTENCE=y +CONFIG_AR600x_DUAL_ANTENNA=y +# CONFIG_AR600x_SINGLE_ANTENNA is not set +# CONFIG_AR600x_BT_QCOM is not set +# CONFIG_AR600x_BT_CSR is not set +CONFIG_AR600x_BT_AR3001=y +CONFIG_ATH6KL_HCI_BRIDGE=y +CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y +CONFIG_AR600x_BT_RESET_PIN=22 +CONFIG_ATH6KL_HTC_RAW_INTERFACE=y +CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y +CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_DRM_PSB=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO1_RFKILL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_CLKSRC_I8253=y + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_SIGMA=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +# CONFIG_NFSD_DEPRECATED is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_LGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y diff --git a/core/linux-lts/config.x86_64 b/core/linux-lts/config.x86_64 new file mode 100644 index 000000000..52e7b722a --- /dev/null +++ b/core/linux-lts/config.x86_64 @@ -0,0 +1,5330 @@ +# +# Automatically generated make config: don't edit +# Linux/x86_64 3.0.54-1 Kernel Configuration +# +CONFIG_64BIT=y +# CONFIG_X86_32 is not set +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ZONE_DMA32=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +# CONFIG_KTIME_SCALAR is not set +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-lts" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=64 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=128 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +# CONFIG_XEN_DEBUG is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=7 +CONFIG_X86_CMPXCHG=y +CONFIG_CMPXCHG_LOCAL=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_IOMMU_API=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_CLEANCACHE=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=m +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y +# CONFIG_INTR_REMAP is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_IOV=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_DEBUG=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=m +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_HAVE_BPF_JIT=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_MISC_DEVICES=y +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=m +CONFIG_PCH_PHUB=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ARCMSR_AER=y +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_VMWARE_PVSCSI=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set +CONFIG_TCM_FC=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +# CONFIG_ARCNET is not set +CONFIG_MII=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_ETHOC=m +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_HP100=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_KSZ884X_PCI=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_DUAL_MAC=y +CONFIG_PCH_GBE=m +CONFIG_NETDEV_10000=y +CONFIG_MDIO=m +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_BNA=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +# CONFIG_TR is not set +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLAGN=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_IWLWIFI_DEVICE_SVTOOL=y +CONFIG_IWL_P2P=y +CONFIG_IWLWIFI_LEGACY=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set +# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWL4965=m +CONFIG_IWL3945=m +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_IWM_TRACING=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_HT=y +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLHC=m +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_NET_FC is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +CONFIG_VMXNET3=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AB8500_PONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_RAMOOPS=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m +CONFIG_I2C_EG20T=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_BASIC_MMIO_CORE=m +CONFIG_GPIO_BASIC_MMIO=m +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_LANGWELL=y +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_GPIO is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_ABX500_CORE=y +CONFIG_AB8500_CORE=y +# CONFIG_AB8500_DEBUG is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_TIMBERDALE=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV6650=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_MAXIRADIO=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_I810 is not set +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWII_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +CONFIG_HID_ROCCAT_PYRA=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_CI13XXX_PCI is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_EG20T is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_AB8500_USB=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_CLKGATE=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_NFC_DEVICES=y +CONFIG_PN544_NFC=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_MCE=y +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB8500=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=m +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_XEN_PLATFORM_PCI=m +CONFIG_SWIOTLB_XEN=y +CONFIG_STAGING=y +# CONFIG_DIGIEPCA is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_COMPUTONE is not set +CONFIG_ET131X=m +# CONFIG_ET131X_DEBUG is not set +CONFIG_SLICOSS=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_DVB_CXD2099=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +# CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8712_AP=y +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_POHMELFS=m +# CONFIG_POHMELFS_DEBUG is not set +CONFIG_POHMELFS_CRYPTO=y +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_USB_SERIAL_QUATECH_USB2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_MOUSE=m +# CONFIG_VME_BUS is not set +CONFIG_DX_SEP=m +# CONFIG_IIO is not set +CONFIG_XVMALLOC=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=m +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m +CONFIG_EASYCAP=m +CONFIG_EASYCAP_SND=y +# CONFIG_EASYCAP_OSS is not set +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_SOLO6X10=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_MACH_NO_WESTBRIDGE=y +CONFIG_ATH6K_LEGACY=m +CONFIG_AR600x_SD31_XXX=y +# CONFIG_AR600x_WB31_XXX is not set +# CONFIG_AR600x_SD32_XXX is not set +# CONFIG_AR600x_CUSTOM_XXX is not set +CONFIG_ATH6KL_ENABLE_COEXISTENCE=y +CONFIG_AR600x_DUAL_ANTENNA=y +# CONFIG_AR600x_SINGLE_ANTENNA is not set +# CONFIG_AR600x_BT_QCOM is not set +# CONFIG_AR600x_BT_CSR is not set +CONFIG_AR600x_BT_AR3001=y +CONFIG_ATH6KL_HCI_BRIDGE=y +CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y +CONFIG_AR600x_BT_RESET_PIN=22 +CONFIG_ATH6KL_HTC_RAW_INTERFACE=y +CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y +CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_DRM_PSB=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_SIGMA=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +# CONFIG_NFSD_DEPRECATED is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y diff --git a/core/linux-lts/ext4-options.patch b/core/linux-lts/ext4-options.patch new file mode 100644 index 000000000..812b05f04 --- /dev/null +++ b/core/linux-lts/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <teg@jklm.no> +Cc: Thomas Baechler <thomas@archlinux.org> +Cc: Tobias Powalowski <tobias.powalowski@googlemail.com> +Cc: Dave Reisner <d@falconindy.com> +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" "
\ No newline at end of file diff --git a/core/linux-lts/i915-fix-ghost-tv-output.patch b/core/linux-lts/i915-fix-ghost-tv-output.patch new file mode 100644 index 000000000..3b631361a --- /dev/null +++ b/core/linux-lts/i915-fix-ghost-tv-output.patch @@ -0,0 +1,26 @@ +Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); diff --git a/core/linux-lts/linux-lts.install b/core/linux-lts/linux-lts.install new file mode 100644 index 000000000..22a606b07 --- /dev/null +++ b/core/linux-lts/linux-lts.install @@ -0,0 +1,65 @@ +# arg 1: the new package version +# arg 2: the old package version + +KERNEL_NAME=-lts +KERNEL_VERSION=3.0.57-1-lts + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' + +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} + + # compat symlinks for the official kernels only + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then + loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" + [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" + if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then + # add compat symlinks for the initramfs images + ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img + ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} + fi + fi +} + +post_upgrade() { + pacman -Q grub &>/dev/null + hasgrub=$? + pacman -Q grub2-common &>/dev/null + hasgrub2=$? + pacman -Q lilo &>/dev/null + haslilo=$? + # reminder notices + if [ $haslilo -eq 0 ]; then + echo ">>>" + if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then + echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." + else + echo ">>> You appear to be using the LILO bootloader. You should run" + echo ">>> 'lilo' before rebooting." + fi + echo ">>>" + fi + + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + fi + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} +} + +post_remove() { + # also remove the compat symlinks + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img +} diff --git a/core/linux-lts/linux-lts.preset b/core/linux-lts/linux-lts.preset new file mode 100644 index 000000000..7300e9c80 --- /dev/null +++ b/core/linux-lts/linux-lts.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux-lts' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux-lts.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-lts-fallback.img" +fallback_options="-S autodetect" diff --git a/core/linux-lts/module-init-wait-3.0.patch b/core/linux-lts/module-init-wait-3.0.patch new file mode 100644 index 000000000..1bcfd2491 --- /dev/null +++ b/core/linux-lts/module-init-wait-3.0.patch @@ -0,0 +1,77 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: wait when loading a module which is currently initializing. +X-Git-Tag: v3.7-rc1~2^2~32 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 + +module: wait when loading a module which is currently initializing. + +The original module-init-tools module loader used a fnctl lock on the +.ko file to avoid attempts to simultaneously load a module. +Unfortunately, you can't get an exclusive fcntl lock on a read-only +fd, making this not work for read-only mounted filesystems. +module-init-tools has a hacky sleep-and-loop for this now. + +It's not that hard to wait in the kernel, and only return -EEXIST once +the first module has finished loading (or continue loading the module +if the first one failed to initialize for some reason). It's also +consistent with what we do for dependent modules which are still loading. + +Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 63cf6e7..74bc195 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) + return module_finalize(info->hdr, info->sechdrs, mod); + } + ++/* Is this module of this name done loading? No locks held. */ ++static bool finished_loading(const char *name) ++{ ++ struct module *mod; ++ bool ret; ++ ++ mutex_lock(&module_mutex); ++ mod = find_module(name); ++ ret = !mod || mod->state != MODULE_STATE_COMING; ++ mutex_unlock(&module_mutex); ++ ++ return ret; ++} ++ + /* Allocate and load the module: note that size of section 0 is always + zero, and we rely on this for optional sections. */ + static struct module *load_module(void __user *umod, +@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, + const char __user *uargs) + { + struct load_info info = { NULL, }; +- struct module *mod; ++ struct module *mod, *old; + long err; + + pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", +@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, + * function to insert in a way safe to concurrent readers. + * The mutex protects against concurrent writers. + */ ++again: + mutex_lock(&module_mutex); +- if (find_module(mod->name)) { ++ if ((old = find_module(mod->name)) != NULL) { ++ if (old->state == MODULE_STATE_COMING) { ++ /* Wait in case it fails to load. */ ++ mutex_unlock(&module_mutex); ++ err = wait_event_interruptible(module_wq, ++ finished_loading(mod->name)); ++ if (err) ++ goto free_arch_cleanup; ++ goto again; ++ } + err = -EEXIST; + goto unlock; + } diff --git a/core/linux-lts/module-symbol-waiting-3.0.patch b/core/linux-lts/module-symbol-waiting-3.0.patch new file mode 100644 index 000000000..b87a38ff5 --- /dev/null +++ b/core/linux-lts/module-symbol-waiting-3.0.patch @@ -0,0 +1,66 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: fix symbol waiting when module fails before init +X-Git-Tag: v3.7-rc1~2^2~33 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 + +module: fix symbol waiting when module fails before init + +We use resolve_symbol_wait(), which blocks if the module containing +the symbol is still loading. However: + +1) The module_wq we use is only woken after calling the modules' init + function, but there are other failure paths after the module is + placed in the linked list where we need to do the same thing. + +2) wake_up() only wakes one waiter, and our waitqueue is shared by all + modules, so we need to wake them all. + +3) wake_up_all() doesn't imply a memory barrier: I feel happier calling + it after we've grabbed and dropped the module_mutex, not just after + the state assignment. + +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 7f2ee45f..63cf6e7 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, + /* Unlink carefully: kallsyms could be walking list. */ + list_del_rcu(&mod->list); + module_bug_cleanup(mod); +- ++ wake_up_all(&module_wq); + ddebug: + dynamic_debug_remove(info.debug); + unlock: +@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + free_module(mod); +- wake_up(&module_wq); ++ wake_up_all(&module_wq); + return ret; + } + if (ret > 0) { +@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + dump_stack(); + } + +- /* Now it's a first class citizen! Wake up anyone waiting for it. */ ++ /* Now it's a first class citizen! */ + mod->state = MODULE_STATE_LIVE; +- wake_up(&module_wq); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_LIVE, mod); + +@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + mod->init_ro_size = 0; + mod->init_text_size = 0; + mutex_unlock(&module_mutex); ++ wake_up_all(&module_wq); + + return 0; + } diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD new file mode 100644 index 000000000..7e06ed2c7 --- /dev/null +++ b/core/linux/PKGBUILD @@ -0,0 +1,329 @@ +# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgbase=linux # Build stock -ARCH kernel +#pkgbase=linux-custom # Build kernel with a different name +_srcname=linux-3.6 +pkgver=3.6.11 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.kernel.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl') +options=('!strip') +source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + # the main kernel config files + 'config' 'config.x86_64' + # standard config files for mkinitcpio ramdisk + 'linux.preset' + 'change-default-console-loglevel.patch' + 'module-symbol-waiting-3.6.patch' + 'module-init-wait-3.6.patch' + 'irq_cfg_pointer-3.6.6.patch' + 'fat-3.6.x.patch') +md5sums=('1a1760420eac802c541a20ab51a093d1' + 'bd4bba74093405887d521309a74c19e9' + '65f7ff39775f20f65014383564d3cb65' + '3adbfa45451c4bcf9dd7879bed033d77' + 'eb14dcfd80c00852ef81ded6e826826a' + '9d3c56a4b999c8bfbd4018089a62f662' + '670931649c60fcb3ef2e0119ed532bd4' + '8a71abc4224f575008f974a099b5cf6f' + '4909a0271af4e5f373136b382826717f' + '88d501404f172dac6fcb248978251560') + +_kernelname=${pkgbase#linux} + +build() { + cd "${srcdir}/${_srcname}" + + # add upstream patch + patch -p1 -i "${srcdir}/patch-${pkgver}" + + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + + # 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) + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + + # fix module initialisation + # https://bugs.archlinux.org/task/32122 + patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" + patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" + + # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt + patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" + + # fix cosmetic fat issue + # https://bugs.archlinux.org/task/32916 + patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + + if [ "${CARCH}" = "x86_64" ]; then + cat "${srcdir}/config.x86_64" > ./.config + else + cat "${srcdir}/config" > ./.config + fi + + if [ "${_kernelname}" != "" ]; then + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config + fi + + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + + # get kernel version + make prepare + + # load configuration + # Configure the kernel. Replace the line below with one of your choice. + #make menuconfig # CLI menu for configuration + #make nconfig # new CLI menu for configuration + #make xconfig # X-based configuration + #make oldconfig # using old config from previous kernel version + # ... or manually edit .config + + # rewrite configuration + yes "" | make config >/dev/null + + # save configuration for later reuse + if [ "${CARCH}" = "x86_64" ]; then + cat .config > "${startdir}/config.x86_64.last" + else + cat .config > "${startdir}/config.last" + fi + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build"; return 1 + #################### + + # build! + make ${MAKEFLAGS} LOCALVERSION= bzImage modules +} + +_package() { + pkgdesc="The ${pkgbase} kernel and modules" + [ "${pkgbase}" = "linux" ] && groups=('base') + depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + optdepends=('crda: to set the correct wireless channels of your country') + provides=("kernel26${_kernelname}=${pkgver}") + conflicts=("kernel26${_kernelname}") + replaces=("kernel26${_kernelname}") + backup=("etc/mkinitcpio.d/${pkgbase}.preset") + install=linux.install + + cd "${srcdir}/${_srcname}" + + KARCH=x86 + + # get kernel version + _kernver="$(make LOCALVERSION= kernelrelease)" + _basekernel=${_kernver%%-*} + _basekernel=${_basekernel%.*} + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + + # add vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # set correct depmod command for install + sed \ + -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ + -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ + -i "${startdir}/linux.install" + sed \ + -e "1s|'linux.*'|'${pkgbase}'|" \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ + -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # remove build and source links + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} + # remove the firmware + rm -rf "${pkgdir}/lib/firmware" + # gzip -9 all modules to save 100MB of space + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building modules and running depmod from post_install/upgrade + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" +} + +_package-headers() { + pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" + provides=("kernel26${_kernelname}-headers=${pkgver}") + conflicts=("kernel26${_kernelname}-headers") + replaces=("kernel26${_kernelname}-headers") + + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build + + cd "${srcdir}/${_srcname}" + install -D -m644 Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" + install -D -m644 kernel/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" + install -D -m644 .config \ + "${pkgdir}/usr/src/linux-${_kernver}/.config" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media mtd net pcmcia scsi sound trace video xen; do + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" + done + + # copy arch includes for external modules + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" + cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + + # copy files necessary for later builds, like nvidia and vmware + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + + # fix permissions on scripts dir + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" + + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + if [ "${CARCH}" = "i686" ]; then + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + fi + + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" + + # add headers for lirc package + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" + + cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" + + for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + done + + # add docbook makefile + install -D -m644 Documentation/DocBook/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" + + # add dm headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + + # add inotify.h + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" + + # add wireless headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/9912 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" + cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + # and... + # http://bugs.archlinux.org/task/11194 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + # in reference to: + # http://bugs.archlinux.org/task/13146 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" + cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" + cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" + cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + + # add xfs and shmem for aufs building + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + + # copy in Kconfig files + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" + done + + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; + + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "${binary}")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip ${STRIP_SHARED} "${binary}";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip ${STRIP_STATIC} "${binary}";; + *application/x-executable*) # Binaries + /usr/bin/strip ${STRIP_BINARIES} "${binary}";; + esac + done + + # remove unneeded architectures + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} +} + +_package-docs() { + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + provides=("kernel26${_kernelname}-docs=${pkgver}") + conflicts=("kernel26${_kernelname}-docs") + replaces=("kernel26${_kernelname}-docs") + + cd "${srcdir}/${_srcname}" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" + cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}" -type f -exec chmod 444 {} \; + find "${pkgdir}" -type d -exec chmod 755 {} \; + + # remove a file already in linux package + rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" +} + +pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") +for _p in ${pkgname[@]}; do + eval "package_${_p}() { + _package${_p#${pkgbase}} + }" +done + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/core/linux/change-default-console-loglevel.patch b/core/linux/change-default-console-loglevel.patch new file mode 100644 index 000000000..63435d84f --- /dev/null +++ b/core/linux/change-default-console-loglevel.patch @@ -0,0 +1,12 @@ +diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c +--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea + + /* We show everything that is MORE important than this.. */ + #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ +-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + diff --git a/core/linux/config b/core/linux/config new file mode 100644 index 000000000..2bd1ccb07 --- /dev/null +++ b/core/linux/config @@ -0,0 +1,6031 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/i386 3.6.3 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-ARCH" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_UNINLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +# CONFIG_XEN_PRIVILEGED_GUEST is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +# CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y +CONFIG_X86_APM_BOOT=y +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +CONFIG_APM_DO_ENABLE=y +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_GX_SUSPMOD=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_OLPC=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_SCx200 is not set +CONFIG_OLPC=y +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y +CONFIG_OLPC_XO15_SCI=y +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS is not set +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_CMA is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_OF_PROMTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_MDIO=m +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_MTD=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +# CONFIG_PNPBIOS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=y +CONFIG_BMP085_I2C=m +# CONFIG_PCH_PHUB is not set +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_WINBOND_VLB=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_LANCE=m +CONFIG_PCNET32=m +CONFIG_DEPCA=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NI65=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CIRRUS=y +CONFIG_CS89x0=m +# CONFIG_CS89x0_PLATFORM is not set +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_EWRK3=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_AT1700=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_ETH16I=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGB_PTP=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBE_PTP=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_APRICOT=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_LP486E=m +CONFIG_NI52=m +CONFIG_ZNET=m +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_EL2=m +CONFIG_AC3200=m +CONFIG_PCMCIA_AXNET=m +CONFIG_E2100=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_NE2000=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_ULTRA=m +CONFIG_WD80x3=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_PCH_PTP=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_SEEQ8005=m +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC9194=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PCI=y +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_MDIO_BUS_MUX=m +CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +# CONFIG_BRCMFMAC_SDIO_OOB is not set +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMDBG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_IWLWIFI_P2P is not set +# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_WL_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_0=y +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_AVM_A1=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_IX1MICROR2=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_ASUSCOM=y +CONFIG_HISAX_TELEINT=y +CONFIG_HISAX_HFCS=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_SPORTSTER=y +CONFIG_HISAX_MIC=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_ISURF=y +CONFIG_HISAX_HSTSAPHIR=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_DRV_ICN=m +CONFIG_ISDN_DRV_PCBIT=m +CONFIG_ISDN_DRV_SC=m +CONFIG_ISDN_DRV_ACT2000=m +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_OLPC=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +# CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_DW=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_OF_PLATFORM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_STUB is not set +CONFIG_SCx200_ACB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_ARIZONA=m +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=y +CONFIG_GPIO_AMD8111=m +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_SODAVILLE is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_AVS=y +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_MC13783_ADC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_ABX500_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_LPC_ICH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y + +# +# Media drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_S5K6AA=m + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_AS3645A=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_V4L_USB_DRIVERS=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Webcam and/or TV USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_V4L_PCI_DRIVERS=y +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +# CONFIG_V4L_RADIO_ISA_DRIVERS is not set +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# +# Supported DVB Frontends +# + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_FONT_AUTOSELECT=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT1605=m +CONFIG_SND_AZT2316=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_TEA575X=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_RENESAS_USBHS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_ISP1301=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 + +# +# USB Peripheral Controller +# +CONFIG_USB_FUSB300=m +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_NOP_USB_XCEIV=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM3556=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=y +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_AMPLC_DIO200_ISA=m +CONFIG_COMEDI_AMPLC_PC236_ISA=m +CONFIG_COMEDI_AMPLC_PC263_ISA=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS08_ISA=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=y +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_FC=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m +# CONFIG_FB_OLPC_DCON is not set +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_DX_SEP=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=y +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_EASYCAP=m +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_SOLO6X10=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_PHONE is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO1_RFKILL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_OF_IOMMU=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers (EXPERIMENTAL) +# + +# +# Rpmsg drivers (EXPERIMENTAL) +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_MEMORY=y +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +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_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_586=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_TCM_VHOST=m +CONFIG_LGUEST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CORDIC=m +CONFIG_DDR=y diff --git a/core/linux/config.x86_64 b/core/linux/config.x86_64 new file mode 100644 index 000000000..c4613ee89 --- /dev/null +++ b/core/linux/config.x86_64 @@ -0,0 +1,5802 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 3.6.3 Kernel Configuration +# +CONFIG_64BIT=y +# CONFIG_X86_32 is not set +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-ARCH" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_FANOUT=64 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_UNINLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=m +CONFIG_X86_X32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_HAVE_BPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=y +CONFIG_BMP085_I2C=m +CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGB_PTP=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBE_PTP=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_ZNET=m +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_PCH_PTP=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_SEEQ8005=m +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PCI=y +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +# CONFIG_BRCMFMAC_SDIO_OOB is not set +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMDBG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_IWLWIFI_P2P is not set +# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_WL_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_ARIZONA=m +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_LANGWELL=y +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_AVS=y +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_MC13783_ADC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_ABX500_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_LPC_ICH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y + +# +# Media drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_S5K6AA=m + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_AS3645A=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_V4L_USB_DRIVERS=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Webcam and/or TV USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_V4L_PCI_DRIVERS=y +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# +# Supported DVB Frontends +# + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_FONT_AUTOSELECT=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_TEA575X=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_RENESAS_USBHS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_ISP1301=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 + +# +# USB Peripheral Controller +# +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_NOP_USB_XCEIV=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM3556=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_MCE_LOG is not set +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=y +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_FC=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_DX_SEP=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=y +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_EASYCAP=m +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_SOLO6X10=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_PHONE is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers (EXPERIMENTAL) +# + +# +# Rpmsg drivers (EXPERIMENTAL) +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_MEMORY=y +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +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_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_TCM_VHOST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CORDIC=m +CONFIG_DDR=y diff --git a/core/linux/fat-3.6.x.patch b/core/linux/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/core/linux/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) +Subject: fs/fat: strip "cp" prefix from codepage in display +X-Git-Tag: next-20121130~1^2~97 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 + +fs/fat: strip "cp" prefix from codepage in display + +Option parsing code expects an unsigned integer for the codepage option, +but prefixes and stores this option with "cp" before passing to +load_nls(). This makes the displayed option in /proc an invalid one. +Strip the prefix when printing so that the displayed option is valid for +reuse. + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + +diff --git a/fs/fat/inode.c b/fs/fat/inode.c +index 3b733a7..3580681 100644 +--- a/fs/fat/inode.c ++++ b/fs/fat/inode.c +@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) + if (opts->allow_utime) + seq_printf(m, ",allow_utime=%04o", opts->allow_utime); + if (sbi->nls_disk) +- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); ++ /* strip "cp" prefix from displayed option */ ++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); + if (isvfat) { + if (sbi->nls_io) + seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/core/linux/irq_cfg_pointer-3.6.6.patch b/core/linux/irq_cfg_pointer-3.6.6.patch new file mode 100644 index 000000000..32583c0ac --- /dev/null +++ b/core/linux/irq_cfg_pointer-3.6.6.patch @@ -0,0 +1,16 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661 + +diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c +index c265593..1817fa9 100644 +--- a/arch/x86/kernel/apic/io_apic.c ++++ b/arch/x86/kernel/apic/io_apic.c +@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) + continue; + + cfg = irq_cfg(irq); ++ if (!cfg) ++ continue; ++ + raw_spin_lock(&desc->lock); + + /* diff --git a/core/linux/linux.install b/core/linux/linux.install new file mode 100644 index 000000000..99a4ed13d --- /dev/null +++ b/core/linux/linux.install @@ -0,0 +1,65 @@ +# arg 1: the new package version +# arg 2: the old package version + +KERNEL_NAME= +KERNEL_VERSION=3.6.11-1-ARCH + +# 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' + +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} + + # compat symlinks for the official kernels only + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then + loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" + [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" + if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then + # add compat symlinks for the initramfs images + ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img + ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} + fi + fi +} + +post_upgrade() { + pacman -Q grub &>/dev/null + hasgrub=$? + pacman -Q grub-common &>/dev/null + hasgrub2=$? + pacman -Q lilo &>/dev/null + haslilo=$? + # reminder notices + if [ $haslilo -eq 0 ]; then + echo ">>>" + if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then + echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." + else + echo ">>> You appear to be using the LILO bootloader. You should run" + echo ">>> 'lilo' before rebooting." + fi + echo ">>>" + fi + + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + fi + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} +} + +post_remove() { + # also remove the compat symlinks + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img +} diff --git a/core/linux/linux.preset b/core/linux/linux.preset new file mode 100644 index 000000000..b06292d10 --- /dev/null +++ b/core/linux/linux.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-fallback.img" +fallback_options="-S autodetect" diff --git a/core/linux/module-init-wait-3.6.patch b/core/linux/module-init-wait-3.6.patch new file mode 100644 index 000000000..1bcfd2491 --- /dev/null +++ b/core/linux/module-init-wait-3.6.patch @@ -0,0 +1,77 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: wait when loading a module which is currently initializing. +X-Git-Tag: v3.7-rc1~2^2~32 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 + +module: wait when loading a module which is currently initializing. + +The original module-init-tools module loader used a fnctl lock on the +.ko file to avoid attempts to simultaneously load a module. +Unfortunately, you can't get an exclusive fcntl lock on a read-only +fd, making this not work for read-only mounted filesystems. +module-init-tools has a hacky sleep-and-loop for this now. + +It's not that hard to wait in the kernel, and only return -EEXIST once +the first module has finished loading (or continue loading the module +if the first one failed to initialize for some reason). It's also +consistent with what we do for dependent modules which are still loading. + +Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 63cf6e7..74bc195 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) + return module_finalize(info->hdr, info->sechdrs, mod); + } + ++/* Is this module of this name done loading? No locks held. */ ++static bool finished_loading(const char *name) ++{ ++ struct module *mod; ++ bool ret; ++ ++ mutex_lock(&module_mutex); ++ mod = find_module(name); ++ ret = !mod || mod->state != MODULE_STATE_COMING; ++ mutex_unlock(&module_mutex); ++ ++ return ret; ++} ++ + /* Allocate and load the module: note that size of section 0 is always + zero, and we rely on this for optional sections. */ + static struct module *load_module(void __user *umod, +@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, + const char __user *uargs) + { + struct load_info info = { NULL, }; +- struct module *mod; ++ struct module *mod, *old; + long err; + + pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", +@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, + * function to insert in a way safe to concurrent readers. + * The mutex protects against concurrent writers. + */ ++again: + mutex_lock(&module_mutex); +- if (find_module(mod->name)) { ++ if ((old = find_module(mod->name)) != NULL) { ++ if (old->state == MODULE_STATE_COMING) { ++ /* Wait in case it fails to load. */ ++ mutex_unlock(&module_mutex); ++ err = wait_event_interruptible(module_wq, ++ finished_loading(mod->name)); ++ if (err) ++ goto free_arch_cleanup; ++ goto again; ++ } + err = -EEXIST; + goto unlock; + } diff --git a/core/linux/module-symbol-waiting-3.6.patch b/core/linux/module-symbol-waiting-3.6.patch new file mode 100644 index 000000000..b87a38ff5 --- /dev/null +++ b/core/linux/module-symbol-waiting-3.6.patch @@ -0,0 +1,66 @@ +From: Rusty Russell <rusty@rustcorp.com.au> +Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) +Subject: module: fix symbol waiting when module fails before init +X-Git-Tag: v3.7-rc1~2^2~33 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 + +module: fix symbol waiting when module fails before init + +We use resolve_symbol_wait(), which blocks if the module containing +the symbol is still loading. However: + +1) The module_wq we use is only woken after calling the modules' init + function, but there are other failure paths after the module is + placed in the linked list where we need to do the same thing. + +2) wake_up() only wakes one waiter, and our waitqueue is shared by all + modules, so we need to wake them all. + +3) wake_up_all() doesn't imply a memory barrier: I feel happier calling + it after we've grabbed and dropped the module_mutex, not just after + the state assignment. + +Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> +--- + +diff --git a/kernel/module.c b/kernel/module.c +index 7f2ee45f..63cf6e7 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, + /* Unlink carefully: kallsyms could be walking list. */ + list_del_rcu(&mod->list); + module_bug_cleanup(mod); +- ++ wake_up_all(&module_wq); + ddebug: + dynamic_debug_remove(info.debug); + unlock: +@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + free_module(mod); +- wake_up(&module_wq); ++ wake_up_all(&module_wq); + return ret; + } + if (ret > 0) { +@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + dump_stack(); + } + +- /* Now it's a first class citizen! Wake up anyone waiting for it. */ ++ /* Now it's a first class citizen! */ + mod->state = MODULE_STATE_LIVE; +- wake_up(&module_wq); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_LIVE, mod); + +@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, + mod->init_ro_size = 0; + mod->init_text_size = 0; + mutex_unlock(&module_mutex); ++ wake_up_all(&module_wq); + + return 0; + } diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 00eb1cd04..4c9ccfd5d 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165869 2012-09-02 01:16:10Z allan $ +# $Id: PKGBUILD 174749 2013-01-06 02:22:46Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=mpfr _pkgver=3.1.1 _patchlevel=p2 pkgver=${_pkgver}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64' 'mips64el') url="http://www.mpfr.org/" @@ -22,6 +22,7 @@ md5sums=('91d51c41fcf2799e4ee7a7126fc95c17' build() { cd "${srcdir}/${pkgname}-${_pkgver}" + patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch new file mode 100644 index 000000000..85622aaac --- /dev/null +++ b/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch @@ -0,0 +1,152 @@ +From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001 +From: Allan McRae <allan@archlinux.org> +Date: Sun, 8 Jul 2012 21:36:36 +1000 +Subject: [PATCH 1/4] Add conflict for replacing owned empty directory + +When two packages own an empty directory, pacman finds no conflict when +one of those packages wants to replace the directory with a file or a +symlink. When it comes to actually extracting the new file/symlink, +pacman sees the directory is still there (we do not remove empty +directories if they are owned by a package) and refuses to extract. + +Detect this potential conflict early and bail. Note that it is a +_potential_ conflict and not a guaranteed one as the other package owning +the directory could be updated or removed first which would remove +the conflict. However, pacman currently can not sort package installation +order to ensure this, so this conflict requires manual upgrade ordering. + +Signed-off-by: Allan McRae <allan@archlinux.org> +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + lib/libalpm/conflict.c | 32 ++++++++++++++++++++++++++------ + test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++ + test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++ + 3 files changed, 66 insertions(+), 6 deletions(-) + create mode 100644 test/pacman/tests/fileconflict009.py + create mode 100644 test/pacman/tests/fileconflict010.py + +diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c +index 32f6f30..efa1a87 100644 +--- a/lib/libalpm/conflict.c ++++ b/lib/libalpm/conflict.c +@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, + return NULL; + } + +-static int dir_belongsto_pkg(const char *root, const char *dirpath, ++static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, + alpm_pkg_t *pkg) + { ++ alpm_list_t *i; + struct stat sbuf; + char path[PATH_MAX]; + char abspath[PATH_MAX]; +- struct dirent *ent = NULL; + DIR *dir; ++ struct dirent *ent = NULL; ++ const char *root = handle->root; ++ ++ /* TODO: this is an overly strict check but currently pacman will not ++ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that ++ * is not simple as even if the directory is being unowned by a conflicting ++ * package, pacman does not sort this to ensure all required directory ++ * "removals" happen before installation of file/symlink */ ++ ++ /* check that no other _installed_ package owns the directory */ ++ for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { ++ if(pkg == i->data) { ++ continue; ++ } ++ ++ if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) { ++ return 0; ++ } ++ } + ++ /* check all files in directory are owned by the package */ + snprintf(abspath, PATH_MAX, "%s%s", root, dirpath); + dir = opendir(abspath); + if(dir == NULL) { +@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath, + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } +- snprintf(path, PATH_MAX, "%s/%s", dirpath, name); ++ snprintf(path, PATH_MAX, "%s%s", dirpath, name); + snprintf(abspath, PATH_MAX, "%s%s", root, path); + if(stat(abspath, &sbuf) != 0) { + continue; + } + if(S_ISDIR(sbuf.st_mode)) { +- if(dir_belongsto_pkg(root, path, pkg)) { ++ if(dir_belongsto_pkg(handle, path, pkg)) { + continue; + } else { + closedir(dir); +@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, + sprintf(dir, "%s/", filestr); + if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) { + _alpm_log(handle, ALPM_LOG_DEBUG, +- "check if all files in %s belongs to %s\n", ++ "check if all files in %s belong to %s\n", + dir, dbpkg->name); +- resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg); ++ resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg); + } + free(dir); + } +diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py +new file mode 100644 +index 0000000..904af4a +--- /dev/null ++++ b/test/pacman/tests/fileconflict009.py +@@ -0,0 +1,20 @@ ++self.description = "dir->symlink change during package upgrade (directory conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++lp2 = pmpkg("pkg2") ++lp2.files = ["dir/"] ++self.addpkg2db("local", lp2) ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir -> /usr/dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("PKG_VERSION=pkg2|1.0-1") ++self.addrule("DIR_EXIST=dir/") +diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py +new file mode 100644 +index 0000000..0a3ce83 +--- /dev/null ++++ b/test/pacman/tests/fileconflict010.py +@@ -0,0 +1,20 @@ ++self.description = "dir->file change during package upgrade (directory conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++lp2 = pmpkg("pkg2") ++lp2.files = ["dir/"] ++self.addpkg2db("local", lp2) ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("PKG_VERSION=pkg2|1.0-1") ++self.addrule("DIR_EXIST=dir/") +-- +1.7.11.1 + diff --git a/core/pacman/0002-Check-empty-subdirectory-ownership.patch b/core/pacman/0002-Check-empty-subdirectory-ownership.patch new file mode 100644 index 000000000..6cf496d16 --- /dev/null +++ b/core/pacman/0002-Check-empty-subdirectory-ownership.patch @@ -0,0 +1,61 @@ +From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001 +From: Allan McRae <allan@archlinux.org> +Date: Sun, 8 Jul 2012 23:58:37 +1000 +Subject: [PATCH 2/4] Check empty subdirectory ownership + +When checking if a package owns a directory, it is important to check +not only that all the files in the directory are part of the package, +but also if the directory is part of a package. This catches empty +subdirectories during conflict checking for directory to file/symlink +replacements. + +Signed-off-by: Allan McRae <allan@archlinux.org> +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + lib/libalpm/conflict.c | 5 +++++ + test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++ + 2 files changed, 22 insertions(+) + create mode 100644 test/pacman/tests/fileconflict012.py + +diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c +index efa1a87..d6e5d8c 100644 +--- a/lib/libalpm/conflict.c ++++ b/lib/libalpm/conflict.c +@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, + struct dirent *ent = NULL; + const char *root = handle->root; + ++ /* check directory is actually in package - used for subdirectory checks */ ++ if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) { ++ return 0; ++ } ++ + /* TODO: this is an overly strict check but currently pacman will not + * overwrite a directory with a file (case 10/11 in add.c). Adjusting that + * is not simple as even if the directory is being unowned by a conflicting +diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py +new file mode 100644 +index 0000000..421b739 +--- /dev/null ++++ b/test/pacman/tests/fileconflict012.py +@@ -0,0 +1,17 @@ ++self.description = "dir->file change during package upgrade (filesystem file conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++self.filesystem = ["dir/file"] ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("DIR_EXIST=dir/") +-- +1.7.11.1 + diff --git a/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch new file mode 100644 index 000000000..ae3a57ecd --- /dev/null +++ b/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch @@ -0,0 +1,29 @@ +From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Fri, 04 May 2012 16:41:40 +0000 +Subject: Ensure pre_upgrade scriptlet gets old package version + +This was accidentally broken in the refactor done in commit 73139ccb. + +Fixes FS#29371. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- +diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c +index 6c2f0cb..c49d99b 100644 +--- a/lib/libalpm/add.c ++++ b/lib/libalpm/add.c +@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, + if(alpm_pkg_has_scriptlet(newpkg) && + !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; +- _alpm_runscriptlet(handle, pkgfile, +- scriptlet_name, newpkg->version, NULL, 1); ++ ++ _alpm_runscriptlet(handle, pkgfile, scriptlet_name, ++ newpkg->version, oldpkg ? oldpkg->version : NULL, 1); + } + + /* we override any pre-set reason if we have alldeps or allexplicit set */ +-- +cgit v0.9.0.2-13-g2bd3 diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD new file mode 100644 index 000000000..6ee826d15 --- /dev/null +++ b/core/pacman/PKGBUILD @@ -0,0 +1,87 @@ +# vim: set ts=2 sw=2 et: +# $Id: PKGBUILD 171528 2012-11-18 11:37:56Z allan $ +# Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=pacman +pkgver=4.0.3 +pkgrel=5 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4' + 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') +makedepends=('asciidoc') +optdepends=('fakeroot: for makepkg usage as normal user') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} + 0001-Add-conflict-for-replacing-owned-empty-directory.patch + 0002-Check-empty-subdirectory-ownership.patch + 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch + pacman.conf + pacman.conf.x86_64 + makepkg.conf) +md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' + '1a70392526c8768470da678b31905a6e' + '1a9b79788640907a2b34e8671cacc94a' + 'a9ddd43891bed364e1e97d27b2887bf1' + '2e8cbf55a94b1954b167c5dee6b62317' + '99734ea46795f466d41c503e9e23b6d4' + '556d49489e82b5750cf026d3b18c8f4f' + '589cd34eb9d5b678455e8289394f523e') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch + patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch + patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install Arch specific stuff + mkdir -p $pkgdir/etc + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686" + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64" + ;; + esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman" + for f in makepkg pacman-key; do + ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" + done + + install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf new file mode 100644 index 000000000..25ca01590 --- /dev/null +++ b/core/pacman/makepkg.conf @@ -0,0 +1,121 @@ +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/wget + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Compiler and Linker Flags +# -march (or -mcpu) builds exclusively for an architecture +# -mtune optimizes for an architecture, but builds for whole processor family +CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file +# +BUILDENV=(fakeroot !distcc color !ccache check !sign) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +# +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) + +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe <john@doe.com>" +#-- Specify a key to use for package signing +#GPGKEY="" + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf new file mode 100644 index 000000000..0596b7a9e --- /dev/null +++ b/core/pacman/pacman.conf @@ -0,0 +1,95 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +#SigLevel = Optional TrustedOnly + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +[core] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +[extra] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +[community] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + diff --git a/core/pacman/pacman.conf.x86_64 b/core/pacman/pacman.conf.x86_64 new file mode 100644 index 000000000..42321bbd9 --- /dev/null +++ b/core/pacman/pacman.conf.x86_64 @@ -0,0 +1,106 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +#SigLevel = Optional TrustedOnly + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +[core] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +[extra] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +[community] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#SigLevel = PackageRequired +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs + diff --git a/core/pacman/pacman.install b/core/pacman/pacman.install new file mode 100644 index 000000000..487819ab7 --- /dev/null +++ b/core/pacman/pacman.install @@ -0,0 +1,75 @@ +#!/bin/sh +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi + if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then + _check_pubring + fi +} + +post_install() { + _check_pubring +} + +_check_pubring() { + echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`" + echo " >>> to import the data required by pacman for package verification." + echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages" +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" +} + +_resetbackups() { + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" + + # path variables + pacconf="/etc/pacman.conf" + dbpath="/var/lib/pacman/local" + + # get a list of NoUpgrade files from the user's pacman.conf + echo ">>> Retrieving pacman.conf NoUpgrade list..." + config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) + # add the standard list of files, even if they are already above + config="$config \ + etc/passwd etc/group etc/shadow etc/sudoers \ + etc/fstab etc/raidtab etc/ld.so.conf \ + etc/rc.conf etc/rc.local \ + etc/modprobe.conf etc/modules.conf \ + etc/lilo.conf boot/grub/menu.lst" + + # blank md5sum for use in sed expression + zeroes='00000000000000000000000000000000' + + for file in $config; do + echo ">>> -> finding owner of /$file..." + line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) + # if file is owned by a package, go find its incorrectly stored sum + if [ ! -z "$line" ]; then + # get the name and version of the package owning file + name=$(echo $line | awk '{print $5}') + version=$(echo $line | awk '{print $6}') + # set the path to the backup array holding the md5sum + path="$dbpath/$name-$version/files" + # run a sed on the path to reset the line containing $file + # NOTE: literal tab characters in sed expression after $file + echo ">>> -> resetting sum of /$file..." + sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path + else + echo ">>> -> $file is unowned." + fi + done +} diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index d2852c447..8174e80eb 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167281 2012-09-29 22:30:14Z allan $ +# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/patch/patch.html" @@ -13,12 +13,21 @@ groups=('base-devel') depends=('glibc') makedepends=('ed') optdepends=('ed: for patch -e functionality') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + patch-2.7.1-initialize-data-structures-early-enough.patch) md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'b12189e0de3cb2af25268441647ec517') + 'b12189e0de3cb2af25268441647ec517' + 'dc6367a7cd49933d4006c246789e98da') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Fix segfault on non-numeric strip-count + # (also segfaults on nonexistent directory passed to -d) + # http://savannah.gnu.org/bugs/?37500 + patch -Np1 -i \ + $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch + ./configure --prefix=/usr make } diff --git a/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch new file mode 100644 index 000000000..046edc3d4 --- /dev/null +++ b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch @@ -0,0 +1,81 @@ +From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@linbit.com> +Date: Thu, 4 Oct 2012 12:33:09 +0200 +Subject: [PATCH] Initialize data structures early enough + +* src/patch.c (main): Initialize data structures early enough, before error +paths can access them. +* tests/bad-usage: Test bad command line usage. +* tests/Makefile.am (TESTS): Add bad-usage here. +--- + src/patch.c | 8 ++++---- + tests/Makefile.am | 1 + + tests/bad-usage | 18 ++++++++++++++++++ + 3 files changed, 23 insertions(+), 4 deletions(-) + create mode 100644 tests/bad-usage + +diff --git a/src/patch.c b/src/patch.c +index 828943b..0255fbb 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -150,6 +150,10 @@ main (int argc, char **argv) + else if ((version_control = getenv ("VERSION_CONTROL"))) + version_control_context = "$VERSION_CONTROL"; + ++ init_backup_hash_table (); ++ init_files_to_delete (); ++ init_files_to_output (); ++ + /* parse switches */ + Argc = argc; + Argv = argv; +@@ -162,10 +166,6 @@ main (int argc, char **argv) + if (make_backups | backup_if_mismatch) + backup_type = get_version (version_control_context, version_control); + +- init_backup_hash_table (); +- init_files_to_delete (); +- init_files_to_output (); +- + init_output (&outstate); + if (outfile) + outstate.ofp = open_outfile (outfile); +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 02fc6de..5cea52d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -20,6 +20,7 @@ TESTS = \ + asymmetric-hunks \ + backup-prefix-suffix \ + bad-filenames \ ++ bad-usage \ + concat-git-diff \ + copy-rename \ + corrupt-reject-files \ +diff --git a/tests/bad-usage b/tests/bad-usage +new file mode 100644 +index 0000000..022eeda +--- /dev/null ++++ b/tests/bad-usage +@@ -0,0 +1,18 @@ ++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require_cat ++use_local_patch ++use_tmpdir ++ ++# ============================================================== ++ ++check 'patch -px || echo "status: $?"' <<EOF ++$PATCH: **** strip count x is not a number ++status: 2 ++EOF +-- +1.8.0.3 + diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 8cf902069..2e9902106 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $ +# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=5 +pkgrel=6 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') -# sysfsutils will not be required in the next release -depends=('udev' 'sysfsutils') +depends=('systemd') conflicts=('pcmcia-cs') # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz initcpio-install-pcmcia) options=(!makeflags) -md5sums=('964c802994677a71b38ec56554aa229f' - '041af04025daee5b3b05812ac3896c8f') build() { cd "$pkgname-$pkgver" - sed -i -e 's,/usr/bin/install,install,g; - s,/lib/udev,/usr/lib/udev,g' Makefile + sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile make } @@ -32,3 +28,5 @@ package() { # install the mkinitpcio hook install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia" } +md5sums=('2e9469c44dcb790d2b497723c2fa0566' + '041af04025daee5b3b05812ac3896c8f') diff --git a/core/rp-pppoe/PKGBUILD b/core/rp-pppoe/PKGBUILD new file mode 100644 index 000000000..920dcd552 --- /dev/null +++ b/core/rp-pppoe/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 167376 2012-10-01 18:24:40Z eric $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: orelien <aurelien.foret@wanadoo.fr> + +pkgname=rp-pppoe +pkgver=3.11 +pkgrel=1 +pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client" +arch=('i686' 'x86_64') +url="http://www.roaringpenguin.com/pppoe/" +license=('GPL') +depends=('ppp>=2.4.5' 'sh' 'net-tools') +backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq + etc/ppp/pppoe-server-options) +options=('!makeflags') +install=rp-pppoe.install +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl adsl.service) +md5sums=('13b5900c56bd602df6cc526e5e520722' + '8fc724aa146dba52ef7b3fbe5b8784c6' + 'adace1ad441aa88dcb3db52fb7f9c97f' + 'af234125f956f3a356ab0d0fcaa9e8a2') + +build() { + cd "$srcdir/$pkgname-$pkgver/src" + ./configure --prefix=/usr --enable-plugin + make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install + + install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" +} diff --git a/core/rp-pppoe/adsl b/core/rp-pppoe/adsl new file mode 100755 index 000000000..33bd91839 --- /dev/null +++ b/core/rp-pppoe/adsl @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ADSL Connection" + /usr/sbin/pppoe-start &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon adsl + stat_done + fi + ;; + stop) + stat_busy "Stopping ADSL Connection" + /usr/sbin/pppoe-stop &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon adsl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/core/rp-pppoe/adsl.service b/core/rp-pppoe/adsl.service new file mode 100644 index 000000000..324164943 --- /dev/null +++ b/core/rp-pppoe/adsl.service @@ -0,0 +1,10 @@ +[Unit] +Description=ADSL Deamon + +[Service] +Type=forking +ExecStart=/usr/sbin/pppoe-start +ExecStop=/usr/sbin/pppoe-stop + +[Install] +WantedBy=multi-user.target diff --git a/core/rp-pppoe/rp-pppoe.install b/core/rp-pppoe/rp-pppoe.install new file mode 100644 index 000000000..1d4bccce2 --- /dev/null +++ b/core/rp-pppoe/rp-pppoe.install @@ -0,0 +1,12 @@ +#arg 1: the new package version +post_install() { +echo ">>> The kernel-mode plugin has a new place." +echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so" +echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 994ff8a2b..bbc9a1078 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $ +# $Id: PKGBUILD 173887 2012-12-27 05:05:41Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed -pkgver=4.2.1 -pkgrel=4.2 +pkgver=4.2.2 +pkgrel=1 pkgdesc="GNU stream editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/sed" @@ -14,12 +14,12 @@ depends=('acl' 'sh') makedepends=('gettext') install=sed.install source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('f0fd4d7da574d4707e442285fd2d3b86' - '91871b227dbf0916e019ba1fb0fbfdf3') +md5sums=('4111de4faa3b9848a0686b2f260c5056' + '86a5ab72f414d4cb38126e8e27cf0101') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --bindir=/bin --without-included-regex + ./configure --prefix=/usr make } @@ -31,4 +31,8 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + + mkdir $pkgdir/bin + ln -s ../usr/bin/sed $pkgdir/bin + } diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD new file mode 100644 index 000000000..2bb35b619 --- /dev/null +++ b/core/syslinux/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 169778 2012-10-28 18:26:30Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=syslinux +pkgver=4.06 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" +url="http://syslinux.zytor.com/" +license=('GPL2') +depends=('perl' 'glibc') +optdepends=('perl-passwd-md5: For md5pass' + 'perl-digest-sha1: For sha1pass' + 'mtools: For mkdiskimage and syslinux support' + 'gptfdisk: For GPT support' + 'util-linux: For isohybrid') +makedepends=('nasm') +backup=('boot/syslinux/syslinux.cfg') +install=syslinux.install +source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 + syslinux-dont-build-dos-windows-targets.patch + syslinux.cfg + syslinux-install_update) + +build() { + # Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + cd "$srcdir"/$pkgname-${pkgver} + # Do not try to build the Windows or DOS installers + patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch + # Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk + make installer + make -C utils + make -C com32 +} + +package() { + cd "$srcdir"/$pkgname-${pkgver} + make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + + # Install the default configuration + install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + # Install the installation and update script + # This script is maintained at git://gist.github.com/772138.git + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update + # move extlinux binary to /usr/sbin + mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux + rmdir "$pkgdir"/sbin +} +md5sums=('0384ef35b724615074e77b1fc89d5b47' + '1528c376e43f0eaccaa80d8ad1bc13b4' + '832595501944fbcabcdc1207f4724fe7' + '680750f73dc2e587ac567d057d485813') diff --git a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch new file mode 100644 index 000000000..2b86ab828 --- /dev/null +++ b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -0,0 +1,12 @@ +diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile +--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 +@@ -54,7 +54,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/core/syslinux/syslinux-install_update b/core/syslinux/syslinux-install_update new file mode 100644 index 000000000..cd1baa572 --- /dev/null +++ b/core/syslinux/syslinux-install_update @@ -0,0 +1,463 @@ +#!/bin/bash +# +# Sylinux Installer / Updater Scripts +# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#----------------- +# Exit Codes: +# 1 - get_boot_device or other function failed +# 2 - install/update failed +# 3 - set_active failed +# 4 - install_mbr failed +# +shopt -s nullglob + +libpath="/usr/lib/syslinux" +bootpath="/boot/syslinux" +extlinux="/usr/sbin/extlinux" + +autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE +com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) +pciids_file=/usr/share/hwdata/pci.ids + +## Helper functions ## +# Taken from libui-sh +# $1 needle +# $2 set (array) haystack +check_is_in() { + local needle="$1" element + shift + for element; do + [[ $element = $needle ]] && return 0 + done + return 1 +} + +# return true when blockdevice is an md raid, otherwise return a unset value +# get all devices that are part of raid device $1 +device_is_raid() { + [[ $1 && -f /proc/mdstat ]] || return 1 + local devmajor=$(stat -c %t "$1") + (( devmajor == 9 )) +} + +mdraid_all_slaves() { + local slave slaves + for slave in /sys/class/block/${1##*/}/slaves/*; do + source "$slave/uevent" + slaves="$slaves/dev/$DEVNAME " + unset DEVNAME + done + echo $slaves +} + +# Check /sys/block to see if device is partitioned +# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist +# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist +dev_is_part() { + # $1 - blockdevice + local dev=$1 + + # If block device uevent file should be found + # If a partition is passed in path shouldn't exist + if [[ $dev = *cciss* ]]; then + [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 + elif [[ $dev = *ida* ]]; then + [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 + else + [[ -f /sys/block/${dev##*/}/dev ]] && return 1 + fi + + return 0 +} + +# If EFI PART is present in the first 8 bytes then it must be a GPT disk +device_is_gpt() { + local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) + [[ $partsig = "EFI PART" ]] +} + +clear_gpt_attr2() { + # $1 - Block Device, no partitions + local disk=$1 + + # Special Exception for cciss controllers + if [[ $disk = *cciss* ]]; then + for part in /dev/cciss/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + # Smart 2 Controllers + elif [[ $disk = *ida* ]]; then + for part in /dev/ida/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + else + for part in /sys/block/${disk##*/}/${disk##*/}*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + fi + return 0 +} + +usage() { +cat << EOF +usage: $0 options + +This script will install or upgrade Syslinux + +OPTIONS: + -h Show this message + -i Install Syslinux + -u Update Syslinux + -a Set Boot flag on boot partiton + -m Install Syslinux MBR + -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + + Arguments Required: + -c Chroot install (ex: -c /mnt) + +Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) + syslinux-install_update.sh -u (update) +EOF +} + +# Trys to find the partition that /boot resides on +# This will either be on /boot or / (root) +getBoot() { + if [[ ! -d "$bootpath" ]]; then + echo "Could not find $bootpath" + echo "Is boot mounted? Is Syslinux installed?" + exit 1 + fi + + syslinux_fs=(ext2 ext3 ext4 btrfs vfat) + + # Use DATA from findmnt see rc.sysint for more info + if [[ -f /proc/self/mountinfo ]]; then + read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") + read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") + else + echo "Could not find /proc/self/mountinfo" + echo "Are you running a kernel greater than 2.6.24?" + exit 1 + fi + + if [[ $bootfs ]]; then + if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then + echo "/boot file system is not supported by Syslinux" + exit 1 + fi + boot="boot" + bootpart="$bootdev" + elif [[ $rootfs ]]; then + if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then + echo "/ (root) file system is not supported by Syslinux" + exit 1 + fi + boot="root" + bootpart="$rootdev" + else + echo "Could not find filesystem on / (root) or /boot." + exit 1 + fi +} + +# We store the partition table type either gpt or mbr in var ptb +# In rare cases a user could have one raid disk using mbr and another using gpt +# In such cases we accept that the output may be incomplete + +# Calls get_ptb() for $bootpart or for all device in RAID +declare -A bootdevs +get_boot_devices() { + if device_is_raid "$bootpart"; then + slaves=$(mdraid_all_slaves "$bootpart") + + for slave in ${slaves[@]}; do + local disk="${slave%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$slave]="$ptb" + done + else + local disk="${bootpart%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$bootpart]="$ptb" + fi +} + +# Function Assumes the boot partition should be marked as active +# All other partitions should not have the boot flag set +set_active() { + # If any bootdev is a block device without partitions bail + # we want to set the boot flag on partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } + done + + # Clear BIOS Bootable Legacy Attribute for GPT drives + # In rare cases where a RAID device has slaves on the same block device + # Attribute 2 will be cleared for each partition multiple times + for dev in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$dev]}" + if [[ "$ptb" = GPT ]]; then + local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda + clear_gpt_attr2 "$disk" + fi + done + + # Set the boot flag on bootdevs (generated from get_boot_devices) + for part in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$part]}" + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + + if [[ "$ptb" = MBR ]]; then + if sfdisk "$disk" -A "$partnum" &>/dev/null; then + echo "Boot Flag Set - $part" + else + echo "FAILED to Set the boot flag on $part" + exit 3 + fi + elif [[ "$ptb" = GPT ]]; then + if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then + echo "Attribute Legacy Bios Bootable Set - $part" + else + echo "FAILED to set attribute Legacy BIOS Bootable on $part" + exit 3 + fi + fi + done + return 0 +} + +install_mbr() { + # If any bootdev is a block device without partitions bail + # we want to install the mbr to a partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } + done + + for part in "${!bootdevs[@]}"; do + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + local ptb="${bootdevs[$part]}" + + # We want to install to the root of the block device + # If the device is a partition - ABORT! + dev_is_part "$disk" && \ + { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} + + if [[ "$ptb" = MBR ]]; then + mbrfile="$libpath/mbr.bin" + elif [[ "$ptb" = GPT ]]; then + mbrfile="$libpath/gptmbr.bin" + fi + + if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then + echo "Installed MBR ($mbrfile) to $disk" + else + echo "Error Installing MBR ($mbrfile) to $disk" + exit 4 + fi + done + return 0 +} + +_install() { + # Copy files to /boot + for file in "${com32_files[@]}"; do + # Symlink files even if links exist + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + done + + # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS + if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + if [[ "$boot" = root ]]; then + ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid "$bootpart"; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + else + "$extlinux" --install "$bootpath" > /dev/null 2>&1 + fi + + if (( $? )); then + echo "Syslinux install failed" + exit 2 + else + echo "Syslinux install successful" + fi + + touch "$CHROOT/$autoupdate_file" +} + +update() { + # Update any com and c32 files in /boot + if [[ "$boot" = boot ]]; then + for file in "$bootpath"/*.{c32,com}; do + file=$(basename "$file") + cp "$libpath/$file" "$bootpath/$file" &> /dev/null + done + if [[ -f "$bootpath/pci.ids" ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid $bootpart; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --update "$bootpath" -r &> /dev/null + else + "$extlinux" --update "$bootpath" &> /dev/null + fi + + if (($?)); then + echo "Syslinux update failed" + exit 2 + else + echo "Syslinux update successful" + fi +} + +if (( $# == 0 )); then + usage + exit 1 +fi + +while getopts "c:uihmas" opt; do + case $opt in + c) + CHROOT=$(readlink -e "$OPTARG") + if [[ -z $CHROOT ]]; then + echo "error: chroot path ``$OPTARG does not exist"; + exit 1 + fi + ;; + h) + USAGE="True" + ;; + i) + INSTALL="True" + ;; + u) + UPDATE="True" + ;; + m) + MBR="True" + ;; + a) + SET_ACTIVE="True" + ;; + s) + # If AUTOUPDATE_FILE does not exist exit the script + if [[ -f $autoupdate_file ]]; then + UPDATE="True" + else + exit 0 + fi + ;; + *) + usage + exit 1 + ;; + esac +done + +if [[ $USAGE ]]; then + usage + exit 0 +fi + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +# Display Usage Information if both Install and Update are passed +if [[ $INSTALL && $UPDATE ]]; then + usage + exit 1 +fi + +# If a chroot dir is path set variables to reflect chroot +if [[ "$CHROOT" ]]; then + libpath="$CHROOT$libpath" + bootpath="$CHROOT$bootpath" + extlinux="$CHROOT$extlinux" +fi + +# Exit if no /boot path exists +if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bootpath is empty!" + echo "Is /boot mounted?" + exit 1 +fi + +# Get the boot device if any of these options are passed +if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then + getBoot +fi + +# Install or Update +if [[ $INSTALL ]]; then + _install || exit +elif [[ $UPDATE ]]; then + update || exit +fi + + +# SET_ACTIVE and MBR +if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then + get_boot_devices + + if [[ $SET_ACTIVE ]]; then + set_active || exit + fi + + if [[ $MBR ]]; then + install_mbr || exit + fi +fi + +exit 0 + +# vim: set et sw=4: diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg new file mode 100644 index 000000000..5a588f58c --- /dev/null +++ b/core/syslinux/syslinux.cfg @@ -0,0 +1,79 @@ +# Config file for Syslinux - +# /boot/syslinux/syslinux.cfg +# +# Comboot modules: +# * menu.c32 - provides a text menu +# * vesamenu.c32 - provides a graphical menu +# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders +# * hdt.c32 - hardware detection tool +# * reboot.c32 - reboots the system +# * poweroff.com - shutdown the system +# +# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. +# If /usr and /boot are on the same file system, symlink the files instead +# of copying them. +# +# If you do not use a menu, a 'boot:' prompt will be shown and the system +# will boot automatically after 5 seconds. +# +# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux +# The wiki provides further configuration examples + +DEFAULT arch +PROMPT 0 # Set to 1 if you always want to display the boot: prompt +TIMEOUT 50 +# You can create syslinux keymaps with the keytab-lilo tool +#KBDMAP de.ktl + +# Menu Configuration +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +UI menu.c32 +#UI vesamenu.c32 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +MENU TITLE Arch Linux +#MENU BACKGROUND splash.png +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +# boot sections follow +# +# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. +# +#-* + +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux.img + +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-fallback.img + +#LABEL windows +# MENU LABEL Windows +# COM32 chain.c32 +# APPEND hd0 1 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com diff --git a/core/syslinux/syslinux.install b/core/syslinux/syslinux.install new file mode 100644 index 000000000..0dc0ece36 --- /dev/null +++ b/core/syslinux/syslinux.install @@ -0,0 +1,13 @@ +post_install() { + echo "==> If you want to use syslinux as your bootloader" + echo "==> edit /boot/syslinux/syslinux.cfg and run" + echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> to install it." +} + +post_upgrade() { + # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + /usr/sbin/syslinux-install_update -s +} + +# vim:set ts=2 sw=2 et: diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index b514c875d..3f8dece1b 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $ +# $Id: PKGBUILD 173745 2012-12-22 15:22:20Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.22.1 -pkgrel=3 +pkgver=2.22.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -75,7 +75,7 @@ package() { # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('730cf9932531ed09b53a04ca30fcb4c9' +md5sums=('eeacbfdd2556acd899a2d0ffdb446185' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD new file mode 100644 index 000000000..c712247d6 --- /dev/null +++ b/extra/abiword/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 173825 2012-12-24 15:09:23Z jgc $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Maël Lavault <moimael@neuf.fr> + +pkgbase=abiword +pkgname=('abiword' 'abiword-plugins') +pkgver=2.8.6 +pkgrel=8 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.abisource.com" +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv') +options=('!makeflags' '!libtool') +source=(http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz + compat_libwpg_0_9.patch + abiword-2.8.6-no-undefined.patch + abiword-2.8.6-libpng15.patch + abiword-2.8.6-glib-2.31.patch) +md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' + '09446a2ebba8288fc611e88f7cf17298' + '42e2614b6e0aad457d91f6ce20b6f225' + '40e370e7e88c5437140ef18037abfbd3' + '6ec338a27a6fb590c348724ddb545849') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" + # fix a gcc 4.6.x build issue, patch from Fedora + patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" + patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + + # Fix build with recent glib, patch from Gentoo + patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch" + + libtoolize --force + autoreconf + + ./configure --prefix=/usr \ + --enable-clipart \ + --enable-templates \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ + --disable-collab-backend-sugar \ + --enable-plugins --without-gnomevfs \ + --with-gio \ + --with-goffice \ + --disable-static \ + --with-psiconv-config=/nothere + make +} + +package_abiword() { + pkgdesc="A fully-featured word processor" + depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils') + install=$pkgname.install + optdepends=('abiword-plugins') + conflicts=("abiword-plugins<${pkgver}-${pkgrel}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i plugins/Makefile \ + -e 's/ collab / /' \ + -e 's/ wpg / /' \ + -e 's/ wmf / /' \ + -e 's/ grammar / /' \ + -e 's/ mathview / /' \ + -e 's/ aiksaurus / /' \ + -e 's/ latex / /' \ + -e 's/ ots / /' \ + -e 's/ wordperfect / /' + make DESTDIR="${pkgdir}" install +} + +package_abiword-plugins() { + pkgdesc="Additional plugins for Abiword" + depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' + 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + + cd "${srcdir}/${pkgbase}-${pkgver}/plugins" + for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do + make -C ${dir} DESTDIR="${pkgdir}" install + done +} diff --git a/extra/abiword/abiword-2.8.6-glib-2.31.patch b/extra/abiword/abiword-2.8.6-glib-2.31.patch new file mode 100644 index 000000000..8b938cc25 --- /dev/null +++ b/extra/abiword/abiword-2.8.6-glib-2.31.patch @@ -0,0 +1,40 @@ +------------------------------------------------------------------------ +r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines +Changed paths: + M /abiword/trunk/src/af/util/xp/ut_go_file.h + +Bug 13197: only import glib.h +Patch by Dominique Leuenberger. +------------------------------------------------------------------------ +r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines +Changed paths: + M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h + +Bug 13247 - Fix glib headers. Patch by Funda Wang +(safe to backport) +------------------------------------------------------------------------ +Index: src/af/util/xp/ut_go_file.h +=================================================================== +--- src/af/util/xp/ut_go_file.h (revision 30478) ++++ src/af/util/xp/ut_go_file.h (revision 30479) +@@ -31,7 +31,6 @@ + + #include <glib.h> + #include <gsf/gsf.h> +-#include <glib/gerror.h> + #include <time.h> + + G_BEGIN_DECLS +Index: goffice-bits/goffice/app/goffice-app.h +=================================================================== +--- goffice-bits/goffice/app/goffice-app.h (revision 30601) ++++ goffice-bits/goffice/app/goffice-app.h (revision 30602) +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000..7eded4c83 --- /dev/null +++ b/extra/abiword/abiword-2.8.6-libpng15.patch @@ -0,0 +1,100 @@ +$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 ++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp +@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap + + /* Clean Up Memory Used */ + +- FREEP(m_pPNGInfo->palette); ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); ++ FREEP(palette); + DELETEP(pBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + +@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; +@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; + +$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 ++++ plugins/garble/xp/abiword-garble-png.cpp +@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* + png_set_strip_alpha( png_ptr ); + png_set_interlace_handling( png_ptr ); + png_set_bgr( png_ptr ); +- rowbytes = info_ptr->rowbytes; ++ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); + png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); + } + +$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000 ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch new file mode 100644 index 000000000..c07000edb --- /dev/null +++ b/extra/abiword/abiword-2.8.6-no-undefined.patch @@ -0,0 +1,21 @@ +diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 ++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic + diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/abiword/abiword.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch new file mode 100644 index 000000000..cf36e188e --- /dev/null +++ b/extra/abiword/compat_libwpg_0_9.patch @@ -0,0 +1,371 @@ +diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 +--- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 ++++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 +--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,6 +1,6 @@ + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 +@@ -60,7 +60,7 @@ + + // Stream class + +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + + #include <gsf/gsf-input.h> + #include <gsf/gsf-infile.h> +@@ -70,12 +70,7 @@ + #include <libwps/libwps.h> + #endif + +-class AbiWordperfectInputStream : +-#ifdef HAVE_LIBWPS +- public WPSInputStream +-#else +- public WPXInputStream +-#endif ++class AbiWordperfectInputStream : public WPXInputStream + { + public: + AbiWordperfectInputStream(GsfInput *input); +@@ -86,7 +81,7 @@ + + virtual WPXInputStream * getDocumentOLEStream(const char * name); + +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -98,11 +93,7 @@ + }; + + AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : +-#ifdef HAVE_LIBWPS +- WPSInputStream(), +-#else +- WPXInputStream(true), +-#endif ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -117,9 +108,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -256,19 +247,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPD_CONFIDENCE_NONE: +- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) +- // however, we'll let the text importer handle such cases +- case WPD_CONFIDENCE_POOR: + return UT_CONFIDENCE_ZILCH; +- case WPD_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPD_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPD_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +@@ -328,7 +312,7 @@ + UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL); + + if (error != WPD_OK) + { +@@ -381,9 +365,9 @@ + float marginLeft = 1.0f, marginRight = 1.0f; + + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ + /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) +@@ -456,15 +440,15 @@ + float marginTop = 0.0f, marginBottom = 0.0f; + float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; + if (propList["fo:margin-top"]) +- marginTop = propList["fo:margin-top"]->getFloat(); ++ marginTop = propList["fo:margin-top"]->getDouble(); + if (propList["fo:margin-bottom"]) +- marginBottom = propList["fo:margin-bottom"]->getFloat(); ++ marginBottom = propList["fo:margin-bottom"]->getDouble(); + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + if (propList["fo:text-indent"]) +- textIndent = propList["fo:text-indent"]->getFloat(); ++ textIndent = propList["fo:text-indent"]->getDouble(); + + m_topMargin = marginTop; + m_bottomMargin = marginBottom; +@@ -487,7 +471,7 @@ + + float lineSpacing = 1.0f; + if (propList["fo:line-height"]) +- lineSpacing = propList["fo:line-height"]->getFloat(); ++ lineSpacing = propList["fo:line-height"]->getDouble(); + + UT_String tmpBuffer; + UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", +@@ -504,7 +488,7 @@ + propBuffer += tmpBuffer; + if (i()["style:position"]) + { +- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); + propBuffer += tmpBuffer; + } + +@@ -640,9 +624,9 @@ + + // TODO: support spaceAfter + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) + m_bSectionChanged = true; +@@ -709,9 +693,9 @@ + if (propList["style:num-format"]) + listType = propList["style:num-format"]->getStr().cstr()[0]; + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || + m_pCurrentListDefinition->getOutlineHash() != listID || +@@ -749,9 +733,9 @@ + if (propList["libwpd:level"]) + level = propList["libwpd:level"]->getInt(); + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) + { +@@ -871,10 +855,10 @@ + + UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) + + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + + listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; +@@ -1263,7 +1247,7 @@ + virtual UT_Error _loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this)); + + if (error != WPS_OK) + { +@@ -1302,18 +1286,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPS_CONFIDENCE_NONE: + return UT_CONFIDENCE_ZILCH; +- case WPS_CONFIDENCE_POOR: +- return UT_CONFIDENCE_POOR; +- case WPS_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPS_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPS_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 +@@ -30,13 +30,7 @@ + #define IE_IMP_WP_H + + #include <stdio.h> +-#ifdef _WIN32 +-#define POINT WPX_POINT +-#endif + #include <libwpd/libwpd.h> +-#ifdef _WIN32 +-#undef POINT +-#endif + #include "ie_imp.h" + #include "ut_string.h" + #include "ut_string_class.h" +@@ -98,7 +92,7 @@ + IE_Imp ** ppie); + }; + +-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl ++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface + { + public: + IE_Imp_WordPerfect(PD_Document * pDocument); +@@ -154,6 +148,21 @@ + virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} + virtual void closeTable(); + ++ virtual void definePageStyle(const WPXPropertyList&) {} ++ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void defineCharacterStyle(const WPXPropertyList&) {} ++ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void insertSpace() {} ++ virtual void insertField(const WPXString&, const WPXPropertyList&) {} ++ virtual void openComment(const WPXPropertyList&) {} ++ virtual void closeComment() {} ++ virtual void openTextBox(const WPXPropertyList&) {} ++ virtual void closeTextBox() {} ++ virtual void openFrame(const WPXPropertyList&) {} ++ virtual void closeFrame() {} ++ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} ++ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} ++ + + protected: + virtual UT_Error _loadFile(GsfInput * input); +diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 +--- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,5 +1,5 @@ + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp +--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 +@@ -31,11 +31,10 @@ + #include <gsf/gsf-input-memory.h> + #include <gsf/gsf-input-stdio.h> + #include <gsf/gsf-infile-msole.h> +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + #include "xap_Module.h" + + using libwpg::WPGraphics; +-using libwpg::WPGString; + + ABI_PLUGIN_DECLARE("WPG") + +@@ -48,7 +47,7 @@ + virtual bool isOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(const char * name); +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -60,7 +59,7 @@ + }; + + AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : +- WPXInputStream(true), ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -75,9 +74,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -245,10 +244,10 @@ + UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) + { + AbiWordPerfectGraphicsInputStream gsfInput(input); +- WPGString svgOutput; ++ WPXString svgOutput; + if (WPGraphics::generateSVG(&gsfInput, svgOutput)) + { +- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); ++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); + UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); + g_object_unref(svgInput); + return result; diff --git a/extra/abs/PKGBUILD b/extra/abs/PKGBUILD new file mode 100644 index 000000000..26ab5ebca --- /dev/null +++ b/extra/abs/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166403 2012-09-07 16:50:29Z dreisner $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=abs +pkgver=2.4.4 +pkgrel=1 +pkgdesc="Utilities to download and work with the Arch Build System (ABS)" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/abs.git/" +license=('GPL') +depends=('bash' 'rsync') +backup=(etc/abs.conf) +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' + 'a628f7d5b1cd1e838366b88709690c24') + +build() { + cd "$pkgname-$pkgver" + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install + + # Add readme file, and make base /var/abs path + install -dm755 "${pkgdir}"/var/abs/local/ + install -Dm644 README "${pkgdir}"/var/abs/README + + # make adjustments to abs.conf + if [[ $CARCH = "i686" ]]; then + sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf + fi + if [[ $CARCH = "x86_64" ]]; then + sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf + fi +} diff --git a/extra/alsa-firmware/PKGBUILD b/extra/alsa-firmware/PKGBUILD new file mode 100644 index 000000000..00df415a4 --- /dev/null +++ b/extra/alsa-firmware/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 158602 2012-05-05 02:35:11Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com> +pkgname=alsa-firmware +pkgver=1.0.25 +pkgrel=2 +pkgdesc="ALSA firmware package" +arch=('i686' 'x86_64') +url="http://alsa-project.org/" +license=('GPL') +source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) +options=(!strip) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-hotplug-dir=/usr/lib/firmware + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + # remove files which conflicts with linux-firmware + rm -rf ${pkgdir}/usr/lib/firmware/{ess,korg,sb16,yamaha} + # remove broken symlinks (broken upstream) + rm -rf ${pkgdir}/usr/lib/firmware/turtlebeach + # remove empty dir + rm -rf ${pkgdir}/usr/bin +} +md5sums=('f1939da45b162c83a726c54a470ef139') diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 079fff115..3cb3b4dad 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 157935 2012-04-30 07:11:57Z andrea $ +# $Id: PKGBUILD 174631 2013-01-05 12:47:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64' 'mips64el') url='https://launchpad.net/appmenu-qt' license=('GPL') depends=('libdbusmenu-qt') makedepends=('cmake') -source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"{,.asc}) +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"{,.asc} + 'appmenu-async.diff') md5sums=('90cce750e5412d43ce075b0a9bdb6782' - 'de499d01369fc85040f5bbfc53ae1700') + 'de499d01369fc85040f5bbfc53ae1700' + '82947207881702d88403c149406b502a') build() { - cd "${srcdir}" + # FS#33286 + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}"/appmenu-async.diff + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -25,6 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff new file mode 100644 index 000000000..c4bc509d7 --- /dev/null +++ b/extra/appmenu-qt/appmenu-async.diff @@ -0,0 +1,121 @@ +=== modified file 'src/CMakeLists.txt' +--- src/CMakeLists.txt 2012-02-27 14:27:17 +0000 ++++ src/CMakeLists.txt 2013-01-04 10:33:53 +0000 +@@ -15,6 +15,10 @@ + ${QT_QTXML_INCLUDE_DIR} + ) + ++qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml ++ registrar) ++ ++ + qt4_automoc(${appmenu_qt_SRCS}) + + link_directories( + +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2012-04-04 16:06:06 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-04 10:36:25 +0000 +@@ -15,6 +15,7 @@ + along with appmenu-qt. If not, see <http://www.gnu.org/licenses/>. + */ + #include "appmenuplatformmenubar.h" ++#include "registrar.h" + + // dbusmenu-qt + #include <dbusmenuexporter.h> +@@ -393,6 +394,8 @@ + + bool MenuBarAdapter::registerWindow() + { ++ static com::canonical::AppMenu::Registrar *registrar = 0; ++ + if (!m_menuBar->window()) { + WARN << "No parent for this menubar"; + return false; +@@ -403,9 +406,8 @@ + return true; + } + +- QDBusInterface host(REGISTRAR_SERVICE, REGISTRAR_PATH, REGISTRAR_IFACE); +- if (!host.isValid()) { +- return false; ++ if (!registrar) { ++ registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + + Q_FOREACH(QAction *action, m_menuBar->actions()) { +@@ -428,8 +430,9 @@ + } + + m_registeredWinId = winId; +- QVariant path = QVariant::fromValue<QDBusObjectPath>(QDBusObjectPath(m_objectPath)); +- host.asyncCall(QLatin1String("RegisterWindow"), QVariant(winId), path); ++ if (registrar) { ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ } + return true; + } + + +=== added file 'src/com.canonical.AppMenu.Registrar.xml' +--- src/com.canonical.AppMenu.Registrar.xml 1970-01-01 00:00:00 +0000 ++++ src/com.canonical.AppMenu.Registrar.xml 2013-01-04 10:04:35 +0000 +@@ -0,0 +1,56 @@ ++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> ++<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd"> ++ <dox:d><![CDATA[ ++ @mainpage ++ ++ An interface to register menus that are associated with a window in an application. The ++ main interface is docuemented here: @ref com::canonical::AppMenu::Registrar. ++ ++ The actual menus are transported using the dbusmenu protocol which is available ++ here: @ref com::canonical::dbusmenu. ++ ]]></dox:d> ++ <interface name="com.canonical.AppMenu.Registrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd"> ++ <dox:d> ++ An interface to register a menu from an application's window to be displayed in another ++ window. This manages that association between XWindow Window IDs and the dbus ++ address and object that provides the menu using the dbusmenu dbus interface. ++ </dox:d> ++ <method name="RegisterWindow"> ++ <dox:d><![CDATA[ ++ Associates a dbusmenu with a window ++ ++ /note this method assumes that the connection from the caller is the DBus connection ++ to use for the object. Applications that use multiple DBus connections will need to ++ ensure this method is called with the same connection that implmenets the object. ++ ]]></dox:d> ++ <arg name="windowId" type="u" direction="in"> ++ <dox:d>The XWindow ID of the window</dox:d> ++ </arg> ++ <arg name="menuObjectPath" type="o" direction="in"> ++ <dox:d>The object on the dbus interface implementing the dbusmenu interface</dox:d> ++ </arg> ++ </method> ++ <method name="UnregisterWindow"> ++ <dox:d> ++ A method to allow removing a window from the database. Windows will also be removed ++ when the client drops off DBus so this is not required. It is polite though. And ++ important for testing. ++ </dox:d> ++ <arg name="windowId" type="u" direction="in"> ++ <dox:d>The XWindow ID of the window</dox:d> ++ </arg> ++ </method> ++ <method name="GetMenuForWindow"> ++ <dox:d>Gets the registered menu for a given window ID.</dox:d> ++ <arg name="windowId" type="u" direction="in"> ++ <dox:d>The XWindow ID of the window to get</dox:d> ++ </arg> ++ <arg name="service" type="s" direction="out"> ++ <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d> ++ </arg> ++ <arg name="menuObjectPath" type="o" direction="out"> ++ <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d> ++ </arg> ++ </method> ++ </interface> ++</node> + diff --git a/extra/audacious-plugins/PKGBUILD b/extra/audacious-plugins/PKGBUILD new file mode 100644 index 000000000..f9625a77f --- /dev/null +++ b/extra/audacious-plugins/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 173108 2012-12-11 04:47:03Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=audacious-plugins +pkgver=3.3.3 +pkgrel=1 +pkgdesc='Plugins for Audacious' +url='http://audacious-media-player.org/' +license=('custom:BSD' 'GPL') +arch=('i686' 'x86_64') + +makedepends=("audacious>=${pkgver}" + 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' + 'libnotify' 'lirc-utils' 'curl' 'libmtp' + 'neon' 'libmms' 'libcue') + +optdepends=('oss: Open Sound System v4 output' + 'alsa-lib: Advanced Linux Sound Arch. output' + 'pulseaudio: PulseAudio output' + 'jack2: Jack Audio Connection Kit output' + 'lame: FileWriter MP3 output' + 'libvorbis: Vorbis input, FileWriter Vorbis output' + 'flac: FLAC input, FileWriter FLAC output' + + 'mpg123: MP3 input' + 'faad2: AAC input' + 'ffmpeg: ffaudio input' + 'libmodplug: modplug input' + 'fluidsynth: MIDI FluidSynth backend input' + 'libcdio: CD Digital Audio input' + 'libsidplay: Commodore 64 audio input' + 'wavpack: WavPack input' + + 'libnotify: libnotify OSD' + 'lirc-utils: LIRC' + 'curl: AudioScrobbler Client' + 'libmtp: Upload to MTP device' + + 'neon: neon-based http transport' + 'libmms: libmms-based mms transport' + 'libcue: CUE playlist format') + +source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index dfd5b481e..2c9c14aa8 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 168030 2012-10-05 13:24:09Z andrea $ +# $Id: PKGBUILD 174169 2013-01-03 07:02:09Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost' 'doxygen') +makedepends=('cmake' 'boost' 'doxygen' 'mesa') install=avogadro.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('f4fbef5ffc69cc312b2316426c36a78d') diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 42b60ffaf..5cf70124a 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170572 2012-11-09 00:21:44Z eric $ +# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,8 +8,8 @@ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=bitlbee -pkgver=3.0.6 -pkgrel=2 +pkgver=3.2 +pkgrel=1 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -22,7 +22,7 @@ source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d' 'bitlbee.tmpfiles') -sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c' +sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 86214c98b..77f6720f7 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 168408 2012-10-11 07:00:11Z andrea $ +# $Id: PKGBUILD 173983 2012-12-31 10:39:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.2.4 +pkgver=1.3 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e0be81bb13a3aa90d521ab96347ed305') +md5sums=('3a90e8826eb9f464084bbdafa549bf3e') build(){ mkdir build diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD new file mode 100644 index 000000000..018f70a54 --- /dev/null +++ b/extra/bogofilter/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Low Kian Seong <fastmail_low@speedymail.org> + +pkgname=bogofilter +pkgver=1.2.2 +pkgrel=4 +pkgdesc="A fast Bayesian spam filtering tool" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://bogofilter.sourceforge.net" +depends=('db' 'perl' 'gsl') +backup=('etc/bogofilter/bogofilter.cf') +source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc/bogofilter \ + --localstatedir=/var \ + --enable-transactions + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" + + install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" + install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" +} diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 08ab767ba..f087d047d 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172193 2012-12-02 04:25:56Z stephane $ +# $Id: PKGBUILD 173838 2012-12-25 00:34:16Z foutrelis $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" @@ -26,6 +26,7 @@ md5sums=('8ebe96efe679f5f6ccff08928fec5b26' '7acecd700b9f94d76fe4a6ad56cb0448') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD index bd64651c3..b69b5fb0d 100644 --- a/extra/ccache/PKGBUILD +++ b/extra/ccache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165213 2012-08-13 11:24:16Z giovanni $ +# $Id: PKGBUILD 174762 2013-01-07 00:33:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ccache -pkgver=3.1.8 +pkgver=3.1.9 pkgrel=1 pkgdesc="A compiler cache" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://ccache.samba.org/" license=('GPL3') depends=('zlib') source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0e0f25fb342dcb1196d9c2986a7323cf') +md5sums=('65f48376a91d3651d6527ca568858be8') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/cdrkit/PKGBUILD b/extra/cdrkit/PKGBUILD new file mode 100644 index 000000000..e7cd1e615 --- /dev/null +++ b/extra/cdrkit/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 138030 2011-09-14 23:20:33Z dreisner $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgname=cdrkit +pkgver=1.1.11 +pkgrel=2 +pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" +arch=('i686' 'x86_64') +url="http://cdrkit.org/" +license=('GPL2') +depends=('file' 'bzip2' 'perl') +makedepends=('cmake') +source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz) +md5sums=('efe08e2f3ca478486037b053acd512e9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make PREFIX="$pkgdir/usr" install + + # Make symlinks for cdrtools compatibility + cd "$pkgdir/usr/bin" + ln -s wodim cdrecord + ln -s readom readcd + ln -s genisoimage mkisofs + ln -s genisoimage mkhybrid + ln -s icedax cdda2wav + + cd "$pkgdir/usr/share/man/man1" + ln -s wodim.1 cdrecord.1 + ln -s readom.1 readcd.1 + ln -s genisoimage.1 mkisofs.1 + ln -s genisoimage.1 mkhybrid.1 + ln -s icedax.1 cdda2wav.1 +} diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD new file mode 100644 index 000000000..56be78816 --- /dev/null +++ b/extra/chromium/PKGBUILD @@ -0,0 +1,139 @@ +# $Id: PKGBUILD 173156 2012-12-11 21:02:48Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=chromium +pkgver=23.0.1271.97 +pkgrel=1 +pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" +arch=('i686' 'x86_64') +url="http://www.chromium.org/" +license=('BSD') +depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' + 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' + 'hicolor-icon-theme') +makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' + 'elfutils' 'subversion' 'nacl-toolchain-newlib') +optdepends=('kdebase-kdialog: needed for file dialogs in KDE') +backup=('etc/chromium/default') +install=chromium.install +source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 + chromium.desktop + chromium.default + chromium.sh + chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch + chromium-ppapi-r0.patch) +sha256sums=('37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1' + '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' + '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' + '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' + 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' + '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd') + +build() { + cd "$srcdir/chromium-$pkgver" + + # Fix build with glibc 2.16 + patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" + + # Fix build without NaCl glibc toolchain (patch from Gentoo) + patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" + + # http://code.google.com/p/chromium/issues/detail?id=109527 + sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc + + # Missing gyp files in tarball (http://crbug.com/144823) + sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi + + # Use Python 2 + find . -type f -exec sed -i -r \ + -e 's|/usr/bin/python$|&2|g' \ + -e 's|(/usr/bin/python2)\.4$|\1|g' \ + {} + + # There are still a lot of relative calls which need a workaround + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + + # Prepare NaCL toolchain + mkdir -p sdk native_client/toolchain/.tars + cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk + tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk + rm -r sdk + + # CFLAGS are passed through release_extra_cflags below + export -n CFLAGS CXXFLAGS + + # Silence "identifier 'nullptr' is a keyword in C++11" warnings + CFLAGS+=' -Wno-c++0x-compat' + + build/gyp_chromium --depth=. \ + -Dwerror= \ + -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + -Dlinux_strip_binary=1 \ + -Dlinux_use_gold_binary=0 \ + -Dlinux_use_gold_flags=0 \ + -Drelease_extra_cflags="$CFLAGS" \ + -Dffmpeg_branding=Chrome \ + -Dproprietary_codecs=1 \ + -Duse_system_bzip2=1 \ + -Duse_system_ffmpeg=0 \ + -Duse_system_libevent=1 \ + -Duse_system_libjpeg=1 \ + -Duse_system_libpng=1 \ + -Duse_system_libxml=0 \ + -Duse_system_ssl=0 \ + -Duse_system_yasm=1 \ + -Duse_system_zlib=0 \ + -Duse_gconf=0 \ + -Ddisable_glibc=1 \ + -Ddisable_pnacl=1 \ + -Ddisable_sse2=1 + + make chrome chrome_sandbox BUILDTYPE=Release +} + +package() { + cd "$srcdir/chromium-$pkgver" + + install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" + + install -Dm4755 -o root -g root out/Release/chrome_sandbox \ + "$pkgdir/usr/lib/chromium/chromium-sandbox" + + cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \ + out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ + "$pkgdir/usr/lib/chromium/" + + if [[ $CARCH == i686 ]]; then + rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe" + fi + + # Allow users to override command-line options + install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default" + + cp -a out/Release/locales "$pkgdir/usr/lib/chromium/" + + install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" + + install -Dm644 "$srcdir/chromium.desktop" \ + "$pkgdir/usr/share/applications/chromium.desktop" + + for size in 22 24 48 64 128 256; do + install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" + done + + for size in 16 32; do + install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" + done + + install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch new file mode 100644 index 000000000..1d11a390e --- /dev/null +++ b/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch @@ -0,0 +1,35 @@ +diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300 ++++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300 +@@ -243,14 +243,13 @@ struct kernel_rusage { + long ru_nivcsw; + }; + +-struct siginfo; + #if defined(__i386__) || defined(__arm__) || defined(__PPC__) + + /* include/asm-{arm,i386,mips,ppc}/signal.h */ + struct kernel_old_sigaction { + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_mask; + unsigned long sa_flags; +@@ -287,13 +286,13 @@ struct kernel_sigaction { + unsigned long sa_flags; + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + struct kernel_sigset_t sa_mask; + #else + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_flags; + void (*sa_restorer)(void); diff --git a/extra/chromium/chromium-ppapi-r0.patch b/extra/chromium/chromium-ppapi-r0.patch new file mode 100644 index 000000000..fb7e160c2 --- /dev/null +++ b/extra/chromium/chromium-ppapi-r0.patch @@ -0,0 +1,11 @@ +--- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200 ++++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200 +@@ -80,7 +80,7 @@ + ], + }, + 'conditions': [ +- ['target_arch!="arm"', { ++ ['target_arch!="arm" and disable_glibc==0', { + 'variables': { + 'build_glibc': 1, + # NOTE: Use /lib, not /lib64 here; it is a symbolic link which diff --git a/extra/chromium/chromium.default b/extra/chromium/chromium.default new file mode 100644 index 000000000..2632024f1 --- /dev/null +++ b/extra/chromium/chromium.default @@ -0,0 +1,4 @@ +# Default settings for chromium. This file is sourced by /usr/bin/chromium + +# Options to pass to chromium +CHROMIUM_FLAGS="" diff --git a/extra/chromium/chromium.desktop b/extra/chromium/chromium.desktop new file mode 100644 index 000000000..18446d40f --- /dev/null +++ b/extra/chromium/chromium.desktop @@ -0,0 +1,113 @@ +[Desktop Entry] +Version=1.0 +Name=Chromium +# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. +# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. +GenericName=Web Browser +GenericName[ar]=متصفح الشبكة +GenericName[bg]=Уеб браузър +GenericName[ca]=Navegador web +GenericName[cs]=WWW prohlížeč +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gu]=વેબ બ્રાઉઝર +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Tīmekļa pārlūks +GenericName[ml]=വെബ് ബ്രൌസര് +GenericName[mr]=वेब ब्राऊजर +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador da Internet +GenericName[ro]=Navigator de Internet +GenericName[ru]=Веб-браузер +GenericName[sl]=Spletni brskalnik +GenericName[sv]=Webbläsare +GenericName[ta]=இணைய உலாவி +GenericName[th]=เว็บเบราว์เซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[zh_CN]=网页浏览器 +GenericName[zh_HK]=網頁瀏覽器 +GenericName[zh_TW]=網頁瀏覽器 +# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[fil]=Web Browser +GenericName[hr]=Web preglednik +GenericName[id]=Browser Web +GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର +GenericName[sk]=WWW prehliadač +GenericName[sr]=Интернет прегледник +GenericName[te]=మహాతల అన్వేషి +GenericName[vi]=Bộ duyệt Web +# Gnome and KDE 3 uses Comment. +Comment=Access the Internet +Comment[ar]=الدخول إلى الإنترنت +Comment[bg]=Достъп до интернет +Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন +Comment[ca]=Accedeix a Internet +Comment[cs]=Přístup k internetu +Comment[da]=Få adgang til internettet +Comment[de]=Internetzugriff +Comment[el]=Πρόσβαση στο Διαδίκτυο +Comment[en_GB]=Access the Internet +Comment[es]=Accede a Internet. +Comment[et]=Pääs Internetti +Comment[fi]=Käytä internetiä +Comment[fil]=I-access ang Internet +Comment[fr]=Accéder à Internet +Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો +Comment[he]=גישה אל האינטרנט +Comment[hi]=इंटरनेट तक पहुंच स्थापित करें +Comment[hr]=Pristup Internetu +Comment[hu]=Internetelérés +Comment[id]=Akses Internet +Comment[it]=Accesso a Internet +Comment[ja]=インターネットにアクセス +Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ +Comment[ko]=인터넷 연결 +Comment[lt]=Interneto prieiga +Comment[lv]=Piekļūt internetam +Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക +Comment[mr]=इंटरनेटमध्ये प्रवेश करा +Comment[nb]=Gå til Internett +Comment[nl]=Verbinding maken met internet +Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ +Comment[pl]=Skorzystaj z internetu +Comment[pt]=Aceder à Internet +Comment[pt_BR]=Acessar a internet +Comment[ro]=Accesaţi Internetul +Comment[ru]=Доступ в Интернет +Comment[sk]=Prístup do siete Internet +Comment[sl]=Dostop do interneta +Comment[sr]=Приступите Интернету +Comment[sv]=Gå ut på Internet +Comment[ta]=இணையத்தை அணுகுதல் +Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి +Comment[th]=เข้าถึงอินเทอร์เน็ต +Comment[tr]=İnternet'e erişin +Comment[uk]=Доступ до Інтернету +Comment[vi]=Truy cập Internet +Comment[zh_CN]=访问互联网 +Comment[zh_HK]=連線到網際網路 +Comment[zh_TW]=連線到網際網路 +Exec=chromium %U +Terminal=false +Icon=chromium +Type=Application +Categories=GTK;Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/extra/chromium/chromium.install b/extra/chromium/chromium.install new file mode 100644 index 000000000..d43ea7c35 --- /dev/null +++ b/extra/chromium/chromium.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/chromium/chromium.sh b/extra/chromium/chromium.sh new file mode 100755 index 000000000..ba8a7e683 --- /dev/null +++ b/extra/chromium/chromium.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Allow users to override command-line options +# Based on Gentoo's chromium package (and by extension, Debian's) +if [[ -f /etc/chromium/default ]]; then + . /etc/chromium/default +fi + +# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system +# default CHROMIUM_FLAGS (from /etc/chromium/default) +CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS} + +export CHROME_WRAPPER=$(readlink -f "$0") +export CHROME_DESKTOP=chromium.desktop + +exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@" diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 34cc4f141..896032387 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 169599 2012-10-24 07:18:13Z tpowa $ +# $Id: PKGBUILD 173349 2012-12-19 14:22:07Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=5.7 +pkgver=5.8 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') @@ -24,4 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('4215f12be8663f65d2c21dbbbafbc7f8') +md5sums=('6aa9c4347780872fefe5823ac06a8ff3') diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD index 1ad697f80..94d607333 100644 --- a/extra/cpio/PKGBUILD +++ b/extra/cpio/PKGBUILD @@ -8,12 +8,15 @@ arch=(i686 x86_64 'mips64el') license=('GPL') url="http://www.gnu.org/software/cpio" depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz) +source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz + gets.patch) install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c') +md5sums=('1112bb6c45863468b5496ba128792f6c' + 'e9e9d1d64a2caa4b9f49b08dc09298db') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i "$srcdir/gets.patch" ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/cpio/gets.patch b/extra/cpio/gets.patch new file mode 100644 index 000000000..0203b645e --- /dev/null +++ b/extra/cpio/gets.patch @@ -0,0 +1,16 @@ +diff -ru cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h +--- cpio-2.11.orig/gnu/stdio.in.h 2012-12-22 22:48:06.596855514 +0100 ++++ cpio-2.11/gnu/stdio.in.h 2012-12-22 22:49:21.496002937 +0100 +@@ -135,12 +135,6 @@ + "use gnulib module fflush for portable POSIX compliance"); + #endif + +-/* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD new file mode 100644 index 000000000..8a74f9597 --- /dev/null +++ b/extra/cups-filters/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 173928 2012-12-28 07:19:09Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=cups-filters +pkgver=1.0.26 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler>=0.20.5' 'qpdf') +makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check +optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly') +backup=(etc/fonts/conf.d/99pdftoopvp.conf) +options=(!libtool) +source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz cups-browsed.service) +md5sums=('38502cb880e1f9be0618e3b2da4c7fec' + '2beb8d9cebf20ddcc6c7598aab4812a6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-avahi \ + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + rm -rf ${pkgdir}/etc/rc.d + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service +} diff --git a/extra/cups-filters/cups-browsed.service b/extra/cups-filters/cups-browsed.service new file mode 100644 index 000000000..d434d82f0 --- /dev/null +++ b/extra/cups-filters/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=a daemon to browse the Bonjour broadcasts + +[Service] +ExecStart=/usr/sbin/cups-browsed +PrivateTmp=yes + +[Install] +Also=cups.service avahi-daemon.service +WantedBy=printer.target diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index ecd4abfed..9908e2202 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,41 +1,21 @@ -# $Id: PKGBUILD 151779 2012-03-02 17:28:27Z dan $ -# Maintainer: +# $Id: PKGBUILD 174991 2013-01-10 01:36:13Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps -pkgver=2.2b1 -pkgrel=1.1 +pkgver=3.7 +pkgrel=1 pkgdesc="Generating 'patchset' information from a CVS repository" -url="http://www.cobite.com/cvsps/" +url="http://www.catb.org/esr/cvsps/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('zlib') -source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz" - call-cvs-q-option.patch - cvsps-2.2b1-bufferoverflow.patch - cvsps-2.2b1-dynamic-logbuf.patch - cvsps-2.2b1-man.patch - seperate-CPPFLAGS.patch - use-INADDR_NONE-define.patch - use-__linux__-define.patch - use-offsetof-macro.patch) -md5sums=('997580e8e283034995b9209076858c68' - '06324c5e3c321126b76dc97fc6c00b34' - '2910012a11a24d5e4192cf9eae7dd259' - '970566460e72cb159426965d6e5763b3' - 'f9d2ee40e52ecd5096fa9a885418eee1' - '6baafbd7512aa52e1b83ed0bead32a6e' - 'a3a81481c07dcc676f5a82ae07e8ee89' - '9e2763315cbda02665c47827d38df459' - '8f7e6f09f42f76deeefe24bbfa509150') +makedepends=('asciidoc') +source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz") +md5sums=('93c4e696a95a65f0b2d475ef10fbedbb') build() { cd "$srcdir/$pkgname-$pkgver" - for file in ${source[@]}; do - if [[ $file == *.patch ]]; then - patch -Np1 < ../$file - fi - done make prefix=/usr } diff --git a/extra/cvsps/cvsps-buffer-overflow.patch b/extra/cvsps/cvsps-buffer-overflow.patch new file mode 100644 index 000000000..e34fd6ee3 --- /dev/null +++ b/extra/cvsps/cvsps-buffer-overflow.patch @@ -0,0 +1,66 @@ +diff -Naur cvsps-3.2.orig/cvsps.c cvsps-3.2/cvsps.c +--- cvsps-3.2.orig/cvsps.c 2012-12-24 19:23:24.000000000 +0000 ++++ cvsps-3.2/cvsps.c 2012-12-27 03:28:24.698076155 +0000 +@@ -1078,17 +1078,16 @@ + static CvsFile * parse_rcs_file(const char * buff) + { + char fn[PATH_MAX]; +- int len = strlen(buff + 10); ++ size_t len = strlen(buff + 10); + char * p; + + /* once a single file has been parsed ok we set this */ + static bool path_ok; +- ++ + /* chop the ",v" string and the "LF" */ + len -= 3; + memcpy(fn, buff + 10, len); + fn[len] = 0; +- + if (strncmp(fn, strip_path, strip_path_len) != 0) + { + /* if the very first file fails the strip path, +@@ -1109,10 +1108,10 @@ + + while ((p = strstr(p, repository_path))) + lastp = p++; +- ++ + if (lastp) + { +- int len = strlen(repository_path); ++ size_t len = strlen(repository_path); + memcpy(strip_path, fn, lastp - fn + len + 1); + strip_path_len = lastp - fn + len + 1; + strip_path[strip_path_len] = 0; +@@ -1136,16 +1135,26 @@ + * + * For now just ignore such files + */ +- debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", ++ debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", + fn, strip_path); + return NULL; + } + + ok: +- path_ok = true; +- ++ /* ++ fix for rhbz#576076 ++ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS ++ */ ++ if(len <= strip_path_len) ++ { ++ debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", ++ fn, strip_path); ++ return NULL; ++ } + /* remove from beginning the 'strip_path' string */ + len -= strip_path_len; ++ path_ok = true; ++ + memmove(fn, fn + strip_path_len, len); + fn[len] = 0; + diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD index e6da6487b..cca246e30 100644 --- a/extra/dasher/PKGBUILD +++ b/extra/dasher/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 137741 2011-09-10 14:49:04Z pierre $ +# $Id: PKGBUILD 173935 2012-12-28 11:59:58Z jgc $ # Maintainer: damir <damir@archlinux.org> pkgname=dasher -pkgver=4.10.1 -pkgrel=3 +pkgver=4.11 +pkgrel=1 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils') +depends=('at-spi' 'gnome-speech' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui') url="http://www.gnome.org" -groups=('gnome-extra') options=('!emptydirs') install=dasher.install -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2") -md5sums=('83e556690ac54c4bb8c49c050510259e') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.11/${pkgname}-${pkgver}.tar.bz2 + error-format-security.patch + fix-binutils-gold.patch) +sha256sums=('fb21cc4ef606e10a8e5deffebe8695a376eabb0766d7d1bdf80abc5f03f4fed2' + '7aeba2667972e408f38b8337f972ff589f05cdf244dec5674f138fc5110405df' + 'f9e2a661e6d0b873e9a5d491b1b70f3a05ea4edda693e078e2e206451c265daf') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/error-format-security.patch" + patch -Np1 -i "${srcdir}/fix-binutils-gold.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper --enable-speech + --localstatedir=/var --disable-scrollkeeper --enable-speech make } diff --git a/extra/dasher/error-format-security.patch b/extra/dasher/error-format-security.patch new file mode 100644 index 000000000..db40d7b86 --- /dev/null +++ b/extra/dasher/error-format-security.patch @@ -0,0 +1,12 @@ +Index: dasher-4.11/Src/Gtk2/game_mode_helper.cpp +=================================================================== +--- dasher-4.11.orig/Src/Gtk2/game_mode_helper.cpp 2009-12-18 13:40:29.000000000 -0500 ++++ dasher-4.11/Src/Gtk2/game_mode_helper.cpp 2011-11-11 12:33:12.349741593 -0500 +@@ -324,6 +324,7 @@ + GTK_DIALOG_MODAL, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, ++ "%s", + message); + gtk_dialog_run (GTK_DIALOG (pDialog)); + gtk_widget_destroy (pDialog); diff --git a/extra/dasher/fix-binutils-gold.patch b/extra/dasher/fix-binutils-gold.patch new file mode 100644 index 000000000..ab87a7633 --- /dev/null +++ b/extra/dasher/fix-binutils-gold.patch @@ -0,0 +1,28 @@ +Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica@probeta.net>
+Las-Update: 2011-07-17
+
+--- a/Src/Makefile.am
++++ b/Src/Makefile.am
+@@ -34,7 +34,8 @@
+ $(GTK2BUILD_LIBS) \
+ -lexpat \
+ $(POPT_LIBS) \
+- $(GPELIB)
++ $(GPELIB) \
++ -lX11
+ #endif
+
+ #if DOQTE
+--- a/Src/Makefile.in
++++ b/Src/Makefile.in
+@@ -295,7 +295,8 @@
+ $(GTK2BUILD_LIBS) \
+ -lexpat \
+ $(POPT_LIBS) \
+- $(GPELIB)
++ $(GPELIB) \
++ -lX11
+
+ all: all-recursive
+
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD index 8b74e0c93..2493e0774 100644 --- a/extra/desktop-file-utils/PKGBUILD +++ b/extra/desktop-file-utils/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 161386 2012-06-10 16:51:40Z jgc $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 174820 2013-01-07 18:41:05Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=desktop-file-utils -pkgver=0.20 +pkgver=0.21 pkgrel=1 pkgdesc="Command line utilities for working with desktop entries" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" license=('GPL') depends=('glib2') source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz) -md5sums=('8c85cbc13632ba69077c6bc41ce4d0ac') +md5sums=('fda5c312c9fb3b8d818fb54f2c34db82') build() { cd "${srcdir}/desktop-file-utils-${pkgver}" diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index 76ae3b2e7..af3708914 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,18 +1,23 @@ -# $Id: PKGBUILD 143546 2011-11-26 09:49:37Z tpowa $ +# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.12 -pkgrel=1.1 +pkgver=3.0.13 +pkgrel=2 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') depends=('glibc') -source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.bz2) +#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) +# using debian source, main page is down since quite some time +source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz + dosfstools-3.0.12-fix-alloc-rootdir-entry.patch) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver + # fix https://bugs.archlinux.org/task/33248 + patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch make } @@ -20,4 +25,5 @@ package () { cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('5c7c2adac9eae4afbe1f16443142b566') +md5sums=('c1d851e3fc065a935c7cf919545d239f' + 'c2be6f2cd1d47297b2d6a8ba237e04eb') diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch new file mode 100644 index 000000000..44e6e86b5 --- /dev/null +++ b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch @@ -0,0 +1,25 @@ +--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 ++++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 +@@ -174,7 +174,10 @@ + offset = fs->root_start + next_free * sizeof(DIR_ENT); + memset(de, 0, sizeof(DIR_ENT)); + while (1) { +- sprintf((char *)de->name, pattern, curr_num); ++ char expanded[12]; ++ sprintf(expanded, pattern, curr_num); ++ memcpy(de->name, expanded, 8); ++ memcpy(de->ext, expanded + 8, 3); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp((const char *)root[scan].name, +--- dosfstools-3.0.12/src/fat.c ++++ dosfstools-3.0.12/src/fat.c +@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) + DIR_ENT de; + loff_t offset; + files++; +- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); ++ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); + de.start = CT_LE_W(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = CT_LE_W(i >> 16); diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 312226912..2b1bbf041 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,14 @@ -# $Id: PKGBUILD 172165 2012-11-30 14:16:13Z andyrtr $ +# $Id: PKGBUILD 174784 2013-01-07 15:28:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> + +# --->>> remember to rebuild/bump pigeonhole in one step <<<--- + pkgname=dovecot -pkgver=2.1.12 +pkgver=2.1.13 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -22,8 +25,8 @@ install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh dovecot.tmpfilesd) -md5sums=('b575dfb5db954132f41e7c390e7e11ff' - '86abccd4ac989be71a33ff856b25057a' +md5sums=('ff64b1d87ad4a8b912ae17b8f9bab3de' + 'd85e65d84b8933e2c2a9c4a42fd97841' '587159e84e2da6f83d70b3c706ba87cc' '342a28251d40f983c98c0d1f1bf3d07d') @@ -58,6 +61,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index a5dbb427c..448840e00 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 165316 2012-08-15 13:47:42Z dan $ +# $Id: PKGBUILD 173919 2012-12-28 04:42:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" -makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') +makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' + 'texlive-latexextra' 'graphviz') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('6fa7baf995fa3f71cfc09e264ba88a83') -sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a') +md5sums=('7004085a39217b4848e26ee726b3c9a7') +sha1sums=('3719f062bf88a3793dc94711d159205b8bb6fd19') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD new file mode 100644 index 000000000..e3be37d2f --- /dev/null +++ b/extra/dvdrip/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 143731 2011-11-28 17:39:01Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> + +pkgname=dvdrip +pkgver=0.98.11 +pkgrel=10 +pkgdesc="A Gtk frontend for transcode writen in Perl" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.exit1.org/dvdrip/" +install=${pkgname}.install +depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' + 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') +optdepends=('ogmtools: for ogm/odd video creation' + 'lsdvd: fast reading of DVD table' + 'fping: for cluster support') +source=("http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz" + 'dvdrip.desktop') +options=('!emptydirs' '!makeflags') +md5sums=('6dfa4199d451757a37eea233a07da4c0' + 'e91cf411928fd0500d07a0022b4ef546') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/dvdrip/dvdrip.desktop b/extra/dvdrip/dvdrip.desktop new file mode 100644 index 000000000..dd19b4aae --- /dev/null +++ b/extra/dvdrip/dvdrip.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=dvd::rip +Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs +Exec=/usr/bin/vendor_perl/dvdrip +Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm +Terminal=false +Type=Application +Categories=Application;AudioVideo;Video; diff --git a/extra/dvdrip/dvdrip.install b/extra/dvdrip/dvdrip.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/dvdrip/dvdrip.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 02b2ac1a7..8e2f85ce0 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172972 2012-12-07 19:30:17Z ronald $ +# $Id: PKGBUILD 174836 2013-01-07 19:44:44Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1bd664721ea4910fb61cff3f4b16863ecdbd0772') +sha1sums=('b41adf1731ff1974861a2c374d0f341b8004d098') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 4ade54ed1..07df5e6c7 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172964 2012-12-07 19:25:18Z ronald $ +# $Id: PKGBUILD 174828 2013-01-07 19:41:37Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('c6ee8092af99842631e49566f6be32b6149eaaca') +sha1sums=('98731b2fa29b863e20b863b816e4045ea768172d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 4f5655242..49678eeb0 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 173171 2012-12-12 00:31:43Z eric $ +# $Id: PKGBUILD 174832 2013-01-07 19:43:10Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.3 -pkgrel=2 +pkgver=1.7.5 +pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD') -depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') +depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo') optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da') +sha1sums=('0bedff456495e30baddd26b908cd0d03285c18a9') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index 70d7aa9cc..df836f7d0 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172961 2012-12-07 19:23:17Z ronald $ +# $Id: PKGBUILD 174825 2013-01-07 19:40:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('42265eb508a17e3684a01429593da138da369718') +sha1sums=('e418110ffdfe1a3ed32b9bc68e4f7bf628d16654') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index cf143a109..b3fc16723 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172966 2012-12-07 19:26:35Z ronald $ +# $Id: PKGBUILD 174830 2013-01-07 19:42:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('3b3edfa7eed63f4b74184939578f16d866fa2bb2') +sha1sums=('bc698a4defd13bd7fc868d211afe8616777f0b06') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index 85e883555..2774b4355 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172971 2012-12-07 19:29:41Z ronald $ +# $Id: PKGBUILD 174835 2013-01-07 19:44:21Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('3161ca46a1fed410340924f43ee773c52ff5e553') +sha1sums=('b1f6c2200693416578fe66c252b16cc2a20c33af') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 79d5bea5d..0c4bd7ab9 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172960 2012-12-07 19:22:39Z ronald $ +# $Id: PKGBUILD 174824 2013-01-07 19:39:59Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b668b23cd0f88b0857a7b140eca645783b770108') +sha1sums=('a12496ac49883f26e94259c853f84badf9f2e6ca') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index d00dc09a2..a269aa4de 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172965 2012-12-07 19:26:00Z ronald $ +# $Id: PKGBUILD 174829 2013-01-07 19:42:03Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('aaf54bfaee1ddae9bbff89da0178b56605df6048') +sha1sums=('91b6963bb60933061c9165665054c054ad4e8b94') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index b300c82ad..302e795f4 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172973 2012-12-07 19:30:53Z ronald $ +# $Id: PKGBUILD 174837 2013-01-07 19:45:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b7c3f346dbeb1d3ee43f140fd2a93384c20a92bb') +sha1sums=('025d2c258cd7b600bef7664802c70dde07fd9e4b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 7ba24de06..9d9c9cfc4 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172967 2012-12-07 19:27:09Z ronald $ +# $Id: PKGBUILD 174831 2013-01-07 19:42:46Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('9850e01d65aeb724fa53e5d9d351cf94eb6957f5') +sha1sums=('e6d6c5d83a265042dc6f8225720c211b3beb3bcf') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD index d98d75a1c..899956829 100644 --- a/extra/emelfm2/PKGBUILD +++ b/extra/emelfm2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156677 2012-04-22 23:01:54Z eric $ +# $Id: PKGBUILD 174286 2013-01-03 23:03:36Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: contrasutra pkgname=emelfm2 -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="A file manager that implements the popular two-pane design" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://emelfm2.net/" depends=('gtk2') license=('GPL3') source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('5528bdd7001451dbdba95bf26ee588be9a0b86da') +sha1sums=('d4498285ae77f0d524ce9be11d50a0aae9569e5f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index ba5f1f076..9fcf6dc4b 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172969 2012-12-07 19:28:30Z ronald $ +# $Id: PKGBUILD 174833 2013-01-07 19:43:35Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('9aebc9ee614e68b3ccb69e10f42ae2989d0d29a0') +sha1sums=('59f4a8869afc64289b53f8673c53baa9dfb1c109') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD index 3f0445dd9..3481694b1 100644 --- a/extra/enca/PKGBUILD +++ b/extra/enca/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 143739 2011-11-28 18:10:34Z giovanni $ +# $Id: PKGBUILD 174764 2013-01-07 09:30:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Filip Dvorak <fila@pruda.com> pkgname=enca -pkgver=1.13 -pkgrel=2.1 +pkgver=1.14 +pkgrel=1 pkgdesc="Charset analyser and converter" arch=('i686' 'x86_64' 'mips64el') -url="http://freshmeat.net/projects/enca/" +url="http://cihar.com/software/enca/" options=('!libtool') license=('GPL') -depends=('recode' 'bash') +depends=('recode') source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('762bead5d9a0a5e55024e1102baaa89d') +md5sums=('03792f25aed003d3ea33b3ce1be1f256') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 812428464..87d35704a 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 173313 2012-12-18 19:57:25Z ronald $ +# $Id: PKGBUILD 173762 2012-12-22 16:29:18Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0omega -_pkgver=0.17.0-omega +pkgver=0.17.0 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -19,15 +18,15 @@ provides=('notification-daemon' 'e') backup=('etc/enlightenment/sysactions.conf') options=('!libtool' '!emptydirs') install=enlightenment17.install -source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz +source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('4c94f470d74133ebf2a5254683d0510bf3ece55f' +sha1sums=('be8228200c1a7caeba914ae77927bda62e3a1776' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') build() { - cd "$srcdir/$_pkgname-$_pkgver" + cd "$srcdir/$_pkgname-$pkgver" export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" @@ -63,7 +62,7 @@ build() { } package() { - cd $srcdir/$_pkgname-$_pkgver + cd $srcdir/$_pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 8a4ed56ae..d39e8b973 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172970 2012-12-07 19:29:06Z ronald $ +# $Id: PKGBUILD 174834 2013-01-07 19:43:57Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('decee66729d0deccb4f836967c4492172a8d3875') +sha1sums=('ef9c3537b4ae53d953514758dde868ae0961a54c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index fb7ca9d5d..2faabaab5 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 172963 2012-12-07 19:24:28Z ronald $ +# $Id: PKGBUILD 174827 2013-01-07 19:41:07Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD') depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' - 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz') -optdepends=("evas_generic_loaders") + 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ffa9b12d34e801112cf081a3c024eca5ef86ed8a') +sha1sums=('eab2f26fe06d045243e7e75c52d59179b1c46980') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 554fb0d69..7296cadaa 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 172962 2012-12-07 19:23:53Z ronald $ +# $Id: PKGBUILD 174826 2013-01-07 19:40:46Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD') -depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina') +depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('2aeee66f9f6ce8a2a7daf0eebf75681f0e89730d') +sha1sums=('0c9cac308b5ce133eb5e5065f9a47cb4fb7660aa') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index d70b1aa6e..62ae913bb 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173049 2012-12-09 18:14:06Z foutrelis $ +# $Id: PKGBUILD 173898 2012-12-27 13:10:52Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896') +sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch new file mode 100644 index 000000000..a9edca3d7 --- /dev/null +++ b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch @@ -0,0 +1,61 @@ +From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Sun, 23 Dec 2012 00:09:34 +0200 +Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg + +This restores exo-open's .desktop file launching functionality. +--- + configure.ac.in | 1 + + exo-open/main.c | 9 --------- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 0c8b3a1..ec9be67 100644 +--- a/configure.ac.in ++++ b/configure.ac +@@ -159,6 +159,7 @@ dnl *** Check for required packages *** + dnl *********************************** + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) ++XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +diff --git a/exo-open/main.c b/exo-open/main.c +index 059fad4..da78f6a 100644 +--- a/exo-open/main.c ++++ b/exo-open/main.c +@@ -32,9 +32,7 @@ + + #include <glib/gstdio.h> + #include <gio/gio.h> +-#ifdef HAVE_GIO_UNIX + #include <gio/gdesktopappinfo.h> +-#endif + #include <exo/exo.h> + + +@@ -143,7 +141,6 @@ usage (void) + static gboolean + exo_open_launch_desktop_file (const gchar *arg) + { +-#ifdef HAVE_GIO_UNIX + GFile *gfile; + gchar *contents; + gsize length; +@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg) + #endif + + return result; +-#else /* !HAVE_GIO_UNIX */ +- g_critical (_("Launching desktop files is not supported when %s is compiled " +- "without GIO-Unix features."), g_get_prgname ()); +- +- return FALSE; +-#endif + } + + +-- +1.8.0.2 + diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD index 31c0b819a..a9771cc16 100644 --- a/extra/expect/PKGBUILD +++ b/extra/expect/PKGBUILD @@ -1,32 +1,20 @@ -# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 173839 2012-12-25 00:34:18Z foutrelis $ +# Maintainer: Allan McRae <allan@archlinux.org> pkgname=expect pkgver=5.45 -pkgrel=2.1 +pkgrel=3 pkgdesc="A tool for automating interactive applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.nist.gov/el/msid/expect.cfm" license=('custom') -depends=('tcl>=8.5.3') -conflicts=('expectk') -install=expect.install -changelog=ChangeLog +depends=('tcl') source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect${pkgver}.tar.gz) -# CVS checkout on gerolde. -#source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2) -# old nist source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2) md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b') build() { cd ${srcdir}/expect${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --mandir=/usr/share/man --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include - - # Keep $startdir/pkg out of library search paths. - sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile + ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -34,9 +22,5 @@ package() { cd ${srcdir}/expect${pkgver} make DESTDIR=${pkgdir} install - # license. install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README - - (cd ${pkgdir}/usr/lib; - ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so) } diff --git a/extra/faac/PKGBUILD b/extra/faac/PKGBUILD new file mode 100644 index 000000000..e56599e5d --- /dev/null +++ b/extra/faac/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 159954 2012-05-27 10:22:19Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Hugo Doria <hugo@archlinux.org> +# Contributor: Sarah Hay <sarah@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=faac +pkgver=1.28 +pkgrel=4 +pkgdesc="An AAC audio encoder" +arch=('i686' 'x86_64') +url="http://www.audiocoding.com/" +license=('GPL' 'custom') +depends=('libmp4v2' 'glibc') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i ../mp4v2-1.9.patch + patch -p0 -i ../mp4v2-2.0.0.patch + patch -p0 -i ../altivec.patch + find . -type f -print0 | xargs -0 sed -i 's/\r//g' + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \ + "${pkgdir}"/usr/share/licenses/faac/LICENSE +} +md5sums=('80763728d392c7d789cde25614c878f6' + 'e1ee422ab524fb1f78d178700c3a0e7f' + '9d52a17e68fa15ca94e88e1457b94b74' + '979ff4f13f36217cb15c92df9fd75f0c') diff --git a/extra/faac/altivec.patch b/extra/faac/altivec.patch new file mode 100644 index 000000000..ae461efc3 --- /dev/null +++ b/extra/faac/altivec.patch @@ -0,0 +1,40 @@ +http://bugs.gentoo.org/306881 + +--- configure.in ++++ configure.in +@@ -33,7 +33,12 @@ + AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], + AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), +- external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) ++ external_mp4v2=no, [ ++ #if defined(__ALTIVEC__) ++ #undef bool ++ #endif ++ #include <mp4v2/mp4v2.h> ++ ]) + + if test x$external_mp4v2 = xyes; then + AC_MSG_NOTICE([*** Building with external mp4v2 ***]) +--- frontend/main.c ++++ frontend/main.c +@@ -30,6 +30,9 @@ + #endif + + #ifdef HAVE_LIBMP4V2 ++#if defined(__ALTIVEC__) ++# undef bool ++#endif + # include <mp4v2/mp4v2.h> + #endif + +--- common/mp4v2/mpeg4ip.h ++++ common/mp4v2/mpeg4ip.h +@@ -123,7 +123,6 @@ + #ifdef __cplusplus + extern "C" { + #endif +-char *strcasestr(const char *haystack, const char *needle); + #ifdef __cplusplus + } + #endif diff --git a/extra/faac/mp4v2-1.9.patch b/extra/faac/mp4v2-1.9.patch new file mode 100644 index 000000000..54a63347b --- /dev/null +++ b/extra/faac/mp4v2-1.9.patch @@ -0,0 +1,47 @@ +diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in +--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200 ++++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300 +@@ -28,14 +28,17 @@ + AC_CHECK_LIB(gnugetopt, getopt_long) + + AM_CONDITIONAL(WITH_MP4V2, false) ++AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) + + AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], + AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), +- external_mp4v2=no, [#include <mp4.h>]) ++ external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) + + if test x$external_mp4v2 = xyes; then + AC_MSG_NOTICE([*** Building with external mp4v2 ***]) ++ MY_DEFINE(HAVE_LIBMP4V2) ++ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) + else + if test x$WITHMP4V2 = xyes; then + AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) +diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c +--- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200 ++++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300 +@@ -30,7 +30,7 @@ + #endif + + #ifdef HAVE_LIBMP4V2 +-# include <mp4.h> ++# include <mp4v2/mp4v2.h> + #endif + + #define DEFAULT_TNS 0 +diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am +--- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200 ++++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300 +@@ -8,5 +8,9 @@ + LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ + else + INCLUDES = -I$(top_srcdir)/include ++if WITH_EXTERNAL_MP4V2 ++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2 ++else + LDADD = $(top_builddir)/libfaac/libfaac.la -lm + endif ++endif diff --git a/extra/faac/mp4v2-2.0.0.patch b/extra/faac/mp4v2-2.0.0.patch new file mode 100644 index 000000000..f4ac8e6d4 --- /dev/null +++ b/extra/faac/mp4v2-2.0.0.patch @@ -0,0 +1,138 @@ +http://bugs.gentoo.org/397575 +http://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704 + +--- configure.in ++++ configure.in +@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long) + AM_CONDITIONAL(WITH_MP4V2, false) + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) + +-AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], +- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, ++AC_CHECK_DECLS([MP4Create], ++ AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), + external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) + +@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then + AC_MSG_NOTICE([*** Building with external mp4v2 ***]) + MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2) + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) ++ AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>]) + else + if test x$WITHMP4V2 = xyes; then + AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) +--- frontend/main.c ++++ frontend/main.c +@@ -873,8 +873,12 @@ int main(int argc, char *argv[]) + if (!faacEncSetConfiguration(hEncoder, myFormat)) { + fprintf(stderr, "Unsupported output format!\n"); + #ifdef HAVE_LIBMP4V2 ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0); ++#else + if (container == MP4_CONTAINER) MP4Close(MP4hFile); + #endif ++#endif + return 1; + } + +@@ -885,12 +889,10 @@ int main(int argc, char *argv[]) + unsigned long ASCLength = 0; + char *version_string; + +-#ifdef MP4_CREATE_EXTENSIBLE_FORMAT +- /* hack to compile against libmp4v2 >= 1.0RC3 +- * why is there no version identifier in mp4.h? */ ++#ifdef MP4_DETAILS_ERROR /* r453 fix */ + MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0); + #else +- MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0); ++ MP4hFile = MP4Create(aacFileName, 0); + #endif + if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) { + fprintf(stderr, "Couldn't create output file %s\n", aacFileName); +@@ -905,12 +907,22 @@ int main(int argc, char *argv[]) + free(ASC); + + /* set metadata */ ++#if HAVE_DECL_MP4TAGSALLOC ++ const MP4Tags* tags; ++ tags = MP4TagsAlloc(); ++ MP4TagsFetch( tags, MP4hFile ); ++#endif + version_string = malloc(strlen(faac_id_string) + 6); + strcpy(version_string, "FAAC "); + strcpy(version_string + 5, faac_id_string); ++#if !HAVE_DECL_MP4TAGSALLOC + MP4SetMetadataTool(MP4hFile, version_string); ++#else ++ MP4TagsSetEncodingTool(tags, version_string); ++#endif + free(version_string); + ++#if !HAVE_DECL_MP4TAGSALLOC + if (artist) MP4SetMetadataArtist(MP4hFile, artist); + if (writer) MP4SetMetadataWriter(MP4hFile, writer); + if (title) MP4SetMetadataName(MP4hFile, title); +@@ -923,8 +935,40 @@ int main(int argc, char *argv[]) + if (comment) MP4SetMetadataComment(MP4hFile, comment); + if (artSize) { + MP4SetMetadataCoverArt(MP4hFile, art, artSize); ++#else ++ if (artist) MP4TagsSetArtist(tags, artist); ++ if (writer) MP4TagsSetComposer(tags, writer); ++ if (title) MP4TagsSetName(tags, title); ++ if (album) MP4TagsSetAlbum(tags, album); ++ if (trackno > 0) { ++ MP4TagTrack tt; ++ tt.index = trackno; ++ tt.total = ntracks; ++ MP4TagsSetTrack(tags, &tt); ++ } ++ if (discno > 0) { ++ MP4TagDisk td; ++ td.index = discno; ++ td.total = ndiscs; ++ MP4TagsSetDisk(tags, &td); ++ } ++ if (compilation) MP4TagsSetCompilation(tags, compilation); ++ if (year) MP4TagsSetReleaseDate(tags, year); ++ if (genre) MP4TagsSetGenre(tags, genre); ++ if (comment) MP4TagsSetComments(tags, comment); ++ if (artSize) { ++ MP4TagArtwork mp4art; ++ mp4art.data = art; ++ mp4art.size = artSize; ++ mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2 ++ MP4TagsAddArtwork( tags, &mp4art ); ++#endif + free(art); + } ++#if HAVE_DECL_MP4TAGSALLOC ++ MP4TagsStore( tags, MP4hFile ); ++ MP4TagsFree( tags ); ++#endif + } + else + { +@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[]) + /* clean up */ + if (container == MP4_CONTAINER) + { ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ MP4Close(MP4hFile, 0); ++#else + MP4Close(MP4hFile); ++#endif + if (optimizeFlag == 1) + { + fprintf(stderr, "\n\nMP4 format optimization... "); ++#ifdef MP4_DETAILS_ERROR /* r453 fix */ + MP4Optimize(aacFileName, NULL, 0); ++#else ++ MP4Optimize(aacFileName, NULL); ++#endif + fprintf(stderr, "Done!"); + } + } else diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD new file mode 100644 index 000000000..e5b83a282 --- /dev/null +++ b/extra/farstream-0.1/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 174741 2013-01-05 21:31:32Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=farstream-0.1 +_pkgname=farstream +pkgver=0.1.2 +pkgrel=2 +pkgdesc="Audio/Video Communications Framework (legacy version)" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/Farstream" +license=('LGPL2.1') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' + 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') +options=('!libtool') +source=(http://freedesktop.org/software/$_pkgname/releases/$_pkgname/$_pkgname-$pkgver.tar.gz + farstream-0.1.2-prefer-vp8.patch + farstream-0.1.2-introspection-tag-order.patch) +sha256sums=('fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9' + '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5' + 'f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124') + +build() { + cd "$_pkgname-$pkgver" + + patch -Np1 -i "$srcdir/farstream-0.1.2-prefer-vp8.patch" + patch -Np1 -i "$srcdir/farstream-0.1.2-introspection-tag-order.patch" + + ./configure \ + --prefix=/usr \ + --with-package-name='Arch Linux Farstream 0.1 Package' \ + --with-package-origin='httpw://www.archlinux.org/' \ + --disable-static + make +} + +package() { + cd "$_pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch new file mode 100644 index 000000000..3283e1fd2 --- /dev/null +++ b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch @@ -0,0 +1,132 @@ +From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> +Date: Fri, 25 May 2012 17:06:59 -0400 +Subject: [PATCH] Gtk-doc tags belong after the description + +--- + farstream/fs-session.c | 16 +++++++--------- + farstream/fs-stream.c | 15 ++++++--------- + 2 files changed, 13 insertions(+), 18 deletions(-) + +diff --git a/farstream/fs-session.c b/farstream/fs-session.c +index 80794d1..abb1bc3 100644 +--- a/farstream/fs-session.c ++++ b/farstream/fs-session.c +@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass) + /** + * FsSession:codec-preferences: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the current preferences list for the local codecs. It is + * set by the user to specify the codec options and priorities. The user may + * change its value with fs_session_set_codec_preferences() at any time +@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass) + * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the + * payload type of the codec will be "reserved" and not be used by any + * dynamically assigned payload type. ++ * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_CODEC_PREFERENCES, +@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass) + /** + * FsSession:codecs: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the list of codecs used for this session. It will include the + * codecs and payload type used to receive media on this session. It will + * also include any configuration parameter that must be transmitted reliably +@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass) + * It is a #GList of #FsCodec. User must free this codec list using + * fs_codec_list_destroy() when done. + * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_CODECS, +@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass) + /** + * FsSession:codecs-without-config: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the same list of codecs as #FsSession:codecs without + * the configuration information that describes the data sent. It is suitable + * for configurations where a list of codecs is shared by many senders. +@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass) + * It is a #GList of #FsCodec. User must free this codec list using + * fs_codec_list_destroy() when done. + * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_CODECS_WITHOUT_CONFIG, +diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c +index b9e1320..110641d 100644 +--- a/farstream/fs-stream.c ++++ b/farstream/fs-stream.c +@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass) + /** + * FsStream:remote-codecs: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the list of remote codecs for this stream. They must be set by the + * user as soon as they are known using fs_stream_set_remote_codecs() + * (generally through external signaling). It is a #GList of #FsCodec. + * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_REMOTE_CODECS, +@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass) + /** + * FsStream:negotiated-codecs: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the list of negotiatied codecs, it is the same list as the list + * of #FsCodec from the parent #FsSession, except that the codec config data + * has been replaced with the data from the remote codecs for this stream. + * This is the list of #FsCodec used to receive data from this stream. + * It is a #GList of #FsCodec. + * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_NEGOTIATED_CODECS, +@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass) + /** + * FsStream:current-recv-codecs: + * +- * Type: GLib.List(FsCodec) +- * Transfer: full +- * + * This is the list of codecs that have been received by this stream. + * The user must free the list if fs_codec_list_destroy(). + * The "farstream-recv-codecs-changed" message is send on the #GstBus +@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass) + * also be emitted if the pad already exists, but the source material that + * will come to it is different. + * ++ * Type: GLib.List(FsCodec) ++ * Transfer: full + */ + g_object_class_install_property (gobject_class, + PROP_CURRENT_RECV_CODECS, +-- +1.7.8.6 + diff --git a/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch b/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch new file mode 100644 index 000000000..67009a8ad --- /dev/null +++ b/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch @@ -0,0 +1,12 @@ +diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences +--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 ++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 +@@ -41,6 +41,8 @@ feedback:nack/pli= + [video/H263] + feedback:nack/pli= + ++[video/VP8-DRAFT-IETF-01] ++ + [video/THEORA] + #feedback:tfrc= + feedback:nack/pli= diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD index a093e0fb1..419c3c9dc 100644 --- a/extra/fcgi/PKGBUILD +++ b/extra/fcgi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137828 2011-09-11 21:00:11Z pierre $ +# $Id: PKGBUILD 173924 2012-12-28 05:30:53Z pierre $ # Maintainer: tobias <tobias@justdreams.de> # Modified by: eliott <eliott@cactuswax.net> # Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com pkgname=fcgi pkgver=2.4.0 -pkgrel=7 +pkgrel=8 depends=('gcc-libs') pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI" arch=('i686' 'x86_64' 'mips64el') @@ -19,12 +19,12 @@ md5sums=('d15060a813b91383a9f3c66faf84867e' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gcc44-fix-include.patch" + patch -p1 -i "${srcdir}/gcc44-fix-include.patch" libtoolize --force aclocal autoconf automake --foreign - ./configure --prefix=/usr + ./configure --prefix=/usr --build=$CHOST make } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index dd8f767d4..76576ab8a 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168900 2012-10-16 14:01:32Z bisson $ +# $Id: PKGBUILD 174012 2013-01-01 13:02:26Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('25c3cf8af2d30b9cc176b36f2a78344ba9ae18f1') +sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 42433bb7b..711c37e7f 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 173148 2012-12-11 16:53:09Z pierre $ +# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $ pkgname=fetchmail -pkgver=6.3.23 +pkgver=6.3.24 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64' 'mips64el') @@ -17,8 +17,8 @@ install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('ac3a4a16dff60fe2651fdcf3d146c91399af2a27' - 'ec1268dad146d55b45dd3fb043613a7af77b890d' +sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535' + 'dff091c04ab64c25f7b6af758f93a75b969117e0' 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' diff --git a/extra/figlet/PKGBUILD b/extra/figlet/PKGBUILD new file mode 100644 index 000000000..c702dc589 --- /dev/null +++ b/extra/figlet/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 160446 2012-06-02 01:31:54Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=figlet +pkgver=2.2.5 +pkgrel=1 +pkgdesc="A program for making large letters out of ordinary text" +arch=('i686' 'x86_64') +url="http://www.figlet.org/" +license=('BSD') +depends=('glibc' 'sh') +source=(ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz) +sha1sums=('dda696958c161bd71d6590152c94c4f705415727') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DEFAULTFONTDIR=/usr/share/figlet/fonts all +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \ + DEFAULTFONTDIR=/usr/share/figlet/fonts install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD new file mode 100644 index 000000000..dde6d1e84 --- /dev/null +++ b/extra/file-roller/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 172925 2012-12-06 20:48:57Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=file-roller +pkgver=3.6.3 +pkgrel=1 +pkgdesc="Archive manipulator for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify') +makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl') +optdepends=('unrar: the RAR uncompression program' + 'zip: creates PKZIP-compatible .zip files' + 'p7zip: 7zip compression utility' + 'arj: ARJ archiver' + 'unace: extraction tool for the proprietary ace archive format') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=file-roller.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/file-roller \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/file-roller/file-roller.install b/extra/file-roller/file-roller.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/extra/file-roller/file-roller.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD new file mode 100644 index 000000000..fe9da598a --- /dev/null +++ b/extra/firefox/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 172184 2012-12-01 13:09:12Z foutrelis $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Jakub Schmidtke <sjakub@gmail.com> + +pkgname=firefox +pkgver=17.0.1 +pkgrel=1 +pkgdesc="Standalone web browser from mozilla.org" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' + 'libnotify' 'desktop-file-utils' 'hicolor-icon-theme' + 'libvpx' 'libevent' 'nss>=3.13.3' 'hunspell' 'sqlite') +makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' + 'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake') +optdepends=('wireless_tools: Location detection via available WiFi networks') +url="http://www.mozilla.org/projects/firefox" +install=firefox.install +options=(!emptydirs) +source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 + mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch) +md5sums=('13d616028eb77de927c29b6655c832c9' + '5644c7b42f51013e2023787938fa955e' + 'eb56667bc1919f2ed93e34bdfc21f7d6' + '150ac0fb3ac7b2114c8e8851a9e0516c' + '0d053487907de4376d67d8f499c5502b' + '52e52f840a49eb1d14be1c0065b03a93') + +build() { + cd mozilla-release + + cp ../mozconfig .mozconfig + patch -Np1 -i ../firefox-install-dir.patch + patch -Np1 -i ../shared-libs.patch + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + # Enable PGO + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build || _fail=1 + + kill $! || true + return $_fail +} + +package() { + cd mozilla-release + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/preferences/vendor.js" + + for i in 16 22 24 32 48 256; do + install -Dm644 browser/branding/official/default$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png" + done + + install -Dm644 ../firefox.desktop \ + "$pkgdir/usr/share/applications/firefox.desktop" + + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl} + + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" +} diff --git a/extra/firefox/firefox-install-dir.patch b/extra/firefox/firefox-install-dir.patch new file mode 100644 index 000000000..9c115f0eb --- /dev/null +++ b/extra/firefox/firefox-install-dir.patch @@ -0,0 +1,30 @@ +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/extra/firefox/firefox.desktop b/extra/firefox/firefox.desktop new file mode 100644 index 000000000..45005dc0f --- /dev/null +++ b/extra/firefox/firefox.desktop @@ -0,0 +1,121 @@ +[Desktop Entry] +Name=Firefox +Name[bn]=ফায়ারফক্স +Name[eo]=Fajrovulpo +Name[fi]=Firefox +Name[pa]=ਫਾਇਰਫੋਕਸ +Name[tg]=Рӯбоҳи оташин +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=firefox %u +Icon=firefox +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/extra/firefox/firefox.install b/extra/firefox/firefox.install new file mode 100644 index 000000000..1a1f4b16b --- /dev/null +++ b/extra/firefox/firefox.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/extra/firefox/mozconfig b/extra/firefox/mozconfig new file mode 100644 index 000000000..c13380e32 --- /dev/null +++ b/extra/firefox/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-startup-notification +ac_add_options --enable-gio +#ac_add_options --enable-gstreamer + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer + +# PGO +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 diff --git a/extra/firefox/shared-libs.patch b/extra/firefox/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/extra/firefox/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/extra/firefox/vendor.js b/extra/firefox/vendor.js new file mode 100644 index 000000000..d8d606bc1 --- /dev/null +++ b/extra/firefox/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD new file mode 100644 index 000000000..7698203e9 --- /dev/null +++ b/extra/flashplugin/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 173213 2012-12-13 12:39:25Z stephane $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgname=flashplugin +_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' +pkgver=11.2.202.258 +pkgrel=1 +pkgdesc='Adobe Flash Player' +url='http://get.adobe.com/flashplayer' +arch=('i686' 'x86_64') +depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme') +optdepends=('libvdpau: GPU acceleration on Nvidia card') +provides=('flashplayer') +license=('custom') +options=(!strip) +install=flashplugin.install +backup=(etc/adobe/mms.cfg) + +if [ "$CARCH" = "i686" ]; then + source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" + "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" + mms.cfg) + md5sums=('ed48f0db80969b1df1e9aab9a9276b8a' + '94ca2aecb409abfe36494d1a7ec7591d' + 'f34aae6279b40e0bd2abfb0d9963d7b8') +elif [ "$CARCH" = "x86_64" ]; then + source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" + "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" + mms.cfg) + md5sums=('999fec504e6d85b1b995264d796d49bf' + '94ca2aecb409abfe36494d1a7ec7591d' + 'f34aae6279b40e0bd2abfb0d9963d7b8') +fi + +package () { + install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so" + if [ "$CARCH" = x86_64 ]; then + install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" + else + install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" + fi + install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties" + for i in 16x16 22x22 24x24 32x32 48x48; do + install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png" + done + install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop" + install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop" + install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf" + install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg" +} diff --git a/extra/flashplugin/flashplugin.install b/extra/flashplugin/flashplugin.install new file mode 100644 index 000000000..8018fcba2 --- /dev/null +++ b/extra/flashplugin/flashplugin.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo " >> " + echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips," + echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg." + echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version." + echo " >> " +} + +post_upgrade() { + if [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then + post_install $1 + fi +} diff --git a/extra/flashplugin/mms.cfg b/extra/flashplugin/mms.cfg new file mode 100644 index 000000000..716525dd0 --- /dev/null +++ b/extra/flashplugin/mms.cfg @@ -0,0 +1,2 @@ +#Hardware video decoding +#EnableLinuxHWVideoDecode=1 diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD index 59b098efe..3441add5d 100644 --- a/extra/fluxbox/PKGBUILD +++ b/extra/fluxbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141366 2011-10-30 03:08:02Z eric $ +# $Id: PKGBUILD 174300 2013-01-04 04:35:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fluxbox -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64' 'mips64el') @@ -11,9 +11,9 @@ license=('MIT') depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ fluxbox.desktop) -sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c' +sha1sums=('6892259dd495424291194fde242230cca95abce3' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD new file mode 100644 index 000000000..a40138ff3 --- /dev/null +++ b/extra/foomatic/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 163470 2012-07-12 17:32:05Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase="foomatic" +pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree') +arch=('i686' 'x86_64') # needs to be changed in the subpackages when makepkg will support it +_snapdate=20120712 +_filtersver=4.0.17 +_enginever=4.0.8 +pkgver=${_filtersver}_${_snapdate} +pkgrel=1 +epoch=1 +makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') +_url1=http://www.openprinting.org/download/foomatic/ +_url2=ftp://ftp.archlinux.org/other/foomatic/ +source=(${_url1}/$pkgbase-filters-${_filtersver}.tar.gz + ${_url1}/$pkgbase-db-engine-${_enginever}.tar.gz + ${_url2}/$pkgbase-db-4.0-${_snapdate}.tar.gz # switch after build url1 -> url2 + ${_url2}/$pkgbase-db-nonfree-${_snapdate}.tar.gz) # switch after build url1 -> url2 +url="http://www.linuxprinting.org/foomatic.html" +options=('!emptydirs') +md5sums=('b05f5dcbfe359f198eef3df5b283d896' + '5283cd5125a96dc0b35d896326512b1a' + '7ea8ed6c34495e237d8071ab5821e871' + 'da4fbbb3556f56d2f5f922af3face539') + +package_foomatic-db() { + + pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files." +# arch=('any') + license=('GPL' 'custom') + depends=('perl' 'libxml2') + replaces=('foomatic-db-ppd' 'foomatic-db-hpijs') + conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs') + provides=('foomatic-db-hpijs') + + cd ${srcdir}/${pkgname}-${_snapdate} + ./configure --prefix=/usr + make DESTDIR=${pkgdir} install + install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} + +package_foomatic-filters() { + + pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format." +# arch=('i686' 'x86_64') + license=('GPL') + backup=(etc/foomatic/filter.conf) + depends=('glibc' 'dbus-core') + optdepends=('perl: for the "beh" Backend End Handler used by cups' + 'net-snmp: certain (mostly HP) printers need it to work') + + cd ${srcdir}/foomatic-filters-${_filtersver} + ./configure --prefix=/usr --sysconfdir=/etc + make + make DESTDIR=${pkgdir} install +} + +package_foomatic-db-engine() { + + pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs." +# arch=(i686 x86_64) + license=('GPL') + depends=('perl' 'libxml2' 'foomatic-filters' 'bash') + + cd ${srcdir}/foomatic-db-engine-${_enginever} + ./configure --prefix=/usr + make + eval `perl -V:archname` + make DESTDIR=${pkgdir} \ + INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \ + INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \ + INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install + /usr/bin/find ${pkgdir} -name '.packlist' -delete + # fix permissions + chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl} +} + +package_foomatic-db-nonfree() { + + pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses" +# arch=('any') + license=('custom') + depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db') + + cd ${srcdir}/foomatic-db-nonfree-${_snapdate} + ./configure --prefix=/usr + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD index 01c3b1a78..cfcc9c583 100644 --- a/extra/freealut/PKGBUILD +++ b/extra/freealut/PKGBUILD @@ -4,7 +4,7 @@ pkgname=freealut pkgver=1.1.0 -pkgrel=4 +pkgrel=4.1 pkgdesc="OpenAL Utility Toolkit (ALUT)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openal.org" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index 5f716c1c1..6a4b8e41c 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 171732 2012-11-21 18:26:59Z andyrtr $ +# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=14 +pkgrel=15 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64 'mips64el') url="http://freenx.berlios.de" license=('GPL') -depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' +depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') optdepends=('cups: adds printing support') makedepends=('imake') @@ -48,6 +48,7 @@ build() { patch -Np0 -i ${srcdir}/remove-dialog.patch sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample + sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig sed -i -e 's,netcat,nc,g' nxloadconfig sed -i -e 's/utmp/nx/g' nxsetup sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 3bd67cbf0..ff0ed781c 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161854 2012-06-15 16:53:25Z andyrtr $ +# $Id: PKGBUILD 173707 2012-12-21 16:29:38Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.10 -pkgrel=1 +pkgver=2.4.11 +pkgrel=2 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('13286702e9390a91661f980608adaff1' +md5sums=('b93435488942486c8d0ca22e8f768034' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD index 607a963b0..09e6e56cb 100644 --- a/extra/fribidi/PKGBUILD +++ b/extra/fribidi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165893 2012-09-03 05:58:50Z giovanni $ +# $Id: PKGBUILD 173837 2012-12-24 18:38:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi -pkgver=0.19.4 -pkgrel=1.1 +pkgver=0.19.5 +pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,7 +12,7 @@ url="http://fribidi.org" depends=('glibc') options=('!libtool') source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0173f98ff929782d45819fc4a813c175') +md5sums=('925bafb97afee8a2fc2d0470c072a155') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD new file mode 100644 index 000000000..959fc1186 --- /dev/null +++ b/extra/ghostscript/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 165016 2012-08-08 19:40:49Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +pkgname=ghostscript +pkgver=9.06 +pkgrel=1 +pkgdesc="An interpreter for the PostScript language" +arch=('i686' 'x86_64') +license=('GPL3' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? +makedepends=('gtk2' 'gnutls') +optdepends=('texlive-core: needed for dvipdf' + 'gtk2: needed for gsx') +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +options=('!libtool' '!makeflags') +md5sums=('46f9ebe40dc52755287b30704270db11') + +build() { + cd ${srcdir}/ghostscript-${pkgver} + + # force it to use system-libs + rm -rf jpeg libpng zlib jasper expat tiff lcms freetype + + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --with-install-cups \ + --enable-fontconfig \ + --enable-freetype \ + --without-luratech \ + --with-system-libtiff \ + --disable-compile-inits #--help # needed for linking with system-zlib + make + + # Build IJS + cd ${srcdir}/ghostscript-${pkgver}/ijs + ./autogen.sh + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${srcdir}/ghostscript-${pkgver} + make DESTDIR=${pkgdir} \ + cups_serverroot=${pkgdir}/etc/cups \ + cups_serverbin=${pkgdir}/usr/lib/cups install soinstall + + # install missing doc files # http://bugs.archlinux.org/task/18023 + install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ + + mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ + + # remove unwanted localized man-pages + rm -rf $pkgdir/usr/share/man/[^man1]* + + # install IJS + cd ${srcdir}/ghostscript-${pkgver}/ijs + make DESTDIR=${pkgdir} install +} diff --git a/extra/ghostscript/svn_rev11948.diff b/extra/ghostscript/svn_rev11948.diff new file mode 100644 index 000000000..92abb0d98 --- /dev/null +++ b/extra/ghostscript/svn_rev11948.diff @@ -0,0 +1,16 @@ +Modified: trunk/gs/base/gximag3x.c +=================================================================== +--- trunk/gs/base/gximag3x.c 2010-12-10 19:50:53 UTC (rev 11947) ++++ trunk/gs/base/gximag3x.c 2010-12-11 23:02:25 UTC (rev 11948) +@@ -241,7 +241,9 @@ + const gs_image3x_mask_t *pixm = + (i == 0 ? &pim->Opacity : &pim->Shape); + +- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict; ++ /* Use memcpy because direct assignment breaks ANSI aliasing */ ++ /* rules and causes SEGV with gcc 4.5.1 */ ++ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict)); + mask[i].image.type = type1; + mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent; + } + diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 188069d38..bdb4ced38 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173146 2012-12-11 15:31:20Z dan $ +# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.0.2 +pkgver=1.8.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -28,11 +28,13 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" git-daemon git-daemon.conf git-daemon@.service - git-daemon.socket) + git-daemon.socket + fix-git-build-python.patch) build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" + patch -Np1 < ../fix-git-build-python.patch make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -109,9 +111,10 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('1aca109d4a719fe5bc43d25927fbc7d9' - 'ab83283a5b3c73ab711a9f02896ca12e' +md5sums=('a2c6f4404c5e432b47474d246ca83c7e' + '8da825142aed9f37f80ad67164990373' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002') + 'f67869315c2cc112e076f0c73f248002' + '7fd505fdcd0cd0223e5b8ad641090de8') diff --git a/extra/git/fix-git-build-python.patch b/extra/git/fix-git-build-python.patch new file mode 100644 index 000000000..11618a49a --- /dev/null +++ b/extra/git/fix-git-build-python.patch @@ -0,0 +1,109 @@ +Date: Wed, 2 Jan 2013 03:59:35 -0500
+From: Jeff King <peff@peff.net>
+To: Junio C Hamano <gitster@pobox.com>
+Cc: Dan McGee <dan@archlinux.org>, GIT Mailing-list <git@vger.kernel.org>,
+ Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
+ David Michael Barr <b@rr-dav.id.au>,
+ "Eric S. Raymond" <esr@thyrsus.com>
+Subject: Re: Test failures with python versions when building git 1.8.1
+Message-ID: <20130102085935.GB9328@sigill.intra.peff.net>
+References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ@mail.gmail.com>
+ <7va9ss5fhq.fsf@alter.siamese.dyndns.org>
+ <20130102065345.GA8685@sigill.intra.peff.net>
+ <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+In-Reply-To: <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+
+On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
+
+> Jeff King <peff@peff.net> writes:
+>
+> > [1] This symlink is doubly wrong, because any use of symbolic links
+> > in the test scripts needs to depend on the SYMLINKS prereq, and this
+> > does not.
+>
+> Yeah, I think we have discussed this once already in
+>
+> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714
+
+Thanks for the pointer; it looks like nothing productive came of the
+earlier discussion. To give a hat trick of failure to this line of code,
+I notice that the existing code also does not properly put quotes around
+$GIT_BUILD_DIR.
+
+> > [2] In both the current code and what I showed above, the test scripts
+> > depend on things in contrib/. This is probably a bad idea in
+> > general, as the quality of what goes into contrib is not as closely
+> > watched (especially with respect to things like portability).
+> > Certainly I would not have known to look more carefully at a patch
+> > to contrib/svn-fe for breakage to the test suite.
+>
+> As long as such tests are made skippable with appropriate
+> prerequisites, I do not think it is bad to have their tests in t/; I
+> would say it is rather better than having them in contrib/ and leave
+> it not run by anybody, which happened to some of the stuff in
+> contrib/ already.
+
+Good point. While my sense of decorum wants to keep contrib totally
+split out, from a practical point of view, it is better to have more
+people run the tests and report failures than not.
+
+Whether we end up doing something with contrib and tests or not, the
+patch below gives a minimal fix in the meantime. Dan, does it fix your
+problem?
+
+-- >8 --
+Subject: [PATCH] t9020: don't run python from $PATH
+
+In t9020, we symlink in a python script from contrib to help
+with the testing. However, we don't munge its #!-line, which
+means we may run the wrong python (we want the one in
+PYTHON_PATH). On top of this, we use a symlink without
+checking the SYMLINKS prereq, and we fail to properly quote
+GIT_BUILD_DIR, which may have spaces.
+
+Instead of symlinking, let's just write a small script which
+will feed the contrib script to PYTHON_PATH. To avoid
+quoting issues, we just export the variables the script
+needs to run.
+
+Signed-off-by: Jeff King <peff@peff.net>
+---
+ t/t9020-remote-svn.sh | 5 ++++-
+ t/test-lib.sh | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
+index 4f2dfe0..416623b 100755
+--- a/t/t9020-remote-svn.sh
++++ b/t/t9020-remote-svn.sh
+@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"
+
+ # We override svnrdump by placing a symlink to the svnrdump-emulator in .
+ export PATH="$HOME:$PATH"
+-ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
++export GIT_BUILD_DIR
++write_script svnrdump <<\EOF
++exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"
++EOF
+
+ init_git () {
+ rm -fr .git &&
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index f50f834..c17db19 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -45,7 +45,7 @@ fi
+ fi
+
+ . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
+-export PERL_PATH SHELL_PATH
++export PERL_PATH SHELL_PATH PYTHON_PATH
+
+ # if --tee was passed, write the output not only to the terminal, but
+ # additionally to the file test-results/$BASENAME.out, too.
+--
+1.8.1.rc3.4.gf3a2f57
+
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 697e93523..74e7418b7 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170173 2012-11-04 03:56:58Z eric $ +# $Id: PKGBUILD 174150 2013-01-03 05:50:14Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=2.1.0 -_fmver=2.1.0 +pkgver=2.2.0 +_fmver=2.2.0 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,7 +15,7 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) -sha1sums=('cb5c31639f0aafb5ef45b9f3895fa05dceda9b7d' +sha1sums=('01697febfacc466b1cf0d7932c83ffd24b6e6784' 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' '197b58f40880995d6442fd42a58fa1f4594fd19d' diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 57ebb7056..8ef55d234 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el') url="http://projects.gnome.org/gnome-color-manager/" license=(GPL2) depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' - 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk') + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk' 'libexif') makedepends=('intltool' 'yelp-tools') install=gnome-color-manager.install options=('!libtool' '!emptydirs') diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 93502f0a3..bc897d81c 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165143 2012-08-11 18:49:18Z eric $ +# $Id: PKGBUILD 173829 2012-12-24 16:03:19Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash pkgver=2.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnucash.org" license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') +depends=('gtkhtml' 'slib' 'goffice0.8' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' 'perl-finance-quote: for stock information lookups' diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index bcf588262..078ac808d 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 160479 2012-06-02 10:26:10Z bluewind $ +# $Id: PKGBUILD 173830 2012-12-24 16:09:54Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.10.17 -pkgrel=2 +pkgver=1.12.0 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') -depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') -optdepends=('pygobject: for python plugin support' +depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils') +optdepends=('python2-gobject: for python plugin support' + 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' 'yelp: for viewing the help manual') install=gnumeric.install -options=('libtool') +options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') +sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,15 +26,11 @@ build() { sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-schemas-install --enable-ssindex + --enable-ssindex --disable-schemas-compile make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}/etc/gconf" } diff --git a/extra/gnumeric/gnumeric.install b/extra/gnumeric/gnumeric.install index 50ee0a7e2..b4b8223dd 100644 --- a/extra/gnumeric/gnumeric.install +++ b/extra/gnumeric/gnumeric.install @@ -1,26 +1,19 @@ -pkgname=gnumeric - post_install() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then + usr/sbin/gconfpkg --uninstall gnumeric + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q + post_install } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 2efa71065..97cc1b82a 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 171957 2012-11-25 10:16:20Z andyrtr $ +# $Id: PKGBUILD 174275 2013-01-03 18:00:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.5 +pkgver=3.1.6 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" +url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') -source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('cd4e5a5382b0e0c76c6cffe30d48bbb6' - '3a8526473e0d47401f88d05727949fc9') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('835a5d20def765cd49ad7274ff3e7493' + '9f8569a4fcb65809a369df1575f10138') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,14 +24,13 @@ build() { --with-zlib \ --disable-static \ --disable-guile \ - --disable-valgrind-tests # --disable-libdane \ + --disable-valgrind-tests make } check() { cd "${srcdir}/${pkgname}-${pkgver}" - make -k check # passes all || /bin/true - #make -k check || /bin/true # some new tests are broken + make -k check } package() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 1c2d63bbd..f4fb6ff1b 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 139546 2011-10-03 12:22:52Z jgc $ +# $Id: PKGBUILD 173831 2012-12-24 16:09:55Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.8.17 -pkgrel=1.1 +pkgver=0.10.0 +pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org" license=('GPL') options=('!libtool') -depends=('gtk2' 'gconf' 'libgsf') -makedepends=('pkgconfig' 'intltool' 'gtk-doc') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - use-apiver-for-dirs.patch) -sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15' - '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') +depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static --enable-introspection make } diff --git a/extra/goffice0.8/PKGBUILD b/extra/goffice0.8/PKGBUILD new file mode 100644 index 000000000..8d794e218 --- /dev/null +++ b/extra/goffice0.8/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 173347 2012-12-19 14:13:59Z jgc $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=goffice0.8 +pkgver=0.8.17 +pkgrel=2 +pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL') +options=('!libtool') +depends=('gtk2' 'gconf' 'libgsf') +conflicts=('goffice<0.10') +makedepends=('pkgconfig' 'intltool' 'gtk-doc') +source=(http://ftp.gnome.org/pub/gnome/sources/goffice/${pkgver%.*}/goffice-${pkgver}.tar.xz + use-apiver-for-dirs.patch) +sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15' + '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270') + +build() { + cd "${srcdir}/goffice-${pkgver}" + patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" + sed -i -e 's/glib\/gregex.h/glib.h/' configure.in + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/goffice-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/goffice0.8/use-apiver-for-dirs.patch b/extra/goffice0.8/use-apiver-for-dirs.patch new file mode 100644 index 000000000..3d0909da3 --- /dev/null +++ b/extra/goffice0.8/use-apiver-for-dirs.patch @@ -0,0 +1,32 @@ +--- configure.in.orig 2011-09-07 08:45:49.687783970 +0000 ++++ configure.in 2011-09-07 09:12:55.709382840 +0000 +@@ -418,7 +418,7 @@ + fi + + dnl ************************************************** +-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) ++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The package name, for gettext]) + AM_GLIB_GNU_GETTEXT +@@ -638,9 +638,9 @@ + dnl ****************** + dnl + dnl These are changed in goffice.c for WIN32 packages +-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') +-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') +-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') ++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') + AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') + dnl + AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') +--- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000 ++++ libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 +@@ -11,4 +11,4 @@ + Libs.private: @EXTRA_LIBS@ + Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ + +-PluginDir=${libdir}/goffice/@VERSION@/plugins ++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index fab274a09..5e504f972 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $ +# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.0.3 +pkgver=1.2.0 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') -url="http://graphite.sil.org/" +url="http://projects.palaso.org/projects/graphitedev" pkgdesc='reimplementation of the SIL Graphite text processing engine' -license=('custom_SIL Dual license') +license=('LGPL' 'GPL' 'custom') depends=('gcc-libs') -makedepends=('cmake' 'freetype2') +makedepends=('cmake' 'freetype2' 'python2') +# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('3bf481ca95109b14435125c0dd1f2217') +md5sums=('f5ef3f7f10fa8c3542c6a085a233080b') build() { cd "${srcdir}" + sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py} mkdir build cd build cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DGRAPHITE2_COMPARE_RENDERER=OFF make + make docs } check() { cd "${srcdir}"/build + sed -i "s:python:python2:g" tests/CTestTestfile.cmake ctest } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index b6dc5d8f7..1b7a93e67 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173173 2012-12-12 00:31:48Z eric $ +# $Id: PKGBUILD 173840 2012-12-25 00:34:21Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=11 +pkgrel=12 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index aa1e6950c..44672b04c 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171701 2012-11-21 14:49:21Z heftig $ +# $Id: PKGBUILD 173802 2012-12-24 02:14:25Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -11,9 +11,9 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'bzip2') makedepends=('yasm') options=(!libtool !emptydirs) -provides=("gst-ffmpeg=$pkgver-pkgrel") +provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959') +sha256sums=('5685fa94eaadad11017bca4fd5f4acc9f3bea63a8be89030e86b341e5a491a50') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index 145af5915..6e8c3afa5 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171697 2012-11-21 14:46:10Z heftig $ +# $Id: PKGBUILD 174936 2013-01-09 12:40:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.3 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,14 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('066ba8a7fa709a25ad291f7b21329b73f513637aafceee00396e588e723d7f9e') +sha256sums=('37ce6e09b99ef3879111c861ee5090582b4fd4c764e81ab6eb2b2b4dd77d7173') build() { cd $pkgbase-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ @@ -29,7 +31,7 @@ build() { check() { cd $pkgbase-$pkgver # Testsuite fails on one test. Some refcount leak - #make check + make check } package_gst-plugins-base-libs() { diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index c9b589016..bf922413f 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 171698 2012-11-21 14:46:59Z heftig $ +# $Id: PKGBUILD 174938 2013-01-09 13:33:08Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.3 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils') +depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('5cfc3f18dede15d60f0af8666f68193e') +sha256sums=('53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5') build() { cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Good Plugins (Archlinux)" \ diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index eb752099d..c0e5362f4 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171700 2012-11-21 14:48:27Z heftig $ +# $Id: PKGBUILD 173512 2012-12-19 19:49:27Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('b8f4cfef12201f19c53a4cde7bc4fef995740c566ea45921d4473f3714e4d8c0') +sha256sums=('509ec52b58523e6ab1f9d9facdbbf8417fb95bbcb1a90e1ec53f90019da710d8') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index fe470fd26..2d683f430 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171696 2012-11-21 14:45:21Z heftig $ +# $Id: PKGBUILD 174933 2013-01-09 12:15:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.3 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('69ac49e2ae9cd2ea5f789de641aeb338bb8731961acfced08ae1c76a797fe6b1') +sha256sums=('26c2827567f09a46d0a3bc1e7f8696b2ae72b047306539178079abae487c5b77') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gstreamer0.10-bad/PKGBUILD b/extra/gstreamer0.10-bad/PKGBUILD new file mode 100644 index 000000000..6182c5133 --- /dev/null +++ b/extra/gstreamer0.10-bad/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 168314 2012-10-08 14:06:19Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-bad +pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins') +pkgver=0.10.23 +pkgrel=3 +arch=('i686' 'x86_64') +license=('LGPL' 'GPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') +url="http://gstreamer.freedesktop.org/" +options=(!libtool !emptydirs) +source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz) +md5sums=('e4822fa2cc933768e2998311a1565979') + +build() { + cd "${srcdir}/gst-plugins-bad-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Bad Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + + make + sed -e 's/gst sys ext/gst/' -i Makefile +} + +# Disable for now: 2 tests fail, one of them is because of not having a camera during build. +#check() { +# cd "${srcdir}/gst-plugins-bad-${pkgver}" +# make check +#} + +package_gstreamer0.10-bad() { + pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-bad-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-bad-plugins() { + pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" + depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus') + groups=('gstreamer0.10-plugins') + install=gstreamer0.10-bad-plugins.install + + cd "${srcdir}/gst-plugins-bad-${pkgver}" + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C sys DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install b/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install new file mode 100644 index 000000000..3a36b0ccb --- /dev/null +++ b/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD new file mode 100644 index 000000000..3d0b13a61 --- /dev/null +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-good +pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') +pkgver=0.10.31 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') +url="http://gstreamer.freedesktop.org/" +options=(!libtool !emptydirs) +source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) +sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') + +build() { + cd "${srcdir}/gst-plugins-good-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --disable-schemas-install \ + --disable-hal \ + --disable-esd \ + --with-package-name="GStreamer Good Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + + make + sed -e 's/gst sys ext/gst/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-good-${pkgver}" + make check +} + +package_gstreamer0.10-good() { + depends=('gstreamer0.10-base>=0.10.34' 'bzip2') + pkgdesc="GStreamer Multimedia Framework Good plugin libraries" + + cd "${srcdir}/gst-plugins-good-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/etc/gconf" +} + +package_gstreamer0.10-good-plugins() { + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') + pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') + conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') + install=gstreamer0.10-good-plugins.install + + cd "${srcdir}/gst-plugins-good-${pkgver}" + make -C sys DESTDIR="${pkgdir}" install + make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" +} diff --git a/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install new file mode 100644 index 000000000..e343beea5 --- /dev/null +++ b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install @@ -0,0 +1,19 @@ +pkgname=gstreamer0.10-good-plugins + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + pre_remove + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 78c720d81..335a58360 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170745 2012-11-10 22:04:15Z heftig $ +# $Id: PKGBUILD 174777 2013-01-07 13:06:57Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.6.2 +pkgver=3.6.4 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') @@ -14,16 +14,12 @@ options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini wacom.patch) -sha256sums=('aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') + settings.ini) +sha256sums=('dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "gtk+-$pkgver" - # Partially revert BGO#673440 in order to fix BGO#674157 - patch -Np1 -i ../wacom.patch - CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD index 46f296191..50917eb3c 100644 --- a/extra/gtkhtml/PKGBUILD +++ b/extra/gtkhtml/PKGBUILD @@ -19,7 +19,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gtkhtml \ --localstatedir=/var --disable-static \ - --disable-deprecated-warning-flags + --disable-deprecated-warning-flags LDFLAGS="$LDFLAGS -lgthread-2.0" make } diff --git a/extra/habak/PKGBUILD b/extra/habak/PKGBUILD index b57221ec5..793c6ea34 100644 --- a/extra/habak/PKGBUILD +++ b/extra/habak/PKGBUILD @@ -16,7 +16,7 @@ md5sums=('bee5c394989367f7a4c5cb9ec99d307c') build() { cd $srcdir/$pkgname-$pkgver - export LDFLAGS=${LDFLAGS/,--sort-common,--as-needed//} + export LDFLAGS="${LDFLAGS/,--sort-common,--as-needed//} -lX11" make } diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index c531090ac..c1ec92531 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 173026 2012-12-08 21:00:09Z heftig $ +# $Id: PKGBUILD 173764 2012-12-22 16:44:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz pkgver=0.9.9 -pkgrel=1 +pkgrel=2 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" license=('MIT') -depends=('icu' 'glib2' 'freetype2' 'graphite') +depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0') makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD new file mode 100644 index 000000000..0308e51ef --- /dev/null +++ b/extra/hdf5-cpp-fortran/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 174838 2013-01-07 19:57:53Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: damir <damir@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=hdf5-cpp-fortran +_pkgname=hdf5 +pkgver=1.8.10 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="General purpose library and file format for storing scientific data" +url="http://www.hdfgroup.org/HDF5/" +license=('custom') +depends=('zlib' 'sh' 'gcc-libs') +makedepends=('time' 'gcc-fortran') +conflicts=('hdf5') +provides=('hdf5') +source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) +options=('!libtool') +sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') + +build() { + cd $srcdir/${_pkgname}-${pkgver/_/-} + export CFLAGS="${CFLAGS/O2/O0}" + export CXXFLAGS="${CFLAGS}" + ./configure --prefix=/usr --disable-static \ + --enable-hl \ + --enable-cxx \ + --enable-fortran \ + --enable-linux-lfs \ + --enable-production \ + --with-pic \ + --docdir=/usr/share/doc/hdf5/ \ + --with-pthread=/usr/lib/ \ + --disable-sharedlib-rpath + make +} + +package() { + cd $srcdir/${_pkgname}-${pkgver/_/-} + + make -j1 DESTDIR=${pkgdir} install + + install -d -m755 $pkgdir/usr/share/licenses/${pkgname} + install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD new file mode 100644 index 000000000..63b23bbf0 --- /dev/null +++ b/extra/hdf5-openmpi/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: damir <damir@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> +# Contributor: Jed Brown <jed@59A2.org> +# Contributor: Simone Pezzuto <junki.gnu@gmail.com> + +pkgname=hdf5-openmpi +_pkgname=hdf5 +pkgver=1.8.10 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)" +url="http://www.hdfgroup.org/HDF5/" +license=('custom') +depends=('zlib' 'sh' 'openmpi') +makedepends=('time') +provides=('hdf5') +conflicts=('hdf5') +source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) +options=('!libtool') +sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') + +build() { + cd $srcdir/${_pkgname}-${pkgver/_/-} + export CFLAGS="${CFLAGS/O2/O0}" + export CXXFLAGS="${CFLAGS}" + ./configure \ + CXX="mpicxx" \ + CC="mpicc" \ + FC="mpif90" \ + F9X="mpif90" \ + RUNPARALLEL="mpirun" \ + OMPI_MCA_disable_memory_allocator=1 \ + --prefix=/usr \ + --with-pthread=/usr/lib/ \ + --enable-linux-lfs \ + --enable-unsupported \ + --enable-shared \ + --disable-static \ + --enable-production=yes \ + --with-zlib \ + --with-default-api-version=v18 \ + --enable-parallel=yes \ + --enable-cxx \ + --disable-sharedlib-rpath + + make +} + +package() { + cd $srcdir/${_pkgname}-${pkgver/_/-} + + make -j1 DESTDIR=${pkgdir} install + + install -d -m755 $pkgdir/usr/share/$_pkgname + mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples} + + install -d -m755 $pkgdir/usr/share/licenses/${pkgname} + install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD index 3901c3612..67f7f62b4 100644 --- a/extra/hdf5/PKGBUILD +++ b/extra/hdf5/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $ +# $Id: PKGBUILD 174839 2013-01-07 19:58:29Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: damir <damir@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=hdf5 -pkgver=1.8.8 -pkgrel=1.1 +pkgver=1.8.10 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="General purpose library and file format for storing scientific data" url="http://www.hdfgroup.org/HDF5/" @@ -15,7 +15,7 @@ depends=('zlib' 'sh') makedepends=('time') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('1bc16883ecd631840b70857bea637a06eb0155da') +sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c') build() { cd $srcdir/${pkgname}-${pkgver/_/-} diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD new file mode 100644 index 000000000..d003d86ff --- /dev/null +++ b/extra/hplip/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 172170 2012-11-30 15:22:14Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor : Rémy Oudompheng <remy@archlinux.org> +# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> + +pkgname=hplip +pkgver=3.12.11 +pkgrel=2 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +arch=('i686' 'x86_64') +url="http://hplipopensource.com" +license=('GPL') +depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' + 'net-snmp>=5.7.1' 'wget') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') +optdepends=('cups: for printing support' + 'python2-dbus: for dbus support' + 'sane: for scanner support' + 'python2-imaging: for commandline scanning support' + 'python2-notify: for Desktop notification support' + 'rpcbind: for network support' + 'python2-pyqt: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' + 'hplip-plugin: binary blobs for specific devices' + 'libusbx: for advanced usb support') +options=('!libtool') +install=hplip.install +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} + cups-1.6-buildfix.diff) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix build with cups 1.6 - FC hplip-ipp-accessors.patch + patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" + + export PYTHON=python2 + + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py + sed -i 's|python ./print.py|python2 ./print.py|' scan.py + sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py + sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + + # fix rc script path - FS#31921 + sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py + + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + + export AUTOMAKE='automake --foreign' + autoreconf --force --install + + ./configure --prefix=/usr \ + --enable-qt4 \ + --disable-foomatic-rip-hplip-install \ + --enable-foomatic-ppd-install \ + --enable-hpcups-install \ + --enable-new-hpcups \ + --enable-cups-ppd-install \ + --enable-cups-drv-install \ + --enable-hpijs-install \ + --enable-foomatic-drv-install \ + --enable-pp-build \ + --enable-udev-acl-rules #--help + + make +} + +package() { + #cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${pkgver/.a/a}" + make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} + # remove HAL .fdi file because HAL is no longer used + rm -rf "$pkgdir"/usr/share/hal + # log dir should not be world writeable + chmod 775 "$pkgdir"/var/log/hp{,/tmp} +} +md5sums=('6caadc4a9e49076c284b146e2dce2937' + '835d3b854d097f229a32291338fa2320' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/extra/hplip/cups-1.6-buildfix.diff b/extra/hplip/cups-1.6-buildfix.diff new file mode 100644 index 000000000..8341a1610 --- /dev/null +++ b/extra/hplip/cups-1.6-buildfix.diff @@ -0,0 +1,392 @@ +diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c +--- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors 2012-06-18 12:41:19.000000000 +0200 ++++ hplip-3.12.6/prnt/cupsext/cupsext.c 2012-07-19 17:11:47.606524137 +0200 +@@ -87,6 +87,46 @@ typedef int Py_ssize_t; + #define PY_SSIZE_T_MIN INT_MIN + #endif + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetCount(attr) attr->num_values ++#define ippGetGroupTag(attr) attr->group_tag ++#define ippGetValueTag(attr) attr->value_tag ++#define ippGetName(attr) attr->name ++#define ippGetBoolean(attr, element) attr->values[element].boolean ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetStatusCode(ipp) ipp->request.status.status_code ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++ ++static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) ++{ ++ ipp->request.op.operation_id = op; ++ return (1); ++} ++ ++static int ippSetRequestId( ipp_t *ipp, int request_id ) ++{ ++ ipp->request.any.request_id = request_id; ++ return (1); ++} ++#endif + + int g_num_options = 0; + cups_option_t * g_options; +@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self, + request = ippNew(); + language = cupsLangDefault(); + +- request->request.op.operation_id = CUPS_GET_PRINTERS; +- request->request.any.request_id = 1; ++ ippSetOperation( request, CUPS_GET_PRINTERS ); ++ ippSetRequestId ( request, 1); + + ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, + "attributes-charset", NULL, cupsLangEncoding( language ) ); +@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self, + ipp_pstate_t state; + int i = 0; + +- for ( attr = response->attrs; attr != NULL; attr = attr->next ) ++ for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) ) + { +- while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER ) +- attr = attr->next; ++ while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER ) ++ attr = ippNextAttribute( response ); + + if ( attr == NULL ) + break; +@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self, + state = IPP_PRINTER_IDLE; + accepting = 0; + +- while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER ) ++ while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER ) + { +- if ( strcmp( attr->name, "printer-name" ) == 0 && +- attr->value_tag == IPP_TAG_NAME ) +- name = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "device-uri" ) == 0 && +- attr->value_tag == IPP_TAG_URI ) +- device_uri = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 && +- attr->value_tag == IPP_TAG_URI ) +- printer_uri = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "printer-info" ) == 0 && +- attr->value_tag == IPP_TAG_TEXT ) +- info = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "printer-location" ) == 0 && +- attr->value_tag == IPP_TAG_TEXT ) +- location = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 && +- attr->value_tag == IPP_TAG_TEXT ) +- make_model = attr->values[ 0 ].string.text; +- +- else if ( strcmp( attr->name, "printer-state" ) == 0 && +- attr->value_tag == IPP_TAG_ENUM ) +- state = ( ipp_pstate_t ) attr->values[ 0 ].integer; +- +- else if (!strcmp(attr->name, "printer-is-accepting-jobs") && +- attr->value_tag == IPP_TAG_BOOLEAN) +- accepting = attr->values[ 0 ].boolean; ++ if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_NAME ) ++ name = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_URI ) ++ device_uri = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_URI ) ++ printer_uri = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_TEXT ) ++ info = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_TEXT ) ++ location = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_TEXT ) ++ make_model = ippGetString( attr, 0, NULL ); ++ ++ else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 && ++ ippGetValueTag( attr ) == IPP_TAG_ENUM ) ++ state = ( ipp_pstate_t ) ippGetInteger( attr, 0 ); ++ ++ else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") && ++ ippGetValueTag( attr ) == IPP_TAG_BOOLEAN) ++ accepting = ippGetBoolean( attr, 0 ); + +- attr = attr->next; ++ attr = ippNextAttribute( response ); + } + + if ( device_uri == NULL ) +@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self, + request = ippNew(); + language = cupsLangDefault(); + +- request->request.op.operation_id = CUPS_ADD_PRINTER; +- request->request.any.request_id = 1; ++ ippSetOperation( request, CUPS_ADD_PRINTER ); ++ ippSetRequestId ( request, 1 ); + + ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, + "attributes-charset", NULL, cupsLangEncoding( language ) ); +@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self, + } + else + { +- status = response->request.status.status_code; ++ status = ippGetStatusCode( response ); + //ippDelete( response ); + r = 1; + } +@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self, + */ + request = ippNew(); + +- request->request.op.operation_id = CUPS_DELETE_PRINTER; +- request->request.op.request_id = 1; ++ ippSetOperation( request, CUPS_DELETE_PRINTER ); ++ ippSetRequestId ( request, 1 ); + + language = cupsLangDefault(); + +@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self, + */ + response = cupsDoRequest( http, request, "/admin/" ); + +- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) ++ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) + { + r = 1; + } +@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject * + + request = ippNew(); + +- request->request.op.operation_id = CUPS_SET_DEFAULT; +- request->request.op.request_id = 1; ++ ippSetOperation( request, CUPS_SET_DEFAULT ); ++ ippSetRequestId ( request, 1 ); + + language = cupsLangDefault(); + +@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject * + + response = cupsDoRequest( http, request, "/admin/" ); + +- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) ++ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) + { + r = 1; + } +@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se + + request = ippNew(); + +- request->request.op.operation_id = op; +- request->request.op.request_id = 1; ++ ippSetOperation( request, op ); ++ ippSetRequestId ( request, 1 ); + + language = cupsLangDefault(); + +@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se + + response = cupsDoRequest(http, request, "/admin/"); + +- if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT)) ++ if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT)) + { + r = 1; + } +@@ -837,7 +877,7 @@ abort: + if ( response != NULL ) + ippDelete( response ); + +- return Py_BuildValue( "i", r );; ++ return Py_BuildValue( "i", r ); + } + + +@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self, + + request = ippNew(); + +- request->request.op.operation_id = CUPS_GET_PPDS; +- request->request.op.request_id = 1; ++ ippSetOperation( request, CUPS_GET_PPDS ); ++ ippSetRequestId ( request, 1 ); + + language = cupsLangDefault(); + +@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self, + if ((response = cupsDoRequest(http, request, "/")) != NULL) + { + +- for (attr = response->attrs; attr; attr = attr->next) ++ for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response )) + { + PyObject *dict; + char *ppdname = NULL; + +- while (attr && attr->group_tag != IPP_TAG_PRINTER) +- attr = attr->next; ++ while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) ++ attr = ippNextAttribute( response ); + + if (!attr) + break; + + dict = PyDict_New (); + +- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next) ++ for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response )) + { + PyObject *val = NULL; + +- if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME) ++ if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME) + { +- ppdname = attr->values[0].string.text; ++ ppdname = ippGetString( attr, 0, NULL ); + + //sprintf( buf, "print '%s'", ppdname); + //PyRun_SimpleString( buf ); + } + +- else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD) +- //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) || +- // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) || +- // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) || +- // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT)) ++ else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD) ++ //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) || ++ // (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || ++ // (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || ++ // (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT)) + { +- val = PyObj_from_UTF8(attr->values[0].string.text); ++ val = PyObj_from_UTF8(ippGetString( attr, 0, NULL )); + } + + if (val) + { +- PyDict_SetItemString (dict, attr->name, val); ++ PyDict_SetItemString (dict, ippGetName( attr ), val); + Py_DECREF (val); + } + } +diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c +--- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors 2012-06-18 12:42:51.000000000 +0200 ++++ hplip-3.12.6/scan/sane/hpaio.c 2012-07-19 17:12:34.557848760 +0200 +@@ -47,6 +47,43 @@ + #define DEBUG_DECLARE_ONLY + #include "sanei_debug.h" + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetGroupTag(attr) attr->group_tag ++#define ippGetValueTag(attr) attr->value_tag ++#define ippGetName(attr) attr->name ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++ ++static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) ++{ ++ ipp->request.op.operation_id = op; ++ return (1); ++} ++ ++static int ippSetRequestId( ipp_t *ipp, int request_id ) ++{ ++ ipp->request.any.request_id = request_id; ++ return (1); ++} ++#endif ++ + static SANE_Device **DeviceList = NULL; + + static int AddDeviceList(char *uri, char *model, SANE_Device ***pd) +@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print + /* Assemble the IPP request */ + request = ippNew(); + +- request->request.op.operation_id = CUPS_GET_PRINTERS; +- request->request.any.request_id = 1; ++ ippSetOperation( request, CUPS_GET_PRINTERS ); ++ ippSetRequestId( request, 1 ); + + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8"); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en"); +@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print + if ((response = cupsDoRequest(http, request, "/")) == NULL) + goto bugout; + +- for (attr = response->attrs; attr != NULL; attr = attr->next) ++ for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response )) + { + /* Skip leading attributes until we hit a printer. */ +- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) +- attr = attr->next; ++ while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) ++ attr = ippNextAttribute( response ); + + if (attr == NULL) + break; + +- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) ++ while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER) + { +- if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0) ++ if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0) + cnt++; +- attr = attr->next; ++ attr = ippNextAttribute( response ); + } + + if (attr == NULL) diff --git a/extra/hplip/hplip.install b/extra/hplip/hplip.install new file mode 100644 index 000000000..74532cde3 --- /dev/null +++ b/extra/hplip/hplip.install @@ -0,0 +1,18 @@ +post_install() { + cat << EOF + +NOTE +---- +# If you want to use this driver with sane: +# echo "hpaio" >> /etc/sane.d/dll.conf + +EOF +} + +post_upgrade() { + if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then + # important upgrade notice + echo "> Please remove your printer in cups, then add it" + echo "> back and reconfigure it to make it work again!" + fi +} diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD index 256ff5661..6b7a3509a 100644 --- a/extra/imap/PKGBUILD +++ b/extra/imap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 132404 2011-07-24 11:35:43Z pierre $ +# $Id: PKGBUILD 173922 2012-12-28 05:23:44Z pierre $ pkgname=imap pkgver=2007f -pkgrel=1.1 +pkgrel=2 pkgdesc="An IMAP/POP server" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -29,8 +29,8 @@ build() { # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd if [ "$CARCH" != "i686" ]; then - yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1 - else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1 + yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" + else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix fi # create ssl certs for secure imap diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD new file mode 100644 index 000000000..8ae4c3c15 --- /dev/null +++ b/extra/ivtv-utils/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155905 2012-04-09 00:12:19Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgname=ivtv-utils +pkgver=1.4.1 +pkgrel=5 +pkgdesc="Userspace utilities for Hauppauge PVR cards" +arch=('i686' 'x86_64') +license=('GPL') +url="http://ivtvdriver.org" +source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz" + "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz") +depends=('gcc-libs') +md5sums=('3a4219d698262ca2b28e41f0f547b0a2' + 'b9a871f1c569025be9c48a77b3515faf') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" PREFIX=/usr install + + cd "${srcdir}" + for file in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do + install -D -m644 $file "${pkgdir}/usr/lib/firmware/$file" + done + + # FS#15133 - files already provided by the kernel-headers package + rm -rf "${pkgdir}"/usr/include + # Resolve conflict with v4l-utils + rm -f "${pkgdir}"/usr/bin/v4l2-ctl +} diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 02c184c5d..873d15d47 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172797 2012-12-06 08:18:49Z andrea $ +# $Id: PKGBUILD 174636 2013-01-05 12:59:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1e3b69751d0da8416215038bc140748df23d4f37') +sha1sums=('b39833e52fba5f245aa2f2c220a8e6a3108a8ed0') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index b67924d61..3e4283fbe 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172821 2012-12-06 08:20:06Z andrea $ +# $Id: PKGBUILD 174660 2013-01-05 13:09:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('d490ee768aa59d263b7fd43d4b180193658aebbd') +sha1sums=('5bcabfecaaad13ee14ef33832fb6df15703c2bd5') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 19449ad60..2a7fdb7c8 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172822 2012-12-06 08:20:09Z andrea $ +# $Id: PKGBUILD 174661 2013-01-05 13:09:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('178b2f10621fbd50b7d4b5d50dfbae012f009551') +sha1sums=('b4a7b69a9eec39d08c75097cb57fec4d22583a52') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 6b8a76599..9926c28ff 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172823 2012-12-06 08:20:13Z andrea $ +# $Id: PKGBUILD 174662 2013-01-05 13:09:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('725825a4a54180eb8fe4e405e08808988e09fdc4') +sha1sums=('cc13736e9131990d898a79b6a17730a284acd36f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index bf70ee06b..2a3b8072f 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172824 2012-12-06 08:20:17Z andrea $ +# $Id: PKGBUILD 174663 2013-01-05 13:10:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('22b82033de4739d82e3e82dcd345cb66eaa6d9fb') +sha1sums=('86767dbd8b78dcdbf105cfd7d09f06dfeebb099d') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 7503068c3..abc8966ee 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172825 2012-12-06 08:20:20Z andrea $ +# $Id: PKGBUILD 174664 2013-01-05 13:10:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('5f7691f0306dd1690fbbf05d15c6c1636ecd80a9') +sha1sums=('708eaed0b76a6428ce5ba29835ac3e515148bea8') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index a87f45de0..3bd2da796 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172826 2012-12-06 08:20:24Z andrea $ +# $Id: PKGBUILD 174665 2013-01-05 13:10:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -15,7 +15,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('7c5b125297ecf7e5801297fac284459209937c76' +sha1sums=('b67e2be133acd8e6de172480f562ef8f3bcf9f2d' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 15dc632bf..ea0317ad2 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172827 2012-12-06 08:20:28Z andrea $ +# $Id: PKGBUILD 174666 2013-01-05 13:11:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('7ba38088117d172e54e66f480cc164509bc4628a') +sha1sums=('9d9fa13d0cfad0a53237d04c959d11039df1af34') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 4f44a7775..536b19e7e 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172828 2012-12-06 08:20:30Z andrea $ +# $Id: PKGBUILD 174667 2013-01-05 13:12:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('64862dd9d6544f21d62b89b8b829c3ffaa2dafb7') +sha1sums=('a2b3438f12b615d877941068ba8f7e63890fb762') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 353d07263..8221c55f6 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172810 2012-12-06 08:19:33Z andrea $ +# $Id: PKGBUILD 174649 2013-01-05 13:04:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('c619181256f86bb1921cfbe6136ea3604d94aabe' +sha1sums=('20cfefd98a8dddef963b86ff0c7b832a464593fb' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 61dd98b2b..9ad47a978 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172989 2012-12-08 06:03:54Z andrea $ +# $Id: PKGBUILD 174650 2013-01-05 13:05:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,23 +11,17 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') -source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff') -sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' - '998f1db2309744dd2c054aec3462a717bc107c2e') +source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") +sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568') build() { - cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff - cd ../ - mkdir build cd build cmake ../kde-baseapps-${pkgver} \ diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 8defb6169..23c4d6217 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172829 2012-12-06 08:20:33Z andrea $ +# $Id: PKGBUILD 174668 2013-01-05 13:12:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('af6c85518c61cbc8e70a1bf280be0f36c3b381ff') +sha1sums=('f8c916e8d1a0c1138addca40520465821350ec92') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 74c7bd6cc..925b349c6 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172830 2012-12-06 08:20:37Z andrea $ +# $Id: PKGBUILD 174669 2013-01-05 13:12:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('13fdd219fe1d1082d89d965026adc2e58906da34' +sha1sums=('e8a31c1db3110d269fcbd3e32d3d409fd20e9f4b' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 3d6e047f1..94c3cb515 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172831 2012-12-06 08:20:41Z andrea $ +# $Id: PKGBUILD 174670 2013-01-05 13:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('01e1a4f37898e1170e5827d07f4e6ed34ab8ea6d') +sha1sums=('7828895c9a44abcffd3e7c34f2215bbf962dfea5') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 8f23e9465..ece1722b6 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172832 2012-12-06 08:20:42Z andrea $ +# $Id: PKGBUILD 174671 2013-01-05 13:13:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('8b43723d404d84fa87f6899ba3d332e3c035b583') +sha1sums=('5e0a4e9b547b4e8ff2118c543a8cff946d1f01eb') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 6109b7912..59a96ede4 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172806 2012-12-06 08:19:17Z andrea $ +# $Id: PKGBUILD 174645 2013-01-05 13:03:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('daa1ceadd1008cc7a82eb810731ff7c76fccb674') +sha1sums=('225cae44640b66f6294333026c78826e2350a7f7') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index f1429d954..4f3326b31 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172803 2012-12-06 08:19:06Z andrea $ +# $Id: PKGBUILD 174642 2013-01-05 13:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('d9c5fbbc79e95fca0ab2523a8de4e2291641bea3') +sha1sums=('8a0cf08aa4747df05edae833139e5eea739adf45') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 9cfe1d0a7..56fb4ffa8 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172808 2012-12-06 08:19:23Z andrea $ +# $Id: PKGBUILD 174647 2013-01-05 13:03:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('4f6f57b7f99b540b126534b8f9208cc1419b7e9a') +sha1sums=('442fff6a343103fd98dae1097e702901c5884e86') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index a54513b56..b9c4ff99f 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172807 2012-12-06 08:19:20Z andrea $ +# $Id: PKGBUILD 174646 2013-01-05 13:03:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('53715ebadb0d591d5a0913602dff7a92eb636e95') +sha1sums=('2acae493326a8a805fc91620984737aea8d31d51') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 96f862fc6..84df2d71a 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172800 2012-12-06 08:18:58Z andrea $ +# $Id: PKGBUILD 174639 2013-01-05 13:00:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('15dd451d602d12e045f3618f9debded16ea45ceb') +sha1sums=('a9ac753f2297329775291c3f7720eb50ef83749b') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 6a918b644..87bf27328 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172805 2012-12-06 08:19:14Z andrea $ +# $Id: PKGBUILD 174644 2013-01-05 13:02:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -17,7 +17,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdegraphics-okular: Okular bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('6634a0cc22c26c4d30a23bfc768adacdbd75eb5d') +sha1sums=('b2574e50b205e164e9e3672f6d28b264f30b7a64') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index f8cd90cca..24dc22d0c 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173044 2012-12-09 15:36:24Z andrea $ +# $Id: PKGBUILD 174640 2013-01-05 13:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('171b3c1cc0e7986ffb2d96a9ff844300e98746bf') +sha1sums=('a99f0b15f6e08a13e3018e4379837bdafe6ebd0e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 1df7fb25c..8c48a95d2 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172818 2012-12-06 08:19:57Z andrea $ +# $Id: PKGBUILD 174657 2013-01-05 13:08:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('4bc60c937d881eb11491b30ae445ebc37393a303') +sha1sums=('43f4305dee7332bb3844a892abc60e728d555e18') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 12e7f0b02..ae7330214 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172833 2012-12-06 08:20:45Z andrea $ +# $Id: PKGBUILD 174672 2013-01-05 13:14:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('e8a2ed440d62edaf302de898f84ba6b3af0eb21e') +sha1sums=('b2edfac9f2187eeb359672adc23d79d7ac53c986') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index e51fd6aca..852b0a869 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172834 2012-12-06 08:20:47Z andrea $ +# $Id: PKGBUILD 174673 2013-01-05 13:14:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('fe77d1fcb0fe0368a4030adebb43aa9323f26f1c') +sha1sums=('6ad6ea449f2d75a1e324c2cb2099724ef01a25b8') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index eebfe2f3e..c28c7e52f 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172835 2012-12-06 08:20:50Z andrea $ +# $Id: PKGBUILD 174674 2013-01-05 13:14:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('e9b68afaad38f42d569f214123a6c8e352cbd3a3') +sha1sums=('0a0144cdab2db70e070d193080545a9a8c5e5e27') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index e0fa936eb..d58027c5a 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172836 2012-12-06 08:20:56Z andrea $ +# $Id: PKGBUILD 174675 2013-01-05 13:15:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('7fb581e74cd2d561a9db7c2de754339f2e345e2a') +sha1sums=('1adf6b51209a0a944d75653dd62cdddde645d370') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 6882671b1..a7e0e512a 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172837 2012-12-06 08:20:58Z andrea $ +# $Id: PKGBUILD 174676 2013-01-05 13:15:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('ef8c012ce41094b7074502753153398028e58c99') +sha1sums=('d20801f87c16f1fb7d8698ea9288c720f81bb60d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index a2df87110..7e67f5870 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172838 2012-12-06 08:21:00Z andrea $ +# $Id: PKGBUILD 174677 2013-01-05 13:15:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('77a1ba76f67b4d353efc2733ffb65873f4f24f45') +sha1sums=('4af247030ea57e8f3eb2f0bc06e5aa786e7209f8') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 40738fb5b..cf285525f 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172839 2012-12-06 08:21:03Z andrea $ +# $Id: PKGBUILD 174678 2013-01-05 13:16:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('eea64f1812eeb4987fe9a39dbb0a7d7bde5b2099') +sha1sums=('6f723cc5cc62ed8865175fd038fa5a67a4bf6005') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index d1412f47e..4306891cd 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172840 2012-12-06 08:21:07Z andrea $ +# $Id: PKGBUILD 174679 2013-01-05 13:16:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('a736204fd77a9652acf247681d0dc560afc45ddb') +sha1sums=('d173d3b35d7a01327bb13833c325b82c915917fe') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 219c11b47..dff3f766b 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172841 2012-12-06 08:21:10Z andrea $ +# $Id: PKGBUILD 174680 2013-01-05 13:16:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('b116a1ad9877e382430511c9f28e61b42a927b82') +sha1sums=('48525b1385f9f1ea7c0fe224e7075d47fb371f0d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 04f7011e0..0b77ea9a1 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172842 2012-12-06 08:21:12Z andrea $ +# $Id: PKGBUILD 174681 2013-01-05 13:17:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('cb82fbb6c62ebd9bb9fd7a96ca62987aa7546a72') +sha1sums=('a8ecb32e9d8d2df828c5e0a4eaea0fe1c8b9cd9b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index f7d113f16..94021e3db 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172843 2012-12-06 08:21:16Z andrea $ +# $Id: PKGBUILD 174682 2013-01-05 13:17:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('f71f6b3196f9836869d7ee937e75c0492c28c9c5') +sha1sums=('505a13d630ddcea52d532851a7781e8f03fe2a6d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 3cc79e7ed..4b0945037 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172844 2012-12-06 08:21:20Z andrea $ +# $Id: PKGBUILD 174683 2013-01-05 13:18:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('07e94f3d66bae5bf518117d76d15f6d996174b5e') +sha1sums=('a5a1eca92677783892013c9712a7a8eb08f7a70b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index d57064c1e..ca5d51e0b 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172845 2012-12-06 08:21:22Z andrea $ +# $Id: PKGBUILD 174684 2013-01-05 13:18:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('fecf388392ef52b838ae1ce35a76208e28547798') +sha1sums=('4d51e39fc8abd353cd28d3156b18737716e28c3a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index b557a4b27..622e1ae7b 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172846 2012-12-06 08:21:24Z andrea $ +# $Id: PKGBUILD 174685 2013-01-05 13:18:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('3b8c0ee5d81caa004f628a3bb660c9ed0f38df73') +sha1sums=('87ed6db18bf33c05d94db6909410eff0bf034783') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index a7a56ee95..6c1050e19 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172847 2012-12-06 08:21:27Z andrea $ +# $Id: PKGBUILD 174686 2013-01-05 13:19:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('4c0b1725b68a93b55ea53aff8b9393f10cfd8792') +sha1sums=('2e1235ebacbf1dff5dc592eb97a8e3c84143ad7d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 292ea26cb..014c20ac3 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172848 2012-12-06 08:21:31Z andrea $ +# $Id: PKGBUILD 174687 2013-01-05 13:19:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('81e9c87b19c14bf5c5e4dfce2e47fbed63ad0c99') +sha1sums=('322473f7d1e92ec57c5af2c54eaa9688b520dfd3') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index ddd2048fa..729e2dcda 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172813 2012-12-06 08:19:42Z andrea $ +# $Id: PKGBUILD 174652 2013-01-05 13:06:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('32631172148b5994e81ba51dddf0e5bbd2a1867c') +sha1sums=('75cf56d9c3c88ef3f7d27f0d4891964372ba467f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 5d98a5537..de655232a 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172849 2012-12-06 08:21:34Z andrea $ +# $Id: PKGBUILD 174688 2013-01-05 13:19:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('9395abdc41127721782a9c565c2176a74e37b165') +sha1sums=('f5b9b0e81e6ef4cf9772f25fac654715a8c36add') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 9ba51485c..603718b11 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172850 2012-12-06 08:21:36Z andrea $ +# $Id: PKGBUILD 174689 2013-01-05 13:20:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('0f6eda7075d36aa9a8a97b15e5f81bf5b99da2e9') +sha1sums=('27fc92f946932f5c7037d0b221d76158a3121623') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index fb2e91f5f..7fad7049f 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172851 2012-12-06 08:21:39Z andrea $ +# $Id: PKGBUILD 174690 2013-01-05 13:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('16cb879c6480340c7cb37622b35010df855f7ce5') +sha1sums=('ef63aea2c93a3def43201e6fff768bc6730edef1') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 88bf9c929..ce2357b8e 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172852 2012-12-06 08:21:40Z andrea $ +# $Id: PKGBUILD 174691 2013-01-05 13:21:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('e69b672ee8530466970c9ef7726682bbb819e051') +sha1sums=('b35f2d330d8eb12ecb419e948591b6ad66f97302') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index b1473f7cb..6e58f035d 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172853 2012-12-06 08:21:49Z andrea $ +# $Id: PKGBUILD 174692 2013-01-05 13:21:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('462d1e2e0a833c16d9b2ccbb79c1bf218ecb2e6f') +sha1sums=('fffc38218cf81247fd19f700e6d42066eb9faa99') build() { cd $srcdir diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 264caf91f..758b4af6f 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172854 2012-12-06 08:21:52Z andrea $ +# $Id: PKGBUILD 174693 2013-01-05 13:23:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('2bff681c1553f8431dcab24c809cde2586e69b88') +sha1sums=('55f3392887401754922a6ae2eb932f633a597682') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index bdbcdb702..da8986e95 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173129 2012-12-11 14:42:15Z jgc $ +# $Id: PKGBUILD 174694 2013-01-05 13:23:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('6a2c0ff74e1a11d0f00c6749b3726b233d283040') +sha1sums=('9f967c27f1ebf331b83778e4ce87eb7966036c30') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 7522ccec1..977f0c215 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172856 2012-12-06 08:21:57Z andrea $ +# $Id: PKGBUILD 174695 2013-01-05 13:24:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('c8c41d4724e689cf70028bafb3bb705fe90607ea') +sha1sums=('3a499986e20db7caa5c6ba1750e1cb48b92822f0') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index f3207b5e7..d124a8696 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172857 2012-12-06 08:22:00Z andrea $ +# $Id: PKGBUILD 174696 2013-01-05 13:24:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('04c9d79cb49d2ee8488a4f343945f3b4ead4b183') +sha1sums=('fe624ecf7bc001ff26893e9d4b86d5c85c483027') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 6a8510294..b463d925b 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172858 2012-12-06 08:22:02Z andrea $ +# $Id: PKGBUILD 174697 2013-01-05 13:25:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('04025967d768683ad9f310aab301b41cb000f51b') +sha1sums=('c24bee251499d456ea8a4680ee812ce7ed2eed7b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 8e52d2800..dd16275f0 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172859 2012-12-06 08:22:07Z andrea $ +# $Id: PKGBUILD 174698 2013-01-05 13:25:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('8df30ea040707fda547bde0435ab0843beb8a59f') +sha1sums=('25b52513a49738e6b9a03542e2b1914a6eb764b9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index ed6b3bf64..aadff88b8 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172860 2012-12-06 08:22:10Z andrea $ +# $Id: PKGBUILD 174699 2013-01-05 13:26:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('e4d06db72f4b1d7268bdc31f760dea3e91a6c920') +sha1sums=('82783cc94ddebaa9e76fa6c97a47537df8345fa2') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 0d70847d8..a2bed3da4 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172861 2012-12-06 08:22:12Z andrea $ +# $Id: PKGBUILD 174700 2013-01-05 13:26:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('0c38aaf8e536704a44b469d708e523f0247a8086') +sha1sums=('6bc5fc1f0ae470dcb8ec03998cc9e224ec6664fe') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 4b7c36030..16c50c21e 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172862 2012-12-06 08:22:15Z andrea $ +# $Id: PKGBUILD 174701 2013-01-05 13:26:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('11492b62e7691becf2fa1f1e8fb50d341abb7825') +sha1sums=('8eacdb97d8b1f14a3e3907f8be67774ef9f6f545') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 8b3770d5b..81e27c098 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172802 2012-12-06 08:19:03Z andrea $ +# $Id: PKGBUILD 174641 2013-01-05 13:01:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('66299e7c61596e22109fe0758c1aab306e591d11') +sha1sums=('1e06acd55f177c118321163b69abb8e52ebff0f2') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 0178dd2de..e39db2826 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172863 2012-12-06 08:22:19Z andrea $ +# $Id: PKGBUILD 174702 2013-01-05 13:27:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cca29298ab63c7e775c81a2266c431507490c93a') +sha1sums=('0f7d138af9487dee932f575b2d431453f21d5ebe') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index c42c7f82b..5209f3393 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172864 2012-12-06 08:22:20Z andrea $ +# $Id: PKGBUILD 174703 2013-01-05 13:27:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('a3829bfb4d129cb56d58b72d38f9ce6a02209d93') +sha1sums=('665f9faacc8bf3cbf6af3d88e66997cb99c4770f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 4d73e4009..6359b7e4c 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172865 2012-12-06 08:22:22Z andrea $ +# $Id: PKGBUILD 174704 2013-01-05 13:28:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ea6156de54839157f933588eb7db6d94a2399f3b') +sha1sums=('56333f7363b6386050ac6f900cbd6ce1e1974ee0') build() { cd "${srcdir}" diff --git a/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch new file mode 100644 index 000000000..5aadeb883 --- /dev/null +++ b/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch @@ -0,0 +1,53 @@ +From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Wed, 5 Dec 2012 22:42:25 +0100 +Subject: [PATCH] Revert "Also check parent mimetypes in + protocolForArchiveMimetype()." + +This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. +It breaks opening odt and other zip-based files in external apps. +That's what I get for delegating the testing :-) +BUG: 311214 +--- + kio/kio/kprotocolmanager.cpp | 19 +------------------ + 1 files changed, 1 insertions(+), 18 deletions(-) + +diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp +index 3f1cadd..502a3e6 100644 +--- a/kio/kio/kprotocolmanager.cpp ++++ b/kio/kio/kprotocolmanager.cpp +@@ -47,7 +47,6 @@ + #include <ksharedconfig.h> + #include <kstandarddirs.h> + #include <kurl.h> +-#include <kmimetype.h> + #include <kmimetypetrader.h> + #include <kprotocolinfofactory.h> + +@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType ) + } + } + } +- const QString prot = d->protocolForArchiveMimetypes.value(mimeType); +- if (!prot.isEmpty()) +- return prot; +- +- // Check parent mimetypes +- KMimeType::Ptr mime = KMimeType::mimeType(mimeType); +- if (mime) { +- const QStringList parentMimeTypes = mime->allParentMimeTypes(); +- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) { +- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType); +- if (!res.isEmpty()) { +- return res; +- } +- } +- } +- +- return QString(); ++ return d->protocolForArchiveMimetypes.value(mimeType); + } + + #undef PRIVATE_DATA +-- +1.7.7 diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD new file mode 100644 index 000000000..4d7f51fa5 --- /dev/null +++ b/extra/kdelibs/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 173891 2012-12-27 10:11:14Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.9.4 +pkgrel=4 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/kdelibs' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' + 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' + 'media-player-info' 'libxtst' 'libutempter') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'kde-applications-menu.patch' 'archlinux-menu.patch' + '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' + 'fix-crash-on-open-with.patch') +sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' + '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i "${srcdir}"/archlinux-menu.patch + + # Fixed upstream + patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch + patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF \ + -DWITH_HUpnp=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/extra/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/extra/kdelibs/fix-crash-on-open-with.patch b/extra/kdelibs/fix-crash-on-open-with.patch new file mode 100644 index 000000000..60556386d --- /dev/null +++ b/extra/kdelibs/fix-crash-on-open-with.patch @@ -0,0 +1,19 @@ +commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 +Author: David Faure <faure@kde.org> +Date: Thu Dec 6 11:55:05 2012 +0100 + + Fix crash when no service was selected (user clicked on "Open With...") + +diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp +index 6d84800..6de0380 100644 +--- a/kparts/browserrun.cpp ++++ b/kparts/browserrun.cpp +@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _ + this, SLOT(slotCopyToTempFileResult(KJob*)) ); + return Delayed; // We'll continue after the job has finished + } +- if (selectedService) { ++ if (selectedService && question.selectedService()) { + *selectedService = question.selectedService(); + // KRun will use this when starting an app + KRun::setPreferredService(question.selectedService()->desktopEntryName()); diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/extra/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/extra/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 51cac9fa6..6d5337cef 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 172866 2012-12-06 08:22:25Z andrea $ +# $Id: PKGBUILD 174705 2013-01-05 13:28:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('libkcddb' 'libkcompactdisc' 'lame') +depends=('libkcddb' 'libkcompactdisc' 'lame' 'cdparanoia') makedepends=('cmake' 'automoc4') groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('f3ad5a8d8f4663ea0ea9d67834498350e932f57e') +sha1sums=('9f95b372adb3bb63453fe2bd83b6442374f1eb2e') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 2e83d7302..b706115dd 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172867 2012-12-06 08:22:28Z andrea $ +# $Id: PKGBUILD 174706 2013-01-05 13:28:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" url='http://kde.org/applications/multimedia/dragonplayer/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('6dd5d1721ba09f73695eee8eaca9478baf471893') +sha1sums=('cd1ea32aa85e82f0458d8813412d9118b4b4e3ba') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 02fa608bb..d430d9f67 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172868 2012-12-06 08:22:30Z andrea $ +# $Id: PKGBUILD 174707 2013-01-05 13:29:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('6886d4949ebbb292bcbbfb28e254b561306ec3e8') +sha1sums=('a59f5d762461c79dccdbe15dc24eec3e7d9bf685') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 1268465b9..855318fa8 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172869 2012-12-06 08:22:34Z andrea $ +# $Id: PKGBUILD 174708 2013-01-05 13:29:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('4ce2a0ce7b5c128c63d1fefcdbd3d2c7c8cf6e56') +sha1sums=('bd9beb44556c2c5d90d365dc35619852b4f5f6a9') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 3889d58bc..80809f997 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172870 2012-12-06 08:22:37Z andrea $ +# $Id: PKGBUILD 174709 2013-01-05 13:30:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('812087a8acfdbe676af422f2742f8c4fee91a835') +sha1sums=('707f4dc77ceded7c99d98d35f4ca73bad594f2be') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index 141682f66..22766d856 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172871 2012-12-06 08:22:39Z andrea $ +# $Id: PKGBUILD 174710 2013-01-05 13:30:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('298472d76a84a9c7f46c27cc7c141c90e1a1fae5') +sha1sums=('5de57f0b6778379bcb1a95ff6e53572de38d2419') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 5cd071155..0b778cb92 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172872 2012-12-06 08:22:42Z andrea $ +# $Id: PKGBUILD 174711 2013-01-05 13:30:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('9c5073216f0b62e0fefbd5fbd1fa0e4889a9da1d') +sha1sums=('bdbb2c0f0bd8b5fcf08f4f772fce6a3f40b24191') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d1f39a0aa..0d1d03b3c 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172873 2012-12-06 08:22:48Z andrea $ +# $Id: PKGBUILD 174712 2013-01-05 13:31:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' +sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 24ad48647..f6f3a47fd 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173031 2012-12-09 07:45:59Z andrea $ +# $Id: PKGBUILD 174638 2013-01-05 13:00:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5d6466761e890b2ee0ce66b274553c10f2827ca0') +sha1sums=('1eeb480d088d93d56d7ce8f7ef939150e126c001') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 5a78a2040..0aaf0a53e 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172874 2012-12-06 08:22:52Z andrea $ +# $Id: PKGBUILD 174713 2013-01-05 13:32:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f383306430705ff2af14518b9be90448bf857398') +sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 692c61c46..37afd819c 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172794 2012-12-06 08:18:42Z andrea $ +# $Id: PKGBUILD 174634 2013-01-05 12:56:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('78fb5ec8d8a0cbd145f44d76618705c1e3e3b0a3') +sha1sums=('f3030a41647b0139342b99ae01e5c6f7f1fc1031') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index d9a74c1e9..ebdf32ac9 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172875 2012-12-06 08:23:01Z andrea $ +# $Id: PKGBUILD 174714 2013-01-05 13:32:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('112e6702e16d0e40c6422c89227a25c2c4993df3') +sha1sums=('cb57f5dbb68c76591457db213844f6cff3ad407e') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index d5a6e42f7..96402609e 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 172804 2012-12-06 08:19:12Z andrea $ +# $Id: PKGBUILD 174643 2013-01-05 13:02:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('7740527d43f057c949c4954d916cd7237c915b20' +sha1sums=('7b1f00228c9485318ab5bf8ac93bf9e1a78b53ea' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 4fddd7c13..24933ce12 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172876 2012-12-06 08:23:07Z andrea $ +# $Id: PKGBUILD 174716 2013-01-05 13:36:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('1742284169b2c9e0d9459241f3277a137a282846' +sha1sums=('8c4e00e455f9dd32504f972fad41cce4c7dccbf5' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 2588fb4f6..f4a221fc7 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172877 2012-12-06 08:23:09Z andrea $ +# $Id: PKGBUILD 174717 2013-01-05 13:37:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('e59638143bdf75e09ef57658f1f8a53514004a14') +sha1sums=('4234c4b93094d4ad287a6e79fcffa7c077e6cf49') build() { cd $srcdir diff --git a/extra/kdeutils-ark/PKGBUILD b/extra/kdeutils-ark/PKGBUILD new file mode 100644 index 000000000..752755377 --- /dev/null +++ b/extra/kdeutils-ark/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 172878 2012-12-06 08:23:12Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-ark +pkgver=4.9.4 +pkgrel=1 +pkgdesc='Archiving Tool' +url='http://kde.org/applications/utilities/ark/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeutils') +depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') +makedepends=('cmake' 'automoc4') +optdepends=('p7zip' 'zip' 'unzip' 'unrar') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") +sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ark-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/extra/kdeutils-ark/kdeutils-ark.install b/extra/kdeutils-ark/kdeutils-ark.install new file mode 100644 index 000000000..78681144b --- /dev/null +++ b/extra/kdeutils-ark/kdeutils-ark.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_update() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 533471d74..1bfa56c3c 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172879 2012-12-06 08:23:14Z andrea $ +# $Id: PKGBUILD 174719 2013-01-05 13:38:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('8fddb94d96df5a3cf83775f81204d716040086bf') +sha1sums=('e39fe967a1053a3c98130e7b2acd4b11c2e425e8') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 0c3a90b74..a5dea340a 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172880 2012-12-06 08:23:18Z andrea $ +# $Id: PKGBUILD 174720 2013-01-05 13:38:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('2cdffc6aad88d8da2e4f37b2d92c40a64a77b9dc') +sha1sums=('256824be3df335549cec61c28c04e2661fe03006') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 5b8da59c6..a93f5fab0 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172881 2012-12-06 08:23:19Z andrea $ +# $Id: PKGBUILD 174721 2013-01-05 13:38:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('6f2c822e8255a87ad1636265c47ac78b366ce0db') +sha1sums=('8c2079c70a106c73e4aad7bb3d8dbd0b73a56ad9') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 9d55dbd52..21a22e3dd 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172882 2012-12-06 08:23:22Z andrea $ +# $Id: PKGBUILD 174722 2013-01-05 13:39:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('57398080e2ae4fe61855ed6f576700fdde83a277') +sha1sums=('b3b7315443b2dac49ca30dfce0800007d83ae950') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 813b8013c..19a60c768 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172883 2012-12-06 08:23:25Z andrea $ +# $Id: PKGBUILD 174723 2013-01-05 13:39:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('f441d4dbb8fa9b4ed9de6c4c0cc0a4af0ca06213') +sha1sums=('efe8b1d947dad51ea0b56f6ad418fdee5fabb0ff') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 39091df3f..1ffa4ad2c 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172884 2012-12-06 08:23:29Z andrea $ +# $Id: PKGBUILD 174724 2013-01-05 13:39:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('30b379e044c18dc28410bffb340bead19c2df3c7') +sha1sums=('70794d478a4b70b2e1597f86dbe1b1100f232738') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 78aa36aa2..7a0ad1d21 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('5aaab53ed9b6e4acd3618dc5265b52b3386c8c65') +sha1sums=('6aefce837f4325198e51b55385884b430217be31') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index fd9ec1378..411ca144f 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172886 2012-12-06 08:23:35Z andrea $ +# $Id: PKGBUILD 174726 2013-01-05 13:40:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('eb0a962643bade40039b06fcf3d4d8a5eb1b9444') +sha1sums=('23ed94890d1a138e409aa10660b6232c9fc50ddd') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index a87ede74a..eddb10fbb 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172887 2012-12-06 08:23:37Z andrea $ +# $Id: PKGBUILD 174727 2013-01-05 13:41:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('d4dd33868ba75a3342ad380ea626e1ed2e8898d5') +sha1sums=('c7c85b44af4e1868f29369db760914db89bbee2b') build() { cd "${srcdir}" diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index e5667d215..5dadd99d2 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172889 2012-12-06 08:23:44Z andrea $ +# $Id: PKGBUILD 174729 2013-01-05 13:41:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('b42ddd333e19daf8f036b733e9dc8d4a6418bfd2') +sha1sums=('e4dd2452f95603009d73068c2362fa26c1959b44') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index a4202461e..394aabaa5 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172890 2012-12-06 08:23:46Z andrea $ +# $Id: PKGBUILD 174730 2013-01-05 13:42:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('5c0e489a470174a61a6bea88ac994e555ebdd1c9') +sha1sums=('3942cda2498bc7dce9ba694cdc81b90329bc3c41') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 49b464698..b8423aae2 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172891 2012-12-06 08:23:49Z andrea $ +# $Id: PKGBUILD 174731 2013-01-05 13:42:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f81a44220c5622b222cb032160be06bf1d965704') +sha1sums=('f021cff63f2e3f724262116343c6ad4bf59e03e6') build() { cd $srcdir diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD new file mode 100644 index 000000000..d9d97012c --- /dev/null +++ b/extra/kile/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 171257 2012-11-16 22:52:10Z allan $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=kile +pkgver=2.1.3 +pkgrel=2 +pkgdesc="A user friendly TeX/LaTeX frontend for KDE" +arch=("i686" "x86_64") +license=('GPL2') +url="http://kile.sourceforge.net/" +depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart') +makedepends=('cmake' 'automoc4') +optdepends=('kdebase-konsole: embedded terminal') +install=${pkgname}.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") +sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/kile/kile.install b/extra/kile/kile.install new file mode 100644 index 000000000..9fe93eeac --- /dev/null +++ b/extra/kile/kile.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index 3b2ae3fc4..65c8e49fa 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146950 2012-01-19 15:31:00Z giovanni $ +# $Id: PKGBUILD 174504 2013-01-05 07:26:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass -pkgver=0.10.0 -pkgrel=3.1 +pkgver=0.10.1 +pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/libass/" @@ -13,7 +13,7 @@ depends=('enca' 'fontconfig' 'fribidi') makedepends=('pkg-config') options=(!libtool) source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -md5sums=('1855bddc4c167f96968dddeeda0eb45c') +md5sums=('0f54b1f3a24fa897ebbbcc5bc744b32a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 112b0c689..4d327419d 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163883 2012-07-21 12:10:06Z andyrtr $ +# $Id: PKGBUILD 174977 2013-01-09 20:07:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.2.4 +pkgver=1.2.6 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('25b45b1ccf6921a5bce4e2d88f55a81f' - 'a6749b55ba9ec9dad471e3a2202de390') +md5sums=('fe556fa15dea046974b11a4c7f1b67a8' + 'b3d721debd0c151e8e3eb0a6a2e223ab') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libcl/PKGBUILD b/extra/libcl/PKGBUILD new file mode 100644 index 000000000..913418b46 --- /dev/null +++ b/extra/libcl/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 165264 2012-08-14 17:01:07Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libcl +pkgver=1.1 +_pkgver=304.37 +pkgrel=3 +pkgdesc="OpenCL library and ICD loader from NVIDIA" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('gcc-libs') +license=('custom') +options=('!strip') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${_pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run") + md5sums=('ee3e97109201ab954c96860e28ada611') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run") + md5sums=('65fce562c0df3def06012db9ff6bafa1') +fi +build() { + cd $srcdir + sh ${_pkg}.run --extract-only +} + +package() { + cd $srcdir/${_pkg} + install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0 + ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1 + ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 70763652b..29cf9da44 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,26 +1,31 @@ -# $Id$ +# $Id: PKGBUILD 174288 2013-01-03 23:42:31Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid -pkgver=0.2.2 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') +pkgver=0.3.0 +pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" +arch=('i686' 'x86_64' 'mips64el') url="http://musicbrainz.org/doc/libdiscid" +license=('LGPL') depends=('glibc') -source=("http://users.musicbrainz.org/~matt/${pkgname}-${pkgver}.tar.gz") -md5sums=('ee21ddbe696a3c60e14827a75f3bcf5b') options=('!libtool') +source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") +md5sums=('17e51260062b7583e5981c82cf618127') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 3bebee8e4..51223e71f 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 163887 2012-07-21 12:16:22Z andyrtr $ +# $Id: PKGBUILD 174985 2013-01-09 20:25:17Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.2.4 +pkgver=1.2.6 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.2.4' 'libisofs>=1.2.4' 'readline') +depends=('libburn>=1.2.6' 'libisofs>=1.2.6' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('d5d78ec840a8bbc7df6582f65a28ca1e' - '39d26239be2e7ed2ec1dd22e214173dd') +md5sums=('1db39e96f8d0370bfe571e21ba62df3f' + '67b3c568140b7a4a27f3efdc74bcf3c2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index d09e3e347..6bdeca2e1 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163885 2012-07-21 12:12:07Z andyrtr $ +# $Id: PKGBUILD 174979 2013-01-09 20:11:39Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.2.4 +pkgver=1.2.6 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('0a86f2cda3b86fc95f7c0efbd793f373' - '8b997974f30da1b7a7f97563df4365a3') +md5sums=('e3b0eebd7523f64020178aaba5d71c88' + '5b8159f7c0cd39a3ce4bd74c4d91253a') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index b84e8f7a6..bd1367e02 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172819 2012-12-06 08:19:58Z andrea $ +# $Id: PKGBUILD 174658 2013-01-05 13:08:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('862239eca7ff3bd68dfcbd0cd1b95c8d99b4bf61') +sha1sums=('aa1094dc21e789d6e573fffc08d21d14cab8fa05') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index b2004c08f..77170ec09 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172820 2012-12-06 08:20:01Z andrea $ +# $Id: PKGBUILD 174659 2013-01-05 13:08:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e1ca051ebaf3430813b9d18dd2c1dca00c147d8a') +sha1sums=('a6d88785485aabdcb96c9a263bf7da9130e23d95') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index bdb58394a..cf9d2cfaf 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172814 2012-12-06 08:19:46Z andrea $ +# $Id: PKGBUILD 174653 2013-01-05 13:06:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('b40cac622106dd45dd15e3ccc3b10480cc624bd8') +sha1sums=('baaafbb1a2da84e4180482c3628727c1b5b16cee') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 9ecf6fbf0..955adbb44 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172812 2012-12-06 08:19:40Z andrea $ +# $Id: PKGBUILD 174651 2013-01-05 13:05:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ecaf85ede42bb99850af6b1a35912327d95a1322') +sha1sums=('c488ca82b10acc26fa44b0f8f52abd7cdd1e4f15') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 7b1ae4fb3..82ac2b55c 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172815 2012-12-06 08:19:48Z andrea $ +# $Id: PKGBUILD 174654 2013-01-05 13:06:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('130c9956c89076ba9df971ea72c0713fdcfee989') +sha1sums=('54f30de47f12101b4e6ebd74f5d8e6052e694461') build() { cd "${srcdir}" diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 8c619411d..31f48faa7 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171965 2012-11-25 14:45:06Z andrea $ +# $Id: PKGBUILD 173820 2012-12-24 04:23:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.3 -pkgrel=2 +pkgver=0.4.4 +pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('kdepimlibs' 'qjson') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('99e61ad50edd51f679170db3b997736b') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a26ddd6da675075f7529652f36f5c9f5') build() { mkdir build diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 7adaf7ff9..281789439 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fe3c09ed2bc378d975b1d2f495752f03529e52e7') +sha1sums=('f38ffdff11abf3aadfa92394ee8816051738f924') build() { cd "${srcdir}" diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD index f1988afbd..e9a7a37d8 100644 --- a/extra/libkolab/PKGBUILD +++ b/extra/libkolab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173021 2012-12-08 17:41:09Z andrea $ +# $Id: PKGBUILD 174981 2013-01-09 20:16:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolab -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Advanced Kolab Object Handling Library" url='http://git.kolab.org/libkolab/' @@ -11,8 +11,8 @@ license=('GPL') depends=('libkolabxml' 'kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('3ba23bc11c3fb1c852e5b7b9788fed6d' - '56052090b7fb89813c3bae1cb5b104c5') +md5sums=('16c4d513fd41f498348ab401a79cdaf6' + '18e76021f9b91df75c798ef24962de06') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 4bdc637f9..9bb9c9e77 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172817 2012-12-06 08:19:54Z andrea $ +# $Id: PKGBUILD 174656 2013-01-05 13:07:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6e6dd688b9cae1e809754d527327770c8a4caad0') +sha1sums=('feec52661f536b56ad14dfc628b90facd39d05ca') build() { cd "${srcdir}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index d82d54e64..3df07831f 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172905 2012-12-06 17:09:50Z andyrtr $ +# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.4.3 pkgver=3.6.4 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -37,8 +37,8 @@ makedepends=( # makedepends 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite>=1.2.0' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -275,7 +275,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libreoffice/PKGBUILD.40 b/extra/libreoffice/PKGBUILD.40 index 08bbf1b67..c21efe929 100644 --- a/extra/libreoffice/PKGBUILD.40 +++ b/extra/libreoffice/PKGBUILD.40 @@ -15,30 +15,25 @@ pkgname=('libreoffice-common' 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.0.0.alpha1 +_LOver=4.0.0.0.beta2 pkgver=4.0.0 -pkgrel=0.alpha1.2 +pkgrel=0.beta2.1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.20.5' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -50,14 +45,10 @@ _mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz @@ -78,24 +69,20 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz - ${_additional_source_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 - ${_additional_source_url}/b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2 - ${_additional_source_url}/46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 + ${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 ${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/libcdr-0.0.9.tar.bz2 + ${_additional_source_url}/libmspub-0.0.3.tar.bz2 + ${_additional_source_url}/libvisio-0.0.24.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - buildfix.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 +noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -115,23 +102,20 @@ noextract=(2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2 - 46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 + 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) -md5sums=('8200d0c9da3615a09d94068eada02c28' - 'b3912d2b9f8312a3b85472890997704d' - '9dfdbac725c0a31b411026108cf7cf22' - '18f577b374d60b3c760a3a3350407632' + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + libcdr-0.0.9.tar.bz2 + libmspub-0.0.3.tar.bz2 + libvisio-0.0.24.tar.bz2) +md5sums=('f0abec2ab5b8a31ba47b00f9cfea0305' + '847b75db75e5b0a501216bb5420083d2' + 'b6caba12606c6616ff283fea4575d118' 'f02578f5218f217a9f20e9c30e119c6a' - '2d8c3b50f77c544f317ab0a8838fadcb' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' '2a177023f9ea8ec8bd00837605c5df1b' 'a7983f859eafb2677d7ff386a023bc40' '3c219630e4302863a9a83d0efde889db' @@ -152,14 +136,14 @@ md5sums=('8200d0c9da3615a09d94068eada02c28' '9f9e15966b5624834157fe3d748312bc' 'dc3d21a3921931096d6e80f6701f6763' 'b2371dc7cf4811c9d32146eec913d296' - '3c0037fb07dea2f0bbae8386fa7c6a9a' - 'b2db54b6e96287ac995d7ed654ace4fc' - '46d9f4cf8b145c21ce1056e116d2ce71' + '8755aac23317494a9028569374dc87b2' '54e578c91b1b68e69c72be22adcb2195' '0168229624cfac409e766913506961a8' '185d60944ea767075d27247c3162b3bc' + '3c0037fb07dea2f0bbae8386fa7c6a9a' + 'b2db54b6e96287ac995d7ed654ace4fc' + '1962a4183bac8a247989af17ef8882ea' '97bf43dda273d79ff90c848ab53b0e3c' - '234e91ac65945ce1ab1e3839780e90f7' 'abcb1b0a7deaffe13ab3d7ca70becb49' '72790a4103da259a55cadd66db931d00') @@ -177,13 +161,7 @@ build() { ln -s ${srcdir}/$source . done popd - -# ln -s ../libreoffice-help-$_LOver/helpcontent2 . -# ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test - + # fix not upstreamable pyuno paths - patch taken from Debian # patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff @@ -194,9 +172,6 @@ build() { esac ARCH_FLAGS="$ARCH_FLAGS $i" done - - # python2 fix - export PYTHON=python2 #autoconf -f @@ -227,6 +202,9 @@ build() { --enable-mergelibs \ --enable-opengl \ --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ @@ -256,7 +234,6 @@ build() { --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ - --disable-mozilla \ --without-system-mozilla \ --without-system-npapi-headers \ --with-ant-home="/usr/share/apache-ant"\ @@ -268,11 +245,7 @@ build() { --with-system-hsqldb \ --with-alloc=system\ --with-system-clucene\ - --without-system-servlet-api \ - --with-java-target-version=1.6 - - -#configure: WARNING: unrecognized options: --enable-ext-scripting-beanshell, --enable-ext-scripting-javascript, --enable-librsvg, --without-system-saxon + --without-system-servlet-api #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool @@ -293,8 +266,8 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -315,9 +288,11 @@ package_libreoffice-common() { etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) groups=('libreoffice') - provides=('go-openoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do @@ -342,7 +317,7 @@ package_libreoffice-common() { cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - # set python-uno PYTHON path + # set VLC and if needed python-uno PYTHON path install -dm755 ${pkgdir}/etc/profile.d install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ @@ -629,26 +604,6 @@ package_libreoffice-en-US() { done } -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - package_libreoffice-extension-presentation-minimizer() { pkgdesc="This extension reduce the file size of the current presentation" @@ -670,38 +625,6 @@ package_libreoffice-extension-report-builder() { unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder } -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/libreoffice-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - package_libreoffice-extension-wiki-publisher() { pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 32d7f9062..46394ed83 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172017 2012-11-26 14:46:50Z andyrtr $ +# $Id: PKGBUILD 173800 2012-12-24 00:28:32Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64' 'mips64el') @@ -12,19 +12,12 @@ url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') options=('!libtool') install=libtasn1.install -source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig} - buffer_overflow_fix.diff) -md5sums=('a3c713c41a9a73851235dc37051be46f' - '43500f54858ffe021e5fd20896b165ad' - '4c9e248a4198d9710bf2f822a7c447a5') +source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('1b07629163025b9693aae9b8957842b2' + '67bdae9b78ac7bbfa2ab24c7d46bd577') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # corrected possible buffer overflow in parser errors. - # http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 - patch -Np1 -i ${srcdir}/buffer_overflow_fix.diff - ./configure --prefix=/usr \ --with-packager=Archlinux \ --with-packager-bug-reports="http://bugs.archlinux.org/" \ diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index b835805bd..0d1aeff8b 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $ +# $Id: PKGBUILD 174025 2013-01-01 19:16:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xcb.freedesktop.org/" @@ -23,6 +23,7 @@ build() { PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ --enable-xinput \ + --enable-xkb \ --disable-static make } diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD index ddb4add72..6435034d5 100644 --- a/extra/libxcomposite/PKGBUILD +++ b/extra/libxcomposite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151410 2012-02-26 10:37:09Z pierre $ +# $Id: PKGBUILD 174258 2013-01-03 11:50:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxcomposite -pkgver=0.4.3 -pkgrel=2.1 +pkgver=0.4.4 +pkgrel=1 pkgdesc="X11 Composite extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxfixes' 'compositeproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2") -sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') +sha256sums=('ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178') build() { cd "${srcdir}/libXcomposite-${pkgver}" diff --git a/extra/libxdamage/PKGBUILD b/extra/libxdamage/PKGBUILD index 60bede826..558a87bd8 100644 --- a/extra/libxdamage/PKGBUILD +++ b/extra/libxdamage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150392 2012-02-17 11:26:19Z allan $ +# $Id: PKGBUILD 174256 2013-01-03 11:42:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxdamage -pkgver=1.1.3 -pkgrel=2.1 +pkgver=1.1.4 +pkgrel=1 pkgdesc="X11 damaged region extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0') makedepends=('pkg-config') options=('!libtool') source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2) -sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee') +sha256sums=('7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad') build() { cd "${srcdir}/libXdamage-${pkgver}" diff --git a/extra/liferea/PKGBUILD b/extra/liferea/PKGBUILD new file mode 100644 index 000000000..cf58f55a4 --- /dev/null +++ b/extra/liferea/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 170014 2012-10-31 00:54:53Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=liferea +pkgver=1.8.10 +pkgrel=1 +pkgdesc="A desktop news aggregator for online news feeds and weblogs" +arch=('i686' 'x86_64') +url="http://liferea.sourceforge.net/" +license=('GPL') +depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +install=liferea.install +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2) +sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d') + +build() { + cd "${srcdir}/liferea-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install + make +} + +package() { + cd "${srcdir}/liferea-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/extra/liferea/liferea.install b/extra/liferea/liferea.install new file mode 100644 index 000000000..7d812ccdb --- /dev/null +++ b/extra/liferea/liferea.install @@ -0,0 +1,22 @@ +pkgname=liferea + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD new file mode 100644 index 000000000..3152b3c30 --- /dev/null +++ b/extra/linux_logo/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 171454 2012-11-17 15:59:08Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=linux_logo +pkgver=5.11 +pkgrel=2 +pkgdesc="Text-based logo and system information program" +arch=('i686' 'x86_64') +url="http://www.deater.net/weave/vmwprod/linux_logo" +license=('GPL') +depends=('glibc') +source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz) +sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + find ./logos -type f | sort > logo_config + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="${pkgdir}/usr" install +} diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 2deb594a2..9f48c3ece 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171485 2012-11-18 02:09:02Z foutrelis $ +# $Id: PKGBUILD 173988 2012-12-31 11:59:46Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -10,12 +10,12 @@ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.1 -pkgrel=6 +pkgver=3.2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml') +makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx') source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz @@ -25,19 +25,17 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz clang-pure64.patch enable-lto.patch llvm-3.1-fix-debug-line-info.patch - clang-3.1-fix-libprofile_rt.a-location.patch - clang-3.1-fix-lwg-2141.patch) -sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab' - 'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786' - '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558' + clang-3.1-fix-libprofile_rt.a-location.patch) +sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' + '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' + 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' - 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7' + 'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b' 'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d' - '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137' - 'a3ac405a983643c9cb9081692a3f4d28e5d19571fa12b0517fb2b1f2acab0ad0') + '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') build() { cd "$srcdir/$pkgname-$pkgver.src" @@ -83,13 +81,13 @@ build() { patch -d tools/clang -Np1 -i \ "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" - # Fix FS#32731: [clang] 3.1 fails to compile libstdc++ <chrono> 4.7.2 - patch -d tools/clang -Np0 -i "$srcdir/clang-3.1-fix-lwg-2141.patch" - # Fix FS#31098: LLVM 3.1 produces invalid debug information # http://llvm.org/bugs/show_bug.cgi?id=13211 patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch" + # Drop "svn" suffix from version string + sed -i 's/3\.2svn/3.2/g' configure + # Apply strip option to configure _optimized_switch="enable" [[ $(check_option strip) == n ]] && _optimized_switch="disable" @@ -118,6 +116,8 @@ build() { --$_optimized_switch-optimized make REQUIRES_RTTI=1 + make -C docs -f Makefile.sphinx man + make -C docs -f Makefile.sphinx html } package_llvm() { @@ -166,6 +166,14 @@ package_llvm() { done fi + # Install man pages + install -d "$pkgdir/usr/share/man/man1" + cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/" + + # Install html docs + cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/" + rm -r "$pkgdir/usr/share/doc/llvm/html/_sources" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -220,6 +228,11 @@ package_clang-analyzer() { ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done + # Relocate man page + install -d "$pkgdir/usr/share/man/man1" + mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \ + "$pkgdir/usr/share/man/man1/" + # Use Python 2 sed -i \ -e 's|env python$|&2|' \ diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch index 3205fbf69..9f43e657e 100644 --- a/extra/llvm/enable-lto.patch +++ b/extra/llvm/enable-lto.patch @@ -19,14 +19,12 @@ Index: lib/Driver/Tools.cpp // Tell the linker to load the plugin. This has to come before AddLinkerInputs // as gold requires -plugin to come before any -plugin-opt that -Wl might // forward. -- if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { + if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } + } AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 7699ac4b9..dd81a957d 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171297 2012-11-17 02:13:54Z allan $ +# $Id: PKGBUILD 174263 2013-01-03 12:45:07Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.28.0 -pkgrel=4 +pkgrel=5 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.1-2' 'texinfo' 'sh') + depends=('sbcl=1.1.3-1' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index d234a3ea1..ec2850e85 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173199 2012-12-13 00:42:44Z giovanni $ +# $Id: PKGBUILD 174611 2013-01-05 08:40:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.4.1 +pkgver=2.4.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('31b328679951158a05f22c3323644b51' +md5sums=('ffae81c0366c13ae852e9fdc26fc3690' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa-demos/LICENSE b/extra/mesa-demos/LICENSE new file mode 100644 index 000000000..ae33d2709 --- /dev/null +++ b/extra/mesa-demos/LICENSE @@ -0,0 +1,82 @@ +Disclaimer + +Mesa is a 3-D graphics library with an API which is very similar to +that of OpenGL* +To the extent that Mesa utilizes the OpenGL command syntax or state +machine, it is being used with authorization from Silicon Graphics, +Inc.(SGI). However, the author does not possess an OpenGL license +from SGI, and makes no claim that Mesa is in any way a compatible +replacement for OpenGL or associated with SGI. Those who want a +licensed implementation of OpenGL should contact a licensed +vendor. + +Please do not refer to the library as MesaGL (for legal +reasons). It's just Mesa or The Mesa 3-D graphics +library + +* OpenGL is a trademark of Silicon Graphics Incorporated. + +License / Copyright Information + +The Mesa distribution consists of several components. Different copyrights +and licenses apply to different components. For example, GLUT is copyrighted +by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa +device drivers are copyrighted by their authors. See below for a list of +Mesa's main components and the license for each. + +The core Mesa library is licensed according to the terms of the MIT license. +This allows integration with the XFree86, Xorg and DRI projects. + +The default Mesa license is as follows: + +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. + + +Mesa Component Licenses + +Component Location Primary Author License +---------------------------------------------------------------------------- +Main Mesa code src/mesa/ Brian Paul Mesa (MIT) + +Device drivers src/mesa/drivers/* See drivers See drivers + +Ext headers include/GL/glext.h SGI SGI Free B + include/GL/glxext.h + +GLUT src/glut/ Mark Kilgard Mark's copyright + +Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL + +SGI GLU library src/glu/sgi/ SGI SGI Free B + +demo programs progs/demos/ various see source files + +X demos progs/xdemos/ Brian Paul see source files + +SGI demos progs/samples/ SGI SGI copyright + +RedBook demos progs/redbook/ SGI SGI copyright diff --git a/extra/mesa-demos/PKGBUILD b/extra/mesa-demos/PKGBUILD new file mode 100644 index 000000000..79f57c0e6 --- /dev/null +++ b/extra/mesa-demos/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 151280 2012-02-25 12:34:36Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname='mesa-demos' +pkgver=8.0.1 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc="Mesa demos and tools" +url="http://mesa3d.sourceforge.net" +license=('custom') +depends=('glew') +source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' + '5c65a0fe315dd347e09b1f2826a1df5a') + +build() { + cd "${srcdir}/mesa-demos-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/mesa-demos-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos" + install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/" +} diff --git a/extra/mod_fastcgi/PKGBUILD b/extra/mod_fastcgi/PKGBUILD new file mode 100644 index 000000000..8b637bc32 --- /dev/null +++ b/extra/mod_fastcgi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 150579 2012-02-18 15:20:31Z pierre $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=mod_fastcgi +pkgver=2.4.6 +pkgrel=4 +pkgdesc="Apache module to support the FastCGI protocol" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.fastcgi.com/" +depends=('apache') +options=('!libtool') +source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz" + 'lp381384.patch') +md5sums=('a21a613dd5dacf4c8ad88c8550294fed' + '7dd09e6579cc9bf2f992bbd82d1d1537') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/lp381384.patch" + cp Makefile.AP2 Makefile + make top_dir=/usr/lib/httpd +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make top_dir=/usr/lib/httpd DESTDIR="${pkgdir}" install + install -Dm644 docs/LICENSE.TERMS \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/mod_fastcgi/lp381384.patch b/extra/mod_fastcgi/lp381384.patch new file mode 100644 index 000000000..e7c978d10 --- /dev/null +++ b/extra/mod_fastcgi/lp381384.patch @@ -0,0 +1,34 @@ +References: +http://thread.gmane.org/gmane.comp.web.fastcgi.devel/2613 +http://article.gmane.org/gmane.comp.web.fastcgi.devel/1167 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509116 +https://bugs.launchpad.net/ubuntu/+source/libapache-mod-fastcgi/+bug/381384 + +Patch extracted from the SNAP-0811090952 snapshot tarball. +2009-05-28 Martin von Gagern + +diff -ru mod_fastcgi-2.4.6/CHANGES mod_fastcgi-2.4.6-lp381384/CHANGES +--- mod_fastcgi-2.4.6/CHANGES 2007-11-13 13:26:35.000000000 +0100 ++++ mod_fastcgi-2.4.6-lp381384/CHANGES 2009-05-28 21:02:31.000000000 +0200 +@@ -1,3 +1,6 @@ ++ *) Don't let the Content-Length header propagate on errors or across ++ redirects. [Artur Zaprzala <arturz ownmail.net>] ++ + 2.4.6 + + *) Fix a bug I introduced in 2.4.4 that broke dynamic application +diff -ru mod_fastcgi-2.4.6/mod_fastcgi.c mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c +--- mod_fastcgi-2.4.6/mod_fastcgi.c 2007-11-13 00:00:10.000000000 +0100 ++++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c 2009-05-28 21:02:31.000000000 +0200 +@@ -753,6 +753,11 @@ + ap_table_set(r->headers_out, "Location", value); + continue; + } ++ ++ if (strcasecmp(name, "Content-Length") == 0) { ++ ap_table_set(r->headers_out, name, value); ++ continue; ++ } + + /* If the script wants them merged, it can do it */ + ap_table_add(r->err_headers_out, name, value); diff --git a/extra/mousepad/PKGBUILD b/extra/mousepad/PKGBUILD new file mode 100644 index 000000000..2e24dd178 --- /dev/null +++ b/extra/mousepad/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 174752 2013-01-06 10:43:03Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: tobias [tobias at archlinux.org] + +pkgname=mousepad +pkgver=0.3.0 +pkgrel=2 +pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)" +arch=('i686' 'x86_64') +url=('http://www.xfce.org/') +license=('GPL2') +groups=('xfce4-goodies') +depends=('gtksourceview2' 'dbus-glib' 'desktop-file-utils') +makedepends=('intltool' 'perl') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) +sha256sums=('10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/mousepad/mousepad.install b/extra/mousepad/mousepad.install new file mode 100644 index 000000000..3421ca591 --- /dev/null +++ b/extra/mousepad/mousepad.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index f20b689ac..5b0ec3a82 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168060 2012-10-05 14:07:35Z bisson $ +# $Id: PKGBUILD 174779 2013-01-07 14:37:06Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.17.2 +pkgver=0.17.3 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' @@ -18,7 +18,7 @@ makedepends=('doxygen') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" 'tmpfiles.d' 'rc.d') -sha1sums=('5e7ccf39f44e51240f181c2e1d9af5a7dafb1f02' +sha1sums=('f684d73a7517371a4461afdb2439f9533b51a49d' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '3470d489565f0ed479f1665dd2876f66acb5a585') diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD new file mode 100644 index 000000000..767521e76 --- /dev/null +++ b/extra/mplayer/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 171266 2012-11-16 23:35:46Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgbase=mplayer +pkgname=('mplayer' 'mencoder') +pkgver=35421 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') +license=('GPL') +url="http://www.mplayerhq.hu/" +options=(!buildflags !emptydirs) +source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop) +md5sums=('b8a82ad1e1d6c3ac847074772daba817' + 'c0d6ef795cf6de48e3b87ff7c23f0319') + +build() { + cd "$srcdir/$pkgbase" + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-cdparanoia \ + --enable-xvmc \ + --enable-radio \ + --enable-radio-capture \ + --language=all \ + --confdir=/etc/mplayer + [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + + make +} + +package_mplayer() { + pkgdesc="A movie player for linux" + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') + + cd "$srcdir/$pkgbase" + + make DESTDIR="$pkgdir" install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" + install -dm755 "$pkgdir/usr/share/mplayer/" + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" + rm -rf "$pkgdir/usr/share/mplayer/font" + #desktop file FS#14770 + install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop" + install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" +} + +package_mencoder() { + pkgdesc="Free command line video decoding, encoding and filtering tool" + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis') + + cd "$srcdir/$pkgbase" + make DESTDIR="$pkgdir" install-mencoder install-mencoder-man + find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; +} +md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' + 'c0d6ef795cf6de48e3b87ff7c23f0319') diff --git a/extra/mplayer/mplayer.desktop b/extra/mplayer/mplayer.desktop new file mode 100644 index 000000000..07acea13f --- /dev/null +++ b/extra/mplayer/mplayer.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Type=Application +Name=MPlayer Media Player +Name[ca]=Reproductor multimèdia MPlayer +Name[pl]=MPlayer odtwarzacz multimedialny +GenericName=Multimedia player +Comment=Play movies and songs +Comment[ca]=Reproduïu vídeos i cançons +Comment[de]=Filme und Musik abspielen +Comment[es]=Reproduzca vídeos y canciones +Comment[fr]=Lecteur multimédia +Comment[it]=Lettore multimediale +Comment[zh]=多媒体播放器 +Comment[pl]=Odtwarzaj filmy i muzykę +Icon=mplayer +TryExec=mplayer +Exec=mplayer %F +Terminal=false +NoDisplay=true +Categories=GTK;AudioVideo;Audio;Video;Player;TV; +MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska; diff --git a/extra/mplayer/mplayer.install b/extra/mplayer/mplayer.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/extra/mplayer/mplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/mplayer/mplayer.png b/extra/mplayer/mplayer.png Binary files differnew file mode 100644 index 000000000..799769335 --- /dev/null +++ b/extra/mplayer/mplayer.png diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index a7148b661..bed55a5fb 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167246 2012-09-29 09:32:53Z andrea $ +# $Id: PKGBUILD 173697 2012-12-21 09:03:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.28 +pkgver=5.5.29 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,9 +13,9 @@ makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') -md5sums=('da8ddb3d00e6e159153d2444360f52a8' +md5sums=('e6b9f9cb82e990bd8f0474df7462904e' 'e7eb2faeab755cbb2fe03542bf328da9' - '1c949c0dbea5206af0db14942d9927b6' + '1351485633baf9894cfdf7c5bbffd7b5' '6ea6ceb360d09a774e87335ee098ddd5' '2fa6e456964d4ff5e6d4f9ff0126aed6' 'a0e1460c276a50a9666c331de83271f2') diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf index 9a41b4fc3..387020858 100644 --- a/extra/mysql/my.cnf +++ b/extra/mysql/my.cnf @@ -18,14 +18,14 @@ [client] #password = your_password port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock # Here follows entries for some specific programs # The MySQL server [mysqld] port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock datadir = /var/lib/mysql skip-external-locking key_buffer_size = 16M diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 848f46c66..083193448 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172939 2012-12-07 16:59:58Z stephane $ +# $Id: PKGBUILD 174748 2013-01-06 01:52:18Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.06 +pkgver=2.10.07 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" @@ -11,7 +11,7 @@ license=('BSD') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('0acad2db3281509af338a283b64e9288a81f195f') +sha1sums=('2eb839c25ad0aa43a0d2d48146fd8ac708d9aabf') install=nasm.install build() { diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD index bdb78754e..a3b760125 100644 --- a/extra/nawk/PKGBUILD +++ b/extra/nawk/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 142711 2011-11-13 14:58:31Z dreisner $ +# $Id: PKGBUILD 173726 2012-12-22 02:28:46Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=nawk -pkgver=20110810 -pkgrel=3 +pkgver=20121220 +pkgrel=1 pkgdesc="The one, true implementation of AWK" url="http://cm.bell-labs.com/who/bwk/" license=('MIT') arch=('i686' 'x86_64' 'mips64el') options=('!makeflags') depends=('glibc') -source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" +source=("$pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" 'manpage-naming.patch') -md5sums=('a7062ecade93dc4cb39190e48db9a51d' +md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8' '8486d387a51fe3b3c9875c4151ad92b4') build() { + # awk -> nawk patch -Np1 < manpage-naming.patch + + # create license sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE + # fix build + sed -i '/YACC = yacc -d -S/ s|^|#|' makefile + make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS" } diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index f8fcd5a39..ef9e2fe78 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.nedit.org/" license=('GPL') depends=('lesstif' 'libxpm') -source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 +source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' 'ae1f56ae9b23163882051720ac52412d') diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index cf1536bbd..2e31d9466 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172796 2012-12-06 08:18:46Z andrea $ +# $Id: PKGBUILD 174633 2013-01-05 12:56:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 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" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f48b29dbbaec3938930176d3225fe292c26c9fce') +sha1sums=('082626d17f4759df079a688406e9b96167f0ef15') build() { mkdir build diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 99e3eb775..09a4db99c 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -21,7 +21,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ - --disable-static + --disable-static --disable-more-warnings make } diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 6158b31f9..de1ce6fee 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -21,7 +21,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ - --disable-static + --disable-static --disable-more-warnings make } diff --git a/extra/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD index 2da8a15e7..ae6a2f81b 100644 --- a/extra/nitrogen/PKGBUILD +++ b/extra/nitrogen/PKGBUILD @@ -18,7 +18,7 @@ md5sums=('dd779a252a222eb9d329d74b809cfe73') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make + make LDADD="-lX11" } package() { diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index a08886104..00f6cf667 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169787 2012-10-29 10:29:15Z jgc $ +# $Id: PKGBUILD 173931 2012-12-28 07:40:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.9.3 +pkgver=4.9.4 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('8a21b3b6766bde3b5ed2a6a7b725e4aa' +md5sums=('cf58772702b3abbdcff14e22014eeeaf' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 36e2cd9de..a2f9c41e6 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 169789 2012-10-29 10:49:49Z jgc $ +# $Id: PKGBUILD 174760 2013-01-06 20:10:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.14 +pkgver=3.14.1.1.93 +_pkgver=3.14.1 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.3 +_nsprver=4.9.4 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz +#source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_1_WITH_CKBI_1_93_RTM/src/${pkgname}-3.14.1.with.ckbi.1.93.tar.gz nss.pc.in nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('ace3642fb2ca67854ea7075d053ca01a6d81e616' +sha1sums=('28b4a2316dc5e5d4605ac375449691c05b6f1c29' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" + cd "${srcdir}/${pkgname}-${_pkgver}/mozilla" # Add CAcert and spi-inc.org CA certificates. # See http://wiki.cacert.org/NSSLib for how to generate patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch" @@ -36,11 +38,16 @@ build() { sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ -i security/coreconf/rules.mk + + # see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now + # CaCert Wiki page should be updated to reflect these changes how to add the certificates + # for now the first patch should still do it + # Generate certdata.c from certdata.txt - cd security/nss/lib/ckfw/builtins - make generate + # cd security/nss/lib/ckfw/builtins + # make generate - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_pkgver}" export BUILD_OPT=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 @@ -58,7 +65,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_pkgver}" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/bin" install -m755 -d "${pkgdir}/usr/include/nss" @@ -71,8 +78,8 @@ package() { -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr/bin,g" \ -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${pkgver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ + -e "s,%NSPR_VERSION%,${_pkgver},g" \ + -e "s,%NSS_VERSION%,${_pkgver},g" > \ "${pkgdir}/usr/lib/pkgconfig/nss.pc" ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc diff --git a/extra/nvidia-304xx-lts/PKGBUILD b/extra/nvidia-304xx-lts/PKGBUILD new file mode 100644 index 000000000..9794500d9 --- /dev/null +++ b/extra/nvidia-304xx-lts/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 172304 2012-12-02 11:03:10Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=nvidia-304xx-lts +pkgver=304.64 +_extramodules=extramodules-3.0-lts +pkgrel=1 +pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux-lts>=3.0.0' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-lts-headers>=3.0.0') +conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts') +provides=('nvidia-304xx') +license=('custom') +install=nvidia-304xx-lts.install +options=(!strip) +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('6964415cf648a5f4f38117b168369de2') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('76007ed4b72afd334e26377b646f5f7e') +fi + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" + echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" +} diff --git a/extra/nvidia-304xx-lts/nvidia-304xx-lts.install b/extra/nvidia-304xx-lts/nvidia-304xx-lts.install new file mode 100644 index 000000000..d1f5eccaa --- /dev/null +++ b/extra/nvidia-304xx-lts/nvidia-304xx-lts.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/extra/nvidia-lts/PKGBUILD b/extra/nvidia-lts/PKGBUILD new file mode 100644 index 000000000..606cabfa8 --- /dev/null +++ b/extra/nvidia-lts/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 171130 2012-11-16 19:30:17Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=nvidia-lts +pkgver=310.19 +_extramodules=extramodules-3.0-lts +pkgrel=1 +pkgdesc="NVIDIA drivers for linux-lts" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux-lts>=3.0.0' "nvidia-utils=$pkgver") +makedepends=('linux-lts-headers>=3.0.0') +provides=('nvidia') +license=('custom') +install=nvidia-lts.install +options=(!strip) +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('2adbdd38540b3a8955714760e05f575d') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('0ba08d32852e442ebba5ba22c7abed36') +fi + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}" + sh ${_pkg}.run --extract-only + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/${_kernver}/build module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf" + echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf" + install -D -m644 "${srcdir}/${_pkg}/LICENSE" "${pkgdir}/usr/share/licenses/nvidia-lts/LICENSE" +} diff --git a/extra/nvidia-lts/nvidia-lts.install b/extra/nvidia-lts/nvidia-lts.install new file mode 100644 index 000000000..d1f5eccaa --- /dev/null +++ b/extra/nvidia-lts/nvidia-lts.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.0-lts' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/extra/nvidia-utils/PKGBUILD b/extra/nvidia-utils/PKGBUILD new file mode 100644 index 000000000..073fb8a9b --- /dev/null +++ b/extra/nvidia-utils/PKGBUILD @@ -0,0 +1,105 @@ +# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> +# Contributor: James Rayner <iphitus@gmail.com> +pkgbase=nvidia-utils +pkgname=('nvidia-utils' 'opencl-nvidia') +pkgver=310.19 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('custom') +options=('!strip') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('2adbdd38540b3a8955714760e05f575d') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('0ba08d32852e442ebba5ba22c7abed36') +fi + +create_links() { + # create soname links + while read -d '' _lib; do + _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" + [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}" + [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}" + done < <(find "${pkgdir}" -type f -name '*.so*' -print0) +} + +build() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only +} + +package_opencl-nvidia() { + pkgdesc="OpenCL implemention for NVIDIA" + depends=('libcl' 'zlib') + optdepends=('opencl-headers: headers necessary for OpenCL development') + cd "${srcdir}/${_pkg}" + + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + create_links +} + +package_nvidia-utils() { + pkgdesc="NVIDIA drivers utilities and libraries." + depends=('xorg-server' 'libxvmc') + optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig' + 'opencl-nvidia: OpenCL support') + conflicts=('libgl') + provides=('libgl') + cd "${srcdir}/${_pkg}" + + # X driver + install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" + # GLX extension module for X + install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise + # OpenGL library + install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + # OpenGL core library + install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" + # VDPAU + install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" + # nvidia-tls library + install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" + + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + + # nvidia-xconfig + install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" + install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" + # nvidia-settings + install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" + install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" + install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + # nvidia-bug-report + install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" + # nvidia-smi + install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" + install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz" + + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE" + ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils" + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" + ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" + + create_links +} diff --git a/extra/nvidia/PKGBUILD b/extra/nvidia/PKGBUILD new file mode 100644 index 000000000..574df67df --- /dev/null +++ b/extra/nvidia/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $ +# Maintainer : Thomas Baechler <thomas@archlinux.org> + +pkgname=nvidia +pkgver=310.19 +_extramodules=extramodules-3.6-ARCH +pkgrel=2 +pkgdesc="NVIDIA drivers for linux." +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.6' 'linux-headers<3.7') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('2adbdd38540b3a8955714760e05f575d') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('0ba08d32852e442ebba5ba22c7abed36') +fi + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" +} diff --git a/extra/nvidia/nvidia.install b/extra/nvidia/nvidia.install new file mode 100644 index 000000000..c2c292ae9 --- /dev/null +++ b/extra/nvidia/nvidia.install @@ -0,0 +1,18 @@ +post_install() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then + echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' + fi +} + +post_remove() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index ba0cc4c10..c8951a808 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,23 +1,19 @@ -# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $ +# $Id: PKGBUILD 174924 2013-01-09 04:17:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx -pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') -pkgver=3.5.0.15 -pkgrel=2 +pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') +pkgver=3.5.0.17 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') -options=('!makeflags') # '!strip') -makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages +#options=('!makeflags') # '!strip') +makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) -source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz - nx-x11.ld.so.conf.d - nx-cflags.patch) -md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' - 'f2ec60c7e2d81bef2f7292d2b33681a6' - 'd0c5b88aac0473e19699cf62d84b9d5f') +source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz) +md5sums=('aac9a999d4b38dedd476409e5fc2c4aa') build() { cd "${srcdir}/nx-libs-$pkgver" @@ -26,17 +22,7 @@ build() { # export CFLAGS="-march=x86-64 -O1 -g -pipe" # export CXXFLAGS="-march=x86-64 -O1 -g -pipe" - - # Gentoo hacks to honor cflags - patch -Np0 -i ${srcdir}/nx-cflags.patch - - # Run autoreconf in all neeed folders - for i in nxcomp nxcompext nxcompshad nxproxy; do - cd ${i} - autoreconf -vfi #${i} - cd .. - done - + # honour CFLAGS in X11 build - upstream fixed so far only the other libs # From xorg-x11-6.9.0-r3.ebuild pushd "${srcdir}/nx-libs-$pkgver/nx-X11" @@ -47,7 +33,11 @@ build() { echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF} echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} popd - + + # fix two broken Makefiles + sed -i "s:/usr/local:/usr:" Makefile + sed -i "s:-o root -g root ::" nxcompshad/Makefile.in + make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall @@ -59,10 +49,11 @@ package_libxcomp() { pkgdesc="NX X compression library" depends=('libjpeg-turbo' 'libpng' 'gcc-libs') - install -dm755 ${pkgdir}/usr/lib/nx/lib - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib + install -dm755 ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx + # symlinks cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} . + ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} . } package_nxproxy() { @@ -71,14 +62,10 @@ package_nxproxy() { depends=('libxcomp') install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin} - cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxproxy . - - # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxproxy + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy ${pkgdir}/usr/lib/nx/bin/nxproxy cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 + # the wrapper + cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin } package_nx-xcompext() { @@ -87,12 +74,13 @@ package_nx-xcompext() { depends=('libxcomp' 'nx-x11') install -dm755 ${pkgdir}/usr/lib/nx - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompext.so.3.5.0 libXcompext.so.3 - ln -sv libXcompext.so.3.5.0 libXcompext.so + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx + #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx + + # symlinks cd ${pkgdir}/usr/lib/ ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} . + #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . } package_nx-x11() { @@ -100,40 +88,47 @@ package_nx-x11() { pkgdesc="NX-X11 lib for the NX framework" depends=('libxcomp') - install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx - - cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxauth . - + install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}} + cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11 + # nxauth + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxauth - - install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" + cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin } package_nxagent() { pkgdesc="NX X server based on Xnest" - depends=('nx-xcompext') + depends=('nx-xcompext' 'libxml2') - install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxagent . - + install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx} + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxagent - # required nxcompshad libs - cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 - ln -sv libXcompshad.so.3.5.0 libXcompshad.so + cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin + + # additional files for documentation + cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy ${pkgdir}/usr/share/nx + + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx + # symlinks cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . + ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . # files should move to nx-compext pkg +} + +package_x2go-agent() { + + pkgdesc="Wrapper arround nxagent to use with x2goserver" + depends=('nxagent') + + install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}} + # this is a nxagent symlink + cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin + # the wrapper + cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin + + cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/x2go.xpm ${pkgdir}/usr/share/pixmaps + cp -a ${srcdir}/fakeinstall/usr/share/x2go/rgb ${pkgdir}/usr/share/x2go + cp -a ${srcdir}/fakeinstall/usr/share/x2go/versions/VERSION.x2goagent ${pkgdir}/usr/share/x2go/versions } package_nx-headers() { diff --git a/extra/nxclient/PKGBUILD b/extra/nxclient/PKGBUILD new file mode 100644 index 000000000..e11b0d8a8 --- /dev/null +++ b/extra/nxclient/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 162204 2012-06-23 13:26:36Z andyrtr $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + +pkgname=nxclient +pkgver=3.5.0.7 +pkgrel=3 +pkgdesc="Nomachine's closed source client for NX servers" +arch=('i686' 'x86_64') +url="http://nomachine.com" +license=('custom:nomachine') +depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-common>=3.5.0-4.1' 'desktop-file-utils') +makedepends=('rpmextract' 'chrpath') +optdepends=('cups: for printing support') +[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.wrapper) +[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44') +[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.wrapper) +[ "$CARCH" = "i686" ] && md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44') +install=nxclient.install + +build() { + cd ${srcdir} + rpmextract.sh *.rpm + sed -i -e 's:/usr/NX:/usr/lib/nx:g' etc/profile.d/nx.* + sed -i -e 's:/usr/NX:/usr/lib/nx:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop +} + +package() { + # profile files + install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh + install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh + # menu entries + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop + rm -r ${srcdir}/usr/NX/share/applnk + + # remove libs that come in system and are provided by libxcomp/nx-x11 + rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*} + + # provided by nx-common + rm ${srcdir}/usr/NX/bin/nxssh + rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped + + # provide default key file later + rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key + + # move files + install -dm755 ${pkgdir}/usr/{bin,lib/nx} + cp -aR ${srcdir}/usr/NX/* ${pkgdir}/usr/lib/nx + # add symlinks + cd ${pkgdir}/usr/bin + ln -sv /usr/lib/nx/bin/{nxclient,nxkill,nxprint,nxservice} . + # install wrapper including Linker fix + mv ${pkgdir}/usr/lib/nx/bin/nxclient ${pkgdir}/usr/lib/nx/bin/nxclient_orig + install -m 755 ${srcdir}/nxclient.wrapper ${pkgdir}/usr/lib/nx/bin/nxclient + + # add default key file + install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/nx/share/keys/server.id_dsa.key + + # add license file + mkdir -p ${pkgdir}/usr/share/licenses/nxclient + mv ${pkgdir}/usr/lib/nx/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE + + # some cleanup + rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups} + + # fix insecure rpath + chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient_orig" +} diff --git a/extra/nxclient/nomachine.key b/extra/nxclient/nomachine.key new file mode 100644 index 000000000..e6eadbc15 --- /dev/null +++ b/extra/nxclient/nomachine.key @@ -0,0 +1,12 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9 +C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF +aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi +xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z +5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG +fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY ++Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa +QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3 +mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf +8xAPsSKs6yZ6j1FNklfu +-----END DSA PRIVATE KEY----- diff --git a/extra/nxclient/nxclient.install b/extra/nxclient/nxclient.install new file mode 100644 index 000000000..9edb5939b --- /dev/null +++ b/extra/nxclient/nxclient.install @@ -0,0 +1,22 @@ +post_install() { + update-desktop-database -q + + echo "For correct setup please take a look at the wiki:" + echo "http://wiki.archlinux.org/index.php/FreeNX" + + +} + +post_upgrade() { + update-desktop-database -q + + if [ "`vercmp $2 3.5.0.7-1.1`" -lt 0 ]; then + # important upgrade notice + echo "because file location of the default key has been moved" + echo "you may need to reconfigure your connection and settings" + fi +} + +post_remove() { + update-desktop-database -q +} diff --git a/extra/nxclient/nxclient.wrapper b/extra/nxclient/nxclient.wrapper new file mode 100644 index 000000000..ab9cc2532 --- /dev/null +++ b/extra/nxclient/nxclient.wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +LD_LIBRARY_PATH=/usr/lib/nx/lib:$LD_LIBRARY_PATH /usr/lib/nx/bin/nxclient_orig $@ diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 19ebef8d8..874c0381a 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168480 2012-10-12 13:08:15Z tpowa $ +# $Id: PKGBUILD 173841 2012-12-25 00:34:23Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' @@ -6,13 +6,13 @@ pkgname=('ocaml') # Needs optimized build. [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs') pkgver=4.00.1 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2' 'custom: QPL-1.0') url="http://caml.inria.fr/" depends=('gdbm') -makedepends=('tk' 'ncurses>=5.6-7' 'libx11') +makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz fix-caml_int64_float_of_bits-n32.patch) diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index a7233d7c2..499c75b7c 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163893 2012-07-21 19:10:48Z giovanni $ +# $Id: PKGBUILD 174853 2013-01-08 01:15:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode pkgver=0.12 -pkgrel=3 +pkgrel=4 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://www.ode.org" @@ -30,5 +30,9 @@ package() { make DESTDIR=${pkgdir}/ install install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/GIMPACT/GIMPACT-LICENSE-BSD.TXT \ + ${pkgdir}/usr/share/licenses/${pkgname}/GIMPACT-LICENSE-BSD.TXT + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/libccd/BSD-LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/BSD-LICENSE } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 12688a67f..9344dd309 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171611 2012-11-20 13:12:19Z schiv $ +# $Id: PKGBUILD 174304 2013-01-04 05:15:04Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,20 +6,23 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' +depends=('jasper' 'gstreamer0.10-base' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'eigen2' - 'libcl' 'opencl-headers' 'mesa') + 'mesa') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' - 'libcl' 'python2-numpy: Python 2.x interface') +if [ "$CARCH" != "mips64el" ]; then + depends+=('intel-tbb' 'libcl') + makedepends+=('opencl-headers') +fi source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' 'fsh.patch') @@ -27,9 +30,14 @@ md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') -_cmakeopts=('-D WITH_OPENCL=ON' +if [ "$CARCH" != "mips64el" ]; then + _cmakeopts=('-D WITH_OPENCL=ON' + '-D WITH_TBB=ON') +else + _cmakeopts=() +fi +_cmakeopts+=( '-D WITH_OPENGL=ON' - '-D WITH_TBB=ON' '-D WITH_XINE=ON' '-D ENABLE_SSE=OFF' '-D ENABLE_SSE2=OFF' @@ -107,6 +115,7 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + # Do we really need licenses for these minor splits? # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index a9b06c207..c9124c508 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,32 +1,42 @@ -# $Id: PKGBUILD 169817 2012-10-30 10:47:49Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $ +# Maintainer: +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.17 -pkgrel=1 -pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" +pkgrel=2 +pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -sha1sums=('10369bd11109312466389b3b050469dd69e54d2b') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch) +sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e' + 'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7') build() { - cd "${srcdir}" + cd "$srcdir" + + # Fix build with LLVM 3.2 + patch -d OpenGTL-$pkgver -Np1 -i \ + "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch" + mkdir build cd build - cmake ../OpenGTL-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../OpenGTL-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch new file mode 100644 index 000000000..c148c88bb --- /dev/null +++ b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch @@ -0,0 +1,38 @@ +diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt +--- OpenGTL-0.9.17.orig/CMakeLists.txt 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/CMakeLists.txt 2012-12-25 03:00:30.000000000 +0200 +@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C + + find_package(LLVM REQUIRED) + +-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.") ++if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.2 is required.") + endif() + + if(MSVC) +diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp +--- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp 2012-12-25 02:59:17.000000000 +0200 +@@ -29,7 +29,7 @@ + #include <llvm/PassManager.h> + #include <llvm/Analysis/LoopPass.h> + #include <llvm/Analysis/Verifier.h> +-#include <llvm/Target/TargetData.h> ++#include <llvm/DataLayout.h> + #include <llvm/GlobalVariable.h> + + // GTLCore +diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp +--- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp 2012-12-25 02:59:34.000000000 +0200 +@@ -23,7 +23,7 @@ + + #include <llvm/Module.h> + #include <llvm/PassManager.h> +-#include <llvm/Target/TargetData.h> ++#include <llvm/DataLayout.h> + #include <llvm/Target/TargetMachine.h> + #include <llvm/Analysis/Verifier.h> + #include <llvm/Transforms/Utils/Cloning.h> diff --git a/extra/p7zip/7zFM.desktop b/extra/p7zip/7zFM.desktop new file mode 100644 index 000000000..62b8e8562 --- /dev/null +++ b/extra/p7zip/7zFM.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=7-Zip FM +GenericName=7-Zip File Manager +Type=Application +Categories=GTK;Utility;Archiving;Compression; +Terminal=false +Icon=p7zip +Exec=7zFM diff --git a/extra/p7zip/PKGBUILD b/extra/p7zip/PKGBUILD new file mode 100644 index 000000000..4bb2bb474 --- /dev/null +++ b/extra/p7zip/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 143961 2011-11-30 22:27:42Z andrea $ +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> +# Contributor: TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=p7zip +pkgver=9.20.1 +pkgrel=6 +pkgdesc='Command-line version of the 7zip compressed file archiver' +url='http://p7zip.sourceforge.net/' +license=('GPL' 'custom') +arch=('i686' 'x86_64') +depends=('gcc-libs' 'bash') +optdepends=('wxgtk: GUI' + 'desktop-file-utils: desktop entries') +makedepends=('yasm' 'nasm' 'wxgtk') +options=('!makeflags') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" + '7zFM.desktop') +sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40') + +install=install + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + + [[ $CARCH = x86_64 ]] \ + && cp makefile.linux_amd64_asm makefile.machine \ + || cp makefile.linux_x86_asm_gcc_4.X makefile.machine + + make all4 OPTFLAGS="${CXXFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}" + + make install \ + DEST_DIR="${pkgdir}" \ + DEST_HOME="/usr" \ + DEST_MAN="/usr/share/man" + + # Licenses + install -d "${pkgdir}"/usr/share/licenses/p7zip + ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ + /usr/share/doc/p7zip/DOCS/License.txt \ + /usr/share/doc/p7zip/DOCS/unRarLicense.txt + + # Integration with stuff... + install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png + install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} + cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ + cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ + ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx + + find GUI/help -type d -exec chmod 755 {} \; + cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ + + chmod -R u+w "${pkgdir}/usr" +} diff --git a/extra/p7zip/install b/extra/p7zip/install new file mode 100644 index 000000000..7f3cc4358 --- /dev/null +++ b/extra/p7zip/install @@ -0,0 +1,13 @@ +post_install() { + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true + [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 24fa24319..847bb4527 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173027 2012-12-08 21:00:11Z heftig $ +# $Id: PKGBUILD 174865 2013-01-08 09:21:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.32.4 +pkgver=1.32.5 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('9895b2e6572c3b3e0cc1c174b8bf55791a47de1995af21a1787f6c573b4b58db') +sha256sums=('7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821') build() { cd ${pkgname}-${pkgver} diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 8458514ed..ab1ef9c68 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173205 2012-12-13 02:46:32Z giovanni $ +# $Id: PKGBUILD 173793 2012-12-23 07:34:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.50 +pkgver=1.51 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('5e239c5aae70dece79fcd6a4307fc53e') +md5sums=('8dfa6adc39623905267a4d3232158e01') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index fc6f699f3..c9249be7d 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171900 2012-11-22 18:08:46Z pierre $ +# $Id: PKGBUILD 173514 2012-12-20 05:52:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.9 +pkgver=5.4.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('076a9f84d861d3f664a2878d5773ba78' +md5sums=('cb716b657a30570b9b468b9e7bc551a1' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '3cfde0cc4ed09b55f1ce531437a4eb88' diff --git a/extra/pidgin-encryption/PKGBUILD b/extra/pidgin-encryption/PKGBUILD index 396022ba6..3f843ccc3 100644 --- a/extra/pidgin-encryption/PKGBUILD +++ b/extra/pidgin-encryption/PKGBUILD @@ -12,11 +12,14 @@ license=('GPL') url="http://pidgin-encrypt.sourceforge.net/" depends=('pidgin' 'nss') options=('!libtool') -source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz) -md5sums=('d839eec602c21f913b32b742dc512f4b') +source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz + glib.patch) +md5sums=('d839eec602c21f913b32b742dc512f4b' + '6183c2e70e11c9ef874b21a996c93d2f') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/glib.patch" ./configure --prefix=/usr --disable-static make } diff --git a/extra/pidgin-encryption/glib.patch b/extra/pidgin-encryption/glib.patch new file mode 100644 index 000000000..9d156c32c --- /dev/null +++ b/extra/pidgin-encryption/glib.patch @@ -0,0 +1,12 @@ +diff -ru pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c +--- pidgin-encryption-3.1.orig/rsa_nss.c 2012-12-26 13:57:18.637297343 +0100 ++++ pidgin-encryption-3.1/rsa_nss.c 2012-12-26 14:00:37.782680833 +0100 +@@ -24,7 +24,7 @@ + #include <debug.h> + #include <gtkdialogs.h> + +-#include "glib/gmain.h" ++#include <glib.h> + + #include <string.h> + #include <assert.h> diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 758c9794f..2add5a8ab 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169990 2012-10-30 23:00:51Z heftig $ +# $Id: PKGBUILD 174743 2013-01-05 21:41:56Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,14 +7,13 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.6 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi' - 'tk' 'ca-certificates' 'intltool' - 'networkmanager') + 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' + 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96') @@ -35,7 +34,6 @@ build() { --enable-cyrus-sasl \ --disable-doxygen \ --enable-nm \ - --disable-vv \ --with-python=/usr/bin/python2 \ --with-system-ssl-certs=/etc/ssl/certs make @@ -66,7 +64,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss') + depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'ca-certificates: SSL CA certificates' 'python2-dbus: for purple-remote and purple-url-handler' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index d8eb344b3..e0622dda7 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172166 2012-11-30 14:16:14Z andyrtr $ +# $Id: PKGBUILD 174785 2013-01-07 15:28:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.12 +_dcpkgver=2.1.13 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 174dac9ae..feefcadbf 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 169989 2012-10-30 23:00:46Z heftig $ +# $Id: PKGBUILD 174766 2013-01-07 11:39:56Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.107 -pkgrel=4 +pkgver=0.109 +pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') license=('LGPL') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" +url="http://www.freedesktop.org/wiki/Software/polkit" depends=('glib2' 'pam' 'expat' 'libsystemd' 'js') makedepends=('intltool' 'gtk-doc' 'gobject-introspection') replaces=('policykit') options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz - polkit.pam fix-empty-wheel.patch) -md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1' + polkit.pam + fix-xauthority.patch) +md5sums=('8c3f08287dd3e1e546e3c2ae00090908' '6564f95878297b954f0572bc1610dd15' - 'c99ab2a7919ad0b69fde4804c043b07f') + '78db344a30d7aa089b4705009ec95b58') build() { cd $pkgname-$pkgver - # https://bugs.archlinux.org/task/31717 - patch -Np1 -i ../fix-empty-wheel.patch + patch -Np1 -i ../fix-xauthority.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ diff --git a/extra/polkit/fix-xauthority.patch b/extra/polkit/fix-xauthority.patch new file mode 100644 index 000000000..cf00b929c --- /dev/null +++ b/extra/polkit/fix-xauthority.patch @@ -0,0 +1,58 @@ +From d6acecdd0ebb42e28ff28e04e0207cb01fa20910 Mon Sep 17 00:00:00 2001 +From: David Zeuthen <zeuthen@gmail.com> +Date: Wed, 19 Dec 2012 19:28:29 +0000 +Subject: Set XAUTHORITY environment variable if is unset + +The way it works is that if XAUTHORITY is unset, then its default +value is $HOME/.Xauthority. But since we're changing user identity +this will not work since $HOME will now change. Therefore, if +XAUTHORITY is unset, just set its default value before changing +identity. This bug only affected login managers using X Window +Authorization but not explicitly setting the XAUTHORITY variable. + +You can argue that XAUTHORITY is broken since it forces uid-changing +apps like pkexec(1) to do more work - and get involved in intimate +details of how X works and so on - but that doesn't change how things +work. + +Based on a patch from Peter Wu <lekensteyn@gmail.com>. + +https://bugs.freedesktop.org/show_bug.cgi?id=51623 + +Signed-off-by: David Zeuthen <zeuthen@gmail.com> +--- +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 840eb3c..da9784a 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -608,6 +608,28 @@ main (int argc, char *argv[]) + g_ptr_array_add (saved_env, g_strdup (value)); + } + ++ /* $XAUTHORITY is "special" - if unset, we need to set it to ~/.Xauthority. Yes, ++ * this is broken but it's unfortunately how things work (see fdo #51623 for ++ * details) ++ */ ++ if (g_getenv ("XAUTHORITY") == NULL) ++ { ++ const gchar *home; ++ ++ /* pre-2.36 GLib does not examine $HOME (it always looks in /etc/passwd) and ++ * this is not what we want ++ */ ++ home = g_getenv ("HOME"); ++ if (home == NULL) ++ home = g_get_home_dir (); ++ ++ if (home != NULL) ++ { ++ g_ptr_array_add (saved_env, g_strdup ("XAUTHORITY")); ++ g_ptr_array_add (saved_env, g_build_filename (home, ".Xauthority", NULL)); ++ } ++ } ++ + /* Nuke the environment to get a well-known and sanitized environment to avoid attacks + * via e.g. the DBUS_SYSTEM_BUS_ADDRESS environment variable and similar. + */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index dee5a706b..23ab1c082 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166985 2012-09-24 14:37:09Z dan $ +# $Id: PKGBUILD 173844 2012-12-25 00:34:31Z foutrelis $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade pkgver=9.1.6 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') -makedepends=('krb5' 'python2' 'perl' 'tcl') +makedepends=('krb5' 'python2' 'perl' 'tcl>=8.6.0') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 5127d4260..2724af2f0 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 172927 2012-12-06 22:05:16Z dan $ +# $Id: PKGBUILD 173843 2012-12-25 00:34:29Z foutrelis $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.2 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') -makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0') source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 postgresql-run-socket.patch postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate diff --git a/extra/psutils/PKGBUILD b/extra/psutils/PKGBUILD new file mode 100644 index 000000000..e5c9af4ae --- /dev/null +++ b/extra/psutils/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 137768 2011-09-10 17:03:05Z pierre $ +# Maintainer: eric <eric@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=psutils +pkgver=1.17 +pkgrel=3 +arch=('i686' 'x86_64') +pkgdesc="A set of postscript utilities" +url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html" +license=('custom') +depends=('glibc' 'ghostscript') +provides=('psutils-lprng') +replaces=('psutils-lprng') +options=('!makeflags') +source=("ftp://ftp.archlinux.org/other/psutils/${pkgname}-${pkgver}.tar.gz" + 'psutils-1.17.diff') +md5sums=('b161522f3bd1507655326afa7db4a0ad' + '2b49e9e796000b42f42804d4b50a2be1') + +build() { + cd "${srcdir}/${pkgname}" + patch -Np1 -i "${srcdir}/psutils-1.17.diff" + make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ + INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ + MANDIR="${pkgdir}/usr/share/man/man1" +} + +package() { + cd "${srcdir}/${pkgname}" + install -d -m755 "${pkgdir}/usr/include" + install -d -m755 "${pkgdir}/usr/share/man" + make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ + INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ + MANDIR="${pkgdir}/usr/share/man/man1" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/extra/psutils/psutils-1.17.diff b/extra/psutils/psutils-1.17.diff new file mode 100644 index 000000000..4af32bd7f --- /dev/null +++ b/extra/psutils/psutils-1.17.diff @@ -0,0 +1,33 @@ +diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix +--- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997 ++++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001 +@@ -19,16 +19,16 @@ + # psnup puts multiple logical pages on one physical page + # psresize scales and moves pages to fit on different paper sizes + +-PAPER=a4 ++PAPER=letter + + # Makefile for PSUtils under Unix + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = /usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = /usr/share/psutils ++PERL = /usr/bin/perl + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,7 +36,7 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = /usr/man/man$(MANEXT) + + CC = gcc + CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index 47a144f6a..f478e09b7 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 169013 2012-10-17 10:20:08Z allan $ +# $Id: PKGBUILD 174964 2013-01-09 16:03:42Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=python-egenix-mx-base pkgname=('python2-egenix-mx-base') _origname=egenix-mx-base -pkgver=3.2.4 -pkgrel=3 +pkgver=3.2.5 +pkgrel=1 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -15,7 +15,7 @@ makedepends=('python2') conflicts=('python-egenix-mx-base<=3.2.4-1') replaces=('python-egenix-mx-base<=3.2.4-1') source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7') +sha1sums=('d64607ff3bdd0c908f1f4ce39d458514135c9a86') build() { cd "${srcdir}/${_origname}-${pkgver}" diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 67b8d3c49..b143002bb 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173215 2012-12-13 12:39:30Z stephane $ +# $Id: PKGBUILD 173845 2012-12-25 00:34:33Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.3.0 -pkgrel=2 +pkgrel=3 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite' 'bluez') +makedepends=('tk>=8.6.0' 'sqlite' 'bluez') [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') optdepends=('tk: for tkinter' 'sqlite') provides=('python3') diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 1c23d1d8a..6f94beeb1 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173214 2012-12-13 12:39:26Z stephane $ +# $Id: PKGBUILD 173846 2012-12-25 00:34:35Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.3 -pkgrel=3 +pkgrel=4 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk' 'bluez') +makedepends=('tk>=8.6.0' 'bluez') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 1550da603..214a531f1 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172476 2012-12-03 18:59:33Z ronald $ +# $Id: PKGBUILD 173847 2012-12-25 00:34:38Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r pkgver=2.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') -makedepends=('openjdk6' 'gcc-fortran' 'tk') +makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags' '!emptydirs') diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD index f50eaaf1a..71f7737e0 100644 --- a/extra/re-alpine/PKGBUILD +++ b/extra/re-alpine/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146303 2012-01-09 01:01:51Z eric $ +# $Id: PKGBUILD 174144 2013-01-03 03:51:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Smith Dhumbumroong <zodmaner@gmail.com> pkgname=re-alpine -pkgver=2.02 -pkgrel=3 +pkgver=2.03 +pkgrel=1 pkgdesc="The continuation of the Alpine email client from University of Washington" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/re-alpine/" @@ -12,15 +12,10 @@ license=('APACHE') depends=('libldap' 'krb5') optdepends=('aspell: spell-checking support' 'hunspell: spell-checking support') -provides=('pine' 'alpine') -conflicts=('pine' 'alpine') -replaces=('pine' 'alpine') options=('!makeflags') source=(http://downloads.sourceforge.net/project/re-alpine/${pkgname}-${pkgver}.tar.bz2 maildir.patch) -md5sums=('5e75826b15f05674856be8618bdefdfb' - '8d7a0e8d940e84e978f50266405c7361') -sha1sums=('9c2f13dbc7ca75e7a09f81df607db84694b10fa6' +sha1sums=('8e1c4f4a4d38814478e8bd3bbeed1c0f8ee9491b' 'c09a8e42f9dba3e63a3755a9c418af95da721d8d') build() { diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index d3d4f093c..174f9800e 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 146481 2012-01-11 15:22:34Z stephane $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 174023 2013-01-01 18:37:13Z andyrtr $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.15 -pkgrel=3.2 +pkgver=1.0.16 +pkgrel=1 url="http://librdf.org/" license=("GPL") -arch=('i686' 'x86_64' 'mips64el') -makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +arch=('i686' 'x86_64') +makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) -sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af' - '3aeef38a7247ae33db6a0a19511ef4132240164b' - 'f5db05c925b6bcd6402d5abd75c648b137f069c7') +sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd' + '2955af40eb2fbffa6e1ef28f7f1b7f607a3958478a5080896b878da96605246d' + '9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 5eb884c14..ebc4007af 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164009 2012-07-23 18:45:40Z schiv $ +# $Id: PKGBUILD 173870 2012-12-26 20:57:07Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=12.04 -pkgrel=2 +pkgver=12.12.25 +pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.rosegardenmusic.com/" @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('b11f4fcad69df45365d2125181524559') +md5sums=('8c98e7d3d448b07d9dc079b28bd37eba') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 78a2a2159..b5554eca3 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173178 2012-12-12 00:32:02Z eric $ +# $Id: PKGBUILD 174294 2013-01-04 03:15:34Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=3 +pkgrel=4 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index d85340e58..64e762109 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p327 +pkgver=1.9.3_p362 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('7d602aba93f31ceef32800999855fbca' +md5sums=('13c26ea368d88a560f07cc8c5eb4fa05' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index b47b62c82..653bde91d 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 169815 2012-10-30 08:04:35Z tpowa $ +# $Id: PKGBUILD 173345 2012-12-19 14:09:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.9 +pkgver=3.6.10 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.9 +_realver=3.6.10 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" @@ -157,7 +157,7 @@ install='samba.install' install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf rm -rf ${pkgdir}/var/run } -md5sums=('0c48bbeb9549fcda37f108aa3c2a817f' +md5sums=('b5f0560c216122529b1c3b7f41c62567' 'a45a4283723be2b0ae32439dc4496a09' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index da4d87cc5..70df8abd3 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 171078 2012-11-16 14:24:00Z allan $ +# $Id: PKGBUILD 174261 2013-01-03 12:31:28Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,13 +19,13 @@ makedepends=('clisp' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('1f000ca9d83072b2712d6cdfca7b41de' +md5sums=('a0f12d01697373499597018a1aad431a' '7ac0c1936547f4278198b8bf7725204d') build() { cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" + export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" export GNUMAKE="make -e" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD new file mode 100644 index 000000000..cfa5262bb --- /dev/null +++ b/extra/sdl/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 166673 2012-09-15 09:41:06Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=sdl +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('LGPL') +depends=('glibc' 'libxext' 'libxrender' 'libx11') +makedepends=('alsa-lib' 'mesa' 'libpulse') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') +options=('!libtool') +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8') + +build() { + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/sdl/fix_joystick_misc_axes.diff b/extra/sdl/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/extra/sdl/fix_joystick_misc_axes.diff @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; diff --git a/extra/sdl/libsdl-1.2.15-resizing.patch b/extra/sdl/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/extra/sdl/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/extra/sdl/sdl-1.2.14-disable-mmx.patch b/extra/sdl/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/extra/sdl/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, diff --git a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch b/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index cadce200e..4d959c5fb 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -25,9 +25,6 @@ sha256sums=('9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1' build() { cd "$pkgname-$pkgver" - # From Debian. - patch -p1 -i "$srcdir/10_gpgme_keyring_finalize_typo.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-ldap --enable-hkp \ diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD index 836e19e29..910609df9 100644 --- a/extra/serd/PKGBUILD +++ b/extra/serd/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=serd -pkgver=0.18.0 +pkgver=0.18.2 pkgrel=1 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ license=('custom:ISC') depends=('glibc') makedepends=('python2') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('96dbade2c81d6df8100a9ef605ce35f8') +md5sums=('0569c21860b2ed2744e42884069a40a2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD new file mode 100644 index 000000000..011594504 --- /dev/null +++ b/extra/serf/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 173790 2012-12-23 03:50:15Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=serf +pkgver=1.1.1 +pkgrel=1 +pkgdesc="High-performance asynchronous HTTP client library" +url="http://code.google.com/p/serf/" +arch=('i686' 'x86_64' 'mips64el') +license=('Apache') +depends=('apr' 'apr-util' 'openssl' 'zlib') +source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('1ec4689ef57e7c28e7371df00d0ccc3e32ef6457') +options=('!libtool') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-openssl=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm "${pkgdir}"/usr/lib/libserf-1.a +} diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 9da40a390..41f10cbcd 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 123635 2011-05-11 23:31:36Z bisson $ +# $Id: PKGBUILD 174014 2013-01-01 13:05:38Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sharutils -pkgver=4.11.1 -pkgrel=1.1 +pkgver=4.13 +pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'gettext' 'texinfo') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('8c1531846bc397c2afbbbf2ca33c8d5fd78bbc3d') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "$srcdir/gets.patch" ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/extra/sharutils/gets.patch b/extra/sharutils/gets.patch new file mode 100644 index 000000000..b1b0f16ca --- /dev/null +++ b/extra/sharutils/gets.patch @@ -0,0 +1,16 @@ +diff -ru sharutils-4.11.1.orig/lib/stdio.in.h sharutils-4.11.1/lib/stdio.in.h +--- sharutils-4.11.1.orig/lib/stdio.in.h 2012-12-26 14:49:54.935220358 +0100 ++++ sharutils-4.11.1/lib/stdio.in.h 2012-12-26 14:50:29.151983394 +0100 +@@ -175,12 +175,6 @@ + "use gnulib module fflush for portable POSIX compliance"); + #endif + +-/* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 512f420d5..4594c85c6 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165459 2012-08-20 09:49:18Z giovanni $ +# $Id: PKGBUILD 173880 2012-12-27 00:40:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('55a09aa0a9513c9b8c5ae6e414a3cc8e') +md5sums=('b8472b5baad3616858706a7b4bf0427a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 5ef75191f..5eee90c6b 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167263 2012-09-29 13:32:07Z ibiru $ +# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: shamrok <szamrok@gmail.com> pkgname=smplayer -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('GPL') depends=('qt' 'mplayer') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('39556a6113afcd9ceee071a8f85477dc') +md5sums=('48755bffdff3878df32d8c047d7a3d52') build() { cd "$pkgname-$pkgver" diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD index 326d569d5..3036fbba6 100644 --- a/extra/soundtouch/PKGBUILD +++ b/extra/soundtouch/PKGBUILD @@ -1,30 +1,21 @@ -# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $ +# $Id: PKGBUILD 174146 2013-01-03 05:00:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=soundtouch -pkgver=1.6.0 -pkgrel=1.1 +pkgver=1.7.1 +pkgrel=1 pkgdesc="An audio processing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.surina.net/soundtouch/" license=('LGPL') depends=('gcc-libs') options=('!libtool') -source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz - soundtouch-1.4.0-mmx-sse-compile-fix.patch - soundtouch-1.4.0-x86_64-asm-broken.patch - disable-mmx.patch) -md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd' - '108cd080b4b0ebe8ed1f950ff1315e7a' - '0d856bb5b519b18c6ba3a2e1770bdfd2' - '36e859e7a74a21ec7f9a5282fed63117') +source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz) +sha1sums=('8b1a461754853f9c7328571449b7f9b8bd578a89') build() { cd "${srcdir}/${pkgname}" - patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" - patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" - [ "${CARCH}" = "mips64el" ] && patch -p1 -i "${srcdir}/disable-mmx.patch" - + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac ./bootstrap case $CARCH in i686) diff --git a/extra/speedtouch/PKGBUILD b/extra/speedtouch/PKGBUILD new file mode 100644 index 000000000..658d0f7e7 --- /dev/null +++ b/extra/speedtouch/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143969 2011-11-30 23:13:25Z giovanni $ +# Maintainer: dorphell <dorphell@archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=speedtouch +pkgver=1.3.1 +pkgrel=4 +pkgdesc="Driver for the ADSL Speed Touch USB modem" +arch=('i686' 'x86_64') +url="http://speedtouch.sourceforge.net/" +license=('GPL') +depends=('bash') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'speedtouch-1.3.1-gcc4.patch') +md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2' + '4191035925db745944c75e26937c42a3') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/speedtouch-1.3.1-gcc4.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make prefix=${pkgdir}/usr sysconfdir=${pkgdir}/etc mandir=${pkgdir}/usr/share/man install +} diff --git a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch b/extra/speedtouch/speedtouch-1.3.1-gcc4.patch new file mode 100644 index 000000000..bdd323c50 --- /dev/null +++ b/extra/speedtouch/speedtouch-1.3.1-gcc4.patch @@ -0,0 +1,11 @@ +--- speedtouch-1.3.1/src/modem.h 2004-09-29 21:56:31.000000000 +0100 ++++ speedtouch-1.3.1-gcc4/src/modem.h 2005-07-21 07:15:03.000000000 +0100 +@@ -38,7 +38,4 @@ + #define EP_CODE_IN 0x85 + #define EP_CODE_OUT 0x05 + +-/* Global Variables */ +-extern int verbose; +- + #endif +
\ No newline at end of file diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 2108aed7c..5a31c4b93 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 173255 2012-12-16 18:09:24Z andyrtr $ +# $Id: PKGBUILD 175005 2013-01-10 17:58:12Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071500 +_amalgamationver=3071502 #_docver=${_amalgamationver} -_docver=3071500 -pkgver=3.7.15 +_docver=3071502 +pkgver=3.7.15.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -md5sums=('0d2a2d27b56ac73d49db76dcb6b4619c' +md5sums=('bcb0ab0b5b30116b2531cfeef3c861b4' 'c1cdbc5544034d9012e421e75a5e4890') build() { diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 3ca41dae4..5ce8be215 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 170250 2012-11-06 11:27:11Z stephane $ +# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.7 -pkgrel=2 +pkgver=1.7.8 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' @@ -28,35 +28,40 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.conf svnserve.tmpfiles svnserve.service - subversion-1.7.6-kwallet-gcc47.patch + subversion-kwallet.patch subversion.rpath.fix.patch) -sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951' - '3df83e46277f0f08868236a6b6e6c0f0d7ef9278' +sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2' + '24f8e82fa131c1a1b924d71046f8d38cb00645a7' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' '9f6790d842cf3e0228b007483a43e39a42724068' - 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' + 'f2aed28a2e34b8631ee9b69175bac1bac59327ce' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -p0 -i ../subversion.rpath.fix.patch + patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch + + # FS#33081 + patch -Np0 -i ../subversion-kwallet.patch if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --disable-javahl --with-gnome-keyring --with-kwallet + --disable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static else ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --enable-javahl --with-gnome-keyring --with-kwallet + --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static fi make external-all diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch new file mode 100644 index 000000000..d2bf17101 --- /dev/null +++ b/extra/subversion/subversion-kwallet.patch @@ -0,0 +1,22 @@ +Index: subversion/libsvn_auth_kwallet/kwallet.cpp +=================================================================== +--- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1421011) ++++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy) +@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + } +@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + }
\ No newline at end of file diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index 38532d2bc..f03085cba 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=suil -pkgver=0.6.6 +pkgver=0.6.10 pkgrel=1 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=('python2' 'qt' 'gtk2') optdepends=('qt: Qt UIs wrapping support' 'gtk2: Gtk2 UIs wrapping support') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('6b596ad806b7bf34dfba34afb48bb758') +md5sums=('735e3cc4d539059cf3948d3dba75807e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD new file mode 100644 index 000000000..336177d71 --- /dev/null +++ b/extra/syslog-ng/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 173195 2012-12-12 17:17:00Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.3.7 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' + 'etc/syslog-ng/scl.conf' + 'etc/syslog-ng/syslog-ng.conf' + 'etc/conf.d/syslog-ng' + 'etc/logrotate.d/syslog-ng') +install=$pkgname.install +source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" + syslog-ng.conf + syslog-ng.conf.d + syslog-ng.logrotate + syslog-ng.rc) +sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8' + 'db14f4937a821e449b769c938faf2275a7ef188e' + '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8' + '949128fe3d7f77a7aab99048061f885bc758000c' + '94af81a84e3add6653755122cdd5080694de059d') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib \ + --localstatedir=/var/lib/syslog-ng \ + --datadir=/usr/share/syslog-ng \ + --with-pidfile-dir=/run \ + --disable-spoof-source \ + --enable-systemd \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" + install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" + install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng" +} diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c79e531de --- /dev/null +++ b/extra/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.3 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (10000); + chain_hostnames (off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/run/systemd/journal/syslog"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/extra/syslog-ng/syslog-ng.conf.d b/extra/syslog-ng/syslog-ng.conf.d new file mode 100644 index 000000000..6bf1cd038 --- /dev/null +++ b/extra/syslog-ng/syslog-ng.conf.d @@ -0,0 +1,10 @@ +# +# /etc/conf.d/syslog-ng +# + +# passed to syslog-ng on config check +SYSLOG_NG_CHECKOPTS=() + +# passed to syslog-ng at startup +SYSLOG_NG_OPTS=() + diff --git a/extra/syslog-ng/syslog-ng.install b/extra/syslog-ng/syslog-ng.install new file mode 100644 index 000000000..a9365d6fe --- /dev/null +++ b/extra/syslog-ng/syslog-ng.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 3.3.6-3 "$2")" -eq 1 ]; then + printf '==> syslog-ng now reads from /run/systemd/journal/syslog in the\n' + printf ' default config. If you still use sysvinit/initscripts, this\n' + printf ' must be /dev/log in /etc/syslog-ng/syslog-ng.conf\n' + fi +} diff --git a/extra/syslog-ng/syslog-ng.logrotate b/extra/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..3509f2970 --- /dev/null +++ b/extra/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true + endscript +} diff --git a/extra/syslog-ng/syslog-ng.rc b/extra/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..d48b71ed1 --- /dev/null +++ b/extra/syslog-ng/syslog-ng.rc @@ -0,0 +1,67 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/syslog-ng + +checkconfig() { + if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then + stat_fail + exit 1 + fi +} + +pidfile=/run/syslog-ng.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in + start) + stat_busy "Starting Syslog-NG" + checkconfig + if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then + add_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [[ -z $PID ]]; then + stat_fail + else + checkconfig + if kill -HUP $PID &>/dev/null; then + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index cd0325489..26090b7e3 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 170721 2012-11-10 04:48:01Z allan $ +# $Id: PKGBUILD 173926 2012-12-28 05:57:13Z andyrtr $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.13 -pkgrel=1 +pkgver=8.6.0 +pkgrel=3 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('fa3a9bf9b2d6ed2431f1baa46f4058b8') +md5sums=('573aa5fe678e9185ef2b3c56b24658d3') build() { cd ${srcdir}/tcl${pkgver}/unix + + # we build the tcl sqlite interface in sqlite-tcl package + rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3* - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } @@ -34,19 +34,11 @@ package() cd ${srcdir}/tcl${pkgver}/unix make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh + ln -sf tclsh8.6 ${pkgdir}/usr/bin/tclsh # install license install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # remove buildroot traces - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \ - -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \ - ${pkgdir}/usr/lib/tclConfig.sh + sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh } diff --git a/extra/texlive-bin/09-texlive-fonts.conf b/extra/texlive-bin/09-texlive-fonts.conf new file mode 100644 index 000000000..f870fbd7a --- /dev/null +++ b/extra/texlive-bin/09-texlive-fonts.conf @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <dir>/usr/share/texmf-dist/fonts/opentype</dir> + <dir>/usr/share/texmf-dist/fonts/truetype</dir> + <dir>/usr/local/share/texmf/fonts/opentype</dir> + <dir>/usr/local/share/texmf/fonts/truetype</dir> +</fontconfig> + diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD new file mode 100644 index 000000000..a3278aa7f --- /dev/null +++ b/extra/texlive-bin/PKGBUILD @@ -0,0 +1,311 @@ +# $Id: PKGBUILD 169389 2012-10-20 09:31:50Z andyrtr $ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Contributor: francois <francois.archlinux.org> + +pkgname=texlive-bin +pkgver=2012.0 +pkgrel=5 +pkgdesc="TeX Live binaries" +license=('GPL') +arch=('i686' 'x86_64') +depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') +makedepends=('perl' 'clisp' 'ffcall') +optdepends=('ed: for texconfig') +provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam') +conflicts=('pdfjam') +options=('!libtool' '!strip') +url='http://tug.org/texlive/' +install="texlive.install" +source=('texmf.cnf' + 'fix-fontforge-encoding.patch' + '09-texlive-fonts.conf' + 'poppler-0.20.patch' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz' + 'luatex-r4449-radical-rule-thickness.patch' +) +backup=(etc/texmf/web2c/texmf.cnf \ + etc/texmf/chktex/chktexrc \ + etc/texmf/dvipdfm/config/config \ + etc/texmf/dvipdfmx/dvipdfmx.cfg \ + etc/texmf/dvips/config/config.ps \ + etc/texmf/tex/generic/config/language.dat \ + etc/texmf/tex/generic/config/language.def \ + etc/texmf/tex/generic/config/pdftexconfig.tex \ + etc/texmf/ttf2pk/ttf2pk.cfg \ + etc/texmf/web2c/fmtutil.cnf \ + etc/texmf/web2c/mktex.cnf \ + etc/texmf/xdvi/XDvi) + +md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' + 'bfb9716aa00c86c08cd31e5b32edeb98' + '393a4bf67adc7ca5df2b386759d1a637' + 'e3a664d5a7f0923f35060fe9d25d2573' + 'ac2c3c3aa765581f8504e21a5edbfb9f' + 'f315a860158cfc952c82a6d759961024' + '5190f3295eb9a604c5f17f5bd607299b') + +build() { + if [ "${CARCH}" = "x86_64" ]; then + export CFLAGS="${CFLAGS} -fPIC" + export CXXFLAGS="${CXXFLAGS} -fPIC" + fi + + cd "$srcdir" + # this patch removes spurious error message with locale "xx_YY.utf8" + patch -Np0 -i fix-fontforge-encoding.patch + # fix build with poppler >= 0.20 + patch -Np0 -i poppler-0.20.patch + # fix radical rule thickness regression in Luatex + # http://tex.stackexchange.com/q/61952/729 + patch -Np0 -i luatex-r4449-radical-rule-thickness.patch + # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) + sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c + ############################################################# + ### configure + cd source + ## prevent compiling Xdvi with libXp + sed -i~ 's|-lXp ||' texk/xdvik/configure + test ! -d Work && mkdir Work + cd Work + echo "--> Initial configuration..." + # we use temporary prefix to avoid messing the existing + # $pkgdir/usr/share/texmf tree + # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221) + ../configure --prefix=/usr -C \ + --sysconfdir=/etc \ + --datarootdir=/usr/share \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --disable-native-texlive-build \ + --with-banner-add="/Arch Linux" \ + --disable-multiplatform \ + --disable-dialog \ + --disable-psutils \ + --disable-t1utils \ + --disable-bibtexu \ + --disable-xz \ + --with-system-zlib \ + --with-system-zziplib \ + --with-system-pnglib \ + --with-system-ncurses \ + --with-system-t1lib \ + --with-system-gd \ + --with-system-poppler \ + --with-system-xpdf \ + --with-system-freetype2 \ + --without-system-graphite \ + --with-freetype2-libdir=/usr/lib \ + --with-freetype2-include=/usr/include/freetype2 \ + --with-xdvi-x-toolkit=xaw \ + --disable-dump-share \ + --disable-aleph \ + --enable-luatex \ + --with-clisp-runtime=default \ + --enable-xindy --disable-xindy-rules --disable-xindy-docs + ############################################################# + ### make + echo "-------------------------------------------------------" + echo "--> Building the whole beast ..." + echo "-------------------------------------------------------" + make +} + +package() { + cd "$srcdir" + ############################################################# + ### install texmf tree + echo "-------------------------------------------------------" + echo "--> installing the texmf tree" + echo "-------------------------------------------------------" + install -m755 -d "$pkgdir"/usr/share + cp -r texmf "$pkgdir"/usr/share/ + install -d -m755 "$pkgdir"/etc/texmf/web2c + install -d -m755 "$pkgdir"/etc/texmf/chktex + install -d -m755 "$pkgdir"/etc/texmf/dvips/config + install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config + install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx + install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config + install -d -m755 "$pkgdir"/etc/texmf/ttf2pk + install -d -m755 "$pkgdir"/etc/texmf/xdvi + install -d -m755 "$pkgdir"/etc/fonts/conf.avail + install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/ + # move man files to /usr/share/man + for i in 1 5; do + install -d -m755 "$pkgdir"/usr/share/man/man$i + mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/ + done + # move info files to /usr/share/info + install -d -m755 "$pkgdir"/usr/share/info + mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/ + rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info} + # copy config files to $TEXMFCONFIG tree + cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \ + "$pkgdir"/etc/texmf/chktex/ + cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \ + "$pkgdir"/etc/texmf/dvips/config/ + cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \ + "$pkgdir"/etc/texmf/dvipdfm/config/ + cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \ + "$pkgdir"/etc/texmf/dvipdfmx/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \ + "$pkgdir"/etc/texmf/ttf2pk/ + cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \ + "$pkgdir"/etc/texmf/xdvi/ + # remove TL specific warnings in the language.{dat,def} files: + sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.* + # clean updmap.cfg + sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg + sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg + + ############################################################# + ### install + cd source + # fixes for xindy + find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \; + + echo "-------------------------------------------------------" + echo "--> Proceeding with make install ..." + echo "-------------------------------------------------------" + cd Work + make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install + rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist} + + # replace upstream texmf.cnf with ours + rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf + install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf + # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c + # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter + ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf + # fix location of TEXMFCACHE for luatools + sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua + ## remove aleph from fmtutil.cnf + sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf + + ## install Perl libraries + mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive + install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive + + # create symlinks for formats + echo "--> Create symlinks for TeX formats ..." + PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ + ############################################################# + # remove dangling symlinks + _bibtexextra_scripts=" +bibexport +listbib +urlbst +" + _core_scripts=" +afm2afm +arlatex +autoinst +bundledoc +checkcites +cmap2enc +ctanify +ctanupload +de-macro +dosepsbin +dviasm +epstopdf +findhyph +font2afm +fragmaster +installfont-tl +latex2man +latexdiff +latexdiff-vc +latexfileversion +latexmk +latexrevise +listings-ext.sh +match_parens +mf2pt1 +mkjobtexmf +mkluatexfontdb +mkt1font +mptopdf +ot2kpx +pdf180 +pdf270 +pdf90 +pdfatfi +pdfbook +pdfcrop +pdfflip +pdfjam +pdfjam-pocketmod +pdfjam-slides3up +pdfjam-slides6up +pdfjoin +pdfnup +pdfpun +pfm2kpx +pkfix +pkfix-helper +purifyeps +repstopdf +rpdfcrop +showglyphs +sty2dtx +texcount +texdef +texdiff +texdirflatten +texliveonfly +texloganalyser +typeoutfileinfo +thumbpdf +vpl2ovp +vpl2vpl +" + _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" + _langcjk_scripts="convbkmk updmap-setup-kanji" + _langextra_scripts="ebong" + _langgreek_scripts="mkgrkindex" + _latexextra_scripts=" +authorindex +exceltex +makeglossaries +pdfannotextractor +perltex +ppower4 +ps4pdf +splitindex +svn-multi +vpe" + _music_scripts="m-tx musixtex musixflx pmx2pdf" + _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" + _pstricks_scripts="pedigree pst2pdf" + _science_scripts="ulqda" + for s in \ + ${_bibtexextra_scripts} \ + ${_core_scripts} \ + ${_htmlxml_scripts} \ + ${_langcjk_scripts} \ + ${_langextra_scripts} \ + ${_langgreek_scripts} \ + ${_latexextra_scripts} \ + ${_music_scripts} \ + ${_pictures_scripts} \ + ${_pstricks_scripts} \ + ${_science_scripts} \ + tlmgr; do + rm -f "$pkgdir"/usr/bin/$s + done + ################################################################### +} + diff --git a/extra/texlive-bin/fix-fontforge-encoding.patch b/extra/texlive-bin/fix-fontforge-encoding.patch new file mode 100644 index 000000000..8104b3289 --- /dev/null +++ b/extra/texlive-bin/fix-fontforge-encoding.patch @@ -0,0 +1,12 @@ +--- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200 ++++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200 +@@ -495,6 +495,9 @@ + { "Big5HKSCS", e_big5hkscs }, + { "Big5-HKSCS", e_big5hkscs }, + { "UTF-8", e_utf8 }, ++ { "utf-8", e_utf8 }, ++ { "UTF8", e_utf8 }, ++ { "utf8", e_utf8 }, + { "ISO-10646/UTF-8", e_utf8 }, + { "ISO_10646/UTF-8", e_utf8 }, + { "UCS2", e_unicode }, diff --git a/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch b/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch new file mode 100644 index 000000000..f925a1a93 --- /dev/null +++ b/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch @@ -0,0 +1,23 @@ +Index: source/texk/web2c/luatexdir/tex/mlist.w +=================================================================== +--- source/texk/web2c/luatexdir/tex/mlist.w (revision 4448) ++++ source/texk/web2c/luatexdir/tex/mlist.w (revision 4449) +@@ -1798,7 +1798,17 @@ + theta = fraction_rule(cur_style); + y = var_delimiter(left_delimiter(q), cur_size, + height(x) + depth(x) + clr + theta, NULL, cur_style); +- theta = height(y); ++ /* If |y| is a composite then set |theta| to the height of its top ++ character, else set it to the height of |y|. */ ++ if (list_ptr(y) != null ++ && type(list_ptr(y)) == hlist_node ++ && list_ptr(list_ptr(y)) != null ++ && type(list_ptr(list_ptr(y))) == glyph_node) { /* and it should be */ ++ theta = char_height(font(list_ptr(list_ptr(y))), ++ character(list_ptr(list_ptr(y)))); ++ } else { ++ theta = height(y); ++ } + } else { + y = var_delimiter(left_delimiter(q), cur_size, + height(x) + depth(x) + clr + theta, NULL, cur_style); diff --git a/extra/texlive-bin/poppler-0.20.patch b/extra/texlive-bin/poppler-0.20.patch new file mode 100644 index 000000000..3bd8183ab --- /dev/null +++ b/extra/texlive-bin/poppler-0.20.patch @@ -0,0 +1,22 @@ +--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 ++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 +@@ -1433,7 +1433,7 @@ + + static int m_Object_getTypeName(lua_State * L) + { +- char *s; ++ const char *s; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) +--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200 ++++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200 +@@ -134,7 +134,7 @@ + exit(1); + } + if (extract_xref_table) { +- int size = xref->getSize(); ++ int size = xref->getNumObjects(); + int i; + for (i = 0; i < size; i++) { + if (xref->getEntry(i)->offset == 0xffffffff) diff --git a/extra/texlive-bin/texlive.install b/extra/texlive-bin/texlive.install new file mode 100644 index 000000000..06a40a3b3 --- /dev/null +++ b/extra/texlive-bin/texlive.install @@ -0,0 +1,43 @@ +infodir=usr/share/info +filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info) + +post_install() { + echo ">>> texlive: updating the filename database..." + usr/bin/mktexlsr + echo -n "creating all formats..." + usr/bin/fmtutil-sys --all 1>/dev/null + echo " done." + echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done +} + +post_upgrade() { + local corename corever _pacout + echo ">>> texlive: updating the filename database..." + usr/bin/mktexlsr + _pacout=$(pacman -Q texlive-core 2>/dev/null) + read corename corever <<< ${_pacout} + if [[ ${corever} == 2012* ]]; then + echo -n "recreating all formats..." + usr/bin/fmtutil-sys --all 1>/dev/null + echo " done." + echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + else + echo "WARNING: not recreating formats since texlive-core has version '$corever'" + fi + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done +} diff --git a/extra/texlive-bin/texmf.cnf b/extra/texlive-bin/texmf.cnf new file mode 100644 index 000000000..76975ee5c --- /dev/null +++ b/extra/texlive-bin/texmf.cnf @@ -0,0 +1,724 @@ +% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea. +% Public domain. +% +% If you modify this original file, YOUR CHANGES WILL BE LOST when it is +% updated. Instead, put your changes -- and only your changes, not an +% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if +% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% +% What follows is a super-summary of what this .cnf file can +% contain. Please read the Kpathsea manual for more information. +% +% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. +% The `=' (and surrounding spaces) is optional. +% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. +% Long lines can be continued with a \. +% +% Earlier entries (in the same or another file) override later ones, and +% an environment variable foo overrides any texmf.cnf definition of foo. +% +% All definitions are read before anything is expanded, so you can use +% variables before they are defined. +% +% If a variable assignment is qualified with `.PROGRAM', it is ignored +% unless the current executable (last filename component of argv[0]) is +% named PROGRAM. This foo.PROGRAM construct is not recognized on the +% right-hand side. For environment variables, use FOO_PROGRAM. +% +% Which file formats use which paths for searches is described in the +% various programs' and the Kpathsea documentation (http://tug.org/kpathsea). +% +% // means to search subdirectories (recursively). +% A leading !! means to look only in the ls-R db, never on the disk. +% In this file, either ; or : can be used to separate path components. +% A leading/trailing/doubled path separator in the paths will be +% expanded into the compile-time default. Probably not what you want. +% +% Brace notation is supported, for example: /usr/local/{mytex,othertex} +% expands to /usr/local/mytex:/usr/local/othertex. We make extensive +% use of this. + + +% Part 1: Search paths and directories. + +% This is the parent directory of our several trees, i.e., +% /usr/local/texlive/YYYY in the original TeX Live distribution. +% +% All trees must be organized according to the TeX Directory Structure +% (http://tug.org/tds), or files may not be found. +% +% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +TEXMFROOT = $SELFAUTODIR/share + +% The tree containing runtime files related to the specific +% distribution and version. +TEXMFMAIN = $TEXMFROOT/texmf + +% The main tree of packages, distribution-agnostic: +TEXMFDIST = $TEXMFROOT/texmf-dist + +% Local additions to the distribution trees. +TEXMFLOCAL = /usr/local/share/texmf + +% TEXMFSYSVAR, where *-sys store cached runtime data. +TEXMFSYSVAR = /var/lib/texmf + +% TEXMFSYSCONFIG, where *-sys store configuration data. +TEXMFSYSCONFIG = /etc/texmf + +% Per-user texmf tree(s) -- organized per the TDS, as usual. To define +% more than one per-user tree, set this to a list of directories in +% braces, as described above. (This used to be HOMETEXMF.) ~ expands +% to %USERPROFILE% on Windows, $HOME otherwise. +TEXMFHOME = ~/texmf + +% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. +TEXMFVAR = ~/.texlive/texmf-var + +% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. +TEXMFCONFIG = ~/.texlive/texmf-config + +% List all the texmf trees. +% +% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named +% explicitly and before all other trees. +% +% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the +% files in TEXMFMAIN are tightly coupled with the particular version of +% the distribution, such as configuration files. Overriding them would +% be more likely to cause trouble than help. On the other hand, the +% bulk of packages and fonts are in TEXMFDIST, and locally-installed +% versions should take precedence over those -- although it is generally +% a source of confusion to have different versions of a package +% installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% Where to look for ls-R files. There need not be an ls-R in the +% directories in this path, but if there is one, Kpathsea will use it. +% By default, this is only the !! elements of TEXMF, so that mktexlsr +% does not create ls-R files in the non-!! elements -- because if an +% ls-R is present, it will be used, and the disk will not be searched. +% This is arguably a bug in kpathsea. +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% The system trees. These are the trees that are shared by all users. +% If a tree appears in this list, the mktex* scripts will use +% VARTEXFONTS for generated files, if the original tree isn't writable; +% otherwise the current working directory is used. +SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST + +% Where generated fonts may be written. This tree is used when the sources +% were found in a system tree and either that tree wasn't writable, or the +% varfonts feature was enabled in MT_FEATURES in mktex.cnf. +VARTEXFONTS = $TEXMFVAR/fonts + +% On some systems, there will be a system tree which contains all the font +% files that may be created as well as the formats. For example +% TEXMFVAR = /var/lib/texmf +% is used in many distros. In this case, set VARTEXFONTS like this +%VARTEXFONTS = $TEXMFVAR/fonts +% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). +% +% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below +% one of the TEXMF directories (avoids overlapping ls-R files). + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Usually you will not need to edit any of the following variables. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% WEB2C is for Web2C specific files. The current directory may not be +% a good place to look for them. +WEB2C = $TEXMF/web2c + +% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input +% or \openin, including .sty, .eps, etc. We specify paths for all known +% formats, past or present. Not all of them are built these days. + +% Plain TeX. Have the command tex check all directories as a last +% resort, we may have plain-compatible stuff anywhere. +TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// + +% Fontinst needs to read afm files. +TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// + +% Other plain-based formats. +TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// +TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// +TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// +TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// + +% LaTeX 2e specific macros are stored in latex/, macros that can only be +% used with 2.09 in latex209/. In addition, we look in the directory +% latex209, useful for macros that were written for 2.09 and do not +% mention 2e at all, but can be used with 2e. +TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// +TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// + +% MLTeX. +TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// +TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// + +% e-TeX. +TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// + +% pdfTeX. +TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// +TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// + +% pdfeTeX. +TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// + +% pdfxTeX. +TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// + +% LuaTeX. +TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// + +% XeTeX. +TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// +TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// +TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// + +% Omega / Aleph. +TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// + +% p(La)TeX. +TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// + +% epTeX. +TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// + +% pBibTeX bibliographies and style files. +BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// +BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// + +% ConTeXt. +TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// + +% jadetex. +TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// +TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// + +% XMLTeX. +TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// +TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// + +% Miscellany, no longer built. +TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// +TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// +TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// + +% Earlier entries override later ones, so put this generic one last. +TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// + +% ttf2tfm. +TTF2TFMINPUTS = .;$TEXMF/ttf2pk// + +% Metafont, MetaPost inputs. +MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// +MPINPUTS = .;$TEXMF/metapost// + +% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. +% We want to find the engine-specific file, e.g., cont-en.fmt can +% exist under both pdftex/ and xetex/. But just in case some formats +% end up without an engine directory, look directly in web2c/ too. +% We repeat the same definition three times because of the way fmtutil +% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats +% will not be found. +TEXFORMATS = .;$TEXMF/web2c{/$engine,} +MFBASES = .;$TEXMF/web2c{/$engine,} +MPMEMS = .;$TEXMF/web2c{/$engine,} +% +% As of 2008, pool files don't exist any more (the strings are compiled +% into the binaries), but just in case something expects to find these: +TEXPOOL = .;$TEXMF/web2c +MFPOOL = ${TEXPOOL} +MPPOOL = ${TEXPOOL} + +% support the original xdvi. Must come before the generic settings. +PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// +VFFONTS.XDvi = .;$TEXMF/%s +PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// +TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// + +% Device-independent font metric files. +VFFONTS = .;$TEXMF/fonts/vf// +TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// + +% The $MAKETEX_MODE below means the drivers will not use a cx font when +% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init +% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. +% The modeless part guarantees that bitmaps for PostScript fonts are found. +PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// + +% Similarly for the GF format, which only remains in existence because +% Metafont outputs it (and MF isn't going to change). +GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE// + +% A backup for PKFONTS and GFFONTS. Not used for anything. +GLYPHFONTS = .;$TEXMF/fonts + +% A place to puth everything that doesn't fit the other font categories. +MISCFONTS = .;$TEXMF/fonts/misc// + +% font name map files. This isn't just fonts/map// because ConTeXt +% wants support for having files with the same name in the different +% subdirs. Maybe if the programs ever get unified to accepting the same +% map file syntax the definition can be simplified again. +TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// + +% BibTeX bibliographies and style files. bibtex8 also uses these. +BIBINPUTS = .;$TEXMF/bibtex/bib// +BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// + +% MlBibTeX. +MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// +MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// + +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + +% MFT style files. +MFTINPUTS = .;$TEXMF/mft// + +% PostScript headers and prologues (.pro); unfortunately, some programs +% also use this for acessing font files (enc, type1, truetype) +TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}// +TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}// + +% OSFONTDIR is to provide a convenient hook for allowing TeX to find +% fonts installed on the system (outside of TeX). An empty default +% value would add "//" to the search paths, so we give it a dummy value. +% OSFONTDIR = /usr/share/fonts + +% PostScript Type 1 outline fonts. +T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// + +% PostScript AFM metric files. +AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// + +% TrueType outline fonts. +TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// + +% OpenType outline fonts. +OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// + +% Type 42 outline fonts. +T42FONTS = .;$TEXMF/fonts/type42// + +% Ligature definition files. +LIGFONTS = .;$TEXMF/fonts/lig// + +% Dvips' config.* files (this name should not start with `TEX'!). +TEXCONFIG = $TEXMF/dvips// + +% Makeindex style (.ist) files. +INDEXSTYLE = .;$TEXMF/makeindex// + +% Font encoding files (.enc). +ENCFONTS = .;$TEXMF/fonts/enc// + +% CMap files. +CMAPFONTS = .;$TEXMF/fonts/cmap// + +% Subfont definition files. +SFDFONTS = .;$TEXMF/fonts/sfd// + +% OpenType feature files (.fea). +FONTFEATURES=.;$TEXMF/fonts/fea// + +% .cid and .cidmap +FONTCIDMAPS=.;$TEXMF/fonts/cid// + +% pdftex config files: +PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// + +% Used by DMP (ditroff-to-mpx), called by makempx -troff. +TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps +MPSUPPORT = .;$TEXMF/metapost/support + +% For xdvi to find mime.types and .mailcap, if they do not exist in +% ~. These are single directories, not paths. +% (But the default mime.types, at least, may well suffice.) +MIMELIBDIR = /etc +MAILCAPLIBDIR = /etc + +% Default settings for the fontconfig library as used by the Windows +% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores +% this. ConTeXT MkIV (all platforms) also use these values. +% +FONTCONFIG_FILE = fonts.conf +FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf +FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache + +% TeX documentation and source files, for use with texdoc and kpsewhich. +TEXDOCS = $TEXMF/doc// +TEXSOURCES = .;$TEXMF/source// + +% Web and CWeb input paths. +WEBINPUTS = .;$TEXMF/web// +CWEBINPUTS = .;$TEXMF/cweb// + +% Omega-related fonts and other files. +OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// +OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// +OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// +OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// +OTPINPUTS = .;$TEXMF/omega/otp// +OCPINPUTS = .;$TEXMF/omega/ocp// + +% Some additional input variables for several programs. If you add +% a program that uses the `other text files' or `other binary files' +% search formats, you'll want to add their variables here as well. +T4HTINPUTS = .;$TEXMF/tex4ht// + +%% t4ht utility, sharing files with TeX4ht +TEX4HTFONTSET=alias,iso8859,unicode +TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// + +% TeXworks editor configuration and settings +TW_LIBPATH = $TEXMFCONFIG/texworks +TW_INIPATH = $TW_LIBPATH + +% For security, do not look in . for dvipdfmx.cfg, since the D option +% would allow command execution. +DVIPDFMXINPUTS = $TEXMF/dvipdfmx + +% Lua needs to look in TEXINPUTS for lua scripts distributed with packages. +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS sufficess for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// + +% Lua needs to look for binary lua libraries distributed with packages. +CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// + +% Architecture independent executables. +TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// + +% Other languages. +JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java// +PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl// +PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python// +RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// + + +%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. +% KPSE_DOT = . + +% This definition isn't used from this .cnf file itself (that would be +% paradoxical), but the compile-time default in paths.h is built from it. +% The SELFAUTO* variables are set automatically from the location of +% argv[0], in kpse_set_program_name. +% +% This main texmf.cnf file is installed, for a release YYYY, in a +% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% Since this file is subject to future updates, the TeX Live installer +% or human administrator may also create a file +% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file +% will take precedence over the distributed one under texmf/web2c. +% +% For security reasons, it is better not to include . in this path. +% +TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} + +% kpathsea 3.5.3 and later sets these at runtime. To avoid empty +% expansions from binaries linked against an earlier version of the +% library, we set $progname and $engine to something non-empty: +progname = unsetprogname +engine = unsetengine + + +% Part 2: Options. + +% If this option is set to true, `tex a.b' will look first for a.b.tex +% (within each path element), and then for a.b, i.e., we try standard +% extensions first. If this is false, we first look for a.b and then +% a.b.tex, i.e., we try the name as-is first. +% +% Both names are always tried; the difference is the order in which they +% are tried. The setting applies to all searches, not just .tex. +% +% This setting only affects names being looked up which *already* have +% an extension. A name without an extension (e.g., `tex story') will +% always have an extension added first. +% +% The default is true, because we already avoid adding the standard +% extension(s) in the usual cases. E.g., babel.sty will only look for +% babel.sty, not babel.sty.tex, regardless of this setting. +try_std_extension_first = t + +% Enable system commands via \write18{...}. When enabled fully (set to +% t), obviously insecure. When enabled partially (set to p), only the +% commands listed in shell_escape_commands are allowed. Although this +% is not fully secure either, it is much better, and so useful that we +% enable it for everything but bare tex. +shell_escape = p + +% No spaces in this command list. +% +% The programs listed here are as safe as any we know: they either do +% not write any output files, respect openout_any, or have hard-coded +% restrictions similar or higher to openout_any=p. They also have no +% features to invoke arbitrary other programs, and no known exploitable +% bugs. All to the best of our knowledge. They also have practical use +% for being called from TeX. +% +shell_escape_commands = \ +bibtex,bibtex8,\ +kpsewhich,\ +makeindex,\ +repstopdf,\ + +% we'd like to allow: +% dvips - but external commands can be executed, need at least -R1. +% epspdf, ps2pdf, pstopdf - need to respect openout_any, +% and gs -dSAFER must be used and check for shell injection with filenames. +% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, +% without Unix convert it hardly seems worth it, and Windows convert +% is something completely different that destroys filesystems, so skip. +% pygmentize - but is the filter feature insecure? +% ps4pdf - but it calls an unrestricted latex. +% rpdfcrop - maybe ok, but let's get experience with repstopdf first. +% texindy,xindy - but is the module feature insecure? +% ulqda - but requires optional SHA1.pm, so why bother. +% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. + +% plain TeX should remain unenhanced. +shell_escape.tex = f +shell_escape.initex = f + +% This is used by the Windows script wrapper for restricting searching +% for the purportedly safe shell_escape_commands above to system +% directories. +TEXMF_RESTRICTED_SCRIPTS = \ + {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + +% Allow TeX \openin, \openout, or \input on filenames starting with `.' +% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? +% a (any) : any file can be opened. +% r (restricted) : disallow opening "dotfiles". +% p (paranoid) : as `r' and disallow going to parent directories, and +% restrict absolute paths to be under $TEXMFOUTPUT. +openout_any = p +openin_any = a + +% Write .log/.dvi/etc. files here, if the current directory is unwritable. +%TEXMFOUTPUT = /tmp + +% If a dynamic file creation fails, log the command to this file, in +% either the current directory or TEXMFOUTPUT. Set to the +% empty string or 0 to avoid logging. +MISSFONT_LOG = missfont.log + +% Set to a colon-separated list of words specifying warnings to suppress. +% To suppress everything, use TEX_HUSH = all; this is currently equivalent to +% TEX_HUSH = checksum:lostchar:readable:special +% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. +TEX_HUSH = none + +% Allow TeX, and MF to parse the first line of an input file for +% the %&format construct. +parse_first_line = t + +% But don't parse the first line if invoked as "tex", since we want that +% to remain Knuth-compatible. The src_specials and +% file_line_error_style settings, as well as the options -enctex, +% -mltex, -8bit, etc., also affect this, but they are all off by default. +parse_first_line.tex = f +parse_first_line.initex = f + +% Control file:line:error style messages. +file_line_error_style = f + +% Enable the mktex... scripts by default? These must be set to 0 or 1. +% Particular programs can and do override these settings, for example +% dvips's -M option. Your first chance to specify whether the scripts +% are invoked by default is at configure time. +% +% These values are ignored if the script names are changed; e.g., if you +% set DVIPSMAKEPK to `foo', what counts is the value of the environment +% variable/config value `FOO', not the `MKTEXPK' value. +% +%MKTEXTEX = 0 +%MKTEXPK = 0 +%MKTEXMF = 0 +%MKTEXTFM = 0 +%MKTEXFMT = 0 +%MKOCP = 0 +%MKOFM = 0 + +% Used by makempx to run TeX. We use "etex" because MetaPost is +% expecting DVI, and not "tex" because we want first line parsing. +TEX = etex + +% These variables specify the external program called for the +% interactive `e' option. %d is replaced by the line number and %s by +% the current filename. The default is specified at compile-time, and +% we let that stay in place since different platforms like different values. +%TEXEDIT = vi +%d '%s' % default for Unix +%TEXEDIT = texworks --position=+%d "%s" % default for Windows +%MFEDIT = ${TEXEDIT} +%MPEDIT = ${TEXEDIT} + +% The default `codepage and sort order' file for BibTeX8, when none is +% given as command line option or environment variable. +BIBTEX_CSFILE = 88591lat.csf + +% This variable is specific to Windows. It must be set to 0 or 1. The +% default is 0. Setting it to 1 tells the Windows script wrappers to +% use an already installed Perl interpreter if one is found on the +% search path, in preference to the Perl shipped with TeX Live. Thus, +% it may be useful if you both (a) installed a full Perl distribution +% for general use, and (b) need to run Perl programs from TL that use +% additional modules we don't provide. The TL Perl does provide all the +% standard Perl modules. +% +%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + + +% Part 3: Array and other sizes for TeX (and Metafont). +% +% If you want to change some of these sizes only for a certain TeX +% variant, the usual dot notation works, e.g., +% main_memory.hugetex = 20000000 +% +% If a change here appears to be ignored, try redumping the format file. + +% Memory. Must be less than 8,000,000 total. +% +% main_memory is relevant only to initex, extra_mem_* only to non-ini. +% Thus, have to redump the .fmt file after changing main_memory; to add +% to existing fmt files, increase extra_mem_*. (To get an idea of how +% much, try \tracingstats=2 in your TeX source file; +% web2c/tests/memtest.tex might also be interesting.) +% +% To increase space for boxes (as might be needed by, e.g., PiCTeX), +% increase extra_mem_bot. +% +% For some xy-pic samples, you may need as much as 700000 words of memory. +% For the vast majority of documents, 60000 or less will do. +% +main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +extra_mem_top = 0 % extra high memory for chars, tokens, etc. +extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. + +% ConTeXt needs lots of memory. +extra_mem_top.context = 2000000 +extra_mem_bot.context = 4000000 + +% Words of font info for TeX (total size of all TFM files, approximately). +% Must be >= 20000 and <= 147483647 (without tex.ch changes). +font_mem_size = 3000000 + +% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). +font_max = 9000 + +% Extra space for the hash table of control sequences. +hash_extra = 200000 + +% Max number of characters in all strings, including all error messages, +% help texts, font names, control sequences. These values apply to TeX. +pool_size = 3250000 +% Minimum pool space after TeX's own strings; must be at least +% 25000 less than pool_size, but doesn't need to be nearly that large. +string_vacancies = 90000 +% Maximum number of strings. +max_strings = 500000 +% min pool space left after loading .fmt +pool_free = 47500 + +% Buffer size. TeX uses the buffer to contain input lines, but macro +% expansion works by writing material into the buffer and reparsing the +% line. As a consequence, certain constructs require the buffer to be +% very large, even though most documents can be handled with a small value. +buf_size = 200000 + +% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in +% the sources), but we don't need that much. The value here suffices +% for all known free hyphenation patterns to be loaded simultaneously +% (as TeX Live does). +% +trie_size = 1000000 + +hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. + % http://primes.utm.edu/curios/page.php/8191.html +nest_size = 500 % simultaneous semantic levels (e.g., groups) +max_in_open = 15 % simultaneous input files and error insertions, + % also applies to MetaPost +param_size = 10000 % simultaneous macro parameters, also applies to MP +save_size = 50000 % for saving values outside current group +stack_size = 5000 % simultaneous input sources + +% These are Omega-specific. +ocp_buf_size = 500000 % character buffers for ocp filters. +ocp_stack_size = 10000 % stacks for ocp computations. +ocp_list_size = 1000 % control for multiple ocps. + +% These work best if they are the same as the I/O buffer size, but it +% doesn't matter much. Must be a multiple of 8. +dvi_buf_size = 16384 % TeX +gf_buf_size = 16384 % MF + +% It's probably inadvisable to change these. At any rate, we must have: +% 45 < error_line < 255; +% 30 < half_error_line < error_line - 15; +% 60 <= max_print_line; +% These apply to TeX, Metafont, and MetaPost. +error_line = 79 +half_error_line = 50 +max_print_line = 79 + +% Metafont only. +screen_width.mf = 1664 +screen_depth.mf = 1200 + +% BibTeX only (max_strings also determines hash_size and hash_prime). +ent_str_size = 250 +glob_str_size = 5000 +max_strings.bibtex = 35307 +max_strings.bibtex8 = 35307 +max_strings.bibtexu = 35307 +max_strings.pbibtex = 35307 + +% GFtype only. +line_length.gftype = 500 +max_rows.gftype = 8191 +max_cols.gftype = 8191 diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index a85383f60..1d196fe0b 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -34,6 +34,9 @@ build() { sed -i '/gtk-update-icon-cache/d' Makefile.in sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in + # Unused i386 binary making strip fail. + rm plugins/maxima/bin/maxima_filter + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --libexecdir=/usr/lib diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 77840cd1b..de4a198f9 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173051 2012-12-09 18:17:19Z foutrelis $ +# $Id: PKGBUILD 173900 2012-12-27 13:11:31Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2) -sha256sums=('a81021af558802b8c2c6cd7db47cca262477c4f3d2b6d8cfa8dbba88568048f1') +sha256sums=('7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85') build() { cd "$srcdir/Thunar-$pkgver" diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD new file mode 100644 index 000000000..6d3c71623 --- /dev/null +++ b/extra/thunderbird/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 171672 2012-11-21 02:02:06Z foutrelis $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Anders Bostrom <anders.bostrom@home.se> + +pkgname=thunderbird +pkgver=17.0 +pkgrel=1 +pkgdesc="Standalone Mail/News reader" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/thunderbird/" +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js) +options=(!emptydirs) +md5sums=('f3690660044337273efb52f79cb15b0e' + '41511a6bcdd04cf56706218e4670e631' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + '1c6f47b315a5d7830f8e901b1f723cfc' + '5a53179d14ae9631b7afe5e4d0fc0b25') + +build() { + cd comm-release + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + + cp "$srcdir/mozconfig" .mozconfig + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd comm-release + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" + + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" + done + + install -Dm644 "$srcdir/thunderbird.desktop" \ + "$pkgdir/usr/share/applications/thunderbird.desktop" + + rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} +} diff --git a/extra/thunderbird/mozconfig b/extra/thunderbird/mozconfig new file mode 100644 index 000000000..8950db703 --- /dev/null +++ b/extra/thunderbird/mozconfig @@ -0,0 +1,40 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/thunderbird/thunderbird-install-dir.patch b/extra/thunderbird/thunderbird-install-dir.patch new file mode 100644 index 000000000..871b7bc47 --- /dev/null +++ b/extra/thunderbird/thunderbird-install-dir.patch @@ -0,0 +1,47 @@ +diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk +--- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist +diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk +--- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 ++++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk +--- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/extra/thunderbird/thunderbird.desktop b/extra/thunderbird/thunderbird.desktop new file mode 100644 index 000000000..a626e52ba --- /dev/null +++ b/extra/thunderbird/thunderbird.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird %u +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true diff --git a/extra/thunderbird/thunderbird.install b/extra/thunderbird/thunderbird.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/extra/thunderbird/thunderbird.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/thunderbird/vendor.js b/extra/thunderbird/vendor.js new file mode 100644 index 000000000..170b505a8 --- /dev/null +++ b/extra/thunderbird/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index cadaef654..439939459 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165513 2012-08-21 19:57:50Z eric $ +# $Id: PKGBUILD 173850 2012-12-25 00:34:49Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=timidity++ pkgver=2.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64' 'mips64el') url="http://timidity.sourceforge.net" license=('GPL') -depends=('libao' 'libvorbis' 'jack' 'ncurses') -makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw') +depends=('libao' 'jack') +makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw') optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \ 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') @@ -22,6 +22,8 @@ sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' build() { cd "${srcdir}/TiMidity++-${pkgver}" + sed -i -e 's/tcl8.5/tcl8.6 tcl8.5/' -e 's/tk8.5/tk8.6 tk8.5/' configure + sed -i 's/my_interp->result/(char *) Tcl_GetObjResult(my_interp)/' interface/tk_c.c ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \ --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \ --enable-audio=alsa,oss,ao,vorbis,flac,jack \ diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index 1dce45686..807a94be2 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $ +# $Id: PKGBUILD 173851 2012-12-25 00:34:54Z foutrelis $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.13 +pkgver=8.6.0 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64' 'mips64el') @@ -11,16 +11,13 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('1fc7dbb7495160756dbc805224afa360') +md5sums=('b883a1a3c489c17413fb602a94bf54e8') build() { cd ${srcdir}/tk${pkgver}/unix - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } @@ -34,23 +31,12 @@ package() { cd ${srcdir}/tk${pkgver}/unix make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf wish8.5 ${pkgdir}/usr/bin/wish - - # install private headers (FS#14388) - cd ${srcdir}/tk${pkgver} - for dir in compat generic generic/ttk unix; do - install -dm755 ${pkgdir}/usr/include/tk-private/$dir - install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h - done + ln -sf wish8.6 ${pkgdir}/usr/bin/wish # install license install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # remove buildroot traces - sed -i \ - -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ - -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ - ${pkgdir}/usr/lib/tkConfig.sh + sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/tkConfig.sh + } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 64f106019..b39b80d0b 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170069 2012-10-31 13:47:37Z ibiru $ +# $Id: PKGBUILD 173915 2012-12-28 03:11:25Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.73 -pkgrel=2 +pkgver=2.75 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') @@ -39,7 +39,6 @@ package_transmission-cli() { install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" - ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" } @@ -71,7 +70,7 @@ package_transmission-qt() { install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" } -md5sums=('fae00b13a7b18f9dc16edef020edea85' +md5sums=('26b92e56e1574bb10443eccbf17443a7' '7d6186ee2a852ae3d44980f05063e194' 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 94a829f5c..b0832042c 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -1,10 +1,4 @@ post_install() { - cat << _EOF - - If you want to run the Transmission daemon at boot do: - systemctl enable transmissiond -_EOF - post_upgrade passwd -l transmission &>/dev/null } diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 483ca44d9..8a743571a 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 169039 2012-10-17 10:21:17Z allan $ +# $Id: PKGBUILD 174290 2013-01-03 23:54:14Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=12.2.0 -pkgrel=2 -pkgdesc="Asynchronous networking framework written in Python." +pkgver=12.3.0 +pkgrel=1 +pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') url="http://twistedmatrix.com/" license=('MIT') @@ -18,7 +18,7 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9') +sha1sums=('921bef9a560edd14ea2b559ac0d674f4dac4fd65') build() { cd "$srcdir/Twisted-$pkgver" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index e204462db..a476b2701 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -10,10 +10,10 @@ url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++" license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') -#source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('99d302b5217bb92b6fb9d91ead6fd028' - '0fcfd66e9746c3105cb5d222ad2cc91d') +source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) +#source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('657555f23a0e79952e811cf738fc4526' + 'd2cfc22eac90730992de976c4d7530c1') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index c6c126fd2..a8a55a34b 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169974 2012-10-30 22:59:38Z heftig $ +# $Id: PKGBUILD 174775 2013-01-07 12:39:21Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('parted: partition management' 'gptfdisk: GUID partition table support') options=(!libtool) source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) -sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb') +sha256sums=('7a6728942d3cd1adc8cd5ee770e8865b293694e9663487861b7b8bf7b495bbbf') build() { cd "udisks-$pkgver" diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 4826ccb6e..4d0f61a8d 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167322 2012-10-01 01:53:47Z bisson $ +# $Id: PKGBUILD 174018 2013-01-01 13:24:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('4f63836935051d52b9194572afb904892fe89595') +sha1sums=('4f40912e4d4a85d9967044caef9e1ef349f3d6f2') install=install diff --git a/extra/unrar/PKGBUILD b/extra/unrar/PKGBUILD new file mode 100644 index 000000000..f4ef1a125 --- /dev/null +++ b/extra/unrar/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 161802 2012-06-14 17:00:58Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: dorphell <dorphell@gmx.net> + +pkgbase=unrar +pkgname=('unrar' 'libunrar') +pkgver=4.2.4 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.rarlab.com/rar_add.htm" +license=('custom') +makedepends=('gcc-libs') +source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz" + 'unrar-4.2.1-soname.patch') +md5sums=('8ea9d1b4139474b282d76e627a2de3e4' + 'b9ec767da9a36f5ac38034c974e77758') + +build() { + cd "${srcdir}/${pkgbase}" + + patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch" + + cp -a ${srcdir}/unrar ${srcdir}/libunrar + make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}" + make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true" +} + +package_unrar() { + pkgdesc="The RAR uncompression program" + depends=('gcc-libs') + cd "${srcdir}/${pkgbase}" + + install -Dm755 unrar "${pkgdir}/usr/bin/unrar" + # install license + install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_libunrar() { + pkgdesc="Library and header file for applications that use libunrar" + depends=('gcc-libs') + cd "${srcdir}/libunrar" + + install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}" + install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp" + ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4" + ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so" + # install license + install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/unrar/unrar-4.2.1-soname.patch b/extra/unrar/unrar-4.2.1-soname.patch new file mode 100644 index 000000000..83ebe9611 --- /dev/null +++ b/extra/unrar/unrar-4.2.1-soname.patch @@ -0,0 +1,11 @@ +--- makefile.unix 2012-02-23 10:23:14.000000000 +0100 ++++ makefile.unix 2012-05-05 12:58:13.000000000 +0200 +@@ -131,7 +131,7 @@ + lib: CXXFLAGS+=$(LIBFLAGS) + lib: clean $(OBJECTS) $(LIB_OBJ) + @rm -f libunrar.so +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++ $(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + + install-unrar: + install -D unrar $(DESTDIR)/bin/unrar diff --git a/extra/unzip/PKGBUILD b/extra/unzip/PKGBUILD new file mode 100644 index 000000000..7c2d71367 --- /dev/null +++ b/extra/unzip/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 150453 2012-02-17 23:22:29Z allan $ +# Maintainer: +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: Robson Peixoto + +pkgname=unzip +pkgver=6.0 +pkgrel=6 +pkgdesc="Unpacks .zip archives such as those made by PKZIP" +arch=('i686' 'x86_64') +url="http://www.info-zip.org/" +license=('custom') +depends=('bzip2' 'bash') +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz') +md5sums=('62b490407489521db863b523a7f86375') + +build() { + cd ${srcdir}/${pkgname}${pkgver/./} + + # set CFLAGS -- from Debian + export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ + -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ + -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ + -DUSE_BZIP2 -DNATIVE" + + sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile + + # make -- from Debian + make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips +} + +package() { + cd ${srcdir}/${pkgname}${pkgver/./} + + # install -- from Debian + make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install + + # install the license file + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE +} + diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index e8ceb8a2b..737738445 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $ +# $Id: PKGBUILD 174773 2013-01-07 12:34:08Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.18 -pkgrel=2 +pkgver=0.9.19 +pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') url="http://upower.freedesktop.org" @@ -12,9 +12,9 @@ depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' ' makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') options=('!libtool') source=($url/releases/$pkgname-$pkgver.tar.xz - 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) -md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' - '188afea4919dc324b2efbae35d9d216a') + lg-unifying-fix-K750-features-name-use-1-second-interval.patch) +md5sums=('f96955ff1a2e4f006937d6b5ea95afb8' + '04b2a6141e80e422a9fe2820b5b3a613') build() { cd "$pkgname-$pkgver" @@ -22,8 +22,7 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - # https://bugs.freedesktop.org/show_bug.cgi?id=54371 - patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + patch -Np1 -i ../lg-unifying-fix-K750-features-name-use-1-second-interval.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch b/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch new file mode 100644 index 000000000..27c4dc51e --- /dev/null +++ b/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch @@ -0,0 +1,98 @@ +From 35b0d25b49d04cf7d33699c34f42a196c8e92a2e Mon Sep 17 00:00:00 2001 +From: Julien Danjou <julien@danjou.info> +Date: Sat, 01 Dec 2012 12:30:03 +0000 +Subject: lg-unifying: fix K750 features name, use 1 second interval + +I've recently got access to some spec on this, so I'm now able to document +his a bit better. Also, change the 0x78 value for the function sending +BattLightMeasureBroadcastEvent to 0x1 since this is the number of event we +want, and one is enough. + +Signed-off-by: Julien Danjou <julien@danjou.info> +Signed-off-by: Richard Hughes <richard@hughsie.com> +--- +diff --git a/src/linux/up-device-lg-unifying.c b/src/linux/up-device-lg-unifying.c +index e8997c0..eddd1ec 100644 +--- a/src/linux/up-device-lg-unifying.c ++++ b/src/linux/up-device-lg-unifying.c +@@ -84,10 +84,9 @@ + #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETCOUNT (0x00 << 4) + #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETDEVICENAME (0x01 << 4) + +-/* I wish i has the spec for this, but I don't so I invented the name */ +-#define HIDPP_FEATURE_K750_BATTERY 0x4301 +-#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY (0x00 << 4) +-#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT (0x01 << 4) ++#define HIDPP_FEATURE_SOLAR_DASHBOARD 0x4301 ++#define HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure (0x00 << 4) ++#define HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent (0x01 << 4) + + #define HIDPP_FEATURE_FUNCTION_AS_ARG(feature) \ + feature >> 8, feature, 0x00 +@@ -105,7 +104,7 @@ struct UpDeviceUnifyingPrivate + int fd; + /* Device index on the Unifying "bus" */ + gint device_index; +- gint feature_k750_battery_index; ++ gint feature_solar_dashboard_index; + GIOChannel *channel; + guint channel_source_id; + }; +@@ -130,8 +129,8 @@ up_device_unifying_event_io (GIOChannel *channel, GIOCondition condition, gpoint + while (read (unifying->priv->fd, buf, sizeof(buf)) > 0) + if (buf[0] == HIDPP_HEADER_RESPONSE && + buf[1] == unifying->priv->device_index && +- buf[2] == unifying->priv->feature_k750_battery_index && +- buf[3] == HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT) { ++ buf[2] == unifying->priv->feature_solar_dashboard_index && ++ buf[3] == HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent) { + lux = (buf[5] << 8) | buf[6]; + if (lux > 200) { + g_object_set (device, +@@ -283,25 +282,24 @@ up_device_unifying_hidpp2_set_battery (UpDeviceUnifying *unifying) + 0x00, 0x00, 0x00, 0x00, 0x00, + }; + +- if (unifying->priv->feature_k750_battery_index == -1) +- unifying->priv->feature_k750_battery_index = +- up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_K750_BATTERY); ++ if (unifying->priv->feature_solar_dashboard_index == -1) ++ unifying->priv->feature_solar_dashboard_index = ++ up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_SOLAR_DASHBOARD); + +- if (unifying->priv->feature_k750_battery_index == 0) { +- /* Probably not a K750 */ ++ if (unifying->priv->feature_solar_dashboard_index == 0) { ++ /* Probably not a solar keyboard */ + /* TODO: add support for BatteryLevelStatus */ + } else { + /* This request will make the keyboard send a bunch of packets + * (events) with lux-meter and battery information */ +- request[2] = unifying->priv->feature_k750_battery_index; +- request[3] = HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY; +- /* Don't know what this means */ +- request[4] = 0x78; +- request[5] = 0x01; ++ request[2] = unifying->priv->feature_solar_dashboard_index; ++ request[3] = HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure; ++ request[4] = 0x01; /* Max number of reports: number of report sent after function call */ ++ request[5] = 0x01; /* Report period: time between reports, in seconds */ + + + if (write (unifying->priv->fd, request, sizeof(request)) != sizeof(request)) { +- g_debug ("Unable to send K750 battery/lux events start request to device"); ++ g_debug ("Unable to send solar battery/lux events start request to device"); + return FALSE; + } + +@@ -719,7 +717,7 @@ up_device_unifying_init (UpDeviceUnifying *unifying) + unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying); + unifying->priv->poll_timer_id = 0; + unifying->priv->fd = -1; +- unifying->priv->feature_k750_battery_index = -1; ++ unifying->priv->feature_solar_dashboard_index = -1; + } + + /** +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index f1d525b93..fd6cd7b6d 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 166800 2012-09-19 10:37:35Z allan $ +# $Id: PKGBUILD 173941 2012-12-28 13:12:00Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') url="http://valgrind.org/" -depends=('glibc>=2.16' 'glibc<2.17' 'perl') +depends=('glibc>=2.17' 'glibc<2.18' 'perl') makedepends=('gdb') options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('288758010b271119a0ffc0183f1d6e38') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.8.1-glibc-2.17.patch) +md5sums=('288758010b271119a0ffc0183f1d6e38' + 'e87c34f9f9ce0040d141b3bd57842b5c') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch + if [ "${CARCH}" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit else diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch new file mode 100644 index 000000000..bfeb9486d --- /dev/null +++ b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure +--- valgrind-3.8.1-orig/configure 2012-09-19 05:19:23.000000000 +1000 ++++ valgrind-3.8.1/configure 2012-12-27 08:11:36.645429011 +1000 +@@ -6612,6 +6612,24 @@ + + # DEFAULT_SUPP set by kernel version check above. + ;; ++ 2.17) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 ++$as_echo "2.17 family" >&6; } ++ ++$as_echo "#define GLIBC_2_17 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ darwin) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 ++$as_echo "Darwin" >&6; } ++ ++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h ++ ++ # DEFAULT_SUPP set by kernel version check above. ++ ;; + bionic) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5 + $as_echo "Bionic" >&6; } +@@ -6624,7 +6642,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index ce0828e68..19483c658 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 173180 2012-12-12 00:32:10Z eric $ +# $Id: PKGBUILD 173956 2012-12-29 19:10:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.3.9.2 -pkgrel=2 +pkgrel=4 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') -optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') +optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('636e96a62e60155f3b9769905d9912b9') diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 5e38243e4..654516144 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') -makedepends=('mesa') +makedepends=('mesa' 'glu') source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch wxpython-fpb_default_style.patch) sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' diff --git a/extra/xchat/PKGBUILD b/extra/xchat/PKGBUILD new file mode 100644 index 000000000..6fee3c70f --- /dev/null +++ b/extra/xchat/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 173853 2012-12-25 00:35:03Z foutrelis $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xchat +pkgver=2.8.8 +pkgrel=11 +pkgdesc="A GTK+ based IRC client" +arch=('i686' 'x86_64') +url="http://www.xchat.org/" +license=('GPL') +depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme') +makedepends=('tcl' 'perl' 'python2' 'librsvg') +optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' + 'python2: for python plugin') +options=('!libtool') +install=xchat.install +source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + http://xchat.org/files/icons/xchat-svg.tar.bz2 + xchat-2.8.8-libnotify07.patch + xchat-2.8.8-link-against-libnotify.patch + xchat-2.8.8-glib-2.31.patch) +sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' + '0d366346cc11e0efb57fc2648fe423c94a3469bd' + 'a053fba4e1911d1ee6a8248fe19e344797920fe3' + '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' + 'aecaf6176a7cfd62555207b02f2793b360aa39da') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" + patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" + patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" + autoconf + autoheader + + LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \ + --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + for i in 24 32 48 64 128 256 ; do + install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps" + rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg + done + install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg" + install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg" +} diff --git a/extra/xchat/xchat-2.8.8-glib-2.31.patch b/extra/xchat/xchat-2.8.8-glib-2.31.patch new file mode 100644 index 000000000..63f562ff8 --- /dev/null +++ b/extra/xchat/xchat-2.8.8-glib-2.31.patch @@ -0,0 +1,62 @@ +Author: Dominique Leuenberger <dimstar@opensuse.org> + +http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239 + +glib got stricter in checking includes. Only glib.h (and a few exceptions) +are to be included directly. + +Index: xchat-2.8.8/src/common/servlist.c +=================================================================== +--- xchat-2.8.8.orig/src/common/servlist.c ++++ xchat-2.8.8/src/common/servlist.c +@@ -24,7 +24,7 @@ + #include <unistd.h> + + #include "xchat.h" +-#include <glib/ghash.h> ++#include <glib.h> + + #include "cfgfiles.h" + #include "fe.h" +Index: xchat-2.8.8/src/common/text.c +=================================================================== +--- xchat-2.8.8.orig/src/common/text.c ++++ xchat-2.8.8/src/common/text.c +@@ -28,7 +28,7 @@ + #include <sys/mman.h> + + #include "xchat.h" +-#include <glib/ghash.h> ++#include <glib.h> + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +Index: xchat-2.8.8/src/common/util.c +=================================================================== +--- xchat-2.8.8.orig/src/common/util.c ++++ xchat-2.8.8/src/common/util.c +@@ -39,7 +39,7 @@ + #include <errno.h> + #include "xchat.h" + #include "xchatc.h" +-#include <glib/gmarkup.h> ++#include <glib.h> + #include <ctype.h> + #include "util.h" + #include "../../config.h" +Index: xchat-2.8.8/src/common/xchat.h +=================================================================== +--- xchat-2.8.8.orig/src/common/xchat.h ++++ xchat-2.8.8/src/common/xchat.h +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include <glib/gslist.h> +-#include <glib/glist.h> +-#include <glib/gutils.h> +-#include <glib/giochannel.h> +-#include <glib/gstrfuncs.h> ++#include <glib.h> + #include <time.h> /* need time_t */ + + #ifndef XCHAT_H diff --git a/extra/xchat/xchat-2.8.8-libnotify07.patch b/extra/xchat/xchat-2.8.8-libnotify07.patch new file mode 100644 index 000000000..2a6dce9a2 --- /dev/null +++ b/extra/xchat/xchat-2.8.8-libnotify07.patch @@ -0,0 +1,24 @@ +diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c +--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500 ++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500 +@@ -125,8 +125,9 @@ static void *nn_mod = NULL; + /* prototypes */ + static gboolean (*nn_init) (char *); + static void (*nn_uninit) (void); +-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon); +-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach); ++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an ++ * extra NULL argument will be fine */ ++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); + static gboolean (*nn_show) (void *noti, GError **error); + static void (*nn_set_timeout) (void *noti, gint timeout); + +@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title, + goto bad; + if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) + goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon)) +- goto bad; + if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) + goto bad; + if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) diff --git a/extra/xchat/xchat-2.8.8-link-against-libnotify.patch b/extra/xchat/xchat-2.8.8-link-against-libnotify.patch new file mode 100644 index 000000000..31e6c0854 --- /dev/null +++ b/extra/xchat/xchat-2.8.8-link-against-libnotify.patch @@ -0,0 +1,343 @@ +From: Christopher Aillon <caillon@redhat.com> +Date: Thu, 7 Apr 2011 19:34:14 -0700 +Subject: [PATCH] Link directly against libnotify + +Dynamically loading the library isn't ideal since the soname +can change silently on us. Additionally, notify-send is +shipped as part of libnotify, so we aren't actually bringing +in a new dependency. Since we'd need to patch the source and +rebuild for new sonames anyway, there's little benefit to +dynamically loading libnotify. + +Plus, this has the benefit of cleaning up the code, as well as +ensuring we'll catch any future soname changes sooner. + +https://bugzilla.redhat.com/show_bug.cgi?id=693362 +https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239 +--- + configure.in | 23 +++++++ + src/fe-gtk/plugin-tray.c | 144 ++++++++++------------------------------------- + 2 files changed, 55 insertions(+), 112 deletions(-) + +diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in +--- xchat-2.8.8/configure.in.libnotifyso4 2010-05-29 23:01:16.000000000 -0700 ++++ xchat-2.8.8/configure.in 2011-04-07 19:27:00.448137113 -0700 +@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX]) + AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR]) + AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR]) + AH_VERBATIM([SOCKS],[#undef SOCKS]) + AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY]) + dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME]) + AH_VERBATIM([USE_SHM],[#undef USE_SHM]) + AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL]) + AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY]) ++AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY]) + AH_VERBATIM([USE_IPV6],[#undef USE_IPV6]) + AH_VERBATIM([USE_MMX],[#undef USE_MMX]) + AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL]) + AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN]) + AH_VERBATIM([USE_XFT],[#undef USE_XFT]) + AH_VERBATIM([USE_XLIB],[#undef USE_XLIB]) + AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION]) + AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD]) +@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl, + AC_ARG_ENABLE(plugin, + [ --disable-plugin disable plugin support], + plugin=$enableval, plugin=yes) + + AC_ARG_ENABLE(dbus, + [ --disable-dbus disable DBUS support], + dbus=$enableval, dbus=yes) + ++AC_ARG_ENABLE(libnotify, ++[ --disable-libnotify disable libnotify support], ++ libnotify=$enableval, libnotify=yes) ++ + AC_ARG_ENABLE(mmx, + [ --disable-mmx disable MMX assembly routines], + mmx=$enableval, mmx=yes) + + AC_ARG_ENABLE(shm, + [ --enable-shm enable use of XShm for fast tinting (default: no)], + shm=$enableval, shm=no) + +@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then + + DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" + AC_SUBST(DBUS_SERVICES_DIR) + AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) + fi + fi + + dnl ********************************************************************* ++dnl ** LIBNOTIFY ******************************************************** ++dnl ********************************************************************* ++ ++if test "x$libnotify" = "xyes" ; then ++ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [ ++ AC_MSG_RESULT(no) ++ libnotify=no ++ ]) ++ if test "$libnotify" != "no" ; then ++ GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS" ++ GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS" ++ AC_DEFINE(USE_LIBNOTIFY) ++ fi ++fi ++ ++dnl ********************************************************************* + dnl ** SPELL ************************************************************ + dnl ********************************************************************* + + if test "$spell" = "gtkspell" ; then + PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [ + AC_MSG_RESULT(no) + spell=no + ]) +@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then + fi + + dnl ********************************************************************* + dnl ** CONDITIONALS ***************************************************** + dnl ********************************************************************* + + AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes") + AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic") ++AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes") + AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") + AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") + AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") + AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") + AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") + AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") + AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") + AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") +@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\ spell + echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin + if test "$xft" = no; then + echo text backend ........ : pango\ nls/gettext ........... : $USE_NLS + else + echo text backend ........ : xft\ nls/gettext ........... : $USE_NLS + fi + echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6 + echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm ++echo libnotify support ... : $libnotify + echo + echo The binary will be installed in $prefix/bin + echo + + if test "$gtkfe" = no; then + echo Warning: The GTK \(GUI\) frontend will not be built. + echo + fi +diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c +--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 2011-04-07 17:57:27.524307905 -0700 ++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2011-04-07 19:18:33.429475719 -0700 +@@ -10,17 +10,27 @@ + #include "../common/fe.h" + #include "../common/util.h" + #include "fe-gtk.h" + #include "pixmaps.h" + #include "maingui.h" + #include "menu.h" + #include <gtk/gtk.h> + +-#define LIBNOTIFY ++#ifdef USE_LIBNOTIFY ++#include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++#if NOTIFY_CHECK_VERSION(0,7,0) ++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c) ++#else ++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d) ++#endif ++#endif + + typedef enum /* current icon status */ + { + TS_NONE, + TS_MESSAGE, + TS_HIGHLIGHT, + TS_FILEOFFER, + TS_CUSTOM /* plugin */ +@@ -112,90 +122,16 @@ tray_count_networks (void) + + void + fe_tray_set_tooltip (const char *text) + { + if (sticon) + gtk_status_icon_set_tooltip (sticon, text); + } + +-#ifdef LIBNOTIFY +- +-/* dynamic access to libnotify.so */ +- +-static void *nn_mod = NULL; +-/* prototypes */ +-static gboolean (*nn_init) (char *); +-static void (*nn_uninit) (void); +-/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an +- * extra NULL argument will be fine */ +-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); +-static gboolean (*nn_show) (void *noti, GError **error); +-static void (*nn_set_timeout) (void *noti, gint timeout); +- +-static void +-libnotify_cleanup (void) +-{ +- if (nn_mod) +- { +- nn_uninit (); +- g_module_close (nn_mod); +- nn_mod = NULL; +- } +-} +- +-static gboolean +-libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon) +-{ +- void *noti; +- +- if (!nn_mod) +- { +- nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY); +- if (!nn_mod) +- { +- nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY); +- if (!nn_mod) +- return FALSE; +- } +- +- if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout)) +- goto bad; +- if (!nn_init (PACKAGE_NAME)) +- goto bad; +- } +- +- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); +- title = strip_color (title, -1, STRIP_ALL); +- noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); +- g_free ((char *)title); +- g_free ((char *)text); +- +- nn_set_timeout (noti, prefs.input_balloon_time*1000); +- nn_show (noti, NULL); +- g_object_unref (G_OBJECT (noti)); +- +- return TRUE; +- +-bad: +- g_module_close (nn_mod); +- nn_mod = NULL; +- return FALSE; +-} +- +-#endif +- + void + fe_tray_set_balloon (const char *title, const char *text) + { + #ifndef WIN32 + const char *argv[8]; + const char *path; + char time[16]; + WinStatus ws; +@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, + /* bit 1 of flags means "no balloons unless hidden/iconified" */ + if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2)) + return; + + /* FIXME: this should close the current balloon */ + if (!text) + return; + +-#ifdef LIBNOTIFY +- /* try it via libnotify.so */ +- if (libnotify_notify_new (title, text, sticon)) +- return; /* success */ +-#endif ++#ifdef USE_LIBNOTIFY ++ NotifyNotification *notification; ++ char *notify_text, *notify_title; + +- /* try it the crude way */ +- path = g_find_program_in_path ("notify-send"); +- if (path) +- { +- sprintf(time, "%d000",prefs.input_balloon_time); +- argv[0] = path; +- argv[1] = "-i"; +- argv[2] = "gtk-dialog-info"; +- if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0) +- argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png"; +- argv[3] = "-t"; +- argv[4] = time; +- argv[5] = title; +- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); +- argv[6] = text; +- argv[7] = NULL; +- xchat_execv (argv); +- g_free ((char *)path); +- g_free ((char *)text); +- } +- else +- { +- /* show this error only once */ +- static unsigned char said_it = FALSE; +- if (!said_it) +- { +- said_it = TRUE; +- fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR); +- } +- } ++ if (!notify_is_initted()) ++ notify_init(PACKAGE_NAME); ++ ++ notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); ++ notify_title = strip_color (title, -1, STRIP_ALL); ++ ++ notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); ++ ++ g_free ((char *)notify_title); ++ g_free ((char *)notify_text); ++ ++ notify_notification_set_timeout (notification, prefs.input_balloon_time*1000); ++ notify_notification_show (notification, NULL); ++ ++ g_object_unref (notification); ++#endif + #endif + } + + static void + tray_set_balloonf (const char *text, const char *format, ...) + { + va_list args; + char *buf; +@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h + return 1; /* return 1 for success */ + } + + int + tray_plugin_deinit (xchat_plugin *plugin_handle) + { + #ifdef WIN32 + tray_cleanup (); +-#elif defined(LIBNOTIFY) +- libnotify_cleanup (); ++#elif defined(USE_LIBNOTIFY) ++ notify_uninit (); + #endif + return 1; + } diff --git a/extra/xchat/xchat.install b/extra/xchat/xchat.install new file mode 100644 index 000000000..eab82d16f --- /dev/null +++ b/extra/xchat/xchat.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 2f1c11af3..c9bd84516 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168560 2012-10-13 11:43:49Z andyrtr $ +# $Id: PKGBUILD 174734 2013-01-05 13:53:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xf86-input-synaptics pkgver=1.6.2 -pkgrel=2 +pkgrel=4 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -19,14 +19,19 @@ provides=('synaptics') conflicts=('synaptics') groups=('xorg-drivers' 'xorg') options=(!libtool) -backup=('etc/X11/xorg.conf.d/10-synaptics.conf') +backup=('etc/X11/xorg.conf.d/50-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) + add_tapbuttons.diff) sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920' - 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2') + '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # * upstream disabled tapping by default if a physical left button is present - see FS#33282 + # * enable MatchDevicePath directive by default - FS#33291 + patch -Np1 -i ${srcdir}/add_tapbuttons.diff + ./configure --prefix=/usr make } @@ -35,7 +40,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + install -m644 conf/50-synaptics.conf "${pkgdir}/etc/X11/xorg.conf.d/" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-input-synaptics/add_tapbuttons.diff b/extra/xf86-input-synaptics/add_tapbuttons.diff new file mode 100644 index 000000000..f9170f74a --- /dev/null +++ b/extra/xf86-input-synaptics/add_tapbuttons.diff @@ -0,0 +1,17 @@ +--- a/conf/50-synaptics.conf 2012-05-11 01:01:10.000000000 +0200 ++++ b/conf/50-synaptics.conf.new 2013-01-05 14:20:21.959670353 +0100 +@@ -11,10 +11,13 @@ + Identifier "touchpad catchall" + Driver "synaptics" + MatchIsTouchpad "on" ++ Option "TapButton1" "1" ++ Option "TapButton2" "2" ++ Option "TapButton3" "3" + # This option is recommend on all Linux systems using evdev, but cannot be + # enabled by default. See the following link for details: + # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html +-# MatchDevicePath "/dev/input/event*" ++ MatchDevicePath "/dev/input/event*" + EndSection + + Section "InputClass" diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 25356c231..d2ebb0595 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169807 2012-10-29 20:42:25Z heftig $ +# $Id: PKGBUILD 174296 2013-01-04 03:24:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.18.0 +pkgver=0.19.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION> options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) -md5sums=('cca2c9ed7a5d3b09689bfc2c204726fb' +md5sums=('bdc66047bb0afb4ac29882cca16cdfaa' '10db4f8272286690255c1bcc18bfdd92') build() { diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index 73835a604..7f838e741 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168569 2012-10-13 11:44:31Z andyrtr $ +# $Id: PKGBUILD 174961 2013-01-09 16:02:11Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-cirrus -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=1 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557') +sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 9d57cfa6c..f20b720e3 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173320 2012-12-18 21:43:54Z andyrtr $ +# $Id: PKGBUILD 173952 2012-12-29 16:02:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.16 +pkgver=2.20.17 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('308646d1d4b07e5c581cd7cca133b0e3410a1a3911a58d7d49b8ea106b64d0ba') +sha256sums=('0bf5e9bd82b2643e06503665545f5cc8c3e24ab48ca4fe84f4e9e7ebbb9e7dbc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 92443de50..79f3fcaf6 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168577 2012-10-13 11:45:07Z andyrtr $ +# $Id: PKGBUILD 173679 2012-12-20 20:15:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 -pkgver=6.9.3 -pkgrel=2 +pkgver=6.9.4 +pkgrel=1 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,13 +14,11 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS optdepends=('mach64-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) -sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218' - '27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD index 8259ce7b1..f0cee485d 100644 --- a/extra/xf86-video-modesetting/PKGBUILD +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169401 2012-10-20 11:16:26Z andyrtr $ +# $Id: PKGBUILD 174965 2013-01-09 16:04:11Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=xf86-video-modesetting -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=1 pkgdesc="X.org generic modesetting video driver" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('248d384ba9b520643fc0b2b2930d6593dfb8185e88e1562381c8f9b1cd5582f2') +sha256sums=('852f9ddb213913f75e1e65ad7ce9c6b5bc7f43a93d8087b6e59666ea4eb3d0d6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index cb909513b..67abbdac7 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169532 2012-10-23 10:08:56Z jgc $ +# $Id: PKGBUILD 173943 2012-12-28 18:53:54Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-neomagic pkgver=1.2.7 -pkgrel=3 +pkgrel=4 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,13 +14,17 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) + git-fixes.patch + shadowfb.patch) sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76' - '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e') + '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e' + 'cf7e49f51869efdb22ee8d6e85bf0f557e22f08072e6d90a4dba3e39feabbf36') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/git-fixes.patch" + # workaround to get it work again https://bugs.archlinux.org/task/32604 + patch -Np1 -i ${srcdir}/shadowfb.patch autoreconf ./configure --prefix=/usr make diff --git a/extra/xf86-video-neomagic/shadowfb.patch b/extra/xf86-video-neomagic/shadowfb.patch new file mode 100644 index 000000000..1cc963b96 --- /dev/null +++ b/extra/xf86-video-neomagic/shadowfb.patch @@ -0,0 +1,18 @@ +diff -ur xf86-video-neomagic-1.2.7.orig/src/neo_driver.c xf86-video-neomagic-1.2.7/src/neo_driver.c +--- xf86-video-neomagic-1.2.7.orig/src/neo_driver.c 2012-12-26 22:14:47.876393607 -0800 ++++ xf86-video-neomagic-1.2.7/src/neo_driver.c 2012-12-26 22:17:10.011933399 -0800 +@@ -1084,9 +1084,13 @@ + xf86DrvMsg(pScrn->scrnIndex,X_CONFIG, + "Show chache for debugging\n"); + ++ /* ++ * Seems modules shadow and/or shadowfb causes black screen and dead ++ * keyboard with xorg 1.13. Just disable it for now. ++ */ + if (!xf86LoadSubModule(pScrn, "xaa")) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n"); +- nPtr->shadowFB = 1; ++ nPtr->shadowFB = 0; + } + + if (nPtr->shadowFB) { diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index a7b1c5475..0d310d6fa 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170688 2012-11-09 17:02:04Z andyrtr $ +# $Id: PKGBUILD 174803 2013-01-07 18:10:24Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.4 +pkgver=1.0.6 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('1a8290489cf4f48d2094a541ec9a6b68beb80299741d047e322e650c30ceb7c1') +sha256sums=('e3e1522d08134da74cb1796e8863fd3ad3caad9eb5e9d27f4cee3dfa7c75341f') build() { cd $pkgname-$pkgver diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD new file mode 100644 index 000000000..28ae7e7f7 --- /dev/null +++ b/extra/xfce4-terminal/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 174007 2013-01-01 12:50:48Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: tobias <tobias funnychar archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=xfce4-terminal +pkgver=0.6.1 +pkgrel=1 +pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" +arch=('i686' 'x86_64') +url="http://www.xfce.org/" +license=('GPL2') +groups=('xfce4') +depends=('libxfce4ui' 'vte' 'hicolor-icon-theme') +makedepends=('intltool') +conflicts=('terminal') +replaces=('terminal') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2) +sha256sums=('61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-terminal/xfce4-terminal.install b/extra/xfce4-terminal/xfce4-terminal.install new file mode 100644 index 000000000..e4f8fd06c --- /dev/null +++ b/extra/xfce4-terminal/xfce4-terminal.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD new file mode 100644 index 000000000..a2a623685 --- /dev/null +++ b/extra/xorg-xlsfonts/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-xlsfonts +pkgver=1.0.4 +pkgrel=1 +pkgdesc='List available X fonts' +url='http://xorg.freedesktop.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('libx11') +makedepends=('xorg-util-macros') +source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2") +sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f') + +build() { + cd "${srcdir}/xlsfonts-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsfonts-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/extra/xsnow/LICENSE b/extra/xsnow/LICENSE new file mode 100644 index 000000000..b5645bacf --- /dev/null +++ b/extra/xsnow/LICENSE @@ -0,0 +1,9 @@ + Copyright + --------- + Xsnow is available freely and you may give it to other people as is, + but I retain all rights. Therefore it does not classify as 'Public + Domain' software. It *is* allowed to package Xsnow for Unix/Linux + distributions, CD-Roms etc, and to make the necessary changes to + makefiles etc. to facilitate this. + +Copyright 1984, 1988, 1990, 1993-1995, 2000-2001 by Rick Jansen, all rights reserved. diff --git a/extra/xsnow/PKGBUILD b/extra/xsnow/PKGBUILD new file mode 100644 index 000000000..0a24514ab --- /dev/null +++ b/extra/xsnow/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 122681 2011-05-06 04:34:00Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xsnow +pkgver=1.42 +pkgrel=5 +pkgdesc="Xsnow will let it snow on the root window and on windows. Santa and his reindeer will complete your festive-season feeling." +arch=('i686' 'x86_64') +url="http://dropmix.xs4all.nl/rick/Xsnow/" +license=('custom') +depends=('libxpm') +makedepends=('imake') +source=(http://dropmix.xs4all.nl/rick/Xsnow/${pkgname}-${pkgver}.tar.gz LICENSE) +md5sums=('451d8fc0a2b5393b428faa496a556036' + '60d377d8f9c0e99297160a464d4a0a9e') +sha1sums=('d63987560dac9c6341e50d270089e40d17031ce3' + 'c93e236bed35a2d5dc23202c1c615d4e146fba49') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + xmkmf + make depend + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" MANPATH=/usr/share/man install install.man + chmod 644 "${pkgdir}/usr/share/man/man1/xsnow.1x" + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index a385413a0..6f5ca2bce 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173116 2012-12-11 10:32:56Z jgc $ +# $Id: PKGBUILD 174967 2013-01-09 16:07:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=287 -pkgrel=2 +pkgver=288 +pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/xterm/" @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('0e4385e66d40b5dd6017d02c3db2a4af' +md5sums=('b9bef1abf6e397be6fa2e5f534964d17' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD new file mode 100644 index 000000000..fb0564edf --- /dev/null +++ b/extra/xulrunner/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 172188 2012-12-01 13:10:31Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +pkgname=xulrunner +pkgver=17.0.1 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('13d616028eb77de927c29b6655c832c9' + '4afe63440e2f1935ff90de15db3b70f0' + '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93') + +build() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig new file mode 100644 index 000000000..9756e5cee --- /dev/null +++ b/extra/xulrunner/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/extra/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/extra/xulrunner/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 0deda06b7..571be36c4 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171491 2012-11-18 04:23:42Z eric $ +# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=5.0.0 -pkgrel=3 +pkgver=5.0.2 +pkgrel=1 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' @@ -13,7 +13,7 @@ backup=('etc/zsh/zprofile') install=zsh.install source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'zprofile') -md5sums=('e8484468925cec8d9a84b8b04797e764' +md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') build() { diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index 873b96b91..5ca311a2b 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -8,13 +8,13 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.6 -_sublevel=9 +_basekernel=3.7 +_sublevel=1 _grsecver=2.9.1 -_timestamp=201212061820 +_timestamp=201212171734 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +pkgrel=4 +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,18 +31,22 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' + 'fat-3.6.x.patch' + 'fix-watchdog-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '2127e118d09154c7a44dd2dfed2cfecd' - '5a7ac3d736bda40cd459865a13263e7d' - '9b4ec887671d9242eba16be5cba4f9dc' - '55695d7853abe483f4db189877fd5e36' +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df' + '6b0726c712ca0fd934207ec7ed4b1739' + '1ef18b1bd701c785585563beac9e5479' + '30b9bb74847eb4fc610094069713cca2' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' - '2f3ae0624acb4a4b12ea2c008b964bd2') + '88d501404f172dac6fcb248978251560' + '3485d6c7ae3af35d16e09d6d9a7ed32a' + 'b56c33eaee920970151fffdfc7df0766') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -71,6 +75,14 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix cosmetic fat issue + # https://bugs.archlinux.org/task/32916 + patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + + # fix watchdog enable/disable regression + # https://bugs.archlinux.org/task/33095 + patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -255,7 +267,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media mtd net pcmcia scsi sound trace video xen; do + media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done @@ -288,13 +300,22 @@ _package-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" - - cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - - for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + done + # usb + for i in cpia2 em28xx pwc sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + done + # i2c + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + for i in cx25840; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" done # add docbook makefile @@ -316,8 +337,8 @@ _package-headers() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" @@ -326,19 +347,19 @@ _package-headers() { # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686 index cd4caf51b..abc973944 100644 --- a/kernels/linux-libre-grsec/config.i686 +++ b/kernels/linux-libre-grsec/config.i686 @@ -1,10 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.1-3 Kernel Configuration +# Linux/i386 3.7.1-4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" @@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -53,7 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="LIBRE-GRSEC" +CONFIG_LOCALVERSION="-LIBRE-GRSEC" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -71,13 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -112,6 +104,18 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y @@ -134,7 +138,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -149,6 +156,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -162,8 +170,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -221,14 +231,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y # # GCOV-based kernel profiling @@ -244,6 +261,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -288,35 +306,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -333,7 +324,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y @@ -392,11 +382,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -426,8 +414,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -473,9 +459,11 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -540,7 +528,7 @@ CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -578,6 +566,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y @@ -617,7 +606,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -675,7 +663,6 @@ CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -705,6 +692,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y @@ -713,6 +701,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -792,6 +781,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -837,6 +827,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -863,10 +863,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -890,7 +891,7 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ECN=m CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_GRADM is not set +CONFIG_NETFILTER_XT_MATCH_GRADM=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m @@ -988,23 +989,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1036,6 +1028,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1369,7 +1364,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m @@ -1397,6 +1391,11 @@ CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1499,7 +1498,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1525,7 +1523,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_OF=y @@ -1583,7 +1582,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1850,6 +1848,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1936,6 +1935,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1994,9 +1994,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -2005,6 +2002,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2234,6 +2232,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2276,6 +2275,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2295,6 +2295,7 @@ CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2429,6 +2430,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2538,6 +2540,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2935,10 +2940,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2953,6 +2958,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2978,6 +2984,7 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m CONFIG_R3964=m @@ -3000,6 +3007,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3071,8 +3079,8 @@ CONFIG_I2C_TINY_USB=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m -# CONFIG_I2C_STUB is not set CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -3127,6 +3135,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set # # PCI GPIO expanders: @@ -3189,6 +3198,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3238,6 +3248,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3303,6 +3314,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3430,6 +3442,7 @@ CONFIG_MFD_RDC321X=m # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_SYSCON is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3443,16 +3456,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3478,156 +3503,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3691,15 +3570,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3708,6 +3579,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3715,10 +3593,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3731,29 +3691,49 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3776,128 +3756,129 @@ CONFIG_RADIO_WL1273=m # CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -4053,8 +4034,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -4159,14 +4141,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4251,6 +4235,7 @@ CONFIG_SND_ALS100=m CONFIG_SND_AZT1605=m CONFIG_SND_AZT2316=m CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8328=m CONFIG_SND_CMI8330=m CONFIG_SND_CS4231=m CONFIG_SND_CS4236=m @@ -4346,7 +4331,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4450,7 +4434,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4472,6 +4458,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4572,8 +4559,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4586,7 +4571,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4651,6 +4635,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4679,10 +4664,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4712,8 +4699,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4804,6 +4790,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4819,7 +4806,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4831,6 +4818,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4925,12 +4913,14 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_SNVS=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4966,7 +4956,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y # # Virtio drivers @@ -5049,6 +5038,7 @@ CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5063,9 +5053,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -5091,7 +5079,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m # CONFIG_COMEDI_CB_PCIMDAS is not set CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -5201,8 +5188,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -5223,7 +5208,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5243,6 +5227,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5310,6 +5299,8 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5514,7 +5505,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5530,6 +5525,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5540,10 +5536,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5650,6 +5647,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5658,6 +5656,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5705,6 +5704,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5735,6 +5735,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -5783,7 +5785,7 @@ CONFIG_PAX_USERCOPY_SLABS=y CONFIG_GRKERNSEC=y # CONFIG_GRKERNSEC_CONFIG_AUTO is not set CONFIG_GRKERNSEC_CONFIG_CUSTOM=y -CONFIG_GRKERNSEC_PROC_GID=9999 +CONFIG_GRKERNSEC_PROC_GID=9998 CONFIG_GRKERNSEC_TPE_TRUSTED_GID=9999 CONFIG_GRKERNSEC_SYMLINKOWN_GID=33 @@ -5816,7 +5818,7 @@ CONFIG_PAX_SEGMEXEC=y CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y # CONFIG_PAX_MPROTECT_COMPAT is not set -CONFIG_PAX_ELFRELOCS=y +# CONFIG_PAX_ELFRELOCS is not set CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="" CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 @@ -5833,7 +5835,7 @@ CONFIG_PAX_RANDMMAP=y # Miscellaneous hardening features # CONFIG_PAX_MEMORY_STACKLEAK=y -CONFIG_PAX_MEMORY_UDEREF=y +# CONFIG_PAX_MEMORY_UDEREF is not set CONFIG_PAX_REFCOUNT=y CONFIG_PAX_USERCOPY=y # CONFIG_PAX_SIZE_OVERFLOW is not set @@ -5845,7 +5847,6 @@ CONFIG_PAX_USERCOPY=y CONFIG_GRKERNSEC_KMEM=y CONFIG_GRKERNSEC_VM86=y # CONFIG_GRKERNSEC_IO is not set -CONFIG_GRKERNSEC_JIT_HARDEN=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -5927,7 +5928,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # @@ -6047,7 +6047,7 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -6091,6 +6091,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -6098,6 +6102,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6173,5 +6178,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 2652b500b..7f633f2ea 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -1,9 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.1-2 Kernel Configuration +# Linux/x86_64 3.7.1-3 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y @@ -21,7 +20,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -54,7 +52,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="LIBRE-GRSEC" +CONFIG_LOCALVERSION="-LIBRE-GRSEC" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -72,13 +70,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -114,10 +106,23 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -136,7 +141,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -151,6 +159,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -164,8 +173,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -222,6 +233,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y @@ -229,8 +242,14 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_RCU_USER_QS=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling @@ -246,6 +265,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y @@ -290,35 +310,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -340,7 +333,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set @@ -378,7 +370,6 @@ CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -458,6 +449,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -530,7 +522,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -561,6 +553,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -589,7 +582,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -634,7 +626,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y @@ -662,6 +653,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m CONFIG_X86_X32=y @@ -678,6 +670,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -757,6 +750,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -802,6 +796,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -828,10 +832,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -855,7 +860,7 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ECN=m CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_GRADM is not set +CONFIG_NETFILTER_XT_MATCH_GRADM=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m @@ -953,23 +958,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1001,6 +997,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1326,7 +1325,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_HAVE_BPF_JIT=y @@ -1354,6 +1352,11 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1454,7 +1457,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1479,7 +1481,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m @@ -1517,7 +1520,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1765,6 +1767,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1847,6 +1850,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1906,9 +1910,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -1917,6 +1918,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2118,6 +2120,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -2159,6 +2162,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2310,6 +2314,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2419,6 +2424,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2667,7 +2675,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2796,10 +2803,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2812,6 +2819,7 @@ CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2839,6 +2847,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2857,6 +2866,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3040,6 +3050,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3089,6 +3100,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3154,6 +3166,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3287,16 +3300,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3322,156 +3347,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3535,15 +3414,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3552,6 +3423,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3559,10 +3437,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3575,29 +3535,48 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3619,128 +3598,129 @@ CONFIG_RADIO_WL1273=m # Texas Instruments WL128x FM driver (ST based) # CONFIG_RADIO_WL128X=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -3890,8 +3870,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -3994,14 +3975,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4144,7 +4127,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4247,7 +4229,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4269,6 +4253,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4369,8 +4354,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4383,7 +4366,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4448,6 +4430,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4476,10 +4459,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4508,8 +4493,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4600,6 +4584,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4615,7 +4600,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4627,6 +4612,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4719,6 +4705,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # @@ -4760,7 +4747,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m # # Virtio drivers @@ -4819,6 +4805,7 @@ CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -4833,9 +4820,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -4861,7 +4846,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m CONFIG_COMEDI_CB_PCIMDAS=m CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -4970,8 +4954,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -4992,7 +4974,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5012,6 +4993,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5079,6 +5065,8 @@ CONFIG_IRQ_REMAP=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5284,7 +5272,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5300,6 +5292,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5310,10 +5303,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5420,6 +5414,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5428,6 +5423,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5472,8 +5468,10 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5504,6 +5502,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -5552,7 +5552,7 @@ CONFIG_PAX_USERCOPY_SLABS=y CONFIG_GRKERNSEC=y # CONFIG_GRKERNSEC_CONFIG_AUTO is not set CONFIG_GRKERNSEC_CONFIG_CUSTOM=y -CONFIG_GRKERNSEC_PROC_GID=9999 +CONFIG_GRKERNSEC_PROC_GID=9998 CONFIG_GRKERNSEC_TPE_TRUSTED_GID=9999 CONFIG_GRKERNSEC_SYMLINKOWN_GID=33 @@ -5691,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # @@ -5813,7 +5812,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5824,7 +5823,9 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m @@ -5859,6 +5860,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5866,6 +5871,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5939,5 +5945,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/kernels/linux-libre-grsec/fat-3.6.x.patch b/kernels/linux-libre-grsec/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/kernels/linux-libre-grsec/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) +Subject: fs/fat: strip "cp" prefix from codepage in display +X-Git-Tag: next-20121130~1^2~97 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 + +fs/fat: strip "cp" prefix from codepage in display + +Option parsing code expects an unsigned integer for the codepage option, +but prefixes and stores this option with "cp" before passing to +load_nls(). This makes the displayed option in /proc an invalid one. +Strip the prefix when printing so that the displayed option is valid for +reuse. + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + +diff --git a/fs/fat/inode.c b/fs/fat/inode.c +index 3b733a7..3580681 100644 +--- a/fs/fat/inode.c ++++ b/fs/fat/inode.c +@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) + if (opts->allow_utime) + seq_printf(m, ",allow_utime=%04o", opts->allow_utime); + if (sbi->nls_disk) +- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); ++ /* strip "cp" prefix from displayed option */ ++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); + if (isvfat) { + if (sbi->nls_io) + seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-grsec/fix-watchdog-3.7.patch b/kernels/linux-libre-grsec/fix-watchdog-3.7.patch new file mode 100644 index 000000000..fe4431604 --- /dev/null +++ b/kernels/linux-libre-grsec/fix-watchdog-3.7.patch @@ -0,0 +1,38 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 997c6a1..75a2ab3 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + ++ /* kick off the timer for the hardlockup detector */ ++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ hrtimer->function = watchdog_timer_fn; ++ + if (!watchdog_enabled) { + kthread_park(current); + return; +@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) + /* Enable the perf event */ + watchdog_nmi_enable(cpu); + +- /* kick off the timer for the hardlockup detector */ +- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +- hrtimer->function = watchdog_timer_fn; +- + /* done here because hrtimer_start can only pin to smp_processor_id() */ + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); +@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + +- if (!watchdog_enabled) +- return; +- + watchdog_set_prio(SCHED_NORMAL, 0); + hrtimer_cancel(hrtimer); + /* disable the perf event */ diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index 640b32e25..a833e9134 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.9-3-LIBRE-GRSEC +KERNEL_VERSION=3.7.1-4-LIBRE-GRSEC _fix_permissions() { /usr/bin/paxutils @@ -12,17 +12,28 @@ _fix_permissions() { echo binaries by running "paxutils". } -_add_trusted_group() { - if ! getent group grsec-trusted >/dev/null; then - groupadd -g 9999 -r grsec-trusted - useradd -g 9999 -r grsec-trusted +_add_proc_group() { + if ! getent group proc-trusted >/dev/null; then + groupadd -g 9998 -r proc-trusted + useradd -g 9998 -r proc-trusted + fi +} + +_add_tpe_group() { + if getent group grsec-trusted >/dev/null; then + groupmod -n tpe-trusted grsec-trusted + fi + + if ! getent group tpe-trusted >/dev/null; then + groupadd -g 9999 -r tpe-trusted + useradd -g 9999 -r tpe-trusted fi } _help() { echo - echo For group grsec-trusted, Trusted Path Execution is disabled and - echo information about all processes from /proc is visible. Think carefully + echo For group tpe-trusted, Trusted Path Execution is disabled. For group + echo proc-trusted, the access to /proc is not restricted. Think carefully echo before adding a normal user to this group. echo echo This is controllable with the sysctl options \"kernel.grsecurity.tpe*\". @@ -56,7 +67,8 @@ post_install () { fi fi - _add_trusted_group + _add_proc_group + _add_tpe_group _fix_permissions _help @@ -93,7 +105,8 @@ post_upgrade() { mkinitcpio -p linux-libre${KERNEL_NAME} fi - _add_trusted_group + _add_proc_group + _add_tpe_group _fix_permissions _help @@ -104,7 +117,9 @@ post_remove() { rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img - if getent group grsec-trusted >/dev/null; then - groupdel grsec-trusted - fi + for group in grsec-trusted proc-trusted tpe-trusted; do + if getent group $group >/dev/null; then + groupdel $group + fi + done } diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index e6ea24827..55b6c41f5 100755 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-lts-grsec # Build stock -LIBRE-LTS-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.2 _grsecver=2.9.1 -_timestamp=201212061818 +_timestamp=201212151420 pkgver=${_basekernel}.35 -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('65c669b6e4888db84a80882461851867' '11cd72c1febacfa98e3c6162fee86ba9' - '27c45c7b29406bea785a8bef77ebfaf2' + 'cb8b68478cd26bcdef1aba5617aa4cb2' '9cdc3506425c2f5ca4a05493c0c8dec9' '969fb7ac31e86521d1d854b7d5a3fa18' '243221bb1898f996dcf2020c015f6fd0' diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install index 18b408248..05662cb18 100755 --- a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install +++ b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install @@ -2,7 +2,45 @@ # arg 2: the old package version KERNEL_NAME=-lts-grsec -KERNEL_VERSION=3.2.35-1-LIBRE-LTS-GRSEC +KERNEL_VERSION=3.2.35-2-LIBRE-LTS-GRSEC + +_fix_permissions() { + /usr/bin/paxutils + + echo + echo You can repeat this process after updating or installing affected + echo binaries by running "paxutils". +} + +_add_proc_group() { + if ! getent group proc-trusted >/dev/null; then + groupadd -g 9998 -r proc-trusted + useradd -g 9998 -r proc-trusted + fi +} + +_add_tpe_group() { + if getent group grsec-trusted >/dev/null; then + groupmod -n tpe-trusted grsec-trusted + fi + + if ! getent group tpe-trusted >/dev/null; then + groupadd -g 9999 -r tpe-trusted + useradd -g 9999 -r tpe-trusted + fi +} + +_help() { + echo + echo For group tpe-trusted, Trusted Path Execution is disabled. For group + echo proc-trusted, the access to /proc is not restricted. Think carefully + echo before adding a normal user to this group. + echo + echo This is controllable with the sysctl options \"kernel.grsecurity.tpe*\". + echo + echo There is an extensive wikibook on grsecurity: + echo http://en.wikibooks.org/wiki/Grsecurity +} # 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' @@ -28,6 +66,12 @@ post_install () { ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} fi fi + + _add_proc_group + _add_tpe_group + _fix_permissions + + _help } post_upgrade() { @@ -60,10 +104,22 @@ post_upgrade() { echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi + + _add_proc_group + _add_tpe_group + _fix_permissions + + _help } post_remove() { # also remove the compat symlinks rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img + + for group in grsec-trusted proc-trusted tpe-trusted; do + if getent group $group >/dev/null; then + groupdel $group + fi + done } diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index b426568ed..77103aa6a 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-lts-rt # Build stock -LIBRE-LTS-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_releasever=52 -_rtpatchver=rt76 +_releasever=57 +_rtpatchver=rt81 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,8 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '41adc30b96b745f08899317da83f7eaa' - 'a2b53a39e1a4b4103f91609b3d285591' + 'b26d37a0fa9cf5024810996f3117361c' + '3835632b05a079b2618bb6f0f2c2a1ac' '7266f5e7af09cc6e4b15d7a952e3b350' '5387f0cf51652c071190789569adf9c7' '85f04a9555bdc295f7c387a6564f0c81' @@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ecf9d21d2d6dfbc29dc18b616cbce4e1') + '21f93138b6d4410b095cc9998f89e47d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index 98e85eeaf..5d71acad7 100644 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.52-1-rt76-LIBRE-LTS-RT +KERNEL_VERSION=3.0.57-1-rt81-LIBRE-LTS-RT # 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-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 32a69fba2..ed61b0c86 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_releasever=7 -_rtpatchver=rt18 +_releasever=11 +_rtpatchver=rt25 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,10 +36,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-symbol-waiting-3.6.patch' 'module-init-wait-3.6.patch' 'irq_cfg_pointer-3.6.6.patch' + 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - 'a4e642180c7d757a642175fe32e4a264' - '01f97c0630de43763699d580f48e1c74' + 'ced16b674906cf8c3733c012f804f5c7' + '0be405891c7fb02b0026d4143f2207da' '11161582d9050710ccfecbe077fc5a63' 'ac8f20b0cd83acb9525b5557e1fafeaf' '82496e68851d1960543a07ba51cdb44a' @@ -50,7 +51,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - '1dd80f353c705fef988346a8ef05d13f') + '88d501404f172dac6fcb248978251560' + 'c188074cdc350ac7cf4e9c8d14c0575e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -86,6 +88,10 @@ build() { # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" + # fix cosmetic fat issue + # https://bugs.archlinux.org/task/32916 + patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-rt/fat-3.6.x.patch b/kernels/linux-libre-rt/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/kernels/linux-libre-rt/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) +Subject: fs/fat: strip "cp" prefix from codepage in display +X-Git-Tag: next-20121130~1^2~97 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 + +fs/fat: strip "cp" prefix from codepage in display + +Option parsing code expects an unsigned integer for the codepage option, +but prefixes and stores this option with "cp" before passing to +load_nls(). This makes the displayed option in /proc an invalid one. +Strip the prefix when printing so that the displayed option is valid for +reuse. + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + +diff --git a/fs/fat/inode.c b/fs/fat/inode.c +index 3b733a7..3580681 100644 +--- a/fs/fat/inode.c ++++ b/fs/fat/inode.c +@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) + if (opts->allow_utime) + seq_printf(m, ",allow_utime=%04o", opts->allow_utime); + if (sbi->nls_disk) +- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); ++ /* strip "cp" prefix from displayed option */ ++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); + if (isvfat) { + if (sbi->nls_io) + seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 7925ec89c..17dc45afa 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.6.7-1-rt18-LIBRE-RT +KERNEL_VERSION=3.6.10-1-rt25-LIBRE-RT # 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 e6c684b1e..95a121a57 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -spacenav=false +spacenav=true pkgbase=blender-libre pkgflag=-libre if [ $spacenav == true ]; then @@ -16,9 +16,9 @@ else spndesc='' fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" -pkgver=2.65 +pkgver=2.65a pkgrel=1 -pkgaev=5 +pkgaev=6 arch=( i686 x86_64 @@ -137,7 +137,7 @@ source=( "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz" ) sha512sums=( - 92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f + 02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f ) build() { @@ -148,27 +148,28 @@ build() { [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' - setarch $CARCH cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.3m \ - -DPYTHON_VERSION=3.3 \ - $DSUPPORT_SSE2_BUILD \ - -DWITH_CODEC_FFMPEG=ON \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_CYCLES=ON \ - -DWITH_CYCLES_CUDA_BINARIES=OFF \ - -DWITH_FFTW3=ON \ - -DWITH_GAMEENGINE=ON \ - -DWITH_IMAGE_REDCODE=OFF \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_JACK=ON \ - -DWITH_MOD_OCEANSIM=ON \ - -DWITH_OPENCOLLADA=ON \ - -DWITH_PLAYER=ON \ - -DWITH_PYTHON_INSTALL=OFF \ + setarch $CARCH cmake ..\ + -DCMAKE_BUILD_TYPE=Release\ + -DCMAKE_INSTALL_PREFIX=/usr\ + -DOPENIMAGEIO_ROOT_DIR=/usr\ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\ + -DPYTHON_LIBPATH=/usr/lib\ + -DPYTHON_LIBRARY=python3.3m\ + -DPYTHON_VERSION=3.3\ + $DSUPPORT_SSE2_BUILD\ + -DWITH_CODEC_FFMPEG=ON\ + -DWITH_CODEC_SNDFILE=ON\ + -DWITH_CYCLES=ON\ + -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_FFTW3=ON\ + -DWITH_GAMEENGINE=ON\ + -DWITH_IMAGE_REDCODE=OFF\ + -DWITH_INSTALL_PORTABLE=OFF\ + -DWITH_JACK=ON\ + -DWITH_MOD_OCEANSIM=ON\ + -DWITH_OPENCOLLADA=ON\ + -DWITH_PLAYER=ON\ + -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON setarch $CARCH make $MAKEFLAGS diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD new file mode 100644 index 000000000..52c390c3a --- /dev/null +++ b/libre/calibre-libre/PKGBUILD @@ -0,0 +1,85 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Petrov Roman <nwhisper@gmail.com> +# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=calibre +pkgname=calibre-libre +pkgver=0.9.13 +pkgrel=1 +pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-imaging' 'shared-mime-info' 'python2-dnspython' + 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect') +makedepends=('python2-pycountry' 'qt-private-headers') +optdepends=('ipython2: to use calibre-debug') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +install=calibre.install +source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('3ad062f85eca072c3990c766bc05412a' + '42c07b43d575b5e7e7524bd7b9528f0e' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${_pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Fix for calibre-0.8.58 + sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + # Remove nonfree fonts + cd resources/fonts; \ + rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ + rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ + rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ + cd ../.. + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + LANG='en_US.UTF-8' python2 setup.py translations +} + +package() { + cd "${srcdir}/${_pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" + install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" +} diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper new file mode 100644 index 000000000..00cac4270 --- /dev/null +++ b/libre/calibre-libre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/libre/calibre-libre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch new file mode 100644 index 000000000..4c756f5d4 --- /dev/null +++ b/libre/calibre-libre/desktop_integration.patch @@ -0,0 +1,109 @@ +--- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 ++++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 +@@ -179,19 +179,6 @@ + self.setup_completion() + if islinux or isbsd: + self.setup_desktop_integration() +- self.create_uninstaller() +- +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- if islinux or isbsd: +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- import shutil +- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) +- + if warn is None and self.warnings: + self.info('There were %d warnings'%len(self.warnings)) + for args, kwargs in self.warnings: +@@ -237,7 +224,7 @@ + if isnetbsd: + f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') + else: +- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') ++ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') + if not os.path.exists(os.path.dirname(f)): + os.makedirs(os.path.dirname(f)) + self.manifest.append(f) +@@ -357,63 +344,39 @@ + + with TemporaryDirectory() as tdir, CurrentDir(tdir), \ + PreserveMIMEDefaults(): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('mimetypes/mobi.png', 'calibre-mobi.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) +- render_img('mimetypes/tpz.png', 'calibre-tpz.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) +- render_img('mimetypes/azw2.png', 'calibre-azw2.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) +- render_img('mimetypes/azw3.png', 'calibre-azw3.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) +- render_img('lt.png', 'calibre-gui.png', width=256, height=256) +- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- cc(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- cc(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes.xml', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes.xml') +- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index e36241067..7cd18bb6a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,8 +6,8 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=34 -pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." +pkgrel=34.1 +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index 38533f59b..7a093b29a 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=claws-mail pkgname=claws-mail-libre pkgflag=-libre pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' arch=( i686 @@ -42,7 +42,7 @@ optdepends=( ) provides=( claws - $pkgbase + $pkgbase=$pkgver ) conflicts=( $pkgbase diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index ec302f134..31b8467c0 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,38 +1,48 @@ -# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $ +# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.25 -pkgrel=1 +pkgver=1.0.29 +pkgrel=3 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.20.5' 'qpdf') +depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('9690028c5e312b086e7572ae1899a33c') +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz + cups-browsed.service + poppler_buildfix.diff) +md5sums=('0640a02a3fb88d3dbdb224e3becd400d' + '4c9f97eae201798000483c4e7109e690' + 'bd97d1d9dbd4feec3a0330fd9fb7a03c') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") build() { cd "$srcdir/$_pkgname-$pkgver" + + # fix build with poppler 0.22 + patch -Np0 -i ${srcdir}/poppler_buildfix.diff + ./configure --prefix=/usr \ --sysconfdir=/etc \ + --with-rcdir=no \ + --enable-avahi \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } check() { cd "$srcdir/$_pkgname-$pkgver" - make -k check + make -j1 -k check } package() { @@ -40,4 +50,7 @@ package() { make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service new file mode 100644 index 000000000..144956c7f --- /dev/null +++ b/libre/cups-filters-libre/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/sbin/cups-browsed + +[Install] +WantedBy=multi-user.target diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff new file mode 100644 index 000000000..b646efd6b --- /dev/null +++ b/libre/cups-filters-libre/poppler_buildfix.diff @@ -0,0 +1,61 @@ +=== modified file 'NEWS' +--- NEWS 2013-01-02 18:23:25 +0000 ++++ NEWS 2013-01-09 10:42:32 +0000 +@@ -1,6 +1,11 @@ + NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 + ----------------------------------------------------- + ++CHANGES IN V1.0.30 ++ ++ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani ++ from BBR Inc. (Bug #1089). ++ + CHANGES IN V1.0.29 + + - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri + +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000 +@@ -1804,8 +1804,14 @@ + maskSplash = new Splash(maskBitmap, gFalse); + maskColor[0] = 0; + maskSplash->clear(maskColor); ++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); ++#else ++ maskSplash->drawImage(&imageSrc, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); ++#endif + delete imgMaskData.imgStr; + maskStr->close(); + gfree(imgMaskData.lookup); + +=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' +--- filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 19:56:59 +0000 ++++ filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 +@@ -5,6 +5,9 @@ + //======================================================================== + + #include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #ifdef USE_GCC_PRAGMAS + #pragma implementation +@@ -235,7 +238,11 @@ + SplashColorMode srcMode, GBool srcAlpha, + int w, int h, SplashCoord *mat) { + if (rasterMode) { ++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); ++#else ++ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); + } + diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index a55d219e0..aa82d36e6 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -1,55 +1,125 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (AUR): Jochen Schalanda <jochen+aur@schalanda.name> +# Contributor (AUR): Pierre Carrier <pierre@spotify.com> # Contributor (AUR): Thomas Dziedzic <gostrc@gmail> # Contributor (AUR): Chris Giles <Chris.G.27@gmail.com> # Contributor (AUR): seblu <seblu+arch@seblu.net> # Contributor (AUR): squiddo <squiddo@intheocean.net> -# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } +pkgbase=dpkg +#pkgname=(dpkg dpkg-devtools dselect libdpkg perl-dpkg) +pkgname=(dpkg-devtools perl-dpkg) +pkgdesc="Debian Package manager and utilities" +license=('GPL2') + +pkgver=1.16.9 +url="http://packages.debian.org/source/sid/dpkg" +_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid -# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl) -pkgname=dpkg -pkgver=1.16.4.3 -pkgrel=1 -pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'." +pkgrel=1.1 +debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/${pkgname}" -license=('GPL2') -depends=('bzip2' 'perl-timedate') -makedepends=('gcc' 'make' 'patch') -optdepends=('fakeroot') -replaces=(dpkg-ubuntu) -conflits=(dpkg-ubuntu) -source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2 - dpkg-rsyncable.patch dpkg-arch.patch) +depends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('perl-test-pod') +makedepends=('perl-io-string' 'perl-timedate') +source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" + dpkg-gzip-rsyncable.patch) + +###################################################################### + +# This is really gross. +# It uses the debian control files to help us split the package. +# Shame on the dpkg developers for not putting that logic into the build system. +_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg" +_debhelper_install() { + local debname=$1 + cd "$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ + | while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ + | while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + install -d "$pkgdir/usr/share/doc/$pkgname/" + sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ + | while read file; do + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null \ + | while read file link; do + ln -s "/$file" "$pkgdir/$link" + done +} + +###################################################################### build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i "${srcdir}/dpkg-rsyncable.patch" - patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection + patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --without-start-stop-daemon + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make + make DESTDIR="$_destdir" install +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_dpkg() { + pkgdesc="Debian Package manager" + provides+=(start-stop-daemon) + conflicts+=(start-stop-daemon) + _debhelper_install dpkg } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_dpkg-devtools() { + pkgdesc="Debian Package development tools" + arch=(any) + depends+=(perl-dpkg) + _debhelper_install dpkg-dev +} + +package_dselect() { + pkgdesc="Debian Package manager high-level interface" + _debhelper_install dselect +} + +package_libdpkg() { + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev +} - # Variables - install -d "${pkgdir}/var/${pkgname}/updates/" - touch "${pkgdir}/var/lib/${pkgname}/{status,available}" +package_perl-dpkg() { + pkgdesc="Debian Package perl modules" + arch=(any) + _debhelper_install libdpkg-perl } -md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') -md5sums=('39c74a948c6fe4c02ed9f15556fe179d' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') -md5sums=('39c74a948c6fe4c02ed9f15556fe179d' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('4df9319b2d17e19cdb6fe94dacee44da' + '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/compare b/libre/dpkg/compare new file mode 100755 index 000000000..4556440a5 --- /dev/null +++ b/libre/dpkg/compare @@ -0,0 +1,26 @@ +#!/bin/bash +# compare the packages extracted in pkg/ to the packages from debian + +_check() { + local pacpkg=$1 + local debpkg=$2 + + libremessages msg "dpkg:$debpkg -> pacman:$pacpkg" + + make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null + + echo -e 'pacman\tdpkg' + comm -3 \ + <(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \ + <(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort) +} + +mkdir -p tmp + +_check dpkg dpkg +_check dpkg-devtools dpkg-dev +_check dselect dselect +_check libdpkg libdpkg-dev +_check perl-dpkg libdpkg-perl + +rm -rf tmp diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk new file mode 100644 index 000000000..88219f283 --- /dev/null +++ b/libre/dpkg/compare.mk @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# Assist file for ./compare + +tmp/%.debian.filelist: + curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/<pre>/,/<\/pre>/{ s|.*<pre>||; s|</pre>.*||; /./p }"|sed 's|/||'|sort > $@ + +tmp/%.pacman.filelist: + ( cd pkg/$* && find * -not -type d; ) | sort > $@ diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch new file mode 100644 index 000000000..3daf6d76e --- /dev/null +++ b/libre/dpkg/dpkg-gzip-rsyncable.patch @@ -0,0 +1,11 @@ +--- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200 ++++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200 +@@ -52,7 +52,7 @@ + my $COMP = { + "gzip" => { + "file_ext" => "gz", +- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ], ++ "comp_prog" => [ "gzip", "--no-name" ], + "decomp_prog" => [ "gunzip" ], + "default_level" => 9, + }, diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index e96c047a8..5a20ba446 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $ +# $Id: PKGBUILD 173502 2012-12-19 18:25:44Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=( @@ -57,7 +57,7 @@ source=( "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" ) sha256sums=( - 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0 + 198759adb10ceb1777245f5706a198708e4539cd1e19b8a900f5d573fc76089f ) build() { diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 3476c68f5..437e959d3 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,7 +9,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=17.0.1 +_debver=18.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,8 +20,8 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=17.0.1 -pkgver=${_debver}.${_debrel} +_pkgver=18.0 +pkgver=$_debver.$_debrel pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." @@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('9d0c6dcde68b688ba613c9704dad8cf6' - 'c3f7acd38f4fd0810a8bbc9c1a1ef990' - 'c806782ef309ecac56b0e736081555ac' - '41f9def213a2de76687be9bd36341c71' - '2aafaa1710de038f7741b1e5c1e40f19' - 'c536bdb01893b53346726cdf572cdda8' - '1b292d4cb415fb0b493fd88529d8add1' - 'eaa814301018cbcbcc9145fd60a0ad3e' - 'a7ffe62f5d1a676db58d6bcd0cb5a29e' - '25c8732aba36a5f8e58f35788a89b2f6' - '5ac90a12d8d1f0bbd0c32e6411168461' - 'f47b78c5f086ec511388a143330e22d5' - 'ae97555f6474f597a15da089b6ef0089' - '0c46ab829c0597dc3faa5e70d64bb903' - '555ccc2a64ce110308ae55569cf0d612' - 'f2bdc9390388552cebde424ccb533b56' - '0f857bdca9f2bcb24b5e8a2f46f398af' - '508928bf9b224786e3fdad9bcfda4230' - 'af8f928b3dcf59489291ed99ad216c10' - 'b97d8915f520de0d760070e7a058492c' - '5d894ccd869331f6ba81b79d66452d29' - 'c3e268cd4c829cb0852ed02c9de2dd4d' - '408c8e898900efc97d3c449382958607' - 'ad9568a88b73189cc73c25728d23db3a' - 'e6e84f910d33d75953a4abc4fb0e78d5' - '403991c8eaa55675b433701901042791' - '8b317a2f84f3ab4f20f213134fa4e89f' - 'f6e192717ea383206793b5ac51d94b9d' - '5a1f2ff1a18c58bf7eae079f0058d3ac' - 'd65eeba91a938d95466fb602919a8253' - '6719800c6c4ea969af4597386900eed5' - '09152085c533d5cfaa3281bd56791ab3' - '5c3b9ba64919931ba924aeb82b6d511d' - '0a5392e0edf416304fa3501e09a9e755' - '9d17cc7f1238db2edda76736ecee56af' - '56b19d666ae1df919b26d6c04ede6ec7' - '16648d2f5b226786487d9f6dd4bf1e11' - '5cc3b11c6dc4399d9024ce58be31dd0b' - '999685ea1e48118e0a033f9b64eec244' - '3b7cb8fb5da908558ad2843ab61bec57' - '7a566e091f024f9cb458e57c20f59fff' - 'eca90e7e61b2b628ddceb230229b8fda' - '58dc4acfb114088852c1e12708778f6a' - '6e6755330cea230f334a6618e5c06268' - 'bf1ffad887e9bf769f021790abdfe79b' - '83baeeed748511bdd7996aa34e074f39' - 'cecea99a977d0849a2077c7c4aca175d' - '01b9b43a1ed30e05f96c10365011b980' - 'e08db859318bd525f37fe5e90c15bc15' - 'e9ba8aeb43ba9465231d91ab4d9046af' - 'af84a3746532b3a1e71bbf173f37acae' - '0694facbec186997b5e3e56f16924371' - 'daeb31829220fc001c9fe63e2fe8de5e' - 'f1573ce43e917553c2720bca8f24569d' - '8afafca7d0a34532d77f9e22929b591c' - 'c67cbab5cb06b30e21c310e3d29fcaa8' - '201292f43d1c354bd0189906d03cbbd0' - '9cf84d585fea1ac3002e2cced729c8a3' - 'b32934822634ebd1a82f64ac70597ef9' - '63cb7e54400f55eb5b4995c299174b40' - '7bdb7601e9c21af7f6e8d4c6f2acc8d4' - 'd998310ca5c38ef8babcc18a4faffae0' - 'f9896f39830058b9b003568f4d67b73b' - '9568dedd80dc5401bd69880952ef42e1' - 'b8863db55f206abf8c4fcc34fd82347b' - '8f4df43a91550692497b599856323bf7' - '4b91b600a3fa5f520c3c0953128695f5' - '0a1fdc989d107d323fb80ea05b13b832' - 'ca6e721d01ee9ec6719c1813ebb7f35b' - '5c40e59819a74f47dc95b58d5e1005ea' - '6506433c61b5811cf600f48a0b5e8074' - 'e4410eaaece0a283bb4060d3eb428a96' - '635a91b20ba7ecde88de1bdf8517c7bb' - 'b884f988301169f17e5f181be5768e74' - '4358aa4e516f38b91e284eb75d729978' - 'f386732f9fb2629f35defe354e85ce02' - '9312ded30c12d367e9280ccfe5f22261' - 'a17cd6c8190d0a31938292b77c6c50fb' - '01187464580ccd34874e48e8113e4e5c' - 'af362b174706ab93851ac1e6e6078422' - 'a8291043c75079d9c66258897b30bba6' - '5ec754344dba9cfdc3021bb03ec118e0' - '04a79f1876c05c62f270f757cf34780c' - '494444bb9df2fbefc8689c3c3be61e6f' - '9b8c613d0f6cb51209021c436f7313d5' - '9ac2c4bab905675ab3cefbc10742f9cb' - 'c1a67c2551a9d0de73d72b3bad887159' - '2153d65575351ac1974fbb5874b4788b')
\ No newline at end of file +md5sums=('08556c8d27a4313b5e67e655d2e1e828' + '9fa01f43db09b12cd724f94c28883a9e' + '0d1ef852709fcae1842105d675c22312' + '56247c867b52a19808ca72f7fceb349a' + 'dd670bcc609c06139671bf953f26d7b8' + 'df233884b68c8f37ff9b757b6480ae94' + 'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8' + 'd0f512e8bf97110a60b16de59b15869b' + '54045555373497393ded8bccc0dc1784' + '61cb757a64268141518ed9dad4795106' + '62f338f7bcd7fb50ef2f61936c0e4990' + '97b2c6a0de5d60b4e5696973aedd3cfc' + 'd916a0b470264a9271509ed7a109e360' + '6f442a2989b814f20f4b73975bc97a5c' + '6117d8d24dad056f143feb3e061702dd' + 'c759f731a415f99a73e20090f4893184' + 'b481b08da143ff45a84d32285249fcfd' + '828f9a5b69634b39d48bfdf472a957bd' + '12d4b6779cb50777303381d35f539c4c' + '8609fd343e1e91724f50d6833d3e2f82' + '331acfbad62badfd48713d9b461efcf3' + '49216a2ea50fcd01057bd7b0d14a78e2' + 'b0738cf3f5ce546134150e082cffaf61' + '9f03cd24990c897e75594229517c1e9a' + '5667260492203f29bba1b2732ce20b77' + 'a1dd5872ab73a1a14ce3e285138445da' + '03e82d09ba4026ab10df5cfc3b78ca5f' + '1e92e7b3725cdfa94fc705ab54c7c6aa' + '35d9a0ccfa3c95a3a56f29c7a5bc4e6b' + '656dbfb6ac9efbeb4e58b5b9fc5fda03' + '29a343077a3de07ce9bb3e4d24d6a11a' + '831e09a24d4d40cb1bb45f980b7fa251' + '8488c98293d6f16caf99cf556f999611' + '92b07db5dcb8fc95ac8f5706b94d7ed5' + 'fa9ee1b85adbd15c46ca075d94e62a14' + '19383d5cb3ed6de8599118dd9f54889e' + 'fdff305ce5b154b12907fa302419548c' + '24df7d71f1a70e8225e80d15a53d3777' + '793bfd1301c4e989e2f904ad9f6b3adc' + '06d4e4423df0908254e422d207292858' + 'd53dce3f9b3a5de374dd6c10ebe3665c' + '382e5237a81fbbbaab499c5c6646b308' + '1da9f5ce8cbd3bdcc46f932b7458574f' + 'd635c40c88a7430a2103c13cdf1b58d3' + 'd1eac26314ade41883b24b91cd9e01c6' + '6e65dd6b8cb0fbd4395e548926043e70' + '97e8c9b3db047651a38f29366867c92e' + '87433742c0b21c7655988d5586667d77' + 'ac5cab1c45e0accf718cf624c8545dea' + 'd3f2ff9a817dff71fa05ffe5f3f45db8' + 'd1909b644b4495343b6d041c15683ad2' + '5c79b17dd9d0d83f749f52d489b347a7' + '433f0456e52420955a3689d2b18b7a94' + '90ee54b793a100b74f1b91ca2acb103b' + '0544d0e7e26a0c07379f0c6ca22708d8' + 'c75d55a574f525f5f08574cb01a2ee20' + 'b43589a4b08112996c756db467015eab' + '82782fd09a815441622187ed8839b0ee' + '52de8e6386f0232d13c6768092089c23' + '091e065f1723fa7fa7701ced828e24ed' + 'a036b50e5915e5b37257fa048e8d7a60' + '1037213a49539a069b9e223dacfbdc94' + '251b43c207b4fb0842a913e658f868c3' + '1aac06560c3a0957087eab1d2034eba3' + '964b3edfd3221d8e412ef695bd9a7b00' + '45a900da3f1cc4834b32b190c67c42af' + 'cad9df2808fd8f009d27142a729f21d6' + '192eaff8883db984c42ee43e3a5303f4' + '1000e395379bc6ef3b9c2c891f615e44' + '1da3d8777bc0595dea09fdd7222b55f3' + '0fbdd7294e21936ae75aca56d4d7252c' + 'af481ef78e4ffe7b4cbf892c5cb10cc2' + 'fc884a9a8203c56196993f6ed65069ca' + '1bebdd6e194cbb746f81725e317eb9b4' + '4c75d146f27aa2a70b0219954baa8965' + 'd832ceafecac23a0659f7a766f6d98de' + 'ed056fa5b30ddf55042699713c629503' + '8e698f20270de2b2fbaf9c1f09257c06' + 'e864caf42db46efbaa229f36af572ee4' + '013864da4a811e894ba1605e7f93e80e' + '69be7804b3d6a6bb5683554cbc324bed' + 'efc6a8427f080706d7d590a7b0eacadd' + '40c41e04514e3cbcae33b15a062b3811' + '164850087cdf79d57569ee9d4e1a8d2d' + '226de7be23de61db7df718ef93f7c906' + 'fb331d7fd4f1c853192111663e2672a0' + '5dd0a89e43aa0f263fc7c1d4302dbfd6' + '8e602db8304ddafad17fd8098125d37b') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 903ca80f2..cfbd441fa 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0.1 +_debver=18.0 _debrel=1 [ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; } _debrepo=http://ftp.debian.org/debian/pool/main/ @@ -22,8 +22,8 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre -pkgver=${_debver}.${_debrel} -pkgrel=4 +pkgver=$_debver.$_debrel +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -33,32 +33,33 @@ fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') -makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification') +makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') options=(!ccache) fi +optdepends=('networkmanager: Location detection via available WiFi networks') url="http://www.geticeweasel.org/" install=iceweasel.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch + iceweasel.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' - 'eab149c1994ab14392e55af3abb08e80' +md5sums=('366e1e4847d7e00eba77ee5a4be0d3db' + '6a571d3a3b355c331f67d57702f4fccf' + '619e8f7c8596838a7daf2b7ce2e54cd3' 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' - 'c8040002668fae7d1b950833bae51607' + '7d16be01a546d7733ab28db980d230f3' + '2823e0ecdefc16b590a9997f9228924a' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' @@ -70,26 +71,31 @@ if [ "$_pkgname" != "$pkgname" ]; then fi build() { + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD on Archlinux + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="mozilla-release" - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" + mv debian "$srcdir/$DEBIAN_BUILD" + cd "$srcdir/$DEBIAN_BUILD" # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true quilt push -a patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" @@ -99,7 +105,7 @@ build() { cat "$srcdir/mozconfig.pgo" >> .mozconfig fi -# From js on abslibre-mips64el.git + # From js on abslibre-mips64el.git if [ "$CARCH" = "mips64el" ]; then msg "Force disabling JIT." sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ @@ -114,7 +120,7 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. + # This is a bug, we should fix it if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -138,24 +144,23 @@ build() { } package() { - cd "${srcdir}/${DEBIAN_BUILD}" + cd "$srcdir/$DEBIAN_BUILD" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/preferences" - # I don't even know why we're hitting the objdir, and ConnOS didn't. + # I don't even know why we're hitting the objdir, and ConnOS didn't _brandingdir=debian/branding brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" for i in 16x16 32x32 48x48 64x64; do install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" - #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel-libre/iceweasel.desktop new file mode 100644 index 000000000..e1aa6f0ca --- /dev/null +++ b/libre/iceweasel-libre/iceweasel.desktop @@ -0,0 +1,105 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Iceweasel +Name[bg]=Iceweasel +Name[ca]=Iceweasel +Name[cs]=Iceweasel +Name[el]=Iceweasel +Name[es]=Iceweasel +Name[fa]=Iceweasel +Name[fi]=Iceweasel +Name[fr]=Iceweasel +Name[hu]=Iceweasel +Name[it]=Iceweasel +Name[ja]=Iceweasel +Name[ko]=Iceweasel +Name[nb]=Iceweasel +Name[nl]=Iceweasel +Name[nn]=Iceweasel +Name[no]=Iceweasel +Name[pl]=Iceweasel +Name[pt]=Iceweasel +Name[pt_BR]=Iceweasel +Name[ru]=Iceweasel +Name[sk]=Iceweasel +Name[sv]=Iceweasel +Comment=Browse the World Wide Web +Comment[bg]=Сърфиране в Мрежата +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ru]=Обозреватель Всемирной Паутины +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[bg]=Интернет браузър +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[de]=Webbrowser +GenericName[el]=Περιηγητής ιστού +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ru]=Интернет-браузер +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +X-GNOME-FullName=Iceweasel Web Browser +X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) +X-GNOME-FullName[ca]=Navegador web Iceweasel +X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč +X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel +X-GNOME-FullName[es]=Navegador web Iceweasel +X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel +X-GNOME-FullName[fi]=Iceweasel-selain +X-GNOME-FullName[fr]=Navigateur Web Iceweasel +X-GNOME-FullName[hu]=Iceweasel webböngésző +X-GNOME-FullName[it]=Iceweasel Browser Web +X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ +X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 +X-GNOME-FullName[nb]=Iceweasel Nettleser +X-GNOME-FullName[nl]=Iceweasel webbrowser +X-GNOME-FullName[nn]=Iceweasel Nettlesar +X-GNOME-FullName[no]=Iceweasel Nettleser +X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel +X-GNOME-FullName[pt]=Iceweasel Navegador Web +X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel +X-GNOME-FullName[ru]=Интернет-браузер Iceweasel +X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel +X-GNOME-FullName[sv]=Webbläsaren Iceweasel +Exec=iceweasel %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=iceweasel +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; +StartupWMClass=Iceweasel +StartupNotify=true diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index cd3d49f2f..83ba6e04e 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,6 +1,6 @@ -diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js ---- iceweasel-17.0.1.orig/browser/app/profile/firefox.js 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/app/profile/firefox.js 2012-12-04 17:00:51.691456154 -0200 +diff -urN iceweasel-18.0.orig/browser/app/profile/firefox.js iceweasel-18.0/browser/app/profile/firefox.js +--- iceweasel-18.0.orig/browser/app/profile/firefox.js 2013-01-10 01:04:16.600370827 -0200 ++++ iceweasel-18.0/browser/app/profile/firefox.js 2013-01-09 19:58:30.691632825 -0200 @@ -37,11 +37,10 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); @@ -17,17 +17,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -194,7 +193,8 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - // Non-symmetric (not shared by extensions) extension-specific [update] preferences --pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); -+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons"); -+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - // restart. -@@ -329,18 +328,18 @@ +@@ -328,18 +327,18 @@ pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -51,7 +41,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // search bar results always open in a new tab pref("browser.search.openintab", false); -@@ -571,7 +570,7 @@ +@@ -570,7 +569,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url @@ -60,7 +50,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); -@@ -624,23 +623,23 @@ +@@ -622,23 +621,23 @@ pref("browser.send_pings", false); /* initial web feed readers list */ @@ -96,7 +86,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); pref("browser.feeds.handler", "ask"); -@@ -651,7 +650,7 @@ +@@ -649,7 +648,7 @@ // region.properties file is newer than the version number in the handler // service datastore, it will add any new handlers it finds in the prefs (as // seeded by this file) to its datastore. @@ -105,7 +95,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // The default set of web-based protocol handlers shown in the application // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -659,65 +658,65 @@ +@@ -657,65 +656,65 @@ // protocol not currently listed here), we should go ahead and add those. // webcal @@ -216,11 +206,10 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // Name of the about: page contributed by safebrowsing to handle display of error // pages on phishing/malware hits. (bug 399233) -@@ -1164,13 +1167,3 @@ - // might keep around more than this, but we'll try to get down to this value). +@@ -1168,14 +1167,4 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -- + -// Example social provider -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); -// Comma-separated list of nsIURI::prePaths that are allowed to activate @@ -230,6 +219,8 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ -pref("social.sidebar.unload_timeout_ms", 10000); -pref("social.active", false); -pref("social.toast-notifications.enabled", true); +- + pref("dom.identity.enabled", false); diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties --- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 +++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 @@ -461,10 +452,10 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i + <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> </DL><p> </DL><p> -diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js ---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js 2012-12-04 02:08:18.095477555 -0200 -@@ -5,99 +5,42 @@ +diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js +--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 21:44:27.000000000 -0200 ++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js 2013-01-10 00:53:04.008909619 -0200 +@@ -5,70 +5,41 @@ // If a definition requires additional params, check that the final search url // is handled correctly by the engine. const SEARCH_ENGINES = { @@ -529,39 +520,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew - "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" + - "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" + - "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC" +-#ifdef XP_MACOSX +- , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" +-#endif - , params: "source=hp&channel=np" -- } -- --, "Яндекс": -- { -- image: "data:image/png;base64," + -- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + -- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" + -- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" + -- "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" + -- "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" + -- "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" + -- "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" + -- "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" + -- "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" + -- "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" + -- "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" + -- "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" + -- "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" + -- "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" + -- "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" + -- "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" + -- "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" + -- "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" + -- "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" + -- "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" + -- "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" + -- "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" + -- "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" + -- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" + -- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" + -- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg==" -- } + "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + + "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + + "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + @@ -595,11 +557,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew + "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" + + "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" + + "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg==" -+ } + } }; - // The process of adding a new default snippet involves: -@@ -106,13 +49,15 @@ +@@ -78,8 +49,8 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ @@ -610,33 +571,17 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +@@ -141,10 +112,6 @@ + if (searchEngineInfo.image) { + let logoElt = document.getElementById("searchEngineLogo"); + logoElt.src = searchEngineInfo.image; +-#ifdef XP_MACOSX +- if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)")) +- logoElt.src = searchEngineInfo.imageHD; +-#endif + logoElt.alt = searchEngineName; + } --let gSearchEngine; -+// Bug with dom.storage.enabled set as false -+// We are using DDG HTML as a default in this case. -+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"}; - - document.addEventListener("DOMContentLoaded", function init() { - setupSearchEngine(); -@@ -142,13 +87,13 @@ - - function setupSearchEngine() - { -- gSearchEngine = JSON.parse(localStorage["search-engine"]); -- -- if (!gSearchEngine) -- return; -+ if (localStorage && localStorage["search-engine"]) { -+ gSearchEngine = JSON.parse(localStorage["search-engine"]); -+ } - -+ - // Look for extended information, like logo and links. -- let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; -+ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; - if (searchEngineInfo) { - for (let prop in searchEngineInfo) - gSearchEngine[prop] = searchEngineInfo[prop]; diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties --- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200 +++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200 @@ -668,25 +613,25 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js ---- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200 -+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 16:22:08.817372515 -0200 -@@ -1,3 +1,7 @@ +diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js +--- iceweasel-18.0.orig/debian/branding/firefox-branding.js 2013-01-08 17:55:47.000000000 -0200 ++++ iceweasel-18.0/debian/branding/firefox-branding.js 2013-01-10 01:49:05.807790675 -0200 +@@ -1,3 +1,6 @@ pref("startup.homepage_override_url",""); pref("startup.homepage_welcome_url",""); pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); + -+// Disable localstorage for privacy reasons. We will rewrite about:home js to -+// fix the bug. ++// Disable localstorage for privacy reasons. +pref("dom.storage.enabled", false); -diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css ---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css 2012-12-04 06:31:10.410410656 -0200 -@@ -66,7 +66,7 @@ +diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css +--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 ++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 +@@ -66,8 +66,7 @@ #searchEngineLogo { display: inline-block; height: 28px; - width: 70px; +- min-width: 70px; + width: 47px; } diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index e79896323..8b5e52d9e 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -21,9 +21,6 @@ ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests @@ -32,9 +29,6 @@ ac_add_options --disable-installer # Optimization ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir # Iceweasel diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 26b14ff86..91d74ba15 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $ +# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,18 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff' "konq-about-fsdg.diff") -sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' - '998f1db2309744dd2c054aec3462a717bc107c2e' +sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -29,12 +27,11 @@ provides=("kdebase-konqueror=$pkgver") build() { cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - cd ../ + cd .. mkdir build cd build diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 75c9a87da..20219e40a 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b' +sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index bc71be0c1..e73cc2f36 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ +# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.4 -pkgrel=3 +pkgver=4.9.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'libxtst') + 'media-player-info' 'libxtst' 'libutempter') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') @@ -23,13 +23,9 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' +sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,11 +33,6 @@ build() { # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch - - # Fixed upstream - patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch - patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch - # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3ff2a4205..8fea1b1c3 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $ +# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' +sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD new file mode 100644 index 000000000..af28566e8 --- /dev/null +++ b/libre/kdepim-libre/PKGBUILD @@ -0,0 +1,307 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbase=kdepim +pkgbase=kdepim-libre +pkgname=('kdepim-akonadiconsole-libre' + 'kdepim-akregator-libre' + 'kdepim-blogilo-libre' + 'kdepim-console-libre' + 'kdepim-kaddressbook-libre' + 'kdepim-kalarm-libre' + 'kdepim-kjots-libre' + 'kdepim-kleopatra-libre' + 'kdepim-kmail-libre' + 'kdepim-knode-libre' + 'kdepim-knotes-libre' + 'kdepim-kontact-libre' + 'kdepim-korganizer-libre' + 'kdepim-kresources-libre' + 'kdepim-ktimetracker-libre' + 'kdepim-ktnef-libre' + 'kdepim-libkdepim-libre') +pkgver=4.9.5 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim-libre') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d') + +build() { + mkdir build + cd build + cmake ../${_pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole-libre() { + pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-akonadiconsole') + conflicts=('kdepim-akonadiconsole') + provides=("kdepim-akonadiconsole=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator-libre() { + pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + replaces=('kdepim-akregator') + conflicts=('kdepim-akregator') + provides=("kdepim-akregator=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo-libre() { + pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('kdepim-blogilo' 'blogilo') + conflicts=('kdepim-blogilo' 'blogilo') + provides=("kdepim-blogilo=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console-libre() { + pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url='http://pim.kde.org' + replaces=('kdepim-console') + conflicts=('kdepim-console') + provides=("kdepim-console=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook-libre() { + pkgdesc='Contact Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + replaces=('kdepim-kaddressbook') + conflicts=('kdepim-kaddressbook') + provides=("kdepim-kaddressbook=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm-libre() { + pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + replaces=('kdepim-kalarm') + conflicts=('kdepim-kalarm') + provides=("kdepim-kalarm=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots-libre() { + pkgdesc='Note Taker (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + replaces=('kdepim-kjots') + conflicts=('kdepim-kjots') + provides=("kdepim-kjots=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra-libre() { + pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + install='kdepim-kleopatra.install' + url="http://kde.org/applications/utilities/kleopatra/" + replaces=('kdepim-kleopatra') + conflicts=('kdepim-kleopatra') + provides=("kdepim-kleopatra=${pkgver}") + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail-libre() { + pkgdesc='Mail Client (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + provides=("kdepim-kmail=${pkgver}") + for i in kmail doc/kmail kmailcvt archivemailagent backupmail \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + mailimporter ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode-libre() { + pkgdesc='News Reader (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + replaces=('kdepim-knode') + conflicts=('kdepim-knode') + provides=("kdepim-knode=${pkgver}") + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes-libre() { + pkgdesc='Popup Notes (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + replaces=('kdepim-knotes') + conflicts=('kdepim-knotes') + provides=("kdepim-knotes=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact-libre() { + pkgdesc='Personal Information Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces') + replaces=('kdepim-kontact' 'kdepim-kontactinterfaces') + provides=("kdepim-kontact=${pkgver}") + for i in kontact/src doc/kontact kontact/plugins/summary \ + kontact/plugins/specialdates doc/kontact-admin; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer-libre() { + pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + replaces=('kdepim-korganizer') + conflicts=('kdepim-korganizer') + provides=("kdepim-korganizer=${pkgver}") + install='kdepim-korganizer.install' + for i in korganizer doc/korganizer kontact/plugins/korganizer \ + calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kresources-libre() { + pkgdesc='KDE PIM resources (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-kresources') + conflicts=('kdepim-kresources') + provides=("kdepim-kresources=${pkgver}") + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker-libre() { + pkgdesc='Personal Time Tracker (without nonfree pilot-link support)' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + replaces=('kdepim-ktimetracker') + conflicts=('kdepim-ktimetracker') + provides=("kdepim-ktimetracker=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktnef-libre() { + pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)' + depends=('kdebase-runtime' 'kdepimlibs') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + replaces=('kdepim-ktnef') + conflicts=('kdepim-ktnef') + provides=("kdepim-ktnef=${pkgver}") + install=kdepim-ktnef.install + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim-libre() { + pkgdesc='Library for KDE PIM (without nonfree pilot-link support)' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + provides=("kdepim-libkdepim=${pkgver}") + for i in akonadi_next calendarsupport incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon messagecomposer messagecore messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdepim-libre/kdepim.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 20ac66607..d6a1cc01e 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $ +# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -18,11 +18,18 @@ install=${_pkgname}.install provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" + 'ark-unar-06.patch') +sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c' + 'a0a836950f185d9b2245204579f969203036fdec') build() { - cd "${srcdir}" + cd "${srcdir}/ark-${pkgver}" + + # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + patch -Np1 -i "${srcdir}/ark-unar-06.patch" + + cd .. mkdir build cd build cmake ../ark-${pkgver} \ diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/kdeutils-ark-libre/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker <lukeshu@sbcglobal.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include <KDebug> ++ ++#include <QDateTime> ++#include <QDir> ++#include <QRegExp> ++#include <QString> ++#include <QStringList> ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spaces<line.size())&&(line[spaces]==QLatin1Char(' '));spaces++){} ++ // Since this is so ugly anyway, I'm not even going to check to ++ // make sure that spaces is even. I mean, what would I do about it? ++ int m_newIndentLevel = spaces/2; ++ ++ if (m_newIndentLevel>m_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel<m_indentLevel) { ++ if ( (m_newIndentLevel<3) && (m_indentLevel>=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 1aafaf4ed..8213590d8 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $ +# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.10 -pkgrel=1.1 +pkgver=1.8.12 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64' 'mips64el') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d' +sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index c420c2070..569568cb1 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $ +# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_basekernel=3.6 -_sublevel=3 +_basekernel=3.7 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -pkgdesc="Kernel libre headers sanitized for use in userspace" +pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') @@ -18,8 +18,8 @@ conflicts=('linux-api-headers') replaces=('linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '844bd14e9f58225274e096c31bbb8a8f') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 52fcbd887..ebdca122c 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linux-libre-firmware pkgver=3.7 -pkgrel=1 +pkgrel=4 pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' @@ -43,7 +43,7 @@ package() { make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install - # move WHENCE file to linux-libre-firmware license folder + # move WHENCE file to linux-firmware license folder install -d -m755 $pkgdir/usr/share/licenses/$pkgname mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 64008c7b6..335d35218 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: André Silva <emulatorman@lavabit.com> _kernver=3.7.1 -_kernrel=1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-12-04-1-u -pkgver=20121204 +_pkgver=2012-12-19-u +pkgver=20121219 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) -md5sums=('bc46200e288acb862149a2af11f4b293') +md5sums=('60756fde830487042a525ff17ccfe7ab') build() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 083330019..47666d7b4 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=57 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'fbaf6e706052fdd45ab889505758c3fc') + '21f93138b6d4410b095cc9998f89e47d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index e6cc4238c..92f3778ca 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -5,8 +5,8 @@ pkgname=linux-libre-manpages pkgver=3.1 -pkgrel=1.2 -pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel" +pkgrel=1.3 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 96432e154..af26e178d 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -9,7 +9,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=2 +pkgrel=3.1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -91,7 +91,8 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux-libre kernel trace event library' + pkgdesc='Linux kernel trace event library' + depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') provides=("libtraceevent=$pkgver") @@ -102,7 +103,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux-libre kernel performance auditing tool' + pkgdesc='Linux kernel performance auditing tool' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -120,7 +121,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 2c24f3883..162169e03 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,8 +12,8 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +pkgrel=2.1 +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,6 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'fat-3.6.x.patch' + 'fix-watchdog-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '6f4bb80d3d91b69daf5ccfea836d02df' @@ -41,7 +42,8 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '0a74f8d9c640daabb774c25cb74db512') + '3485d6c7ae3af35d16e09d6d9a7ed32a' + 'b56c33eaee920970151fffdfc7df0766') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -70,6 +72,10 @@ build() { # https://bugs.archlinux.org/task/32916 patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + # fix watchdog enable/disable regression + # https://bugs.archlinux.org/task/33095 + patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -387,7 +393,7 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch new file mode 100644 index 000000000..fe4431604 --- /dev/null +++ b/libre/linux-libre/fix-watchdog-3.7.patch @@ -0,0 +1,38 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 997c6a1..75a2ab3 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + ++ /* kick off the timer for the hardlockup detector */ ++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ hrtimer->function = watchdog_timer_fn; ++ + if (!watchdog_enabled) { + kthread_park(current); + return; +@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) + /* Enable the perf event */ + watchdog_nmi_enable(cpu); + +- /* kick off the timer for the hardlockup detector */ +- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +- hrtimer->function = watchdog_timer_fn; +- + /* done here because hrtimer_start can only pin to smp_processor_id() */ + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); +@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + +- if (!watchdog_enabled) +- return; +- + watchdog_set_prio(SCHED_NORMAL, 0); + hrtimer_cancel(hrtimer); + /* disable the perf event */ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e8f8b6979..61aa977c0 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.7.1-1-LIBRE +KERNEL_VERSION=3.7.1-2.1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index c8cd92d40..7da492643 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=35 +pkgrel=35.1 epoch=1 _extramodules=extramodules-3.7-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -55,7 +55,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) " depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') @@ -72,7 +72,7 @@ package_lirc-libre() { } package_lirc-utils-libre() { - pkgdesc="Linux-libre Infrared Remote Control utils" + pkgdesc="Linux Infrared Remote Control utils" depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 3810fe495..4e4f94494 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=2 +pkgrel=4 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ source=( jamendo.ico::http://www.jamendo.com/favicon.ico parabola-packages.xml parabola-wiki-en.xml - seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml + seeks-search.xml::http://www.seeks.fr/opensearch.xml yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) @@ -45,6 +45,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' 'e50a847cec81357e8730e0d327515a9c' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - '3c68938db88b6ea552742718a08f3bf8' + 'dc6c76acf4c68a40710383513d72fa8b' 'bdb2640c643493063051bc72eeeff920' 'cb281f07933210c812a6153f32109645') diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index ffd2f2d61..8696a1bfa 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=6 +pkgrel=6.1 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar' url='http://p7zip.sourceforge.net/' license=('GPL') diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 01502f813..cf38b1882 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,9 +12,9 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.3 -pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') +pkgrel=9.4 +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 37a7c1ad9..d7c900f2a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,9 +11,9 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=12 -pkgdesc="Modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') +pkgrel=12.1 +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index e1664e809..85366a600 100755 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N30N <archlinux@alunamation.com> pkgname=unar -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') @@ -38,5 +38,5 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('ae5233dd835229f867f0948d28dde0d6' +md5sums=('d493957a56844ef9c1ad7b7dd24571fc' '4fa4ecc6e4ba14d3b6952d064e728511') diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD index 2e5aa615c..e4ac77b11 100644 --- a/libre/ununrar/PKGBUILD +++ b/libre/ununrar/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=ununrar -pkgver=0.0a0dev20120412 +pkgver=0.0a0dev20130105 pkgrel=1 pkgdesc="An unrar-compatible interface to Unarchiver" arch=('any') @@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre') conflicts=('unrar' 'unrar-libre') options=(!emptydirs) source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") -sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f') +sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200') package() { cd "$srcdir/Ununrar-$pkgver" diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index af7f7156e..394379a3c 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,8 +8,8 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE -pkgrel=15 -pkgdesc="Kernel libre module that emulates SCSI devices" +pkgrel=15.1 +pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index d836a3a37..1833f020e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,19 +7,20 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.4 -pkgrel=1.1 +pkgver=4.2.6 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" - 'expac') + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,16 +33,17 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - pkgdesc='Host kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -50,17 +52,18 @@ package_virtualbox-libre-host-modules-lts(){ } package_virtualbox-libre-guest-modules-lts(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh index 4c3c29e30..d1bfb72ce 100755 --- a/libre/virtualbox-libre-modules-lts/build.sh +++ b/libre/virtualbox-libre-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 1ecee7b2c..067a95fdd 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,19 +6,20 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.4 -pkgrel=2 +pkgver=4.2.6 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" - 'expac') + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,16 +32,17 @@ build() { } package_virtualbox-libre-host-modules(){ - pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.6' 'linux-libre<3.7') + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.6' 'linux-libre<3.7') +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -67,5 +70,4 @@ package_virtualbox-libre-guest-modules(){ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } - # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh index f798a615d..6152ec21d 100755 --- a/libre/virtualbox-libre-modules/build.sh +++ b/libre/virtualbox-libre-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index caf59aa13..41b5ac73a 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 8605cf20a..1ac430c3b 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch index 51fd6361c..b75c3c565 100644 --- a/libre/virtualbox-libre/001-vboxdrv-reference.patch +++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch @@ -1,88 +1,44 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -67,38 +67,34 @@ - - /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ - QString g_QStrHintLinuxNoMemory = QApplication::tr( -- "This error means that the kernel driver was either not able to " -+ "This error means that the kernel libre driver was either not able to " - "allocate enough memory or that some mapping operation failed." - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -+ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " -- "module by executing<br/><br/>" + "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "libre module by executing<br/><br/>" + " <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and " + "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " -+ "The VirtualBox kernel libre modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Please try completely uninstalling and reinstalling " - "VirtualBox." - ); +@@ -90,11 +89,8 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " + "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." -+ "The VirtualBox kernel libre modules do not match this version of " -+ "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> " ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " + " <font color=blue>'dkms autoinstall'</font><br/><br/>" ); QString g_QStrHintOtherNoDriver = QApplication::tr( -- "Make sure the kernel module has been loaded successfully." -+ "Make sure the kernel libre module has been loaded successfully." - ); - - /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ -@@ -590,7 +586,7 @@ - case VERR_VM_DRIVER_NOT_INSTALLED: - case VERR_VM_DRIVER_LOAD_ERROR: - msgText += QApplication::tr ( -- "<b>Cannot access the kernel driver!</b><br/><br/>"); -+ "<b>Cannot access the kernel libre driver!</b><br/><br/>"); - # ifdef RT_OS_LINUX - msgText += g_QStrHintLinuxNoDriver; - # else -@@ -603,7 +599,7 @@ - break; - # endif - case VERR_VM_DRIVER_NOT_ACCESSIBLE: -- msgText += QApplication::tr ("Kernel driver not accessible"); -+ msgText += QApplication::tr ("Kernel libre driver not accessible"); - break; - case VERR_VM_DRIVER_VERSION_MISMATCH: - # ifdef RT_OS_LINUX diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -30,19 +30,20 @@ - SHUTDOWN="true" - elif ! lsmod|grep -q vboxdrv; then +@@ -32,17 +32,18 @@ cat << EOF --WARNING: The vboxdrv kernel module is not loaded. Either there is no module -- available for the current kernel (`uname -r`) or it failed to + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module -+ available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-host-modules or -+ if you don't use our stock kernel libre compile the modules with ++ load. Please reinstall the kernel module virtualbox-libre-host-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. -@@ -52,9 +53,8 @@ - - if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF --WARNING: The compilation of the vboxdrv.ko kernel module failed during the -+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the - installation for some reason. Starting a VM will not be possible. -- Please consult the User Manual for build instructions. - EOF - fi -
\ No newline at end of file diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 54978ea3c..dc94a2a33 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -8,18 +8,18 @@ pkgbase=virtualbox-libre pkgname=('virtualbox-libre' + 'virtualbox-libre-host-dkms' + 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-host-source' - 'virtualbox-libre-guest-utils' - 'virtualbox-libre-guest-source') -pkgver=4.2.4 -pkgrel=1 + 'virtualbox-libre-guest-utils') +pkgver=4.2.6 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('alsa-lib' 'bin86' - 'cdrkit-libre' + 'cdrkit' 'curl' 'dev86' 'gsoap' @@ -28,7 +28,6 @@ makedepends=('alsa-lib' 'libidl2' 'libpulse' 'libstdc++5' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' @@ -41,7 +40,7 @@ makedepends=('alsa-lib' 'glu' 'python2' 'qt' - 'sdl-libre' + 'sdl' 'sdl_ttf' 'vde2' 'xalan-c') @@ -78,7 +77,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' +md5sums=('d680aeb3b4379b8281527aeb012b2df5' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -88,7 +87,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '4f1692638d6740df4c4ad9766ba4e179' + 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -108,8 +107,8 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '85141ccd2621a8e004b8f55c9a1f83eb' - 'c7b29fbf4c24a00e8646ca6dd73f38a1') + '05d166104a66ee479896c941ac27a3d0' + '78168f8699aa01a632603f0d5b1b8281') build() { cd "VirtualBox-$pkgver" @@ -150,33 +149,37 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --enable-vnc \ --disable-kmods -# --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all + + # fix python2 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + # build rdesktop-vrdp (broken from LocalConfig.kmk) - cd src/VBox/RDP/client + pushd src/VBox/RDP/client cp "$srcdir/LocalConfig.kmk" . + # fix keymap path FS#32548 + sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all + popd } package_virtualbox-libre() { pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' depends=('curl' 'libpng' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' 'libxmu' - 'sdl-libre' + 'sdl' + 'shared-mime-info' 'virtualbox-libre-host-modules') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' - 'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' 'net-tools: Host-only or bridged networking support') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') @@ -275,15 +278,15 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox Host kernel libre modules source (DKMS)' +package_virtualbox-libre-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') - replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') - conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') + conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-host-source.install + install=virtualbox-libre-host-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -291,15 +294,15 @@ package_virtualbox-libre-host-source() { cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" } -package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)' +package_virtualbox-libre-guest-dkms() { + pkgdesc='VirtualBox Guest kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules') - replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') - conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') + conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-guest-source.install + install=virtualbox-libre-guest-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -310,7 +313,7 @@ package_virtualbox-libre-guest-source() { package_virtualbox-libre-guest-utils(){ pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels') provides=("virtualbox-guest-utils=$pkgver") replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index fcdb3c631..91d15e380 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,6 +1,8 @@ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-16 23:00:19.998701465 -0200 -@@ -33,289 +33,365 @@ +diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp +index 6ae0372..df65e60 100644 +--- a/src/VBox/Main/src-all/Global.cpp ++++ b/src/VBox/Main/src-all/Global.cpp +@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] = VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -190,318 +192,320 @@ + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux", "Arch Linux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux_64", "Arch Linux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)", VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian", "Debian", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian", "Debian", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian", VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian_64", "Debian (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian_64", "Debian (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)", VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, - { "Linux", "Linux", "OpenSUSE", "openSUSE", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE", "openSUSE", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE", VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE_64", "openSUSE (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)", VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora", "Fedora", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora", "Fedora", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora", VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora_64", "Fedora (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)", VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo", "Gentoo", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo", "Gentoo", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo", VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo_64", "Gentoo (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)", VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva", "Mandriva", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva", "Mandriva", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva_64", "Mandriva (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)", VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat", "Red Hat", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat", "Red Hat", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat", VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat_64", "Red Hat (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)", VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux", "Turbolinux", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux", "Turbolinux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux", VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux_64", "Turbolinux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)", VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu", "Ubuntu", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu", "Ubuntu", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu", VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu_64", "Ubuntu (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)", VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros", "Xandros", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros", "Xandros", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros", VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros_64", "Xandros (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)", VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle", "Oracle", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle", "Oracle", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle", VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle_64", "Oracle (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)", VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31", "Windows 3.1", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", + VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, + 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95", "Windows 95", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95", + VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98", "Windows 98", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98", + VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe", "Windows ME", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME", + VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, + 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4", "Windows NT 4", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4", + VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, + 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000", "Windows 2000", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000", + VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, + 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP", "Windows XP", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP", + VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64", "Windows XP (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)", + VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003", "Windows 2003", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003", + VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64", "Windows 2003 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)", + VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista", "Windows Vista", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista", + VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64", "Windows Vista (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)", + VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008", "Windows 2008", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008", + VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64", "Windows 2008 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)", + VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7", "Windows 7", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7", + VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64", "Windows 7 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)", + VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8", "Windows 8", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8", + VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, + 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64", "Windows 8 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)", + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64", "Windows 2012 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", + VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT", "Other Windows", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows", + VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, + 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris", "Oracle Solaris 10 5/09 and earlier", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier", VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris", "Oracle Solaris 10 10/09 and later", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris11_64", "Oracle Solaris 11 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)", VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD", "FreeBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD_64", "FreeBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD", "OpenBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD_64", "OpenBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD", "NetBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD_64", "NetBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp3", "OS/2 Warp 3", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp4", "OS/2 Warp 4", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp45", "OS/2 Warp 4.5", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2eCS", "eComStation", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2", "Other OS/2", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS", "Mac OS X", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS_64", "Mac OS X (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "DOS", "DOS", ++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Netware", "Netware", ++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "L4", "L4", ++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "QNX", "QNX", ++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "JRockitVE", "JRockitVE", ++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 22:44:37.177454655 -0200 -@@ -44,45 +44,33 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +index c5a4cfe..7d2b363 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +@@ -44,46 +44,33 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -519,6 +523,7 @@ - { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, - { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, - { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, +- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, - { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, - { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, - { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -542,6 +547,8 @@ - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, +- +- /* Code names for Linux distributions: */ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -567,13 +574,12 @@ + { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, + { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, + { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, - -- /* Code names for Linux distributions: */ ++ + /* Code names for non-free GNU/Linux distributions: */ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +78,7 @@ +@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -582,7 +588,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +103,50 @@ +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -619,6 +625,7 @@ + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -641,18 +648,37 @@ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +159,8 @@ +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, -+ ++ + /* Other: */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300 -@@ -3405,7 +3405,18 @@ +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) + /* Create widgets: */ + QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { ++ pMainLayout->setContentsMargins(8, 6, 8, 6); + m_pLabel = new QIRichTextLabel(this); ++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_pNameAndSystemEditor = new UINameAndSystemEditor(this); +- pMainLayout->addWidget(m_pLabel); +- pMainLayout->addWidget(m_pNameAndSystemEditor); +- pMainLayout->addStretch(); ++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); ++ pMainLayout->addWidget(m_pLabel, 1); ++ pMainLayout->addWidget(m_pNameAndSystemEditor, 1); + } + + /* Setup connections: */ +diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp +index 8cb1e12..20e3eda 100644 +--- a/src/VBox/Main/xml/Settings.cpp ++++ b/src/VBox/Main/xml/Settings.cpp +@@ -3405,7 +3405,18 @@ const struct { { "netware", "Netware" }, { "solaris", "Solaris" }, { "opensolaris", "OpenSolaris" }, @@ -672,9 +698,11 @@ }; void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-09-04 09:48:43.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl 2012-10-03 17:02:10.780019131 -0300 -@@ -763,6 +763,17 @@ +diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl +index 9a31a4c..7db11ad 100644 +--- a/src/VBox/Main/xml/SettingsConverter.xsl ++++ b/src/VBox/Main/xml/SettingsConverter.xsl +@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid. <xsl:when test="@OSType='solaris'">Solaris</xsl:when> <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when> <xsl:when test="@OSType='l4'">L4</xsl:when> @@ -692,9 +720,11 @@ </xsl:choose> </xsl:attribute> <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-10-03 00:13:20.408089706 -0300 -@@ -70,6 +70,24 @@ +diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +index 4523dad..38ae21a 100644 +--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc ++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +@@ -71,6 +71,24 @@ <file alias="os_oracle_64.png">images/os_oracle_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> @@ -719,9 +749,11 @@ <file alias="hd_16px.png">images/hd_16px.png</file> <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-10-03 17:03:46.114796857 -0300 -@@ -4310,11 +4310,11 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +index 8af9597..39a8d39 100644 +--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -738,7 +770,7 @@ {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4337,7 +4337,7 @@ +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -747,7 +779,7 @@ {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4353,6 +4353,25 @@ +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, @@ -773,9 +805,11 @@ }; for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n) { ---- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 -+++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-10-03 17:07:12.143504689 -0300 -@@ -116,6 +116,25 @@ +diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h +index cbc0b73..31516cd 100644 +--- a/include/VBox/ostypes.h ++++ b/include/VBox/ostypes.h +@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_MacOS = 0xB0000, VBOXOSTYPE_MacOS_x64 = 0xB0100, VBOXOSTYPE_JRockitVE = 0xC0000, @@ -801,9 +835,11 @@ /** The bit number which indicates 64-bit or 32-bit. */ #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-10-03 17:11:27.739487250 -0300 -@@ -84,7 +84,32 @@ +diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp +index 05fc3b6..ce24d92 100644 +--- a/src/VBox/Main/src-server/ApplianceImpl.cpp ++++ b/src/VBox/Main/src-server/ApplianceImpl.cpp +@@ -84,7 +84,32 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this @@ -837,7 +873,7 @@ { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, -@@ -110,7 +135,7 @@ +@@ -110,7 +135,7 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, @@ -846,7 +882,7 @@ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, -@@ -151,53 +176,72 @@ +@@ -151,53 +176,72 @@ struct osTypePattern /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { @@ -961,9 +997,11 @@ }; /** ---- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h 2011-04-28 05:00:56.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h 2012-10-03 17:13:50.738308572 -0300 -@@ -145,8 +145,20 @@ +diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h +index e1e21d5..6d2da12 100644 +--- a/src/VBox/Main/include/ovfreader.h ++++ b/src/VBox/Main/include/ovfreader.h +@@ -145,8 +145,20 @@ enum CIMOSType_T CIMOSType_CIMOS_CentOS_64 = 107, CIMOSType_CIMOS_OracleEnterpriseLinux = 108, CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, @@ -985,9 +1023,11 @@ }; ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300 -@@ -141,7 +141,7 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +index 59749be..8e2b425 100644 +--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType) #ifdef VBOX_WITH_VIDEOHWACCEL /* Check if 2D video acceleration supported by the guest OS type: */ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); @@ -996,3 +1036,737 @@ #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI /* Check if WDDM mode supported by the guest OS type: */ +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +index f67cfc2..438ffee 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +@@ -32,6 +32,11 @@ enum + TypeID = Qt::UserRole + 1 + }; + ++const char* FreedomLabel = "We hope you don't use non-free " ++ "GNU/Linux distros and non-free operating " ++ "systems, since to use them is to surrender " ++ "your freedom."; ++ + UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + : QIWithRetranslateUI<QWidget>(pParent) + { +@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + qRegisterMetaType<CGuestOSType>(); + + /* Create widgets: */ +- QGridLayout *pMainLayout = new QGridLayout(this); ++ QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { + pMainLayout->setContentsMargins(0, 0, 0, 0); +- m_pNameLabel = new QLabel(this); +- { +- m_pNameLabel->setAlignment(Qt::AlignRight); +- m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pNameEditor = new QLineEdit(this); +- { +- m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); +- m_pNameLabel->setBuddy(m_pNameEditor); +- } +- m_pFamilyLabel = new QLabel(this); +- { +- m_pFamilyLabel->setAlignment(Qt::AlignRight); +- m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pFamilyCombo = new QComboBox(this); +- { +- m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pFamilyLabel->setBuddy(m_pFamilyCombo); +- } +- m_pTypeLabel = new QLabel(this); +- { +- m_pTypeLabel->setAlignment(Qt::AlignRight); +- m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pTypeCombo = new QComboBox(this); +- { +- m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pTypeLabel->setBuddy(m_pTypeCombo); +- } +- QVBoxLayout *pIconLayout = new QVBoxLayout; +- { +- m_pTypeIcon = new QLabel(this); ++ ++ /* Top QWidget */ ++ m_pGlobalCnt = new QFrame; ++ m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ ++ QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt); ++ { ++ m_pGridCnt = new QFrame; ++ m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pGridCnt->setMinimumWidth(500); ++ ++ QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt); + { +- m_pTypeIcon->setFixedSize(32, 32); +- } +- pIconLayout->addWidget(m_pTypeIcon); +- pIconLayout->addStretch(); +- } +- pMainLayout->addWidget(m_pNameLabel, 0, 0); +- pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); +- pMainLayout->addWidget(m_pFamilyLabel, 1, 0); +- pMainLayout->addWidget(m_pFamilyCombo, 1, 1); +- pMainLayout->addWidget(m_pTypeLabel, 2, 0); +- pMainLayout->addWidget(m_pTypeCombo, 2, 1); +- pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ pGridLayout->setContentsMargins(4, 4, 4, 4); ++ m_pNameLabel = new QLabel(m_pGridCnt); ++ { ++ m_pNameLabel->setAlignment(Qt::AlignRight); ++ m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pNameEditor = new QLineEdit(m_pGridCnt); ++ { ++ m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); ++ m_pNameLabel->setBuddy(m_pNameEditor); ++ } ++ m_pFamilyLabel = new QLabel(m_pGridCnt); ++ { ++ m_pFamilyLabel->setAlignment(Qt::AlignRight); ++ m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pFamilyCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pFamilyLabel->setBuddy(m_pFamilyCombo); ++ } ++ m_pTypeLabel = new QLabel(m_pGridCnt); ++ { ++ m_pTypeLabel->setAlignment(Qt::AlignRight); ++ m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pTypeCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pTypeLabel->setBuddy(m_pTypeCombo); ++ } ++ QVBoxLayout *pIconLayout = new QVBoxLayout; ++ { ++ m_pTypeIcon = new QLabel; ++ { ++ m_pTypeIcon->setFixedSize(32, 32); ++ } ++ pIconLayout->addWidget(m_pTypeIcon); ++ pIconLayout->addStretch(); ++ } ++ ++ pGridLayout->addWidget(m_pNameLabel, 0, 0); ++ pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); ++ pGridLayout->addWidget(m_pFamilyLabel, 1, 0); ++ pGridLayout->addWidget(m_pFamilyCombo, 1, 1); ++ pGridLayout->addWidget(m_pTypeLabel, 2, 0); ++ pGridLayout->addWidget(m_pTypeCombo, 2, 1); ++ pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ } ++ ++ m_pFreedomLabel = new QLabel(m_pGlobalCnt); ++ { ++ m_pFreedomLabel->setStyleSheet("color: red;" ++ "border-radius: 4px;" ++ "padding: 2px;" ++ "background-color: #DDDDDD;"); ++ m_pFreedomLabel->setWordWrap(true); ++ m_pFreedomLabel->setAlignment(Qt::AlignCenter); ++ m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pFreedomLabel->hide(); ++ } ++ ++ pGlobalLayout->addStretch(); ++ pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter); ++ pGlobalLayout->addWidget(m_pFreedomLabel); ++ pGlobalLayout->addStretch(); ++ } ++ ++ pMainLayout->addWidget(m_pGlobalCnt); + } + + /* Check if host supports (AMD-V or VT-x) and long mode: */ +@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi() + m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that " + "you plan to install into this virtual machine " + "(called a guest operating system).")); ++ m_pFreedomLabel->setText(tr(FreedomLabel)); + } + + void UINameAndSystemEditor::sltFamilyChanged(int iIndex) +@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex) + /* Else simply select the first one present: */ + else m_pTypeCombo->setCurrentIndex(0); + ++ /* Hide or show the freedom label if it is translated to the active language */ ++ int isEnglish = QLocale::system().language(); ++ if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31) ++ { ++ if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros") ++ { ++ m_pFreedomLabel->show(); ++ } ++ else ++ { ++ m_pFreedomLabel->hide(); ++ } ++ } ++ + /* Update all the stuff: */ + sltTypeChanged(m_pTypeCombo->currentIndex()); + +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +index 6a698c0..3c23845 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +@@ -30,6 +30,7 @@ + class QLabel; + class QLineEdit; + class QComboBox; ++class QFrame; + + /* QWidget reimplementation providing editor for basic VM parameters: */ + class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget> +@@ -76,6 +77,8 @@ private slots: + private: + + /* Widgets: */ ++ QFrame *m_pGlobalCnt; ++ QFrame *m_pGridCnt; + QLabel *m_pNameLabel; + QLabel *m_pFamilyLabel; + QLabel *m_pTypeLabel; +@@ -83,6 +86,7 @@ private: + QLineEdit *m_pNameEditor; + QComboBox *m_pFamilyCombo; + QComboBox *m_pTypeCombo; ++ QLabel *m_pFreedomLabel; + + /* Variables: */ + CGuestOSType m_type; +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +index 100cb8c..5ab98ad 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +@@ -19,7 +19,7 @@ + + /* Global includes: */ + #include <QVBoxLayout> +-#include <QHBoxLayout> ++#include <QVBoxLayout> + #include <QGroupBox> + #include <QGridLayout> + #include <QSpacerItem> +@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup) + m_pNameAndSystemCnt = new QGroupBox(this); + { + m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt); ++ m_pNameAndSystemCnt->setFixedHeight(170); ++ ++ QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt); + { ++ pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2); + m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt); + pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor); + } +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +index cea825b..7ade350 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +index e41d97d..f449069 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'aquesta màquina virtual (anomenat sistema operatiu client).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +index e82fc7c..a98be2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'esta màquina virtual (anomenat sistema operatiu client).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +index 176f417..bb58906 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +index 3f88de8..1d48468 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +index 14a3721..945d554 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +@@ -4838,6 +4838,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +index 4e52534..3d7dba6 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +index 275e1e6..34171eb 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +@@ -5951,6 +5951,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +index f902373..625da36 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +@@ -4850,6 +4850,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +index 3f31f8f..9248344 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +index b918edb..a6868a4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +@@ -6432,6 +6432,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Affiche le type du système d'exploitation (dit système d'exploitation invité) que vous allez installer dans cette machine virtuelle.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Nous espérons que vous n'utilisez pas de distribution GNU/Linux non libre ni de système d'exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +index b04f31b..77a389f 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostrar o tipo do sistema operativo que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +index 76d4371..c1aff65 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>A tervezett vendég operációs rendszer típusa.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +index 349d776..fb81c2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +@@ -6768,6 +6768,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +index 61f6a37..70e66b9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +index 9ab3823..40006f9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation> + </message> ++ <message> ++ <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +index be82aab..7d73e23 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +@@ -6451,6 +6451,10 @@ medium</comment> + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">បង្ហាញប្រភេទប្រព័ន្ធប្រតិបត្តិការដែលអ្នកមានគម្រោងដំឡើងម៉ាស៊ីននិម្មិតនេះ (បានហៅប្រព័ន្ធប្រតិបត្តិរបស់ម៉ាស៊ីនភ្ញៀវ) ។</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +index 05ccf51..3fb2a07 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로, 사용하지 않을 것을 권유합니다.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +index 3e06e93..cadd54b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +@@ -6767,6 +6767,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +index 2b81abd..610dad8 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +@@ -5894,6 +5894,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +index 7122389..ca0b4b2 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +index ebcba39..0bb693b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +@@ -6816,6 +6816,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +index 6a82c7e..c866fa4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +index 3b79282..345725c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +index c2230a2..653f436 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется "гостевая ОС").</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +index 40eec9d..dcecd31 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +@@ -6762,6 +6762,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +index 9eeef05..649c108 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +index 800d10b..239a8d4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +@@ -7768,6 +7768,10 @@ serial ports</comment> + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +index cdb888e..4c8d86c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +@@ -6312,6 +6312,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +index 8b51e82..2557231 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +index 2690322..0ea229a 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +@@ -4810,6 +4810,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +index 5b567f7..8709191 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +@@ -5858,6 +5858,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>显示你要安装到虚拟电脑的操作系统类型.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +index 5d1d136..095c169 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +@@ -4834,6 +4834,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 138bbd612..e93fe80e8 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 -+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 +--- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -55,7 +55,16 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -609,17 +596,6 @@ +@@ -580,8 +567,6 @@ + if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) + VBOX_WITH_CROGL = 1 + endif +-# Enable the VNC server extension pack (GPL only). +-#VBOX_WITH_EXTPACK_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + # Enable Host=>Guest Drag'n'Drop +@@ -621,17 +606,6 @@ endif ## @} @@ -73,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -810,14 +786,6 @@ +@@ -822,14 +796,6 @@ # Skip stuff. # @@ -88,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -872,7 +840,6 @@ +@@ -884,7 +850,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -96,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -894,7 +861,6 @@ +@@ -906,7 +871,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -104,7 +113,16 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -985,9 +951,6 @@ +@@ -979,7 +943,7 @@ + # + # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. + # +-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\ ++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\ + , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) + if $(words $(VBOX_ONLY_BUILD)) > 1 + $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) +@@ -997,9 +961,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -114,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1118,10 +1081,6 @@ +@@ -1130,10 +1091,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -125,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1744,9 +1703,6 @@ +@@ -1738,9 +1695,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -135,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2638,13 +2594,6 @@ +@@ -2632,13 +2586,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -149,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4049,6 @@ +@@ -4099,99 +4046,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -249,6 +267,131 @@ # # Qt 4 # Qt 4 +--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200 +@@ -90,8 +90,6 @@ + WITH_HARDENING=1 + WITH_UDPTUNNEL=1 + WITH_VDE=0 +-WITH_VNC=0 +-WITH_EXTPACK=1 + WITH_DOCS=1 + BUILD_LIBXML2= + BUILD_LIBCURL= +@@ -124,8 +122,6 @@ + MESA="-lGL" + INCZ="" + LIBZ="-lz" +-INCVNCSERVER="" +-LIBVNCSERVER="-lvncserver" + INCDEVMAPPER="" + LIBDEVMAPPER="-ldevmapper" + CXX_FLAGS="" +@@ -930,47 +926,6 @@ + } + + # +-# Check for libvncserver, needed for VNC in OSE +-# +-check_vncserver() +-{ +- test_header libvncserver +- cat > $ODIR.tmp_src.cc <<EOF +-#include <cstdio> +-#include <rfb/rfbconfig.h> +- +-extern "C" int main() +-{ +- const char* v=LIBVNCSERVER_VERSION; +- unsigned int major = 0, minor = 0, micro = 0; +- +- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; +- +- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); +- if (major*10000 + minor*100 + micro >= 900) +- { +- printf(", OK.\n"); +- return 0; +- } +- else +- { +- printf(", expected version 0.9 or higher\n"); +- return 1; +- } +-} +-EOF +- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then +- if test_execute; then +- cnf_append "VBOX_WITH_EXTPACK_VNC" "1" +- fi +- fi +-} +- +-# + # Check for libcurl, needed by S3 + # + check_curl() +@@ -2173,8 +2128,6 @@ + [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" + [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" + [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" +-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" +-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack" + [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF +@@ -2346,15 +2299,9 @@ + --enable-webservice) + [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 + ;; +- --enable-vnc) +- WITH_VNC=1 +- ;; + --disable-hardening) + WITH_HARDENING=0 + ;; +- --disable-extpack) +- WITH_EXTPACK=0 +- ;; + --disable-docs) + WITH_DOCS=0 + ;; +@@ -2512,15 +2459,6 @@ + echo >> $CNF + fi + +-# extpack +-if [ $OSE -eq 0 ]; then +- if [ $WITH_EXTPACK -eq 1 ]; then +- BUILD_LIBSSL=1 +- else +- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" "" +- fi +-fi +- + # headless + if [ -n "$HEADLESS" ]; then + cnf_append "VBOX_HEADLESS" "1" +@@ -2646,15 +2584,6 @@ + cnf_append "VBOX_WITH_DOCS_PACKING" "" + fi + +-# VNC server support +-if [ $OSE -ge 1 ]; then +- if [ $WITH_VNC = 1 ]; then +- check_vncserver +- else +- cnf_append "VBOX_WITH_EXTPACK_VNC" "" +- fi +-fi +- + # success! + echo + echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 +++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 @@ -378,7 +378,6 @@ diff --git a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install new file mode 100644 index 000000000..828a16a1d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install @@ -0,0 +1,25 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + VBoxManage extpack uninstall 'VNC' >/dev/null +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install new file mode 100644 index 000000000..2d62eae43 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install @@ -0,0 +1,30 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxguest/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxguest/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install new file mode 100644 index 000000000..8028cb7e0 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxhost/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxhost/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..90d8a8739 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,8 +30,8 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules. -===> Use virtualbox-libre-source package if you don't use our stock linux-libre package. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules. +===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi } diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD new file mode 100644 index 000000000..16586e732 --- /dev/null +++ b/pcr/chm2pdf/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Rodrigo Coacci <rcoacci@gmail.com> +# Contributor: fes0 +# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> + +pkgname=chm2pdf +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A simple Python script that converts CHM files into PDF files." +arch=('any') +license=('GPL2') +url="http://code.google.com/p/chm2pdf/" +depends=('chmlib' 'python2' 'python2-pychm' 'htmldoc') +optdepends=('beautiful-soup: A Python HTML/XML parser designed for quick turnaround projects like screen-scraping') +source=('http://chm2pdf.googlecode.com/files/chm2pdf-0.9.1.tar.gz') + + +build() { + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $srcdir/$pkgname-$pkgver/chm2pdf + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$startdir/pkg +} + diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD new file mode 100644 index 000000000..60ff8f267 --- /dev/null +++ b/pcr/debhelper/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer (AUR): Antoine Lubineau <antoine@lubignon.info> +# Contributor (AUR): Andrei "Garoth" Thorp <garoth@gmail.com> +# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> + +_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid +debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } + +pkgname=debhelper +pkgver=9.20120322 +pkgrel=1 +pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks" +arch=('any') +url="http://packages.debian.org/${pkgname}" +license='GPL3' +depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl') +makedepends=('po4a') +source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname" + make +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install +} + +md5sums=('9ea56782e6396a59ec49f45f9c4a603f') diff --git a/pcr/emacs-newlisp/PKGBUILD b/pcr/emacs-newlisp/PKGBUILD new file mode 100644 index 000000000..25dcbc219 --- /dev/null +++ b/pcr/emacs-newlisp/PKGBUILD @@ -0,0 +1,24 @@ +# Contributor: Jan Krvek <wamba@centrum.cz> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=emacs-newlisp +pkgver=0.25 +pkgrel=5 +arch=('any') +pkgdesc="Emacs mode for Newlisp." +url="http://artfulcode.net/projects" +depends=('emacs') +makedepends=('unzip') +license=('GPL') +source=(http://www.artfulcode.net/wp-content/uploads/2008/12/newlisp-mode.zip) +noextract=newlisp-mode.zip +install=emacs-newlisp.install + +build() { + cd $srcdir + unzip -quo newlisp-mode.zip || return 1 + cd $srcdir/newlisp-mode || return 1 + install -d $pkgdir/usr/share/emacs/site-lisp/newlisp-mode + install -Dm644 *.el $pkgdir/usr/share/emacs/site-lisp/newlisp-mode +} diff --git a/pcr/emacs-newlisp/emacs-newlisp.install b/pcr/emacs-newlisp/emacs-newlisp.install new file mode 100644 index 000000000..640e19d16 --- /dev/null +++ b/pcr/emacs-newlisp/emacs-newlisp.install @@ -0,0 +1,26 @@ +# vim: set ft=sh: +post_install() { + echo " +=> Autoloading: + ------------ + In your .emacs or .init.el + (add-to-list 'load-path (expand-file-name \"/usr/share/emacs/site-lisp/newlisp-mode\")) + (add-to-list 'auto-mode-alist '(\"\\\\.lsp\\\\'\" . newlisp-mode)) + (autoload 'newlisp-mode \"newlisp\" \"Turn on NewLisp mode\" t) + (turn-on-font-lock) + +=> Newlisp is started with the Emacs command M-x newlisp-mode." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install +} + +op=$1 +shift + +$op $* diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD new file mode 100644 index 000000000..ff321ea02 --- /dev/null +++ b/pcr/freeipmi/PKGBUILD @@ -0,0 +1,49 @@ +# http://github.com/fukawi2/aur-packages +# Contributor: Nathan Owe <ndowens04 at gmail> +# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> +# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> + +pkgname=freeipmi +pkgver=1.2.3 +pkgrel=1 +pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/freeipmi/" +license=('GPL') +depends=('libgcrypt') +options=('!libtool') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --infodir=/usr/share/info + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir/ install + + # Move init scripts and config to Arch paths + mv $pkgdir/etc/init.d $pkgdir/etc/rc.d + mv $pkgdir/etc/sysconfig $pkgdir/etc/conf.d + + # Fix references to 'init.d' and 'sysconfig' + sed -e 's|/etc/init.d/|/etc/rc.d/|g' \ + -e 's|/etc/rc.d/init.d/functions|/etc/rc.d/functions|g' \ + -i $pkgdir/etc/rc.d/* + sed -e 's|CONFFILE=/etc/sysconfig/bmc-watchdog|CONFFILE=/etc/cond.f/bmc-watchdog|g' \ + -i $pkgdir/etc/rc.d/bmc-watchdog + + rm -Rf $pkgdir/usr/share/info/dir +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ipmitool/PKGBUILD b/pcr/ipmitool/PKGBUILD new file mode 100644 index 000000000..38d4eb237 --- /dev/null +++ b/pcr/ipmitool/PKGBUILD @@ -0,0 +1,18 @@ +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmitool +pkgver=1.8.11 +pkgrel=1 +pkgdesc="Command-line interface to IPMI-enabled devices" +arch=(i686 x86_64) +url="http://ipmitool.sourceforge.net" +depends=('glibc' 'bash' 'openssl') +license=("BSD") +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --with-kerneldir + make || return 1 + make DESTDIR=${startdir}/pkg install +} diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD new file mode 100644 index 000000000..132ea7c59 --- /dev/null +++ b/pcr/ipmiutil/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: goodmen <goodmenlinux@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributors: champus, madeye, Ranguvar and ninja_pt +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmiutil +pkgver=2.7.5 +pkgrel=1 +pkgdesc="A simple program that lists results from the hardware detection library." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/ipmiutil/" +license=('BSD2.0') +depends=('') +makedepends=('openssl') +options=('!emptydirs') +source=("http://prdownloads.sourceforge.net/ipmiutil/ipmiutil-${pkgver}.tar.gz") + +build() { + cd ${srcdir} + tar -xf ${pkgname}-${pkgver}.tar.gz + + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --enable-gpl + make -j1 || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD new file mode 100644 index 000000000..372243b2a --- /dev/null +++ b/pcr/libav-builder/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +static=false +pkgbase=libav +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + pkgname=libav-static-builder +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + pkgname=libav-builder +fi +pkgflag=builder +pkgver=0.8.4 +pkgrel=1 +pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" +arch=any +url="http://$pkgbase.org/" +license=GPL +depends=${pkgname%-$pkgflag}=$pkgver +conflicts=( + ffmpeg + ffmpeg-static +) +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + conflicts+=( + ${pkgname%-static-$pkgflag} + ) +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + conflicts+=( + ${pkgname%-$pkgflag}-static + ) +fi + +package() { + install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} + include_list=$(ls /opt/${pkgname%-$pkgflag}/include) + for i in $include_list; do + ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include + done + lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) + for l in $lib_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib + done + pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) + for c in $pkgconfig_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig + done +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD new file mode 100644 index 000000000..ded1e6ca5 --- /dev/null +++ b/pcr/libnatpmp-from-social-repo/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Pierre Bourdon <delroth@gmail.com> + +pkgname=libnatpmp +pkgver=20120821 +pkgrel=1 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr/libnatpmp.html" +license=('BSD') +depends=('glibc') +makedepends=() +source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALLPREFIX="$pkgdir/usr" \ + INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install + + # Needed by some packages + install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD new file mode 100644 index 000000000..da47f927b --- /dev/null +++ b/pcr/luabind/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Jakob Gruber <jakob.gruber@gmail.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: rayte <rabyte.at.gmail.dot.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=luabind +pkgver=0.9.1 +pkgrel=3 +pkgdesc='A library that helps you create bindings between C++ and Lua' +arch=( + i686 + x86_64 + mips64el +) +url="http://www.rasterbar.com/products/$pkgname.html" +license=MIT +makedepends=( + boost + boost-build + unzip +) +depends=( + gcc-libs + lua51 +) +source=( + "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + ${pkgname}_boost.patch +) +md5sums=( + 8a323fb51d07dad5cfdb12c432793d55 + d62ae6fc635300bc659df9dbb587ac53 +) + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/${pkgname}_boost.patch + + # build luabind + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared +} + +package() { + cd $srcdir/$pkgname-$pkgver + + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared install + + # copy license + install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE \ + $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/luabind/luabind_boost.patch b/pcr/luabind/luabind_boost.patch new file mode 100644 index 000000000..92e32828a --- /dev/null +++ b/pcr/luabind/luabind_boost.patch @@ -0,0 +1,59 @@ +diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp +index 1b45ec1..8f5afff 100644 +--- luabind-0.9.1/luabind/detail/call_function.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp +@@ -323,7 +323,8 @@ namespace luabind + + #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -440,4 +441,5 @@ namespace luabind + + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp +index de8d563..e63555b 100644 +--- luabind-0.9.1/luabind/detail/call_member.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp +@@ -316,7 +316,8 @@ namespace luabind + + #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -360,4 +361,5 @@ namespace luabind + #undef LUABIND_TUPLE_PARAMS + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp +index d54c668..0f88cc5 100755 +--- luabind-0.9.1/luabind/wrapper_base.hpp ++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp +@@ -89,7 +89,8 @@ namespace luabind + + #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -188,3 +189,4 @@ namespace luabind + #undef N + + #endif ++#endif diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD index c3e5d6137..7e9a5323b 100755 --- a/pcr/mednafen-wip/PKGBUILD +++ b/pcr/mednafen-wip/PKGBUILD @@ -6,14 +6,12 @@ pkgbase=mednafen pkgname=mednafen-wip -pkgver=0.9.26 -_pkgver=422 -pkgrel=2 +pkgver=0.9.27 +_pkgver=441 +pkgrel=1 pkgdesc='A command-line multi-system gaming emulator, WIP version' url="http://$pkgbase.sourceforge.net/" -license=( - GPL -) +license=GPL arch=( i686 x86_64 @@ -32,26 +30,18 @@ makedepends=( mesa glu ) -provides=( - $pkgbase -) -conflicts=( - $pkgbase -) -source=( - 'http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' -) -sha1sums=( - e43c2b04b513af1db35933a2819d2660e7106600 -) +provides=$pkgbase +conflicts=$pkgbase +source='http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' +sha1sums=5be7597bb8fc9c47ae434d4a0aab16e13230b916 build() { cd $srcdir/$pkgbase - ./configure --prefix=/usr - make + setarch $CARCH ./configure --prefix=/usr + setarch $CARCH make } package() { cd $srcdir/$pkgbase - make DESTDIR=$pkgdir install + setarch $CARCH make DESTDIR=$pkgdir install } diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD new file mode 100644 index 000000000..0a7209f0b --- /dev/null +++ b/pcr/mosquitto/PKGBUILD @@ -0,0 +1,34 @@ +# This is the PKGBUILD for mosquitto, an MQTT broker and example clients +# Maintainer: Dan Anderson <dan-anderson@cox.net> +# Contributor: Gordon JC Pearce <gordon@gjcp.net> + +pkgname=mosquitto +pkgver=1.1 +pkgrel=1 +pkgdesc="An MQTT broker and clients" +arch=(i686 x86_64 mips64el) +url="http://mosquitto.org/" +makedepends=('python') +optdepends=('python: python support') +license=('BSD') +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('ab51f64eb3f0041402073aa7865f3ec4' + '76fbc38a2eb0b8110caf7ac1f43d4057') + +build() { + cd "$srcdir/$pkgname-$pkgver" +# Remove hardcoded prefix + find -name Makefile -exec sed '/prefix=/d' -i {} \; + + make prefix=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr DESTDIR="$pkgdir/" install + + install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 LICENSE-3rd-party.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/newlisp/PKGBUILD b/pcr/newlisp/PKGBUILD new file mode 100644 index 000000000..a53106390 --- /dev/null +++ b/pcr/newlisp/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: scrawler <scrawler@gmail.com> +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=newlisp +pkgver=10.4.5 +pkgrel=1 +pkgdesc="newLISP is a LISP like, general purpose scripting language." +url="http://www.newlisp.org" +license=('GPL') +arch=('x86_64' 'i686') +depends=('readline') +optdepends=('openjdk6') +options=('docs') +source=(http://newlisp.org/downloads/$pkgname-$pkgver.tgz) +install=$pkgname.install + +build() { +cd $srcdir/$pkgname-$pkgver +./configure +[ $CARCH = "x86_64" ] && make -f makefile_linuxLP64_utf8 +[ $CARCH = "i686" ] && make -f makefile_linux_utf8 +install -d $pkgdir/usr/bin +install -d $pkgdir/usr/share/man/man1 +make bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man \ +datadir=$pkgdir/usr/share install +} diff --git a/pcr/newlisp/newlisp.install b/pcr/newlisp/newlisp.install new file mode 100644 index 000000000..2c7fd8481 --- /dev/null +++ b/pcr/newlisp/newlisp.install @@ -0,0 +1,20 @@ +pre_install() { + rm /usr/bin/newlisp +} + +post_install() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_upgrade() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + +post_upgrade() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_remove() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + diff --git a/pcr/pmount/PKGBUILD b/pcr/pmount/PKGBUILD new file mode 100644 index 000000000..a35dc01c8 --- /dev/null +++ b/pcr/pmount/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=pmount +pkgver=0.9.23 +pkgrel=5 +pkgdesc="mount removable devices as normal user" +arch=(i686 x86_64) +license=('GPL2') +url="http://pmount.alioth.debian.org/" +backup=('etc/pmount.allow') +depends=('sysfsutils>=2.0.0-1' 'util-linux') +makedepends=('intltool') +source=( + https://alioth.debian.org/frs/download.php/3310/${pkgname}-${pkgver}.tar.bz2 + 'http://anonscm.debian.org/gitweb/?p=pmount/pmount-debian.git;a=blob_plain;f=debian/completion/pmount') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-hal \ + --with-cryptsetup-prog=/usr/sbin/cryptsetup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 ${srcdir}/pmount ${pkgdir}/usr/share/bash-completion/completions/pmount +} +md5sums=('db19f5bf3151b1b41705ec7bafa439d3' + '224f24127f8ab3605de8b9bcb433882f') diff --git a/pcr/python-renpy/ChangeLog b/pcr/python-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR <alexanderr at gmx dot com> + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python-renpy/PKGBUILD b/pcr/python-renpy/PKGBUILD new file mode 100644 index 000000000..f7c16e9b9 --- /dev/null +++ b/pcr/python-renpy/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> +# Contributor: zhn <zhangn1985 AT gmail com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=python-renpy +pkgver=6.14.1 +pkgrel=2 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=('i686' 'x86_64' 'mips64el') +license=('MIT') +url='http://www.renpy.org/' +depends=('ffmpeg' 'fribidi' 'glew' 'python2-pygame' 'mesa') +options=(!buildflags) +conflicts=("renpy<$pkgver" 'renpy64' 'renpy-bin') +# python-argparse is part of distribution since 2.7 +makedepends=('python2>=2.7' 'cython') +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-${pkgver}-source.tar.bz2" + python2.diff + renpy.diff) + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + '19b861f4d934bfea817c161bf3ea1142' + '14f789d847dbd4278a2d5d74ab551e2d') + +build() { + cd "$srcdir"/renpy-${pkgver}-source + + #patch -p1 < ../python2.diff + patch -Rp1 < ../renpy.diff + + CFLAGS=-Os python2 module/setup.py build +} + +package(){ + cd "$srcdir"/renpy-${pkgver}-source + + # install python-renpy + CFLAGS=-Os python2 module/setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/pcr/python-renpy/python2.diff b/pcr/python-renpy/python2.diff new file mode 100644 index 000000000..c1e68d87e --- /dev/null +++ b/pcr/python-renpy/python2.diff @@ -0,0 +1,8 @@ +--- a/module/setup.py.orig 2011-09-06 07:50:08.000000000 +0800 ++++ b/module/setup.py 2011-09-16 18:38:42.187110252 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import platform + import sys diff --git a/pcr/python-renpy/renpy.diff b/pcr/python-renpy/renpy.diff new file mode 100644 index 000000000..89a6b8c05 --- /dev/null +++ b/pcr/python-renpy/renpy.diff @@ -0,0 +1,20 @@ +diff -aur renpy-6.14.1-source.new/module/ffdecode.c renpy-6.14.1-source/module/ffdecode.c +--- renpy-6.14.1-source.new/module/ffdecode.c 2012-08-28 16:49:27.217523406 +1100 ++++ renpy-6.14.1-source/module/ffdecode.c 2012-08-26 15:28:30.000000000 +1100 +@@ -1152,6 +1152,7 @@ + AVFormatContext *ic; + int err, i, ret, video_index, audio_index; + AVPacket pkt1, *pkt = &pkt1; ++ AVFormatParameters params, *ap = ¶ms; + int codecs_locked = 0; + + // url_set_interrupt_cb(decode_interrupt_cb); +@@ -1161,6 +1162,8 @@ + is->video_stream = -1; + is->audio_stream = -1; + ++ memset(ap, 0, sizeof(*ap)); ++ + is->io_context = rwops_open(is->rwops); + + codecs_locked = 1; diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python2-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR <alexanderr at gmx dot com> + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD new file mode 100644 index 000000000..4d6611548 --- /dev/null +++ b/pcr/python2-renpy/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> +# Contributor: zhn <zhangn1985 AT gmail com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=python2-renpy +pkgflag=renpy +pkgver=6.14.1 +pkgrel=3 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=( + i686 + x86_64 + mips64el +) +license=MIT +url="http://www.$pkgflag.org/" +depends=( + fribidi + glew + libav + libgl + python2-pygame +) +# python-argparse is part of distribution since 2.7 +makedepends=( + cython2 + libav-builder # to solve libav deps + mesa + 'python2>=2.7' +) +options=!buildflags +provides="python-$pkgflag=$pkgver" +conflicts=( + python-$pkgflag + "$pkgflag<$pkgver" + $pkgflag64 + $pkgflag-bin +) +renplaces=python-$pkgflag +changelog=ChangeLog +source=( + "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" +) + +md5sums=( + 16814530ba9ce1f2968bb8c8c785651b +) + +build() { + cd $srcdir/$pkgflag-$pkgver-source + + sed -i -e ' + s#!/usr/bin/env python#!/usr/bin/env python2#; + ' module/setup.py + + CFLAGS=-Os setarch $CARCH python2 module/setup.py build +} + +package(){ + cd $srcdir/$pkgflag-$pkgver-source + + # install python2-$pkgflag + CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog new file mode 100644 index 000000000..566d97fa9 --- /dev/null +++ b/pcr/renpy/ChangeLog @@ -0,0 +1,30 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + removed optdepends. + removed jedit-external.diff (does not work anymore). + +2012-23-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + Added notice abot RENPY_BASE usage to renpy.install. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + +2012-16-03 AlexanderR <alexanderr at gmx dot com> + + * 6.13.9-1 : + re-split package python-renpy into two. added ChangeLog. + added jedit-external.diff to split jedit into optdepends. + added profile.d scripts to export RENPY_BASE. + added icon, launcher script and .desktop file. + creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy. diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD new file mode 100644 index 000000000..89c07a433 --- /dev/null +++ b/pcr/renpy/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> + +pkgname=renpy +pkgver=6.14.1 +pkgrel=1 +pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." +arch=('any') +license=('MIT') +url='http://www.renpy.org/' +# is ttf-dejavu required by renpy or games itself? +depends=("python-renpy=$pkgver" 'ttf-dejavu') +options=(!strip !zipman) +conflicts=('renpy-bin' 'renpy64') +replaces=('renpy64') +install=renpy.install +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" + "${pkgname}.desktop" + "${pkgname}."{sh,csh} + 'python2.diff' + 'renpy-launcher.sh') + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + 'a9beb35fa6c6d8af7ba5d2a764c33158' + 'd206d24b78e207a2c3b603fef14ac47f' + '8b9922e26e567248a2a5adc1d0cdfdd4' + '0476b16220e6faeb031e1dbfe45249b4' + 'dfa92cdecc15e5c1ddee387fbbbb2d9c') + +build() { + cd "$srcdir/renpy-$pkgver-source" + + patch -p1 < ../python2.diff + + # fonts are provided by ttf-dejavu + rm common/DejaVuSans.ttf common/DejaVuSans.txt +} + +package(){ + mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d} + + cd "$srcdir" + + install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d" + install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname" + install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop" + + cd renpy-$pkgver-source + + cp -r launcher renpy common renpy.py template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial} + chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial} +} diff --git a/pcr/renpy/python2.diff b/pcr/renpy/python2.diff new file mode 100644 index 000000000..9153659a2 --- /dev/null +++ b/pcr/renpy/python2.diff @@ -0,0 +1,8 @@ +--- renpy-6.13.9/renpy.py 2012-01-16 01:48:05.000000000 +1100 ++++ renpy-6.13.9.new/renpy.py 2012-03-16 05:36:41.406170787 +1100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + #@PydevCodeAnalysisIgnore + # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us> + # diff --git a/pcr/renpy/renpy-launcher.sh b/pcr/renpy/renpy-launcher.sh new file mode 100644 index 000000000..605c0c1fd --- /dev/null +++ b/pcr/renpy/renpy-launcher.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +mkdir -p ~/renpy_projects +cd ~/renpy_projects +exec env python2 -OO /usr/share/renpy/renpy.py "$@" diff --git a/pcr/renpy/renpy.csh b/pcr/renpy/renpy.csh new file mode 100644 index 000000000..71269b48c --- /dev/null +++ b/pcr/renpy/renpy.csh @@ -0,0 +1 @@ +setenv RENPY_BASE /usr/share/renpy/ diff --git a/pcr/renpy/renpy.desktop b/pcr/renpy/renpy.desktop new file mode 100644 index 000000000..5cd64ea94 --- /dev/null +++ b/pcr/renpy/renpy.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Ren'Py +GenericName= renpy +GenericName[fr]= renpy +Comment=A programming language and runtime, intended to ease the creation of visual-novel type games. +Comment[fr]=Un langage de programmation et un excutable conus pour faciliter la cration de jeux de type "visual-novel" +Icon=renpy.png +Exec=renpy +Categories=Game;AdventureGame; + diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install new file mode 100644 index 000000000..9630a255f --- /dev/null +++ b/pcr/renpy/renpy.install @@ -0,0 +1,21 @@ +post_install() { + ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc" + + cat << EOF +This package sets global environment variable RENPY_BASE, forcing all RenPy +games, including incompatible ones, to use system-wide interpreter. Undefine +this variable to launch games, you downloaded somewhere, with their built-in +versions of interpreter. + +To run two example games: The Question and RenPy Tutorial you should be +member of "games" group. +EOF +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm "/usr/share/renpy/doc" +} diff --git a/pcr/renpy/renpy.sh b/pcr/renpy/renpy.sh new file mode 100644 index 000000000..32b2e6d29 --- /dev/null +++ b/pcr/renpy/renpy.sh @@ -0,0 +1 @@ +export RENPY_BASE=/usr/share/renpy/ diff --git a/pcr/yabause-svn/PKGBUILD b/pcr/yabause-svn/PKGBUILD new file mode 100644 index 000000000..e8996aa3a --- /dev/null +++ b/pcr/yabause-svn/PKGBUILD @@ -0,0 +1,39 @@ +pkgname=yabause-svn +pkgver=3010 +pkgrel=1 +pkgdesc="A Sega Saturn emulator. (svn)" +arch=(i686 x86_64) +license=("GPL") +depends=(gtkglext sdl freeglut glu) +makedepends=(subversion mesa) +url="http://yabause.org/" +conflicts=(yabause yabause-qt yabause-qt-svn) +provides=(yabause) +_svntrunk="https://yabause.svn.sourceforge.net/svnroot/yabause/trunk" +_svnmod="yabause" + +build() { + cd "${srcdir}" + + if [ -d "${_svnmod}/.svn" ]; then + (cd "$_svnmod" && svn up -r $pkgver) + else + svn co "$_svntrunk" --config-dir ./ -r $pkgver $_svnmod + fi + + msg 'SVN checkout done or server timeout' + + rm -rf "${_svnmod}-build" + cp -r "$_svnmod" "${_svnmod}-build" + cd "${_svnmod}-build/yabause" + + ./autogen.sh + ./configure --prefix=/usr LIBS="-lm" + make +} + +package() { + cd "${srcdir}/${_svnmod}-build/yabause" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD new file mode 100644 index 000000000..255dee266 --- /dev/null +++ b/pcr/yabause/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Anton Shestakov <engored*ya.ru> +# Contributor: Tiago Camargo <tcamargo@gmail.com> +# Contributor: robb_force <robb_force@holybuffalo.net> +pkgname=yabause +pkgver=0.9.11.1 +pkgrel=1 +pkgdesc='A Sega Saturn emulator.' +url='http://yabause.org/' +license=('GPL') +arch=('i686' 'x86_64') +depends=('gtkglext' 'sdl' 'freeglut' 'glu') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('86c728fe3efda655a28c645714e4b8f4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr LIBS="-lm" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} |
