diff options
658 files changed, 12273 insertions, 20969 deletions
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index 54a1595d5..cd0bef8a8 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 92682 2013-06-12 04:38:43Z bgyorgy $ +# $Id: PKGBUILD 94510 2013-07-25 21:57:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Ner0 pkgname=activity-log-manager -pkgver=0.9.5 +pkgver=0.9.7 pkgrel=1 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/activity-log-manager" license=('GPL2') -depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') +depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) -md5sums=('460b4439798badbf4ba4b76b31cc1d03' - '6167df74ce44659aa94a89f31ff4d351') + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz) +md5sums=('d886be32db0fa351aaf0eb59912ee377' + 'f7a284bca152011500cb845aebad8d14') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,6 +25,8 @@ build() { mv -f -t po ../po/* printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS + rm src/activity_log_manager_vala.stamp + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } diff --git a/community/algol68g/PKGBUILD b/community/algol68g/PKGBUILD new file mode 100644 index 000000000..00b2e8305 --- /dev/null +++ b/community/algol68g/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 94260 2013-07-18 11:12:21Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: karolina.lindqvist@kramnet.se + +pkgname=algol68g +pkgver=2.7 +pkgrel=1 +pkgdesc='Algol 68 Genie, an Algol 68 compiler-interpreter' +arch=('x86_64' 'i686') +url='http://www.xs4all.nl/~jmvdveer/algol.html' +license=('GPL') +depends=('gsl' 'plotutils') +optdepends=('postgresql-libs: for postgresql support') +source=("http://jmvdveer.home.xs4all.nl/algol68g-$pkgver.tar.gz" + 'plotutils.patch' + 'http://www.xs4all.nl/~jmvdveer/a68gdoc.pdf') +sha256sums=('ebcf029ae65ceafca87090cc470dd37f86ac0bdb1529cd4dd7a92454d224d325' + '50afcc7812d117e5f0a2f5240c9cd58f8bfcc04b3da0634b9aa0ab06183ed0aa' + '8cbfb480cb5dfb20f79c2391d7111fc8b727c3e9e02008ab4c0cde9acb62e7d3') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../plotutils.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" docdir="/usr/share/doc/$pkgname" install + install "$srcdir/a68gdoc.pdf" "$pkgdir/usr/share/doc/$pkgname" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/algol68g/plotutils.patch b/community/algol68g/plotutils.patch new file mode 100644 index 000000000..17c750075 --- /dev/null +++ b/community/algol68g/plotutils.patch @@ -0,0 +1,20 @@ +--- ./source/plotutils.c.orig 2012-04-05 00:44:52.000000000 +0200 ++++ ./source/plotutils.c 2012-04-28 05:27:04.000000000 +0200 +@@ -1018,7 +1018,7 @@ + X_COORD (&DEVICE (f)) = 0; + Y_COORD (&DEVICE (f)) = 0; + return (PLOTTER (&DEVICE (f))); +- } else if (!strcmp (device_type, "gif")) { ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { + /*------------------------------------+ + | Supported plotter type - pseudo GIF | + +------------------------------------*/ +@@ -1059,7 +1059,7 @@ + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black"); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no"); +- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); ++ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); + if (PLOTTER (&DEVICE (f)) == NULL) { + diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN); + exit_genie (p, A68_RUNTIME_ERROR); diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD new file mode 100644 index 000000000..b7a2597d2 --- /dev/null +++ b/community/argyllcms/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 94940 2013-08-01 12:47:25Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) + +pkgname=argyllcms +_pkgname=Argyll +pkgver=1.5.1 +_pkgver="V${pkgver}" +pkgrel=2 +pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" +arch=(i686 x86_64) +depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr') +makedepends=('ftjam' 'zip' 'unzip') +source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) +url="http://www.argyllcms.com/" +license=("GPL" "AGPL") +install=${pkgname}.install +md5sums=('a708364bb389a157b78c1e219c00985a') + +build() { + cd "${srcdir}"/${_pkgname}_${_pkgver} + echo "***running makeall.sh***" + sh ./makeall.sh + echo "***running makeinstall.sh***" + sh ./makeinstall.sh + echo "***running makepackagebin.sh***" + sh ./makepackagebin.sh + rm "${srcdir}"/${_pkgname}_${_pkgver}/bin/License.txt + rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/License.txt + rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/afiles + rm "${srcdir}"/${_pkgname}_${_pkgver}/doc/afiles +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + install -m755 "${srcdir}"/${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin + mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref + # Because there is just html documentation we have to move it + mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc + mkdir -p "${pkgdir}"/usr/lib/udev/rules.d + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + sed -i 's|IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + +# As mentioned in https://bugzilla.redhat.com/show_bug.cgi?id=859244 and https://bbs.archlinux.org/viewtopic.php?id=155589 +# I've commented out the line: +# IMPORT{program}="usb-db %p" +# to prevent the error messages: +# systemd-udevd[242]: failed to execute '/usr/lib/udev/usb-db'... +EOF +} + +# vim:set ts=2 sw=2 et: diff --git a/community/argyllcms/argyllcms.install b/community/argyllcms/argyllcms.install new file mode 100644 index 000000000..2f001309b --- /dev/null +++ b/community/argyllcms/argyllcms.install @@ -0,0 +1,39 @@ +post_install() { + cat << EOF + +NOTE for argyllcms: +---- + ==> The documentaion is only available as html! + ==> You will find it in /usr/share/argyllcms/doc + ==> Color charts located in /usr/share/argyllcms/ref + ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! +EOF + +/usr/sbin/groupadd plugdev &> /dev/null +RETVAL=$? +if [ $RETVAL -eq 0 ] ; then + /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" +elif [ $RETVAL -eq 9 ] ; then + /bin/echo "==> Please add your argyllcms user to plugdev group! <==" +else + /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" +fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD deleted file mode 100644 index d98a68cff..000000000 --- a/community/arm-elf-binutils/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 79080 2012-10-30 09:53:07Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=arm-elf-binutils -pkgver=2.23 -pkgrel=1 -_xprefix=/usr -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=(i686 x86_64 mips64el) -license=(GPL) -options=(!libtool) -url="http://sources.redhat.com/binutils" -depends=('glibc' 'zlib') -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz) -md5sums=('ed58f50d8920c3f1d9cb110d5c972c27') - -build() { - cd $srcdir/binutils-${pkgver} - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \ - --program-prefix=arm-elf- \ - --enable-shared \ - --disable-multilib \ - --with-lib-path=${_xprefix}/lib/binutils/arm-elf \ - --disable-nls \ - --target=arm-elf \ - --host=$CHOST \ - --build=$CHOST \ - --with-sysroot=/usr/$CHOST/arm-elf \ -# --with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/ - -# mkdir -p $pkgdir/${_xprefix}/lib/binutils -# sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c - - make configure-host - make tooldir=$pkgdir/${_xprefix} - make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install - - mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf - cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf - - rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}* - - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share -} diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD deleted file mode 100644 index 5627f8c6e..000000000 --- a/community/arm-elf-gcc-base/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $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.2 -pkgrel=1 -pkgdesc="The GNU Compiler Collection" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -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=('cc308a0891e778cfda7a151ab8a6e762') - -build() { - cd $srcdir/gcc-$pkgver - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - rm -rf build - mkdir build - cd build - - ../configure --prefix=/usr \ - --target=arm-elf \ - --enable-obsolete \ - --host=$CHOST \ - --build=$CHOST \ - --enable-shared --disable-nls --enable-languages=c --enable-multilib \ - --with-local-prefix=/usr/lib/arm-elf \ - --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ - --enable-softfloat \ - --with-float=soft \ - --with-newlib \ - --with-sysroot=/usr/$CHOST/arm-elf - - make all-gcc all-target-libgcc -} - -package() { - cd $srcdir/gcc-$pkgver/build - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - make DESTDIR=$pkgdir install-gcc install-target-libgcc - - rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* - rm -f $pkgdir/usr/share/man/man7/gfdl.7* - rm -f $pkgdir/usr/share/man/man7/gpl.7* - rm -rf $pkgdir/usr/share/info - - cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ - rm -rf $pkgdir/usr/libexec - - # strip it manually - strip $pkgdir/usr/bin/* 2>/dev/null || true - find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true -} diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index 108c360e6..cc8c7acc9 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,40 +1,44 @@ -# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $ +# $Id: PKGBUILD 94834 2013-07-31 01:12:04Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer pkgname=arpwatch pkgver=2.1a15 -pkgrel=11 +pkgrel=12 pkgdesc='Ethernet/FDDI station activity monitor' arch=('i686' 'x86_64' 'mips64el') url='ftp://ftp.ee.lbl.gov/' license=('BSD') depends=('libpcap' 'smtp-forwarder') source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz" + 'ethercodes.dat.xz' 'LICENSE' "$pkgname.service") md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' + '0a47a4e7a0f2ede5c8c7f22ec678fa72' '9359518c500562281e76cdb0b2fa9062' '43e2358ba0532da38e5296250a7fcfd8') prepare() { cd $pkgname-$pkgver # move arp database in /var/lib/arpwatch + # /var is used because arpwatch write its learned mac into this folder sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in # binary ownership to root sed -i 's/-\(o\|g\) bin/-\1 root/g' Makefile.in + # Update ethercodes with recent OUI. See gen_ethercodes.sh + cp -f "$srcdir/ethercodes.dat" ethercodes.dat } build() { cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin - make SENDMAIL=`which sendmail` + make SENDMAIL=/usr/bin/sendmail } package() { cd $pkgname-$pkgver - install -d -m 0755 "$pkgdir"/usr/{bin,share/man} + install -d -m 0755 "$pkgdir"/usr/{bin,share/man/man8} make DESTDIR="$pkgdir" install install-man # install ether prefix database install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat" diff --git a/community/arpwatch/ethercodes.dat.xz b/community/arpwatch/ethercodes.dat.xz Binary files differnew file mode 100644 index 000000000..1838c8194 --- /dev/null +++ b/community/arpwatch/ethercodes.dat.xz diff --git a/community/arpwatch/gen_ethercode.sh b/community/arpwatch/gen_ethercode.sh new file mode 100755 index 000000000..a5cdeeebe --- /dev/null +++ b/community/arpwatch/gen_ethercode.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright © 2013 Sébastien Luttringer + +# This script is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This script 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this script. If not, see <http://www.gnu.org/licenses/>. + +# Get and format official OUI +wget -O- 'http://standards.ieee.org/regauth/oui/oui.txt' | \ +sed -nr 's/[ \t]+(..)-(..)-(..)[ \t]+\(hex\)[ \t]+(.*)/\L\1:\2:\3\E\t\4/p' > ethercodes.dat + +# Add private OUI +cat >> ethercodes.dat <<EOF +52:54:00 QEMU Virtual NIC +b0:c4:20 Bochs Virtual NIC +de:ad:ca PearPC Virtual NIC +00:ff:d1 Cooperative Linux virtual NIC +EOF + +# Sort and compress +sort ethercodes.dat | xz -9 > ethercodes.dat.xz +rm ethercodes.dat diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD index d6b032ec1..0937e7713 100644 --- a/community/astromenace/PKGBUILD +++ b/community/astromenace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81338 2012-12-18 09:30:27Z svenstaro $ +# $Id: PKGBUILD 94294 2013-07-18 23:41:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Ivan Bobrov <ibobrik at gmail dot com> # Contributor: Black_Mage <vleon1 at gmail dot com> pkgname=astromenace -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu' 'freetype2' 'libxinerama') makedepends=('cmake' 'mesa') source=(http://downloads.sourceforge.net/openastromenace/astromenace-src-$pkgver.tar.bz2 astromenace.desktop) -md5sums=('b2c69deed1708ec25d3fbec0b49f64d8' +md5sums=('a1481ca7cf498773fddc16a3b41c9b9b' '1edc9367564a6c639a2b8199adf26a08') build() { diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index d0c3377a0..6f27a9088 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92644 2013-06-10 11:55:07Z mtorromeo $ +# $Id: PKGBUILD 94856 2013-07-31 10:33:01Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.3 -pkgrel=3 +pkgrel=4 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64 mips64el) @@ -57,6 +57,8 @@ package() { etc/audit/*.conf \ etc/audisp/plugins.d/*.conf \ usr/lib/systemd/system/auditd.service + + chmod 644 usr/lib/systemd/system/auditd.service } sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' diff --git a/community/banner/PKGBUILD b/community/banner/PKGBUILD new file mode 100644 index 000000000..8720cb681 --- /dev/null +++ b/community/banner/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=banner +pkgver=1.3.2 +pkgrel=4 +pkgdesc="Print large banners to ASCII terminals" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +depends=('glibc') +makedepends=('shhmsg' 'shhopt') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('9bd1dc58d3bced525a19194b92d20217') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make INSTBASEDIR="$pkgdir"/usr/ INSTMANDIR="$pkgdir"/usr/share/man/man1/ install +} diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index f276cb230..1b292d09a 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92426 2013-06-05 07:49:55Z seblu $ +# $Id: PKGBUILD 94599 2013-07-27 17:55:53Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.3-P1 +_pkgver=9.9.3-P2 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='The ISC BIND nameserver' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('9e1a9e5e45685befce6b93d4fcfd63e50eaeb2cf' +sha1sums=('a0235692c488b3fadf54a15858b1f13ae2ab6979' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index f7fa72f0a..908af191a 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90843 2013-05-14 17:50:10Z seblu $ +# $Id: PKGBUILD 94704 2013-07-29 09:56:29Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.10 -pkgrel=4 +pkgver=1.3.11 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://bird.network.cz/' license=('GPL2') @@ -12,7 +12,7 @@ depends=('readline' 'ncurses') source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') -md5sums=('553c331b32bca9e926519cb2f67d68be' +md5sums=('8ad2eb997fb8251bc5b24cf32619571b' '01360e3b71ff2ed2223e87a3176e0659' 'b895b473cbc98cfd54751f737536eb1e') diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD index ec0182974..26072c4b7 100644 --- a/community/bti/PKGBUILD +++ b/community/bti/PKGBUILD @@ -1,35 +1,29 @@ -# $Id: PKGBUILD 67521 2012-03-13 02:14:29Z kchen $ +# $Id: PKGBUILD 94095 2013-07-14 11:36:26Z jlichtblau $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: uvok <uvok at online dot de> # Contributor: Urist <9362773 at gmail.com> pkgname=bti -pkgver=032 -pkgrel=3 +pkgver=033 +pkgrel=1 pkgdesc='Console client for Twitter and identi.ca' arch=('i686' 'x86_64' 'mips64el') url='http://gregkh.github.com/bti/' license=('GPL') -depends=('pcre' 'libxml2' 'curl' 'liboauth') +depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c') makedepends=('git') +source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753') build() { - local _gitroot='git://github.com/gregkh/bti.git' - git clone ${_gitroot} - - cd bti - git checkout ${pkgver} - - ./autogen.sh - - ./configure \ - --prefix=/usr + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr make } package() { - cd bti + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 29ca00f84..e729f3b0c 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92187 2013-06-02 15:36:24Z bpiotrowski $ +# $Id: PKGBUILD 94869 2013-08-01 06:54:42Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> @@ -7,7 +7,7 @@ pkgname=cantata pkgver=1.0.3 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') @@ -17,6 +17,11 @@ install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") md5sums=('fd942d25127a7936efaf1fe887d66189') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' replaygain/ffmpeginput.cpp +} + build() { cd "$srcdir/$pkgname-$pkgver" mkdir build diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 79f03f0a4..35a4a7b7e 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89650 2013-05-01 05:38:53Z giovanni $ +# $Id: PKGBUILD 94187 2013-07-16 14:49:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.10 +pkgver=1.4.11 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3897/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5372e8593624dee837269bf86e4b8b06') +source=("https://alioth.debian.org/frs/download.php/file/3920/${pkgname}-${pkgver}.tar.bz2") +md5sums=('20e3d6f045c53707a597cbacb86b6c5b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,7 +21,6 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-twinserial - make } diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 22c4a7fa0..621dd71fa 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94016 2013-07-13 12:31:10Z svenstaro $ +# $Id: PKGBUILD 94870 2013-08-01 06:54:43Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" diff --git a/community/cegui/cegui-0.7.6-python-detection.patch b/community/cegui/cegui-0.7.6-python-detection.patch deleted file mode 100644 index e14cd812e..000000000 --- a/community/cegui/cegui-0.7.6-python-detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- acinclude.m4.original 2012-01-24 10:42:16.066632295 +0100 -+++ acinclude.m4 2012-01-24 10:43:15.800274030 +0100 -@@ -1411,7 +1411,7 @@ - if test x$ax_python_bin != x; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - AC_CHECK_HEADER([$ax_python_bin/Python.h], -- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], -+ [[ax_python_header="/usr/include/$ax_python_bin"]], - ax_python_header=no) - if test x$ax_python_lib != xno; then - if test x$ax_python_header != xno; then diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD index b851d61de..73aa6a72d 100644 --- a/community/chicken/PKGBUILD +++ b/community/chicken/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86291 2013-03-14 20:09:27Z arodseth $ +# $Id: PKGBUILD 94266 2013-07-18 13:14:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: <david@pako.st> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=chicken -pkgver=4.8.0.3 +pkgver=4.8.0.4 pkgrel=1 pkgdesc='Compiler for R5RS scheme, featuring handy extensions' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ url='http://call-cc.org/' license=('BSD') depends=('gcc') source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz") -sha256sums=('6a1414e6f35586e47d7f4470eaf1779a4f73dec664b14bebf8763dd804b399c3') +sha256sums=('cd6c4b05f76a6ac82ff32e8dbd53f7517a283bda32003c6b3baa0c6b24990fb2') build() { cd "$pkgname-$pkgver" diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 4d04747e3..dfd347d52 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92287 2013-06-03 14:08:59Z thestinger $ +# $Id: PKGBUILD 94253 2013-07-18 00:42:27Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -8,18 +8,18 @@ # Contributor: Elisamuel Resto <ryuji@simplysam.us> pkgname=chrony -pkgver=1.27 -pkgrel=4 +pkgver=1.28 +pkgrel=1 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64' 'mips64el') url="http://chrony.tuxfamily.org/" -options=(strip !emptydirs) +options=(strip emptydirs) license=('GPL') depends=('readline' 'libcap') backup=('etc/chrony.conf') source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) -sha256sums=('d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d' +sha256sums=('7adc34e77c5b5ffdf274adad54de503a34386f6b483c45e1a723751763c04364' 'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc') build() { @@ -35,7 +35,7 @@ package() { install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf" # Arch's kernel has enhanced RTC support, make chrony use it by default - sed -i '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \ + sed -i '/^! \(rtconutc\|rtcfile \/var\/lib\/chrony\/rtc\)$/ s/^! //' \ "$pkgdir/etc/chrony.conf" mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin" diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 753844d83..7b2b05a89 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92190 2013-06-02 15:47:25Z faidoc $ +# $Id: PKGBUILD 94121 2013-07-14 15:37:15Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') url="http://cinnamon.linuxmint.com/" @@ -15,7 +15,8 @@ depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' - 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat') + 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat' + 'gnome-panel') makedepends=('gnome-common' 'intltool') optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'cinnamon-screensaver: lock screen' @@ -24,14 +25,14 @@ optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'nemo: the official Cinnamon file manager (forked from Nautilus)') options=('!libtool' '!emptydirs') install=${pkgname}.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" "keyboard_applet.patch" "fix-control-center-check.patch" "gnome-3.8.patch" "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('4b6495c0294283e649e9e3fc5ae630c9d63cd6e8177bc3dfc29170f8d32efbc0' +sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e' @@ -39,10 +40,8 @@ sha256sums=('4b6495c0294283e649e9e3fc5ae630c9d63cd6e8177bc3dfc29170f8d32efbc0' 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') - - build() { - cd ${srcdir}/linuxmint-Cinnamon* + cd ${srcdir}/Cinnamon* # Python2 fix sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ @@ -81,6 +80,6 @@ build() { } package() { - cd ${srcdir}/linuxmint-Cinnamon* + cd ${srcdir}/Cinnamon* make DESTDIR="${pkgdir}" install } diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD index 9ef39fd88..2ac7218f2 100644 --- a/community/clinica/PKGBUILD +++ b/community/clinica/PKGBUILD @@ -1,36 +1,42 @@ -# $Id: PKGBUILD 88675 2013-04-21 22:16:41Z heftig $ +# $Id: PKGBUILD 94204 2013-07-16 17:21:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com> pkgname=clinica -pkgver=0.2.1 -pkgrel=6 +pkgver=0.3.0 +pkgrel=1 pkgdesc="Simple medical records manager" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/clinica-project" license=('GPL3') -depends=('libgee06' 'libpeas' 'dconf') -makedepends=('vala' 'intltool' 'python') +depends=('libgee06' 'libpeas' 'jansson' 'libsoup' 'librsvg' 'yelp') +makedepends=('cmake' 'vala' 'intltool') optdepends=('python2-gobject: for Agenzia del Farmaco plugin') install=clinica.install -source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" - vala-0.16.patch) -md5sums=('327ce50d20b0e56d3de57270eed2ad23' - 'cd619b85a1758aad846c06b11961c6a3') +options=('!makeflags') +source=("https://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") +md5sums=('dae10a4e10c7d148f05ae56d1b0ae47d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/vala-0.16.patch" + sed -i -e "s:-Werror=format-security:-Wformat -Werror=format-security:g" CMakeLists.txt sed -i 's@^#!.*python$@#!/usr/bin/python2@' plugins/AgenziaDelFarmaco.py - sed -i -e "s:Application;GTK;:Office;GTK;:g" clinica.desktop + sed -i -e "s:Application;GTK;:Office;GTK;:g" data/clinica.desktop - ./waf configure --prefix=/usr - LC_ALL=C LANG=C ./waf build + mkdir build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DGSETTINGS_COMPILE=OFF \ + -DGSETTINGS_COMPILE_IN_PLACE=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON .. + + LC_ALL=C LANG=C make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}/build" - ./waf --destdir="${pkgdir}" install - rm -rf ${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled + make DESTDIR="${pkgdir}" install } diff --git a/community/clinica/vala-0.16.patch b/community/clinica/vala-0.16.patch deleted file mode 100644 index fda32c1b2..000000000 --- a/community/clinica/vala-0.16.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -Naur clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala clinica-0.2.1/libclinica/DoctorContextMenu.vala ---- clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala 2011-11-30 13:42:30.000000000 +0100 -+++ clinica-0.2.1/libclinica/DoctorContextMenu.vala 2012-10-16 16:57:35.000000000 +0200 -@@ -22,7 +22,7 @@ - - namespace Clinica { - -- public class DoctorContextMenu : Menu { -+ public class DoctorContextMenu : Gtk.Menu { - - /** - * @brief The doctor associated to this popup menu -@@ -38,13 +38,13 @@ - /** - * @brief MenuItem associated to doctor deletion - */ -- private MenuItem delete_menuitem; -+ private Gtk.MenuItem delete_menuitem; - - /** - * @brief MenuItem that triggers doctor edit - * dialog. - */ -- private MenuItem edit_menuitem; -+ private Gtk.MenuItem edit_menuitem; - - private ResourceManager resource_manager; - -@@ -55,8 +55,8 @@ - - /* Create menu items, connect them to their callback - * and add it to the menu */ -- delete_menuitem = new MenuItem.with_label (_("Delete")); -- edit_menuitem = new MenuItem.with_label (_("Edit")); -+ delete_menuitem = new Gtk.MenuItem.with_label (_("Delete")); -+ edit_menuitem = new Gtk.MenuItem.with_label (_("Edit")); - - delete_menuitem.activate.connect (on_delete_menuitem_activated); - edit_menuitem.activate.connect (on_edit_menuitem_activated); -@@ -67,11 +67,11 @@ - show_all (); - } - -- private void on_delete_menuitem_activated (MenuItem item) { -+ private void on_delete_menuitem_activated (Gtk.MenuItem item) { - view.remove_selected_doctor (); - } - -- private void on_edit_menuitem_activated (MenuItem item) { -+ private void on_edit_menuitem_activated (Gtk.MenuItem item) { - var doctor_editor = new DoctorEditor.with_doctor (resource_manager, doctor); - doctor_editor.dialog.set_transient_for (resource_manager.user_interface.window); - doctor_editor.run (); -diff -Naur clinica-0.2.1.orig/libclinica/EventDetail.vala clinica-0.2.1/libclinica/EventDetail.vala ---- clinica-0.2.1.orig/libclinica/EventDetail.vala 2011-11-30 13:42:30.000000000 +0100 -+++ clinica-0.2.1/libclinica/EventDetail.vala 2012-10-16 16:55:51.000000000 +0200 -@@ -104,9 +104,9 @@ - */ - private bool on_button_press_event (Widget widget, EventButton event) { - if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { -- var popup_menu = new Menu (); -- var edit_menu_item = new MenuItem.with_label (_("Edit")); -- var remove_menu_item = new MenuItem.with_label (_("Remove")); -+ var popup_menu = new Gtk.Menu (); -+ var edit_menu_item = new Gtk.MenuItem.with_label (_("Edit")); -+ var remove_menu_item = new Gtk.MenuItem.with_label (_("Remove")); - - /* Connect callbacks for the item */ - edit_menu_item.activate.connect (on_edit_menu_item_activate); -@@ -125,7 +125,7 @@ - return false; - } - -- private void on_edit_menu_item_activate (MenuItem? item = null) { -+ private void on_edit_menu_item_activate (Gtk.MenuItem? item = null) { - var event_editor = new EventEditor (resource_manager, associated_event); - event_editor.set_transient_for (resource_manager.user_interface.calendar_window); - if (event_editor.run () == EventEditor.Response.SAVE) { -@@ -137,7 +137,7 @@ - event_editor.destroy (); - } - -- private void on_remove_menu_item_activate (MenuItem? item = null) { -+ private void on_remove_menu_item_activate (Gtk.MenuItem? item = null) { - var question = new MessageDialog (null, - DialogFlags.MODAL | DialogFlags.DESTROY_WITH_PARENT, - MessageType.QUESTION, ButtonsType.YES_NO, "%s", -diff -Naur clinica-0.2.1.orig/libclinica/PatientContextMenu.vala clinica-0.2.1/libclinica/PatientContextMenu.vala ---- clinica-0.2.1.orig/libclinica/PatientContextMenu.vala 2011-12-09 18:14:42.000000000 +0100 -+++ clinica-0.2.1/libclinica/PatientContextMenu.vala 2012-10-16 16:54:59.000000000 +0200 -@@ -26,7 +26,7 @@ - * @brief Menu to be displayed when a user right click on a patient - * in the TreeView - */ -- public class PatientContextMenu : Menu { -+ public class PatientContextMenu : Gtk.Menu { - - /* Patient where that user has right clicked on */ - Patient patient; -@@ -35,9 +35,9 @@ - PatientListView view; - - /* MENU ITEMS */ -- MenuItem edit_menuitem; -- MenuItem delete_menuitem; -- MenuItem view_visits_menuitem; -+ Gtk.MenuItem edit_menuitem; -+ Gtk.MenuItem delete_menuitem; -+ Gtk.MenuItem view_visits_menuitem; - - private ResourceManager resource_manager; - -@@ -48,13 +48,13 @@ - this.view = view; - - /* Instantiate menu items */ -- edit_menuitem = new MenuItem.with_label(_("Edit")); -+ edit_menuitem = new Gtk.MenuItem.with_label(_("Edit")); - edit_menuitem.activate.connect (on_edit_menuitem_activated); - -- delete_menuitem = new MenuItem.with_label(_("Delete")); -+ delete_menuitem = new Gtk.MenuItem.with_label(_("Delete")); - delete_menuitem.activate.connect(on_delete_menuitem_activated); - -- view_visits_menuitem = new MenuItem.with_label(_("Edit visits")); -+ view_visits_menuitem = new Gtk.MenuItem.with_label(_("Edit visits")); - view_visits_menuitem.activate.connect(on_view_visits_menuitem_activated); - - /* Append menuitems */ -@@ -65,18 +65,18 @@ - show_all (); - } - -- private void on_edit_menuitem_activated (MenuItem item) { -+ private void on_edit_menuitem_activated (Gtk.MenuItem item) { - var patient_editor = new PatientEditor.with_patient (resource_manager, patient); - patient_editor.dialog.set_transient_for (resource_manager.user_interface.window); - patient_editor.run(); - patient_editor.destroy (); - } - -- private void on_delete_menuitem_activated (MenuItem item) { -+ private void on_delete_menuitem_activated (Gtk.MenuItem item) { - view.remove_selected_patient (); - } - -- private void on_view_visits_menuitem_activated (MenuItem item) { -+ private void on_view_visits_menuitem_activated (Gtk.MenuItem item) { - resource_manager.user_interface.show_visit_window (patient); - } - } -diff -Naur clinica-0.2.1.orig/libclinica/UserInterface.vala clinica-0.2.1/libclinica/UserInterface.vala ---- clinica-0.2.1.orig/libclinica/UserInterface.vala 2011-12-09 19:15:27.000000000 +0100 -+++ clinica-0.2.1/libclinica/UserInterface.vala 2012-10-16 16:56:48.000000000 +0200 -@@ -216,7 +216,7 @@ - /* Menu item */ - - [CCode (instance_pos = -1)] -- public void on_new_patient_menu_item_activate (MenuItem item) { -+ public void on_new_patient_menu_item_activate (Gtk.MenuItem item) { - var new_patient_dialog = new PatientEditor (resource_manager); - new_patient_dialog.dialog.set_transient_for (window); - new_patient_dialog.run (); -@@ -224,7 +224,7 @@ - } - - [CCode (instance_pos = -1)] -- public void on_new_doctor_menu_item_activate (MenuItem item) { -+ public void on_new_doctor_menu_item_activate (Gtk.MenuItem item) { - var new_doc_dialog = new DoctorEditor (resource_manager); - new_doc_dialog.dialog.set_transient_for (window); - new_doc_dialog.run (); -@@ -232,22 +232,22 @@ - } - - [CCode (instance_pos = -1)] -- public void on_patient_menu_item_activate (MenuItem item) { -+ public void on_patient_menu_item_activate (Gtk.MenuItem item) { - show_patient_list_page (); - } - - [CCode (instance_pos = -1)] -- public void on_doctor_menu_item_activate (MenuItem item) { -+ public void on_doctor_menu_item_activate (Gtk.MenuItem item) { - show_doctor_list_page (); - } - - [CCode (instance_pos = -1)] -- public void on_home_menu_item_activate (MenuItem item) { -+ public void on_home_menu_item_activate (Gtk.MenuItem item) { - show_start_page(); - } - - [CCode (instance_pos = -1)] -- public void on_search_medicines_menu_item_activate (MenuItem item) { -+ public void on_search_medicines_menu_item_activate (Gtk.MenuItem item) { - set_page (medicine_search_page); - } - -@@ -260,7 +260,7 @@ - } - - [CCode (instance_pos = -1)] -- public void on_settings_menu_item_activate (MenuItem item) { -+ public void on_settings_menu_item_activate (Gtk.MenuItem item) { - if (settings_manager == null){ - settings_manager = new SettingsManager (resource_manager); - /* Dereference the window on release to make it be freed and -@@ -275,7 +275,7 @@ - } - - [CCode (instance_pos = -1)] -- public void on_help_menu_item_activate (MenuItem item) { -+ public void on_help_menu_item_activate (Gtk.MenuItem item) { - try { - Gtk.show_uri (this.window.get_screen (), "ghelp:clinica", Gdk.CURRENT_TIME); - } catch (GLib.Error e) { -diff -Naur clinica-0.2.1.orig/libclinica/VisitDetail.vala clinica-0.2.1/libclinica/VisitDetail.vala ---- clinica-0.2.1.orig/libclinica/VisitDetail.vala 2011-12-09 18:29:19.000000000 +0100 -+++ clinica-0.2.1/libclinica/VisitDetail.vala 2012-10-16 16:53:08.000000000 +0200 -@@ -87,10 +87,10 @@ - */ - private bool on_button_press_event (Widget widget, EventButton event) { - if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { -- var popup_menu = new Menu (); -+ var popup_menu = new Gtk.Menu (); - popup_menu.attach_to_widget (this, null); - -- var open_visit_menu_item = new MenuItem.with_label (_("Show details")); -+ var open_visit_menu_item = new Gtk.MenuItem.with_label (_("Show details")); - open_visit_menu_item.activate.connect (on_open_visit_menu_item_activate); - popup_menu.append (open_visit_menu_item); - -@@ -102,7 +102,7 @@ - return false; - } - -- private void on_open_visit_menu_item_activate (MenuItem? item = null) { -+ private void on_open_visit_menu_item_activate (Gtk.MenuItem? item = null) { - var visit_window = resource_manager.user_interface.show_visit_window (associated_visit.patient); - visit_window.select_visit (associated_visit); - } diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index db71c0a03..ef4c77b4b 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81962 2013-01-04 20:16:47Z bpiotrowski $ +# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z 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=2 +pkgrel=3 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 8c39b47cc..d335c87d2 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90210 2013-05-08 19:56:22Z giovanni $ +# $Id: PKGBUILD 94544 2013-07-26 15:55:51Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.6.2 +pkgver=0.6.4 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bf1d8055be76be704418df7fbc811a21') +md5sums=('072cb40a495e539661ea789131555f79') build() { cd "${srcdir}" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index ce74afe72..f2bbb332d 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93153 2013-06-26 11:50:34Z spupykin $ +# $Id: PKGBUILD 94303 2013-07-19 15:21:00Z 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,14 +6,14 @@ pkgname=darktable pkgver=1.2.2 _pkgver=1.2 -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' 'openexr' 'sqlite' 'libxslt' - 'libsoup' 'gtk-engines') + 'libsoup' 'gtk-engines' 'json-glib' 'flickcurl') makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 1c55c9bdd..3eb190db8 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 93423 2013-07-03 11:48:53Z spupykin $ +# $Id: PKGBUILD 94954 2013-08-01 13:33:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.0.3pre -pkgrel=2 +pkgver=3.1.2 +pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') -depends=('gmime24' 'libzdb' 'mhash' 'libevent') +depends=('gmime' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') @@ -21,8 +21,7 @@ backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) -#source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz -source=("$pkgname-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_0" +source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service @@ -32,7 +31,7 @@ source=("$pkgname-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_0" dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('SKIP' +md5sums=('905bf87cad4336e161b3d0d9cd5311bd' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' @@ -45,7 +44,8 @@ md5sums=('SKIP' build() { cd $srcdir/dbmail-${pkgver/_/-}/ - [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \ + [ -f Makefile ] || ./configure \ + --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-ldap --with-sieve make } diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD new file mode 100644 index 000000000..974ee5eb0 --- /dev/null +++ b/community/dispcalgui/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 94958 2013-08-01 14:04:59Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Cedric Girard <girard.cedric@gmail.com> +# Contributor: foxbunny <bg.branko@gmail.com> + +pkgname=dispcalgui +pkgver=1.2.7.0 +pkgrel=1 +pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" +arch=('i686' 'x86_64') +url="http://hoech.net/dispcalGUI/" +license=('GPL3') +makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'setuptools' 'xdg-utils') +depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy') +optdepends=('gksu: For running as root') +install=${pkgname}.install + +source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") + +md5sums=('a0ff80ee5e560fbe208c12189e00c470') + +package() { + cd "${srcdir}"/dispcalGUI-${pkgver} + + find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} + + + python2 setup.py install --root="${pkgdir}" --optimize=1 + + #udev rules are shipped with argyllcms + rm -rf "${pkgdir}"/etc/udev/ +} + +# vim:set ts=2 sw=2 et: diff --git a/community/dispcalgui/dispcalgui.install b/community/dispcalgui/dispcalgui.install new file mode 100644 index 000000000..9256fe5e3 --- /dev/null +++ b/community/dispcalgui/dispcalgui.install @@ -0,0 +1,19 @@ +# arg 1: the new package version +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade(){ + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + +# vim:set ts=2 sw=2 et: diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 765446bbe..3b6d117ea 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $ +# $Id: PKGBUILD 94163 2013-07-15 11:02:50Z 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=11 +pkgrel=12 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/distcc/" license=('GPL') -depends=('gcc' 'popt' 'avahi') -makedepends=('gtk2' 'pkgconfig' 'python2' 'dbus') +depends=('gcc' 'popt' 'avahi' 'dbus') +makedepends=('gtk2' 'pkgconfig' 'python2') optdepends=('gtk2: for distccmon-gnome' 'python2') backup=('etc/conf.d/distccd' diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD new file mode 100644 index 000000000..a4efe727a --- /dev/null +++ b/community/dnscrypt-proxy/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 94587 2013-07-27 15:21:05Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Techlive Zheng <techlivezheng at gmail dot com> +# Contributor: peace4all <markspost at rocketmail dot com> + +pkgname=dnscrypt-proxy +pkgver=1.3.2 +pkgrel=1 +pkgdesc="A tool for securing communications between a client and a DNS resolver" +arch=('i686' 'x86_64') +url="http://dnscrypt.org/" +license=('custom') +depends=(libsodium) +source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2 + conf.d.file + dnscrypt-proxy.service) +backup=(etc/conf.d/dnscrypt-proxy) + +build() { + cd "$srcdir/$pkgname-$pkgver" + CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --sbindir=/usr/bin + make -j2 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system} + install -m 644 COPYING "$pkgdir"/usr/share/licenses/$pkgname + install -m 644 AUTHORS NEWS README README.markdown "$pkgdir"/usr/share/doc/$pkgname + install -m 644 "$srcdir"/conf.d.file "$pkgdir"/etc/conf.d/$pkgname + install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system + rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include} +} + +sha512sums=('969219c5655ca7bcb8cbfb79d9dae9b27a79489bae7451e6e478ab5cee1bc22f0dc1758e9ff51ac2e80ec4230e6fe4eaba3a5ff98c3ddbde8d9dc24a51050bab' + '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61' + '33e8f95c38a10a9e05aadeb369616f6dfaa8b32bc28b9f8ab9ae29dfc3b03514442e7172b1f52c56665317b61cad7d130a0e1dc00d6aceaa59eb465e63d079bc') diff --git a/community/dnscrypt-proxy/conf.d.file b/community/dnscrypt-proxy/conf.d.file new file mode 100644 index 000000000..fae760f21 --- /dev/null +++ b/community/dnscrypt-proxy/conf.d.file @@ -0,0 +1,3 @@ +DNSCRYPT_LOCALIP=127.0.0.1 +DNSCRYPT_LOCALPORT=53 +DNSCRYPT_USER=nobody diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service new file mode 100644 index 000000000..5e30d888e --- /dev/null +++ b/community/dnscrypt-proxy/dnscrypt-proxy.service @@ -0,0 +1,20 @@ +[Unit] +Description=A tool for securing communications between a client and a DNS resolver. +After=network.target +# Only needed if you use pdnsd, other caching DNS servers can go here. Could be ignored too. +#Before=pdnsd.service + +[Service] +Type=forking +PIDFile=/var/run/dnscrypt-proxy.pid +EnvironmentFile=/etc/conf.d/dnscrypt-proxy +ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid +ExecStart=/usr/bin/dnscrypt-proxy --daemonize \ + --pidfile=/var/run/dnscrypt-proxy.pid \ + --logfile=/var/log/dnscrypt-proxy.log \ + --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \ + --user=${DNSCRYPT_USER} +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index cddc9f719..366cfdf1c 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,11 +1,11 @@ # vim:set ft=sh: -# $Id: PKGBUILD 93494 2013-07-04 12:38:35Z idevolder $ +# $Id: PKGBUILD 94328 2013-07-20 16:51:21Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') -pkgver=0.5.5 +pkgver=0.5.6 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -23,7 +23,7 @@ source=( "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434' +sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD index 6e13e2428..5585c5fc8 100644 --- a/community/ekg/PKGBUILD +++ b/community/ekg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56895 2011-10-16 06:24:00Z bpiotrowski $ +# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $ # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=ekg @@ -17,6 +17,9 @@ build() { sed -i 's#gg%s#ekg%s#' src/ekg.c ./configure --prefix=/usr --with-pthread --enable-aspell --with-python make +} + +package() { make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/include $pkgdir/usr/lib } diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 236515763..a15bad499 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,44 +1,51 @@ -# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $ +# $Id: PKGBUILD 94920 2013-08-01 07:01:09Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=6 -pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +pkgrel=7 +pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client' arch=('i686' 'x86_64' 'mips64el') url="http://ekg2.org/" license=('GPL') depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') optdepends=('xosd: xosd support' - 'sqlite: sqlite support' - 'gtk2: gtk support') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('68fc05b432c34622df6561eaabef5a40') + 'sqlite: sqlite support' + 'gtk2: gtk support') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz + ekg2-0.3.1-giflib5.patch) +md5sums=('68fc05b432c34622df6561eaabef5a40' + 'f3b6979e9b8705b0b9c7efd3f3a808fd') + +prepare() { + cd $pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + patch -Np1 -i ../ekg2-0.3.1-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - export PYTHON=/usr/bin/python2 #EKG2 isn't python3 friendly + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/ekg2 \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg \ - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/ekg2 \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg - make + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod - rm -rf "$pkgdir"/usr/libexec - chmod -R 755 "$pkgdir"/usr/lib/perl5 - chmod +s "$pkgdir"/usr/lib/ekg2/ioctld + rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod + rm -rf "$pkgdir"/usr/libexec + chmod -R 755 "$pkgdir"/usr/lib/perl5 + chmod +s "$pkgdir"/usr/lib/ekg2/ioctld } diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch new file mode 100644 index 000000000..f0e6885c0 --- /dev/null +++ b/community/ekg2/ekg2-0.3.1-giflib5.patch @@ -0,0 +1,12 @@ +diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c +--- a/plugins/gg/commands.c 2011-03-17 18:08:11.000000000 +0100 ++++ b/plugins/gg/commands.c 2013-07-29 18:45:51.296790942 +0200 +@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname, + goto err; + } + +- if (!(file = DGifOpenFileHandle(fd))) { ++ if (!(file = DGifOpenFileHandle(fd, NULL))) { + snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", + GifLastError()); + goto err2; diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index a997b5b3e..0889a4352 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94019 2013-07-13 12:31:42Z svenstaro $ +# $Id: PKGBUILD 94875 2013-08-01 06:54:49Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=9 +pkgrel=10 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 28eb735f7..c96ef752d 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.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ 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=('6d05a1ebe50fa2c00c03fa41195bdf48' +md5sums=('e0b3bde72fb416fd10550cac829758bd' 'SKIP') build() { diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD index 9bcbf8f96..e3dfa3770 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 90022 2013-05-06 19:36:51Z foutrelis $ +# $Id: PKGBUILD 94921 2013-08-01 07:01:11Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aectann <aectann@infoline.su> pkgname=fbv pkgver=1.0b -pkgrel=6 +pkgrel=7 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64' 'mips64el') url="http://s-tech.elsat.net.pl/fbv/" license=('GPL') depends=('libpng' 'libungif' 'libjpeg') -source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz) -md5sums=('3e466375b930ec22be44f1041e77b55d') +source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz + giflib-5.0.patch) +md5sums=('3e466375b930ec22be44f1041e77b55d' + '6310899c97c4226352ad409c1c7fefb3') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c + patch -Np1 -i ../giflib-5.0.patch make } diff --git a/community/fbv/giflib-5.0.patch b/community/fbv/giflib-5.0.patch new file mode 100644 index 000000000..462e2fb04 --- /dev/null +++ b/community/fbv/giflib-5.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/gif.c b/gif.c +--- a/gif.c 2003-08-24 22:23:02.000000000 +0200 ++++ b/gif.c 2013-07-30 10:27:55.851099159 +0200 +@@ -81,7 +81,7 @@ int fh_gif_load(char *name,unsigned char + ColorMapObject *cmap; + int cmaps; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL){printf("err5\n"); gflush;} ////////// + do + { +@@ -184,7 +184,7 @@ int fh_gif_getsize(char *name,int *x,int + int extcode; + GifRecordType rt; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL) gflush; + do + { diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index 22a6b7e6a..4eb6a5462 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 93398 2013-07-03 05:13:18Z fyan $ +# $Id: PKGBUILD 94202 2013-07-16 16:30:47Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-libpinyin -pkgver=0.3.0 -pkgrel=2 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit') makedepends=('cmake' 'intltool' 'wget') -source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz" - "https://github.com/fcitx/fcitx-libpinyin/commit/7a68b40e36bd3425dae847a3860057a951ec5e78.patch") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz") install=$pkgname.install build() { cd "$srcdir/${pkgname}-${pkgver}" - # Fix importdict - patch -p1 -i ../7a68b40e36bd3425dae847a3860057a951ec5e78.patch - rm -rf build mkdir build cd build @@ -36,5 +32,4 @@ package() { make DESTDIR="${pkgdir}" install } -sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762' - '0b4776d348db9616d9bd4485fe7950a5c88f349388a4dc97e0ec62beaf0d6729ba88c645b1f83d415af8c5808cde3aae4b8306fd65e21bd404e9a8105d5bcae0') +sha512sums=('3b7501a75dab2f5b83541c71ccac93709f3354f390f322d7b95e4b94e0c4dc6963522759ab52eb77203d787d6d14d3ce1c838dd92ecd0db041a3b7a25008eaa4') diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD index 5a76e66ec..6ab9ec328 100644 --- a/community/fcitx-rime/PKGBUILD +++ b/community/fcitx-rime/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 92965 2013-06-21 05:40:07Z fyan $ +# $Id: PKGBUILD 94200 2013-07-16 16:25:08Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-rime -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc='Fcitx Wrapper for librime' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') -depends=('fcitx>=4.2.7' "librime" "brise") +depends=('fcitx>=4.2.8.1' "librime" "brise") makedepends=('cmake') install=fcitx-rime.install -source=( - "http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz" -) +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { cd "$pkgname-$pkgver" @@ -31,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('81fd0c0b7bf55881b5cb1fc87dde19a4') +sha512sums=('4497cfdf38e6fd85e358b0c8b52efa21b54a8c46cf5f6a640ca1c1f91a30df2a2033f46eec2d123bfadf9c8c58e4b8f6ec96b1564d32b2b8157261ca14a2855b') diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD index 965ae4fee..a68aa82b1 100644 --- a/community/fcitx-unikey/PKGBUILD +++ b/community/fcitx-unikey/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 93372 2013-07-02 09:47:28Z fyan $ +# $Id: PKGBUILD 94198 2013-07-16 16:15:47Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-unikey -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Fcitx Wrapper for unikey" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') -depends=('fcitx>=4.2.7') +depends=('fcitx>=4.2.8') optdepends=('qt4: To run the fcitx unikey macro editor') makedepends=('cmake' 'qt4') source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") install=fcitx-unikey.install -build(){ - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 .. - make +build() { + cd "$srcdir/${pkgname}-${pkgver}" + mkdir -p build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 .. + make } -package () -{ - cd "$srcdir/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install } -sha512sums=('8349623c196ec7c4e48e64d07ef551a308f71f2bfc09fcd320bb02854a77370169b94131750dfcf065dd2a9c734c86048f482d0d2f0b210a1834ab77ea3bf1aa') +sha512sums=('71a0773222b1172943f80bce904da77c136225981a0580d937327829c8d734fc65d9c4afa5275bd210ca837d7a7b9d8bfb18df96f62710068b9883a22499fbfb') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 1f6d9ea22..e4a06047b 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,35 +1,21 @@ -# $Id: PKGBUILD 93582 2013-07-06 12:35:20Z fyan $ +# $Id: PKGBUILD 94235 2013-07-17 12:26:33Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') -pkgver=4.2.8 -pkgrel=3 +pkgver=4.2.8.1 +pkgrel=2 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://fcitx-im.org" license=('GPL') makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \ 'iso-codes' 'gobject-introspection' 'libxkbfile') -source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz - https://github.com/fcitx/fcitx/commit/b0a5439ac0188211c0955baf6811a0e3406ac812.patch - https://github.com/fcitx/fcitx/commit/94635187b18badb1a2dff821de9a30a20d00feb1.patch - https://github.com/fcitx/fcitx/commit/46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch) +source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz) build() { - #source /etc/profile.d/qt4.sh - - cd "$srcdir/$pkgbase-$pkgver" - - # Fix ELF file patch - patch -p1 -i ../b0a5439ac0188211c0955baf6811a0e3406ac812.patch - - # Fix switch key issue - patch -p1 -i ../94635187b18badb1a2dff821de9a30a20d00feb1.patch - patch -p1 -i ../46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch - cd "$srcdir" mkdir -p build cd build @@ -69,11 +55,14 @@ package_fcitx() { 'fcitx-gtk2: GTK2 IM Module for fcitx' 'fcitx-gtk3: GTK3 IM Module for fcitx' 'fcitx-hangul: Hangul (Korean) support for fcitx' + 'fcitx-kkc: libkkc (Japanese Kana Kanji input method) engine 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-qt4: QT4 IM Module for fcitx' + 'fcitx-qt5: QT5 IM Module for fcitx' 'fcitx-rime: Rime input method engine (Traditional Chinese)' + 'fcitx-sayura: Sinhala Transe IME engine for fcitx' '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' @@ -129,7 +118,4 @@ package_fcitx-qt4() { make DESTDIR="${pkgdir}" install } -md5sums=('79676d18536ebb9d0a0fa47e96416016' - '0f3f85204ac1559bbf2cff304122234e' - '417cd212d9fb7b9881232d57d023e49f' - 'd91ae8316154eccce3234c55e53a3c3b') +sha512sums=('981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72') diff --git a/community/fcitx/fcitx-gtk2.install b/community/fcitx/fcitx-gtk2.install index e99de41ed..6fd3be681 100644 --- a/community/fcitx/fcitx-gtk2.install +++ b/community/fcitx/fcitx-gtk2.install @@ -1,5 +1,5 @@ post_install() { - /usr/bin/gtk-query-immodules-2.0 --update-cache + usr/bin/gtk-query-immodules-2.0 --update-cache } post_upgrade() { diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD index 96fa9f3fd..a34f737d2 100644 --- a/community/ffmpeg-compat/PKGBUILD +++ b/community/ffmpeg-compat/PKGBUILD @@ -1,62 +1,79 @@ # $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-compat -pkgver=20120509 -pkgrel=3 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +pkgver=0.10.8 +pkgrel=4 +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64' 'mips64el') -url="http://ffmpeg.org/" +url='http://ffmpeg.org/' license=('GPL') -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) -makedepends=('git') +depends=( + 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' + 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx' + 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'x264' 'xvidcore' 'zlib' + ) if [ "$CARCH" != "mips64el" ]; then depends+=(libva) - makedepends+=('yasm' 'libvdpau') + makedepends=('libvdpau' 'yasm') fi -#git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz) -md5sums=('a35359e424608f369d380f03e4dc9966') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) +sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8') build() { - cd "ffmpeg" + cd ffmpeg-$pkgver + CFLAGS+=" -I/usr/include/openjpeg-1.5" \ ./configure \ --prefix=/usr \ --incdir=/usr/include/ffmpeg-compat \ --libdir=/usr/lib/ffmpeg-compat \ --shlibdir=/usr/lib/ffmpeg-compat \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ + --disable-debug \ + --disable-static \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ + --enable-libmodplug \ + --enable-libmp3lame \ --enable-libopencore_amrnb \ --enable-libopencore_amrwb \ - --enable-libschroedinger \ --enable-libopenjpeg \ - --enable-librtmp \ --enable-libpulse \ - --enable-gpl \ - --enable-version3 \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libxvid \ + --enable-postproc \ --enable-runtime-cpudetect \ - --disable-debug \ - --disable-static + --enable-shared \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + make } package() { - cd "ffmpeg" + cd ffmpeg-$pkgver make DESTDIR="$pkgdir" install - rm -rf $pkgdir/usr/{bin,share} + rm -rf "$pkgdir"/usr/{bin,share} + + install -dm755 "$pkgdir"/etc/ld.so.conf.d/ + echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf } + +# vim:set ts=2 sw=2 et: diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 01dcc7dda..6f65f9375 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84348 2013-02-16 22:50:27Z ioni $ +# $Id: PKGBUILD 94877 2013-08-01 06:54:51Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ffmpeg2theora pkgver=0.29 -pkgrel=3 +pkgrel=4 pkgdesc="Simple converter to create Ogg Theora files" arch=('x86_64' 'i686' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" @@ -15,6 +15,11 @@ makedepends=('scons') # 'libkate') source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + echo "#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000" >> src/ffmpeg2theora.h +} + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index c434b18b0..872078081 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88204 2013-04-13 20:20:33Z alucryd $ +# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ffmpegsource -pkgver=753 +pkgver=755 pkgrel=1 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool') source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/" 'autoconf.patch') sha256sums=('SKIP' - 'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93') + '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7') pkgver() { cd "${SRCDEST}"/${pkgname} diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch index e15e4522c..2ed0d0f6e 100755 --- a/community/ffmpegsource/autoconf.patch +++ b/community/ffmpegsource/autoconf.patch @@ -9,14 +9,3 @@ lib_LTLIBRARIES = src/core/libffms2.la src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then - CXXFLAGS="$OPT_FLAGS" - fi - --AM_CONFIG_HEADER([src/config/config.h]) -+AC_CONFIG_HEADERS([src/config/config.h]) - AC_PROG_CC - AC_PROG_CXX - LT_INIT([static disable-shared]) diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 5cd15184b..61709421f 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92437 2013-06-05 11:05:37Z spupykin $ +# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index 6c13a2e3f..ae98e2068 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87411 2013-03-31 19:18:15Z stephane $ +# $Id: PKGBUILD 94805 2013-07-30 20:37:58Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Elmo Todurov <todurov@gmail.com> # Contributor: guini <sidtrun@googlemail.com> @@ -8,7 +8,7 @@ pkgname=freeorion pkgver=0.4.2 -pkgrel=4 +pkgrel=5 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') url='http://www.freeorion.org/' @@ -20,41 +20,41 @@ else depends=('nvidia-cg-toolkit') fi depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl') -makedepends=('boost' 'ogre=1.8.1-4' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl' +makedepends=('boost' 'ogre=1.8.1' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl' 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg') options=('!strip' '!emptydirs') install=$pkgname.install source=("$pkgname.sh" "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png" - "cmake_python.patch") -sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf' + "cmake_python.patch" + "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6142") +sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707' 'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f' - '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a') -_svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/' + '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a' + 'SKIP') _pyversion=2.7 -_revision=5771 + +pkgver() { + #cd "$pkgname" + + #svnversion | tr -d [A-z] + echo "$pkgver" +} + +prepare() { + cd "$pkgname" + + svn upgrade +} build() { cd "$srcdir" - gendesk -n + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" #msg2 'Looking up revision from version number...' #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1` - #msg2 'The revision for the latest official release is $_releaserevision" - ## _revision=$_releaserevision - #msg2 "Compiling with revision $_revision" - - msg2 "Checking out svn revision $_revision..." - if [[ -d "$pkgname/.svn" ]]; then - (cd "$pkgname" && svn up -r "$_revision") - else - svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname" - fi - msg2 'Setting up build directory...' - rm -rf "$srcdir/$pkgname-build" - cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" - cd "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname" msg2 'CMake/Python fix...' patch -N -p1 -i "$srcdir/cmake_python.patch" @@ -77,11 +77,11 @@ build() { msg2 'OGRE fix...' sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \ - "$srcdir/$pkgname-build/ogre_plugins.cfg" + "$srcdir/$pkgname/ogre_plugins.cfg" } package() { - cd "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname" msg2 'Packaging documentation...' install -Dm644 loki_setup/README.txt \ @@ -111,7 +111,7 @@ package() { "$pkgdir/usr/share/applications/freeorion.desktop" msg2 'Packaging OGRE plugins configuration...' - install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \ + install -Dm 644 "$srcdir/$pkgname/ogre_plugins.cfg" \ "$pkgdir/usr/share/freeorion/ogre_plugins.cfg" msg2 'Cleaning up...' diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh index d80623ab2..9f35e7032 100644 --- a/community/freeorion/freeorion.sh +++ b/community/freeorion/freeorion.sh @@ -54,17 +54,17 @@ # If this is a symlink, then we # need to change into the dir of symlink-target. if [ -h $0 ]; then - echo "I am Symlink. Following into my targets basedir" + #echo "I am Symlink. Following into my targets basedir" ME=`readlink $0` else - echo "Following into my basedir" + #echo "Following into my basedir" ME=$0 fi # This is important! Script won't work outside its installation dir ROOT=/usr/share/freeorion cd ${ROOT} -echo -n "CWD: " +#echo -n "CWD: " pwd @@ -86,7 +86,7 @@ if [ "$PYTHON_USE_SHIPPED" = "1" ]; then export PYTHONPATH=${PYTHONHOME} export PYTHONDEBUG=1 export PYTHONVERBOSE=1 - echo "PYTHONHOME=${PYTHONHOME}" + #echo "PYTHONHOME=${PYTHONHOME}" export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH} export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index e21783928..024423a26 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84350 2013-02-16 22:50:28Z ioni $ +# $Id: PKGBUILD 94879 2013-08-01 06:54:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Free RDP client" arch=('i686' 'x86_64' 'mips64el') url="http://freerdp.sourceforge.net" @@ -15,8 +15,15 @@ makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') -source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz) -md5sums=('c260051a94caff590def5caa4fcf59d6') +source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz + ffmpeg2.0.patch) +md5sums=('c260051a94caff590def5caa4fcf59d6' + '1260eecf01ea5212e2db8ac9c5e7fa6d') + +prepare() { + cd $srcdir/FreeRDP-$pkgver + patch -Np1 -i ../ffmpeg2.0.patch +} build() { cd $srcdir/FreeRDP-$pkgver diff --git a/community/freerdp/ffmpeg2.0.patch b/community/freerdp/ffmpeg2.0.patch new file mode 100644 index 000000000..bc9022da4 --- /dev/null +++ b/community/freerdp/ffmpeg2.0.patch @@ -0,0 +1,76 @@ +diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c +--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100 ++++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200 +@@ -28,6 +28,8 @@ + #include "tsmf_constants.h" + #include "tsmf_decoder.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + /* Compatibility with older FFmpeg */ + #if LIBAVUTIL_VERSION_MAJOR < 50 + #define AVMEDIA_TYPE_VIDEO 0 +@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder + ITSMFDecoder iface; + + int media_type; +- enum CodecID codec_id; ++ enum AVCodecID codec_id; + AVCodecContext* codec_context; + AVCodec* codec; + AVFrame* frame; +@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context( + { + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + +- mdecoder->codec_context = avcodec_alloc_context(); ++ mdecoder->codec_context = avcodec_alloc_context3(NULL); + if (!mdecoder->codec_context) + { + DEBUG_WARN("avcodec_alloc_context failed."); +@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st + mdecoder->codec_context->channels = media_type->Channels; + mdecoder->codec_context->block_align = media_type->BlockAlign; + +-#ifdef AV_CPU_FLAG_SSE2 +- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; +-#else +-#if LIBAVCODEC_VERSION_MAJOR < 53 +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT; +-#else +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2; +-#endif +-#endif +- + return true; + } + +@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF + { + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + +- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0) ++ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0) + { + DEBUG_WARN("avcodec_open failed."); + return false; +@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio( + av_init_packet(&pkt); + pkt.data = (uint8*) src; + pkt.size = src_size; +- len = avcodec_decode_audio3(mdecoder->codec_context, +- (int16_t*) dst, &frame_size, &pkt); ++ AVFrame * frame = avcodec_alloc_frame (); ++ len = avcodec_decode_audio4(mdecoder->codec_context, ++ frame, &frame_size, &pkt); + } + #endif + if (len <= 0 || frame_size <= 0) +@@ -499,7 +492,6 @@ TSMFDecoderEntry(void) + + if (!initialized) + { +- avcodec_init(); + avcodec_register_all(); + initialized = true; + } diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index d5154e31f..6a165b6e8 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90027 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 94880 2013-08-01 06:54:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=5 +pkgrel=6 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 69cc32f62..db5c78c7b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92837 2013-06-16 17:21:06Z foutrelis $ +# $Id: PKGBUILD 94882 2013-08-01 06:54:58Z bpiotrowski $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') -pkgver=3.4.1 -pkgrel=4 +pkgver=3.4.2 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -32,7 +32,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti options=(!emptydirs) source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" gambas3-3.4.1-llvm-3.3.patch) -md5sums=('eef35861d1e95808180ac7ed5a436569' +md5sums=('c35c0f88211e2c0203d2467acb8d384d' '04bf972f5d5546118ecbcc1f24271216') create_dirs() { diff --git a/community/gauche/PKGBUILD b/community/gauche/PKGBUILD new file mode 100644 index 000000000..efc16877c --- /dev/null +++ b/community/gauche/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 94289 2013-07-18 21:59:48Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Motohiro Ueki <ueki.com@gmail.com> +# Contributor: nkoizu <nkoizu@gmail.com> + +pkgname=gauche +pkgver=0.9.3.3 +pkgrel=1 +url='http://practical-scheme.net/gauche/' +pkgdesc='R5RS Scheme implementation (provides gosh)' +depends=('gdbm' 'zlib' 'slib') +license=('BSD') +arch=('x86_64' 'i686') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/$pkgname/Gauche-$pkgver.tgz") +sha256sums=('3d8b70075faa0f7a24f8d112cc102ee3e1066680cdd19d324d59f33fab79caac') + +build() { + cd "$srcdir/Gauche-$pkgver" + + ./configure --prefix=/usr --enable-multibyte=utf-8 \ + --enable-threads=pthreads + make -j1 +} + +package() { + cd "$srcdir/Gauche-$pkgver" + + make -j1 DESTDIR="$pkgdir" install-pkg install-doc + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gauche/gauche.install b/community/gauche/gauche.install new file mode 100644 index 000000000..2edfe522e --- /dev/null +++ b/community/gauche/gauche.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gauche-refe.info gauche-refj.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 + /usr/bin/gosh -ftest -uslib -E"require 'new-catalog" -Eexit; +} + +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/gdal/PKGBUILD b/community/gdal/PKGBUILD index 015ddde27..83aa66a94 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91067 2013-05-18 16:29:28Z jlichtblau $ +# $Id: PKGBUILD 94922 2013-08-01 07:01:13Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gdal.org/" diff --git a/community/gdal/gdal.changelog b/community/gdal/gdal.changelog index c31121e1d..7f74141ee 100644 --- a/community/gdal/gdal.changelog +++ b/community/gdal/gdal.changelog @@ -1,3 +1,6 @@ +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gdal 1.10.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * gdal 1.8.0-1 diff --git a/community/gigedit/PKGBUILD b/community/gigedit/PKGBUILD deleted file mode 100644 index bd05aa9bf..000000000 --- a/community/gigedit/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 67675 2012-03-13 18:24:44Z lcarlier $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: svoufff <svoufff at gmail dot com> -# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> - -pkgname=gigedit -pkgver=0.2.0 -pkgrel=2 -pkgdesc="Gigasampler instrument editor" -arch=(i686 x86_64 'mips64el') -url="http://www.linuxsampler.org/" -license=('GPL') -depends=('linuxsampler' 'gtkmm' 'libsigc++') -makedepends=('intltool') -options=('!libtool' '!makeflags') -source=(http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.gz) -md5sums=('eadfc82118460206e8f83c104f9d2a3a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix linking - sed -i -e 's/@LIBS@/@LIBS@ -lsigc-2.0/g' src/gigedit/Makefile.in - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD index 5dedd42f9..2e6aa3961 100644 --- a/community/gimp-plugin-mathmap/PKGBUILD +++ b/community/gimp-plugin-mathmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90036 2013-05-06 19:37:24Z foutrelis $ +# $Id: PKGBUILD 94923 2013-08-01 07:01:15Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Serge Gielkens <gielkens.serge@mumeli.org> pkgname=gimp-plugin-mathmap pkgver=1.3.5 -pkgrel=3 +pkgrel=4 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae" arch=('i686' 'x86_64' 'mips64el') url="http://www.complang.tuwien.ac.at/schani/mathmap/" @@ -14,10 +14,11 @@ makedepends=('doxygen' 'unzip') provides=('gimp-mathmap') replaces=('gimp-mathmap') source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \ - fix_libnoise_build.patch libpng15.patch) + fix_libnoise_build.patch libpng15.patch giflib-5.0.patch) md5sums=('6ff66d070ea410dee1a27283d05b8beb' 'eca40de0ba0e6b8d34b7d1f904bc3d18' - '9780d6354b7380b772c4616253ecee54') + '9780d6354b7380b772c4616253ecee54' + '9cc8eb13526056d8f3d06cc3e984a719') build() { cd "$srcdir/mathmap-$pkgver" @@ -26,6 +27,8 @@ build() { patch -Np1 < "$srcdir"/fix_libnoise_build.patch # fix for libpng 1.5 patch -Np1 < "$srcdir"/libpng15.patch + # fix for giflib 5.0 + patch -Np1 < "$srcdir"/giflib-5.0.patch make } diff --git a/community/gimp-plugin-mathmap/giflib-5.0.patch b/community/gimp-plugin-mathmap/giflib-5.0.patch new file mode 100644 index 000000000..d9036a451 --- /dev/null +++ b/community/gimp-plugin-mathmap/giflib-5.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/rwimg/rwgif.c b/rwimg/rwgif.c +--- a/rwimg/rwgif.c 2009-08-23 13:56:14.000000000 +0200 ++++ b/rwimg/rwgif.c 2013-07-30 10:59:45.391015754 +0200 +@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD index 4c6d8ba49..a356f1953 100644 --- a/community/gimp-refocus/PKGBUILD +++ b/community/gimp-refocus/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gimp-refocus pkgver=0.9.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" arch=('i686' 'x86_64' 'mips64el') url="http://refocus.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('gimp') source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) md5sums=('8d4eac4ef45c904fb5e73021696bec94' - '0280f3d4c4d7838da459d8070abb6966' + '1b7bc13154f483994af3846c7ee29ad7' '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch index db359487c..56193a3c8 100644 --- a/community/gimp-refocus/refocus-gimp-2.0.patch +++ b/community/gimp-refocus/refocus-gimp-2.0.patch @@ -71,7 +71,7 @@ diff -u -u -r1.1.1.1 Makefile.am refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c -refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas} -+refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} ++refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} -lm refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index a0bae749c..1ea048b9f 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 92260 2013-06-03 11:49:45Z foutrelis $ +# $Id: PKGBUILD 94386 2013-07-22 14:09:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller <henning@orgizm.net> pkgname=glusterfs -pkgver=3.3.1 +pkgver=3.4.0 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=5 +pkgrel=1 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64 mips64el) url='http://www.gluster.org/' @@ -17,9 +17,7 @@ makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz glusterd.service) -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' +sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8' '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') build() { @@ -46,7 +44,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make -j1 DESTDIR=$pkgdir install install -D -m 644 \ $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ diff --git a/community/gmime24/PKGBUILD b/community/gmime24/PKGBUILD deleted file mode 100644 index 64f2d9f7e..000000000 --- a/community/gmime24/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 87490 2013-04-01 16:50:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=gmime24 -pkgver=2.4.33 -pkgrel=1 -pkgdesc="Core mime parsing library" -arch=(i686 x86_64 mips64el) -license=('GPL') -url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'zlib') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-${pkgver}.tar.xz) -md5sums=('a4dc6e553c0cf3b7d96dfef8ab633163') - -build() { - # get rid of that .wapi errors in fakeroot - export MONO_SHARED_DIR="${srcdir}/weird" - mkdir -p "${MONO_SHARED_DIR}" - - cd ${srcdir}/gmime-${pkgver} - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \ - --disable-mono \ - --disable-static - make -} - -package() { - cd ${srcdir}/gmime-${pkgver} - make DESTDIR=${pkgdir} install - # These are gmime alternatives for the same shareutils tools - rm -rf ${pkgdir}/usr/bin/uuencode ${pkgdir}/usr/bin/uudecode ${pkgdir}/usr/share -} diff --git a/community/gmpc/PKGBUILD b/community/gmpc/PKGBUILD index bea9562cc..45be95eca 100644 --- a/community/gmpc/PKGBUILD +++ b/community/gmpc/PKGBUILD @@ -1,30 +1,39 @@ -# $Id$ +# $Id: PKGBUILD 94825 2013-07-30 21:19:19Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> pkgname=gmpc pkgver=11.8.16 -pkgrel=1 -pkgdesc="A GTK2 client for MPD" -arch=('i686' 'x86_64' 'mips64el') -url="http://gmpclient.org/home" +pkgrel=2 +pkgdesc='MPD client (Gtk2)' +arch=('x86_64' 'i686' 'mips64el') +url='http://gmpclient.org/home' license=('GPL') depends=('libunique' 'libmpd' 'libsoup' 'sqlite' 'hicolor-icon-theme' 'xdg-utils') makedepends=('gob2' 'intltool' 'vala') options=('!libtool') -install=gmpc.install -source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('223aeb000e41697d8fdf54ccedee89d5') +install='gmpc.install' +source=("http://download.sarine.nl/Programs/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz") +sha256sums=('a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's/GNOME;AudioVideo;/GTK;AudioVideo;Player;/' data/gmpc.desktop.in +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in - export LDFLAGS="$LDFLAGS -lm" + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr - make + make CFLAGS+='-lm' } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 68083e094..5375b04e6 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94025 2013-07-13 12:32:36Z svenstaro $ +# $Id: PKGBUILD 94924 2013-08-01 07:01:17Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=9 +pkgrel=10 arch=(i686 x86_64 mips64el) url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -15,10 +15,11 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu pkgconfig boost) options=(!libtool !emptydirs) source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch gnash-0.8.10-boost-1.50.patch) + nodebug.patch gnash-0.8.10-boost-1.50.patch gnucash-0.8.10-giflib-5.0.patch) sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551' - 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c') + 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c' + 'd1597ce496d95913a7d5873a0a3c58e4f40fa4ec6e3fc7ae939a66f1362b3e57') build() { cd gnash-$pkgver @@ -29,6 +30,8 @@ build() { # Link to libboost_system.so patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch + patch -Np1 -i ../gnucash-0.8.10-giflib-5.0.patch + ./autogen.sh ./configure \ --prefix=/usr \ diff --git a/community/gnash/gnucash-0.8.10-giflib-5.0.patch b/community/gnash/gnucash-0.8.10-giflib-5.0.patch new file mode 100644 index 000000000..2ca7032bb --- /dev/null +++ b/community/gnash/gnucash-0.8.10-giflib-5.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +--- a/libbase/GnashImageGif.cpp 2012-01-19 19:17:48.000000000 +0000 ++++ b/libbase/GnashImageGif.cpp 2013-07-30 09:08:37.707930583 +0000 +@@ -269,7 +269,7 @@ GifInput::processRecord(GifRecordType re + void + GifInput::read() + { +- _gif = DGifOpen(_inStream.get(), &readData); ++ _gif = DGifOpen(_inStream.get(), &readData, NULL); + + GifRecordType record; + diff --git a/community/gnubg/PKGBUILD b/community/gnubg/PKGBUILD new file mode 100644 index 000000000..5ad5b0c0b --- /dev/null +++ b/community/gnubg/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk> + +pkgname=gnubg +pkgver=1.01.003 +pkgrel=1 +pkgdesc="A world class backgammon application" +arch=('i686' 'x86_64') +url="http://www.gnubg.org" +license=('GPL') +depends=('python2' 'gtkglext' 'hicolor-icon-theme') +conflicts=('gnubg-cli' 'gnubg-cvs') +install=$pkgname.install +source=($url/media/sources/$pkgname-release-$pkgver-sources.tar.gz + $pkgname.desktop) +md5sums=('5b03cf8634abe2822eee4db1317f0754' + '965f5c7c25f60b27d06cc6fef7befd30') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./autogen.sh + + ./configure --prefix=/usr --bindir=/usr/bin --sysconfdir=/etc \ + --mandir=/usr/share/man + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 "$srcdir"/$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} diff --git a/community/gnubg/gnubg.desktop b/community/gnubg/gnubg.desktop new file mode 100644 index 000000000..a0d3ba75d --- /dev/null +++ b/community/gnubg/gnubg.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Name=GNU Backgammon +Name[hr]=GNU Tavla +Name[ru]=GNU Нарды +Name[sr]=ГНУ Тавла +GenericName=Backgammon +GenericName[hr]=Tavla +GenericName[ru]=Нарды +GenericName[sr]=Тавла +Comment=GNU Backgammon +Comment[hr]=GNU Tavla +Comment[ru]=GNU Короткие нарды +Comment[sr]=GNU Тавла +Exec=gnubg +Icon=gnubg +StartupNotify=true +Terminal=false +Type=Application +Categories=GTK;Game;StrategyGame; diff --git a/community/gnubg/gnubg.install b/community/gnubg/gnubg.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community/gnubg/gnubg.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/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index c9d2e18fc..c13045c9f 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90156 2013-05-07 13:34:32Z spupykin $ +# $Id: PKGBUILD 94925 2013-08-01 07:01:18Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" @@ -15,8 +15,10 @@ makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make') conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('1771bdb42f27ee946b17bf60fef5eb2e') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz + giflib-5.0.patch) +md5sums=('1771bdb42f27ee946b17bf60fef5eb2e' + 'b998c0bc3e2bc260c2779d7a50ce6407') build() { cd $srcdir/$pkgname-$pkgver @@ -24,6 +26,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc/GNUstep sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h sed -i 's|png_sizeof|sizeof|g' Source/NSBitmapImageRep+PNG.m + patch -Np1 -i ../giflib-5.0.patch make } diff --git a/community/gnustep-gui/giflib-5.0.patch b/community/gnustep-gui/giflib-5.0.patch new file mode 100644 index 000000000..3d8a32d27 --- /dev/null +++ b/community/gnustep-gui/giflib-5.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/Source/NSBitmapImageRep+GIF.m b/Source/NSBitmapImageRep+GIF.m +--- a/Source/NSBitmapImageRep+GIF.m 2013-01-13 14:57:37.000000000 +0100 ++++ b/Source/NSBitmapImageRep+GIF.m 2013-07-30 11:30:19.630935640 +0200 +@@ -142,7 +142,7 @@ static int gs_gif_output(GifFileType *fi + } + + gs_gif_init_input_source(&src, imageData); +- file = DGifOpen(&src, gs_gif_input); ++ file = DGifOpen(&src, gs_gif_input, NULL); + if (file == NULL) + { + /* we do not use giferror here because it doesn't +@@ -216,7 +216,7 @@ static int gs_gif_output(GifFileType *fi + + /* open the image */ + gs_gif_init_input_source(&src, imageData); +- file = DGifOpen(&src, gs_gif_input); ++ file = DGifOpen(&src, gs_gif_input, NULL); + if (file == NULL) + { + /* we do not use giferror here because it doesn't diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index f3d84a587..9191dd88d 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $ +#$Id: PKGBUILD 94279 2013-07-18 19:28:01Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide -pkgver=18.1 -pkgrel=3 +pkgver=19 +pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ options=('!strip') source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe' +sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') @@ -42,14 +42,14 @@ build() { } package() { + cd "$srcdir/liteide-x$pkgver/build/liteide" + msg2 'Creating directories...' mkdir -p \ "$pkgdir/usr/lib/liteide" \ "$pkgdir/usr/share/liteide" \ "$pkgdir/usr/share/doc/$pkgname" - cd "$srcdir/liteide-x$pkgver/build/liteide" - msg2 'Packaging executables...' for binary in goastview goapi goexec godocview liteide; do install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index e7aafe995..9a9643bed 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94026 2013-07-13 12:32:46Z svenstaro $ +# $Id: PKGBUILD 94883 2013-08-01 06:54:59Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.40 -pkgrel=2 +pkgrel=3 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 34ef31589..f5ad6cbbb 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90042 2013-05-06 19:37:40Z foutrelis $ +# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=4288 -pkgrel=2 +pkgrel=3 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" @@ -13,15 +13,16 @@ makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch) sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6' - '794b0e4a497af527e093ff0328f1acc8995f2b04') + 'SKIP' + '63f59ab745c57bf7d242e942e30a4e6c7a1236b0') # source PKGBUILD && mksource mksource() { [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) _svnver=${pkgver} - _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" + _svntrunk="svn://svn.code.sf.net/p/gpac/code/trunk/gpac" _svnmod="$pkgname-${pkgver}" mkdir ${pkgname}-${pkgver} pushd ${pkgname}-${pkgver} @@ -35,6 +36,11 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gpac-ffmpeg.patch" +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no diff --git a/community/gpac/gpac-ffmpeg.patch b/community/gpac/gpac-ffmpeg.patch new file mode 100644 index 000000000..035d7b65c --- /dev/null +++ b/community/gpac/gpac-ffmpeg.patch @@ -0,0 +1,37 @@ +--- modules/ffmpeg_in/ffmpeg_decode.c 2013-03-11 21:43:22.000000000 -0400 ++++ modules/ffmpeg_in/ffmpeg_decode.c 2013-07-11 23:38:15.108181474 -0400 +@@ -38,7 +38,9 @@ + #undef USE_AVCODEC2 + #endif + +-#if (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35) ++#if (LIBAVCODEC_VERSION_MAJOR >= 55) ++#define USE_AVCTX3 ++#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35) + #define USE_AVCTX3 + #endif + +@@ -625,10 +628,11 @@ + if (ffd->frame_start>inBufferLength) ffd->frame_start = 0; + + redecode: +- gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; + #ifdef USE_AVCODEC2 ++ gotpic = 192000; + len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt); + #else ++ gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; + len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start); + #endif + if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; } +--- modules/ffmpeg_in/ffmpeg_in.h 2013-03-11 21:43:22.000000000 -0400 ++++ modules/ffmpeg_in/ffmpeg_in.h 2013-07-11 23:38:15.108181474 -0400 +@@ -120,7 +120,7 @@ + + /*for audio packed frames*/ + u32 frame_start; +- char audio_buf[AVCODEC_MAX_AUDIO_FRAME_SIZE]; ++ char audio_buf[192000]; + Bool check_h264_isma; + + u32 base_ES_ID; diff --git a/community/guitarix2/PKGBUILD b/community/guitarix2/PKGBUILD index 6eff8e6c2..5f4dadb8c 100644 --- a/community/guitarix2/PKGBUILD +++ b/community/guitarix2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 93760 2013-07-10 02:27:39Z speps $ +# $Id: PKGBUILD 94628 2013-07-29 00:41:54Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=guitarix2 -pkgver=0.27.1 -pkgrel=1 +pkgver=0.28.1 +pkgrel=2 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust" arch=('i686' 'x86_64') url="http://guitarix.sourceforge.net/" license=('GPL') -depends=('gtkmm' 'jack' 'liblrdf' 'boost-libs' 'zita-convolver' 'zita-resampler') +depends=('gtkmm' 'jack' 'liblrdf' 'boost-libs' + 'zita-convolver' 'zita-resampler' 'desktop-file-utils') makedepends=('python2' 'boost' 'intltool' 'lv2') optdepends=('meterbridge: sound meters') provides=('guitarix' 'gx_head') @@ -16,7 +17,7 @@ conflicts=('guitarix' 'gx_head') replaces=('guitarix' 'gx_head') install="$pkgname.install" source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2") -md5sums=('65e0917f9529460931be522e2879e514') +md5sums=('7038bf7ab112bd5c5c2bd86f0b632d02') build() { cd "$srcdir/guitarix-$pkgver" @@ -24,10 +25,8 @@ build() { --no-desktop-update \ --no-ldconfig \ --no-faust \ - --optimization \ --shared-lib \ - --lib-dev \ - --build-lv2 + --lib-dev python2 waf build } diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 72eac8d2c..628244fa7 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90045 2013-05-06 19:37:46Z foutrelis $ +# $Id: PKGBUILD 94885 2013-08-01 06:55:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> pkgname=guvcview -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=2 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ 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=('fe141fe2fe2a16df69f7866c27334a56') +md5sums=('5ca1b9c89d2b9370ee203dcc24efd695') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 3a2edb39e..a67916ef4 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92299 2013-06-03 16:15:33Z spupykin $ +# $Id: PKGBUILD 94887 2013-08-01 06:55:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.19 -pkgrel=1 +pkgrel=2 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -22,15 +22,18 @@ makedepends=('fpc' 'cmake' source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png - build-fix.patch) + build-fix.patch + ffmpeg2.0.patch) md5sums=('51d84ad6ea00e9894e6119b118b4a523' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90') + 'a9d7b0ba72cbeb7fc74fce459db9dd90' + 'da84d64a252579236d3ff0cc6e008e72') prepare() { cd $pkgname-src-$pkgver patch -Rp1 <$srcdir/build-fix.patch + patch -Np1 -i ../ffmpeg2.0.patch } build() { diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch new file mode 100644 index 000000000..67f123ae3 --- /dev/null +++ b/community/hedgewars/ffmpeg2.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp +--- a/QTfrontend/util/LibavInteraction.cpp 2013-05-30 20:07:33.000000000 +0000 ++++ b/QTfrontend/util/LibavInteraction.cpp 2013-07-22 16:24:42.564768844 +0000 +@@ -32,7 +32,7 @@ extern "C" + + struct Codec + { +- CodecID id; ++ AVCodecID id; + bool isAudio; + QString shortName; // used for identification + QString longName; // used for displaying to user +@@ -52,7 +52,7 @@ QList<Codec> codecs; + QMap<QString,Format> formats; + + // test if given format supports given codec +-bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id) ++bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id) + { + #if LIBAVFORMAT_VERSION_MAJOR >= 54 + return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1; diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD deleted file mode 100644 index c31ea657a..000000000 --- a/community/id3lib-rcc/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=id3lib-rcc -pkgver=3.8.3 -pkgrel=7 -pkgdesc="id3lib with librcc patch" -arch=('i686' 'x86_64' 'mips64el') -url="http://id3lib.sourceforge.net/" -license=('GPL') -depends=('libxml2' 'librcc' 'gcc-libs') -provides=('id3lib') -conflicts=('id3lib') -options=('!libtool') -source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 - arch.patch - id3lib-gcc4.patch) -md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' - '608a475f119974c8f72406fd84e1030f' - '8b503330d653578f75fc9f2bf3c3833d' - '94191cf1fe6f5fd391d95a6de81a48b9') - -build() { - cd "${srcdir}"/id3lib-$pkgver - - patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch - patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch - cd src - patch -Np0 -i "${srcdir}"/arch.patch - cd .. - - sed -i 's#iomanip.h##' configure - sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h - - ./configure --prefix=/usr - make LDFLAGS=-lrcc -} - -package() { - cd "${srcdir}"/id3lib-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/community/id3lib-rcc/arch.patch b/community/id3lib-rcc/arch.patch deleted file mode 100644 index 2732fde5e..000000000 --- a/community/id3lib-rcc/arch.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.in.org 2003-03-02 03:23:00.000000000 +0300 -+++ Makefile.in 2006-07-14 08:33:40.000000000 +0400 -@@ -172,7 +172,8 @@ - tag_parse_v1.cpp \ - tag_render.cpp \ - utils.cpp \ -- writers.cpp -+ writers.cpp \ -+ rccpatch.cpp - - - lib_LTLIBRARIES = libid3.la -@@ -200,7 +201,7 @@ - io_decorators.lo io_helpers.lo misc_support.lo mp3_parse.lo \ - readers.lo spec.lo tag.lo tag_file.lo tag_find.lo tag_impl.lo \ - tag_parse.lo tag_parse_lyrics3.lo tag_parse_musicmatch.lo \ -- tag_parse_v1.lo tag_render.lo utils.lo writers.lo -+ tag_parse_v1.lo tag_render.lo utils.lo writers.lo rccpatch.lo - am_libid3_la_OBJECTS = $(am__objects_1) - libid3_la_OBJECTS = $(am_libid3_la_OBJECTS) - -@@ -233,7 +234,8 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_musicmatch.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_v1.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_render.Plo ./$(DEPDIR)/utils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo -+@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rccpatch.Plo - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -@@ -328,6 +330,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tag_render.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writers.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rccpatch.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) diff --git a/community/id3lib-rcc/id3lib-gcc4.patch b/community/id3lib-rcc/id3lib-gcc4.patch deleted file mode 100644 index 7f4ef666a..000000000 --- a/community/id3lib-rcc/id3lib-gcc4.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -wbBur id3lib-3.8.3/configure.in id3lib-3.8.3.my/configure.in ---- id3lib-3.8.3/configure.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/configure.in 2009-09-08 15:09:40.000000000 +0000 -@@ -227,7 +227,6 @@ - ) - AC_CHECK_HEADERS( \ - string \ -- iomanip.h \ - ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) - ) - -@@ -296,11 +295,11 @@ - AC_DEFINE_UNQUOTED(_ID3LIB_BINARY_AGE, $ID3LIB_BINARY_AGE) - AC_DEFINE_UNQUOTED(_ID3_COMPILED_WITH_DEBUGGING, "${enable_debug}") - --CONDITIONAL_SUBDIRS= --if test "x$ac_cv_lib_z_uncompress" = "xno"; then -- CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" --fi --AC_CONFIG_SUBDIRS(zlib) -+#CONDITIONAL_SUBDIRS= -+#if test "x$ac_cv_lib_z_uncompress" = "xno"; then -+# CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" -+#fi -+#AC_CONFIG_SUBDIRS(zlib) - - CFLAGS="$CFLAGS -Wall" - -diff -wbBur id3lib-3.8.3/doc/Doxyfile.in id3lib-3.8.3.my/doc/Doxyfile.in ---- id3lib-3.8.3/doc/Doxyfile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/doc/Doxyfile.in 2009-09-08 15:10:40.000000000 +0000 -@@ -263,8 +263,10 @@ - - INPUT = ../src \ - ../include/id3/field.h \ -- ../include/id3/frame.h \ - ../include/id3/globals.h \ -+ ../include/id3/io_decorators.h \ -+ ../include/id3/io_helpers.h \ -+ ../include/id3/io_strings.h \ - ../include/id3/misc_support.h \ - ../include/id3/reader.h \ - ../include/id3/readers.h \ -diff -wbBur id3lib-3.8.3/examples/demo_convert.cpp id3lib-3.8.3.my/examples/demo_convert.cpp ---- id3lib-3.8.3/examples/demo_convert.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_convert.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -84,7 +84,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - flags_t ulFlag = ID3TT_ALL; - gengetopt_args_info args; -diff -wbBur id3lib-3.8.3/examples/demo_copy.cpp id3lib-3.8.3.my/examples/demo_copy.cpp ---- id3lib-3.8.3/examples/demo_copy.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_copy.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -81,7 +81,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/examples/demo_info.cpp id3lib-3.8.3.my/examples/demo_info.cpp ---- id3lib-3.8.3/examples/demo_info.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_info.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -309,7 +309,7 @@ - - #define DEBUG - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - ID3D_INIT_DOUT(); - -diff -wbBur id3lib-3.8.3/examples/demo_tag.cpp id3lib-3.8.3.my/examples/demo_tag.cpp ---- id3lib-3.8.3/examples/demo_tag.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_tag.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -46,7 +46,7 @@ - os << "v2"; - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/include/id3/id3lib_strings.h id3lib-3.8.3.my/include/id3/id3lib_strings.h ---- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/id3lib_strings.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,6 +30,7 @@ - #define _ID3LIB_STRINGS_H_ - - #include <string> -+#include <cstring> - - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) - namespace std -diff -wbBur id3lib-3.8.3/include/id3/writers.h id3lib-3.8.3.my/include/id3/writers.h ---- id3lib-3.8.3/include/id3/writers.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/writers.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,7 +30,7 @@ - - #include "id3/writer.h" - #include "id3/id3lib_streams.h" --//#include <string.h> -+#include <string.h> - - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer - { -diff -wbBur id3lib-3.8.3/src/Makefile.am id3lib-3.8.3.my/src/Makefile.am ---- id3lib-3.8.3/src/Makefile.am 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.am 2009-09-08 15:09:49.000000000 +0000 -@@ -76,6 +76,8 @@ - LDADD = $(top_builddir)/zlib/src/libz.la - endif - -+libid3_la_LIBADD = -lz -lstdc++ -+ - libid3_la_LDFLAGS = \ - -version-info $(LT_VERSION) \ - -release $(LT_RELEASE) \ -diff -wbBur id3lib-3.8.3/src/Makefile.in id3lib-3.8.3.my/src/Makefile.in ---- id3lib-3.8.3/src/Makefile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.in 2009-09-08 15:09:49.000000000 +0000 -@@ -192,7 +192,8 @@ - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --libid3_la_LIBADD = -+libid3_la_LIBADD = -lz -lstdc++ -+ - am__objects_1 = c_wrapper.lo field.lo field_binary.lo field_integer.lo \ - field_string_ascii.lo field_string_unicode.lo frame.lo \ - frame_impl.lo frame_parse.lo frame_render.lo globals.lo \ -diff -wbBur id3lib-3.8.3/src/tag_file.cpp id3lib-3.8.3.my/src/tag_file.cpp ---- id3lib-3.8.3/src/tag_file.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/tag_file.cpp 2009-09-08 15:10:22.000000000 +0000 -@@ -242,8 +242,8 @@ - strcpy(sTempFile, filename.c_str()); - strcat(sTempFile, sTmpSuffix.c_str()); - --#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -- // This section is for Windows folk && gcc 3.x folk -+#if !defined(HAVE_MKSTEMP) -+ // This section is for Windows folk - fstream tmpOut; - createFile(sTempFile, tmpOut); - -@@ -257,7 +257,7 @@ - tmpOut.write((char *)tmpBuffer, nBytes); - } - --#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#else //!defined(HAVE_MKSTEMP) - - // else we gotta make a temp file, copy the tag into it, copy the - // rest of the old file after the tag, delete the old file, rename -@@ -270,7 +270,7 @@ - //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); - } - -- ofstream tmpOut(fd); -+ ofstream tmpOut(sTempFile); - if (!tmpOut) - { - tmpOut.close(); -@@ -285,14 +285,14 @@ - uchar tmpBuffer[BUFSIZ]; - while (file) - { -- file.read(tmpBuffer, BUFSIZ); -+ file.read((char *)tmpBuffer, BUFSIZ); - size_t nBytes = file.gcount(); -- tmpOut.write(tmpBuffer, nBytes); -+ tmpOut.write((char *)tmpBuffer, nBytes); - } - - close(fd); //closes the file - --#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#endif ////!defined(HAVE_MKSTEMP) - - tmpOut.close(); - file.close(); diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index bbce4c008..b04c1fb55 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94060 2013-07-13 14:11:15Z spupykin $ +# $Id: PKGBUILD 94126 2013-07-14 18:31:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="a quest interpreter" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/instead/" @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz) -md5sums=('e6ef7cdac1daf3b3795dcd309d028468') +md5sums=('fe925715e48ce06ddce9eeeec380b881') build() { cd "${srcdir}/instead-${pkgver}" diff --git a/community/iverilog/PKGBUILD b/community/iverilog/PKGBUILD new file mode 100644 index 000000000..1cb86beee --- /dev/null +++ b/community/iverilog/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 73557 2012-07-09 19:15:21Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jared Casper <jaredcasper@gmail.com> +# Contributor: Paulo Matias <matias archlinux-br org> + +pkgname=iverilog +pkgver=0.9.6 +pkgrel=1 +pkgdesc='Icarus Verilog compiler and simulation tool' +arch=('x86_64' 'i686') +url='http://iverilog.icarus.com/' +license=('GPL') +makedepends=('readline' 'gperf') +depends=('bzip2' 'sh' 'gcc-libs' 'zlib') +source=("ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-$pkgver.tar.gz") +sha256sums=('25304d5d58d6411fcd1ab94992a505215eea5a6bbd9779c2be2d9d19f38cd54a') + +build() { + cd "$srcdir/${pkgname/i}-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/${pkgname/i}-$pkgver" + + make -j1 prefix="$pkgdir/usr" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 703697c71..ead10403c 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86189 2013-03-12 21:45:28Z jlichtblau $ +# $Id: PKGBUILD 94888 2013-08-01 06:55:03Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kid3.sourceforge.net/" @@ -17,6 +17,11 @@ changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) sha256sums=('8426b40b065f5a968796d1ff92da8d7a96d67cd963df837ce30ff1cf795ae301') +prepare() { + cd ${pkgname}-${pkgver} + sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' src/core/import/ffmpegfingerprintdecoder.cpp +} + build() { cd ${pkgname}-${pkgver} diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index 7405e80dc..f845cf74c 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $ +# $Id: PKGBUILD 94926 2013-08-01 07:01:20Z bpiotrowski $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64' 'mips64el') url='http://kmess.sourceforge.net/' @@ -14,14 +14,18 @@ depends=('kdebase-lib') makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('a2e57911713308bef81b9347135cc5dd') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" + giflib-5.0.patch) +md5sums=('a2e57911713308bef81b9347135cc5dd' + '97734b073bf4a45ed3612d7626541cee') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Fix invalid PNG images to work with libpng 1.6 find -name '*.png' -exec optipng -quiet -force -fix {} + + + patch -Np1 -i ../giflib-5.0.patch } build() { diff --git a/community/kmess/giflib-5.0.patch b/community/kmess/giflib-5.0.patch new file mode 100644 index 000000000..9b959b175 --- /dev/null +++ b/community/kmess/giflib-5.0.patch @@ -0,0 +1,85 @@ +diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp +--- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 ++++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 +@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw + int width = isfImage.width(); + int numColors = 0; + bool gifError = true; ++ int gifErrCode; + + // Convert the image to GIF using libgif + + // Open the gif file + gifData.open( QIODevice::WriteOnly ); +- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); ++ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); + if( gifImage == 0 ) + { + qWarning() << "Couldn't initialize gif library!"; +@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw + numColors = 256; + } + +- cmap = MakeMapObject( numColors, NULL ); ++ cmap = GifMakeMapObject( numColors, NULL ); + if( cmap == 0 && isfImage.numColors() > 1 ) + { + qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; +@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw + else + { + // Write the extension +- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) + { + qWarning() << "EGifPutExtensionFirst failed!"; + goto writeError; +@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw + // Write all the full data blocks + while( length >= MAX_GIF_BYTE ) + { +- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionNext failed!"; ++ qWarning() << "EGifPutExtensionBlock failed!"; + goto writeError; + } + +@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw + // Write the last block + if( length > 0 ) + { +- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (n) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (n) failed!"; + goto writeError; + } + } + else + { +- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (0) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (0) failed!"; + goto writeError; + } + } +@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw + writeError: + // Clean up the GIF converter etc + EGifCloseFile( gifImage ); +- FreeMapObject( cmap ); ++ GifFreeMapObject( cmap ); + gifData.close(); + + if( gifError ) + { +- qWarning() << "GIF error code:" << GifLastError(); ++ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); + } + else + { diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 28385b75b..ca4bbe875 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 90052 2013-05-06 19:38:03Z foutrelis $ +# $Id: PKGBUILD 94927 2013-08-01 07:01:21Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.69 -pkgrel=7 +pkgrel=8 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.leptonica.com/" license=('custom') options=(!libtool) depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') -source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) -md5sums=('d4085c302cbcab7f9af9d3d6f004ab22') +source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz + giflib6.patch) +md5sums=('d4085c302cbcab7f9af9d3d6f004ab22' + 'f87e1b2c98107fe51544d4f4c44a9733') + +prepare() { + cd ${srcdir}/leptonica-${pkgver} + patch -p1 <$srcdir/giflib6.patch +} build() { cd ${srcdir}/leptonica-${pkgver} diff --git a/community/leptonica/giflib6.patch b/community/leptonica/giflib6.patch new file mode 100644 index 000000000..10dc02eee --- /dev/null +++ b/community/leptonica/giflib6.patch @@ -0,0 +1,56 @@ +diff -wbBur leptonica-1.69/src/gifio.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c +--- leptonica-1.69/src/gifio.c 2012-01-22 22:29:15.000000000 +0400 ++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c 2013-07-30 18:27:19.269137200 +0400 +@@ -100,7 +100,7 @@ + _lseek(fd, 0, SEEK_SET); + #endif /* _MSC_VER */ + +- if ((gif = DGifOpenFileHandle(fd)) == NULL) ++ if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL) + return (PIX *)ERROR_PTR("invalid file or file not found", + procName, NULL); + +@@ -316,7 +316,7 @@ + } + + /* Save the cmap colors in a gif_cmap */ +- if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) { ++ if ((gif_cmap = GifMakeMapObject(gif_ncolor, NULL)) == NULL) { + pixDestroy(&pixd); + return ERROR_INT("failed to create GIF color map", procName, 1); + } +@@ -325,7 +325,7 @@ + if (ncolor > 0) { + if (pixcmapGetColor(cmap, i, &rval, &gval, &bval) != 0) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to get color from color map", + procName, 1); + } +@@ -337,9 +337,9 @@ + } + + /* Get the gif file handle */ +- if ((gif = EGifOpenFileHandle(fd)) == NULL) { ++ if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to create GIF image handle", procName, 1); + } + +@@ -347,11 +347,11 @@ + if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap) + != GIF_OK) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + EGifCloseFile(gif); + return ERROR_INT("failed to write screen description", procName, 1); + } +- FreeMapObject(gif_cmap); /* not needed after this point */ ++ GifFreeMapObject(gif_cmap); /* not needed after this point */ + + if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) { + pixDestroy(&pixd); diff --git a/community/libc++/PKGBUILD b/community/libc++/PKGBUILD index 51e254233..6a4f8c0df 100644 --- a/community/libc++/PKGBUILD +++ b/community/libc++/PKGBUILD @@ -1,25 +1,25 @@ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: MThinkCpp <mtc.maintainer[at]outlook.com> -pkgname='libc++' +pkgname=libc++ pkgver=3.3 -pkgrel=1 +pkgrel=3 pkgdesc='A new implementation of the C++ standard library, targeting C++11.' url='http://libcxx.llvm.org' license=('custom:University of Illinois/NCSA Open Source License') arch=('i686' 'x86_64') -depends=('glibc' 'gcc-libs') # gcc-libs for libsupc++ binary -makedepends=('clang' 'subversion' 'cmake' 'gcc') # gcc provides libsupc++ headers +# gcc-libs needed for libgcc_s, because Arch doesn't use a pure compiler-rt clang +depends=('glibc' 'libc++abi' 'gcc-libs') +makedepends=('clang' 'subversion' 'cmake') source=("http://www.llvm.org/releases/${pkgver}/libcxx-${pkgver}.src.tar.gz") -md5sums=('SKIP') +md5sums=('59006e659ffb33f5222a7b79d4cd071e') +install=${pkgname}.install build() { - _gcc_include_dir=/usr/include/c++/$(gcc -dumpversion) - _gcc_platform_include_dir=$_gcc_include_dir/$(gcc -dumpmachine) mkdir -p libcxx-${pkgver}.src/build cd libcxx-${pkgver}.src/build - cmake -G "Unix Makefiles" -DLIBCXX_CXX_ABI=libsupc++ \ - -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="${_gcc_include_dir};${_gcc_platform_include_dir}" \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "${srcdir}/libcxx-${pkgver}.src" + CC=clang CXX=clang++ cmake -G "Unix Makefiles" -DLIBCXX_CXX_ABI=libcxxabi \ + -DLIBCXX_LIBCXXABI_INCLUDE_PATHS=/usr/include \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/libcxx-${pkgver}.src" make } package() { diff --git a/community/libc++/libc++.install b/community/libc++/libc++.install new file mode 100644 index 000000000..caef683ae --- /dev/null +++ b/community/libc++/libc++.install @@ -0,0 +1,7 @@ +post_install() { + echo compile with \`clang++ -std=c++11 -stdlib=libc++ -lc++abi\` to use libc++ +} + +post_upgrade() { + post_install +} diff --git a/community/libc++abi/PKGBUILD b/community/libc++abi/PKGBUILD new file mode 100644 index 000000000..9d86d1cbc --- /dev/null +++ b/community/libc++abi/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Benno Fünfstück <pyhaxor@googlemail.com> + +pkgname=libc++abi +pkgver=3.2 +pkgrel=1 +pkgdesc='A new implementation of low level support for a standard C++ library' +arch=('i686' 'x86_64') +url="http://libcxxabi.llvm.org/" +license=('MIT' 'custom:University of Illinois/NCSA Open Source License') +makedepends=(subversion libunwind clang libc++) +source=(svn+https://llvm.org/svn/llvm-project/libcxxabi/branches/release_32) +md5sums=(SKIP) + +build() { + cd release_32/lib + ./buildit +} + +package() { + cd release_32 + mkdir -p "$pkgdir/usr/include" + install -Dm644 lib/libc++abi.so.1.0 "$pkgdir/usr/lib/libc++abi.so.1.0" + ln -s /usr/lib/libc++abi.so.1.0 "$pkgdir/usr/lib/libc++abi.so.1" + ln -s /usr/lib/libc++abi.so.1.0 "$pkgdir/usr/lib/libc++abi.so" + install include/* "$pkgdir/usr/include" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index 2e66d5198..263f045f2 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73658 2012-07-12 19:03:11Z spupykin $ +# $Id: PKGBUILD 94889 2013-08-01 06:55:04Z bpiotrowski $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libdlna pkgver=0.2.4 -pkgrel=11 +pkgrel=12 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index dd2f7eb41..a70c8a70e 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 93766 2013-07-10 06:57:36Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 94416 2013-07-23 07:33:46Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=1.1.0 -pkgrel=5 +pkgver=1.1.1 +pkgrel=1 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('a5bc8b8291cf810c659bfb3af378b5de') +md5sums=('90ba664616b06835db7ebc949388d03b') build() { cd $pkgname-$pkgver diff --git a/community/libkkc-data/PKGBUILD b/community/libkkc-data/PKGBUILD index 0a235cb22..cce108c2b 100644 --- a/community/libkkc-data/PKGBUILD +++ b/community/libkkc-data/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 94837 2013-07-31 03:58:38Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc-data -pkgver=0.2.5 +pkgver=0.2.7 pkgrel=1 pkgdesc="Language model data package for libkkc" arch=('i686' 'x86_64') @@ -23,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('bb31dca814e72dfcddf88f2da3fc37c5') +sha512sums=('61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7') diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD index c80ee65ec..91970093b 100644 --- a/community/libkkc/PKGBUILD +++ b/community/libkkc/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 94838 2013-07-31 03:58:39Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Japanese Kana Kanji conversion library" arch=('i686' 'x86_64') @@ -11,6 +12,7 @@ license=('GPL') options=(!libtool) depends=('marisa' 'json-glib' 'libgee06') makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') +optdepends=('sh: to use kkc-package-data') source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) build() { @@ -29,4 +31,4 @@ package() { "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" } -md5sums=('b50f0341596a4e290188a7bf5195cd26') +sha512sums=('2bb056cf00b6212a18462a5f952d4557944b29f49a92b0701abed5f5d6601fdb3b57c4e09a0b3db8ff39be01e91ab658656b89f576663046e53478ed07fe87af') diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD new file mode 100644 index 000000000..5a5d3b097 --- /dev/null +++ b/community/libsodium/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 94581 2013-07-27 14:32:50Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: namelessjon <jonathan.stott@gmail.com> +# Contributor: Alessio Sergi <asergi at archlinux dot us> + +pkgname=libsodium +pkgver=0.4.2 +pkgrel=2 +pkgdesc="P(ortable|ackageable) NaCl-based crypto library" +arch=('i686' 'x86_64') +url="https://github.com/jedisct1/libsodium" +license=('custom:ISC') +depends=('glibc') +options=('!libtool') +source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz) +sha256sums=('1a7901cdd127471724e854a8eb478247dc0ca67be549345c75fc6f2d4e05ed39') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$pkgname-$pkgver" + make check +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -d -m 755 "$pkgdir/usr/share/licenses/$pkgname" + install -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index e9cffbca3..adc24ab22 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93546 2013-07-05 10:38:11Z spupykin $ +# $Id: PKGBUILD 94790 2013-07-30 12:33:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -33,13 +33,11 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - "storage-fix.patch::https://bugs.archlinux.org/index.php?getfile=10700") -md5sums=('f980a84719033e9efca01048da505dfb' + libvirt.tmpfiles.d) +md5sums=('632f30a2f22fbb404b8e10702d7f55ca' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f' - '321f03bd626d2d24e816d5298c3bc3fe') + '020971887442ebbf1b6949e031c8dd3f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -51,8 +49,6 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - patch -p1 <$srcdir/storage-fix.patch - export LDFLAGS=-lX11 export RADVD=/usr/bin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \ diff --git a/community/linuxsampler/PKGBUILD b/community/linuxsampler/PKGBUILD deleted file mode 100644 index d1fe73fe1..000000000 --- a/community/linuxsampler/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 67532 2012-03-13 11:02:12Z lcarlier $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: svoufff <svoufff at gmail dot com> -# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> - -pkgname=linuxsampler -pkgver=1.0.0 -pkgrel=2 -pkgdesc="Professional-grade audio sampler alternative to Gigasampler" -arch=(i686 x86_64 'mips64el') -url="http://www.linuxsampler.org/" -license=('GPL' 'custom') -depends=('libgig' 'jack' 'sqlite3') -makedepends=('dssi' 'lv2core') -options=('libtool') # do NOT slay libtool; required by gigedit -source=(http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.bz2 - license.txt) -md5sums=('a97136791a3228d840b006e5481fc39d' - '746c1421eb9f6812b5fa411bfb923c75') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # install GPL exception statement - install -Dm644 ../license.txt \ - "$pkgdir/usr/share/licenses/$pkgname/GPL-EXCEPTION" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/linuxsampler/license.txt b/community/linuxsampler/license.txt deleted file mode 100644 index 98031bc95..000000000 --- a/community/linuxsampler/license.txt +++ /dev/null @@ -1,7 +0,0 @@ -LinuxSampler is licensed under the GNU GPL with the exception that -USAGE of the source code, libraries and applications -FOR COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without -prior written permission by the LinuxSampler authors. - -If you have questions on the subject, that are not yet covered by -the FAQ, please contact us. diff --git a/community/lout/PKGBUILD b/community/lout/PKGBUILD index 8d1ab95a9..90f7b3b0d 100644 --- a/community/lout/PKGBUILD +++ b/community/lout/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83917 2013-02-06 14:41:18Z kkeen $ +# $Id: PKGBUILD 94153 2013-07-15 07:02:55Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: catwell <catwell@archlinux.us> pkgname=lout -pkgver=3.39 -pkgrel=2 +pkgver=3.40 +pkgrel=1 pkgdesc="A lightweight document formatting system." arch=('i686' 'x86_64' 'mips64el') url="http://lout.wiki.sourceforge.net/" @@ -15,7 +15,7 @@ source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz makefile.arch lout.install http://pkgs.fedoraproject.org/repo/pkgs/lout/slides.pdf/6822c33e49a1dca0b090f297d404d7fa/slides.pdf) -md5sums=('151e1fba676c7052936ccc1bcd9663a9' +md5sums=('fd0fe084cebd07fc209d392a2d380755' '088a29ca16477a9a30da9fafc9391de8' '597cd52eb87ef6253cf769bed4db3952' '6822c33e49a1dca0b090f297d404d7fa') diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD index f8e5cb508..dd40dcf2b 100644 --- a/community/lwm/PKGBUILD +++ b/community/lwm/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67238 2012-03-05 15:00:02Z kkeen $ +# $Id: PKGBUILD 94155 2013-07-15 07:14:16Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Ben Mazer <blm@groknil.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=lwm -pkgver=1.2.2 -pkgrel=3.1 -pkgdesc="a very light weight window manager" +pkgver=1.2.3 +pkgrel=1 +pkgdesc="A very light weight window manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.jfc.org.uk/software/lwm.html" license=('GPL') depends=('xorg-server' 'libxext' 'libsm') makedepends=('imake') source=(http://www.jfc.org.uk/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('1748722a293e03d632b615275ef84498') +md5sums=('439789a5396107cca5f54e108760c1f4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD index 12443da90..ecddd34ad 100644 --- a/community/lxsession/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 80231 2012-11-18 09:34:03Z bpiotrowski $ +# $Id: PKGBUILD 94956 2013-08-01 13:37:08Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxsession -pkgver=0.4.6.1 -pkgrel=3 +pkgver=0.4.9.2 +pkgrel=2 pkgdesc='Lightweight X11 session manager' arch=('i686' 'x86_64' 'mips64el') url="http://lxde.org/" license=('GPL2') groups=('lxde') -depends=('gtk2' 'dbus') -makedepends=('pkgconfig' 'intltool') +depends=('gtk2' 'dbus' 'libgee06' 'dbus-glib' 'polkit' 'lsb-release') +makedepends=('pkgconfig' 'intltool' 'vala') replaces=('lxde-settings-daemon' 'lxsession-lite') conflicts=('lxsession-lite' 'lxde-settings-daemon') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - lxsession-0.4.6.1-logind-support.patch) -md5sums=('e456b64c5ab3652a4dec661ec706dc6e' - '7459321f5dc263493837768dcb03f852') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('bc3eb71936dbdf813e9ac2f00ab948f0') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np2 -i $srcdir/lxsession-0.4.6.1-logind-support.patch + cd $pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch deleted file mode 100644 index 44829e615..000000000 --- a/community/lxsession/lxsession-0.4.6.1-logind-support.patch +++ /dev/null @@ -1,608 +0,0 @@ ---- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.c 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.c 2012-11-13 17:26:30.807070976 +0100 -@@ -51,13 +51,20 @@ - char * dbus_HAL_Reboot(void); - char * dbus_HAL_Suspend(void); - char * dbus_HAL_Hibernate(void); -+gboolean dbus_logind_CanPowerOff(void); -+gboolean dbus_logind_CanReboot(void); -+gboolean dbus_logind_CanSuspend(void); -+gboolean dbus_logind_CanHibernate(void); -+char * dbus_logind_PowerOff(void); -+char * dbus_logind_Reboot(void); -+char * dbus_logind_Suspend(void); -+char * dbus_logind_Hibernate(void); -+char * dbus_LXDE_Logout(void); - /* End FORWARDS */ - - /* Connect to the system bus. Once a connection is made, it is saved for reuse. */ --static DBusConnection * dbus_connect(void) -+static DBusConnection * dbus_connect_system(void) - { -- if ((dbus_context.connection == NULL) && ( ! dbus_context.connection_tried)) -- { - DBusError error; - dbus_error_init(&error); - dbus_context.connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -67,16 +74,57 @@ - dbus_error_free(&error); - } - dbus_context.connection_tried = TRUE; -- } - - return dbus_context.connection; - } - -+static DBusConnection * dbus_connect_session(void) -+{ -+ DBusError error; -+ dbus_error_init(&error); -+ dbus_context.connection = dbus_bus_get(DBUS_BUS_SESSION, &error); -+ if (dbus_context.connection == NULL) -+ { -+ g_warning(G_STRLOC ": Failed to connect to the session message bus: %s", error.message); -+ dbus_error_free(&error); -+ } -+ dbus_context.connection_tried = TRUE; -+ -+ return dbus_context.connection; -+} -+ -+ - /* Send a message. */ --static DBusMessage * dbus_send_message(DBusMessage * message, char * * error_text) -+static DBusMessage * dbus_send_message_system(DBusMessage * message, char * * error_text) - { - /* Get a connection handle. */ -- DBusConnection * connection = dbus_connect(); -+ DBusConnection * connection = dbus_connect_system(); -+ if (connection == NULL) -+ return FALSE; -+ -+ /* Send the message. */ -+ DBusError error; -+ dbus_error_init(&error); -+ DBusMessage * reply = dbus_connection_send_with_reply_and_block(connection, message, DBUS_TIMEOUT, &error); -+ dbus_message_unref(message); -+ if (reply == NULL) -+ { -+ if ((error.name == NULL) || (strcmp(error.name, DBUS_ERROR_NO_REPLY) != 0)) -+ { -+ if (error_text != NULL) -+ *error_text = g_strdup(error.message); -+ g_warning(G_STRLOC ": DBUS: %s", error.message); -+ } -+ dbus_error_free(&error); -+ } -+ return reply; -+} -+ -+/* Send a message. */ -+static DBusMessage * dbus_send_message_session(DBusMessage * message, char * * error_text) -+{ -+ /* Get a connection handle. */ -+ DBusConnection * connection = dbus_connect_session(); - if (connection == NULL) - return FALSE; - -@@ -132,6 +180,36 @@ - } - return result; - } -+ -+/* Read a result for a method that returns a string encoded boolean. */ -+static gboolean dbus_read_result_sboolean(DBusMessage * reply) -+{ -+ gboolean result = FALSE; -+ char* string_result; -+ if (reply != NULL) -+ { -+ /* Get the string result. */ -+ DBusError error; -+ dbus_error_init(&error); -+ dbus_bool_t status = dbus_message_get_args( -+ reply, -+ &error, -+ DBUS_TYPE_STRING, &string_result, -+ DBUS_TYPE_INVALID); -+ if ( ! status) -+ { -+ g_warning(G_STRLOC ": DBUS: %s", error.message); -+ dbus_error_free(&error); -+ } -+ else -+ { -+ if (!strcmp(string_result, "yes")) -+ result = TRUE; -+ } -+ dbus_message_unref(reply); -+ } -+ return result; -+} - #endif - - /*** ConsoleKit mechanism ***/ -@@ -152,7 +230,7 @@ - static gboolean dbus_ConsoleKit_query(const char * const query) - { - #ifdef HAVE_DBUS -- return dbus_read_result_boolean(dbus_send_message(dbus_ConsoleKit_formulate_message(query), NULL)); -+ return dbus_read_result_boolean(dbus_send_message_system(dbus_ConsoleKit_formulate_message(query), NULL)); - #else - return FALSE; - #endif -@@ -163,7 +241,7 @@ - { - #ifdef HAVE_DBUS - char * error = NULL; -- dbus_read_result_void(dbus_send_message(dbus_ConsoleKit_formulate_message(command), &error)); -+ dbus_read_result_void(dbus_send_message_system(dbus_ConsoleKit_formulate_message(command), &error)); - return error; - #else - return NULL; -@@ -225,7 +303,7 @@ - DBUS_TYPE_INVALID); - - /* Send the message. */ -- DBusMessage * reply = dbus_send_message(message, NULL); -+ DBusMessage * reply = dbus_send_message_system(message, NULL); - if (reply == NULL) - return FALSE; - -@@ -252,7 +330,7 @@ - { - #ifdef HAVE_DBUS - char * error = NULL; -- dbus_read_result_void(dbus_send_message(dbus_UPower_formulate_command(command), &error)); -+ dbus_read_result_void(dbus_send_message_system(dbus_UPower_formulate_command(command), &error)); - return error; - #else - return NULL; -@@ -329,7 +407,7 @@ - DBusMessage * message = dbus_HAL_formulate_string_property_query(property); - if (message == NULL) - return FALSE; -- DBusMessage * reply = dbus_send_message(message, NULL); -+ DBusMessage * reply = dbus_send_message_system(message, NULL); - if (reply == NULL) - return FALSE; - dbus_message_unref(reply); -@@ -343,7 +421,7 @@ - static gboolean dbus_HAL_boolean_query(const char * const property) - { - #ifdef HAVE_DBUS -- return dbus_read_result_boolean(dbus_send_message(dbus_HAL_formulate_boolean_property_query(property), NULL)); -+ return dbus_read_result_boolean(dbus_send_message_system(dbus_HAL_formulate_boolean_property_query(property), NULL)); - #else - return FALSE; - #endif -@@ -367,7 +445,7 @@ - - /* Send the message and wait for a reply. */ - char * error = NULL; -- dbus_read_result_void(dbus_send_message(message, &error)); -+ dbus_read_result_void(dbus_send_message_system(message, &error)); - return error; - #else - return NULL; -@@ -421,3 +499,185 @@ - { - return dbus_HAL_command("Hibernate"); - } -+ -+/*** logind mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the logind Manager interface to query a property. */ -+static DBusMessage * dbus_logind_formulate_query(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ query); -+} -+ -+/* Formulate a message to the logind Manager interface. */ -+static DBusMessage * dbus_logind_formulate_message(const char * const method) -+{ -+ static dbus_bool_t interactive = FALSE; -+ DBusMessage * message = dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ method); -+ if (message != NULL) -+ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &interactive, DBUS_TYPE_INVALID); -+ return message; -+} -+#endif -+ -+/* Send a specified query to the logind interface and process a boolean result. */ -+static gboolean dbus_logind_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_sboolean(dbus_send_message_system(dbus_logind_formulate_query(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified command to the logind interface and process a void result. */ -+static char * dbus_logind_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_system(dbus_logind_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Read the can-poweroff property of logind. */ -+gboolean dbus_logind_CanPowerOff(void) -+{ -+ return dbus_logind_query("CanPowerOff"); -+} -+ -+/* Read the can-reboot property of logind. */ -+gboolean dbus_logind_CanReboot(void) -+{ -+ return dbus_logind_query("CanReboot"); -+} -+ -+/* Read the can-suspend property of logind. */ -+gboolean dbus_logind_CanSuspend(void) -+{ -+ return dbus_logind_query("CanSuspend"); -+} -+ -+/* Read the can-hibernate property of logind. */ -+gboolean dbus_logind_CanHibernate(void) -+{ -+ return dbus_logind_query("CanHibernate"); -+} -+ -+/* Invoke the PowerOff method on logind. */ -+char * dbus_logind_PowerOff(void) -+{ -+ return dbus_logind_command("PowerOff"); -+} -+ -+/* Invoke the Reboot method on logind. */ -+char * dbus_logind_Reboot(void) -+{ -+ return dbus_logind_command("Reboot"); -+} -+ -+/* Invoke the Suspend method on logind. */ -+char * dbus_logind_Suspend(void) -+{ -+ return dbus_logind_command("Suspend"); -+} -+ -+/* Invoke the Hibernate method on logind. */ -+char * dbus_logind_Hibernate(void) -+{ -+ return dbus_logind_command("Hibernate"); -+} -+ -+/*** LXDE mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the LXDE Session Manager interface. */ -+static DBusMessage * dbus_LXDE_formulate_message(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.lxde.SessionManager", -+ "/org/lxde/SessionManager", -+ "org.lxde.SessionManager", -+ query); -+} -+#endif -+ -+/* Send a specified message to the LXDE interface and process a boolean result. */ -+static gboolean dbus_LXDE_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_boolean(dbus_send_message_session(dbus_LXDE_formulate_message(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified message to the LXDE interface and process a void result. */ -+static char * dbus_LXDE_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_session(dbus_LXDE_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Invoke the Logout method on LXDE. */ -+char * dbus_LXDE_Logout(void) -+{ -+ return dbus_LXDE_command("Logout"); -+} -+ -+/*** Lightdm mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the Lightdm interface. */ -+static DBusMessage * dbus_Lightdm_formulate_message(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.freedesktop.DisplayManager", -+ g_getenv ("XDG_SEAT_PATH"), -+ "org.freedesktop.DisplayManager.Seat", -+ query); -+} -+#endif -+ -+/* Send a specified message to the Lightdm interface and process a boolean result. */ -+static gboolean dbus_Lightdm_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_boolean(dbus_send_message_session(dbus_Lightdm_formulate_message(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified message to the Lightdm interface and process a void result. */ -+static char * dbus_Lightdm_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_session(dbus_Lightdm_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Invoke the Logout method on LXDE. */ -+char * dbus_Lightdm_SwitchToGreeter(void) -+{ -+ return dbus_Lightdm_command("SwitchToGreeter"); -+} ---- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.h 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.h 2012-11-13 17:26:30.807070976 +0100 -@@ -44,4 +44,18 @@ - extern char * dbus_HAL_Suspend(void); - extern char * dbus_HAL_Hibernate(void); - -+/* Interface to logind for shutdown, reboot, suspend, and hibernate. */ -+extern gboolean dbus_logind_CanPowerOff(void); -+extern gboolean dbus_logind_CanRestart(void); -+extern char * dbus_logind_PowerOff(void); -+extern char * dbus_logind_Restart(void); -+extern gboolean dbus_logind_CanSuspend(void); -+extern gboolean dbus_logind_CanHibernate(void); -+extern char * dbus_logind_Suspend(void); -+extern char * dbus_logind_Hibernate(void); -+ -+extern char * dbus_LXDE_Logout(void); -+ -+extern char * dbus_Lightdm_SwitchToGreeter(); -+ - #endif ---- src/lxsession-0.4.6.1/lxsession-logout/lxsession-logout.c 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/lxsession-logout.c 2012-11-13 17:26:30.807070976 +0100 -@@ -69,12 +69,21 @@ - int reboot_HAL : 1; /* Reboot is available via HAL */ - int suspend_HAL : 1; /* Suspend is available via HAL */ - int hibernate_HAL : 1; /* Hibernate is available via HAL */ -+ int shutdown_logind : 1; /* Shutdown is available via logind */ -+ int reboot_logind : 1; /* Reboot is available via logind */ -+ int suspend_logind : 1; /* Suspend is available via logind */ -+ int hibernate_logind : 1; /* Hibernate is available via logind */ - int switch_user_GDM : 1; /* Switch User is available via GDM */ -- int switch_user_KDM : 1; /* Switch User is available via KDM */ -+ int switch_user_LIGHTDM : 1; /* Switch User is available via GDM */ -+ int switch_user_KDM : 1; /* Switch User is available via LIGHTDM */ - int ltsp : 1; /* Shutdown and reboot is accomplished via LTSP */ -+ -+ int lock_screen : 1; /* Lock screen available */ -+ - } HandlerContext; - - static gboolean lock_screen(void); -+static const gchar* determine_lock_screen(void); - static gboolean verify_running(const char * display_manager, const char * executable); - static void logout_clicked(GtkButton * button, HandlerContext * handler_context); - static void change_root_property(GtkWidget* w, const char* prop_name, const char* value); -@@ -93,13 +102,32 @@ - */ - static gboolean lock_screen(void) - { -- if (!g_spawn_command_line_async("lxlock", NULL)) -+ const gchar* program = determine_lock_screen(); -+ -+ if (program) - { -+ g_spawn_command_line_async(program, NULL); - return TRUE; - } - return FALSE; - } - -+static const gchar* determine_lock_screen(void) -+{ -+ const gchar* program = NULL; -+ -+ if (g_find_program_in_path("xdg-screensaver")) -+ { -+ program = "xdg-screensaver lock"; -+ } -+ else if (g_find_program_in_path("lxlock")) -+ { -+ program = "lxlock"; -+ } -+ return program; -+} -+ -+ - /* Verify that a program is running and that an executable is available. */ - static gboolean verify_running(const char * display_manager, const char * executable) - { -@@ -187,6 +215,8 @@ - error_result = dbus_ConsoleKit_Stop(); - else if (handler_context->shutdown_HAL) - error_result = dbus_HAL_Shutdown(); -+ else if (handler_context->shutdown_logind) -+ error_result = dbus_logind_PowerOff(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -208,6 +238,8 @@ - error_result = dbus_ConsoleKit_Restart(); - else if (handler_context->reboot_HAL) - error_result = dbus_HAL_Reboot(); -+ else if (handler_context->reboot_logind) -+ error_result = dbus_logind_Reboot(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -225,6 +257,8 @@ - error_result = dbus_UPower_Suspend(); - else if (handler_context->suspend_HAL) - error_result = dbus_HAL_Suspend(); -+ else if (handler_context->suspend_logind) -+ error_result = dbus_logind_Suspend(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -242,6 +276,8 @@ - error_result = dbus_UPower_Hibernate(); - else if (handler_context->hibernate_HAL) - error_result = dbus_HAL_Hibernate(); -+ else if (handler_context->hibernate_logind) -+ error_result = dbus_logind_Hibernate(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -258,6 +294,17 @@ - g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL); - else if (handler_context->switch_user_KDM) - g_spawn_command_line_sync("kdmctl reserve", NULL, NULL, NULL, NULL); -+ else if (handler_context->switch_user_LIGHTDM) -+ dbus_Lightdm_SwitchToGreeter(); -+ gtk_main_quit(); -+} -+ -+/* Handler for "clicked" signal on Lock button. */ -+static void lock_screen_clicked(GtkButton * button, HandlerContext * handler_context) -+{ -+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), NULL); -+ -+ lock_screen(); - gtk_main_quit(); - } - -@@ -435,6 +482,28 @@ - handler_context.hibernate_HAL = TRUE; - } - -+ /* Initialize capabilities of the logind mechanism. */ -+ if (!handler_context.shutdown_available && dbus_logind_CanPowerOff()) -+ { -+ handler_context.shutdown_available = TRUE; -+ handler_context.shutdown_logind = TRUE; -+ } -+ if (!handler_context.reboot_available && dbus_logind_CanReboot()) -+ { -+ handler_context.reboot_available = TRUE; -+ handler_context.reboot_logind = TRUE; -+ } -+ if (!handler_context.suspend_available && dbus_logind_CanSuspend()) -+ { -+ handler_context.suspend_available = TRUE; -+ handler_context.suspend_logind = TRUE; -+ } -+ if (!handler_context.hibernate_available && dbus_logind_CanHibernate()) -+ { -+ handler_context.hibernate_available = TRUE; -+ handler_context.hibernate_logind = TRUE; -+ } -+ - /* If we are under GDM, its "Switch User" is available. */ - if (verify_running("gdm", "gdmflexiserver")) - { -@@ -442,6 +511,34 @@ - handler_context.switch_user_GDM = TRUE; - } - -+ /* If we are under GDM3, its "Switch User" is available. */ -+ if (verify_running("gdm3", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm also use gdmflexiserver */ -+ if (verify_running("lightdm", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm also use gdmflexiserver */ -+ if (verify_running("lightdm", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm can also be find by the env */ -+ if (g_getenv("XDG_SEAT_PATH")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_LIGHTDM = TRUE; -+ } -+ - /* If we are under KDM, its "Switch User" is available. */ - if (verify_running("kdm", "kdmctl")) - { -@@ -451,7 +548,18 @@ - - /* LTSP support */ - if (g_getenv("LTSP_CLIENT")) -+ { - handler_context.ltsp = TRUE; -+ handler_context.shutdown_available = TRUE; -+ handler_context.reboot_available = TRUE; -+ } -+ -+ /* Lock screen */ -+ const gchar* very_lock_screen = determine_lock_screen(); -+ if (very_lock_screen) -+ { -+ handler_context.lock_screen = TRUE; -+ } - - /* Make the button images accessible. */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images"); -@@ -596,6 +704,17 @@ - gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4); - } - -+ /* Create the Lock Screen button. */ -+ if (handler_context.lock_screen && !handler_context.ltsp) -+ { -+ GtkWidget * lock_screen_button = gtk_button_new_with_mnemonic(_("L_ock Screen")); -+ GtkWidget * image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_BUTTON); -+ gtk_button_set_image(GTK_BUTTON(lock_screen_button), image); -+ gtk_button_set_alignment(GTK_BUTTON(lock_screen_button), 0.0, 0.5); -+ g_signal_connect(G_OBJECT(lock_screen_button), "clicked", G_CALLBACK(lock_screen_clicked), &handler_context); -+ gtk_box_pack_start(GTK_BOX(controls), lock_screen_button, FALSE, FALSE, 4); -+ } -+ - /* Create the Logout button. */ - GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout")); - GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON); diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index fa9b9dcf1..13d8d02b2 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93166 2013-06-26 17:55:13Z svenstaro $ +# $Id: PKGBUILD 94891 2013-08-01 06:55:07Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.8.0beta1 _pkgver=3.8.0-beta1 -pkgrel=1 +pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD index b35effbad..6d9b9239f 100644 --- a/community/metapixel/PKGBUILD +++ b/community/metapixel/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 90060 2013-05-06 19:38:23Z foutrelis $ +# $Id: PKGBUILD 94928 2013-08-01 07:01:23Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> pkgname=metapixel pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc='A program for generating photomosaics.' arch=('i686' 'x86_64' 'mips64el') url='http://www.complang.tuwien.ac.at/schani/metapixel/' license=('GPL') depends=('giflib' 'libjpeg' 'libpng' 'perl') source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" - 'metapixel-1.0.2-libpng-1.5.patch') + 'metapixel-1.0.2-libpng-1.5.patch' + 'metapixel-1.0.2-giflib-5.0.patch') md5sums=('af5d77d38826756af213a08e3ada9941' - '1832a79790b07402735bfeb9f71f36e9') + '1832a79790b07402735bfeb9f71f36e9' + 'f16abb33c545734eea36ec16c92a05e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch + patch -p0 -i ../metapixel-1.0.2-giflib-5.0.patch make } diff --git a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch new file mode 100644 index 000000000..d9d4b9065 --- /dev/null +++ b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch @@ -0,0 +1,11 @@ +--- rwimg/rwgif.c.orig 2013-07-30 13:21:57.733602922 +0200 ++++ rwimg/rwgif.c 2013-07-30 13:21:01.827421262 +0200 +@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + diff --git a/community/meterbridge/PKGBUILD b/community/meterbridge/PKGBUILD new file mode 100644 index 000000000..3cc12bb90 --- /dev/null +++ b/community/meterbridge/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 94414 2013-07-22 22:01:34Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=meterbridge +pkgver=0.9.2 +pkgrel=1 +pkgdesc="Collection of Audio meters for the JACK audio server" +arch=('i686' 'x86_64') +url="http://plugin.org.uk/meterbridge/" +license=('GPL') +depends=('jack' 'sdl_image') +source=("http://plugin.org.uk/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('ef5d20761755c88e5b5a0c35f11f670e') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # gcc 4.x fix + sed -i "s/ buf_rect.*,//" src/main.h + + # iec scale fix + # http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-June/032475.html + sed -i 's/ 5.0/ 2.5/' src/dpm_meters.c +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + aclocal && automake -a && autoconf + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/midori-gtk3/PKGBUILD b/community/midori-gtk3/PKGBUILD new file mode 100644 index 000000000..8f2deb460 --- /dev/null +++ b/community/midori-gtk3/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 94988 2013-08-02 13:05:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: rabyte <rabyte.at.gmail.dot.com> +# Contributor: Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> + +pkgname=midori-gtk3 +pkgver=0.5.4 +pkgrel=2 +pkgdesc='Lightweight web browser (GTK3)' +arch=('x86_64' 'i686') +url='http://www.midori-browser.org/' +license=('LGPL2.1') +install='midori.install' +conflicts=('midori') +provides=('midori') +depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') +optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' + 'aria2: download utility') +options=('!emptydirs') +source=("http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2") +sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') + +build() { + cd "$srcdir/midori_${pkgver}_all_" + + # if granite is present, the build fails (last time I tried) + python2 ./waf configure \ + --prefix=/usr \ + --enable-gtk3 \ + --disable-granite \ + --enable-webkit2 + python2 ./waf build +} + +package() { + cd "$srcdir/midori_${pkgver}_all_" + + DESTDIR="$pkgdir" python2 ./waf install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/midori-gtk3/midori.install b/community/midori-gtk3/midori.install new file mode 100644 index 000000000..e6af79c5f --- /dev/null +++ b/community/midori-gtk3/midori.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 6c81af3a3..5ed94865e 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91092 2013-05-19 10:48:50Z arodseth $ +# $Id: PKGBUILD 94981 2013-08-02 10:17:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -7,38 +7,32 @@ # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori -pkgver=0.5.2 -pkgrel=1 -pkgdesc='Lightweight web browser based on Gtk WebKit' +pkgver=0.5.4 +pkgrel=4 +pkgdesc='Lightweight web browser (GTK2)' arch=('x86_64' 'i686' 'mips64el') -url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' +url='http://www.midori-browser.org/' license=('LGPL2.1') -install="$pkgname.install" -depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr') +install='midori.install' +depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique' 'gcr') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') options=('!emptydirs') -source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") -sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c') +source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2") +sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/${pkgname}_${pkgver}_all_" - ./configure --prefix=/usr \ - --jobs=${MAKEFLAGS/-j/} \ - --enable-addons \ - --enable-unique \ - --enable-nls \ - --enable-docs \ - --enable-apidocs - make + python2 ./waf configure --prefix=/usr + python2 ./waf build } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/${pkgname}_${pkgver}_all_" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" python2 ./waf install } # vim:set ts=2 sw=2 et: diff --git a/community/midori/midori.install b/community/midori/midori.install index 4da5511fd..e6af79c5f 100644 --- a/community/midori/midori.install +++ b/community/midori/midori.install @@ -10,3 +10,5 @@ post_upgrade() { post_remove() { post_install $1 } + +# vim:set ts=2 sw=2 et: diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 2643d6ed4..fdd66999c 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $ +# $Id: PKGBUILD 94892 2013-08-01 06:55:08Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 7006cd73e..78447dab4 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ +# $Id: PKGBUILD 94436 2013-07-25 05:59:37Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R46 -pkgrel=3 +pkgver=R47 +pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -13,7 +13,7 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('77c108d8143a6e7670954d77517d216d' +md5sums=('71c7cbcd78306897801b8b6691091e66' 'a231b325d5f2155a6c667a9323986718') build() { diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 5a391e8cb..633deeff7 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92918 2013-06-19 09:58:46Z bluewind $ +# $Id: PKGBUILD 94893 2013-08-01 06:55:10Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index 4bcbe2eb6..2baa5ab47 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90689 2013-05-13 14:29:50Z spupykin $ +# $Id: PKGBUILD 94894 2013-08-01 06:55:12Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=9 +pkgrel=10 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 047f8a063..4711ca200 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92601 2013-06-09 16:56:19Z bpiotrowski $ +# $Id: PKGBUILD 94896 2013-08-01 06:55:15Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20130428 -pkgrel=1 +pkgrel=4 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmp 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' - 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') + 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu' 'giflib') makedepends=('unzip' 'python' 'python-docutils' 'git') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') @@ -26,13 +26,21 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa) -sha256sums=('SKIP') +source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa + giflib-5.0.patch) +sha256sums=('SKIP' + '20706ebb35e7c1935ae263c48d623a878db3b634ca575927913f56d9ce059c7a') + +pkgver() { + cd $pkgname + git log -1 --format="%cd" --date=short | sed 's|-||g' +} prepare() { cd $pkgname sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; + patch -Np1 -i ../giflib-5.0.patch } build() { @@ -43,6 +51,7 @@ build() { ./configure --prefix=/usr --confdir=/etc/mplayer \ --enable-translation --language=all \ --enable-joystick \ + --enable-gif \ --disable-speex \ --disable-openal \ --disable-libdv \ diff --git a/community/mplayer2/giflib-5.0.patch b/community/mplayer2/giflib-5.0.patch new file mode 100644 index 000000000..9eaa6e98e --- /dev/null +++ b/community/mplayer2/giflib-5.0.patch @@ -0,0 +1,111 @@ +diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c +index b808f81..c61d86c 100644 +--- a/libvo/vo_gif89a.c ++++ b/libvo/vo_gif89a.c +@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); + #endif + ++#if GIFLIB_MAJOR > 4 ++ new_gif = EGifOpenFileName(gif_filename, 0, NULL); ++#else + new_gif = EGifOpenFileName(gif_filename, 0); ++#endif + if (new_gif == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); + return 1; +@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, + return 1; + } + ++#if GIFLIB_MAJOR > 4 ++ reduce_cmap = GifMakeMapObject(256, NULL); ++#else + reduce_cmap = MakeMapObject(256, NULL); ++#endif + if (reduce_cmap == NULL) { + free(slice_data); slice_data = NULL; + free(reduce_data); reduce_data = NULL; +@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo + } + + R = Ra; G = Ga; B = Ba; ++#if GIFLIB_MAJOR > 4 ++ return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors); ++#else + return QuantizeBuffer(width, height, &size, R, G, B, dst, colors); ++#endif + } + + static void flip_page(void) +@@ -365,8 +377,11 @@ static void uninit(void) + free(gif_filename); + free(slice_data); + free(reduce_data); ++#if GIFLIB_MAJOR > 4 ++ if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap); ++#else + if (reduce_cmap != NULL) FreeMapObject(reduce_cmap); +- ++#endif + // set the pointers back to null. + new_gif = NULL; + gif_filename = NULL; + +diff --git a/configure b/configure +index 95a5ae8..d9c826f 100755 +--- a/configure ++++ b/configure +@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then + _gif=no + for _ld_gif in "-lungif" "-lgif" ; do + statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break ++ statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break + done + fi + +diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c +index eee7a85..a764474 100644 +--- a/libmpdemux/demux_gif.c ++++ b/libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++static void PrintGifError(errcode) ++{ ++ char *Err = GifErrorString(errcode); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) + gif_priv_t *priv = calloc(1, sizeof(gif_priv_t)); + sh_video_t *sh_video = NULL; + GifFileType *gif = NULL; ++ int GifError; + + priv->current_pts = 0; + demuxer->seekable = 0; // FIXME +@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) + // not read from the beginning of the file and the command will fail. + // with this hack enabled, you will lose the ability to stream a GIF. + lseek(demuxer->stream->fd, 0, SEEK_SET); +- gif = DGifOpenFileHandle(demuxer->stream->fd); ++ gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError); + #else +- gif = DGifOpen(demuxer->stream, my_read_gif); ++ gif = DGifOpen(demuxer->stream, my_read_gif, &GifError); + #endif + if (!gif) { +- PrintGifError(); ++ PrintGifError(GifError); + free(priv); + return NULL; + } diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index da85c2b5c..20adab7ad 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,28 +1,42 @@ -# $Id: PKGBUILD 90064 2013-05-06 19:38:31Z foutrelis $ +# $Id: PKGBUILD 94929 2013-08-01 07:01:24Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=6 -pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" +pkgrel=8 +pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('i686' 'x86_64' 'mips64el') -url="http://mtpaint.sourceforge.net/" +url='http://mtpaint.sourceforge.net/' license=('GPL3') depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') -install=mtpaint.install +makedepends=('setconf') +install='mtpaint.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - "libpng15.patch") + 'libpng15.patch') sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i '../libpng15.patch' + sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c + sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c + sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c + sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c + sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c +} + build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ../libpng15.patch + export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS" ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff sed -i 's:-lpng:-lpng -lgif:' _conf.txt + sed -i 's:ungif:gif:g' _conf.txt + setconf _conf.txt CC 'gcc -w' make } diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index a514ea801..84deacad3 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $ +# $Id: PKGBUILD 94357 2013-07-22 11:20:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.2.4 -pkgrel=2 +pkgver=5.2.5 +pkgrel=1 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64 mips64el) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -12,7 +12,7 @@ makedepends=('cmake') license=('GPL') options=('libtool') source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('0ace04820794ea1712b2a303ebd99dba') +md5sums=('909e0c3c9c341fe777d0a620c4084442') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 368cf746d..5616cc87c 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93850 2013-07-11 09:50:39Z jconder $ +# $Id: PKGBUILD 94897 2013-08-01 06:55:19Z bpiotrowski $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=9 +pkgrel=10 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index 698decddd..c499709c7 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 82601 2013-01-21 11:30:27Z spupykin $ +# $Id: PKGBUILD 94780 2013-07-30 10:05:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia -pkgver=1.44 +pkgver=1.45 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' 'mips64el') -depends=('sdl' 'alsa-lib' 'gtk3' 'glu') +depends=('sdl' 'alsa-lib' 'gtk3' 'glu' 'libarchive') makedepends=('unzip' 'mesa') source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" "build-fix.patch") -md5sums=('ea59be039dfc50ae32a6decf905f04b8' +md5sums=('f34aa327011af7c149ec679db5b53362' '4a852d8e484c2fe214377ec18a68356f') build() { diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 08fb0bff5..cc8f0ca4b 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93729 2013-07-09 07:18:03Z bpiotrowski $ +# $Id: PKGBUILD 94240 2013-07-17 19:28:57Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,8 +7,8 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.4.1 -pkgrel=4 +pkgver=1.4.2 +pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -29,7 +29,7 @@ backup=(${_cfgdir:1}/fastcgi.conf source=(http://nginx.org/download/nginx-$pkgver.tar.gz service logrotate) -sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119' +sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611' '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 0798f9d98..e9aebcc54 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93869 2013-07-11 15:37:07Z bpiotrowski $ +# $Id: PKGBUILD 94551 2013-07-26 20:25:44Z 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.10.13 +pkgver=0.10.15 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('a102fad260d216b95611ddd57aeb6531c92ad1038508390654423feb1b51c059') +sha256sums=('87345ab3b96aa02c5250d7b5ae1d80e620e8ae2a7f509f7fa18c4aaa340953e8') prepare() { cd node-v$pkgver diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index b8d257e9d..abc581a57 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $ +# $Id: PKGBUILD 94613 2013-07-28 13:05:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd -pkgver=3.2.15 -pkgrel=2 +pkgver=3.2.16 +pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -14,7 +14,7 @@ makedepends=('flex') arch=('i686' 'x86_64' 'mips64el') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') -sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664' +sha1sums=('cb95efa819902799365691a0a7ddb3690a97df88' 'f35ecb887e86ae0a54ac70aef5a7577fc8761877') install=install diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index 5030c8173..a1373f9c1 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92051 2013-05-31 00:48:23Z seblu $ +# $Id: PKGBUILD 94084 2013-07-14 10:32:42Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget -pkgver=10.2 -pkgrel=2 +pkgver=11.0 +pkgrel=1 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686' 'mips64el') url="http://nzbget.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt') makedepends=('autoconf' 'automake') changelog=$pkgname.changelog source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.gz) -sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2') +sha256sums=('27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index e0ea55273..7e2a9312a 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2013-07-14-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 11.0-1 + 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * nzbget 10.2-1 diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index bcb33ed15..737acc1b9 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93727 2013-07-08 23:58:49Z seblu $ +# $Id: PKGBUILD 94352 2013-07-22 08:32:55Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.2.0 +pkgver=2.4.0 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=('2afc64577936a1a79cff72b0718c9636') +md5sums=('456774fbc37d5267e4e8920694b7ad48') build() { cd $pkgname-$pkgver diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD index f748da628..1157c0a30 100644 --- a/community/openclonk/PKGBUILD +++ b/community/openclonk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90070 2013-05-06 19:38:47Z foutrelis $ +# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Wesley <rudirennsau at hotmail dot com> pkgname=openclonk pkgver=5.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multiplayer-action-tactic-skill game" arch=('i686' 'x86_64') url="http://openclonk.org" @@ -22,7 +22,7 @@ build() { cmake ../ -DCMAKE_INSTALL_PREFIX=/usr - make + make } package() { @@ -34,3 +34,5 @@ package() { install -dm755 "$pkgdir"/usr/share/licenses/$pkgname install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname } + +# vim: ts=2 sw=2 et: diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 4a8953754..fb8d89490 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94036 2013-07-13 12:34:57Z svenstaro $ +# $Id: PKGBUILD 94899 2013-08-01 06:55:22Z bpiotrowski $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 3ef92191b..e5e1734b6 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90073 2013-05-06 19:38:55Z foutrelis $ +# $Id: PKGBUILD 94900 2013-08-01 06:55:23Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=10 +pkgver=3.2.0 +pkgrel=3 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') @@ -16,11 +16,9 @@ makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip +source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip) +md5sums=('4980f8692712a24d4c99f363f80c6814') build() { cd OpenSceneGraph-$pkgver @@ -42,8 +40,7 @@ build() { -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so - sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch +# sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp make } diff --git a/community/openscenegraph/osg-xine-1.2.patch b/community/openscenegraph/osg-xine-1.2.patch deleted file mode 100644 index c73b588dc..000000000 --- a/community/openscenegraph/osg-xine-1.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c ---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 -+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 -@@ -2769,8 +2769,8 @@ - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -- rgb_class->driver_class.get_identifier = get_identifier; -- rgb_class->driver_class.get_description = get_description; -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index d0092cdb9..fc56c8211 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 94037 2013-07-13 12:35:07Z svenstaro $ +# $Id: PKGBUILD 94175 2013-07-15 22:55:05Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage pkgver=1.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) -url="http://code.google.com/p/openshadinglanguage/" +url="https://github.com/imageworks/OpenShadingLanguage" license=('custom') -depends=('boost-libs' 'openimageio' 'openexr' 'llvm' 'intel-tbb' 'freetype2' 'libpng' 'libtiff') +depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm') makedepends=('boost' 'cmake' 'clang') source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) md5sums=('17aaa01987963220e164522c29281f14') @@ -22,6 +22,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_STATIC=1 \ .. make } diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index c2ab306fd..c4f6e8eda 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92128 2013-06-01 08:22:38Z lcarlier $ +# $Id: PKGBUILD 94719 2013-07-29 13:10:04Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('f6cb90e0773dc7bdf01161ded03e48661a65c3f1412b192ae954215aaf26eca2') +sha256sums=('f6efc0cd0c4f4315a98844c331acc2e02322d5671ec376b9f0a11795b0eb270b') package() { cd ${pkgname}-${pkgver} diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index f1fce3b3a..8efac66ff 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83205 2013-01-28 10:08:03Z spupykin $ +# $Id: PKGBUILD 94305 2013-07-19 15:21:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,16 @@ license=('GPL3') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) -md5sums=('81633e87f096030e1f23904927f4c32f') +md5sums=('62f96188afc1cc2fe5b48f334bd4c99f') build() { cd "$srcdir/parcellite-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "$srcdir/parcellite-$pkgver" make DESTDIR="$pkgdir" install make distclean } diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 0ad0688a2..eb2f558e3 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93130 2013-06-25 14:39:40Z spupykin $ +# $Id: PKGBUILD 94522 2013-07-26 10:51:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" @@ -21,7 +21,7 @@ conflicts=('parole-media-player-git') options=('!libtool') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('0236073ad67916092a75fcaa59583780') +md5sums=('ab87c3067e310cf200e26a61ed95cdf8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 94a3bda89..eba0b90dc 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92115 2013-05-31 16:30:12Z spupykin $ +# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=5.4.0 +pkgver=5.6.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=('5f4603d4c4ee8d60826e56f9012d2e99') +md5sums=('7bf098790c5772bb45480abe3e425f3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 5ae07a8ca..a21b13a8a 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 93666 2013-07-08 11:18:56Z spupykin $ +# $Id: PKGBUILD 94307 2013-07-19 15:21:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.7 +pkgver=4.0.10 pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('07f892d34164bfcc883a46d8b730b8e5') +md5sums=('a30ec12f12923aedd42ed2747903f65a') build(){ cd $srcdir/passenger-release-$pkgver @@ -32,5 +32,5 @@ package() { cp -R * $pkgdir/usr/lib/passenger/ mkdir -p $pkgdir/usr/lib/httpd/modules - ln -sf /usr/lib/passenger/libout/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so + ln -sf /usr/lib/passenger/buildout/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so } diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index fec340497..5c9a682ad 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79229 2012-11-01 10:32:52Z bpiotrowski $ +# $Id: PKGBUILD 94411 2013-07-22 20:03:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('af0cff78690e658f3c06ceabf27bc71a') +md5sums=('853ef5e3eba6bf36e15985bfe3170456') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 201bb53e2..d20f9db2a 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94039 2013-07-13 12:35:25Z svenstaro $ +# $Id: PKGBUILD 94902 2013-08-01 06:55:27Z bpiotrowski $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=8 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -14,19 +14,22 @@ makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2 performous-0.7.0-cmake.patch - fix-noisy-sound-output.patch) + fix-noisy-sound-output.patch + ffmpeg-2.0.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' '7da8aef3f4dd28e19f95957ae9ac2bb1' - '820dc6d1a91c23f0ef56e2cd1759afb6') + '820dc6d1a91c23f0ef56e2cd1759afb6' + '9f781162b6ebc77b68caa05e2941c527') prepare() { cd performous-${pkgver} # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch - # fix FS#33948 (merged upstream) patch -Np1 -i ../fix-noisy-sound-output.patch + # fix building with ffmpeg-2.0 + patch -Np1 -i ../ffmpeg-2.0.patch } build() { diff --git a/community/performous/ffmpeg-2.0.patch b/community/performous/ffmpeg-2.0.patch new file mode 100644 index 000000000..26819dd9b --- /dev/null +++ b/community/performous/ffmpeg-2.0.patch @@ -0,0 +1,11 @@ +diff -ru performous-0.7.0/game/ffmpeg.cc performous-0.7.0a/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0a/game/ffmpeg.cc 2013-07-17 10:28:11.284467081 +0200 +@@ -17,6 +17,7 @@ + #endif + + #define AUDIO_CHANNELS 2 ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; + diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index 19b7ed1cb..0b6cbb498 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,23 +1,16 @@ -# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $ +# $Id: PKGBUILD 94938 2013-08-01 11:26:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des -pkgver=2.05 -pkgrel=6 +pkgver=2.07 +pkgrel=1 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~dparis/Crypt-DES" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz" - "perl-5.18.patch") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb' - '836d1a954281257efe00503d98b42dc8') - -prepare() { - cd $srcdir/Crypt-DES-$pkgver - patch -p1 <$srcdir/perl-5.18.patch -} +source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") +md5sums=('e845d24cf383ca4a30a3380a2735feac') build() { cd $srcdir/Crypt-DES-$pkgver diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch deleted file mode 100644 index 16e5aac85..000000000 --- a/community/perl-crypt-des/perl-5.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs ---- Crypt-DES-2.05.org/DES.xs 2005-12-08 18:52:50.000000000 +0300 -+++ Crypt-DES-2.05/DES.xs 2013-05-20 15:35:58.668612530 +0400 -@@ -64,8 +64,7 @@ - output = sv_newmortal(); - output_len = 8; - -- if (!SvUPGRADE(output, SVt_PV)) -- croak("cannot use output argument as lvalue"); -+ SvUPGRADE(output, SVt_PV); - - perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); - diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD index 805749e53..f8a39a069 100644 --- a/community/perl-package-stash-xs/PKGBUILD +++ b/community/perl-package-stash-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91690 2013-05-26 09:25:52Z bluewind $ +# $Id: PKGBUILD 94211 2013-07-16 19:26:21Z jsteel $ # Maintainer: Jonathan Steel <mail@jsteel.org> # Contributor: Justin Davis <jrcd83@gmail.com> pkgname=perl-package-stash-xs -pkgver=0.26 -pkgrel=2 +pkgver=0.28 +pkgrel=1 pkgdesc="Faster and more correct implementation of the Package::Stash API" arch=(i686 x86_64 mips64el) url="http://search.cpan.org/dist/Package-Stash-XS" @@ -13,8 +13,8 @@ depends=('perl') makedepends=('perl-extutils-makemaker') checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires') options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") -md5sums=('33b07af6344d4a16ecd4e9ae3fa48984') +source=(http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-$pkgver.tar.gz) +md5sums=('9664356ec3be02626cbd3081ec246b70') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,7 +24,9 @@ build() { MODULEBUILDRC=/dev/null cd Package-Stash-XS-${pkgver} + /usr/bin/perl Makefile.PL + make ) } @@ -32,17 +34,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" cd Package-Stash-XS-${pkgver} + make test ) } package() { cd Package-Stash-XS-${pkgver} - make DESTDIR="$pkgdir" install -} -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: + make DESTDIR="$pkgdir"/ install +} diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index c868ca892..1367ad42a 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91693 2013-05-26 09:25:57Z bluewind $ +# $Id: PKGBUILD 94191 2013-07-16 14:53:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=1.07 -pkgrel=2 +pkgver=1.08 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'perl-module-implementation') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('7cb0e18bd547f3ba9c492712d1795ac6') +md5sums=('5edfb0ffd92cbb0e2646ddf23d4516e9') build() { cd Params-Validate-${pkgver} diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index 33213a413..7dffb0ade 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 92665 2013-06-11 09:54:52Z idevolder $ # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Jarek Sedlacek <jareksedlacek@gmail.com> pkgname=php-mongo -pkgver=1.4.1 -pkgrel=2 +pkgver=1.4.2 +pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" @@ -27,5 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } -sha256sums=('230e7d26eaa826c7aacfc90fd1128f8c390216abe7f588d3bbcd130bd1fb84b6' +sha256sums=('ecbf8621c418c35abb0d5e9719432a2f315db2559023861105635bae5bfbd120' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 03ad2c151..768c58981 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,33 +1,43 @@ -# $Id: PKGBUILD 93040 2013-06-23 03:02:10Z fyan $ +# $Id: PKGBUILD 94960 2013-08-01 15:24:00Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.1f -_commit=66b7498a7530a1c47dabbe05c0726a9188353217 +pkgver=0.2a.20130801 +_branch=dev +_commit=3f1b9ecb6f38b8c8a58f2bea33684f40526b7e66 pkgrel=1 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') +depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev') optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit") -source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver") -md5sums=('SKIP') +source=("git://github.com/xiehuc/pidgin-lwqq.git#branch=$_branch" +#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" + "git://github.com/xiehuc/lwqq.git") -build() -{ +prepare() { + cd "$srcdir/$pkgname" + git checkout $_commit + git submodule init + git config submodule."liblwqq".url "$srcdir/lwqq" + git submodule update +} + +build() { cd "${srcdir}/$pkgname" cmake -DCMAKE_INSTALL_PREFIX=/usr . make } -package() -{ +package() { cd "$srcdir/$pkgname" make DESTDIR="${pkgdir}" install } + +sha512sums=('SKIP' + 'SKIP') diff --git a/community/playpen/PKGBUILD b/community/playpen/PKGBUILD new file mode 100644 index 000000000..b01dc48b6 --- /dev/null +++ b/community/playpen/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +pkgname=playpen +pkgver=1 +pkgrel=2 +epoch=1 +pkgdesc='A secure application sandbox using namespaces, cgroups and seccomp' +arch=(i686 x86_64) +url='https://github.com/thestinger/playpen/' +license=(MIT) +depends=(libseccomp gcc-libs) +makedepends=(git python clang) +source=(git://github.com/thestinger/playpen#tag=1) +md5sums=(SKIP) + +build() { + cd $pkgname + git submodule update --init + make +} + +package() { + cd $pkgname + make PREFIX=/usr DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index 34ec6c021..ab072b8b9 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87572 2013-04-03 10:14:55Z spupykin $ +# $Id: PKGBUILD 94359 2013-07-22 11:20:50Z 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.5 +pkgver=1.5.7 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('wxgtk2.9' '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=('da86cb73cee9d006a42f9574811d13ab') +md5sums=('f5b53ec66a606f088b0aa388595ea5f9') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index e4d8c4188..639da6d20 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 92211 2013-06-02 19:15:02Z bpiotrowski $ +# $Id: PKGBUILD 94432 2013-07-24 19:06:38Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: J0k3r <moebius282 e4a t gmail D0_T com> # Contributor: Alois Nespor <alois.nespor@gmail.com> -# Contributor: JerichoKru <jerichokru(AT)htomail.com> +# Contributor: JerichoKru <jerichokru(AT)hotmail.com> pkgname=pragha pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') url="http://pragha.wikispaces.com/" license=('GPL3') -depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base' +depends=('libnotify' 'libcdio-paranoia' 'gst-plugins-base' 'taglib' 'hicolor-icon-theme' 'gtk2' 'dbus-glib' 'sqlite' 'desktop-file-utils' 'libclastfm') -optdepends=('notification-daemon: OSD notification') +optdepends=('notification-daemon: OSD notification' + 'gst-plugins-good: A collection of gstreamer codecs' + 'gst-plugins-bad: A collection of gstreamer codecs' + 'gst-plugins-ugly: A collection of gstreamer codecs') makedepends=('intltool') replaces=('dissonance') install=pragha.install -source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2" - cdio-includes.patch) -sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5' - '83b366be516b4c09dbccbb25b473f2de545bdbe8') +source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2") +sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/cdio-includes.patch" - - LIBS+="-ldbus-glib-1" ./configure --prefix=/usr + LIBS+="-ldbus-glib-1" \ + ./configure --prefix=/usr \ + --with-gstreamer=1.0 \ + CPPFLAGS="-DHAVE_PARANOIA_NEW_INCLUDES" make } diff --git a/community/pragha/cdio-includes.patch b/community/pragha/cdio-includes.patch deleted file mode 100644 index 707734ad0..000000000 --- a/community/pragha/cdio-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/cdda.h.orig 2013-02-16 23:13:47.000000000 +0100 -+++ b/src/cdda.h 2013-06-02 21:07:50.473864563 +0200 -@@ -24,7 +24,7 @@ - #ifdef HAVE_PARANOIA_NEW_INCLUDES - #include <cdio/paranoia/cdda.h> - #else -- #include <cdio/cdda.h> -+ #include <cdio/paranoia/cdda.h> - #ifdef __CDIO_CONFIG_H__ - #include <cdio/cdio_unconfig.h> - #endif diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD deleted file mode 100644 index 90b88459f..000000000 --- a/community/preload/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 90536 2013-05-13 00:33:46Z eric $ -# Maintainer: -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=preload -pkgver=0.6.4 -pkgrel=6 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc="Makes applications run faster by prefetching binaries and shared objects" -url="http://sourceforge.net/projects/preload" -license=('GPL2') -depends=('glib2' 'bash') -makedepends=('help2man') -backup=('etc/preload.conf') -options=('!makeflags') -install=$pkgname.install -source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" - service) -md5sums=('10786287b55afd3a2b433b4f898809f4' - 'b4871a6ade86968322b3bdf3fce88e99') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --sbindir=/usr/bin \ - --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" sysconfigdir=/etc/conf.d install - - install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service - - rm -rf "${pkgdir}"/etc/rc.d - rm -rf "${pkgdir}"/var/lib/preload/preload.state - rm -rf "${pkgdir}"/var/log/preload.log - - sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf -} diff --git a/community/preload/preload.install b/community/preload/preload.install deleted file mode 100644 index 2c758c265..000000000 --- a/community/preload/preload.install +++ /dev/null @@ -1,30 +0,0 @@ -PRELOAD_STATE=/var/lib/preload/preload.state - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - if [ `vercmp $2 0.6.3-2` -lt 0 ]; then - echo "Backing up your state file..." - cp -af ${PRELOAD_STATE} ${PRELOAD_STATE}.backup - fi -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ `vercmp $2 0.6.3-2` -lt 0 -a -f ${PRELOAD_STATE}.backup ]; then - echo "Restoring the state file..." - mv -f ${PRELOAD_STATE}.backup ${PRELOAD_STATE} - fi -} - -# arg 1: the old package version -post_remove() { - echo - echo "Leaving ${PRELOAD_STATE} intact in case one day you want to" - echo "install preload again. If you are sure you don't need it anymore, please" - echo "remove it manually. Log files in /var/log have not been removed as well." - echo -} - -# vim:set ts=2 sw=2 et: diff --git a/community/preload/service b/community/preload/service deleted file mode 100644 index a26e2d01b..000000000 --- a/community/preload/service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Adaptive readahead daemon - -[Service] -Type=simple -IOSchedulingClass=3 -EnvironmentFile=/etc/conf.d/preload -ExecStart=/usr/bin/preload --foreground $PRELOAD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 9573f4b85..fa7f74367 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86488 2013-03-18 11:20:57Z arodseth $ +# $Id: PKGBUILD 94903 2013-08-01 06:55:29Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -7,7 +7,7 @@ pkgbase=projectm pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test') pkgver=2.1.0 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') url='http://projectm.sourceforge.net/' license=('LGPL') diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 527e56025..80347596a 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9840 +pkgver=9893 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') @@ -19,9 +19,9 @@ build() { ./mkfiles.pl - sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile + sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk - make prefix=/usr + make -f Makefile.gtk prefix=/usr } package() { @@ -30,7 +30,7 @@ package() { install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ - make prefix=/usr DESTDIR=${pkgdir} install + make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install #fix FS#14600 mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD index 43170f0e4..0960e79ae 100644 --- a/community/python-pygit2/PKGBUILD +++ b/community/python-pygit2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88510 2013-04-19 08:16:34Z thestinger $ +# $Id: PKGBUILD 94332 2013-07-20 22:37:34Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> pkgbase=python-pygit2 pkgname=(python-pygit2 python2-pygit2) -pkgver=0.18.0 +pkgver=0.19.0 pkgrel=1 pkgdesc='Python bindings for libgit2' url="https://github.com/libgit2/pygit2" @@ -12,7 +12,7 @@ makedepends=(python python2) arch=(i686 x86_64 mips64el) license=('GPL2') source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz) -md5sums=('25dedbcf38d690dc8b3716389f2702de') +md5sums=('a197304b3788ad051c39d7f2eeae4745') package_python-pygit2() { cd "$srcdir/pygit2-$pkgver" diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 055dd9bee..10a4f2818 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87229 2013-03-28 20:43:22Z jlichtblau $ +# $Id: PKGBUILD 94086 2013-07-14 10:55:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('995a55cf45acba67aa0144b64782566187c3ed3240652f22d4002127f6f2fcb4' +sha256sums=('156ae80bda0e7004f63867f0880b8737fb4e175388fc9edf6d541f2901686737' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { @@ -40,5 +40,3 @@ package(){ install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } -sha256sums=('4dbab9ed00824647a9afd315619e7974e176a3b47e50f3754441e69f1dbee72d' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 308d122a2..2e5704bfb 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.7.1-1 + 2013-03-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.7.0-1 diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 45a165304..7a6b39148 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 92815 2013-06-15 12:48:27Z jlichtblau $ +#$Id: PKGBUILD 94904 2013-08-01 06:55:31Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 1e99f350f..8a1a9f3d9 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92566 2013-06-08 18:10:04Z schiv $ +# $Id: PKGBUILD 94309 2013-07-19 17:36:37Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.9 +pkgver=0.5.10 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') install=qtractor.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('92e18a45e8a378761119440eb677a908') +md5sums=('54a9c2b4eb0f65e44bdc27c91849a341') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index e235e817f..d11c955bf 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90540 2013-05-13 00:51:44Z seblu $ +# $Id: PKGBUILD 94860 2013-07-31 13:09:35Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.22.1 -pkgrel=2 +pkgver=0.99.22.3 +pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64' 'mips64el') url='http://www.quagga.net' @@ -20,7 +20,7 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripd.service' 'ripngd.service' 'zebra.service') -md5sums=('d9ab848661720d6da2551c7a4a19c731' +md5sums=('1467b6828842af59b31252515729bb09' '20a8e36ad851d4e06467aeb56a84b245' 'cc90c234aac9098c5132d653037d5269' '67d0ada0f3000b9a86351798786c5256' diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 879207733..d7f58f7e2 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86576 2013-03-20 02:34:21Z eric $ +# $Id: PKGBUILD 94905 2013-08-01 06:55:33Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=14 +pkgrel=15 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD deleted file mode 100644 index d1926630c..000000000 --- a/community/rusxmms/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=rusxmms -pkgver=1.2.11_csa43 -_xmmsver=1.2.11 -_csaver=csa43 -pkgrel=3 -pkgdesc="XMMS with librcc" -arch=(i686 x86_64 'mips64el') -license=(GPL) -url="http://rusxmms.sourceforge.net/" -depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl) -makedepends=(mesa patch) -provides=(xmms) -conflicts=(xmms) -options=('!libtool' '!distcc') -source=(http://xmms.org/files/1.2.x/xmms-${_xmmsver}.tar.bz2 \ - http://dside.dyndns.org/files/rusxmms/RusXMMS2-${_csaver}.tar.bz2) -md5sums=('f3e6dbaf0b3f571a532ab575656be506' - '8f387dd2e5c95f8730979e09687b6e02') - -build() { - cd "${srcdir}"/xmms-${_xmmsver} - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in - - ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 - (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) - - mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ - autoconf - sed -i 's/unicode.c//g' Input/mpg123/Makefile.in - sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in - - (cd libxmms && aclocal && automake && autoconf) - - case $CARCH in - x86_64) - ./configure --prefix=/usr --disable-mikmod --disable-simd - ;; - i686) - ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest - ;; - *) - return 1 - ;; - esac - - make -} - -package(){ - cd "${srcdir}"/xmms-${_xmmsver} - make DESTDIR="$pkgdir" install - - mkdir -p "$pkgdir"/usr/share/{applications,pixmaps} - install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications - install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm - # don't want wmxmms - rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms - rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1} -} diff --git a/extra/scribus/PKGBUILD b/community/scribus/PKGBUILD index ba4aad179..9d35c971a 100644 --- a/extra/scribus/PKGBUILD +++ b/community/scribus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $ +# $Id: PKGBUILD 94794 2013-07-30 14:34:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -6,24 +6,24 @@ # Contributor: Ben <ben@benmazer.net> pkgname=scribus -pkgver=1.4.2 -pkgrel=3 +pkgver=1.4.3 +pkgrel=1 pkgdesc='Desktop publishing software' -url="http://www.scribus.net/" +url='http://www.scribus.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake' 'boost' 'mesa') depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' - 'ghostscript' 'python2' 'aspell' 'boost-libs' + 'ghostscript' 'python2' 'podofo' 'boost-libs' 'desktop-file-utils' 'shared-mime-info') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') +sha1sums=('23d85fcfe0a61ff88cc003639efdbb38d43feb7f') options=('!libtool') install=install prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}" sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop sed \ -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ @@ -33,7 +33,7 @@ prepare() { } build() { - cd "${srcdir}/build" + cd "${srcdir}/${pkgname}-${pkgver}/build" cmake "../${pkgname}-${pkgver}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ @@ -43,7 +43,7 @@ build() { } package() { - cd "${srcdir}/build" + cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop" } diff --git a/extra/scribus/install b/community/scribus/install index 8040f715b..8040f715b 100644 --- a/extra/scribus/install +++ b/community/scribus/install diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 08bd35335..9b742d4d8 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88118 2013-04-12 07:50:02Z svenstaro $ +# $Id: PKGBUILD 94906 2013-08-01 06:55:35Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml -pkgver=2.0 +pkgver=2.1 pkgrel=1 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') makedepends=('mesa' 'cmake' 'doxygen') install=sfml.install -source=("https://github.com/LaurentGomila/SFML/archive/2.0.tar.gz") -md5sums=('294fd8563a319e06f68bbca0eedc905e') +source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/SFML/archive/${pkgver}.tar.gz") +md5sums=('6457a5903b156390012773e9ef33f65f') build() { cd "$srcdir"/SFML-${pkgver} diff --git a/community/shhmsg/PKGBUILD b/community/shhmsg/PKGBUILD new file mode 100644 index 000000000..f1ef76668 --- /dev/null +++ b/community/shhmsg/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=shhmsg +pkgver=1.4.1 +pkgrel=1 +pkgdesc="Library for displaying messages" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('de300150851786eb19cb9b9ad234d7a2') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/shhopt/PKGBUILD b/community/shhopt/PKGBUILD new file mode 100644 index 000000000..701b32fdb --- /dev/null +++ b/community/shhopt/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=shhopt +pkgver=1.1.7 +pkgrel=1 +pkgdesc="Library for parsing command line options" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('caf24206354296e8a48771aea1f47fbd') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 1e2c8dfc2..af8420930 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $ +# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -15,8 +15,15 @@ license=("GPL") url="https://gitorious.org/fg" options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") -source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") -md5sums=('0ec974d3778f777d5c99c89db671fcc7') +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" + "osg-3.2.patch") +md5sums=('0ec974d3778f777d5c99c89db671fcc7' + 'd7f35f02d88c6ef9c58e07b8431811e6') + +prepare() { + cd $srcdir/simgear-$pkgver + patch -p1 <$srcdir/osg-3.2.patch +} build() { cd $srcdir/simgear-$pkgver diff --git a/community/simgear/osg-3.2.patch b/community/simgear/osg-3.2.patch new file mode 100644 index 000000000..30d732ad6 --- /dev/null +++ b/community/simgear/osg-3.2.patch @@ -0,0 +1,22 @@ +diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx +--- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 2011-06-29 18:58:56.000000000 +0400 ++++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx 2013-07-25 16:14:24.268934729 +0400 +@@ -80,15 +80,15 @@ + int n = _effect->getGenerator(Effect::TANGENT); + tsg->generate(geometry, 0); // 0 is normal_unit, but I have no idea what that is! + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::BINORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::NORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX); + } + } + diff --git a/community/skktools/PKGBUILD b/community/skktools/PKGBUILD new file mode 100644 index 000000000..4ea438a52 --- /dev/null +++ b/community/skktools/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 94840 2013-07-31 05:14:59Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: noonov <noonov@gmail.com> + +pkgname=skktools +pkgver=1.3.3 +pkgrel=2 +pkgdesc="Dictionary maintenance tools for the SKK Japanese input method" +arch=('i686' 'x86_64') +url="http://openlab.ring.gr.jp/skk/" +license=('GPL2') +depends=('gdbm' 'glib2') +optdepends=('ruby' 'python2' 'perl') +source=(http://openlab.ring.gr.jp/skk/tools/${pkgname}-${pkgver}.tar.gz) +md5sums=('9011bf096ea3a408169729b54ca605f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --with-gdbm + make + + sed -i '1s|python|&2|' skk2cdb.py +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/skktools" + cp -a -t "${pkgdir}/usr/share/skktools" \ + convert2skk dbm filters \ + saihenkan.rb skk2cdb.py skkdic-diff.scm unannotation.awk + + install -D -m644 skk-xml.el "${pkgdir}/usr/share/emacs/site-lisp/skk-xml.el" +} diff --git a/community/spice/PKGBUILD b/community/spice/PKGBUILD index 7f033c5a5..f409fc994 100644 --- a/community/spice/PKGBUILD +++ b/community/spice/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93446 2013-07-03 13:23:11Z spupykin $ +# $Id: PKGBUILD 94713 2013-07-29 10:19:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> pkgname=spice -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=1 pkgdesc="SPICE client and server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') makedepends=(python2 python2-pyparsing qemu mesa) depends=(pixman spice-protocol alsa-utils libxrandr libxinerama libsasl openssl celt0.5.1 libgl glu) source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('f33a682892f6793169f20298b2296449') +md5sums=('325b1c42ce24e75de45a75876b73a8bd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 20939b939..4e2d4f457 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94070 2013-07-13 20:40:02Z svenstaro $ +# $Id: PKGBUILD 94907 2013-08-01 06:55:37Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,7 +6,7 @@ pkgname=spring pkgver=0.94.1 _pkgver=94.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 109d0759b..b8d843509 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93861 2013-07-11 14:38:19Z spupykin $ +# $Id: PKGBUILD 94128 2013-07-14 18:31:46Z 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.3.7 +pkgver=3.3.8 pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') @@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('269013bb77cf0c3d771f8590145272f0' +md5sums=('ec1654d28e29bdd2ee342ffb655ecc72' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index bcf70fee3..d93e934d5 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83699 2013-02-04 14:24:41Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 94597 2013-07-27 17:54:41Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') url='http://www.rutschle.net/tech/sslh.shtml' @@ -16,7 +16,7 @@ install=$pkgname.install source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh-select.service' 'sslh-fork.service') -md5sums=('36e64bd6c7d0a299d5acd1109988099b' +md5sums=('cdb3e4499ff00438495f46ef7204ec58' '67e8c9511508673254afa3e1ca61ff89' 'a4402244a4d819beb3c6dc7ff031084e') diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD new file mode 100644 index 000000000..9b903cd2c --- /dev/null +++ b/community/stella/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> +# Contributor: Renato Garcia <fgarcia.renato@gmail.com> +# Contributor: Tiago Camargo <tcamargo@gmail.com> +# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> + +pkgname=stella +pkgver=3.9 +pkgrel=1 +pkgdesc="A multi-platform Atari 2600 VCS emulator" +arch=('i686' 'x86_64') +url="http://stella.sourceforge.net" +license=('GPL') +depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache') +install=$pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz) +md5sums=('a0b1dbfef4f7b5e6ff9273c15cf4ba7d') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install +} diff --git a/community/stella/stella.install b/community/stella/stella.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community/stella/stella.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/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD index 5c286dcdc..a4c340503 100644 --- a/community/stuntrally/PKGBUILD +++ b/community/stuntrally/PKGBUILD @@ -5,7 +5,7 @@ pkgname=stuntrally pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Stunt Rally game with track editor, based on VDrift' arch=('x86_64' 'i686') license=('GPL3') @@ -13,7 +13,7 @@ url='http://code.google.com/p/vdrift-ogre' depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data') makedepends=('cmake' 'boost') install=stuntrally.install -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver") +source=("$pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz") sha256sums=('ef3e645e4911f37c28925e3339c39555e849b7ac13511f009742030f531eed68') build() { diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index c93ee70a1..ee913c57e 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $ +# $Id: PKGBUILD 94908 2013-08-01 06:55:39Z bpiotrowski $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 @@ -6,7 +6,7 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=8 +pkgrel=9 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64' 'mips64el') url="http://super-tux.sourceforge.net/" diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD index 4fcf46c12..c9173c2a0 100644 --- a/community/swftools/PKGBUILD +++ b/community/swftools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $ +# $Id: PKGBUILD 94930 2013-08-01 07:01:25Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=swftools pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.swftools.org/" @@ -13,13 +13,16 @@ depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') makedepends=('bison' 'flex' 'zlib' 'patch') changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) + $pkgname-$pkgver.patch + giflib-5.0.patch) sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' - '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d') + '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d' + 'd163438fe736fb6d1ddbecaa5099a2edac35044c9fc697a8b7167e57f0d513e0') prepare() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ../giflib-5.0.patch sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c } diff --git a/community/swftools/giflib-5.0.patch b/community/swftools/giflib-5.0.patch new file mode 100644 index 000000000..48263c6f3 --- /dev/null +++ b/community/swftools/giflib-5.0.patch @@ -0,0 +1,53 @@ +diff -rupN a/src/gif2swf.c b/src/gif2swf.c +--- a/src/gif2swf.c 2011-01-02 03:30:29.000000000 +0000 ++++ b/src/gif2swf.c 2013-07-30 19:30:32.666103403 +0000 +@@ -65,6 +65,15 @@ enum disposal_method { + RESTORE_TO_PREVIOUS + }; + ++static void PrintGifError(int err) ++{ ++ char *Err = GifErrorString(err); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err); ++} + + void SetFrameAction(TAG ** t, const char *src, int ver) + { +@@ -230,13 +239,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + } + fclose(fi); + +- if ((gft = DGifOpenFileName(sname)) == NULL) { ++ if ((gft = DGifOpenFileName(sname, NULL)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", sname); + return t; + } + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(DGifSlurp(gft)); + return t; + } + +@@ -488,7 +497,7 @@ int CheckInputFile(char *fname, char **r + } + fclose(fi); + +- if ((gft = DGifOpenFileName(s)) == NULL) { ++ if ((gft = DGifOpenFileName(s, NULL)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", fname); + return -1; + } +@@ -499,7 +508,7 @@ int CheckInputFile(char *fname, char **r + global.max_image_height = gft->SHeight; + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(DGifSlurp(gft)); + return -1; + } + // After DGifSlurp() call, gft->ImageCount become available diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index b760e510f..1307067fd 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92171 2013-06-02 10:38:24Z bpiotrowski $ +# $Id: PKGBUILD 94931 2013-08-01 07:01:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> @@ -6,7 +6,7 @@ pkgname=sxiv pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc='Simple X Image Viewer' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 7addc08af..90eb7462c 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94053 2013-07-13 12:37:47Z svenstaro $ +# $Id: PKGBUILD 94909 2013-08-01 06:55:42Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.0 -pkgrel=4 +pkgrel=5 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD deleted file mode 100644 index 4ee5f489b..000000000 --- a/community/taglib-rcc/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 59135 2011-11-21 12:15:14Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=taglib-rcc -pkgver=1.7 -pkgrel=1.1 -pkgdesc="taglib with librcc patch" -arch=('i686' 'x86_64' 'mips64el') -url="http://developer.kde.org/~wheeler/taglib.html" -depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc') -makedepends=('patch' 'cmake') -license=('GPL') -provides=("taglib=$pkgver") -conflicts=("taglib") -options=('!libtool') -source=(http://developer.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/taglib-csa6.tar.bz2) -md5sums=('6a7e312668f153fa905a81714aebc257' - '0868d633843ecd87526c77d788b3d3b6') - -build() { - cd $srcdir/taglib-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || true - [ $NOEXTRACT -eq 1 ] || sed -i 's|#include <string>|#include <string.h>|' $srcdir/taglib-$pkgver/taglib/toolkit/rccpatch.cpp - - cd .. - mkdir build - cd build - - [ $NOEXTRACT -eq 1 ] || cmake ../taglib-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MP4=ON \ - -DWITH_ASF=ON - make VERBOSE=1 - make DESTDIR=${pkgdir} install -} diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 40c33dd44..65b0e76db 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83382 2013-01-30 21:35:39Z jlichtblau $ +# $Id: PKGBUILD 94089 2013-07-14 11:11:38Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=tellico -pkgver=2.3.7 +pkgver=2.3.8 pkgrel=1 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('automoc4' 'cmake') install=$pkgname.install changelog=$pkgname.changelog source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ae858559a226df380940dbd0d8378c45fd6c382359ccebe10f94c2687d6219a1') +sha256sums=('2d8a0d06951e0755c7987d0a07cc8157cd42c8b1c143170042183ff1e89e2ccb') build() { cd ${srcdir} diff --git a/community/tellico/tellico.changelog b/community/tellico/tellico.changelog index ff3debe2d..a1591d839 100644 --- a/community/tellico/tellico.changelog +++ b/community/tellico/tellico.changelog @@ -1,2 +1,5 @@ +2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * tellico 2.3.8-1 + 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * tellico 2.3.7-1 diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index 917246621..0649939ee 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 85733 2013-03-05 21:38:07Z arodseth $ +# $Id: PKGBUILD 94746 2013-07-29 21:17:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.14 +pkgver=0.15 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' license=('Apache') -depends=('pcre' 'zlib') +depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686' 'mips64el') -source=("https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('9334d6f41685963c41790502fcfd83ed0ac664d94626d9fee44ae5c33c616bb3') +source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") +sha256sums=('bb05e329148315a9791cfa5cc1f7db4681e44476729971b4b3b7c2845a635748') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 4e2ad657b..a37192c1e 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,50 +1,53 @@ -# $Id: PKGBUILD 93706 2013-07-08 14:56:58Z spupykin $ +# $Id: PKGBUILD 94384 2013-07-22 13:59:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.3.0 -pkgrel=1 +pkgrel=2 _xorgver=1.14.2 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" license=('GPL') -depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' - 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp' - 'fltk') +depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' + 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' + 'libgl' 'libgcrypt' 'perl' ) makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' - 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg') + 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick') options=(!libtool) conflicts=('tightvnc') source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2 ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 vncserver.service vncviewer.desktop - xserver114.patch) + gethomedir.patch + getmaster.patch) md5sums=('a5158228e64d14496821a39bf3851f1b' '5d36a6483e8e301875131e8302c67727' '0903d5a0dfa38e0b04964505b644585c' - '15c0405f920c3dac250692e8922578d1' - '928faf837ba5b1b34283f9f018df2f5e') + '71cac0fb9701b0a041430f0fddfe00c8' + '22f1523a0eca56ad79cfabd0db6e2cf6' + 'e056a2502dfe0cb3b02e08cab689482f') prepare() { cd ${srcdir}/${pkgname}-${pkgver} cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver + + patch -Np1 -i ${srcdir}/gethomedir.patch + patch -Np1 -i ${srcdir}/getmaster.patch } build() { cd ${srcdir}/${pkgname}-${pkgver} - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes + cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr make - make -C media cd unix/xserver - patch -Np1 -i ${srcdir}/xserver114.patch + patch -Np1 -i ../xserver114.patch autoreconf -fiv ./configure --prefix=/usr \ --disable-static --disable-xinerama --without-dtrace \ @@ -63,7 +66,5 @@ package() { make DESTDIR=${pkgdir} install sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service - install -dm0755 $pkgdir/usr/share/icons - install -m0644 ${srcdir}/${pkgname}-${pkgver}/media/icons/* $pkgdir/usr/share/icons/ install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop } diff --git a/community/tigervnc/gethomedir.patch b/community/tigervnc/gethomedir.patch new file mode 100644 index 000000000..5f3542de8 --- /dev/null +++ b/community/tigervnc/gethomedir.patch @@ -0,0 +1,20 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-09-06 19:44:04.431123087 +0200 +@@ -5,6 +5,7 @@ + RDR_LIB=$(LIB_DIR)/rdr/librdr.la + NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la + XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la ++OS_LIB=$(LIB_DIR)/os/libos.la + COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) + + noinst_LTLIBRARIES = libvnccommon.la +@@ -55,7 +56,7 @@ + + libvnc_la_LDFLAGS = -module -avoid-version + +-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) ++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) + + EXTRA_DIST = Xvnc.man + diff --git a/community/tigervnc/getmaster.patch b/community/tigervnc/getmaster.patch new file mode 100644 index 000000000..cf6ce863f --- /dev/null +++ b/community/tigervnc/getmaster.patch @@ -0,0 +1,96 @@ +diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc +--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12 09:30:50.551459439 +0100 ++++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12 09:38:31.037480528 +0100 +@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo + + unsigned InputDevice::getKeyboardState(void) + { +- DeviceIntPtr master; +- +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); +- return XkbStateFieldFromRec(&master->key->xkbInfo->state); ++ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state); + } + + unsigned InputDevice::getLevelThreeMask(void) +@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask( + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void) + if (state & ShiftMask) + return 0; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; + unsigned char mask; +@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS + if (!(state & ShiftMask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL + if (!(state & mask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key + if (new_state != NULL) + *new_state = state; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + unsigned int state_out; + KeySym dummy; +@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode + XkbDescPtr xkb; + XkbAction *act; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke + if (numlock_keycode == 0) + return false; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, numlock_keycode, state); + if (act == NULL) +@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke + KeySym *syms; + KeySym upper, lower; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) { + if (XkbKeyNumGroups(xkb, key) == 0) diff --git a/community/tigervnc/vncviewer.desktop b/community/tigervnc/vncviewer.desktop index b14e4fe2a..5f6046db2 100644 --- a/community/tigervnc/vncviewer.desktop +++ b/community/tigervnc/vncviewer.desktop @@ -4,7 +4,7 @@ Type=Application Name=TigerVNC viewer Comment=TigerVNC viewer Exec=/usr/bin/vncviewer -Icon=tigervnc_32.png +Icon=tigervnc.png Terminal=false StartupNotify=false Categories=Application; Network; diff --git a/community/tigervnc/xserver114.patch b/community/tigervnc/xserver114.patch deleted file mode 100644 index 80dd6a225..000000000 --- a/community/tigervnc/xserver114.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up xorg-server-20130109/configure.ac.vnc xorg-server-20130109/configure.ac ---- xorg-server-20130109/configure.ac.vnc 2013-01-24 13:01:31.013267503 +0100 -+++ xorg-server-20130109/configure.ac 2013-01-24 13:08:43.283941751 +0100 -@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC -@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -1826,7 +1833,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2291,6 +2297,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -up xorg-server-20130109/hw/Makefile.am.vnc xorg-server-20130109/hw/Makefile.am ---- xorg-server-20130109/hw/Makefile.am.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/hw/Makefile.am 2013-01-24 13:08:43.283941751 +0100 -@@ -33,7 +33,8 @@ SUBDIRS = \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ -- $(XQUARTZ_SUBDIRS) -+ $(XQUARTZ_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive - -diff -up xorg-server-20130109/mi/miinitext.c.vnc xorg-server-20130109/mi/miinitext.c ---- xorg-server-20130109/mi/miinitext.c.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/mi/miinitext.c 2013-01-24 13:08:43.283941751 +0100 -@@ -112,6 +112,10 @@ SOFTWARE. - #include "micmap.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* The following is only a small first step towards run-time - * configurable extensions. - */ -@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[ - #ifdef XSELINUX - {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, - #endif -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - }; - - static ExtensionModule *ExtensionModuleList = NULL; diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 129d5bbb1..2a1533213 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92284 2013-06-03 13:56:49Z spupykin $ +# $Id: PKGBUILD 94846 2013-07-31 07:46:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.10 -pkgrel=5 +pkgver=3.2.10.1 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -17,7 +17,7 @@ backup=('etc/unrealircd/unrealircd.conf' source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service arch-fixes.patch) -md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' +md5sums=('97b4bd68a804e517355efa756f401a90' '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD new file mode 100644 index 000000000..f71d6310a --- /dev/null +++ b/community/uwsgi/PKGBUILD @@ -0,0 +1,233 @@ +# $Id: PKGBUILD 94867 2013-07-31 22:32:58Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Kevin Zuber <uKev@knet.eu> +# Contributor: Vsevolod Balashov <vsevolod@balashov.name> + +pkgbase=uwsgi +pkgname=(uwsgi + uwsgi-plugin-common + uwsgi-plugin-rack + uwsgi-plugin-python2 + uwsgi-plugin-python + uwsgi-plugin-nagios + uwsgi-plugin-router + uwsgi-plugin-admin + uwsgi-plugin-ruby + uswgi-plugin-greenlet + uswgi-plugin-php + uwsgi-plugin-carbon + uwsgi-plugin-rrdtool + uwsgi-plugin-erlang + uwsgi-plugin-pam + uwsgi-plugin-jvm + uwsgi-plugin-zergpool + ) +pkgver=1.9.14 +pkgrel=2 +arch=(i686 x86_64) +url="http://projects.unbit.it/$pkgbase" +license=(GPL2) +conflicts=(python-$pkgbase) +makedepends=(gcc python python2 ruby python2-greenlet php curl libxml2 libyaml + perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7 + jansson) +source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz + archlinux.ini + tmpfilesd + uwsgi@.service + uwsgi@.socket + uwsgi_fix_rpath.patch + uwsgi_ruby20_compatibility.patch + uwsgi_trick_chroot.patch) +md5sums=('ec9cf333534604f17ef4e24051d9d65d' + '73a3ad84736c8f2f3d077c43b24cf1b7' + 'b05ba1d796e1ea608a40635bc4f3ec67' + '0b79320fbae92715c96086cf51e60bc8' + 'db70315bbc8cb886a278ba59d5fd8d57' + '1a4516d5cdcf5b95b036f4eae2d0c152' + '4d09535ce379c8acd76160f35d5d6b55' + '0c09a52fdb88f08c36a8b380f451ce6d') + +prepare(){ + cd $srcdir/$pkgbase-$pkgver + cp $srcdir/archlinux.ini buildconf/archlinux.ini + sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py + for patch in uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do + patch -Np1 -i $srcdir/$patch + done + rm -rf plugins/ruby + mv plugins/ruby{19,} + sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py + +} +build() { + pushd $srcdir/$pkgbase-$pkgver + python uwsgiconfig.py --build archlinux + python2 uwsgiconfig.py --plugin plugins/python archlinux python2 + python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet +} + +package_uwsgi() { + backup=(etc/uwsgi/archlinux.ini) + pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" + depends=(python2 libxml2 jansson libyaml systemd) + install=uwsgi.install + cd $srcdir/$pkgbase-$pkgver + install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi + install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini + install -Dm644 $srcdir/uwsgi@.service $pkgdir/usr/lib/systemd/system/uwsgi@.service + install -Dm644 $srcdir/uwsgi@.socket $pkgdir/usr/lib/systemd/system/uwsgi@.socket + install -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so + install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini + install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf +} + +package_uwsgi-plugin-common(){ + depends=(uwsgi) + pkgdesc="Common plugins for uWSGI" + install -dm755 $pkgdir/usr/bin + for plugin in cache cgi rpc ugreen; do + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${plugin} + install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so + done +} + +package_uwsgi-plugin-rack(){ + depends=(ruby uwsgi-plugin-common) + pkgdesc="Ruby rack plugin" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_rack + install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so +} + +package_uwsgi-plugin-python2(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Python2 support" + cd $srcdir/$pkgbase-$pkgver + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2 + install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so +} + +package_uwsgi-plugin-python(){ + depends=(python uwsgi-plugin-common) + pkgdesc="Plugin for Python support" + install -dm755 $pkgdir/usr/bin + cd $srcdir/$pkgbase-$pkgver + ln -s uwsgi $pkgdir/usr/bin/uwsgi_python + install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so +} + +package_uwsgi-plugin-nagios(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Nagios support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_nagios + install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so +} + +package_uwsgi-plugin-router(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Router support" + install -dm755 $pkgdir/usr/lib/uwsgi + install -dm755 $pkgdir/usr/bin + cd $pkgbase-$pkgver + for file in *router*_plugin.so; do + install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${file%_plugin.so} + done +} + +package_uwsgi-plugin-admin(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Admin support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_admin + install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so +} + +package_uwsgi-plugin-ruby(){ + depends=(ruby uwsgi-plugin-common) + pkgdesc="Plugin for Ruby support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_ruby + install -Dm755 $pkgbase-$pkgver/ruby_plugin.so $pkgdir/usr/lib/uwsgi/ruby_plugin.so +} + + +package_uswgi-plugin-lua51(){ + depends=(lua uwsgi-plugin-common) + pkgdesc="Plugin for Lua support" + install -dm755 $pkgdir/usr/bin + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua51 + install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua51_plugin.so +} + +package_uswgi-plugin-greenlet(){ + depends=(python2-greenlet uwsgi-plugin-common) + pkgdesc="Plugin for Python Greenlet support" + cd $srcdir/$pkgbase-$pkgver + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet + install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so +} + +package_uswgi-plugin-php(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for PHP support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_php + install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so +} + +package_uwsgi-plugin-carbon(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Carbon support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon + install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so +} + +package_uwsgi-plugin-rrdtool(){ + depends=(uwsgi-plugin-common rrdtool) + pkgdesc="Plugin for Rrdtool support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool + install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so +} + +package_uwsgi-plugin-erlang(){ + depends=(uwsgi-plugin-common erlang) + pkgdesc="Plugin for Erlang support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang + install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so +} + + +package_uwsgi-plugin-pam(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Pam support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_pam + install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so +} + +package_uwsgi-plugin-jvm(){ + depends=(uwsgi-plugin-common java-runtime=7) + pkgdesc="Plugin for Jvm support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm + install -Dm755 $pkgbase-$pkgver/jvm_plugin.so $pkgdir/usr/lib/uwsgi/jvm_plugin.so +} + +package_uwsgi-plugin-zergpool(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for zergpool support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool + install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so +} diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini new file mode 100644 index 000000000..36841b267 --- /dev/null +++ b/community/uwsgi/archlinux.ini @@ -0,0 +1,17 @@ +[uwsgi] +inherit = core +bin_name = uwsgi +xml = true +yaml = true +json = true +pcre = true +routing = true +debug = true +sqlite3 = true +ssl = true +xml_implementation = libxml2 +yaml_implementation = auto +malloc_implementation = libc +embedded_plugins = echo, ping, corerouter, http +plugin_dir = /usr/lib/uwsgi +plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger diff --git a/community/uwsgi/tmpfilesd b/community/uwsgi/tmpfilesd new file mode 100644 index 000000000..8609b38f0 --- /dev/null +++ b/community/uwsgi/tmpfilesd @@ -0,0 +1 @@ +d /run/uwsgi 0755 - - - - diff --git a/community/uwsgi/uwsgi.install b/community/uwsgi/uwsgi.install new file mode 100644 index 000000000..0002ec42e --- /dev/null +++ b/community/uwsgi/uwsgi.install @@ -0,0 +1,12 @@ +post_install(){ + systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf +} +post_update(){ + echo "To use uwsgi@.socket and uwsgi@.service:" + echo "\tAll you need to do is put the name of your .ini file after the @ sign" + echo "\tYou can use either the .socket or .service, but if you use the .socket" + echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http" + echo "\tserver touches the socket. You will also not need to specify the socket in" + echo "\tthe .ini file or in the .service file. Systemd will handle listening to" + echo "\tthe socket for you." +} diff --git a/community/uwsgi/uwsgi@.service b/community/uwsgi/uwsgi@.service new file mode 100644 index 000000000..c9e9789a0 --- /dev/null +++ b/community/uwsgi/uwsgi@.service @@ -0,0 +1,13 @@ +[Unit] +Description=uWSGI Emperor +After=syslog.target + +[Service] +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini +Restart=always +Type=notify +StandardError=syslog +NotifyAccess=main + +[Install] +WantedBy=multi-user.target diff --git a/community/uwsgi/uwsgi@.socket b/community/uwsgi/uwsgi@.socket new file mode 100644 index 000000000..012b33a7a --- /dev/null +++ b/community/uwsgi/uwsgi@.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Socket for uWSGI Cgit + +[Socket] +# Change this to your uwsgi application port or unix socket location +ListenStream=/run/uwsgi/%I.sock + +[Install] +WantedBy=sockets.target diff --git a/community/uwsgi/uwsgi_fix_rpath.patch b/community/uwsgi/uwsgi_fix_rpath.patch new file mode 100644 index 000000000..3de66a771 --- /dev/null +++ b/community/uwsgi/uwsgi_fix_rpath.patch @@ -0,0 +1,66 @@ +diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py +index ac7eb3e..0911288 100644 +--- a/plugins/jvm/uwsgiplugin.py ++++ b/plugins/jvm/uwsgiplugin.py +@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: + + GCC_LIST = ['jvm_plugin'] + +-if 'LD_RUN_PATH' in os.environ: +- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] +-else: +- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] +- + def post_build(config): + if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: + os._exit(1) +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index fb9e5bb..fd12c91 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) +- os.environ['LD_RUN_PATH'] = ld_run_path + + LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] + +diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py +index c4f03e1..8d4b2e0 100644 +--- a/plugins/python/uwsgiplugin.py ++++ b/plugins/python/uwsgiplugin.py +@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ: + else: + try: + LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) +- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) + except: + LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) +- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX + + LIBS.append('-lpython%s' % get_python_version()) + else: +diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +index 8dee214..2375bc9 100644 +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\"" + + if has_shared == 'yes': + LDFLAGS.append('-L' + libpath ) +- os.environ['LD_RUN_PATH'] = libpath + LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) + else: + GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip())) +diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +index ecea48d..4f35984 100644 +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG + + libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() + LDFLAGS.append('-L' + libpath ) +-os.environ['LD_RUN_PATH'] = libpath + LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() + diff --git a/community/uwsgi/uwsgi_ruby20_compatibility.patch b/community/uwsgi/uwsgi_ruby20_compatibility.patch new file mode 100644 index 000000000..b4bf20d38 --- /dev/null +++ b/community/uwsgi/uwsgi_ruby20_compatibility.patch @@ -0,0 +1,42 @@ +diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +index 2375bc9..b908417 100644 +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -10,13 +10,14 @@ except: + rbconfig = 'Config' + + version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip() +-v = version.split('.') + + GCC_LIST = ['rack_plugin', 'rack_api'] + +-if (v[0] == '1' and v[1] == '9') or v[0] >= '2': ++if version >= '1.9': + CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split() + CFLAGS.append('-DRUBY19') ++ if version >= '2.0': ++ CFLAGS.append('-DRUBY20') + CFLAGS.append('-Wno-unused-parameter') + rbconfig = 'RbConfig' + else: +diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +index 4f35984..156018f 100644 +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -10,13 +10,14 @@ except: + rbconfig = 'Config' + + version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip() +-v = version.split('.') + + GCC_LIST = ['../rack/rack_plugin', '../rack/rack_api'] + +-if v[0] == '1' and v[1] == '9': ++if version >= '1.9': + CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split() + CFLAGS.append('-DRUBY19') ++ if version >= '2.0': ++ CFLAGS.append('-DRUBY20') + CFLAGS.append('-Wno-unused-parameter') + rbconfig = 'RbConfig' + else: diff --git a/community/uwsgi/uwsgi_trick_chroot.patch b/community/uwsgi/uwsgi_trick_chroot.patch new file mode 100644 index 000000000..3bfb1ac22 --- /dev/null +++ b/community/uwsgi/uwsgi_trick_chroot.patch @@ -0,0 +1,16 @@ +diff --git a/uwsgiconfig.py b/uwsgiconfig.py +index e447123..4d55f2c 100644 +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None): + except: + pass + +- if uc: +- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin' +- else: +- plugin_dest = name + '_plugin' ++ plugin_dest = name + '_plugin' + + shared_flag = '-shared' + diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index f84a6d362..8c1820d0b 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 90963 2013-05-16 17:56:17Z bpiotrowski $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 94324 2013-07-20 14:19:20Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.19.0 +pkgver=3.19.18.4 pkgrel=1 pkgdesc='Fast and modern Javascript engine' arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ license=('BSD') depends=('gcc-libs' 'readline') makedepends=('subversion' 'python2') source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2) -sha256sums=('35af5629792e958968eacc94daef3ad358b6ed7126875db6138664f51c061368') +sha256sums=('10d7a51ed2769b1c2a6311a30ed1967d0a1da3f522c90b9c00f25fbe0b1aba02') [[ "$CARCH" = 'i686' ]] && ARCH=ia32 [[ "$CARCH" = 'x86_64' ]] && ARCH=x64 @@ -20,10 +21,8 @@ sha256sums=('35af5629792e958968eacc94daef3ad358b6ed7126875db6138664f51c061368') prepare() { cd $pkgname-$pkgver - # Fetch gyp make dependencies - # The world isn't ready for python3 export PYTHON=python2 find build/ test/ tools/ src/ -type f \ -exec sed -e 's_^#!/usr/bin/env python$_&2_' \ diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 35ac2775e..0225b12f9 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85589 2013-03-03 17:28:55Z dreisner $ +# $Id: PKGBUILD 94910 2013-08-01 06:55:43Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=4 +pkgrel=5 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 4d220f40b..51b0f410c 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $ +# $Id: PKGBUILD 94462 2013-07-25 11:22:57Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.9' 'linux<3.10' - 'linux-headers>=3.9' 'linux-headers<3.10' +makedepends=('linux>=3.10' 'linux<3.11' + 'linux-headers>=3.10' 'linux-headers<3.11' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' @@ -18,7 +18,7 @@ makedepends=('linux>=3.9' 'linux<3.10' 'bc') # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.9-ARCH +_extramodules=extramodules-3.10-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -36,7 +36,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -51,7 +51,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 169dd9a35..ed1762c21 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-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 b1c7a68c6..2f7f00d9e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 46db8282a..bcfecb3e8 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90101 2013-05-06 19:39:56Z foutrelis $ +# $Id: PKGBUILD 94911 2013-08-01 06:55:45Z bpiotrowski $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=8 +pkgrel=9 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -26,11 +26,12 @@ 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 tcl-8.6.diff python-destdir.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694' + '4ff5668957336709dcd096fbac102558' 'a804a9f034e24ef1a8b28542c15ce1a1' 'f7aba715bcc10de93a6ecf1cd6b0c560') @@ -40,6 +41,7 @@ build() { # fix compilation errors: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff" + patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff" patch -Np1 -i "${srcdir}/tcl-8.6.diff" patch -Np1 -i "${srcdir}/python-destdir.diff" diff --git a/community/vtk/ffmpeg-2.0.diff b/community/vtk/ffmpeg-2.0.diff new file mode 100644 index 000000000..2488d74a0 --- /dev/null +++ b/community/vtk/ffmpeg-2.0.diff @@ -0,0 +1,21 @@ +diff -rupN a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +--- a/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:29:24.625362910 +0000 ++++ b/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:39:16.184515101 +0000 +@@ -149,7 +149,7 @@ int vtkFFMPEGWriterInternal::Start() + + //Set up the codec. + AVCodecContext *c = this->avStream->codec; +- c->codec_id = (CodecID)this->avOutputFormat->video_codec; ++ c->codec_id = (AVCodecID)this->avOutputFormat->video_codec; + c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; +@@ -199,7 +199,7 @@ int vtkFFMPEGWriterInternal::Start() + vtkGenericWarningMacro (<< "Codec not found." ); + return 0; + } +- if (avcodec_open(c, codec) < 0) ++ if (avcodec_open2(c, codec, NULL) < 0) + { + vtkGenericWarningMacro (<< "Could not open codec."); + return 0; diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 81ffa3f17..a5975f2e4 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90105 2013-05-06 19:40:03Z foutrelis $ +# $Id: PKGBUILD 94912 2013-08-01 06:55:47Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 4dbda497b..7eba5c783 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 92508 2013-06-07 12:43:24Z seblu $ +# $Id: PKGBUILD 94173 2013-07-15 21:54:10Z tomegun $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.1.1 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64' 'mips64el') url='http://wayland.freedesktop.org' license=('MIT') options=(!libtool) -depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango') +depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('5239afe177dadbded3c0018b55dd1045be5f84b2') +sha1sums=('23201d31e71768e5ec3de0d10fa6de988dd273c8') build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/weston \ - --disable-android-compositor + --libexecdir=/usr/lib/weston make } @@ -29,11 +28,8 @@ package() { # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" # embed more clients - for _c in calibrator clickdot cliptest dnd editor eventdemo flower gears image \ - resizor simple-egl simple-shm simple-touch smoke transformed view; do + for _c in calibrator clickdot cliptest dnd editor eventdemo flower fullscreen gears \ + image resizor simple-egl simple-shm simple-touch smoke transformed view; do install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c" done - for _c in info keyboard screensaver screenshooter tablet-shell terminal; do - install -Dm755 "clients/weston-$_c" "$pkgdir/usr/bin/weston-$_c" - done } diff --git a/community/widelands/6233_6232.diff b/community/widelands/6233_6232.diff deleted file mode 100644 index f82477607..000000000 --- a/community/widelands/6233_6232.diff +++ /dev/null @@ -1,59 +0,0 @@ -=== modified file 'src/graphic/graphic.cc' ---- src/graphic/graphic.cc 2011-11-30 21:38:37 +0000 -+++ src/graphic/graphic.cc 2012-02-19 17:10:12 +0000 -@@ -725,6 +725,18 @@ - if (!png_ptr) - throw wexception("Graphic::save_png: could not create png struct"); - -+ png_infop info_ptr = png_create_info_struct(png_ptr); -+ if (!info_ptr) { -+ png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -+ throw wexception("Graphic::save_png: could not create png info struct"); -+ } -+ -+ // Set jump for error -+ if (setjmp(png_jmpbuf(png_ptr))) { -+ png_destroy_write_struct(&png_ptr, &info_ptr); -+ throw wexception("Graphic::save_png: Error writing PNG!"); -+ } -+ - // Set another write function. This is potentially dangerouse because the - // flush function is internally called by png_write_end(), this will crash - // on newer libpngs. See here: -@@ -736,35 +748,14 @@ - sw, - &Graphic::m_png_write_function, &Graphic::m_png_flush_function); - -- png_infop info_ptr = png_create_info_struct(png_ptr); -- -- if (!info_ptr) { -- png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -- throw wexception("Graphic::save_png: could not create png info struct"); -- } -- -- // Set jump for error -- if (setjmp(png_jmpbuf(png_ptr))) { -- png_destroy_write_struct(&png_ptr, &info_ptr); -- throw wexception("Graphic::save_png: could not set png setjmp"); -- } -- - // Fill info struct - png_set_IHDR - (png_ptr, info_ptr, pix.get_w(), pix.get_h(), - 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - -- // png_set_strip_16(png_ptr) ; -- - // Start writing - png_write_info(png_ptr, info_ptr); -- -- // Strip data down -- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); -- -- png_set_packing(png_ptr); -- - { - uint32_t surf_w = pix.get_w(); - uint32_t surf_h = pix.get_h(); - diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index b0626e98b..62dd1b535 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94055 2013-07-13 12:38:06Z svenstaro $ +# $Id: PKGBUILD 94913 2013-08-01 06:55:50Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=8 +pkgrel=9 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" diff --git a/community/widelands/widelands-0.16-libpng15.patch b/community/widelands/widelands-0.16-libpng15.patch deleted file mode 100644 index 9f733e7b9..000000000 --- a/community/widelands/widelands-0.16-libpng15.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/graphic/SDL_mng.cc -+++ src/graphic/SDL_mng.cc -@@ -276,7 +276,7 @@ - * 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)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - SDL_SetError("Error reading the PNG file."); - goto done; - } -@@ -356,9 +356,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int const s = (info_ptr->channels == 4) ? 0 : 8; -+ int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -369,7 +369,7 @@ - SDL_AllocSurface - (SDL_SWSURFACE, - width, height, -- bit_depth * info_ptr->channels, -+ bit_depth * png_get_channels(png_ptr, info_ptr), - Rmask, Gmask, Bmask, Amask); - if (not surface) { - SDL_SetError("Out of memory"); -@@ -407,6 +407,9 @@ - /* read rest of file, get additional chunks in info_ptr - REQUIRED */ - png_read_end(png_ptr, info_ptr); - -+ png_colorp png_palette; -+ int png_num_palette; -+ - /* Load the palette, if any */ - if ((palette = surface->format->palette)) { - if (color_type == PNG_COLOR_TYPE_GRAY) { -@@ -416,12 +419,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 (uint32_t 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 (uint32_t 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/widelands/widelands-build15-gcc-4.5-patch b/community/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 50b9ce992..f0f6e4a00 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88341 2013-04-16 13:32:48Z spupykin $ +# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.48 +pkgver=3.7.51 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('efe537f908b12d30ef1aeebf77222fbf') +md5sums=('a3f5d10f6f96a6298505801f4d0f6190') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index 71bd4588f..36c2071a1 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $ +# $Id: PKGBUILD 94986 2013-08-02 13:00:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> @@ -6,20 +6,17 @@ pkgname=xdebug pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64' 'mips64el') url="http://www.xdebug.org" license=('GPL') depends=('php') -install="${pkgname}.install" backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz - xdebug-5.2.ini xdebug.ini) md5sums=('e49cec9861b45dc0b36eae33bf8a14fa' - '6b7fdbbe0bf381bda40e77e29981f439' - '68de800943369d4c76bdf7eb35c8463b') + '6a1f2ef91c632d4c9b7b218cd2e278ef') build() { cd $srcdir/$pkgname-$pkgver @@ -39,11 +36,6 @@ package() { make DESTDIR=$pkgdir install cd $srcdir/$pkgname-$pkgver - if [ "$PHPVER" \< "5.3.0" ] ; then - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so - install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini - else - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so - install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini - fi + make INSTALL_ROOT=$pkgdir install + install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini } diff --git a/community/xdebug/xdebug-5.2.ini b/community/xdebug/xdebug-5.2.ini deleted file mode 100644 index 9beb7fc30..000000000 --- a/community/xdebug/xdebug-5.2.ini +++ /dev/null @@ -1,5 +0,0 @@ -zend_extension=/usr/lib/php/xdebug.so -;xdebug.remote_enable=on -;xdebug.remote_host=127.0.0.1 -;xdebug.remote_port=9000 -;xdebug.remote_handler=dbgp diff --git a/community/xdebug/xdebug.ini b/community/xdebug/xdebug.ini index c6c9222ea..9062dfc8b 100644 --- a/community/xdebug/xdebug.ini +++ b/community/xdebug/xdebug.ini @@ -1,4 +1,4 @@ -zend_extension=/usr/lib/php/modules/xdebug.so +;zend_extension=/usr/lib/php/modules/xdebug.so ;xdebug.remote_enable=on ;xdebug.remote_host=127.0.0.1 ;xdebug.remote_port=9000 diff --git a/community/xdebug/xdebug.install b/community/xdebug/xdebug.install deleted file mode 100644 index a7ec0b9cc..000000000 --- a/community/xdebug/xdebug.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - local _configfile=/etc/php/conf.d/xdebug.ini - echo " ==> You may wish to uncomment/change the settings found in " - echo " $_configfile" - echo "" -} - -post_upgrade() { - local _configfile=/etc/php/conf.d/xdebug.ini - local PHPVER=$(php -r 'echo phpversion();') - post_install $1 - - if [ "$PHPVER" \< "5.3" ] ; then - echo " ==> You are currenty running a version of php < 5.3." - echo " When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname." - echo "" - fi -} diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 8db1d4fe3..135d22481 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90112 2013-05-06 19:40:17Z foutrelis $ +# $Id: PKGBUILD 94932 2013-08-01 07:01:29Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.33 -pkgrel=2 +pkgrel=3 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64' 'mips64el') url="http://www.xemacs.org/" diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD index 65fbd3cfe..1aa5cfc70 100644 --- a/community/xjadeo/PKGBUILD +++ b/community/xjadeo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93894 2013-07-11 20:56:42Z speps $ +# $Id: PKGBUILD 94915 2013-08-01 06:55:57Z bpiotrowski $ # Maintainer : speps <speps at aur dot archlinux dot org> pkgname=xjadeo pkgver=0.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A simple video player that is synchronized to jack transport." arch=('i686' 'x86_64') url="http://xjadeo.sourceforge.net" diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index de363c2ac..e5b0be472 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92871 2013-06-17 10:57:56Z spupykin $ +# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=18 +pkgrel=19 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -54,22 +54,18 @@ install=xmms2.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "xmms2d.conf" "xmms2d.service" - "ffmpeg-0.11.diff") + "ffmpeg2.0.patch") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '47e68461589578e8a99857746c5b6f29' - 'e176971ef96807f72fa8fc17d260c20a') + 'da84ec58c5711f3c4ecd932c3e6642d6') build() { - cd xmms2-${pkgver}/src/plugins/avcodec/ - # remove call to avcodec_init - # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13 - patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff - cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ../ffmpeg2.0.patch # python2 fix -# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf + # sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf sed -i 's|#include <cdio/cdda.h>|#include <cdio/paranoia/cdda.h>|' src/plugins/cdda/cdda.c sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|' src/plugins/samba/{samba.c,wscript} diff --git a/community/xmms2/ffmpeg-0.11.diff b/community/xmms2/ffmpeg-0.11.diff deleted file mode 100644 index 91d3a3106..000000000 --- a/community/xmms2/ffmpeg-0.11.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- avcodec.c.orig 2012-06-07 15:08:23.796225671 -0500 -+++ avcodec.c 2012-06-07 15:08:36.649489373 -0500 -@@ -134,7 +134,6 @@ - - xmms_xform_private_data_set (xform, data); - -- avcodec_init (); - avcodec_register_all (); - - mimetype = xmms_xform_indata_get_str (xform, diff --git a/community/xmms2/ffmpeg2.0.patch b/community/xmms2/ffmpeg2.0.patch new file mode 100644 index 000000000..87cc974c3 --- /dev/null +++ b/community/xmms2/ffmpeg2.0.patch @@ -0,0 +1,37 @@ +diff -rupN a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c +--- a/src/plugins/avcodec/avcodec.c 2011-10-20 21:26:08.000000000 +0200 ++++ b/src/plugins/avcodec/avcodec.c 2013-07-22 17:17:53.098385978 +0200 +@@ -134,7 +134,6 @@ xmms_avcodec_init (xmms_xform_t *xform) + + xmms_xform_private_data_set (xform, data); + +- avcodec_init (); + avcodec_register_all (); + + mimetype = xmms_xform_indata_get_str (xform, +@@ -200,7 +199,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + } + } + +- data->codecctx = avcodec_alloc_context (); ++ data->codecctx = avcodec_alloc_context3 (NULL); + data->codecctx->sample_rate = data->samplerate; + data->codecctx->channels = data->channels; + data->codecctx->bit_rate = data->bitrate; +@@ -211,7 +210,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + data->codecctx->codec_id = codec->id; + data->codecctx->codec_type = codec->type; + +- if (avcodec_open (data->codecctx, codec) < 0) { ++ if (avcodec_open2 (data->codecctx, codec, NULL) < 0) { + XMMS_DBG ("Opening decoder '%s' failed", codec->name); + goto err; + } else { +diff -rupN a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h +--- a/src/plugins/avcodec/avcodec_compat.h 2011-10-20 21:26:08.000000000 +0200 ++++ b/src/plugins/avcodec/avcodec_compat.h 2013-07-22 17:16:15.841723560 +0200 +@@ -65,3 +65,4 @@ typedef struct AVPacket { + # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO + #endif + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 19c3f98bb..13fd01fa0 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 89335 2013-04-28 16:53:08Z td123 $ +# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib -pkgver=0.11 -pkgrel=7 +pkgver=0.11.2 +pkgrel=1 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('415a7ed9449198b0e93d49ab0a4a0f72') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/xmonad-contrib-remove-getatomname.patch - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -33,5 +32,3 @@ package() { runhaskell Setup.lhs copy --destdir=$pkgdir install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE } -md5sums=('05fba258ac6063e49b50786a0869bd1f' - '1d1fab94ae24b2a8f6a5dcd9cd6d9548') diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index 81f912cbd..1962a7854 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 88303 2013-04-16 10:25:07Z bgyorgy $ +# $Id: PKGBUILD 94092 2013-07-14 11:19:44Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.15 -pkgrel=2 +pkgver=3.16 +pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') -url="http://www.sandklef.com/xnee/" +url="http://xnee.wordpress.com/" license=('GPL3') depends=('gtk2' 'libxtst') makedepends=('texinfo') @@ -15,7 +15,7 @@ optdepends=('xosd: feedback support') options=('!libtool' '!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gnee.desktop) -sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd' +sha256sums=('07393d84d7abfab607b5ba078a0c32411815b7c883317356f6b92f7bbf3176fe' 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1') build() { diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index b10864c83..d72b4493b 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.16-1 + 2013-04-16 Balló György <ballogyor+arch at gmail dot com> * fix dependencies * enable GUI and library diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index ac2ff5123..feaae1f35 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 90116 2013-05-06 19:40:25Z foutrelis $ +# $Id: PKGBUILD 94933 2013-08-01 07:01:30Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=xplanet pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="An Xearth wannabe" arch=(i686 x86_64 'mips64el') url="http://xplanet.sourceforge.net/" license=('GPL') depends=('pango' 'libungif' 'libtiff' 'libxss') -source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz) -md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz + giflib6.patch) +md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' + '74e1894304fe3b7caf0b3ddf3c471b0b') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/giflib6.patch +} build() { cd $srcdir/$pkgname-$pkgver + unset LDFLAGS ./configure --prefix=/usr --with-freetype make } diff --git a/community/xplanet/giflib6.patch b/community/xplanet/giflib6.patch new file mode 100644 index 000000000..aaf024198 --- /dev/null +++ b/community/xplanet/giflib6.patch @@ -0,0 +1,130 @@ +diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c +--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 ++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400 +@@ -20,7 +20,7 @@ + + #include <stdio.h> + #include <stdlib.h> +- ++#define FALSE 0 + #include <gif_lib.h> + + /* +@@ -42,11 +42,11 @@ + int color_index; + unsigned char *ptr = NULL; + +- infile = DGifOpenFileName(filename); ++ infile = DGifOpenFileName(filename, NULL); + + if (infile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -54,7 +54,7 @@ + { + if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -63,7 +63,7 @@ + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(infile) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -107,14 +107,14 @@ + GifByteType *ext; + if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + while (ext != NULL) + { + if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + } +@@ -178,7 +178,7 @@ + return(0); + } + +- colormap = MakeMapObject(colormap_size, NULL); ++ colormap = GifMakeMapObject(colormap_size, NULL); + + for (i = 0; i < width * height; i++) + { +@@ -187,10 +187,10 @@ + blue[i] = (GifByteType) rgb[3*i+2]; + } + +- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, ++ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, + buffer, colormap->Colors) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -198,24 +198,24 @@ + free(green); + free(blue); + +- outfile = EGifOpenFileName((char *) filename, FALSE); ++ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); + if (outfile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -224,7 +224,7 @@ + { + if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + ptr += width; +@@ -233,7 +233,7 @@ + EGifSpew(outfile); + + if (EGifCloseFile(outfile) == GIF_ERROR) +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + + free(buffer); + diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD index bbdc4c545..633ed59d8 100644 --- a/community/xvkbd/PKGBUILD +++ b/community/xvkbd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88530 2013-04-19 10:33:08Z spupykin $ +# $Id: PKGBUILD 94165 2013-07-15 11:03:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd -pkgver=3.4a +pkgver=3.5 pkgrel=1 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm') makedepends=('imake') source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz) -md5sums=('3d996ba9f84b5ed2392f9809ada22711') +md5sums=('f7344982d985be925c7a708110e20497') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 0b32e20c4..412bca218 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 88640 2013-04-20 21:08:12Z arodseth $ +# $Id: PKGBUILD 94952 2013-08-01 13:32:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws pkgver=1.96 -pkgrel=1 +pkgrel=2 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' license=('BSD') -depends=('pam' 'erlang') +depends=('pam' 'erlang') # segfaults with erlang-nox backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install -optdepends=('erlang-nox: Erlang without X (headless)') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2' @@ -27,6 +26,8 @@ prepare() { for file in cgi.yaws cgi-bin/foo.py; do sed -i '0,/on/s//on2/' "www/$file" done + # R16B1 fix + sed -i 's/:sha(Salted)/:hash(sha, Salted)/' src/yaws_websockets.erl } build() { diff --git a/community/zita-convolver/PKGBUILD b/community/zita-convolver/PKGBUILD index fee89316f..80ac28e5e 100644 --- a/community/zita-convolver/PKGBUILD +++ b/community/zita-convolver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93759 2013-07-10 02:26:55Z speps $ +# $Id: PKGBUILD 94626 2013-07-29 00:15:08Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Philipp Überbacher <murks at lavabit dot com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,7 +6,7 @@ pkgname=zita-convolver pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A fast, partitioned convolution engine library." arch=('i686' 'x86_64') url="http://kokkinizita.linuxaudio.org/linuxaudio/" @@ -18,8 +18,11 @@ md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a') prepare() { cd "$srcdir/$pkgname-$pkgver/libs" + # FS#36248 - strip -march=native + sed -i '/native/d' Makefile + # prevent ldconfig call - sed -i 's/ldconfig//' Makefile + sed -i '/ldconfig/d' Makefile } build() { @@ -29,7 +32,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/libs" - make SUFFIX="" PREFIX=/usr DESTDIR="$pkgdir/" install + make SUFFIX="" PREFIX=/usr DESTDIR="$pkgdir/" install # missing softlink ln -s lib$pkgname.so.$pkgver \ diff --git a/community/zita-resampler/PKGBUILD b/community/zita-resampler/PKGBUILD index f43665891..2aecd92e3 100644 --- a/community/zita-resampler/PKGBUILD +++ b/community/zita-resampler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93758 2013-07-10 02:26:27Z speps $ +# $Id: PKGBUILD 94623 2013-07-28 23:23:53Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Philipp Überbacher <murks at lavabit dot com> pkgname=zita-resampler pkgver=1.3.0 -pkgrel=1 -pkgdesc="A C++ library for resampling audio signals." +pkgrel=2 +pkgdesc="A C++ library for resampling audio signals" url="http://kokkinizita.linuxaudio.org/linuxaudio/" arch=('i686' 'x86_64') license=('GPL3') @@ -13,6 +13,13 @@ depends=('gcc-libs' 'libsndfile') source=("${url}downloads/$pkgname-$pkgver.tar.bz2") md5sums=('74c12e2280008f63ac9f2670fe4cf79b') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # FS#36248 - strip march=native + sed -i '/native/d' {libs,apps}/Makefile +} + build() { cd "$srcdir/$pkgname-$pkgver/libs" diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index a678f7548..f4a47d19b 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $ +# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.7.1 +pkgver=3.0 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7be02eb973eccf388f1ae750fc09eed0' +md5sums=('a2624994561aa69f056c904c1ccb2880' 'SKIP') build() { diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index 929e840e4..aa65edc8f 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $ +# $Id: PKGBUILD 191698 2013-07-29 09:44:29Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib -pkgver=2.8.22 -pkgrel=3 +pkgver=2.9.0 +pkgrel=1 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('463177b5c29c7a598c991e12a4898e06') +md5sums=('e0f94ac2138fd33c7e77b19c1e9a9390') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch deleted file mode 100644 index 4420d0b63..000000000 --- a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 -From: Dan McGee <dan@archlinux.org> -Date: Sun, 19 Jun 2011 16:04:25 -0500 -Subject: [PATCH] Set hostname via /proc if file is available - -On Linux, the hostname can be set via this file if available, precluding -the need for a `hostname` binary. - -Signed-off-by: Dan McGee <dan@archlinux.org> ---- - dhcpcd-hooks/30-hostname | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname -index 65d1a13..af94262 100644 ---- a/dhcpcd-hooks/30-hostname -+++ b/dhcpcd-hooks/30-hostname -@@ -21,7 +21,11 @@ need_hostname() - try_hostname() - { - if valid_domainname "$1"; then -- hostname "$1" -+ if [ -w /proc/sys/kernel/hostname ]; then -+ echo "$1" > /proc/sys/kernel/hostname -+ else -+ hostname "$1" -+ fi - else - syslog err "Invalid hostname: $1" - fi --- -1.7.5.4 - diff --git a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch deleted file mode 100644 index 7e78ecd0d..000000000 --- a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <d@falconindy.com> -Date: Tue, 21 Jun 2011 09:32:47 -0400 -Subject: [PATCH] set MTU via sysfs if file is available - -On Linux, a network interface's MTU can be set by writing to -/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. - -Signed-off-by: Dave Reisner <d@falconindy.com> ---- - dhcpcd-hooks/10-mtu | 4 ++-- - dhcpcd-run-hooks.in | 11 +++++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu -index 639697c..8763930 100644 ---- a/dhcpcd-hooks/10-mtu -+++ b/dhcpcd-hooks/10-mtu -@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if set_mtu "$interface" "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ set_mtu "$interface" "$mtu" - rm "$mtu_dir/$interface" - fi - fi -diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in -index 0e60338..843f3ca 100644 ---- a/dhcpcd-run-hooks.in -+++ b/dhcpcd-run-hooks.in -@@ -215,6 +215,17 @@ service_condcommand() - service_exists $1 && service_status $1 && service_cmd $1 $2 - } - -+# Set MTU for an interface -+set_mtu() { -+ local interface=$1 mtu=$2 -+ -+ if [ -e /sys/class/net/$interface/mtu ]; then -+ echo "$mtu" > /sys/class/net/$interface/mtu -+ else -+ ifconfig "$interface" mtu "$mtu" -+ fi -+} -+ - # We source each script into this one so that scripts run earlier can - # remove variables from the environment so later scripts don't see them. - # Thus, the user can create their dhcpcd.enter/exit-hook script to configure --- -1.7.5.4 - diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ce258579f..8896727b7 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $ +# $Id: PKGBUILD 191940 2013-08-01 13:10:13Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.6.8 -pkgrel=3 +pkgver=6.0.4 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,10 @@ depends=('glibc' 'sh') provides=('dhcp-client') backup=('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_.service' 'dhcpcd.service') -sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917' +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" + 'dhcpcd_.service' + 'dhcpcd.service') +sha1sums=('3e93b02071015e90f9199658c04509e4b565dd4d' '6245b8db7e6f39a0305571726bb693a53901c400' 'e49e01041f831281a1cd0c97ca21204e0aa07fda') @@ -25,8 +26,11 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # configure variables - ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ - --rundir=/run + ./configure \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/dhcpcd \ + --dbdir=/var/lib/dhcpcd \ + --rundir=/run # Build make @@ -38,8 +42,8 @@ package() { # Install License install -d $pkgdir/usr/share/licenses/$pkgname - awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ - >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + sed 26q "$srcdir/$pkgname-$pkgver/control.h" \ + >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Set Options in /etc/dhcpcd.conf echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall @@ -47,8 +51,4 @@ package() { # install systemd files install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 - - # usrmove - cd "$pkgdir" - mv sbin usr/bin } diff --git a/core/dhcpcd/remove_ifconfig.patch b/core/dhcpcd/remove_ifconfig.patch deleted file mode 100644 index 5bcc4a68f..000000000 --- a/core/dhcpcd/remove_ifconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 -+++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 -@@ -7,7 +7,7 @@ - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if ip link set "$interface" mtu "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ ip link set "$interface" mtu "$new_interface_mtu" - rm "$mtu_dir/$interface" - fi - fi diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index e142a6476..bcab9740d 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188586 2013-06-16 16:11:16Z tpowa $ +# $Id: PKGBUILD 191697 2013-07-29 09:44:27Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.20 +pkgver=3.0.22 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,7 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') -md5sums=('b34dcf1d22bc1074ebdba68799fa3cad' +md5sums=('301f01ca8a734011c0257134bcf475c8' 'SKIP') build() { diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index c0e52bb76..62e9e9bde 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $ +# $Id: PKGBUILD 191961 2013-08-02 00:55:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,8 +10,8 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.8.1 -pkgrel=1 -#_snapshot=4.8-20130502 +pkgrel=2 +_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -20,9 +20,11 @@ makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 -md5sums=('3b2386c114cd74185aa3754b58a79304') +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gcc-4.8-filename-output.patch) +md5sums=('e21f259bc4c44e61e19a780ad5badfeb' + '40cb437805e2f7a006aa0d0c3098ab0f') if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} @@ -45,6 +47,9 @@ prepare() { # hack! - some configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 + patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch + mkdir ${srcdir}/gcc-build } diff --git a/core/gcc/gcc-4.8-filename-output.patch b/core/gcc/gcc-4.8-filename-output.patch new file mode 100644 index 000000000..6951eb239 --- /dev/null +++ b/core/gcc/gcc-4.8-filename-output.patch @@ -0,0 +1,17 @@ +--- gcc/c-family/c-opts.c (revision 200330) ++++ gcc/c-family/c-opts.c (working copy) +@@ -1338,10 +1338,14 @@ c_finish_options (void) + + /* Give CPP the next file given by -include, if any. */ + static void + push_command_line_include (void) + { ++ // This can happen if disabled by -imacros for example. ++ if (include_cursor > deferred_count) ++ return; ++ + if (!done_preinclude) + { + done_preinclude = true; + if (flag_hosted && std_inc && !cpp_opts->preprocessed) + { diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index a60e5c790..9e298ab3d 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 189879 2013-07-10 14:29:53Z jgc $ +# $Id: PKGBUILD 191338 2013-07-23 17:13:19Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) pkgver=2.36.3 -pkgrel=2 +pkgrel=3 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 mips64el) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz + bug701560.patch revert-warn-glib-compile-schemas.patch) sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e' + '5e71f9a59f434f8850fb2474d3f8022ea36c7e254283db3437ae72f52b0690bd' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') prepare() { cd glib-$pkgver patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + patch -Np1 -i ../bug701560.patch # doc building fail "automake-1.13 probably too old" # autoreconf -i diff --git a/core/glib2/bug701560.patch b/core/glib2/bug701560.patch new file mode 100644 index 000000000..041419791 --- /dev/null +++ b/core/glib2/bug701560.patch @@ -0,0 +1,37 @@ +From 05d430065da918051a97e3384c4b2252af47503d Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 20 Jun 2013 17:13:29 +0000 +Subject: Revert "g_file_set_contents(): don't fsync on ext3/4" + +We didn't actually do any real-world testing of this, and +unsurprisingly it turns out to break in at least one widely-used +configuration (Fedora 19 x86_64, ext4 on LVM). + +This reverts commit 9d0c17b50102267a5029b58b1f44efbad82d8f03. + +https://bugzilla.gnome.org/show_bug.cgi?id=701560 +--- +diff --git a/glib/gfileutils.c b/glib/gfileutils.c +index b6ca3bb..2980098 100644 +--- a/glib/gfileutils.c ++++ b/glib/gfileutils.c +@@ -1088,16 +1088,9 @@ write_to_temp_file (const gchar *contents, + /* On Linux, on btrfs, skip the fsync since rename-over-existing is + * guaranteed to be atomic and this is the only case in which we + * would fsync() anyway. +- * +- * ext3 and ext4 are also safe in this respect under the default +- * mount options (and if someone picks non-default options to +- * improve their performance at the cost of reliability, who are we +- * to argue?) +- * +- * Note: EXT[234]_SUPER_MAGIC are equal. + */ + +- if (fstatfs (fd, &buf) == 0 && (buf.f_type == BTRFS_SUPER_MAGIC || buf.f_type == EXT3_SUPER_MAGIC)) ++ if (fstatfs (fd, &buf) == 0 && buf.f_type == BTRFS_SUPER_MAGIC) + goto no_fsync; + } + #endif +-- +cgit v0.9.2 diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index 9278eb132..74af6846c 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183276 2013-04-20 14:43:27Z andyrtr $ +# $Id: PKGBUILD 191717 2013-07-29 14:03:23Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 -pkgdesc="a general purpose crypto library based on the code used" +pkgdesc="General purpose cryptographic library based on the code from GnuPG" arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" license=('LGPL') @@ -14,7 +14,7 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -sha1sums=('c9998383532ba3e8bcaf690f2f0d65e814b48d2f') +sha1sums=('2c6553cc17f2a1616d512d6870fe95edf6b0e26e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index ce4a12f6e..31daad167 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 183491 2013-04-22 09:10:18Z tpowa $ +# $Id: PKGBUILD 191277 2013-07-23 09:46:53Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libusbx -pkgver=1.0.15 +pkgver=1.0.16 pkgrel=1 -depends=('glibc') +depends=('glibc' 'systemd') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64 mips64el) url="http://libusbx.org" license=('LGPL') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2) options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") -md5sums=('d02c008c04f0ef420e0f2508cfa841ca') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,3 +29,4 @@ package () { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e') diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 85af29111..2c3b14347 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ +# $Id: PKGBUILD 191942 2013-08-01 13:10:15Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.20.2 -pkgrel=1 +pkgver=1.21.1 +pkgrel=2 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" @@ -14,12 +14,12 @@ options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'glibc-2.16.patch' 'config') -sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' +sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' - 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') + '240c9ab805fbf5eb3347b2a42f62d840f160c4999d0f172b28ba50dadad09ada') -build() { - cd "$srcdir/busybox-$pkgver" +prepare() { + cd "busybox-$pkgver" case $CARCH in mips64el) @@ -28,12 +28,13 @@ build() { local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;; esac - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config - patch -Np1 < "$srcdir/glibc-2.16.patch" + patch -Np1 <"$srcdir/glibc-2.16.patch" +} - make +build() { + make -C "busybox-$pkgver" } package() { diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index ed84c5383..ad36538d8 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.0 -# Sun May 13 11:33:40 2012 +# Busybox version: 1.21.0 +# Tue Jan 22 09:04:09 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=0 +CONFIG_SHA3_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +# CONFIG_SHA3SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -274,7 +277,7 @@ CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set -# CONFIG_SYNC is not set +CONFIG_SYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set # CONFIG_CMP is not set @@ -612,9 +614,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -622,6 +626,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set @@ -701,7 +706,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set @@ -894,6 +899,13 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_PSTREE is not set # CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y @@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set @@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_LOGGER is not set diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index f9c583403..c08a466a4 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188861 2013-06-23 11:12:05Z tpowa $ +# $Id: PKGBUILD 191387 2013-07-25 11:24:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=8 +pkgrel=9 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' diff --git a/core/nfs-utils/nfs-utils.install b/core/nfs-utils/nfs-utils.install index 7dcdf9575..f6c72d915 100644 --- a/core/nfs-utils/nfs-utils.install +++ b/core/nfs-utils/nfs-utils.install @@ -5,9 +5,9 @@ cat << 'EOM' ==> Extended configuration options for NFS (clients & server) are available in ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 + ==> Please refer to http://wiki.archlinux.org/index.php/NFS + ==> for further information on NFS4; for NFSv3, refer to + ==> http://wiki.archlinux.org/index.php/NFSv3 EOM } diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD index fd0323114..398d72d70 100644 --- a/extra/a2ps/PKGBUILD +++ b/extra/a2ps/PKGBUILD @@ -1,52 +1,55 @@ -# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $ +# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=a2ps pkgver=4.14 -pkgrel=2 +pkgrel=4 pkgdesc="An Any to PostScript filter" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/a2ps/" license=('GPL3') -depends=('ghostscript' 'psutils' 'imagemagick' 'perl') +depends=('ghostscript' 'psutils' 'imagemagick') makedepends=('gperf') backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') options=('!libtool') install=a2ps.install -source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \ - a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \ - a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch) -md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' - '93011b58e9f20a7fafa31287a51884a4' - '2e493d0bc00d71eb3e8a9b6febc52b69' - '09cc5ed4d3d8ff1b2103e519191e8286' - '42aa39b74f6da8cf6e94185c4fc3e601' - '066f9327fee6b6eca3a57d657d1097d1') +source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig} + a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch + a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch + a2ps-4.14-fix-stpcpy-proto.patch a2ps-texinfo5.patch) sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' + 'SKIP' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65' '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce' '6aed29c1399e79f3914b408059610f9e7c0fc38e' - '58fa90134f1027e3f05aeb08212cbcc10f420738') + '58fa90134f1027e3f05aeb08212cbcc10f420738' + '81269db9dd29685b0ece2539070ced3f7a8472df') + +prepare() { + cd ${pkgname}-${pkgver} + sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 + sed -i "s:^countdictstack: \0:" contrib/psset.in + patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch" + patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch" + patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch" + patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch" + patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch" + patch -p1 -i "${srcdir}/a2ps-texinfo5.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch - patch -p1 < ../a2ps-4.13c-emacs.patch - patch -p1 < ../a2ps-4.13-manpage-chmod.patch - patch -p1 < ../a2ps-4.14-check-mempcpy.patch - patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch - sed -i '/AM_C_PROTOTYPES/d' configure.in - sed -i '/ansi2knr/d' Makefile.am {src,lib,contrib/sample}/Makefile.am + cd ${pkgname}-${pkgver} libtoolize --force --copy - autoreconf -I m4 + autoreconf --force --install -I m4 ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ --includedir=/usr/include --enable-nls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset" } diff --git a/extra/a2ps/a2ps-texinfo5.patch b/extra/a2ps/a2ps-texinfo5.patch new file mode 100644 index 000000000..847de44b3 --- /dev/null +++ b/extra/a2ps/a2ps-texinfo5.patch @@ -0,0 +1,46 @@ +diff -Naur a2ps-4.14-orig/doc/a2ps.texi a2ps-4.14/doc/a2ps.texi +--- a2ps-4.14-orig/doc/a2ps.texi 2013-07-30 02:27:21.950434805 -0400 ++++ a2ps-4.14/doc/a2ps.texi 2013-07-30 02:29:07.286445041 -0400 +@@ -22,12 +22,12 @@ + @c `a2ps'. Avoid those quotes. + @iftex + @macro pack +-@code{@value{PACKAGE}}@c ++@code{@value{PACKAGE}} + @end macro + @end iftex + @ifnottex + @macro pack +-@value{PACKAGE}@c ++@value{PACKAGE} + @end macro + @end ifnottex + +@@ -43,11 +43,6 @@ + @end macro + @end ifnottex + +-@c TeX variants +-@macro LaTeX +-La@TeX{} +-@end macro +- + @macro PreTeX + Pre@TeX{} + @end macro +@@ -3965,13 +3960,13 @@ + @itemx \end@{enumerate@} + @itemx \begin@{description@} + @itemx \end@{description@} +-These commands are legal in @LaTeX but have no sense in @PreTeX{}. ++These commands are legal in @LaTeX{} but have no sense in @PreTeX{}. + Hence there are simply ignored and not printed (if immediately followed + by an end-of-line). + @end table + + @node Differences with LaTeX +-@subsubsection Differences with @LaTeX ++@subsubsection Differences with @LaTeX{} + The following symbols, inherited from the style sheet @code{Symbol}, are + not supported by @LaTeX{}: + diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index 4995e372c..40c9e7366 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149328 2012-02-06 20:28:08Z stephane $ +# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $ # Maintainer: # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=a52dec pkgver=0.7.4 -pkgrel=6.2 +pkgrel=7 pkgdesc="A free library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -19,14 +19,17 @@ md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052' 'ccaa978e70cc74b364486bd72fd38d1d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i ../a52dec-0.7.4-build.patch + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in mv configure.in configure.ac - patch -p0 -i "$srcdir/configure.patch" - patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch" ./bootstrap - ./configure --prefix=/usr --enable-shared \ - --build=$CHOST --host=$CHOST +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-shared make } diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index 6433ad1b0..c9427e7a4 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 160233 2012-05-31 11:55:41Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=abook -pkgver=0.6.0pre2 -pkgrel=5 +pkgver=0.6.0pre2.20130724 +pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' -arch=('i686' 'x86_64' 'mips64el') url='http://abook.sourceforge.net/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') +makedepends=('git') depends=('readline') -source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz" - 'vcard-compat.patch') -sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec' - 'feb35deb79116c187953d06e514c7918be5646b6') +source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68") +sha1sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../vcard-compat.patch + cd "${srcdir}/${pkgname}" ./configure --prefix=/usr --mandir=/usr/share/man make + cd po && make update-po } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install } diff --git a/extra/abook/vcard-compat.patch b/extra/abook/vcard-compat.patch deleted file mode 100644 index cc8ea7f3f..000000000 --- a/extra/abook/vcard-compat.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -aur old/filter.c new/filter.c ---- old/filter.c 2006-09-06 15:26:10.000000000 +1000 -+++ new/filter.c 2012-05-31 17:48:18.644744197 +1000 -@@ -44,6 +44,7 @@ - static int csv_parse_file(FILE *in); - static int allcsv_parse_file(FILE *in); - static int palmcsv_parse_file(FILE *in); -+static int vcard_parse_file(FILE *in); - - /* - * export filter prototypes -@@ -75,6 +76,7 @@ - { "csv", N_("comma separated values"), csv_parse_file }, - { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, - { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, -+ { "vcard", N_("vCard file"), vcard_parse_file }, - { "\0", NULL, NULL } - }; - -@@ -1331,6 +1333,263 @@ - */ - - /* -+ * vCard import filter -+ */ -+ -+static char *vcard_fields[] = { -+ "FN", /* NAME */ -+ "EMAIL", /* EMAIL */ -+ "ADR", /* ADDRESS */ -+ "ADR", /* ADDRESS2 - not used */ -+ "ADR", /* CITY */ -+ "ADR", /* STATE */ -+ "ADR", /* ZIP */ -+ "ADR", /* COUNTRY */ -+ "TEL", /* PHONE */ -+ "TEL", /* WORKPHONE */ -+ "TEL", /* FAX */ -+ "TEL", /* MOBILEPHONE */ -+ "NICKNAME", /* NICK */ -+ "URL", /* URL */ -+ "NOTE", /* NOTES */ -+ "BDAY", /* ANNIVERSARY */ -+ NULL -+}; -+ -+/* -+ * mappings between vCard ADR field and abook's ADDRESS -+ * see rfc2426 section 3.2.1 -+ */ -+static int vcard_address_fields[] = { -+ -1, /* vCard(post office box) - not used */ -+ -1, /* vCard(the extended address) - not used */ -+ 2, /* vCard(the street address) - ADDRESS */ -+ 4, /* vCard(the locality) - CITY */ -+ 5, /* vCard(the region) - STATE */ -+ 6, /* vCard(the postal code) - ZIP */ -+ 7 /* vCard(the country name) - COUNTRY */ -+}; -+ -+enum { -+ VCARD_KEY = 0, -+ VCARD_KEY_ATTRIBUTE, -+ VCARD_VALUE, -+}; -+ -+static char * -+vcard_get_line_element(char *line, int element) -+{ -+ int i; -+ char *line_copy = 0; -+ char *result = 0; -+ char *key = 0; -+ char *key_attr = 0; -+ char *value = 0; -+ -+ line_copy = xstrdup(line); -+ -+ /* make newline characters if exist end of string */ -+ for(i=0; line_copy[i]; i++) { -+ if(line_copy[i] == '\r' || line_copy[i] == '\n') { -+ line_copy[i] = '\0'; -+ break; -+ } -+ } -+ -+ /* separate key from value */ -+ for(i=0; line_copy[i]; i++) { -+ if(line_copy[i] == ':') { -+ line_copy[i] = '\0'; -+ key = line_copy; -+ value = &line_copy[i+1]; -+ break; -+ } -+ } -+ -+ /* separate key from key attributes */ -+ if (key) { -+ for(i=0; key[i]; i++) { -+ if(key[i] == ';') { -+ key[i] = '\0'; -+ key_attr = &key[i+1]; -+ break; -+ } -+ } -+ } -+ -+ switch(element) { -+ case VCARD_KEY: -+ if(key) -+ result = xstrdup(key); -+ break; -+ case VCARD_KEY_ATTRIBUTE: -+ if(key_attr) -+ result = xstrdup(key_attr); -+ break; -+ case VCARD_VALUE: -+ if(value) -+ result = xstrdup(value); -+ break; -+ } -+ -+ xfree(line_copy); -+ return result; -+} -+ -+static void -+vcard_parse_email(list_item item, char *line) -+{ -+ char *email; -+ -+ email = vcard_get_line_element(line, VCARD_VALUE); -+ -+ if(item[1]) { -+ item[1] = strconcat(item[1], ",", email, 0); -+ xfree(email); -+ } -+ else { -+ item[1] = email; -+ } -+} -+ -+static void -+vcard_parse_address(list_item item, char *line) -+{ -+ int i; -+ int k; -+ char *value; -+ char *address_field; -+ -+ value = vcard_get_line_element(line, VCARD_VALUE); -+ if(!value) -+ return; -+ -+ address_field = value; -+ for(i=k=0; value[i]; i++) { -+ if(value[i] == ';') { -+ value[i] = '\0'; -+ if(vcard_address_fields[k] >= 0) { -+ item[vcard_address_fields[k]] = xstrdup(address_field); -+ } -+ address_field = &value[i+1]; -+ k++; -+ if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields))) -+ break; -+ } -+ } -+ item[vcard_address_fields[k]] = xstrdup(address_field); -+ xfree(value); -+} -+ -+static void -+vcard_parse_phone(list_item item, char *line) -+{ -+ int index = 8; -+ char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE); -+ char *value = vcard_get_line_element(line, VCARD_VALUE); -+ -+ /* set the standard number */ -+ if (!type) { -+ item[index] = value; -+ } -+ -+ /* -+ * see rfc2426 section 3.3.1 -+ */ -+ else if (strstr(type, "TYPE=") == type){ -+ if (strcasestr(type, "home")) { -+ item[index] = xstrdup(value); -+ } -+ if (strcasestr(type, "work")) { -+ item[index+1] = xstrdup(value); -+ } -+ if (strcasestr(type, "fax")) { -+ item[index+2] = xstrdup(value); -+ } -+ if (strcasestr(type, "cell")) { -+ item[index+3] = xstrdup(value); -+ } -+ -+ xfree(type); -+ xfree(value); -+ } -+} -+ -+static void -+vcard_parse_line(list_item item, char *line) -+{ -+ int i; -+ char *key; -+ -+ for(i=0; vcard_fields[i]; i++) { -+ key = vcard_fields[i]; -+ -+ if(!strncmp(key, line, strlen(key))) { -+ if(i == 1) { -+ vcard_parse_email(item, line); -+ } -+ else if(i == 2) { -+ vcard_parse_address(item, line); -+ } -+ else if(i == 8) { -+ vcard_parse_phone(item, line); -+ } -+ else { -+ item[i] = vcard_get_line_element(line, VCARD_VALUE); -+ } -+ break; -+ } -+ } -+} -+ -+static void -+vcard_parse_item(FILE *in) -+{ -+ char *line = NULL; -+ list_item item = item_create(); -+ -+ while(!feof(in)) { -+ line = getaline(in); -+ -+ if(line && !strncmp("END:VCARD", line, 9)) { -+ xfree(line); -+ break; -+ } -+ else if(line) { -+ vcard_parse_line(item, line); -+ xfree(line); -+ } -+ } -+ -+ add_item2database(item); -+ item_free(&item); -+} -+ -+static int -+vcard_parse_file(FILE *in) -+{ -+ char *line = NULL; -+ -+ while(!feof(in)) { -+ line = getaline(in); -+ -+ if(line && !strncmp("BEGIN:VCARD", line, 11)) { -+ xfree(line); -+ vcard_parse_item(in); -+ } -+ else if(line) { -+ xfree(line); -+ } -+ } -+ -+ return 0; -+} -+ -+/* -+ * end of vCard import filter -+ */ -+ -+/* - * csv addressbook export filters - */ - -@@ -1547,10 +1806,18 @@ - - free(name); - -+ if(db_fget(e.item, NICK)) -+ fprintf(out, "NICKNAME:%s\r\n", -+ db_fget(e.item, NICK)); -+ -+ if(db_fget(e.item, ANNIVERSARY)) -+ fprintf(out, "BDAY:%s\r\n", -+ db_fget(e.item, ANNIVERSARY)); -+ - if(db_fget(e.item, ADDRESS)) -- fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n", -- safe_str(db_fget(e.item, ADDRESS)), -+ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n", - safe_str(db_fget(e.item, ADDRESS2)), -+ safe_str(db_fget(e.item, ADDRESS)), - safe_str(db_fget(e.item, CITY)), - safe_str(db_fget(e.item, STATE)), - safe_str(db_fget(e.item, ZIP)), -diff -aur old/misc.c new/misc.c ---- old/misc.c 2006-09-05 05:24:18.000000000 +1000 -+++ new/misc.c 2012-05-31 17:40:46.241284874 +1000 -@@ -77,6 +77,27 @@ - return 1; - } - -+char * -+strcasestr(char *haystack, char *needle) -+{ -+ int i; -+ int k; -+ -+ assert(haystack != NULL); -+ assert(needle != NULL); -+ -+ for(i=0; i<strlen(haystack)-strlen(needle)+1; i++) { -+ for(k=0; k<strlen(needle); k++, i++) { -+ if (tolower(haystack[i]) != tolower(needle[k])) -+ break; -+ else if ((k+1) == strlen(needle)) -+ return &haystack[i]; -+ } -+ } -+ -+ return NULL; -+} -+ - - #ifdef HAVE_CONFIG_H - # include "config.h" -diff -aur old/misc.h new/misc.h ---- old/misc.h 2006-09-05 05:24:18.000000000 +1000 -+++ new/misc.h 2012-05-31 17:40:46.241284874 +1000 -@@ -18,6 +18,8 @@ - - int is_number(char *s); - -+char *strcasestr(char *haystack, char *needle); -+ - char *strdup_printf(const char *format, ... ); - char *strconcat(const char *str, ...); - diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 5f2e409b9..0bd9d6f68 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190032 2013-07-13 12:39:56Z svenstaro $ +# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.10.0 -pkgrel=2 +pkgver=1.10.2 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bb94de6a4300bf8355e6a1ccce5846af') +md5sums=('35eb8f76588b1d111f75bc46e3ac784b') prepare() { mkdir build diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index c03207608..179409919 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ +# $Id: PKGBUILD 191885 2013-08-01 06:53:19Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins pkgver=1.0.27 -pkgrel=1 +pkgrel=2 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') url="http://www.alsa-project.org" @@ -14,13 +14,18 @@ depends=(alsa-lib) makedepends=(libpulse jack ffmpeg) optdepends=('libpulse: PulseAudio plugin' 'jack: Jack plugin' - 'ffmpeg: libavcodec resampling plugin' + 'ffmpeg: libavcodec resampling plugin, a52 plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') +prepare() { + cd $pkgname-$pkgver + sed -i 's/ && LIBAVCODEC_VERSION_MINOR >= 34//' a52/pcm_a52.c +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD new file mode 100644 index 000000000..260ec0825 --- /dev/null +++ b/extra/alsa-tools/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: Sebastien Luttringer <seblu+arch@seblu.net> +# Contributor: Jochen Immendœrfer <jochen.immendoerfer@gmail.com> + +pkgname=alsa-tools +pkgver=1.0.27 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://alsa-project.org/" +license=('GPL') +depends=('gcc-libs' 'alsa-lib') +makedepends=('fltk' 'gtk2' 'gtk3') +optdepends=('fltk: hdspconf, hdspmixer' + 'gtk2: other GUI tools' + 'gtk3: hdajackretask' + 'bash: couple of tools') +provides=("$pkgname-emu10k1" "$pkgname-ice1712") +options=('!libtool') +source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") +md5sums=('1ea381d00a6069a98613aa7effa4cb51') + +_tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb" + "hdspconf" "hdsploader" "hdspmixer" "ld10k1" "mixartloader" + "pcxhrloader" "rmedigicontrol" "sb16_csp" "sbiload" "sscape_ctl" + "us428control" "usx2yloader" "vxloader") + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # qlo10k1 cannot be built; it depends on ld10k1 + sed -i 's:ld10k1 qlo10k1 \\:ld10k1 \\:' Makefile + + # hwmixvolume requires pyalsa, not currently in repos + sed -i 's:hwmixvolume hdajackretask :hdajackretask :' Makefile +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # not using upstream's global makefile as it's too clever + for i in ${_tools[@]}; do + if [ $i != sbiload ]; then + ( + cd $i + ./configure --prefix=/usr --sbindir=/usr/bin + make + ) + else + ( + cd seq/sbiload + ./configure --prefix=/usr --sbindir=/usr/bin + make + ) + fi + done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + for i in ${_tools[@]}; do + if [ $i != sbiload ]; then + ( + cd $i + make DESTDIR="$pkgdir" install + ) + else + ( + cd seq/sbiload + make DESTDIR="$pkgdir" install + ) + fi + done +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 6dfe5274a..fdcd42531 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ +# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27.1 -pkgrel=2 +pkgver=1.0.27.2 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -14,7 +14,6 @@ makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 90alsa) -backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -39,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('3d81357b997744a139881ef72bc6921a' +md5sums=('b65e9a04181bd7c9db7667a4566f8dc3' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index b0685b62c..781d88be9 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ +# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 6602b518b..1ee8ea565 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $ +# $Id: PKGBUILD 190843 2013-07-18 19:19:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.24 -pkgrel=3 +pkgver=2.2.25 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -38,7 +38,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd.service arch.layout) -md5sums=('91bd1484aca13a7095d6432be37fc7ae' +md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045' 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index dbb1fe20a..d838041ec 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158966 2012-05-13 20:20:53Z jgc $ +# $Id: PKGBUILD 190841 2013-07-18 18:46:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.4.6 +pkgver=1.4.8 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('util-linux') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('ffee70a111fd07372982b0550bbb14b7') +md5sums=('ce2ab01a0c3cdb71cf0a6326b8654f41') build() { cd "${srcdir}/apr-${pkgver}" diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 877faf646..66961d92f 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ +# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,11 @@ license=('GPL') depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('17028a3106f870cd62f6a60930a28590' +md5sums=('40edf6ab63488d52abf94a2a48d7ac97' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 78d8f7734..36da2e3ec 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -4,7 +4,7 @@ post_install() { > LXVST_PATH to include any custom directories of *.so VST plug-ins. > Ardour 3 also supports video (timeline and monitoring), but aside from - > xjadeo (AUR) the required external programs need to be retrieved from: + > xjadeo the required external programs need to be retrieved from: http://x42.github.io/harvid/ @@ -32,8 +32,7 @@ post_upgrade() { > Due to uncertainties with regards to program stability, 'harvid' is > currently not packaged in our repositories. - > In addition to the timeline, video can be monitored with xjadeo, which - > is presently available in the AUR. It will be in our repositories soon. + > In addition to the timeline, video can be monitored with xjadeo. MSG } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 08e5895df..4c280f793 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ +# $Id: PKGBUILD 191362 2013-07-24 02:13:43Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=9 +pkgrel=10 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool' '!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') -optdepends=('dbus: communicating with client applications' - 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' +depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' 'qt4: qt4 bindings' @@ -40,6 +39,7 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action } diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 2334186b3..304f7e9de 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $ +# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -20,7 +20,9 @@ build() { cd "${srcdir}/${pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP new file mode 100644 index 000000000..87010d49c --- /dev/null +++ b/extra/avidemux/PKGBUILD.WIP @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.6.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ + 'libvdpau' 'libdca' 'fribidi' 'glu') +options=('!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) +#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') + +prepare() { + cd ${pkgbase}_${pkgver} + sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { +#mv snapshot_8273 ${pkgbase}_${pkgver} + + cd ${pkgbase}_${pkgver} + bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin' + 'qt4: for the QtScript scripting support' + 'libdca: for the corresponding audio decoder plugin' + 'fribidi: for the corresponding video filter plugin') + + cd ${pkgbase}_${pkgver} + (cd buildCli; make DESTDIR="${pkgdir}" install) + (cd buildCore; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildGtk; make DESTDIR="${pkgdir}" install) + (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + + rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildQt4; make DESTDIR="${pkgdir}" install) + (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index 2f8eab7f8..091d5f122 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 185131 2013-05-11 10:28:24Z heftig $ +# $Id: PKGBUILD 191196 2013-07-19 15:53:05Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64 mips64el) url="https://live.gnome.org/Bijiben" license=(GPL) -depends=(libtracker-sparql clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) +depends=(tracker clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) makedepends=(intltool itstool) options=(!emptydirs) install=bijiben.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c8c02c3701594d0b7f212c25613c097e2343d104157518c7c8cfb6a1bc111cf8') +sha256sums=('287742267c7484a92ead8c896091ceb0b2603ba8b5dccf304ea534456735beec') build() { cd $pkgname-$pkgver diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 6deb7002c..6f14ef9af 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 191889 2013-08-01 06:53:23Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=bzflag pkgver=2.4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'glew' 'glu' 'sdl') source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr make - cd misc make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index ecb976ca3..8f384caae 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $ +# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3') +sha256sums=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937') build() { cd $pkgname-$pkgver diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index defbf418b..20f60941d 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185532 2013-05-14 19:17:44Z heftig $ +# $Id: PKGBUILD 191890 2013-08-01 06:53:24Z bpiotrowski $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=5 +pkgrel=6 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 039a58c76..cb5880f62 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ +# $Id: PKGBUILD 191274 2013-07-23 03:29:14Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.8 -pkgrel=2 +pkgrel=3 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'service' 'service.fresh' @@ -22,7 +22,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' - '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' + 'bb488a56b0f6a0760446cde89c1e3321e2717b78' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' '1c8ef193919b041135115170acd6313f008de808') diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate index 6a9051bed..5f6d87d29 100644 --- a/extra/clamav/logrotate +++ b/extra/clamav/logrotate @@ -1,8 +1,10 @@ /var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript + create 644 clamav clamav + sharedscripts + missingok + notifempty + postrotate + /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript } diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index eabd82720..f2ac74081 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $ +# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cln -pkgver=1.3.2 -pkgrel=1.2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="Class library for numbers" arch=('i686' 'x86_64' 'mips64el') url="http://www.ginac.de/CLN/" @@ -13,8 +13,7 @@ makedepends=('texlive-core') options=('!libtool') install=cln.install source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d897cce94d9c34d106575ed4ec865d71') -sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0') +sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,6 +34,6 @@ check() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-html install-pdf } diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 2b701d62a..637d67be0 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $ +# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.4 -pkgrel=2 +pkgver=2.0.6 +pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" @@ -12,7 +12,7 @@ depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97') +sha256sums=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258') build() { cd $pkgname-$pkgver diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 2433a321b..2b0a30eea 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $ +# $Id: PKGBUILD 190119 2013-07-15 21:53:44Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter pkgver=1.14.4 -pkgrel=2 +pkgrel=3 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -19,7 +19,7 @@ sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ - --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input + --enable-wayland-backend --enable-egl-backend --enable-evdev-input # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 39f90d60c..573c9b350 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $ +# $Id: PKGBUILD 190118 2013-07-15 21:53:44Z tomegun $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl pkgver=1.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) url="http://www.clutter-project.org/" @@ -17,7 +17,7 @@ sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ - --enable-wayland-egl-{platform,server} --enable-gles{1,2} + --enable-wayland-egl-platform --enable-gles{1,2} # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 3998489f2..af55ab055 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188955 2013-06-27 04:04:12Z heftig $ +# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.1 -pkgrel=1 +pkgver=1.0.2 +pkgrel=2 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" @@ -15,8 +15,15 @@ optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) -source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('d480eb23a3de67cab090c810c894cc68069a278d') +source=($url/releases/$pkgname-$pkgver.tar.xz + udev-systemd.patch) +sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0' + '3b467b9674f767c804943d191beaf6bd1ba3a606') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../udev-systemd.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/colord/udev-systemd.patch b/extra/colord/udev-systemd.patch new file mode 100644 index 000000000..311a92437 --- /dev/null +++ b/extra/colord/udev-systemd.patch @@ -0,0 +1,17 @@ +Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. +Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185 + +--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in ++++ colord-1.0.1/rules/69-cd-sensors.rules.in +@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct + + # color calibration device + ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb" + + # Allow the daemon to access the color devices + ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 58bcbbabf..4080832c2 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $ +# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') url="http://live.gnome.org/dconf" license=('LGPL2.1') -depends=('glib2' 'gtk-update-icon-cache') +depends=('glib2') makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb') +sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee') build() { cd "$pkgname-$pkgver" diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 75d713d64..7478c122a 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,13 +1,15 @@ post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + if [[ -x /usr/bin/gtk-update-icon-cache ]]; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade(){ - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 1538b084b..dd82c9c0b 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 164005 2012-07-23 18:42:21Z schiv $ +# $Id: PKGBUILD 191219 2013-07-21 14:09:43Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ddrescue -pkgver=1.16 -pkgrel=2 +pkgver=1.17 +pkgrel=1 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/ddrescue/ddrescue.html" license=('GPL3') depends=('gcc-libs') install=$pkgname.install -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('57b67407e882c6418531d48a2f20d16b' - 'bf072280587665d82829be15eb6fc9ad') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" + "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz.sig") +md5sums=('564469370fe70cd9ac280b15e1addc50' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index dbc6fc4e3..2a5913115 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ +# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') license=(GPL) @@ -14,6 +14,7 @@ depends=(webkitgtk3 hicolor-icon-theme) makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install +groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 42d4f1c32..99cb155ef 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179518 2013-03-05 19:33:11Z ioni $ +# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> @@ -6,24 +6,24 @@ # Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=4.2.2 +pkgver=4.3 pkgrel=1 -_date=201302041200 +_date=201306052000 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64' 'mips64el') url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst') +depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('daa539af97a5cf4fb8ae1d7675b9625b' +md5sums=('8046626198b529c2e292022c39c18262' '7ea99a30fbaf06ec29261541b8eb1e23' 'ba2cf02c48e6e35bfe3685401c26bb5b' '77cff7543ccf7e177cb6667f5a20ce19') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='902102ec85539f4c9342b2c1c4c67f64' +[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8' package() { # install eclipse @@ -35,17 +35,8 @@ package() { $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \ - "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \ - "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \ - "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png" - # install icon install -Dm644 "$srcdir"/eclipse.svg \ "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v201301120609/bin/runant.py + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py } diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 21c3f573e..a7d6139c7 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} + emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' - '3f6990fabfbe1d5f3cd58bace4eb20f1') + 'SKIP' + '560cdf463299e059c5fadf474bcba218') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../emacs-24.3-giflib5.patch +} build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch new file mode 100644 index 000000000..b8571abb2 --- /dev/null +++ b/extra/emacs/emacs-24.3-giflib5.patch @@ -0,0 +1,26 @@ +--- src/image.c ++++ src/image.c 2013-05-21 15:49:41.945819346 +0000 +@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image + } + + /* Open the GIF file. */ ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpenFileName (SSDATA (file)); ++#else ++ gif = fn_DGifOpenFileName (SSDATA (file), NULL); ++#endif + if (gif == NULL) + { + image_error ("Cannot open `%s'", file, Qnil); +@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image + memsrc.len = SBYTES (specified_data); + memsrc.index = 0; + ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpen (&memsrc, gif_read_from_memory); ++#else ++ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); ++#endif + if (!gif) + { + image_error ("Cannot open memory source `%s'", img->spec, Qnil); diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index 8633e1d17..a2124de50 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190038 2013-07-13 12:40:51Z svenstaro $ +# $Id: PKGBUILD 191891 2013-08-01 06:53:24Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 83413fc07..583bd60c7 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185537 2013-05-14 20:42:07Z ioni $ +# $Id: PKGBUILD 191825 2013-07-31 08:49:27Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.9 +pkgver=3.10 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('5777759e85b3323917c6cc9327f5d99c') +md5sums=('d1930df6e70a5204e8154a9911992be4') build() { cd $pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index f462e760e..4c12a00a0 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ +# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas pkgver=1.7.7 -pkgrel=1 +pkgrel=2 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' +depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz + evas-1.7.5-giflib5.patch) +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af' + 'ec40d3aff6240dc0e33e648c76393f62b985628a') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../evas-1.7.5-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" @@ -56,7 +62,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install license files diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch new file mode 100644 index 000000000..48d1834c5 --- /dev/null +++ b/extra/evas/evas-1.7.5-giflib5.patch @@ -0,0 +1,93 @@ +diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c +index 18a6e23..e8cc562 100644 +--- a/src/modules/loaders/gif/evas_image_load_gif.c ++++ b/src/modules/loaders/gif/evas_image_load_gif.c +@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + int h; + int alpha; + int loop_count = -1; +- ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + w = 0; + h = 0; + alpha = -1; +@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + GifFileType *gif; + Image_Entry_Frame *frame = NULL; + Gif_Frame *gif_frame = NULL; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + { + int fd; + GifFileType *gif; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + int remain_frames = frame_num; + double duration = 0; + int frame_count = 0; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + frame_count = ie->frame_count; + +@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + #endif + if (fd < 0) return -1; + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 43f81f44b..fbd713048 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188088 2013-06-08 19:38:24Z heftig $ +# $Id: PKGBUILD 191340 2013-07-23 17:20:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870') +sha256sums=('0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index a5f9df144..45f4e38b3 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188090 2013-06-08 19:44:06Z heftig $ +# $Id: PKGBUILD 191347 2013-07-23 17:52:56Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') url="http://www.gnome.org" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('948dbee5e31b364155719003a0a8b28dfa270aae5f364b5614faa0b262a7ff3a') +sha256sums=('1883d0d375286583520800317fbf41be585d34b40166fd03dc14c3f237a6f660') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 1cd35cf91..d02ef0b2a 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188089 2013-06-08 19:43:23Z heftig $ +# $Id: PKGBUILD 191343 2013-07-23 17:41:59Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a') +sha256sums=('d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766') build() { cd $pkgname-$pkgver diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD index 8b73023f6..b866cae93 100644 --- a/extra/exempi/PKGBUILD +++ b/extra/exempi/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: André Klitzing <aklitzing@online.de> + pkgname=exempi -pkgver=2.2.0 -pkgrel=1.2 +pkgver=2.2.1 +pkgrel=1 pkgdesc="A library to parse XMP metadata" arch=(i686 x86_64 'mips64el') url="http://libopenraw.freedesktop.org/wiki/Exempi" @@ -10,17 +11,18 @@ license=('custom:BSD') depends=('gcc-libs' 'expat' 'zlib') makedepends=('boost') options=(!libtool) -source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('f46d96975613593ee17aaf48cd350228') +source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('0f8e5832299224684a65847eedf8d1e4' + 'SKIP') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/share/licenses/$pkgname" install -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index 0b137fe90..55a959c19 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 184373 2013-05-06 19:37:00Z foutrelis $ +# $Id: PKGBUILD 191916 2013-08-01 06:59:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.09 -pkgrel=2 +pkgrel=3 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64' 'mips64el') url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') -makedepends=('libxpm') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl' 'desktop-file-utils') +makedepends=('libxpm' 'imagemagick') optdepends=('ghostscript: to use fbgs') -source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +install=fbida.install +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + ida-desktop.patch ida-PrintGifError.patch) sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7' - '18f5660301201326bd9426ce55e9fc217bf720d8') + 'SKIP' + 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717' + '4e7ed05fbfba46296aae11a9768680109bee8ac5') prepare() { cd ${pkgname}-${pkgver} sed -i 's/ungif/gif/' GNUmakefile + patch -p0 -i "${srcdir}/ida-desktop.patch" + patch -p1 -i "${srcdir}/ida-PrintGifError.patch" } build() { cd ${pkgname}-${pkgver} - make + make verbose=yes + convert -resize 25% logo.jpg ida.png } package() { cd ${pkgname}-${pkgver} make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install + install -D -m644 desktop/ida.desktop "${pkgdir}/usr/share/applications/ida.desktop" + install -D -m644 ida.png "${pkgdir}/usr/share/pixmaps/ida.png" } diff --git a/extra/fbida/fbida.install b/extra/fbida/fbida.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/fbida/fbida.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/fbida/ida-PrintGifError.patch b/extra/fbida/ida-PrintGifError.patch new file mode 100644 index 000000000..60a45ea7d --- /dev/null +++ b/extra/fbida/ida-PrintGifError.patch @@ -0,0 +1,61 @@ +diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c +--- fbida-2.09-orig/rd/read-gif.c 2013-07-29 16:43:26.949362012 -0400 ++++ fbida-2.09/rd/read-gif.c 2013-07-29 16:43:43.669166969 -0400 +@@ -13,6 +13,14 @@ + int w,h; + }; + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + static GifRecordType + gif_fileread(struct gif_state *h) + { +@@ -25,7 +33,7 @@ + if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { + if (debug) + fprintf(stderr,"gif: DGifGetRecordType failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + switch (RecordType) { +@@ -42,7 +50,7 @@ + if (rc == GIF_ERROR) { + if (debug) + fprintf(stderr,"gif: DGifGetExtension failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + if (debug) { +@@ -93,12 +101,13 @@ + struct gif_state *h; + GifRecordType RecordType; + int i, image = 0; +- ++ int Error; ++ + h = malloc(sizeof(*h)); + memset(h,0,sizeof(*h)); + + h->infile = fp; +- h->gif = DGifOpenFileHandle(fileno(fp)); ++ h->gif = DGifOpenFileHandle(fileno(fp), &Error); + h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); + + while (0 == image) { +@@ -108,7 +117,7 @@ + if (GIF_ERROR == DGifGetImageDesc(h->gif)) { + if (debug) + fprintf(stderr,"gif: DGifGetImageDesc failed\n"); +- PrintGifError(); ++ localPrintGifError(); + } + if (NULL == h->gif->SColorMap && + NULL == h->gif->Image.ColorMap) { diff --git a/extra/fbida/ida-desktop.patch b/extra/fbida/ida-desktop.patch new file mode 100644 index 000000000..8440e4cb3 --- /dev/null +++ b/extra/fbida/ida-desktop.patch @@ -0,0 +1,17 @@ +--- desktop/ida.desktop~ 2008-08-28 00:33:58.000000000 +0200 ++++ desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 +@@ -1,9 +1,10 @@ + [Desktop Entry] + Type=Application +-Encoding=UTF-8 + Name=ida + GenericName=Image Viewer ++Comment=Image Viewer + Exec=ida %F +-Terminal=no +-Categories=Motif;Graphics;Viewer +-MimeType=image/jpeg;image/tiff;image/png ++Terminal=false ++Categories=Motif;Graphics;Viewer; ++MimeType=image/jpeg;image/tiff;image/png; ++Icon=ida diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index aab0934c4..94d69acbf 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ +# $Id: PKGBUILD 191951 2013-08-01 20:53:41Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2.1 -pkgrel=1 +pkgver=2.0 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') +sha256sums=('940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c') build() { cd $pkgname-$pkgver @@ -62,14 +62,16 @@ build() { --enable-libvpx \ --enable-libx264 \ --enable-libxvid \ + --enable-pic \ --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ + --enable-swresample \ --enable-vdpau \ --enable-version3 \ --enable-x11grab \ $extraconf - + make make tools/qt-faststart make doc/ff{mpeg,play,server}.1 diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 1ae9e16e0..d95df37f3 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ +# $Id: PKGBUILD 191893 2013-08-01 06:53:26Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD index 743fb4f50..f8fd53cfc 100644 --- a/extra/fluxter/PKGBUILD +++ b/extra/fluxter/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $ +# $Id: PKGBUILD 191227 2013-07-21 21:10:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fluxter pkgver=0.1.0 -pkgrel=5.1 +pkgrel=6 pkgdesc="A workspace pager for fluxbox" arch=('i686' 'x86_64' 'mips64el') url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html" license=('GPL') depends=('gcc-libs' 'libx11') -source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \ +source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz fluxter-0.1.0-asneeded.patch) -md5sums=('6d18553220e8fc33c54762d2e7d31528' - '3deb4e816d12a262455bc8281fa82577') sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc' '2fc912d40233577b34cb6c641e066863e487fab0') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../fluxter-0.1.0-asneeded.patch - autoreconf +} + +build() { + cd ${pkgname}-${pkgver} + autoreconf --force --install ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index df83a5ef7..9f842e358 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 171997 2012-11-25 21:50:28Z bisson $ +# $Id: PKGBUILD 191917 2013-08-01 06:59:46Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20120731_b -pkgrel=3.1 +pkgrel=6 pkgdesc='Outline and bitmap font editor' -arch=('i686' 'x86_64' 'mips64el') url='http://fontforge.sourceforge.net/' +arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2") -sha1sums=('b520f532b48e557c177dffa29120225066cc4e84') +source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2" + 'http://fontforge.org/cidmaps.tgz') +sha1sums=('b520f532b48e557c177dffa29120225066cc4e84' + 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94') # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +options=('!libtool' '!makeflags') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver//_/-}" + sed 's/python /python2 /g' -i Makefile.dynamic.in + sed \ + -e'/^#include <gif_lib.h>/i #include <stddef.h>' \ + -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \ + -i configure gutils/gimagereadgif.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver//_/-}" - sed -i 's/python /python2 /g' Makefile.dynamic.in ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -40,9 +50,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/fontforge" + install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge" + install -d "${pkgdir}/usr/share/icons" cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor" rm -fr "${pkgdir}/usr/share/icons/hicolor/src" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop" } diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 2b7bcc010..e508223e3 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ +# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.9.2 -pkgrel=3 +pkgver=2.9.3 +pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64' 'mips64el') url="http://fuse.sourceforge.net/" @@ -16,11 +16,12 @@ backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' +sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') prepare() { cd "$pkgname-$pkgver" + # fix building with glibc-2.14 sed -i '1i#define _GNU_SOURCE' util/fusermount.c diff --git a/extra/fuse/fuse.rc.d b/extra/fuse/fuse.rc.d deleted file mode 100755 index 768da5b02..000000000 --- a/extra/fuse/fuse.rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# fuse Init script for Filesystem in Userspace -# Based on the script by Miklos Szeredi <miklos@szeredi.hu> - -. /etc/rc.conf -. /etc/rc.d/functions -FUSECTL=/sys/fs/fuse/connections - -case "$1" in - start) - stat_busy "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then - mount -t fusectl none $FUSECTL >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - add_daemon fuse - stat_done - ;; - stop) - stat_busy "Stopping fuse" - umount $FUSECTL >/dev/null 2>&1 - rmmod fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fuse - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index f36057f7c..53877eb72 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 184378 2013-05-06 19:37:15Z foutrelis $ +# $Id: PKGBUILD 191373 2013-07-24 20:02:25Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm pkgver=2.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') +optdepends=('perl-tk: for ClickToFocus support' + 'perl-x11-protocol: for ClickToFocus support') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 6c225a409..0f922cf8e 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,28 +1,34 @@ -# $Id: PKGBUILD 188471 2013-06-14 19:27:51Z heftig $ +# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org" options=('!libtool') -depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server) -makedepends=(itstool intltool gnome-doc-utils gobject-introspection) +depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost) +makedepends=(itstool intltool yelp-tools gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz - fix_external_program_directories.patch) -sha256sums=('1d0ed61ac2b184c62acb0d09a5b7c03793b5793599dbb6888d7fe8d1fb6e8da2' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') + fix_external_program_directories.patch arch-pam.patch) +sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447' + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' + 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003') -build() { +prepare() { cd $pkgbase-$pkgver - patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i ../fix_external_program_directories.patch + patch -Np1 -i ../arch-pam.patch + AUTOPOINT='intltoolize --automake -c' autoreconf -fi +} +build() { + cd $pkgbase-$pkgver ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -37,7 +43,7 @@ build() { --without-tcp-wrappers \ --without-console-kit \ --with-systemd \ - --with-default-pam-config=exherbo + --with-default-pam-config=arch sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -62,8 +68,7 @@ package_gdm() { cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install - chmod 1770 "$pkgdir/var/log/gdm" - chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + chmod 711 "$pkgdir/var/log/gdm" rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" ### Split libgdm diff --git a/extra/gdm/arch-pam.patch b/extra/gdm/arch-pam.patch new file mode 100644 index 000000000..1faa2b90b --- /dev/null +++ b/extra/gdm/arch-pam.patch @@ -0,0 +1,179 @@ +diff --git c/configure.ac i/configure.ac +index bda20c6..e118101 100644 +--- c/configure.ac ++++ i/configure.ac +@@ -185,12 +185,13 @@ if test x$enable_split_authentication = xyes; then + fi + + AC_ARG_WITH(default-pam-config, +- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@])) ++ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@])) + dnl If not given, try autodetecting from release files (see NetworkManager source) + if test x$with_default_pam_config = x; then + AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") ++ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch") + AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs") + dnl If not autodetected, default to none + if test x$with_default_pam_config = x; then +@@ -198,7 +199,7 @@ if test x$with_default_pam_config = x; then + fi + fi + case x$with_default_pam_config in +- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;; ++ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;; + *) + AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}]) + exit 1 +@@ -208,6 +209,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha + AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded) + AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo) + AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs) ++AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch) + + AC_ARG_ENABLE(console-helper, + AS_HELP_STRING([--enable-console-helper], +diff --git c/data/Makefile.am i/data/Makefile.am +index 81eb8ef..6a67433 100644 +--- c/data/Makefile.am ++++ i/data/Makefile.am +@@ -129,6 +129,15 @@ pam_lfs_files = pam-lfs/gdm.pam \ + $(NULL) + EXTRA_DIST += $(pam_lfs_files) + ++pam_arch_files = pam-arch/gdm-autologin.pam \ ++ pam-arch/gdm-launch-environment.pam \ ++ pam-arch/gdm-fingerprint.pam \ ++ pam-arch/gdm-smartcard.pam \ ++ pam-arch/gdm-password.pam \ ++ pam-arch/gdm-pin.pam \ ++ $(NULL) ++EXTRA_DIST += $(pam_arch_files) ++ + if ENABLE_REDHAT_PAM_CONFIG + pam_files = $(pam_redhat_files) + endif +@@ -141,6 +150,9 @@ endif + if ENABLE_LFS_PAM_CONFIG + pam_files = $(pam_lfs_files) + endif ++if ENABLE_ARCH_PAM_CONFIG ++pam_files = $(pam_arch_files) ++endif + + EXTRA_DIST += \ + $(schemas_in_files) \ +diff --git c/data/pam-arch/gdm-autologin.pam i/data/pam-arch/gdm-autologin.pam +new file mode 100644 +index 0000000..de615ef +--- /dev/null ++++ i/data/pam-arch/gdm-autologin.pam +@@ -0,0 +1,13 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-fingerprint.pam i/data/pam-arch/gdm-fingerprint.pam +new file mode 100644 +index 0000000..f296ae0 +--- /dev/null ++++ i/data/pam-arch/gdm-fingerprint.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_fprintd.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_fprintd.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-launch-environment.pam i/data/pam-arch/gdm-launch-environment.pam +new file mode 100644 +index 0000000..6dfbc51 +--- /dev/null ++++ i/data/pam-arch/gdm-launch-environment.pam +@@ -0,0 +1,13 @@ ++auth required pam_succeed_if.so audit quiet_success user = gdm ++auth required pam_env.so ++auth optional pam_permit.so ++ ++account required pam_succeed_if.so audit quiet_success user = gdm ++account include system-local-login ++ ++password required pam_deny.so ++ ++session required pam_succeed_if.so audit quiet_success user = gdm ++session required pam_systemd.so ++session optional pam_keyinit.so force revoke ++session optional pam_permit.so +diff --git c/data/pam-arch/gdm-password.pam i/data/pam-arch/gdm-password.pam +new file mode 100644 +index 0000000..7411285 +--- /dev/null ++++ i/data/pam-arch/gdm-password.pam +@@ -0,0 +1,9 @@ ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-pin.pam i/data/pam-arch/gdm-pin.pam +new file mode 100644 +index 0000000..e024244 +--- /dev/null ++++ i/data/pam-arch/gdm-pin.pam +@@ -0,0 +1,11 @@ ++auth requisite pam_pin.so ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++password optional pam_pin.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-smartcard.pam i/data/pam-arch/gdm-smartcard.pam +new file mode 100644 +index 0000000..7c3d736 +--- /dev/null ++++ i/data/pam-arch/gdm-smartcard.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_pkcs11.so wait_for_card card_only ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_pkcs11.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start + diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index c48faf4ae..4f15730f0 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -5,6 +5,7 @@ post_install() { getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null + chown root:gdm /var/log/gdm > /dev/null glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 8322d2d76..fb8eaea94 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184381 2013-05-06 19:37:25Z foutrelis $ +# $Id: PKGBUILD 191894 2013-08-01 06:53:27Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD index ba7c13ff5..80ef5a0b2 100644 --- a/extra/genius/PKGBUILD +++ b/extra/genius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $ +# $Id: PKGBUILD 191334 2013-07-23 17:00:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> pkgname=genius -pkgver=1.0.16 +pkgver=1.0.17 pkgrel=1 pkgdesc="Advanced calculator including a mathematical programming language" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!makeflags') install=genius.install source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz) -sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78') +sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index fb5089c9a..627444421 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $ +# $Id: PKGBUILD 191918 2013-08-01 06:59:47Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=4.2.1 -pkgrel=3 +pkgver=5.0.4 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -18,34 +18,24 @@ conflicts=('libungif') replaces=('libungif') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 - giflib-4.2.1-quantize.patch) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '26174405ba886a89b8a4db18fe653a99') + giflib-5.0.4-include-stddef.patch) +md5sums=('da60935d07374de00a78c2f6f720c8f5' + 'e39b98822334f2bd2009469e5dea65c5') prepare() { cd ${pkgname}-${pkgver} - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac - patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch - autoreconf -fi + patch -Np1 -i ../giflib-5.0.4-include-stddef.patch } build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} } package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" - ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" - ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch new file mode 100644 index 000000000..d3ea73854 --- /dev/null +++ b/extra/giflib/giflib-5.0.4-include-stddef.patch @@ -0,0 +1,11 @@ +diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h +--- a/lib/gif_lib.h 2013-01-06 07:29:57.000000000 +0100 ++++ b/lib/gif_lib.h 2013-07-30 10:52:47.611034000 +0200 +@@ -19,6 +19,7 @@ extern "C" { + #define GIF_OK 1 + + #include <stdbool.h> ++#include <stddef.h> + + #define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp. */ + #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d0afe870f..74a7cbe7d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ +# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.2 +pkgver=1.8.3.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') +makedepends=('python2' 'emacs' 'libgnome-keyring') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -18,10 +18,10 @@ optdepends=('tk: gitk and git gui' 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' 'subversion: git svn' - 'cvsps: git cvsimport') + 'cvsps: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') replaces=('git-core') provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" @@ -37,8 +37,8 @@ build() { NO_CROSS_DIRECTORY_HARDLINKS=1 \ all - cd contrib/emacs - make prefix=/usr + make -C contrib/emacs prefix=/usr + make -C contrib/credential/gnome-keyring } check() { @@ -72,16 +72,23 @@ package() { CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install + INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git # fancy git prompt mkdir -p "$pkgdir"/usr/share/git/ install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh - # more contrib stuff - cp -a ./contrib/* $pkgdir/usr/share/git/ + # emacs + make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install + # gnome credentials helper + install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # the rest of the contrib stuff + cp -a ./contrib/* $pkgdir/usr/share/git/ + # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ @@ -92,9 +99,6 @@ package() { sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install # how 'bout some manpages? for mansect in man1 man5 man7; do @@ -111,7 +115,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('83b792fd06066c77e1d4911ebba2d701' - 'f850829e1e7f32e388d2ffb61759fcc9' +md5sums=('80eec3201a5d012913d287b85adaee8e' + '86fd812754d25201fd72c7476045dfec' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 4de85bfcd..8777035fc 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,18 +1,24 @@ -# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $ +# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs pkgver=1.36.1 -pkgrel=1 +pkgrel=2 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') url="http://live.gnome.org/Gjs" license=(GPL) depends=(cairo gobject-introspection 'js>=17.0.0') options=('!libtool') -source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2) -sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27') +source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2 + gettext-typo.patch) +sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27' + 'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../gettext-typo.patch +} build() { cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static diff --git a/extra/gjs/gettext-typo.patch b/extra/gjs/gettext-typo.patch new file mode 100644 index 000000000..9a07b9a71 --- /dev/null +++ b/extra/gjs/gettext-typo.patch @@ -0,0 +1,22 @@ +From 178c810b7797ff2fca0440e519ddf4dbede589a1 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Sun, 12 May 2013 16:46:19 +0000 +Subject: gettext: fix typo + +https://bugzilla.gnome.org/show_bug.cgi?id=700336 +--- +diff --git a/modules/gettext.js b/modules/gettext.js +index 8f73c13..60991e1 100644 +--- a/modules/gettext.js ++++ b/modules/gettext.js +@@ -46,7 +46,7 @@ function gettext(msgid) { + return GLib.dgettext(null, msgid); + } + function dgettext(domain, msgid) { +- return GLib.dgetext(domain, msgid); ++ return GLib.dgettext(domain, msgid); + } + function dcgettext(domain, msgid, category) { + return GLib.dcgettext(domain, msgid, category); +-- +cgit v0.9.2 diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 7425f8cfd..d29c44bf3 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $ +# $Id: PKGBUILD 191913 2013-08-01 06:53:46Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.9.0 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64' 'mips64el') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz - glxew_export_fix.diff) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe' - 'f389645a1400aebdadce596fec970cfe0be6c15b') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('f41b45ca4a630ad1d00b8b87c5f493781a380300') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix compilation for some 3rd party apps; FS#32835 - patch -Np1 -i ${srcdir}/glxew_export_fix.diff - sed -i 's|lib64|lib|' config/Makefile.linux make } diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff deleted file mode 100644 index 8a179e0a7..000000000 --- a/extra/glew/glxew_export_fix.diff +++ /dev/null @@ -1,30 +0,0 @@ -X-Git-Url: -http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220 - -diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h -index cfcd20d..e9a3391 100644 ---- a/auto/src/glxew_mid.h -+++ b/auto/src/glxew_mid.h -@@ -1,7 +1,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT -Index: glew-1.8.0/include/GL/glxew.h -=================================================================== ---- glew-1.8.0.orig/include/GL/glxew.h 2012-08-08 20:56:17.574088414 +0200 -+++ glew-1.8.0/include/GL/glxew.h 2012-08-08 20:57:34.350092129 +0200 -@@ -1360,7 +1360,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch deleted file mode 100644 index fe92fbd94..000000000 --- a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch +++ /dev/null @@ -1,230 +0,0 @@ -From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de> -Date: Thu, 2 Aug 2012 21:41:41 +0200 -Subject: [PATCH] Make Glib::Object subclassing more robust -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Rearrange how we register the interfaces, properties and signals of a newly -created type so that: - -• The outcome is independent of the order of the arguments passed to -Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from -the change to hash randomization in perl 5.17.6. - -• We register things in the correct order: interfaces first, before entering -class_init; then properties and signals from within class_init. This also -avoids prematurely creating the new type's class. ---- - GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- - NEWS | 7 +++++ - 2 files changed, 77 insertions(+), 22 deletions(-) - -diff --git a/GType.xs b/GType.xs -index 02e24a4..fdaad68 100644 ---- a/GType.xs -+++ b/GType.xs -@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, - - - static void --add_signals (GType instance_type, HV * signals) -+add_signals (GType instance_type, HV * signals, AV * interfaces) - { -- GObjectClass *oclass; - HE * he; - -- oclass = g_type_class_ref (instance_type); -- - hv_iterinit (signals); - while (NULL != (he = hv_iternext (signals))) { - I32 keylen; -@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) - - /* the key is the signal name */ - signal_name = hv_iterkey (he, &keylen); -- /* if the signal is defined at this point, we're going to -- * override the installed closure. */ -- signal_id = g_signal_lookup (signal_name, instance_type); -+ -+ /* if, at this point, the signal is already defined in the -+ * ancestry or the interfaces we just added to instance_type, -+ * we can only override the installed closure. trying to -+ * create a new signal with the same name is an error. -+ * -+ * unfortunately, we cannot simply use instance_type to do the -+ * lookup because g_signal_lookup would complain about it since -+ * it hasn't been fully loaded yet. see -+ * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>. -+ * -+ * FIXME: the "if (signal_id)" check in the hash ref block -+ * below could be removed since g_signal_newv also checks this. -+ * consequently, this lookup code could be moved into the class -+ * closure block below. */ -+ signal_id = g_signal_lookup (signal_name, -+ g_type_parent (instance_type)); -+ if (!signal_id && interfaces) { -+ int i; -+ for (i = 0; i <= av_len (interfaces); i++) { -+ GType interface_type; -+ SV ** svp = av_fetch (interfaces, i, FALSE); -+ if (!svp || !gperl_sv_is_defined (*svp)) -+ continue; -+ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); -+ signal_id = g_signal_lookup (signal_name, interface_type); -+ if (signal_id) -+ break; -+ } -+ } - - /* parse the key's value... */ - value = hv_iterval (signals, he); -@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) - signal_name); - } - } -- -- g_type_class_unref (oclass); - } - - typedef struct { -@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, - } - - static void --add_properties (GType instance_type, AV * properties) -+add_properties (GType instance_type, GObjectClass * oclass, AV * properties) - { -- GObjectClass *oclass; - int propid; - -- oclass = g_type_class_ref (instance_type); -- - for (propid = 0; propid <= av_len (properties); propid++) { - SV * sv = *av_fetch (properties, propid, 1); - GParamSpec * pspec = NULL; -@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) - } - g_object_class_install_property (oclass, propid + 1, pspec); - } -- -- g_type_class_unref (oclass); - } - - /* -@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) - return q; - } - -+typedef struct { -+ GType instance_type; -+ AV *interfaces; -+ AV *properties; -+ HV *signals; -+} GPerlClassData; -+ - static void --gperl_type_class_init (GObjectClass * class) -+gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) - { - class->finalize = gperl_type_finalize; - class->get_property = gperl_type_get_property; - class->set_property = gperl_type_set_property; -+ -+ if (class_data->properties) -+ add_properties (class_data->instance_type, class, -+ class_data->properties); -+ if (class_data->signals) -+ add_signals (class_data->instance_type, -+ class_data->signals, class_data->interfaces); - } - - static void -@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); - PREINIT: - int i; - GTypeInfo type_info; -+ GPerlClassData class_data; - GTypeQuery query; - GType parent_type, new_type; - char * new_type_name; - CODE: - /* start with a clean slate */ - memset (&type_info, 0, sizeof (GTypeInfo)); -+ memset (&class_data, 0, sizeof (GPerlClassData)); - type_info.base_init = (GBaseInitFunc) gperl_type_base_init; - type_info.class_init = (GClassInitFunc) gperl_type_class_init; - type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; -+ type_info.class_data = &class_data; - - /* yeah, i could just call gperl_object_type_from_package directly, - * but i want the error messages to be more informative. */ -@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); - /* mark this type as "one of ours". */ - g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); - -- /* now look for things we should initialize presently, e.g. -- * signals and properties and interfaces and such, things that -- * would generally go into a class_init. */ -+ /* put it into the class data so that add_signals and add_properties -+ * can use it. */ -+ class_data.instance_type = new_type; -+ -+ /* now look for things we should initialize, e.g. signals and -+ * properties and interfaces. put the corresponding data into the -+ * class_data struct. the interfaces will be handled directly further -+ * below, while the properties and signals will be handled in the -+ * class_init function so that they have access to the class instance. -+ * this mimics the way things are supposed to be done in C: register -+ * interfaces in the get_type function, and register properties and -+ * signals in the class_init function. */ - for (i = 3 ; i < items ; i += 2) { - char * key = SvPV_nolen (ST (i)); - if (strEQ (key, "signals")) { - if (gperl_sv_is_hash_ref (ST (i+1))) -- add_signals (new_type, (HV*)SvRV (ST (i+1))); -+ class_data.signals = (HV*)SvRV (ST (i+1)); - else - croak ("signals must be a hash of signalname => signalspec pairs"); - } else if (strEQ (key, "properties")) { - if (gperl_sv_is_array_ref (ST (i+1))) -- add_properties (new_type, (AV*)SvRV (ST (i+1))); -+ class_data.properties = (AV*)SvRV (ST (i+1)); - else - croak ("properties must be an array of GParamSpecs"); - } else if (strEQ (key, "interfaces")) { - if (gperl_sv_is_array_ref (ST (i+1))) -- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); -+ class_data.interfaces = (AV*)SvRV (ST (i+1)); - else - croak ("interfaces must be an array of package names"); - } - } - -+ /* add the interfaces to the type now before we create its class and -+ * enter the class_init function. */ -+ if (class_data.interfaces) -+ add_interfaces (new_type, class_data.interfaces); -+ - /* instantiate the class right now. perl doesn't let classes go - * away once they've been defined, so we'll just leak this ref and - * let the GObjectClass live as long as the program. in fact, -diff --git a/NEWS b/NEWS -index 5606566..ad71da0 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,10 @@ -+Overview of changes in Glib <next> (unstable) -+============================================ -+ -+* Make Glib::Object subclassing more robust. This should in particular fix -+ issues revealed by the change to hash randomization introduced in perl -+ 5.17.6. -+ - Overview of changes in Glib 1.280 (stable) - ========================================== - --- -1.8.2.3 - diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index ee1300607..2f70e9ccd 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ +# $Id: PKGBUILD 191337 2013-07-23 17:10:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl -pkgver=1.280 -pkgrel=3 +pkgver=1.301 +pkgrel=1 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,17 +12,8 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz - 0001-Make-Glib-Object-subclassing-more-robust.patch) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' - 'ebe39d50eff182a1ad4390cbbef46e41') - -prepare() { - cd "${srcdir}/Glib-${pkgver}" - - # Needed for gtk2-perl to compile against Perl 5.18 - patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" -} +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) +md5sums=('7c0d005a20afff174c99a83c72f9786b') build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index ea287c4d3..120a737cb 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,37 +1,50 @@ -# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=9.2 +pkgrel=10 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc') -options=('!libtool') +depends=('glibc' 'sh') +options=('!libtool' '!makeflags') install=glib.install -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ - gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz + gcc340.patch aclocal-fixes.patch glib1-autotools.patch) sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0' + '8a25fde3c79567262b3024f4e74c9ca4ee8a6279') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/gcc340.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/glib1-autotools.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch + cd ${pkgname}-${pkgver} + if [[ $CARCH = "i686" ]]; then + CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' + elif [[ $CARCH = "x86_64" ]]; then + CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + fi - [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + autoreconf --force --install ./configure --prefix=/usr --mandir=/usr/share/man \ --infodir=/usr/share/info $CONFIGFLAG make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch new file mode 100644 index 000000000..1332c9639 --- /dev/null +++ b/extra/glib/glib1-autotools.patch @@ -0,0 +1,33 @@ +diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in +--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400 ++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400 +@@ -17,7 +17,7 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -81,7 +81,7 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else +diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am +--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400 ++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400 +@@ -42,7 +42,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD index ba1d6d02e..df4f43807 100644 --- a/extra/glpk/PKGBUILD +++ b/extra/glpk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178114 2013-02-16 16:08:40Z ronald $ +# $Id: PKGBUILD 191850 2013-07-31 15:25:15Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: bzklrm <bzklrm@gmail.com> # Additional contributors Senjin, Xavier, dundee pkgname=glpk -pkgver=4.48 +pkgver=4.52 pkgrel=1 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems." arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('e00c92faa38fd5d865fa27206abbb06680bab7bb' - '4b57f5ae0a8114c5307daa6071f9be5967a935d6') +sha1sums=('44b30b0de777a0a07e00615ac6791af180ff4d2c' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD index 264534d7d..04a85ea81 100644 --- a/extra/gnet/PKGBUILD +++ b/extra/gnet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $ +# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnet pkgver=2.0.8 -pkgrel=2.1 +pkgrel=3 pkgdesc="A simple network library" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GNetLibrary" @@ -11,17 +11,15 @@ license=('LGPL') depends=('glib2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('93327d2fca333d7e54ba2cf54e071165') sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - find examples -name Makefile.in | xargs sed -ri 's/^(LIBS .*)/\1 -lglib-2.0/' - ./configure --prefix=/usr + cd ${pkgname}-${pkgver} + LIBS+="-lglib-2.0" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 3db98fa9b..bbf6134ed 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189930 2013-07-11 18:55:47Z ioni $ +# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accoun makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6cb3fe9e7f0f2380d77494a3408893265c42ea2a70579f0c871defbab5a7b5fa') +sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1c9c043e9..573dfed07 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ +# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.3 +pkgver=3.8.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD index 565988e8f..883e619c6 100644 --- a/extra/gnome-dictionary/PKGBUILD +++ b/extra/gnome-dictionary/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $ +# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-dictionary -pkgver=3.6.0 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Look up words in dictionary sources" arch=(i686 x86_64 mips64el) url="http://gnome.org" @@ -13,7 +13,7 @@ install=$pkgname.install options=(!libtool) groups=('gnome') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9') +sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 204d45b5f..6b165d2b3 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185463 2013-05-14 10:32:30Z heftig $ +# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.2 +pkgver=3.8.4 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('a6ed1c109005f81ec34a8aa09b2f114c07b4fba8feef47d2f23559797be88640' +sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 39045563c..836cc9334 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189793 2013-07-08 08:16:03Z jgc $ +# $Id: PKGBUILD 191201 2013-07-19 20:57:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.3 -pkgrel=2 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,24 +14,14 @@ options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - git-fixes.patch) -sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c' - '30b0a42df9ea0c6c18ed51cb8f150008e4b5ab624eb420f0251d08ab2503c330') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch -} +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc') build() { cd $pkgname-$pkgver - aclocal - autoconf - automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static + --libexecdir=/usr/lib/$pkgname --disable-static #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/gnome-settings-daemon/git-fixes.patch b/extra/gnome-settings-daemon/git-fixes.patch deleted file mode 100644 index a56033ce1..000000000 --- a/extra/gnome-settings-daemon/git-fixes.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff --git a/data/gnome-settings-daemon.desktop.in.in b/data/gnome-settings-daemon.desktop.in.in -index c5a5518..ff71eee 100644 ---- a/data/gnome-settings-daemon.desktop.in.in -+++ b/data/gnome-settings-daemon.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application - _Name=GNOME Settings Daemon --Exec=@libexecdir@/gnome-settings-daemon -+Exec=@libexecdir@/gnome-settings-daemon-localeexec - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Initialization -diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am -index 194a7cc..94b3861 100644 ---- a/gnome-settings-daemon/Makefile.am -+++ b/gnome-settings-daemon/Makefile.am -@@ -48,6 +48,15 @@ gsddir = $(libexecdir) - gsd_PROGRAMS = \ - gnome-settings-daemon - -+gsd_SCRIPTS = \ -+ gnome-settings-daemon-localeexec -+ -+EXTRA_DIST = \ -+ gnome-settings-daemon-localeexec.in -+ -+gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in -+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@prefix\@|$(prefix)|" $< > $@.tmp && mv $@.tmp $@ -+ - apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon - api_DATA = \ - gnome-settings-plugin.h -diff --git a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in -new file mode 100755 -index 0000000..eed91a4 ---- /dev/null -+++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in -@@ -0,0 +1,20 @@ -+#!/bin/sh -+ -+SETTING=$(gsettings get org.gnome.system.locale region) -+REGION=${SETTING#\'} -+REGION=${REGION%\'} -+ -+if [ -n "$REGION" ]; then -+ export LC_TIME=$REGION -+ export LC_NUMERIC=$REGION -+ export LC_MONETARY=$REGION -+ export LC_MEASUREMENT=$REGION -+ export LC_PAPER=$REGION -+fi -+ -+if [ -x @prefix@/bin/ibus-daemon ]; then -+ export QT_IM_MODULE=ibus -+ export XMODIFIERS=@im=ibus -+fi -+ -+exec @libexecdir@/gnome-settings-daemon -diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c -index 24c1598..16017df 100644 ---- a/gnome-settings-daemon/main.c -+++ b/gnome-settings-daemon/main.c -@@ -279,37 +279,6 @@ set_legacy_ibus_env_vars (GDBusProxy *proxy) - } - #endif - --/* Keep synchronised with set_locale() and -- * set_legacy_ibus_env_vars() above */ --static void --set_locale_env (void) --{ -- GSettings *locale_settings; -- gchar *region; -- -- /* Set locale environment */ -- locale_settings = g_settings_new ("org.gnome.system.locale"); -- region = g_settings_get_string (locale_settings, "region"); -- if (region[0]) { -- g_setenv ("LC_TIME", region, TRUE); -- g_setenv ("LC_NUMERIC", region, TRUE); -- g_setenv ("LC_MONETARY", region, TRUE); -- g_setenv ("LC_MEASUREMENT", region, TRUE); -- g_setenv ("LC_PAPER", region, TRUE); -- } -- g_free (region); -- g_object_unref (locale_settings); -- --#ifdef HAVE_IBUS -- /* Set IBus legacy environment */ -- if (is_program_in_path ("ibus-daemon") && -- keyboard_plugin_is_enabled ()) { -- g_setenv ("QT_IM_MODULE", "ibus", TRUE); -- g_setenv ("XMODIFIERS", "@im=ibus", TRUE); -- } --#endif --} -- - static void - register_with_gnome_session (GDBusProxy *proxy) - { -@@ -499,8 +468,6 @@ main (int argc, char *argv[]) - - g_log_set_default_handler (gsd_log_default_handler, NULL); - -- set_locale_env (); -- - notify_init ("gnome-settings-daemon"); - - bus_register (); -diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c -index 45393ec..f51d520 100644 ---- a/plugins/housekeeping/gsd-housekeeping-manager.c -+++ b/plugins/housekeeping/gsd-housekeeping-manager.c -@@ -372,12 +372,20 @@ gboolean - gsd_housekeeping_manager_start (GsdHousekeepingManager *manager, - GError **error) - { -+ gchar *dir; -+ - g_debug ("Starting housekeeping manager"); - gnome_settings_profile_start (NULL); - - /* Create ~/.local/ as early as possible */ - g_mkdir_with_parents(g_get_user_data_dir (), 0700); - -+ /* Create ~/.local/share/applications/, see -+ * https://bugzilla.gnome.org/show_bug.cgi?id=703048 */ -+ dir = g_build_filename (g_get_user_data_dir (), "applications", NULL); -+ g_mkdir (dir, 0700); -+ g_free (dir); -+ - gsd_ldsm_setup (FALSE); - - manager->priv->settings = g_settings_new (THUMB_PREFIX); -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index e6380bd..96da3d1 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -261,11 +261,12 @@ gsd_power_manager_error_quark (void) - } - - static void --notify_close_if_showing (NotifyNotification *notification) -+notify_close_if_showing (NotifyNotification **notification) - { -- if (notification == NULL) -+ if (*notification == NULL) - return; -- notify_notification_close (notification, NULL); -+ notify_notification_close (*notification, NULL); -+ g_clear_object (notification); - } - - typedef enum { -@@ -1214,7 +1215,7 @@ engine_ups_discharging (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - - /* create a new notification */ - create_notification (title, message->str, -@@ -1424,7 +1425,7 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1597,7 +1598,7 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1735,7 +1736,7 @@ engine_charge_action (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1797,8 +1798,8 @@ engine_device_changed_cb (UpClient *client, UpDevice *device, GsdPowerManager *m - } else if (state == UP_DEVICE_STATE_FULLY_CHARGED || - state == UP_DEVICE_STATE_CHARGING) { - g_debug ("fully charged or charging, hiding notifications if any"); -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - main_battery_or_ups_low_changed (manager, FALSE); - } - -@@ -2268,7 +2269,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (!up_client_get_on_battery (client)) { - /* if we are playing a critical charge sound loop on AC, stop it */ - play_loop_stop (&manager->priv->critical_alert_timeout_id); -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - main_battery_or_ups_low_changed (manager, FALSE); - } - -@@ -2638,7 +2639,7 @@ idle_configure (GsdPowerManager *manager) - &manager->priv->idle_dim_id); - clear_idle_watch (manager->priv->idle_monitor, - &manager->priv->idle_sleep_warning_id); -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - return; - } - -@@ -2705,7 +2706,7 @@ idle_configure (GsdPowerManager *manager) - } - - if (manager->priv->idle_sleep_warning_id == 0) -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - /* set up dim callback for when the screen lock is not active, - * but only if we actually want to dim. */ -@@ -3038,7 +3039,7 @@ static void - show_sleep_warning (GsdPowerManager *manager) - { - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - /* create a new notification */ - switch (manager->priv->sleep_action_type) { -@@ -3109,7 +3110,7 @@ idle_became_active_cb (GnomeIdleMonitor *monitor, - set_temporary_unidle_on_ac (manager, FALSE); - - /* close any existing notification about idleness */ -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); - } -@@ -3344,8 +3345,8 @@ handle_resume_actions (GsdPowerManager *manager) - { - /* close existing notifications on resume, the system power - * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - main_battery_or_ups_low_changed (manager, FALSE); - - /* ensure we turn the panel back on after resume */ diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index a9d5b9820..2653f103e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ +# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.3 -pkgrel=3 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch - git-fixes.patch) -sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') + nm-libexecdir.patch) +sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f - patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch deleted file mode 100644 index 989c881f0..000000000 --- a/extra/gnome-shell/git-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css -index 775b687..f4ea781 100644 ---- a/data/theme/gnome-shell.css -+++ b/data/theme/gnome-shell.css -@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { - font-weight: bold; - color: #666666; - padding-top: 1em; -+ padding-left: 2px; - } - - .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 6075e66..cae3e1b 100644 ---- a/js/gdm/util.js -+++ b/js/gdm/util.js -@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ - - answerQuery: function(serviceName, answer) { - if (!this._userVerifier.hasPendingMessages) { -+ this._clearMessageQueue(); - this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); - } else { - let signalId = this._userVerifier.connect('no-more-messages', -diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js -index b07ea95..72bc010 100644 ---- a/js/ui/components/telepathyClient.js -+++ b/js/ui/components/telepathyClient.js -@@ -18,7 +18,7 @@ const Params = imports.misc.params; - const PopupMenu = imports.ui.popupMenu; - - // See Notification.appendMessage --const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute -+const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes - const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes - const SCROLLBACK_RECENT_LENGTH = 20; - const SCROLLBACK_IDLE_LENGTH = 5; -@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ - let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), - group: 'meta', - styles: ['chat-meta-message'], -- childProps: { expand: true, x_fill: false }, -+ childProps: { expand: true, x_fill: false, -+ x_align: St.Align.END }, - noTimestamp: true, - timestamp: lastMessageTime }); - -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index d322581..ed61bf7 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ - _startTimer: function() { - let startTime = GLib.get_monotonic_time(); - this._secondsLeft = this._totalSecondsToStayOpen; -+ this._updateDescription(); - - this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, - function() { -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 0bb887e..e25b3bd 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ - // and shown otherwise) - addChrome: function(actor, params) { - this.uiGroup.add_actor(actor); -+ if (this.uiGroup.contains(global.top_window_group)) -+ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); - this._trackActor(actor, params); - }, - -diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js -index 7e7b536..7fa052e 100644 ---- a/js/ui/osdWindow.js -+++ b/js/ui/osdWindow.js -@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ - { opacity: 0, - time: FADE_TIME, - transition: 'easeOutQuad', -- onComplete: Lang.bind(this, this._reset) }); -+ onComplete: Lang.bind(this, function() { -+ this._reset(); -+ Meta.enable_unredirect_for_screen(global.screen); -+ }) -+ }); - }, - - _reset: function() { - this.actor.hide(); - this.setLabel(null); - this.setLevel(null); -- Meta.enable_unredirect_for_screen(global.screen); - }, - - _monitorsChanged: function() { -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index fe9cd31..4264f01 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ - }, - - _onDragEnd: function(action, actor, eventX, eventY, modifiers) { -+ if (this._lockScreenState != MessageTray.State.HIDING) -+ return; - if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { - // Complete motion automatically - let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); -diff --git a/src/st/st-widget.c b/src/st/st-widget.c -index 42992ec..4875acc 100644 ---- a/src/st/st-widget.c -+++ b/src/st/st-widget.c -@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) - - if (stage == NULL) - { -- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -- st_describe_actor (CLUTTER_ACTOR (widget))); -+ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -+ st_describe_actor (CLUTTER_ACTOR (widget))); -+ return g_object_new (ST_TYPE_THEME_NODE, NULL); - } - - if (parent_node == NULL) diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 7da4ab696..a6c6bac23 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $ +# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ replaces=(gnome-themes) conflicts=(gnome-themes) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1') +sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 6e7fb614d..756dcd97a 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183409 2013-04-21 22:10:42Z heftig $ +# $Id: PKGBUILD 190104 2013-07-15 17:59:27Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.8.0 +pkgver=3.8.3 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!emptydirs' '!libtool') groups=('gnome') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae0638a24cf306b6615639a8706c9b48e8961ae26d7f8b5d65eb26955ca4cc3f') +sha256sums=('e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD index 5eab02234..5e3bf7ca5 100644 --- a/extra/gnome-vfs/PKGBUILD +++ b/extra/gnome-vfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $ +# $Id: PKGBUILD 191321 2013-07-23 15:15:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs pkgver=2.24.4 -pkgrel=6.1 +pkgrel=7 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -14,33 +14,43 @@ url="http://www.gnome.org" install=gnome-vfs.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 gnutls-config.patch - gcrypt-config.patch) + gcrypt-config.patch + enable-deprecated.patch) sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d' - 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114') + 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114' + 'ca2b9dffb1fa202c0d1f0d3648ef37cd8e84657a22d4c6746bb46e9a6cf1ee47') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" + patch -Np1 -i ../gnutls-config.patch #fix build with new libgcrypt >= 1.5.0 - patch -Np1 -i "${srcdir}/gcrypt-config.patch" + patch -Np1 -i ../gcrypt-config.patch + # remove -DG_DISABLE_DEPRECATED + patch -Np1 -i ../enable-deprecated.patch + + sed -i -s 's|$(srcdir)/auto-test|auto-test|' test/Makefile.am +} +build() { + cd ${pkgname}-${pkgver} libtoolize --force gtkdocize aclocal autoconf - automake - ./configure --prefix=/usr --sysconfdir=/etc \ + automake --add-missing + CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure \ + --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --disable-hal \ - --enable-avahi --disable-howl \ + --enable-samba --with-samba-includes=/usr/include/samba-4.0 \ + --disable-hal --enable-avahi --disable-howl \ --disable-openssl --enable-gnutls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/gnome-vfs/enable-deprecated.patch b/extra/gnome-vfs/enable-deprecated.patch new file mode 100644 index 000000000..0f249b2bb --- /dev/null +++ b/extra/gnome-vfs/enable-deprecated.patch @@ -0,0 +1,57 @@ +diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am +--- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100 +@@ -8,7 +8,6 @@ INCLUDES= \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am +--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100 +@@ -19,7 +19,6 @@ INCLUDES = \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_BINDIR=\"$(bindir)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ +diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am +--- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100 +@@ -18,7 +18,6 @@ INCLUDES = \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ + -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am +--- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100 +@@ -4,8 +4,7 @@ INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(TEST_CFLAGS) \ +- $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED ++ $(VFS_CFLAGS) + + libraries = \ + $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ +diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am +--- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100 ++++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100 +@@ -6,7 +6,6 @@ INCLUDES = \ + -I$(top_builddir)/libgnomevfs \ + $(TEST_CFLAGS) \ + $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ + -DMODULES_PATH=\"$(libdir)/vfs/modules\" + + if OS_WIN32 diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 40b638520..0eff0e9d2 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $ +# $Id: PKGBUILD 190849 2013-07-18 20:27:30Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.3 +pkgver=1.12.4 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6' +sha256sums=('562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index c2d2ea67e..9cda1fb2e 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189862 2013-07-10 07:26:53Z bpiotrowski $ +# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.6.2 -pkgrel=3 +pkgver=4.6.3 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" @@ -16,7 +16,7 @@ options=('!makeflags') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" gnuplot-doc2texi-el.patch) -sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd' +sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2' '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8') build() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0f50c438b..f42a8c29c 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $ +# $Id: PKGBUILD 191780 2013-07-30 17:27:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,18 +14,12 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} - check_fix.diff) -md5sums=('c220b50736f61292ed8722d5132b6a3e' - 'SKIP' - '53ae2a58a401d9e6d052910670da8b07') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('7c0dd4f77dc70c64d2f385aeb2df4157' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix i686 test suite failure - patch -Np1 -i ${srcdir}/check_fix.diff - + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -35,13 +29,12 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make -k check - #make -j1 check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff deleted file mode 100644 index f7c7e32c3..000000000 --- a/extra/gnutls/check_fix.diff +++ /dev/null @@ -1,34 +0,0 @@ -From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@gnutls.org> -Date: Sun, 2 Jun 2013 12:10:06 +0200 -Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. - ---- - tests/cert-tests/pem-decoding | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding -index fe769ec..f8c6372 100755 ---- a/tests/cert-tests/pem-decoding -+++ b/tests/cert-tests/pem-decoding -@@ -61,7 +61,9 @@ if test "$rc" != "0"; then - exit $rc - fi - --diff $srcdir/complex-cert.pem tmp-pem.pem -+cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 -+cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 -+diff tmp1 tmp2 - rc=$? - - if test "$rc" != "0"; then -@@ -69,6 +71,6 @@ if test "$rc" != "0"; then - exit $rc - fi - --rm -f tmp-pem.pem -+rm -f tmp-pem.pem tmp1 tmp2 - - exit 0 --- -1.7.1 diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff new file mode 100644 index 000000000..8277e2b2d --- /dev/null +++ b/extra/gnutls/tls_fix.diff @@ -0,0 +1,32 @@ +diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c +index 198cb34..3caa5ac 100644 +--- a/lib/gnutls_cipher.c ++++ b/lib/gnutls_cipher.c +@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session, + return gnutls_assert_val(ret); + + if (unlikely((unsigned)length_to_decrypt > compressed->size)) +- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ { ++ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n", ++ (unsigned int)length_to_decrypt, (unsigned int)compressed->size); ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ } + + ret = + _gnutls_auth_cipher_decrypt2 (¶ms->read.cipher_state, +diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c +index 993ddb9..4795711 100644 +--- a/lib/gnutls_record.c ++++ b/lib/gnutls_record.c +@@ -1193,8 +1193,8 @@ begin: + /* We allocate the maximum possible to allow few compressed bytes to expand to a + * full record. + */ +- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), +- MAX_RECORD_RECV_SIZE(session)); ++ t.size = _gnutls_get_max_decrypted_data(session); ++ decrypted = _mbuffer_alloc(t.size, t.size); + if (decrypted == NULL) + return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 33cf7a38b..cd4827cbc 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188943 2013-06-26 11:06:57Z foutrelis $ +# $Id: PKGBUILD 190847 2013-07-18 20:16:59Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.3 +pkgver=0.10.4 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') 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=('1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2') +sha256sums=('30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD index c8ad827ae..d22eba99f 100644 --- a/extra/gperftools/PKGBUILD +++ b/extra/gperftools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $ +# $Id: PKGBUILD 191875 2013-08-01 00:55:33Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Jost <schnouki@schnouki.net> @@ -7,8 +7,8 @@ # Contributor: Jan Rüegg <rggjan@gmail.com> pkgname=gperftools -pkgver=2.0 -pkgrel=4 +pkgver=2.1 +pkgrel=1 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools" arch=('i686' 'x86_64') url="http://code.google.com/p/gperftools/" @@ -18,14 +18,11 @@ optdepends=('graphviz: pprof graph generation' 'gv: pprof postscript generation') options=('!libtool') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080') +sha256sums=('f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f') build() { cd "$pkgname-$pkgver" - # fix for glibc 2.16 - sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc - ./configure --prefix=/usr --enable-frame-pointers make } diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index ec36f1b32..f6d7e0c2c 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $ +# $Id: PKGBUILD 191285 2013-07-23 10:02:47Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') @@ -21,6 +21,7 @@ optdepends=('gupnp-av: uPnP plugin' 'libdmapsharing: DMAP sharing plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') +groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index f3087f4bc..c9fefb682 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ +# $Id: PKGBUILD 191762 2013-07-30 09:58:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.3 +pkgver=0.14.4 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk3 gtk-doc vala) optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') +sha256sums=('ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac') build() { cd $pkgname-$pkgver diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 51abbdd64..8a3ab6f1e 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190013 2013-07-12 20:37:31Z heftig $ +# $Id: PKGBUILD 191871 2013-07-31 17:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f') +sha256sums=('759641c0597c24191322f40945b363b75df299a539ff4086650be6193028189a') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index ee250f344..bb9c4ac21 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190006 2013-07-12 20:19:50Z heftig $ +# $Id: PKGBUILD 191865 2013-07-31 17:14:21Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ 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=('b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d') +sha256sums=('963e3b83d651661f495ca2e44ccd2d5c61e986e9d7706246e568276689a372ea') build() { cd $pkgbase-$pkgver diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 6219e1256..2cbed4550 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190007 2013-07-12 20:23:55Z heftig $ +# $Id: PKGBUILD 191870 2013-07-31 17:33:33Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad') +sha256sums=('cfa2e617a76f93e9ddd4ae1109297e93fb4a06b152042b996231234a72c5a5ff') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 631682bf7..578b1b492 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190010 2013-07-12 20:29:57Z heftig $ +# $Id: PKGBUILD 191938 2013-08-01 08:51:34Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.8 +pkgver=1.0.9 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=('58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84') +sha256sums=('11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 59afb9248..b7facf76f 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188473 2013-06-14 19:32:02Z heftig $ +# $Id: PKGBUILD 191181 2013-07-19 01:56:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.4 +pkgver=0.5.5.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) @@ -14,14 +14,13 @@ makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstream options=(!libtool !emptydirs) source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('acd624693e392d6fd037d7072613e7384ebd6371') +sha1sums=('f4f28d04a2f6dc2b68151af700231ff8e47a7596') prepare() { cd $pkgbase-$pkgver mkdir build-1.0 build-0.10 } - build() { cd $pkgbase-$pkgver/build-1.0 ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0 diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 30f4661a1..2b21463b8 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190004 2013-07-12 20:15:01Z heftig $ +# $Id: PKGBUILD 191864 2013-07-31 17:05:38Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.8 +pkgver=1.0.9 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=('ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d') +sha256sums=('17a2c60a82baa461ef685ad3de187edb9c03a2c7e07513daba58a5a32efacaa3') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 4f46197a1..102ae5931 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178131 2013-02-16 22:48:50Z ioni $ +# $Id: PKGBUILD 191896 2013-08-01 06:53:29Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index e77286af0..7356f01c6 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 -pkgrel=11.2 -pkgdesc="The GTK+ toolkit" +pkgrel=12 +pkgdesc="GTK+ is a multi-platform toolkit (v1)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('LGPL') @@ -12,20 +12,21 @@ depends=('libxi' 'glib' 'sh') makedepends=('libxt') options=('!libtool') install=gtk.install -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz + aclocal-fixes.patch) +sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' + 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') -build() { - cd "${srcdir}/gtk+-${pkgver}" - if [ "${CARCH}" = "x86_64" ]; then - rm config.guess config.sub - ln -s /usr/share/libtool/config/config.guess config.guess - ln -s /usr/share/libtool/config/config.sub config.sub - fi - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" +prepare() { + cd gtk+-${pkgver} + cp /usr/share/libtool/config/config.guess . + cp /usr/share/libtool/config/config.sub . + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} +build() { + cd gtk+-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --infodir=/usr/share/info \ --with-xinput=xfree @@ -33,6 +34,6 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" + cd gtk+-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 872afd9eb..a5d505ae8 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185255 2013-05-12 15:16:09Z heftig $ +# $Id: PKGBUILD 191835 2013-07-31 09:23:27Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.5 +pkgver=4.6.6 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d5145919708250b3dd0e650f90d156984217356d953da936394ceb8da59ff546') +sha256sums=('145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index b53cddf20..303096b43 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185396 2013-05-13 18:53:34Z heftig $ +# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,6 +12,7 @@ url="http://www.gnome.org" depends=('dconf' 'gtk3' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils') options=('!libtool' '!emptydirs') +groups=('gnome') install=gucharmap.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901') diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 14689e9e5..d9e373f4f 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $ +# $Id: PKGBUILD 191763 2013-07-30 10:02:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.3 +pkgver=0.20.4 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0') +sha256sums=('27eec44d62f6f60305cd65d7a488fc128700f8345ab37cc2ab42cf052fdd5b35') build() { cd $pkgname-$pkgver diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 05f197b67..7f1e0aefd 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ +# $Id: PKGBUILD 191565 2013-07-25 16:28:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=(MIT) makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') +sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35') build() { cd $pkgbase-$pkgver diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 3915aa1ec..3b9d9af0f 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190039 2013-07-13 12:40:59Z svenstaro $ +# $Id: PKGBUILD 191897 2013-08-01 06:53:30Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=7 +pkgrel=8 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 500aab551..7c9eade1d 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 189729 2013-07-06 17:47:53Z schiv $ +# $Id: PKGBUILD 191614 2013-07-27 18:39:53Z eric $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ibus -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.3 +pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ibus.googlecode.com" license=('LGPL') -depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject') +depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify') makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c') +sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521') build() { cd ${pkgname}-${pkgver} diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index eee6629cf..a28b75be1 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,14 +4,16 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz + openjdk-hotfix.patch) +sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb' + '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -22,6 +24,7 @@ build() { LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz cd "${srcdir}"/icedtea-web* + patch -Np1 < $srcdir/openjdk-hotfix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} \ diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch new file mode 100644 index 000000000..29a0a309b --- /dev/null +++ b/extra/icedtea-web-java7/openjdk-hotfix.patch @@ -0,0 +1,56 @@ +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java +--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 +@@ -35,6 +35,8 @@ + import net.sourceforge.jnlp.cache.UpdatePolicy; + import net.sourceforge.jnlp.security.viewer.CertificateViewer; + import net.sourceforge.jnlp.services.ServiceUtil; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + /** + * This is the main entry point for the JNLP client. The main +@@ -113,6 +115,9 @@ + * Launch the JNLP file specified by the command-line arguments. + */ + public static void main(String[] argsIn) { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + args = argsIn; + + if (null != getOption("-viewer")) { +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 +@@ -234,7 +234,7 @@ + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { +- // ignore it ++ e.printStackTrace(); + } + + doMainAppContextHacks(); +diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java +--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 +@@ -72,6 +72,8 @@ + import java.net.ProxySelector; + import java.util.Enumeration; + import java.util.Properties; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + import net.sourceforge.jnlp.config.DeploymentConfiguration; + import net.sourceforge.jnlp.runtime.JNLPRuntime; +@@ -94,6 +96,9 @@ + */ + public static void main(String args[]) + throws IOException { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { + System.err.println("Invalid pipe names provided. Refusing to proceed."); + System.exit(1); diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD index 3b13aa317..d6ef840bf 100644 --- a/extra/idnkit/PKGBUILD +++ b/extra/idnkit/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $ +# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=2.1 +pkgrel=3 pkgdesc='Provides functionalities about Internationalized Domain Name processing' url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') +backup=('etc/idnalias.conf' 'etc/idn.conf') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') -backup=('etc/idnalias.conf' 'etc/idn.conf') +prepare() { + cd idnkit-${pkgver}-src + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} build() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src ./configure \ --host=$CHOST \ --build=$CHOST \ @@ -30,12 +34,12 @@ build() { } check() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make check } package() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" rm "${pkgdir}"/etc/*.sample diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index 6300c081c..d9d7347fd 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" @@ -31,5 +31,5 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('70f1413840c2a228783d1332b8b168e6' +md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae' '65f1ec028c9f6fbf3a0abd6a687e9745') diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index adc59a7d4..ed2f84bff 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152805 2012-03-09 17:06:42Z andyrtr $ +# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.5 -pkgrel=1.1 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -14,22 +14,25 @@ optdepends=('perl: for mkhtmlindex') source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2' 'linuxconfig.patch' 'LICENSE') -sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1' +sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' 'a3d971a507a460233afd8ed46e9f06135fed634d' 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' - '1f0f8aea1526c6c022f2cf16f7a6c67118c68336' - 'c58b7252df481572ec1ccd77b9f1ab561ed89e45' + '2599afa039d2070bae9df6ce43da288b3a4adf97' + 'ae22eb81d56d018f0b3b149f70965ebfef2385fd' '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' 'c5ecffb25ad079ba3858e3aec047d046df603a89') -build() { - cd ${srcdir}/xorg-cf-files-1.0.4 + +prepare() { + cd xorg-cf-files-1.0.5 patch -p1 -i "${srcdir}/linuxconfig.patch" - cd "${srcdir}" +} + +build() { for i in *; do if [ -d "${i}" ]; then pushd "${i}" @@ -41,7 +44,6 @@ build() { } package() { - cd "${srcdir}" for i in *; do if [ -d "${i}" ]; then pushd "${i}" diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index d81c0360f..ae0924c92 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184394 2013-05-06 19:37:57Z foutrelis $ +# $Id: PKGBUILD 191919 2013-08-01 06:59:48Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=12 +pkgrel=13 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/imlib/" @@ -12,12 +12,14 @@ depends=('gtk' 'giflib' 'libpng' 'libtiff') makedepends=('libxt') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 - debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch + imlib-1.9.15-libpng15.patch imlib-giflib5.patch) sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' - '33c3aaa43eb624f2a6ab0406285a8515903333e3') + '33c3aaa43eb624f2a6ab0406285a8515903333e3' + '56e9d65e05a347452fd608d2dfc8538f7ce09893') prepare() { cd ${pkgname}-${pkgver} @@ -25,6 +27,7 @@ prepare() { patch -p1 -i "${srcdir}/CAN-2004-1026.patch" patch -p0 -i "${srcdir}/aclocal-fixes.patch" patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" + patch -p1 -i "${srcdir}/imlib-giflib5.patch" sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . diff --git a/extra/imlib/imlib-giflib5.patch b/extra/imlib/imlib-giflib5.patch new file mode 100644 index 000000000..affd206fc --- /dev/null +++ b/extra/imlib/imlib-giflib5.patch @@ -0,0 +1,110 @@ +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400 +@@ -444,6 +444,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -454,7 +455,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + if (!gif) + return NULL; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 17:37:11.941783903 -0400 +@@ -23,6 +23,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -30,7 +31,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + transp = -1; + data = NULL; +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400 +@@ -6,6 +6,14 @@ + + #define G_MAXINT ((int) 0x7fffffff) + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + /* Split the ID - damages input */ + + static char * +@@ -462,14 +470,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 22:08:46.182265058 -0400 +@@ -10,6 +10,14 @@ + #else + #include <gif_lib.h> + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + unsigned char * + loader_gif(FILE *f, int *w, int *h, int *t) + { +@@ -43,14 +51,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index f042719d0..a51feb3fd 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 184395 2013-05-06 19:37:59Z foutrelis $ +# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') +source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 + imlib2-giflib5.patch) +sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0' + '29d0778ffbe6e57f08048918a79eb1ad6af87bce') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../imlib2-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" + [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx" + [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64" - # Configure and Build ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ --x-libraries=/usr/lib $EXTRAOPTS @@ -30,7 +35,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # Install License diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch new file mode 100644 index 000000000..966c6e4a7 --- /dev/null +++ b/extra/imlib2/imlib2-giflib5.patch @@ -0,0 +1,14 @@ +--- src/modules/loaders/loader_gif.c.orig ++++ src/modules/loaders/loader_gif.c +@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct + #endif + if (fd < 0) + return 0; ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileHandle(fd, NULL); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + close(fd); diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 1b803b403..2e8864f5e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189830 2013-07-08 20:27:27Z guillaume $ +# $Id: PKGBUILD 191921 2013-08-01 06:59:51Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspo _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index a01b5989c..b9db17268 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178132 2013-02-16 22:48:51Z ioni $ +# $Id: PKGBUILD 191898 2013-08-01 06:53:31Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=8 +pkgrel=9 pkgdesc="Feature-rich and easy to handle CD burning application" arch=("i686" "x86_64" 'mips64el') url="http://sourceforge.net/projects/k3b/" @@ -20,16 +20,20 @@ optdepends=('dvd+rw-tools: for dvd burning support' options=('!libtool') install=k3b.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) + k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch) sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' '8120c0e22e6c41ea285ca6060be13723ed91c52b' - '5b35bff3f7670686a32bd71afea2deaca4331631') + '5b35bff3f7670686a32bd71afea2deaca4331631' + '02db0666db8d793860c93ef9e2f19a00c9451945') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" - cd .. + patch -p1 -i "${srcdir}/k3b-2.0.2-libav9.patch" +} + +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -39,6 +43,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/k3b/k3b-2.0.2-libav9.patch b/extra/k3b/k3b-2.0.2-libav9.patch new file mode 100644 index 000000000..bb1f5e1a4 --- /dev/null +++ b/extra/k3b/k3b-2.0.2-libav9.patch @@ -0,0 +1,42 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200 +@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open() + } + + // analyze the streams +- ::av_find_stream_info( d->formatContext ); ++ ::avformat_find_stream_info( d->formatContext, 0 ); + + // we only handle files containing one audio stream + if( d->formatContext->nb_streams != 1 ) { +@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open() + + // open the codec on our context + kDebug() << "(K3bFFMpegFile) found codec for " << m_filename; +- if( ::avcodec_open( codecContext, d->codec ) < 0 ) { ++ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) { + kDebug() << "(K3bFFMpegDecoderFactory) could not open codec."; + return false; + } +--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-07-12 23:05:37.371157123 -0400 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-07-12 23:12:01.649948739 -0400 +@@ -55,7 +55,7 @@ + K3b::Msf length; + + // for decoding. ffmpeg requires 16-byte alignment. +- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15]; ++ char outputBuffer[192000 + 15]; + char* alignedOutputBuffer; + char* outputBufferPos; + int outputBufferSize; +@@ -319,7 +319,7 @@ + } + + d->outputBufferPos = d->alignedOutputBuffer; +- d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ d->outputBufferSize = 192000; + + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index 29feeb073..0d44e0aa3 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,31 +1,38 @@ -# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $ +# $Id: PKGBUILD 191225 2013-07-21 20:40:01Z eric $ +# Maintainer: # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kaffeine pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc='KDE media player' license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://kaffeine.kde.org" -depends=('kdelibs' 'kdebase-runtime' 'xine-lib') -makedepends=('pkg-config' 'cmake' 'automoc4') +depends=('kdebase-runtime' 'xine-lib') +makedepends=('cmake' 'automoc4') install=kaffeine.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('690e48d2e5fe123887109aa9b1bc1c31') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + kaffeine-1.2.2-gcc4.7.patch) +md5sums=('690e48d2e5fe123887109aa9b1bc1c31' + '48afe5ec99b38fe02782db57a847033f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/kaffeine-1.2.2-gcc4.7.patch" +} build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install + cd build + make DESTDIR="$pkgdir" install } diff --git a/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch new file mode 100644 index 000000000..e74563e0b --- /dev/null +++ b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch @@ -0,0 +1,32 @@ +commit 2da9df1e67004c3cfa879578c351300a99f23da1 +Author: Christoph Pfister <christophpfister@gmail.com> +Date: Wed Apr 4 21:22:09 2012 +0200 + + fix build for gcc 4.7 + +diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp +index 7fc8f68..e70d8b8 100644 +--- a/src/dvb/dvbepg.cpp ++++ b/src/dvb/dvbepg.cpp +@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size) + // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011) + QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC); + +- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid(); +- --entryCount, entry.advance()) { ++ for (AtscEitSectionEntry eitEntry = eitSection.entries(); ++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) { + DvbEpgEntry epgEntry; + epgEntry.channel = channel; +- epgEntry.begin = baseDateTime.addSecs(entry.startTime()); +- epgEntry.duration = QTime().addSecs(entry.duration()); +- epgEntry.title = entry.title(); ++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); ++ epgEntry.duration = QTime().addSecs(eitEntry.duration()); ++ epgEntry.title = eitEntry.title(); + +- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); ++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); + DvbSharedEpgEntry entry = epgEntries.value(id); + + if (entry.isValid() && (entry->channel == epgEntry.channel) && diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 85b1bc1d6..eed142676 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ +# $Id: PKGBUILD 191899 2013-08-01 06:53:32Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 4daeb8141..5848026bc 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ +# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,13 +20,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch } build() { diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/extra/kdenetwork/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD index 18dc8731e..6116bead8 100644 --- a/extra/libdatrie/PKGBUILD +++ b/extra/libdatrie/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $ +# $Id: PKGBUILD 191328 2013-07-23 16:51:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libdatrie -pkgver=0.2.5 -pkgrel=1.1 +pkgver=0.2.6 +pkgrel=1 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe." url="http://linux.thai.net/projects/datrie" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') options=('!libtool' '!emptydirs') -source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz) -md5sums=('c9b057d07198d66e1ac2eff32937d3d4') +source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.xz) +md5sums=('e253eb2433045f6e224c7fa44f9796e1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index 8a6d1e1eb..7863a185e 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,28 +1,38 @@ -# $Id: PKGBUILD 184402 2013-05-06 19:38:19Z foutrelis $ +# $Id: PKGBUILD 191924 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus -pkgver=2.10 -pkgrel=4 +pkgver=2.10.9 +pkgrel=1 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64 'mips64el') license=('MPL' 'LGPL') url="http://www.mono-project.com" -depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') +depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif') options=('!libtool') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) -md5sums=('451966e8f637e3a1f02d1d30f900255d' - 'a2d143676bbaceeb88b4c34069e93986') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + libpng15.patch + libgdiplus0-giflib5.patch + libgdiplus-2.10.9-gold.patch) +md5sums=('b4615c14584b5d73cbb9757c28887654' + 'a2d143676bbaceeb88b4c34069e93986' + 'ad97558c721106eea03c7808b501814b' + '95fb92750c131ce9287419c3ac5fcb76') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libpng15.patch + patch -Np1 -i ../libgdiplus0-giflib5.patch + patch -Np1 -i ../libgdiplus-2.10.9-gold.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 <../libpng15.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-cairo=system make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgdiplus/libgdiplus-2.10.9-gold.patch b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch new file mode 100644 index 000000000..379ae941e --- /dev/null +++ b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch @@ -0,0 +1,16 @@ + tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 97f5f4e..c02ca25 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -228,7 +228,7 @@ DEPS = \ + $(top_builddir)/src/libgdiplus.la + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0 + + testgdi_DEPENDENCIES = $(TEST_DEPS) + testgdi_LDADD = $(LDADDS) diff --git a/extra/libgdiplus/libgdiplus0-giflib5.patch b/extra/libgdiplus/libgdiplus0-giflib5.patch new file mode 100644 index 000000000..36d2bf836 --- /dev/null +++ b/extra/libgdiplus/libgdiplus0-giflib5.patch @@ -0,0 +1,117 @@ +diff --git a/src/gifcodec.c b/src/gifcodec.c +index 8dee0eb..564beed 100644 +--- a/src/gifcodec.c ++++ b/src/gifcodec.c +@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 + + #include "gifcodec.h" + ++#if GIFLIB_MAJOR < 5 + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); ++#endif + + /* Data structure used for callback */ + typedef struct +@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) + */ + + static int +-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) ++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) + { + ExtensionBlock *ep; + +@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) + + if (ExtData) { + memcpy(ep->Bytes, ExtData, Len); +- ep->Function = New->Function; ++ ep->Function = func; + } + + return (GIF_OK); +@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) + } + + case EXTENSION_RECORD_TYPE: { +- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { ++ int func; ++ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } + + while (ExtData != NULL) { + /* Create an extension block with our data */ +- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { ++ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { + return (GIF_ERROR); + } + + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } +- temp_save.Function = 0; + } + break; + } +@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) + result = NULL; + loop_counter = FALSE; + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + gif = DGifOpen(stream, &gdip_gif_fileinputfunc); + } else { + gif = DGifOpen (stream, &gdip_gif_inputfunc); + } +- ++#else ++ if (from_file) ++ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); ++ else ++ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); ++#endif ++ + if (gif == NULL) { + goto error; + } +@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + return InvalidParameter; + } + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + fp = EGifOpenFileName (stream, 0); + } else { + fp = EGifOpen (stream, gdip_gif_outputfunc); + } ++#else ++ if (from_file) ++ fp = EGifOpenFileName (stream, 0, NULL); ++ else ++ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); ++#define MakeMapObject GifMakeMapObject ++#define FreeMapObject GifFreeMapObject ++#define QuantizeBuffer GifQuantizeBuffer ++#define BitSize GifBitSize ++#endif + + if (!fp) { + return FileNotFound; +@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + Buffer[0] = 1; + Buffer[1] = ptr[0]; + Buffer[2] = ptr[1]; ++#if GIFLIB_MAJOR < 5 + EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); + EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); ++#else ++ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); ++ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); ++ EGifPutExtensionBlock(fp, 3, Buffer); ++ EGifPutExtensionTrailer(fp); ++#endif + } + } + diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index ea824fdd0..5e725fc28 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190014 2013-07-12 20:40:29Z heftig $ +# $Id: PKGBUILD 191831 2013-07-31 09:07:16Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -13,7 +13,7 @@ depends=(glib2) makedepends=(gobject-introspection vala) options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b365b3afccbf9a9ecf4282be0b8ce7dcd56afa3c59c19d2ca79bb7f2724a966c') +sha256sums=('fbb73b963abaf1d07f360ac5fdb6905b4862d53553ea5f383a6884678bcd8267') build() { cd $pkgname-$pkgver diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD index 74672fb5c..ee212be87 100644 --- a/extra/libmbim/PKGBUILD +++ b/extra/libmbim/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 188603 2013-06-16 20:32:24Z eric $ +# $Id: PKGBUILD 191189 2013-07-19 12:04:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libmbim -pkgver=1.2.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="MBIM modem protocol helper library" arch=(i686 x86_64 mips64el) -url="http://cgit.freedesktop.org/libmbim/libmbim" +url="http://www.freedesktop.org/wiki/Software/libmbim/" license=(GPL2) depends=(glib2 bash systemd) makedepends=(gtk-doc python) options=('!libtool') -source=(http://cgit.freedesktop.org/libmbim/libmbim/snapshot/$pkgname-$pkgver.tar.xz) -sha256sums=('0b00085486bb34b772e56643d6605eaffc3b2dd620485bc598cab8b0c6051825') +source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('a7fa909df229574eb11baac89075ac1366a2ac1670f586483bdf0173257cf781') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-tests + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static make } diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index 05e91dd5b..c7018b2f7 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ +# $Id: PKGBUILD 191705 2013-07-29 10:07:56Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.8.2 +pkgver=0.9.0 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net" license=('GPL') -depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') -makedepends=('libtool' 'git') +depends=('flac' 'libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') +makedepends=('libtool') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") @@ -29,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('562b39b6788f8128b7185b83f14ca516') +md5sums=('b9b9677ababf823e0739e5caff68aa86') diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD index db3c9d398..ba3bf2ddb 100644 --- a/extra/libpciaccess/PKGBUILD +++ b/extra/libpciaccess/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libpciaccess -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc="X11 PCI access library" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig' 'xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac') +sha256sums=('abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch deleted file mode 100644 index e67728051..000000000 --- a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001 -From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> -Date: Mon, 29 Apr 2013 08:57:14 -0500 -Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly - returned from - -png_create_write_struct() (Andrew Church). ---- - ANNOUNCE | 6 ++++-- - CHANGES | 4 +++- - pngwrite.c | 65 +++++++++++++++++++++++++++++++------------------------------- - 3 files changed, 39 insertions(+), 36 deletions(-) - - (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) - -diff --git a/pngwrite.c b/pngwrite.c -index 33924aa..b71a3d3 100644 ---- a/pngwrite.c -+++ b/pngwrite.c -@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, - png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, - error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); - #endif /* PNG_USER_MEM_SUPPORTED */ -+ if (png_ptr != NULL) -+ { -+ /* Set the zlib control values to defaults; they can be overridden by the -+ * application after the struct has been created. -+ */ -+ png_ptr->zbuffer_size = PNG_ZBUF_SIZE; - -- /* Set the zlib control values to defaults; they can be overridden by the -- * application after the struct has been created. -- */ -- png_ptr->zbuffer_size = PNG_ZBUF_SIZE; -- -- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in -- * pngwutil.c defaults it according to whether or not filters will be used, -- * and ignores this setting. -- */ -- png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; -- png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; -- png_ptr->zlib_mem_level = 8; -- png_ptr->zlib_window_bits = 15; -- png_ptr->zlib_method = 8; -+ /* The 'zlib_strategy' setting is irrelevant because png_default_claim in -+ * pngwutil.c defaults it according to whether or not filters will be -+ * used, and ignores this setting. -+ */ -+ png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; -+ png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; -+ png_ptr->zlib_mem_level = 8; -+ png_ptr->zlib_window_bits = 15; -+ png_ptr->zlib_method = 8; - - #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED -- png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; -- png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; -- png_ptr->zlib_text_mem_level = 8; -- png_ptr->zlib_text_window_bits = 15; -- png_ptr->zlib_text_method = 8; -+ png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; -+ png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; -+ png_ptr->zlib_text_mem_level = 8; -+ png_ptr->zlib_text_window_bits = 15; -+ png_ptr->zlib_text_method = 8; - #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ - -- /* This is a highly dubious configuration option; by default it is off, but -- * it may be appropriate for private builds that are testing extensions not -- * conformant to the current specification, or of applications that must not -- * fail to write at all costs! -- */ --# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED -+ /* This is a highly dubious configuration option; by default it is off, -+ * but it may be appropriate for private builds that are testing -+ * extensions not conformant to the current specification, or of -+ * applications that must not fail to write at all costs! -+ */ -+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED - png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; - /* In stable builds only warn if an application error can be completely - * handled. - */ --# endif -+#endif - -- /* App warnings are warnings in release (or release candidate) builds but -- * are errors during development. -- */ --# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC -+ /* App warnings are warnings in release (or release candidate) builds but -+ * are errors during development. -+ */ -+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC - png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN; --# endif -+#endif - -- if (png_ptr != NULL) -- { - /* TODO: delay this, it can be done in png_init_io() (if the app doesn't - * do it itself) avoiding setting the default function if it is not - * required. --- -1.8.2.2 - diff --git a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch deleted file mode 100644 index 0a305c150..000000000 --- a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 127b08a265f99ce517ea31ec7988a91fc17da4d9 Mon Sep 17 00:00:00 2001 -From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> -Date: Sun, 5 May 2013 22:13:47 -0500 -Subject: [PATCH 09/10] [libpng16] Calculate our own zlib windowBits when - decoding rather than - -trusting the CMF bytes in the PNG datastream. ---- - ANNOUNCE | 6 +++-- - CHANGES | 5 +++- - pngrutil.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- - 3 files changed, 88 insertions(+), 10 deletions(-) - - (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) - -diff --git a/pngrutil.c b/pngrutil.c -index 01c3679..9c10e26 100644 ---- a/pngrutil.c -+++ b/pngrutil.c -@@ -18,8 +18,6 @@ - - #ifdef PNG_READ_SUPPORTED - --#define png_strtod(p,a,b) strtod(a,b) -- - png_uint_32 PNGAPI - png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf) - { -@@ -4165,6 +4163,75 @@ png_read_finish_row(png_structrp png_ptr) - } - #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ - -+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED -+/* This is the code to to select a windowBits value to match the smallest -+ * possible sliding window needed to contain the entire uncompressed image. -+ */ -+static unsigned int -+required_window_bits(png_alloc_size_t data_size) -+{ -+ unsigned int windowBits = 15; -+ if (data_size <= 16384) /* else windowBits must be 15 */ -+ { -+ unsigned int half_z_window_size = 1U << (windowBits-1); /* 16384 */ -+ -+ do -+ { -+ half_z_window_size >>= 1; -+ --windowBits; -+ } -+ while (windowBits > 8 && data_size <= half_z_window_size); -+ } -+ return windowBits; -+} -+/* This is used below to find the size of an image to pass to png_deflate_claim, -+ * so it only needs to be accurate if the size is less than 16384 bytes (the -+ * point at which a lower LZ window size can be used.) -+ * -+ * To do: merge this with png_image_size() in pngwutil.c and put the result -+ * in png.c as a PNG_INTERNAL_FUNCTION. -+ */ -+static png_alloc_size_t -+png_read_image_size(png_structrp png_ptr) -+{ -+ /* Only return sizes up to the maximum of a png_uint_32, do this by limiting -+ * the width and height used to 15 bits. -+ */ -+ png_uint_32 h = png_ptr->height; -+ -+ if (png_ptr->rowbytes < 32768 && h < 32768) -+ { -+ if (png_ptr->interlaced) -+ { -+ /* Interlacing makes the image larger because of the replication of -+ * both the filter byte and the padding to a byte boundary. -+ */ -+ png_uint_32 w = png_ptr->width; -+ unsigned int pd = png_ptr->pixel_depth; -+ png_alloc_size_t cb_base; -+ int pass; -+ -+ for (cb_base=0, pass=0; pass<=6; ++pass) -+ { -+ png_uint_32 pw = PNG_PASS_COLS(w, pass); -+ -+ if (pw > 0) -+ cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass); -+ } -+ -+ return cb_base; -+ } -+ -+ else -+ return (png_ptr->rowbytes+1) * h; -+ } -+ -+ else -+ return 0xffffffffU; -+} -+ -+#endif /* PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED */ -+ - void /* PRIVATE */ - png_read_start_row(png_structrp png_ptr) - { -@@ -4449,14 +4516,20 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) - png_free(png_ptr, buffer); - } - -- /* Finally claim the zstream for the inflate of the IDAT data, use the bits -- * value from the stream (note that this will result in a fatal error if the -- * IDAT stream has a bogus deflate header window_bits value, but this should -- * not be happening any longer!) -+ /* Finally claim the zstream for the inflate of the IDAT data, using the -+ * windowBts predicted from the uncompressed data size, not the value from -+ * the stream. If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then -+ * simply use a 32kbyte window (windowBits=15). - */ -- if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK) -+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED -+ if (png_inflate_claim(png_ptr, png_IDAT, -+ required_window_bits(png_read_image_size(png_ptr))) != Z_OK) -+#else -+ if (png_inflate_claim(png_ptr, png_IDAT, 15) != Z_OK) -+#endif - png_error(png_ptr, png_ptr->zstream.msg); - - png_ptr->flags |= PNG_FLAG_ROW_INIT; - } -+ - #endif /* PNG_READ_SUPPORTED */ --- -1.8.2.2 - diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index bf803f20e..3bc376d33 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,40 +1,30 @@ -# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $ +# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.2 -_apngver=1.6.2 -pkgrel=3 +pkgver=1.6.3 +_apngver=1.6.3 +pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libpng.org/pub/png/libpng.html" license=('custom') depends=('zlib' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz" - 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch - 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch - adjust-apng-patch-for-libpng16-git-changes.patch) -md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' - '7d0c9f4b9a7f45dd5d1088e54b623c98' - '59b83234f60a7d1d179d9b0b6a0ebc01' - 'b1f7922b6678305bdb7c23d5bd1763f3' - 'f87704c3fb6d29f09b52178e89a42e2e') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} + http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) +md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c' + 'SKIP' + '57007fc121baa2cdc48abcfb26300e78') prepare() { cd $pkgname-$pkgver - # Add fixes from libpng16 branch - patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch - patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch - # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch patch -Np1 -i ../libpng-$_apngver-apng.patch } diff --git a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch deleted file mode 100644 index 26ac1c1cf..000000000 --- a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libpng-1.6.2-apng.patch.orig 2013-05-06 12:09:16.000000000 +0300 -+++ libpng-1.6.2-apng.patch 2013-05-06 12:12:14.000000000 +0300 -@@ -1034,7 +1034,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l - - if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) - png_chunk_benign_error(png_ptr, "Extra compressed data"); --@@ -4459,4 +4671,80 @@ -+@@ -4459,5 +4671,81 @@ - - png_ptr->flags |= PNG_FLAG_ROW_INIT; - } -@@ -1114,6 +1114,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l - +} - +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ - +#endif /* PNG_READ_APNG_SUPPORTED */ -+ - #endif /* PNG_READ_SUPPORTED */ - diff -Naru libpng-1.6.2.org/pngset.c libpng-1.6.2/pngset.c - --- libpng-1.6.2.org/pngset.c 2013-04-29 17:31:42.000000000 +0900 diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD index b3d1be2a5..458310cc6 100644 --- a/extra/libqmi/PKGBUILD +++ b/extra/libqmi/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 188775 2013-06-20 03:53:16Z heftig $ +# $Id: PKGBUILD 191190 2013-07-19 12:11:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libqmi pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="QMI modem protocol helper library" arch=(i686 x86_64 mips64el) -url="http://cgit.freedesktop.org/libqmi" +url="http://www.freedesktop.org/wiki/Software/libqmi/" license=(GPL2) depends=(glib2 bash) makedepends=(gtk-doc python) options=('!libtool') -source=($url/snapshot/$pkgname-$pkgver.tar.xz) -sha256sums=('3a9d1359da703905147c173df4f6c0e5bb5dbca0a0fd3d0ce6efe26331bcafeb') +source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --with-tests make } diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index 75784fd1a..ae2c5581e 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164508 2012-08-01 10:14:01Z jgc $ +# $Id: PKGBUILD 191330 2013-07-23 16:53:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libthai -pkgver=0.1.18 +pkgver=0.1.19 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" @@ -12,8 +12,8 @@ license=('LGPL') depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('0250fc5255c1e62b23f88c2d6b1d6262') +source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('c4a6c3842257889f8f15ae192b66e797') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libtxc_dxtn/PKGBUILD b/extra/libtxc_dxtn/PKGBUILD index 375d6aa79..289ced445 100644 --- a/community/libtxc_dxtn/PKGBUILD +++ b/extra/libtxc_dxtn/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 190835 2013-07-18 12:20:11Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libtxc_dxtn pkgver=1.0.1 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 mips64el) pkgdesc="S3 Texture Compression (S3TC) library for Mesa" url="http://dri.freedesktop.org/wiki/S3TC" diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index d72cdcb5d..89c368a36 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189920 2013-07-11 14:30:26Z heftig $ +# $Id: PKGBUILD 191925 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 762f82dfc..1c41314ac 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $ +# $Id: PKGBUILD 191746 2013-07-30 07:19:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa') +sha256sums=('10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index f2e695ec7..1742a636e 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $ +# $Id: PKGBUILD 191295 2013-07-23 11:13:07Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') -makedepends=('pkgconfig' 'libxslt' 'python2') +depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau') +makedepends=('pkgconfig' 'libxslt' 'python') options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) + libxcb-1.1-no-pthread-stubs.patch + reorder-configure.patch) sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' - '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310') + '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310' + '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=66413 + patch -Np1 -i ../reorder-configure.patch + NOCONFIGURE=1 ./autogen.sh +} build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - export PYTHON=/usr/bin/python2 - ./autogen.sh --prefix=/usr \ + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ --enable-xinput \ --enable-xkb \ --disable-static @@ -29,7 +37,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch new file mode 100644 index 000000000..afeeffe7e --- /dev/null +++ b/extra/libxcb/reorder-configure.patch @@ -0,0 +1,29 @@ +--- libxcb-1.9.1/configure.ac 2013-05-30 17:38:01.000000000 +0200 ++++ libxcb-1.9.1/configure.ac.new 2013-06-30 21:01:30.134153288 +0200 +@@ -2,20 +2,21 @@ + # Process this file with autoconf to produce a configure script. + + # Initialize Autoconf +-AC_PREREQ(2.57) + AC_INIT([libxcb], + 1.9.1, + [xcb@lists.freedesktop.org]) ++AC_PREREQ(2.57) ++ ++# Initialize Automake ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ++ + AC_CONFIG_SRCDIR([xcb.pc.in]) + # Set common system defines for POSIX extensions, such as _GNU_SOURCE + # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) + # to avoid autoconf errors. + AC_USE_SYSTEM_EXTENSIONS + +-# Initialize Automake +-AM_INIT_AUTOMAKE([foreign dist-bzip2]) +-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +- + AM_PATH_PYTHON([2.6]) + + PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 9079e706d..1a2be3266 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ +# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.5 -pkgrel=1.2 +pkgver=1.4.6 +pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') +sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 960b8092c..79fbd180d 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ +# $Id: PKGBUILD 190133 2013-07-16 17:49:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.06.06 +pkgver=2013.07.16 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('81431f6217725e2b1c3f1a16fca19221') +md5sums=('8b660d11d43c3beac11580e62e3179f8') build() { cd ${srcdir}/live diff --git a/extra/loudmouth/07-glib-single-include.patch b/extra/loudmouth/07-glib-single-include.patch new file mode 100644 index 000000000..074b29526 --- /dev/null +++ b/extra/loudmouth/07-glib-single-include.patch @@ -0,0 +1,17 @@ +Description: Fix build failure with glib 2.32 + where including individual glib headers is no longer allowed. +Author: Michael Biebl <biebl@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576 +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 ++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/extra/loudmouth/08-fix-ipv6-connect.patch b/extra/loudmouth/08-fix-ipv6-connect.patch new file mode 100644 index 000000000..b8815a7de --- /dev/null +++ b/extra/loudmouth/08-fix-ipv6-connect.patch @@ -0,0 +1,28 @@ +Description: fix crash when falling back from IPv6 to IPv4 + Previously, loudmouth would set socket->watch_connect to NULL when + encountering an error. When the connection attempt (to a different IPv6) + succeeded later on, _lm_socket_succeeded would therefore not remove the + socket_connect_cb watcher, leading to socket_connect_cb being called upon + socket activity and segfaulting the program. +Author: Michael Stapelberg <stapelberg@debian.org> +Bug-Debian: http://bugs.debian.org/631729 +Forwarded: no +Last-Update: 2013-02-03 +--- a/loudmouth/lm-socket.c ++++ b/loudmouth/lm-socket.c +@@ -529,7 +529,6 @@ + /* error condition, but might be possible to recover + * from it (by connecting to the next host) */ + if (!_lm_socket_failed_with_error (connect_data, err)) { +- socket->watch_connect = NULL; + goto out; + } + } +@@ -560,7 +559,6 @@ + _lm_sock_close (connect_data->fd); + _lm_socket_failed_with_error (connect_data, err); + +- socket->watch_connect = NULL; + goto out; + } + } diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD index 17cbb2b01..cbc3bf1ce 100644 --- a/extra/loudmouth/PKGBUILD +++ b/extra/loudmouth/PKGBUILD @@ -5,7 +5,7 @@ pkgname=loudmouth pkgver=1.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight Jabber client library written in C/Glib" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -16,19 +16,30 @@ makedepends=('intltool' 'pkgconfig' 'gtk-doc') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 01-fix-sasl-md5-digest-uri.patch 03-drop-stanzas-on-fail.patch - 04-use-pkg-config-for-gnutls.patch) + 04-use-pkg-config-for-gnutls.patch + 07-glib-single-include.patch + 08-fix-ipv6-connect.patch) md5sums=('55339ca42494690c3942ee1465a96937' 'dc799cea18b24847b1e008c7424010a3' 'b7b2d81b01a5eee5fd5e21cae67b4af7' - 'bffb25b9551df43255fe1706588582f3') + 'bffb25b9551df43255fe1706588582f3' + 'd1546ed54740de536f6bb79a18c5dccb' + '8e3071299776d32b9be27bba7d3f9ae0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" - patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" - patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch + patch -Np1 -i ../03-drop-stanzas-on-fail.patch + patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch + patch -Np1 -i ../07-glib-single-include.patch + patch -Np1 -i ../08-fix-ipv6-connect.patch libtoolize --force - autoreconf + aclocal + autoconf + automake --add-missing +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make } diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 81e62cbbc..4935e2033 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $ +# $Id: PKGBUILD 190839 2013-07-18 17:45:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.31 +pkgver=5.5.32 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28' +sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index db347f8d2..c911dae6d 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ +# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.9.0 -pkgrel=1 +pkgrel=3 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index c10b39419..ef6114012 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ +# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.3 +pkgver=2.7 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=('99e311b2202057a259899f67b425e087' +md5sums=('61093c08ca5d8d1310382d17764f0c43' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index d544f0ab8..24e1d6822 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190055 2013-07-13 17:35:09Z andyrtr $ +# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.4 -pkgrel=5 +pkgver=9.1.6 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland' 'systemd') @@ -17,17 +17,10 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - git_fixes.patch LICENSE) -md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8' - '8ec30e1bd7abe5e8e540df4fa618540f' +md5sums=('443a2a352667294b53d56cb1a74114e9' '5c65a0fe315dd347e09b1f2826a1df5a') -prepare() { - cd ?esa-* - patch -Np1 -i ../git_fixes.patch -} - build() { cd ${srcdir}/?esa-* @@ -72,6 +65,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" depends=("mesa-libgl=${pkgver}") + optdepends=('libtxc_dxtn: S3 Texture Compressed support') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -89,6 +83,7 @@ package_ati-dri() { package_intel-dri() { pkgdesc="Mesa drivers for Intel" + optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri @@ -100,6 +95,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" + optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") # vdpau driver is problematic, so remove it (FS#36004) diff --git a/extra/mesa/git_fixes.patch b/extra/mesa/git_fixes.patch deleted file mode 100644 index 51b0b8f8e..000000000 --- a/extra/mesa/git_fixes.patch +++ /dev/null @@ -1,476 +0,0 @@ -From 6194644a49f841488e23ce021e7817ec02927eef Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 01 Jul 2013 21:31:03 +0000 -Subject: docs: Add 9.1.4 release md5sums - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> ---- -diff --git a/docs/relnotes-9.1.4.html b/docs/relnotes-9.1.4.html -index 48e421b..fa6fe67 100644 ---- a/docs/relnotes-9.1.4.html -+++ b/docs/relnotes-9.1.4.html -@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported. - - <h2>MD5 checksums</h2> - <pre> --TBD -+a2c4e25d0e27918bc67f61bae04d0cb8 MesaLib-9.1.4.tar.bz2 -+8c7e9ce5b05cb2223f0587396dd9dc08 MesaLib-9.1.4.tar.gz -+020459c5793d4279bdcb2daa1f7dd9f6 MesaLib-9.1.4.zip - </pre> - - <h2>New features</h2> --- -cgit v0.9.0.2-2-gbebe - -From e94a89de4deeabd0f8347795385b2f098aa35365 Mon Sep 17 00:00:00 2001 -From: Vinson Lee <vlee@freedesktop.org> -Date: Fri, 01 Feb 2013 07:28:41 +0000 -Subject: swrast: Fix memory leak. - -Fixes resource leak defect reported by Coverity. - -Signed-off-by: Vinson Lee <vlee@freedesktop.org> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 985e710c0d1f4f3bbd18448f04e611bd57ae9100) ---- -diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c -index 9638271..b380de3 100644 ---- a/src/mesa/drivers/dri/swrast/swrast.c -+++ b/src/mesa/drivers/dri/swrast/swrast.c -@@ -363,6 +363,7 @@ swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv, - xrb->bpp = 8; - break; - default: -+ free(xrb); - return NULL; - } - --- -cgit v0.9.0.2-2-gbebe - -From ab159327a7dc2dd41f9887d053d4abb3de69d195 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:33:59 +0000 -Subject: glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset - -This will be used in the next commit. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit 5097f358419c067a71e96e39764b3bb0a716bdbb) ---- -diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp -index b8335fe..fbbe577 100644 ---- a/src/mesa/main/uniform_query.cpp -+++ b/src/mesa/main/uniform_query.cpp -@@ -234,7 +234,7 @@ validate_uniform_parameters(struct gl_context *ctx, - return false; - } - -- _mesa_uniform_split_location_offset(location, loc, array_index); -+ _mesa_uniform_split_location_offset(shProg, location, loc, array_index); - - if (*loc >= shProg->NumUserUniformStorage) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", -diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c -index d902407..cee57a7 100644 ---- a/src/mesa/main/uniforms.c -+++ b/src/mesa/main/uniforms.c -@@ -532,7 +532,7 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) - if (shProg->UniformStorage[index].block_index != -1) - return -1; - -- return _mesa_uniform_merge_location_offset(index, offset); -+ return _mesa_uniform_merge_location_offset(shProg, index, offset); - } - - GLuint GLAPIENTRY -diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h -index a12ad9b..853a27c 100644 ---- a/src/mesa/main/uniforms.h -+++ b/src/mesa/main/uniforms.h -@@ -268,7 +268,8 @@ struct gl_builtin_uniform_desc { - * Combine the uniform's base location and the offset - */ - static inline GLint --_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) -+_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, -+ unsigned base_location, unsigned offset) - { - return (base_location << 16) | offset; - } -@@ -277,7 +278,8 @@ _mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) - * Separate the uniform base location and parameter offset - */ - static inline void --_mesa_uniform_split_location_offset(GLint location, unsigned *base_location, -+_mesa_uniform_split_location_offset(const struct gl_shader_program *prog, -+ GLint location, unsigned *base_location, - unsigned *offset) - { - *offset = location & 0xffff; -diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -index 4286f0e..1e04f64 100644 ---- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -@@ -3052,7 +3052,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx, - "Couldn't find uniform for initializer %s\n", name); - return; - } -- int loc = _mesa_uniform_merge_location_offset(index, offset); -+ int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset); - - for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) { - ir_constant *element; --- -cgit v0.9.0.2-2-gbebe - -From 4d12a9c67c850ff2c92f301317bc3fae0bcb448a Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:35:05 +0000 -Subject: glsl: Add gl_shader_program::UniformLocationBaseScale - -This is used by _mesa_uniform_merge_location_offset and -_mesa_uniform_split_location_offset to determine how the base and offset -are packed. Previously, this value was hard coded as (1U<<16) in those -functions via the shift and mask contained therein. The value is still -(1U<<16), but it can be changed in the future. - -The next patch dynamically generates this value. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit 26d86d26f9f972b19c7040bdb1b1daf48537ef3e) ---- -diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp -index d457e4d..ac726f4 100644 ---- a/src/glsl/link_uniforms.cpp -+++ b/src/glsl/link_uniforms.cpp -@@ -730,6 +730,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) - - assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets)); - memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets)); -+ prog->UniformLocationBaseScale = (1U<<16); - - #ifndef NDEBUG - for (unsigned i = 0; i < num_user_uniforms; i++) { -diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h -index 23c3a0d..3e440f5 100644 ---- a/src/mesa/main/mtypes.h -+++ b/src/mesa/main/mtypes.h -@@ -2419,6 +2419,21 @@ struct gl_shader_program - unsigned NumUniformBlocks; - - /** -+ * Scale factor for the uniform base location -+ * -+ * This is used to generate locations (returned by \c glGetUniformLocation) -+ * of uniforms. The base location of the uniform is multiplied by this -+ * value, and the array index is added. -+ * -+ * \note -+ * Must be >= 1. -+ * -+ * \sa -+ * _mesa_uniform_merge_location_offset, _mesa_uniform_split_location_offset -+ */ -+ unsigned UniformLocationBaseScale; -+ -+ /** - * Indices into the _LinkedShaders's UniformBlocks[] array for each stage - * they're used in, or -1. - * -diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c -index 59daff5..0494320 100644 ---- a/src/mesa/main/shaderobj.c -+++ b/src/mesa/main/shaderobj.c -@@ -283,6 +283,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx, - ralloc_free(shProg->UniformStorage); - shProg->NumUserUniformStorage = 0; - shProg->UniformStorage = NULL; -+ shProg->UniformLocationBaseScale = 0; - } - - if (shProg->UniformHash) { -diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h -index 853a27c..421232d 100644 ---- a/src/mesa/main/uniforms.h -+++ b/src/mesa/main/uniforms.h -@@ -271,7 +271,9 @@ static inline GLint - _mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, - unsigned base_location, unsigned offset) - { -- return (base_location << 16) | offset; -+ assert(prog->UniformLocationBaseScale >= 0); -+ assert(offset < prog->UniformLocationBaseScale); -+ return (base_location * prog->UniformLocationBaseScale) + offset; - } - - /** -@@ -282,8 +284,8 @@ _mesa_uniform_split_location_offset(const struct gl_shader_program *prog, - GLint location, unsigned *base_location, - unsigned *offset) - { -- *offset = location & 0xffff; -- *base_location = location >> 16; -+ *offset = location % prog->UniformLocationBaseScale; -+ *base_location = location / prog->UniformLocationBaseScale; - } - /*@}*/ - --- -cgit v0.9.0.2-2-gbebe - -From 307a703c759263bb37285b0919721ff2c413fc56 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:39:28 +0000 -Subject: glsl: Generate smaller values for uniform locations - -Previously we would generate uniform locations as (slot << 16) + -array_index. We do this to handle applications that assume the location -of a[2] will be +1 from the location of a[1]. This resulted in every -uniform location being at least 0x10000. The OpenGL 4.3 spec was -amended to require this behavior, but previous versions did not require -locations of array (or structure) members be sequential. - -We've now encountered two applications that assume uniform values will -be "small." As far as we can tell, these applications store the GLint -returned by glGetUniformLocation in a int16_t or possibly an int8_t. - -THIS BEHAVIOR IS NOT GUARANTEED OR IMPLIED BY ANY VERSION OF OpenGL. - -Other implementations happen to have both these behaviors (sequential -array elements and small values) since OpenGL 2.0, so let's just match -their behavior. - -Fixes "3D Bowling" on Android. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit cfa3c5ad828f56559a6cc2de299f993b8e748ea4) ---- -diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp -index ac726f4..8e01d2e 100644 ---- a/src/glsl/link_uniforms.cpp -+++ b/src/glsl/link_uniforms.cpp -@@ -730,7 +730,20 @@ link_assign_uniform_locations(struct gl_shader_program *prog) - - assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets)); - memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets)); -- prog->UniformLocationBaseScale = (1U<<16); -+ -+ /* Determine the size of the largest uniform array queryable via -+ * glGetUniformLocation. Using this as the location scale guarantees that -+ * there is enough "room" for the array index to be stored in the low order -+ * part of the uniform location. It also makes the locations be more -+ * tightly packed. -+ */ -+ unsigned max_array_size = 1; -+ for (unsigned i = 0; i < num_user_uniforms; i++) { -+ if (uniforms[i].array_elements > max_array_size) -+ max_array_size = uniforms[i].array_elements; -+ } -+ -+ prog->UniformLocationBaseScale = max_array_size; - - #ifndef NDEBUG - for (unsigned i = 0; i < num_user_uniforms; i++) { --- -cgit v0.9.0.2-2-gbebe - -From 2cfc0072a80cfd9503be7e57a1d8375d64d7eb98 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <r.sandiford@uk.ibm.com> -Date: Mon, 17 Jun 2013 16:10:49 +0000 -Subject: st/xlib Fix XIMage bytes-per-pixel calculation - -Fixes a crash seen while running gnome on a 16-bit screen over vnc. - -NOTE: This is a candidate for stable release branches. - -Reviewed-by: Brian Paul <brianp@vmware.com> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit 876fefe2ff8901ae4b908cff89ac5dd4324f4fe5) ---- -diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c -index 5c6d6a7..4f99e23 100644 ---- a/src/gallium/state_trackers/glx/xlib/xm_api.c -+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c -@@ -1392,9 +1392,8 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - return; - } - -- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. -- We assume 32 bit pixels. */ -- ximage_stride = w * 4; -+ /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -+ ximage_stride = w * ((img->bits_per_pixel + 7) / 8); - - for (line = 0; line < h; line++) - memcpy(&map[line * tex_xfer->stride], --- -cgit v0.9.0.2-2-gbebe - -From 8ed60f7f7fb060ccf939328bb03c9714b207236f Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <r.sandiford@uk.ibm.com> -Date: Mon, 17 Jun 2013 16:13:25 +0000 -Subject: st/xlib: Fix XImage stride calculation - -Fixes window skew seen while running gnome on a 16-bit screen over vnc. - -NOTE: This is a candidate for stable release branches. - -Reviewed-by: Brian Paul <brianp@vmware.com> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit c132c2978b02da7140462a633605a0127dfcceb4) ---- -diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c -index 4f99e23..9bfd372 100644 ---- a/src/gallium/state_trackers/glx/xlib/xm_api.c -+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c -@@ -1366,7 +1366,7 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - enum pipe_format internal_format = res->format; - struct pipe_transfer *tex_xfer; - char *map; -- int line, ximage_stride; -+ int line, byte_width; - XImage *img; - - internal_format = choose_pixel_format(drawable->xm_visual); -@@ -1393,12 +1393,12 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - } - - /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -- ximage_stride = w * ((img->bits_per_pixel + 7) / 8); -+ byte_width = w * ((img->bits_per_pixel + 7) / 8); - - for (line = 0; line < h; line++) - memcpy(&map[line * tex_xfer->stride], -- &img->data[line * ximage_stride], -- ximage_stride); -+ &img->data[line * img->bytes_per_line], -+ byte_width); - - pipe_transfer_unmap(pipe, tex_xfer); - --- -cgit v0.9.0.2-2-gbebe - -From 5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88 Mon Sep 17 00:00:00 2001 -From: Kristian Høgsberg <krh@bitplanet.net> -Date: Tue, 18 Jun 2013 20:53:46 +0000 -Subject: wayland: Handle global_remove event as well - -We need to set up a handler for the global_remove event that gets sent -out when a global gets removed. Without the handler we end up calling -a NULL pointer. - -https://bugs.freedesktop.org/show_bug.cgi?id=65910 - -NOTE: This is a candidate for the stable branches. - -Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> -(cherry picked from commit 712269d6744a8849d1d0cf01fa0132d969b79ed4) ---- -diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index 99d8729..e106dc2 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -643,8 +643,15 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name, - } - } - -+static void -+registry_handle_global_remove(void *data, struct wl_registry *registry, -+ uint32_t name) -+{ -+} -+ - static const struct wl_registry_listener registry_listener = { -- registry_handle_global -+ registry_handle_global, -+ registry_handle_global_remove - }; - - EGLBoolean --- -cgit v0.9.0.2-2-gbebe - -From cda92f5191cd2ed4782dbdd41143d520857861c9 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -Date: Tue, 18 Jun 2013 15:41:43 +0000 -Subject: st/dri/sw: Fix pitch calculation in drisw_update_tex_buffer - -swrastGetImage rounds the pitch up to 4 bytes for compatibility reasons -that are explained in drisw_glx.c:bytes_per_line, so drisw_update_tex_buffer -must do the same. - -Fixes window skew seen while running firefox over vnc on a 16-bit screen. - -NOTE: This is a candidate for the stable branches. - -[ajax: fixed typo in comment] - -Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit 5a0556f061d9db00dd7637433d393beead3b3d85) ---- -diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c -index 7a5f797..41f66d5 100644 ---- a/src/gallium/state_trackers/dri/sw/drisw.c -+++ b/src/gallium/state_trackers/dri/sw/drisw.c -@@ -265,8 +265,9 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, - /* Copy the Drawable content to the mapped texture buffer */ - get_image(dPriv, x, y, w, h, map); - -- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -- ximage_stride = w * cpp; -+ /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. -+ get_image() has a pitch rounded up to 4 bytes. */ -+ ximage_stride = ((w * cpp) + 3) & -4; - for (line = h-1; line; --line) { - memmove(&map[line * transfer->stride], - &map[line * ximage_stride], --- -cgit v0.9.0.2-2-gbebe - -From 26f802d0635fc247bbc3ebf6f7e9bf126b6b5e69 Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Thu, 31 Jan 2013 00:44:25 +0000 -Subject: svga: check for NaN shader immediates - -The svga device doesn't handle them. Replace with zeros. -Fixes several piglit tests, such as "glsl-const-builtin-inversesqrt". - -Reviewed-by: Reviewed-by: José Fonseca <jfonseca@vmware.com> -(cherry picked from commit 3cb491534493a52e9a88cb88d31727569afb8167) ---- -diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c -index 36ed008..d439e5b 100644 ---- a/src/gallium/drivers/svga/svga_tgsi_insn.c -+++ b/src/gallium/drivers/svga/svga_tgsi_insn.c -@@ -2716,8 +2716,10 @@ static boolean svga_emit_immediate( struct svga_shader_emitter *emit, - unsigned i; - - assert(1 <= imm->Immediate.NrTokens && imm->Immediate.NrTokens <= 5); -- for (i = 0; i < imm->Immediate.NrTokens - 1; i++) -- value[i] = imm->u[i].Float; -+ for (i = 0; i < imm->Immediate.NrTokens - 1; i++) { -+ float f = imm->u[i].Float; -+ value[i] = util_is_inf_or_nan(f) ? 0.0f : f; -+ } - - for ( ; i < 4; i++ ) - value[i] = id[i]; --- -cgit v0.9.0.2-2-gbebe - diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 81bd3704a..921762748 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $ +# $Id: PKGBUILD 191901 2013-08-01 06:53:34Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -19,7 +19,7 @@ install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') + '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch index 99c14107d..efbf6f5da 100644 --- a/extra/miro/ffmpeg.patch +++ b/extra/miro/ffmpeg.patch @@ -61,3 +61,14 @@ av_free(oc); /* End-of-transcode marker. */ +--- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 ++++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 +@@ -228,7 +228,7 @@ + fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); + } + +- if (avcodec_open(video_st->codec, codec) < 0) { ++ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { + fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); + } + } diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index c08be7683..58b68e0d8 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $ +# $Id: PKGBUILD 191902 2013-08-01 06:53:35Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.5beta1 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="An ncurses console audio player designed to be powerful and easy to use" arch=('i686' 'x86_64' 'mips64el') @@ -41,9 +41,13 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } -build() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" +prepare() { + cd ${pkgname}-2.5.0-beta1 patch -p0 -i "${srcdir}/moc-ffmpeg.patch" +} + +build() { + cd ${pkgname}-2.5.0-beta1 ./configure --prefix=/usr --without-rcc \ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ @@ -53,6 +57,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" + cd ${pkgname}-2.5.0-beta1 make DESTDIR="${pkgdir}" install } diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 4ef875761..d8dce99af 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,37 +1,36 @@ -# $Id: PKGBUILD 187818 2013-06-06 13:48:42Z heftig $ +# $Id: PKGBUILD 191191 2013-07-19 12:16:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager -pkgver=0.7.991 +pkgver=1.0.0 pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') -url="http://cgit.freedesktop.org/ModemManager/ModemManager/" +url="http://www.freedesktop.org/wiki/Software/ModemManager/" license=(GPL2) depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme) -makedepends=(intltool git gtk-doc) +makedepends=(intltool gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install -#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=a00f1d7") -sha256sums=('SKIP') +source=(http://www.freedesktop.org/software/$_realname/$_realname-$pkgver.tar.xz) +sha256sums=('e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563') build() { - cd $_realname - ./autogen.sh --prefix=/usr \ + cd $_realname-$pkgver + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --sbindir=/usr/bin \ --with-udev-base-dir=/usr/lib/udev \ --disable-static \ - --with-polkit + --with-polkit=permissive make } package() { - cd $_realname + cd $_realname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index ad5376595..4094cb526 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ +# $Id: PKGBUILD 191707 2013-07-29 10:14:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.5.2 +pkgver=2.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('cd8eb9f866dddb934357b7cdefb5a370') +md5sums=('3f149cd0c2842b95551130bd56840f55') diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index c356c9e97..2434051da 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $ +# $Id: PKGBUILD 191959 2013-08-02 00:36:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.17.4 -pkgrel=1 +pkgrel=5 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') @@ -23,6 +23,12 @@ sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb' backup=('etc/mpd.conf') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/cdio_paranoia_input_plugin.c + sed 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:192000:g' -i src/decoder/ffmpeg_decoder_plugin.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -31,6 +37,7 @@ build() { --enable-jack \ --enable-lastfm \ --enable-soundcloud \ + --enable-pipe-output \ --enable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system @@ -40,9 +47,11 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/usr/lib/systemd/user install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf + ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service sed \ -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index d3e701687..42905532d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187901 2013-06-07 22:39:54Z heftig $ +# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a') +sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454') build() { cd "$pkgname-$pkgver" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index 3ea4d33c2..87ec0b12a 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $ +# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-sendto pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64' 'mips64el') url="http://download.gnome.org/sources/nautilus-sendto/" @@ -14,6 +14,7 @@ depends=(glib2) makedepends=(gettext intltool gobject-introspection) options=('!libtool' '!emptydirs') install=nautilus-sendto.install +groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb') diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 0819548b5..2dffb2fb8 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=nedit pkgver=5.5 -pkgrel=6.2 +pkgrel=7 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64' 'mips64el') url="http://www.nedit.org/" @@ -11,25 +11,25 @@ license=('GPL') depends=('lesstif' 'libxpm') source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' - 'ae1f56ae9b23163882051720ac52412d') sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch" sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux sed -i 's|fgets|//fgets|' util/check_lin_tif.c sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c +} +build() { + cd ${pkgname}-${pkgver} make linux docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 58f51c2f3..ed731d21d 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ +# $Id: PKGBUILD 191905 2013-08-01 06:53:38Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index daec052c4..cf32cab3d 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 188110 2013-06-10 00:00:35Z bisson $ +# $Id: PKGBUILD 191740 2013-07-30 01:18:34Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=nmap -pkgver=6.25 -pkgrel=2.1 +pkgver=6.40 +pkgrel=1 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('pygtk') -optdepends=('pygtk: zenmap') +optdepends=('pygtk: zenmap' + 'sudo: privilege escalation for zenmap' + 'xterm: privilege escalation for zenmap' + 'kdebase-runtime: privilege escalation for zenmap' + 'gksu: privilege escalation for zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f') +sha1sums=('ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index e4a3d09eb..f9bf4bae3 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,63 +1,44 @@ -# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $ +# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=nspr -pkgver=4.9.6 -pkgrel=1 +pkgver=4.10 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/nspr/" license=('MPL' 'GPL') depends=('glibc') 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=('62b1e9d376d503d972f90c3c0031d879' - 'bce1611f3117b53fc904cab549c09967') +options=('!emptydirs') +source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +md5sums=('f5466def95726b3c900d8a0227bdd034') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - if [ "$CARCH" = "x86_64" ]; then - confflags="--enable-64bit" + cd $pkgname-$pkgver + + if [[ $CARCH = x86_64 ]]; then + _confflags="--enable-64bit" else - confflags="" + _confflags="" fi - sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - -i mozilla/nsprpub/config/rules.mk - - ./mozilla/nsprpub/configure \ + ./nspr/configure \ --prefix=/usr \ --libdir=/usr/lib \ --includedir=/usr/include/nspr \ --enable-optimize \ - --disable-debug ${confflags} + --disable-debug ${_confflags} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib/*.a + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ - "${pkgdir}/usr/bin/prerr.properties" \ - "${pkgdir}/usr/share/aclocal/nspr.m4" \ - "${pkgdir}/usr/include/nspr/md" + chmod 644 "$pkgdir"/usr/lib/*.a + ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" + rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ + "$pkgdir/usr/include/nspr/md" } diff --git a/extra/nspr/nspr.pc.in b/extra/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0ca..000000000 --- a/extra/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 235d2716a..ebd9bb584 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,109 +1,97 @@ -# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $ +# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.14.3 -pkgrel=3 +pkgver=3.15.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.6 +_nsprver=4.10 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') -options=('!strip') +options=('!strip' '!makeflags') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss.pc.in nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c' +sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') -build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" +prepare() { + cd $pkgname-$pkgver + # 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" + patch -Np1 -i ../add_spi+cacert_ca_certs.patch # Adds transitional SSL renegotiate support - patch from Debian - patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" + patch -Np3 -i ../ssl-renegotiate-transitional.patch # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i security/coreconf/rules.mk + sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ + -i nss/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 +build() { + cd $pkgname-$pkgver/nss - cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + export NSPR_INCLUDE_DIR="`nspr-config --includedir`" + export NSPR_LIB_DIR="`nspr-config --libdir`" export XCFLAGS="${CFLAGS}" [ "$CARCH" = "x86_64" ] && export USE_64=1 - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss + make -C coreconf + make -C lib/dbm + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${_nsprver},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 - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" + cd $pkgname-$pkgver + install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} + + NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}') + + sed ../nss.pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,${_nsprver},g" \ + -e "s,%NSS_VERSION%,${pkgver},g" \ + > "$pkgdir/usr/lib/pkgconfig/nss.pc" + ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc" + + sed ../nss-config.in \ + -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > "$pkgdir/usr/bin/nss-config" + chmod 755 "$pkgdir/usr/bin/nss-config" + + cd dist/*.OBJ/bin + install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap + + cd ../lib + install -t "$pkgdir/usr/lib" *.so + install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk + + cd ../../public/nss + install -t "$pkgdir/usr/include/nss" -m644 *.h } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index edaaa9464..3fc20f5b8 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,32 +1,26 @@ -# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $ +# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=14 +pkgrel=17 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') arch=('i686' 'x86_64' 'mips64el') makedepends=('perl-html-parser') depends=('openssl' 'libcap' 'libedit') -backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +backup=('etc/ntp.conf') source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" - 'ntpd' - 'ntpdate' 'ntp.conf' - 'ntpd.conf' 'ntpd.service' 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' - '4e324e625c1f080b5c028be5092aa71adbf9bd99' - '01394b8a952f5edc85d19df8335eeac3980320f4' - 'f6a2292c26a201d9305669e99463fb54e5603b3f' - '4537d1f58b299d463db5048129cb264511474b0b' - 'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95' - '0cb9dbd285e2e8ac51ff47dee08af69e12a09855' + 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' + 'ff8370719f003f184563b7d6068c03086678482f' + 'e1c48cba549b7d21501aadf513926e463884c090' ) install=install @@ -50,10 +44,7 @@ package() { rmdir "${pkgdir}"/usr/{lib,sbin} install -d -o 87 "${pkgdir}"/var/lib/ntp - install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd - install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf - install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 2c0a34571..25135fb3b 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -17,6 +17,3 @@ restrict ::1 # Location of drift file driftfile /var/lib/ntp/ntp.drift - -# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing -# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd deleted file mode 100755 index 480fa1088..000000000 --- a/extra/ntp/ntpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -unset PID -PIDFILE='/run/ntpd.pid' - -if [[ -r ${PIDFILE} ]]; then - read -r PID <"${PIDFILE}" - if [[ -n ${PID} && ! -d /proc/${PID} ]]; then - rm -f "${PIDFILE}" - unset PID - fi -fi - -case "$1" in - start) - stat_busy "Starting NTP Daemon" - if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then - add_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then - rm ${PIDFILE} - rm_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf deleted file mode 100644 index 047961fde..000000000 --- a/extra/ntp/ntpd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g -u ntp" - -# arguments passed to ntpd when started -NTPD_ARGS="-g -u ntp" diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index 4e3290858..45239877f 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=forking PrivateTmp=true ExecStart=/usr/bin/ntpd -g -u ntp:ntp -ControlGroup=cpu:/ Restart=always [Install] diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate deleted file mode 100755 index a8e746785..000000000 --- a/extra/ntp/ntpdate +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -case "$1" in - start) - stat_busy "Starting NTP Client" - if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then - add_daemon ntpdate - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service index 82d72d8b6..094dd42c8 100644 --- a/extra/ntp/ntpdate.service +++ b/extra/ntp/ntpdate.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=oneshot PrivateTmp=true ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp -ControlGroup=cpu:/ [Install] WantedBy=multi-user.target diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 7bb35ecce..45483af71 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ +# $Id: PKGBUILD 191854 2013-07-31 16:20:12Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 732fc7890..e2f2da0ea 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178390 2013-02-21 05:35:59Z heftig $ +# $Id: PKGBUILD 191906 2013-08-01 06:53:39Z bpiotrowski $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.opalvoip.org" @@ -14,7 +14,7 @@ options=(!makeflags) source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz opal-ffmpeg.patch) sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864' - 'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231') + '0111eec3f7109a83f8cd4a87744ca050b3ca27482e9d31e3a1d50798f8cd88c1') build() { cd "${srcdir}/opal-${pkgver}" diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch index c40e1ddfb..e7671ee53 100644 --- a/extra/opal/opal-ffmpeg.patch +++ b/extra/opal/opal-ffmpeg.patch @@ -193,3 +193,180 @@ diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/pl m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations } +diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx +--- a/plugins/video/common/dyna.cxx 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.cxx 2013-07-22 16:55:47.307946942 +0000 +@@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc + #endif + + +-FFMPEGLibrary::FFMPEGLibrary(CodecID codec) ++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) + { + m_codec = codec; + if (m_codec==CODEC_ID_H264) +@@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load() + return true; + } + +-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) + { + return Favcodec_find_encoder(id); + } + +-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) + { + WaitAndSignal m(processLock); + +diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h +--- a/plugins/video/common/dyna.h 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.h 2013-07-22 16:55:47.191281134 +0000 +@@ -88,13 +88,13 @@ class DynaLink + class FFMPEGLibrary + { + public: +- FFMPEGLibrary(CodecID codec); ++ FFMPEGLibrary(AVCodecID codec); + ~FFMPEGLibrary(); + + bool Load(); + +- AVCodec *AvcodecFindEncoder(enum CodecID id); +- AVCodec *AvcodecFindDecoder(enum CodecID id); ++ AVCodec *AvcodecFindEncoder(enum AVCodecID id); ++ AVCodec *AvcodecFindDecoder(enum AVCodecID id); + AVCodecContext *AvcodecAllocContext(void); + AVFrame *AvcodecAllocFrame(void); + int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); +@@ -117,15 +117,15 @@ class FFMPEGLibrary + DynaLink m_libAvcodec; + DynaLink m_libAvutil; + +- CodecID m_codec; ++ AVCodecID m_codec; + char m_codecString[32]; + + void (*Favcodec_init)(void); + void (*Fav_init_packet)(AVPacket *pkt); + + void (*Favcodec_register_all)(void); +- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); +- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); ++ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id); ++ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id); + AVCodecContext *(*Favcodec_alloc_context)(void); + AVFrame *(*Favcodec_alloc_frame)(void); + int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); +diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h +--- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 02:18:04.000000000 +0000 ++++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-07-22 16:55:47.167947971 +0000 +@@ -101,7 +101,7 @@ + * 1. no value of a existing codec ID changes (that would break ABI), + * 2. it is as close as possible to similar codecs. + */ +-enum CodecID { ++enum AVCodecID { + CODEC_ID_NONE, + + /* video codecs */ +@@ -1390,7 +1390,7 @@ typedef struct AVCodecContext { + + char codec_name[32]; + enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ +- enum CodecID codec_id; /* see CODEC_ID_xxx */ ++ enum AVCodecID codec_id; /* see CODEC_ID_xxx */ + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). +@@ -2843,7 +2843,7 @@ typedef struct AVCodec { + */ + const char *name; + enum AVMediaType type; +- enum CodecID id; ++ enum AVCodecID id; + int priv_data_size; + int (*init)(AVCodecContext *); + int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data); +@@ -2898,7 +2898,7 @@ typedef struct AVHWAccel { + * + * See CODEC_ID_xxx + */ +- enum CodecID id; ++ enum AVCodecID id; + + /** + * Supported pixel format. +@@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec); + /** + * Find a registered encoder with a matching codec ID. + * +- * @param id CodecID of the requested encoder ++ * @param id AVCodecID of the requested encoder + * @return An encoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_encoder(enum CodecID id); ++AVCodec *avcodec_find_encoder(enum AVCodecID id); + + /** + * Find a registered encoder with the specified name. +@@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co + /** + * Find a registered decoder with a matching codec ID. + * +- * @param id CodecID of the requested decoder ++ * @param id AVCodecID of the requested decoder + * @return A decoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_decoder(enum CodecID id); ++AVCodec *avcodec_find_decoder(enum AVCodecID id); + + /** + * Find a registered decoder with the specified name. +@@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +-int av_get_bits_per_sample(enum CodecID codec_id); ++int av_get_bits_per_sample(enum AVCodecID codec_id); + + #if FF_API_OLD_SAMPLE_FMT + /** +diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx +--- a/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.cxx 2013-07-22 16:55:47.314613571 +0000 +@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc + PTRACE(4, m_prefix, "Encoder closed"); + } + +-bool H263_Base_EncoderContext::Init(CodecID codecId) ++bool H263_Base_EncoderContext::Init(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h +--- a/plugins/video/H.263-1998/h263-1998.h 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.h 2013-07-22 16:55:47.307946942 +0000 +@@ -115,7 +115,7 @@ class H263_Base_EncoderContext + virtual ~H263_Base_EncoderContext(); + + virtual bool Init() = 0; +- virtual bool Init(CodecID codecId); ++ virtual bool Init(AVCodecID codecId); + + virtual bool SetOptions(const char * const * options); + virtual void SetOption(const char * option, const char * value); +diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx +--- a/plugins/video/H.264/h264-x264.cxx 2013-02-20 02:18:02.000000000 +0000 ++++ b/plugins/video/H.264/h264-x264.cxx 2013-07-22 17:05:35.383661843 +0000 +@@ -40,6 +40,9 @@ + #include "plugin-config.h" + #endif + ++#define FF_IDCT_H264 11 ++#define CODEC_FLAG2_SKIP_RD 0x00004000 ++ + #include <codec/opalplugin.hpp> + + #include "../common/ffmpeg.h" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 068e5c9b0..95f0f4dfd 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $ +# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD deleted file mode 100644 index cf262e1c6..000000000 --- a/extra/openexr/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=openexr -pkgver=2.0.0 -pkgrel=1 -pkgdesc="An high dynamic-range image file format library" -url="http://www.openexr.com/" -arch=(i686 x86_64 'mips64el') -license=('BSD') -depends=('zlib' 'ilmbase') -options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('0820e1a8665236cb9e728534ebf8df18') diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 788ff4ddb..7d6423df8 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ +# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.15 +pkgver=2.16 pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") -md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') +md5sums=('bd7afcd949023ed2f3e9d9294848ad19') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index c67d5c757..2f73b6e52 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $ # Maintainer: pkgname=perl-dbi -pkgver=1.627 +pkgver=1.628 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/DBI/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) -md5sums=('aab49be51b0f4867a1894145b023d2c5') +md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a') build() { cd DBI-${pkgver} diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index b0142295c..a20de52d2 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189866 2013-07-10 07:26:57Z bpiotrowski $ +# $Id: PKGBUILD 191859 2013-07-31 16:31:30Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit -pkgver=3.61 -pkgrel=2 +pkgver=3.62 +pkgrel=1 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=("i686" "x86_64" 'mips64el') url="http://www.pstoedit.net/" @@ -14,7 +14,7 @@ depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') makedepends=('ghostscript') options=('!libtool' '!makeflags') source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz") -sha1sums=('426f3746ecb441caa0db401d5880e1ac04a399d5') +sha1sums=('50d5a4e2fe0e0ff2f73cb094cb945b221083e742') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index a22e4ef5f..a804817f3 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144607 2011-12-08 01:03:26Z foutrelis $ +# $Id: PKGBUILD 191204 2013-07-20 01:49:05Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -9,12 +9,12 @@ pkgver=2.7.0 pkgrel=1.2 pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64' 'mips64el') -url="https://www.guifications.org/projects/purple-plugin-pack" +url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" license=('GPL') depends=('libpurple') makedepends=('intltool' 'gettext' 'python2' 'pidgin') options=('!libtool') -source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2) +source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2) sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 6930e62cd..e6ff9a5f2 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,18 +1,12 @@ -# $Id: PKGBUILD 189853 2013-07-09 13:42:03Z tpowa $ +# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=1.5.1 -pkgrel=2 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64' 'mips64el') +pkgname=('qemu' 'libcacard') +pkgver=1.5.2 +pkgrel=1 +arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' - 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' - 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' - 'libiscsi') -backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 65-kvm.rules) @@ -23,14 +17,20 @@ build () { cd "${srcdir}/${pkgname}-${pkgver}" # gtk gui breaks keymappings at the moment - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl'\ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ - --enable-mixemu --libexecdir=/usr/lib/qemu \ + --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ --disable-gtk --enable-linux-aio --enable-seccomp make } -package() { +package_qemu() { + pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." + depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi' 'libcacard') + backup=('etc/qemu/target-x86_64.conf') cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install rm "${pkgdir}/usr/share/qemu/bios.bin" @@ -49,7 +49,22 @@ package() { /usr/bin/strip $STRIP_BINARIES "$binary";; esac done + # remove libcacard files + rm -rf ${pkgdir}/usr/lib/libcacard* + rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc + rm -rf ${pkgdir}/usr/bin/vscclient +} +package_libcacard() { + pkgdesc="Common Access Card (CAC) Emulation" + options=('strip' '!libtool') + depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2') + mkdir -p ${pkgdir}/usr/bin + mkdir -p ${pkgdir}/usr/lib/pkgconfig + cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/ + cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ + cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } -md5sums=('b56e73bdcfdb214d5c68e13111aca96f' + +md5sums=('04b94189ba587b3280713ded3b7f959a' '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index f752b84cb..ed0eeb3f0 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184430 2013-05-06 19:39:36Z foutrelis $ +# $Id: PKGBUILD 191650 2013-07-29 07:23:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' @@ -11,14 +11,14 @@ license=('LGPL2.1' 'GPL3') depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.4 +_qtver=4.8.5 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" - "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' 'qwebview.patch' 'LLIntCLoop32BigEndian.patch') -sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd' - 'f5880f11c139d7d8d01ecb8d874535f7d9553198' +sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c' + '745f9ebf091696c0d5403ce691dc28c039d77b9e' '315b6ff603f35e5492a036f7082f6aa075dfb607' 'ef467fcfc9e74aa88356f27acc21792706ed1e4d' 'af830ae24e2ae5113754c9ae524d27ec0a28a9d6') diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD index 1374c9d02..777734f48 100644 --- a/extra/quadrapassel/PKGBUILD +++ b/extra/quadrapassel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183453 2013-04-21 22:12:00Z heftig $ +# $Id: PKGBUILD 191635 2013-07-28 18:12:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=quadrapassel -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=quadrapassel.install url="https://live.gnome.org/Quadrapassel" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284') +sha256sums=('a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229') build() { cd $pkgname-$pkgver diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1b5a1435d..5b7826717 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189851 2013-07-09 13:36:09Z tpowa $ +# $Id: PKGBUILD 191365 2013-07-24 10:47:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,16 +17,15 @@ _COMPILER="GCC46" pkgname="refind-efi" pkgver="0.7.1" -pkgrel="1" +pkgrel="4" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') license=('GPL3' 'custom') makedepends=('subversion' 'python2') -depends=('dosfstools' 'efibootmgr') +depends=('bash' 'dosfstools' 'efibootmgr') optdepends=('mactel-boot: For bless command in Apple Mac systems' - 'bash: For refind-mkfont script' 'imagemagick: For refind-mkfont script') options=('!strip' 'docs' '!makeflags') @@ -64,10 +63,10 @@ _setup_env_vars() { _prepare_tianocore_sources() { - _setup_env_vars - msg "Delete old UDK BUILD dir" rm -rf "${_UDK_DIR}/" || true + + msg "Create UDK BUILD dir" mkdir -p "${_UDK_DIR}/" for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do @@ -105,10 +104,10 @@ _prepare_tianocore_sources() { sed "s|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true msg "Fix UDK Target ARCH for rEFInd" - sed "s|X64|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true - sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + sed "s|X64|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true + sed "s|IA32|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true - chmod +x "${_UDK_DIR}/BaseTools/BuildEnv" + chmod 0755 "${_UDK_DIR}/BaseTools/BuildEnv" } @@ -125,6 +124,8 @@ _prepare_refind_sources() { prepare() { + _setup_env_vars + msg "Prepare Tianocore Sources" _prepare_tianocore_sources @@ -180,29 +181,35 @@ build() { package() { msg "Install the rEFInd UEFI application" - install -d "${pkgdir}/usr/lib/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/refind_${_TIANO_S_ARCH}.efi" msg "Install UEFI drivers built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" - install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" + install -d "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" + install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" msg "Install UEFI applications built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}" - install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}" + install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" - msg "Install the rEFInd config file" - install -d "${pkgdir}/usr/lib/refind/config/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf" - install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf" + msg "Install rEFInd helper scripts" + install -d "${pkgdir}/usr/bin/" + install -D -m0755 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install" + install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf" + install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind" + install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" + + msg "Install the rEFInd sample config files" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/share/refind/refind.conf-sample" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/share/refind/refind_linux.conf-sample" msg "Install the rEFInd docs" install -d "${pkgdir}/usr/share/refind/docs/html/" install -d "${pkgdir}/usr/share/refind/docs/Styles/" install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README" - install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS" + install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt" + install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt" rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true msg "Install the rEFInd fonts" @@ -210,10 +217,6 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/fonts"/* "${pkgdir}/usr/share/refind/fonts/" rm -f "${pkgdir}/usr/share/refind/fonts/mkfont.sh" - msg "Install the rEFInd mkfont.sh" - install -d "${pkgdir}/usr/bin/" - install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" - msg "Install the rEFInd icons" install -d "${pkgdir}/usr/share/refind/icons/" install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/refind/icons/" @@ -230,4 +233,12 @@ package() { install -d "${pkgdir}/usr/share/licenses/refind/" install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" + msg "Use '#!/usr/bin/env bash' in all scripts" + sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true + + msg "Point refind dir paths to /usr/share/refind/ in refind-install script" + sed 's|^ThisDir=.*|ThisDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^RefindDir=.*|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" + } diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install index e43f6cb61..947d157e3 100644 --- a/extra/refind-efi/refind-efi.install +++ b/extra/refind-efi/refind-efi.install @@ -2,20 +2,21 @@ post_install() { cat << EOF -rEFInd UEFI applications have been installed at /usr/lib/refind/refind_*.efi +rEFInd UEFI application has been installed at /usr/share/refind/refind_*.efi -Other UEFI applications have been installed at /usr/lib/refind/tools_*/ +Other UEFI applications have been installed at /usr/share/refind/tools_*/ -UEFI drivers have deen installed at /usr/lib/refind/drivers_*/ +UEFI drivers have deen installed at /usr/share/refind/drivers_*/ Copy the efi application (according to your UEFI ARCH) -and /usr/lib/refind/config/refind.conf to a sub-directory of <EFISYS>/EFI/ -and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs) +and /usr/share/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/ +as refind.conf and add an entry to firmware boot menu using efibootmgr +or mactel-boot (for Macs) rEFInd Icons have been installed at /usr/share/refind/icons/ rEFInd Fonts have been installed at /usr/share/refind/fonts/ -HTML Documentation is available at /usr/share/refind/docs/html/ +HTML Documentation is available at /usr/share/doc/refind/html/ More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 223544f00..d83c509b6 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ +# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z 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=13.04 +pkgver=13.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -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=('bcc9be7bf8c3945e0eefdb95dc037f0b') +md5sums=('67b110277718b6ef2ec098a8fc452340') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,6 @@ build() { export lrdf_CFLAGS LRELEASE LUPDATE ./configure --prefix=/usr - make } diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index b4cc1ea97..2c42e4bc6 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 189979 2013-07-12 06:44:58Z eric $ +# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $ # Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121230 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64' 'mips64el') url="http://rtmpdump.mplayerhq.hu/" license=('GPL2' 'LGPL2.1') depends=('openssl') -options=(!makeflags) +options=('!makeflags') #git://git.ffmpeg.org/rtmpdump -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('89faf9df54204dbab211621809aa961ea6405e192cc0ce6633307e87aed400b7') +source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz) +sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2') build() { cd $pkgname-$pkgver diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 4e3f4dccc..2a449a41a 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185316 2013-05-13 09:39:29Z heftig $ +# $Id: PKGBUILD 191370 2013-07-24 12:22:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.2 +pkgver=0.18.3 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') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('26dea444e69f68cec822e58080162d056528a518b9b155503016a19dda0b48a4') +sha256sums=('b3bb97476b44f7adae162c8cdb062160120336ed33a88c2a692ab8fac187d105') build() { cd $pkgname-$pkgver diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index ae128ab19..587621f0b 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 184435 2013-05-06 19:39:45Z foutrelis $ +# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') +makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') checkdepends=('time') optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' 'libid3tag: for mp3 plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-ffmpeg0.11.patch) -sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9' - '2f92bcaebcaf300782396f106cdd27c72048a851') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9') prepare() { cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in } diff --git a/extra/sox/sox-ffmpeg0.11.patch b/extra/sox/sox-ffmpeg0.11.patch deleted file mode 100644 index 901c81582..000000000 --- a/extra/sox/sox-ffmpeg0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure ---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400 -+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400 -@@ -15781,9 +15781,9 @@ - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 --$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } --if ${ac_cv_lib_avformat_av_open_input_file+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5 -+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; } -+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -15797,27 +15797,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char av_open_input_file (); -+char avformat_open_input (); - int - main () - { --return av_open_input_file (); -+return avformat_open_input (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_avformat_av_open_input_file=yes -+ ac_cv_lib_avformat_avformat_open_input=yes - else -- ac_cv_lib_avformat_av_open_input_file=no -+ ac_cv_lib_avformat_avformat_open_input=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5 --$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; } --if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5 -+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; } -+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then : - for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c ---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400 -+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400 -@@ -93,7 +93,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - enc->error_resilience = 1; - #else -- enc->error_recognition = 1; -+ enc->err_recognition = 1; - #endif - - if (!codec || avcodec_open(enc, codec) < 0) -@@ -157,7 +157,7 @@ - static int startread(sox_format_t * ft) - { - priv_t * ffmpeg = (priv_t *)ft->priv; -- AVFormatParameters params; -+ AVDictionary *params; - int ret; - int i; - -@@ -172,7 +172,7 @@ - - /* Open file and get format */ - memset(¶ms, 0, sizeof(params)); -- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { -+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { - lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); - return SOX_EOF; - } -@@ -231,7 +231,7 @@ - /* If input buffer empty, read more data */ - if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { - if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && -- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) -+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error)) - break; - ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); - ffmpeg->audio_buf_index = 0; -@@ -373,13 +373,6 @@ - return SOX_EOF; - } - -- /* set the output parameters (must be done even if no -- parameters). */ -- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { -- lsx_fail("ffmpeg invalid output format parameters"); -- return SOX_EOF; -- } -- - /* Next line for debugging */ - /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ - -@@ -391,14 +384,14 @@ - - /* open the output file, if needed */ - if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { -+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { - lsx_fail("ffmpeg could not open `%s'", ft->filename); - return SOX_EOF; - } - } - - /* write the stream header, if any */ -- av_write_header(ffmpeg->ctxt); -+ avformat_write_header(ffmpeg->ctxt, NULL); - - return SOX_SUCCESS; - } -@@ -478,7 +471,7 @@ - #if (LIBAVFORMAT_VERSION_INT < 0x340000) - url_fclose(&ffmpeg->ctxt->pb); - #else -- url_fclose(ffmpeg->ctxt->pb); -+ avio_close(ffmpeg->ctxt->pb); - #endif - } - diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 5e0a9ee44..487302ff3 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,85 +1,83 @@ -# $Id: PKGBUILD 189775 2013-07-07 23:18:58Z angvp $ +# $Id: PKGBUILD 191954 2013-08-01 21:53:49Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') -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>=5.18' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' + 'libgnome-keyring' 'kdelibs' 'ruby') +[ "$CARCH" != "mips64el" ] && makedepends+=('java-runtime' 'java-environment') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' + 'kdeutils-kwallet: for KWallet for auth credentials' + 'bash-completion: for svn bash completion' + 'python2: for some hook scripts' + 'java-environment: for Java support' + 'ruby: for some hook scripts') provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f053a9948dfe5c70eff5c00509723214' +md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' + 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' 'e8020c7a1d1a0c47091b5fdd034f81c5' '6b4340ba9d8845cd8497e013ae01be3f') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export PYTHON=/usr/bin/python2 - - #patch -Np0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --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-static - else + [ "$CARCH" = "mips64el" ] && extraconf="--disable-javahl" ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ + --with-zlib=/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 + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ + --disable-static $extraconf - #make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl #swig-rb + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl swig-rb [ "$CARCH" = "mips64el" ] || make javahl } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} +check() { + cd ${pkgname}-${pkgver} + export LANG=C LC_ALL=C + make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +} package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl #install-swig-rb + install install-swig-py install-swig-pl install-swig-rb [ "$CARCH" = "mips64el" ] || make install-javahl @@ -87,9 +85,6 @@ package() { cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - ## svnserve ... # xinetd diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 4fab1ec3a..4ef6d9a1a 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179516 2013-03-05 19:16:44Z ioni $ +# $Id: PKGBUILD 191842 2013-07-31 09:40:22Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.17.3 +pkgver=0.17.5 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f190ac6244440601f616dd61846689ba') +md5sums=('57d7778e58f82a43dba1311cece0d4e3') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 11b9b0305..5b2bb7fa5 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183617 2013-04-25 16:40:37Z ioni $ +# $Id: PKGBUILD 191840 2013-07-31 09:36:38Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.20.2 +pkgver=0.20.4 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('bfc8a1b94c7a268f15d4d92b83460987') +md5sums=('78be56307d2da7c580cf6df33a225ba0') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 578888af4..90e855186 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ +# $Id: PKGBUILD 191309 2013-07-23 13:29:40Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> @@ -20,7 +20,7 @@ md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ + PYTHON=python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-gnome-keyring \ --disable-schemas-compile diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 22f32357e..17779678b 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184438 2013-05-06 19:39:53Z foutrelis $ +# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.1 +pkgver=0.16.2 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771') +sha256sums=('033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409') build() { cd $pkgbase-$pkgver diff --git a/extra/transcode/04_ffmpeg_options.patch b/extra/transcode/04_ffmpeg_options.patch new file mode 100644 index 000000000..d0429b1d9 --- /dev/null +++ b/extra/transcode/04_ffmpeg_options.patch @@ -0,0 +1,26 @@ +Description: Remove "-vpre medium" from ffmpeg's command-line arguments list. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436 +From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25 +--- + export/ffmpeg_cfg.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- transcode.orig/export/ffmpeg_cfg.c ++++ transcode/export/ffmpeg_cfg.c +@@ -126,7 +126,7 @@ int lavc_param_gmc = 0; + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = NULL; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ +@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={ + {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, +- {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0}, + {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0}, + {NULL, NULL, 0, 0, 0, 0} + }; diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 6082f4cf4..9cd251ca0 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184439 2013-05-06 19:39:55Z foutrelis $ +# $Id: PKGBUILD 191909 2013-08-01 06:53:42Z bpiotrowski $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,29 +6,47 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=9 +pkgrel=10 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') + 'libmpeg2' 'libxaw' 'libxv' 'a52dec') makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.11.patch) + ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') + '3d2dcdc23f14938e87d14cfc03000bb3b649b85e' + 'ef1cccd35317d3a28443b654da49de731cdf1766' + '00938db9aebde719799c11116ed9fe85a9cc4bdd' + '6d1774e202cca689c4e417def982452990b8e7e4') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/ffmpeg-0.11.patch" + patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch" + patch -p1 -i "${srcdir}/04_ffmpeg_options.patch" + patch -p1 -i "${srcdir}/transcode-ffmpeg.patch" + + cd ../subtitleripper + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile +} - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ @@ -38,21 +56,15 @@ build() { --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert make - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile + cd ../subtitleripper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - cd "${srcdir}/subtitleripper" + cd ../subtitleripper install -m 755 pgm2txt "${pkgdir}/usr/bin/" install -m 755 srttool "${pkgdir}/usr/bin/" install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" diff --git a/extra/transcode/transcode-1.1.7-libav-9.patch b/extra/transcode/transcode-1.1.7-libav-9.patch new file mode 100644 index 000000000..3989d3d83 --- /dev/null +++ b/extra/transcode/transcode-1.1.7-libav-9.patch @@ -0,0 +1,31 @@ +--- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 ++++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 +@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) + return; + } + +- ret = av_find_stream_info(lavf_dmx_context); ++ ret = avformat_find_stream_info(lavf_dmx_context, NULL); + if (ret < 0) { + tc_log_error(__FILE__, "unable to fetch informations from '%s'" + " (libavformat failure)", +--- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 ++++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 +@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(NULL); + if (lavc_dec_context == NULL) { + tc_log_error(__FILE__, "Could not allocate enough memory."); + goto decoder_error; +@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; + +- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { ++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { + tc_log_error(__FILE__, "Could not initialize the '%s' codec.", + codec->name); + goto decoder_error; diff --git a/extra/transcode/transcode-ffmpeg.patch b/extra/transcode/transcode-ffmpeg.patch new file mode 100644 index 000000000..0021d07d5 --- /dev/null +++ b/extra/transcode/transcode-ffmpeg.patch @@ -0,0 +1,115 @@ +diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c +--- transcode-1.1.7-orig/encode/encode_lavc.c 2013-07-13 18:41:25.441796991 -0400 ++++ transcode-1.1.7/encode/encode_lavc.c 2013-07-13 18:45:21.042465999 -0400 +@@ -977,8 +977,6 @@ + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1150,8 +1148,6 @@ + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1182,7 +1178,7 @@ + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, +diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c +--- transcode-1.1.7-orig/export/export_ffmpeg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/export_ffmpeg.c 2013-07-13 18:48:46.263478358 -0400 +@@ -835,8 +835,6 @@ + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -867,7 +865,6 @@ + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c +--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-07-13 18:48:34.633609112 -0400 +@@ -50,8 +50,6 @@ + //int lavc_param_vpass = 0; + int lavc_param_vrc_strategy = 2; + int lavc_param_vb_strategy = 0; +-int lavc_param_luma_elim_threshold = 0; +-int lavc_param_chroma_elim_threshold = 0; + int lavc_param_packet_size= 0; + int lavc_param_strict= 0; + int lavc_param_data_partitioning= 0; +@@ -105,7 +103,6 @@ + int lavc_param_mv0= 0; + int lavc_param_noise_reduction= 0; + int lavc_param_qp_rd= 0; +-int lavc_param_inter_threshold= 0; + int lavc_param_sc_threshold= 0; + int lavc_param_ss= 0; + int lavc_param_top= -1; +@@ -156,8 +153,6 @@ + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +- {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +@@ -215,13 +210,12 @@ + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000}, + {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, +- {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, + {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h +--- transcode-1.1.7-orig/export/ffmpeg_cfg.h 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.h 2013-07-13 18:49:04.169944470 -0400 +@@ -29,8 +29,6 @@ + //extern int lavc_param_vpass; + extern int lavc_param_vrc_strategy; + extern int lavc_param_vb_strategy; +-extern int lavc_param_luma_elim_threshold; +-extern int lavc_param_chroma_elim_threshold; + extern int lavc_param_packet_size; + extern int lavc_param_strict; + extern int lavc_param_data_partitioning; +@@ -84,7 +82,6 @@ + extern int lavc_param_mv0; + extern int lavc_param_noise_reduction; + extern int lavc_param_qp_rd; +-extern int lavc_param_inter_threshold; + extern int lavc_param_sc_threshold; + extern int lavc_param_ss; + extern int lavc_param_top; diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index d0a44ffc3..bb7dcab64 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 189680 2013-07-04 14:55:33Z tomegun $ +# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.80 -pkgrel=2 +pkgver=2.81 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('2bde600d4b0a75d0bd3784550d59a8af') +md5sums=('db1ad10ecff07150486dab2365ccb3a8') build() { cd $pkgbase-$pkgver diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD deleted file mode 100644 index 0adeccb65..000000000 --- a/extra/truecrypt/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $ -# Maintainer: Paul Mattal <paul.archlinux.org> - -pkgname=truecrypt -pkgver=7.1a -pkgrel=1 -epoch=1 -pkgdesc="Free open-source cross-platform disk encryption software" -url="http://www.truecrypt.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('custom') # TrueCrypt License v2.6 -depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper') -makedepends=('nasm') -optdepends=('sudo: mounting encrypted volumes as nonroot users') -conflicts=('truecrypt-utils') -replaces=('truecrypt-utils') -# N.B. Truecrypt's web-based source download is incompatible with -# makepkg. Source has been placed on ftp.archlinux.org instead -source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ - 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ - "${pkgname}.desktop" \ - "${pkgname}-arch-detection.patch") -md5sums=('102d9652681db11c813610882332ae48' - '5bca3d15b35d0725ff3317e568062ad8' - 'ce6a707b79411e82e8e558aa03e764b0' - '183b9bf04a943454d4e216130bcbac01' - '00ea70fa8437de877b31b027ac2b4060') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Work around buggy CPU type detection - patch -Np1 -i ../${pkgname}-arch-detection.patch - - # Build - make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Install Binary - install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" - - # Install Desktop file and Icon - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" - - # Install License - install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" -} diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch deleted file mode 100644 index bc16a2a36..000000000 --- a/extra/truecrypt/truecrypt-arch-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile ---- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400 -+++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400 -@@ -120,10 +120,7 @@ - - export CPU_ARCH ?= unknown - --ARCH = $(shell uname -p) --ifeq "$(ARCH)" "unknown" -- ARCH = $(shell uname -m) --endif -+ARCH = $(shell uname -m) - - ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) - CPU_ARCH = x86 diff --git a/extra/truecrypt/truecrypt.desktop b/extra/truecrypt/truecrypt.desktop deleted file mode 100644 index 53626f29f..000000000 --- a/extra/truecrypt/truecrypt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=truecrypt -Icon=truecrypt -Comment=On-the-fly encryption -Terminal=false -Name=TrueCrypt -StartupNotify=true -Categories=System; diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index cef6f3c74..9dc4e570f 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ +# $Id: PKGBUILD 191375 2013-07-24 21:41:22Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=13.0.0 +pkgver=13.1.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') @@ -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=('5c66a4f231a5f3e17860a41498ac80e76a156dca') +sha1sums=('7f6e07b8098b248157ac26378fafa9e018f279a7') prepare() { cd "Twisted-$pkgver" diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 4b23230fe..e4fa0f68c 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184443 2013-05-06 19:40:02Z foutrelis $ +# $Id: PKGBUILD 191927 2013-08-01 07:00:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.4 -pkgrel=3 +pkgrel=4 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,7 +25,7 @@ md5sums=('b017647a0c159bbe43cdb81762d1c577' '9d9f62f05a967a5926df496e86404148') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" @@ -38,7 +38,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-ethernet \ @@ -50,7 +50,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 2a0673dad..2f6e1f820 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 184444 2013-05-06 19:40:04Z foutrelis $ +# $Id: PKGBUILD 191605 2013-07-27 08:12:19Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps - 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' + 'libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' # additional makedeps - 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy') + 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost>=1.54.0' 'python2-numpy') options=('!libtool') source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz) md5sums=('b6155afe1ea967917d2be16d98a85404') @@ -21,6 +21,7 @@ build() { cd "${srcdir}"/${pkgbase}-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DWITH_OPENEXR=true \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc make @@ -33,7 +34,7 @@ check() { package_vigra() { pkgdesc="Computer vision library" - depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') + depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 029ea78ef..d8ce95730 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185450 2013-05-14 10:15:54Z heftig $ +# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('eda05e6abfd3d575f8b954c1e442d28639ae13b67fc285ef585b8cd78da014e8') +sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6') build() { cd $pkgname-$pkgver diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 3636f2cc4..bdb3fba56 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $ +# $Id: PKGBUILD 191593 2013-07-26 10:24:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') -pkgver=6.1.6 -pkgrel=2 +pkgver=6.1.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz" - 'automake113.patch') -md5sums=('3991149c570f3738c3e819ce603e487f' - '570043e1b5f4acd9826732f002941c12') +source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('88885e84e8f7b61e59516f696b1d3be5') prepare() { cd ${pkgbase}-opensource-${pkgver} optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png - - patch -p1 -i "${srcdir}"/automake113.patch } build() { diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch deleted file mode 100644 index 5f84b49bc..000000000 --- a/extra/virtuoso/automake113.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ a/configure.in ---- b/configure.in -@@ -36,7 +36,7 @@ - AC_INIT([Virtuoso Open Source Edition], - AC_CONFIG_SRCDIR([libsrc/Dk.h]) - AC_CONFIG_AUX_DIR([binsrc/config]) - AC_CONFIG_MACRO_DIR([binsrc/config]) --AM_CONFIG_HEADER([libsrc/Dk/config.h]) -+AC_CONFIG_HEADER([libsrc/Dk/config.h]) - - dnl - dnl You may need to change the next macro for older versions of automake: diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 2fa15ab4c..b876df205 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $ +# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.7 -pkgrel=2 +pkgver=2.0.8.a +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' @@ -58,22 +58,29 @@ backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool' '!emptydirs') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('3b0e465b0990097b65abaf3e25589957') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz" + vlc-2.0.7-vaapi-compat.patch + vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) +md5sums=('e5000677181406d026ffe448633d1ca0' + '6df10774bb7acf20e09d6139e5c7839e' + 'e592efe7bb65291a84f99cfaa3a9f8a2') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd "${srcdir}/${pkgname}-${pkgver/.a}" + + patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp +} - [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" - - # fix for flac-1.3.0 - sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c - sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c +build() { + cd "${srcdir}/${pkgname}-${pkgver/.a}" + [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ + PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ @@ -98,12 +105,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.a}" make DESTDIR="${pkgdir}" install for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done } diff --git a/extra/vlc/vlc-2.0.7-vaapi-compat.patch b/extra/vlc/vlc-2.0.7-vaapi-compat.patch new file mode 100644 index 000000000..4fd29710b --- /dev/null +++ b/extra/vlc/vlc-2.0.7-vaapi-compat.patch @@ -0,0 +1,11 @@ +diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c +--- a/modules/codec/avcodec/vaapi.c 2013-01-22 09:51:40.000000000 +0000 ++++ b/modules/codec/avcodec/vaapi.c 2013-07-27 17:23:37.965202118 +0000 +@@ -47,6 +47,7 @@ + + #include <X11/Xlib.h> + #include <va/va_x11.h> ++#include <va/va_compat.h> + + typedef struct + { diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch new file mode 100644 index 000000000..3006cbc8d --- /dev/null +++ b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch @@ -0,0 +1,29 @@ +From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Thu, 25 Jul 2013 01:14:32 +0200 +Subject: [PATCH] Fix live555 breakage in last update + +--- + modules/demux/live555.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 9e02630..7a1ab16 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/live555.cpp +@@ -243,7 +243,11 @@ public: + char const* applicationName, portNumBits tunnelOverHTTPPortNum, + demux_sys_t *p_sys) : + RTSPClient( env, rtspURL, verbosityLevel, applicationName, +- tunnelOverHTTPPortNum ) ++ tunnelOverHTTPPortNum ++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800 ++ , -1 ++#endif ++ ) + { + this->p_sys = p_sys; + } +-- +1.8.3.4 + diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index dbe4ca569..36333f1a6 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $ +# $Id: PKGBUILD 190120 2013-07-15 21:53:45Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('d2dc9398a83692cafc16eba6e45f85d8') +md5sums=('48d375afb15f3e68a72cf7b4fd8f4a63') diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index bc3cf4a87..3d0632eda 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $ +# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" @@ -16,7 +16,7 @@ conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) -sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b') +sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f') prepare() { cd $pkgbase-$pkgver diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 20aae0027..6564b180f 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $ +# $Id: PKGBUILD 191778 2013-07-30 17:02:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.25 -pkgrel=2 +pkgver=5.0.26 +pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') url="http://www.linux.it/~md/software/" @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('8f873c1c51592ee419b2a46b0a3c8432') +md5sums=('236829eea77e85df2443a54815a1b41d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index e694e615c..401e7f352 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 184448 2013-05-06 19:40:10Z foutrelis $ +# $Id: PKGBUILD 191928 2013-08-01 07:00:01Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.4 -pkgrel=2 +pkgrel=3 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') -source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz + wmaker.desktop + wm-giflib.patch) md5sums=('640b8ea5b1a875440aa48eaab09c5f00' - '2fba97bebfd691836b92b8f0db79ff13') + '2fba97bebfd691836b92b8f0db79ff13' + '05d8e98fb579f2fa5a097b629374e6b8') +prepare() { + cd WindowMaker-$pkgver + patch -Np0 -i ../wm-giflib.patch + autoreconf -fi +} build() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ @@ -24,10 +32,10 @@ build() { } package() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop + make DESTDIR="$pkgdir" install + install -D -m644 COPYING.WTFPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL" + install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop" } diff --git a/extra/windowmaker/wm-giflib.patch b/extra/windowmaker/wm-giflib.patch new file mode 100644 index 000000000..4b6b69073 --- /dev/null +++ b/extra/windowmaker/wm-giflib.patch @@ -0,0 +1,2422 @@ +Index: WINGs/Examples/colorpick.c +=================================================================== +--- WINGs/Examples/colorpick.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/colorpick.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Examples/fontl.c +=================================================================== +--- WINGs/Examples/fontl.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/fontl.c 2013-01-18 16:57:47.955049409 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Examples/puzzle.c +=================================================================== +--- WINGs/Examples/puzzle.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/puzzle.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Extras/test.c +=================================================================== +--- WINGs/Extras/test.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/test.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Extras/wtabledelegates.c +=================================================================== +--- WINGs/Extras/wtabledelegates.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtabledelegates.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdint.h> + #include <WINGs/WINGsP.h> + +Index: WINGs/Extras/wtableview.c +=================================================================== +--- WINGs/Extras/wtableview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtableview.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <X11/cursorfont.h> + #include <stdint.h> +Index: WINGs/Tests/mywidget.c +=================================================================== +--- WINGs/Tests/mywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/mywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -13,6 +13,10 @@ + * + * + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + /* +Index: WINGs/Tests/testmywidget.c +=================================================================== +--- WINGs/Tests/testmywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/testmywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdlib.h> + +Index: WINGs/Tests/wmfile.c +=================================================================== +--- WINGs/Tests/wmfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmfile.c 2013-01-18 16:57:47.957049469 +0100 +@@ -11,6 +11,10 @@ + ----------------------------------------------------------------------- + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wmquery.c +=================================================================== +--- WINGs/Tests/wmquery.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmquery.c 2013-01-18 16:57:47.957049469 +0100 +@@ -3,6 +3,10 @@ + * Author: Len Trigg <trigg@cs.waikato.ac.nz> + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wtest.c +=================================================================== +--- WINGs/Tests/wtest.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wtest.c 2013-01-18 16:57:47.957049469 +0100 +@@ -2,6 +2,10 @@ + * WINGs test application + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <stdio.h> +Index: WINGs/array.c +=================================================================== +--- WINGs/array.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/array.c 2013-01-18 16:57:47.957049469 +0100 +@@ -8,6 +8,10 @@ + * proper credit is always appreciated :) + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/bagtree.c +=================================================================== +--- WINGs/bagtree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/bagtree.c 2013-01-18 16:57:47.957049469 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/configuration.c +=================================================================== +--- WINGs/configuration.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/configuration.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/data.c +=================================================================== +--- WINGs/data.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/data.c 2013-01-18 16:57:47.958049499 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include "WUtil.h" + +Index: WINGs/dragcommon.c +=================================================================== +--- WINGs/dragcommon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragcommon.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion +Index: WINGs/dragdestination.c +=================================================================== +--- WINGs/dragdestination.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragdestination.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <X11/Xatom.h> + +Index: WINGs/dragsource.c +=================================================================== +--- WINGs/dragsource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragsource.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/error.c +=================================================================== +--- WINGs/error.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/error.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdarg.h> +Index: WINGs/findfile.c +=================================================================== +--- WINGs/findfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/findfile.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WUtil.h" +Index: WINGs/handlers.c +=================================================================== +--- WINGs/handlers.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/handlers.c 2013-01-18 16:57:47.959049529 +0100 +@@ -3,6 +3,10 @@ + * WINGs internal handlers: timer, idle and input handlers + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/hashtable.c +=================================================================== +--- WINGs/hashtable.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/hashtable.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <string.h> + #include <stdlib.h> +Index: WINGs/memory.c +=================================================================== +--- WINGs/memory.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/memory.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WUtil.h" + +Index: WINGs/misc.c +=================================================================== +--- WINGs/misc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/misc.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,6 +1,10 @@ + + /* Miscelaneous helper functions */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + WMRange wmkrange(int start, int count) +Index: WINGs/notification.c +=================================================================== +--- WINGs/notification.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/notification.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <assert.h> + #include <stdio.h> +Index: WINGs/proplist.c +=================================================================== +--- WINGs/proplist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/proplist.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/selection.c +=================================================================== +--- WINGs/selection.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/selection.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include <X11/Xatom.h> +Index: WINGs/string.c +=================================================================== +--- WINGs/string.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/string.c 2013-01-18 16:57:47.961049589 +0100 +@@ -6,6 +6,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: WINGs/tree.c +=================================================================== +--- WINGs/tree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/tree.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + + #include "WUtil.h" +Index: WINGs/userdefaults.c +=================================================================== +--- WINGs/userdefaults.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/userdefaults.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + #include <strings.h> +Index: WINGs/usleep.c +=================================================================== +--- WINGs/usleep.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/usleep.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <errno.h> + #include <time.h> + +Index: WINGs/wapplication.c +=================================================================== +--- WINGs/wapplication.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wapplication.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + #include <X11/Xlocale.h> + +Index: WINGs/wappresource.c +=================================================================== +--- WINGs/wappresource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wappresource.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + + #include "WINGsP.h" +Index: WINGs/wballoon.c +=================================================================== +--- WINGs/wballoon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wballoon.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/wbox.c +=================================================================== +--- WINGs/wbox.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbox.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct { +Index: WINGs/wbrowser.c +=================================================================== +--- WINGs/wbrowser.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbrowser.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <math.h> /* for : double rint (double) */ + +Index: WINGs/wbutton.c +=================================================================== +--- WINGs/wbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbutton.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Button { +Index: WINGs/wcolor.c +=================================================================== +--- WINGs/wcolor.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolor.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include "wconfig.h" +Index: WINGs/wcolorpanel.c +=================================================================== +--- WINGs/wcolorpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorpanel.c 2013-01-18 16:57:47.963049651 +0100 +@@ -23,6 +23,10 @@ + * - Resizing + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + #include "rgb.h" +Index: WINGs/wcolorwell.c +=================================================================== +--- WINGs/wcolorwell.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorwell.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_COLOR_DATA_TYPE "application/X-color" +Index: WINGs/wevent.c +=================================================================== +--- WINGs/wevent.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wevent.c 2013-01-18 16:57:47.964049682 +0100 +@@ -3,6 +3,10 @@ + * This event handling stuff was inspired on Tk. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* table to map event types to event masks */ +Index: WINGs/wfilepanel.c +=================================================================== +--- WINGs/wfilepanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfilepanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/wfont.c +=================================================================== +--- WINGs/wfont.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfont.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include "wconfig.h" +Index: WINGs/wfontpanel.c +=================================================================== +--- WINGs/wfontpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfontpanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "WUtil.h" + #include "wconfig.h" +Index: WINGs/wframe.c +=================================================================== +--- WINGs/wframe.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wframe.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Frame { +Index: WINGs/widgets.c +=================================================================== +--- WINGs/widgets.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/widgets.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/winputmethod.c +=================================================================== +--- WINGs/winputmethod.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/winputmethod.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + + #include "WINGsP.h" +Index: WINGs/wlabel.c +=================================================================== +--- WINGs/wlabel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlabel.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Label { +Index: WINGs/wlist.c +=================================================================== +--- WINGs/wlist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlist.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + char *WMListDidScrollNotification = "WMListDidScrollNotification"; +Index: WINGs/wmenuitem.c +=================================================================== +--- WINGs/wmenuitem.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmenuitem.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_MenuItem { +Index: WINGs/wmisc.c +=================================================================== +--- WINGs/wmisc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmisc.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpanel.c +=================================================================== +--- WINGs/wpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpanel.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/keysym.h> +Index: WINGs/wpixmap.c +=================================================================== +--- WINGs/wpixmap.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpixmap.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpopupbutton.c +=================================================================== +--- WINGs/wpopupbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpopupbutton.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_PopUpButton { +Index: WINGs/wprogressindicator.c +=================================================================== +--- WINGs/wprogressindicator.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wprogressindicator.c 2013-01-18 16:57:47.967049773 +0100 +@@ -5,6 +5,10 @@ + * - centralized drawing into one pain function + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ProgressIndicator { +Index: WINGs/wruler.c +=================================================================== +--- WINGs/wruler.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wruler.c 2013-01-18 16:57:47.967049773 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wscroller.c +=================================================================== +--- WINGs/wscroller.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscroller.c 2013-01-18 16:57:47.967049773 +0100 +@@ -7,6 +7,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <math.h> +Index: WINGs/wscrollview.c +=================================================================== +--- WINGs/wscrollview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscrollview.c 2013-01-18 16:57:47.967049773 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ScrollView { +Index: WINGs/wslider.c +=================================================================== +--- WINGs/wslider.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wslider.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #undef STRICT_NEXT_BEHAVIOUR +Index: WINGs/wsplitview.c +=================================================================== +--- WINGs/wsplitview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wsplitview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* +Index: WINGs/wtabview.c +=================================================================== +--- WINGs/wtabview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtabview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_TabView { +Index: WINGs/wtext.c +=================================================================== +--- WINGs/wtext.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtext.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,6 +1,10 @@ + + /* WINGs WMText: multi-line/font/color/graphic text widget, by Nwanua. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <ctype.h> + #include <X11/keysym.h> +Index: WINGs/wtextfield.c +=================================================================== +--- WINGs/wtextfield.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WINGs/wtextfield.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wutil.c +=================================================================== +--- WINGs/wutil.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wutil.c 2013-01-18 16:57:47.969049831 +0100 +@@ -3,6 +3,10 @@ + * Handle events for non-GUI based applications + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + void WHandleEvents() +Index: WINGs/wview.c +=================================================================== +--- WINGs/wview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wview.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/Xresource.h> +Index: WINGs/wwindow.c +=================================================================== +--- WINGs/wwindow.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wwindow.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xmd.h> + + #include "WINGsP.h" +Index: WPrefs.app/Appearance.c +=================================================================== +--- WPrefs.app/Appearance.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Appearance.c 2013-01-18 16:57:47.970049862 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/Configurations.c +=================================================================== +--- WPrefs.app/Configurations.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Configurations.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Expert.c +=================================================================== +--- WPrefs.app/Expert.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Expert.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + /* This structure containts the list of all the check-buttons to display in the +Index: WPrefs.app/Focus.c +=================================================================== +--- WPrefs.app/Focus.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Focus.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/FontSimple.c +=================================================================== +--- WPrefs.app/FontSimple.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/FontSimple.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <fontconfig/fontconfig.h> +Index: WPrefs.app/Icons.c +=================================================================== +--- WPrefs.app/Icons.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Icons.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/KeyboardSettings.c +=================================================================== +--- WPrefs.app/KeyboardSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/KeyboardSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Menu.c +=================================================================== +--- WPrefs.app/Menu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Menu.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + #include <ctype.h> +Index: WPrefs.app/MenuPreferences.c +=================================================================== +--- WPrefs.app/MenuPreferences.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MenuPreferences.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/MouseSettings.c +=================================================================== +--- WPrefs.app/MouseSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MouseSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <X11/Xutil.h> +Index: WPrefs.app/Paths.c +=================================================================== +--- WPrefs.app/Paths.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Paths.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <assert.h> +Index: WPrefs.app/Preferences.c +=================================================================== +--- WPrefs.app/Preferences.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Preferences.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/TexturePanel.c +=================================================================== +--- WPrefs.app/TexturePanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/TexturePanel.c 2013-01-18 16:57:47.973049956 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: WPrefs.app/Themes.c +=================================================================== +--- WPrefs.app/Themes.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Themes.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/WPrefs.c +=================================================================== +--- WPrefs.app/WPrefs.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WPrefs.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + +Index: WPrefs.app/WindowHandling.c +=================================================================== +--- WPrefs.app/WindowHandling.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WindowHandling.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Workspace.c +=================================================================== +--- WPrefs.app/Workspace.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Workspace.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/double.c +=================================================================== +--- WPrefs.app/double.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/double.c 2013-01-18 16:57:47.974049987 +0100 +@@ -4,6 +4,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + #include "double.h" +Index: WPrefs.app/editmenu.c +=================================================================== +--- WPrefs.app/editmenu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/editmenu.c 2013-01-18 16:57:47.975050017 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <WINGs/WUtil.h> + #include <stdlib.h> +Index: WPrefs.app/main.c +=================================================================== +--- WPrefs.app/main.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/main.c 2013-01-18 16:57:47.975050017 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <assert.h> +Index: WPrefs.app/xmodifier.c +=================================================================== +--- WPrefs.app/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ WPrefs.app/xmodifier.c 2013-01-18 16:57:47.975050017 +0100 +@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include <strings.h> + #include <X11/Xlib.h> +Index: src/actions.c +=================================================================== +--- src/actions.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/actions.c 2013-01-18 16:57:47.975050017 +0100 +@@ -20,6 +20,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appicon.c +=================================================================== +--- src/appicon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/appicon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/application.c +=================================================================== +--- src/application.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/application.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appmenu.c +=================================================================== +--- src/appmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/appmenu.c 2013-01-18 16:57:47.976050047 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/balloon.c +=================================================================== +--- src/balloon.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/balloon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef BALLOON_TEXT +Index: src/client.c +=================================================================== +--- src/client.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/client.c 2013-01-18 16:57:47.977050077 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/colormap.c +=================================================================== +--- src/colormap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/colormap.c 2013-01-18 16:57:47.977050077 +0100 +@@ -23,6 +23,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WindowMaker.h" +Index: src/cycling.c +=================================================================== +--- src/cycling.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/cycling.c 2013-01-18 16:57:47.977050077 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/defaults.c +=================================================================== +--- src/defaults.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/defaults.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/dialog.c +=================================================================== +--- src/dialog.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dialog.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dock.c +=================================================================== +--- src/dock.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/dock.c 2013-01-18 16:57:47.979050138 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dockedapp.c +=================================================================== +--- src/dockedapp.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dockedapp.c 2013-01-18 16:57:47.979050138 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/event.c +=================================================================== +--- src/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/event.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/framewin.c +=================================================================== +--- src/framewin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/framewin.c 2013-01-18 16:57:47.980050168 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/geomview.c +=================================================================== +--- src/geomview.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/geomview.c 2013-01-18 16:57:47.980050168 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + typedef struct W_GeometryView { +Index: src/icon.c +=================================================================== +--- src/icon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/icon.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/main.c +=================================================================== +--- src/main.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/main.c 2013-01-18 16:57:47.981050198 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/menu.c +=================================================================== +--- src/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/menu.c 2013-01-18 16:57:47.981050198 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/misc.c +=================================================================== +--- src/misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/misc.c 2013-01-18 16:57:47.981050198 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/monitor.c +=================================================================== +--- src/monitor.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/monitor.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include <unistd.h> + #include <stdlib.h> +Index: src/motif.c +=================================================================== +--- src/motif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/motif.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef MWM_HINTS +Index: src/moveres.c +=================================================================== +--- src/moveres.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/moveres.c 2013-01-18 16:57:47.982050228 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/osdep_bsd.c +=================================================================== +--- src/osdep_bsd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_bsd.c 2013-01-18 16:57:47.983050258 +0100 +@@ -11,6 +11,10 @@ + #else /* OPENBSD || NETBSD */ + # include <sys/param.h> + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/sysctl.h> + + #include <assert.h> +Index: src/osdep_darwin.c +=================================================================== +--- src/osdep_darwin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_darwin.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/sysctl.h> + +Index: src/osdep_linux.c +=================================================================== +--- src/osdep_linux.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_linux.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: src/osdep_stub.c +=================================================================== +--- src/osdep_stub.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_stub.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/utsname.h> + + #include <WINGs/WUtil.h> +Index: src/pixmap.c +=================================================================== +--- src/pixmap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/pixmap.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/placement.c +=================================================================== +--- src/placement.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/placement.c 2013-01-18 16:57:47.983050258 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/properties.c +=================================================================== +--- src/properties.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/properties.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/resources.c +=================================================================== +--- src/resources.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/resources.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/rootmenu.c +=================================================================== +--- src/rootmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/rootmenu.c 2013-01-18 16:57:47.984050288 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/screen.c +=================================================================== +--- src/screen.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/screen.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/session.c +=================================================================== +--- src/session.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/session.c 2013-01-18 16:57:47.985050319 +0100 +@@ -57,6 +57,10 @@ + * if the Die message is received, exit. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/shutdown.c +=================================================================== +--- src/shutdown.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/shutdown.c 2013-01-18 16:57:47.985050319 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/stacking.c +=================================================================== +--- src/stacking.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/stacking.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/startup.c +=================================================================== +--- src/startup.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/startup.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/superfluous.c +=================================================================== +--- src/superfluous.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/superfluous.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/switchmenu.c +=================================================================== +--- src/switchmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/switchmenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/switchpanel.c +=================================================================== +--- src/switchpanel.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/switchpanel.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/texture.c +=================================================================== +--- src/texture.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/texture.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/usermenu.c +=================================================================== +--- src/usermenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/usermenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -56,6 +56,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef USER_MENU +Index: src/wcore.c +=================================================================== +--- src/wcore.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wcore.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wdefaults.c +=================================================================== +--- src/wdefaults.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wdefaults.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/window.c +=================================================================== +--- src/window.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/window.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/winmenu.c +=================================================================== +--- src/winmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/winmenu.c 2013-01-18 16:57:47.988050412 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/winspector.c +=================================================================== +--- src/winspector.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/winspector.c 2013-01-18 16:57:47.988050412 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wmspec.c +=================================================================== +--- src/wmspec.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/wmspec.c 2013-01-18 16:57:47.989050442 +0100 +@@ -28,6 +28,10 @@ + * return to be Success is not enough. -Dan + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/workspace.c +=================================================================== +--- src/workspace.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/workspace.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/xdnd.c +=================================================================== +--- src/xdnd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xdnd.c 2013-01-18 16:57:47.989050442 +0100 +@@ -1,5 +1,9 @@ + /* Many part of code are ripped of an example from JX's site */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef XDND +Index: src/xinerama.c +=================================================================== +--- src/xinerama.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xinerama.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "xinerama.h" +Index: src/xmodifier.c +=================================================================== +--- src/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xmodifier.c 2013-01-18 16:57:47.989050442 +0100 +@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: src/xutil.c +=================================================================== +--- src/xutil.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xutil.c 2013-01-18 16:57:47.990050472 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <X11/Xutil.h> +Index: test/notest.c +=================================================================== +--- test/notest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/notest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -3,6 +3,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> +Index: test/wtest.c +=================================================================== +--- test/wtest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/wtest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -8,6 +8,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <X11/Xlib.h> +Index: util/convertfonts.c +=================================================================== +--- util/convertfonts.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/convertfonts.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/fontconv.c +=================================================================== +--- util/fontconv.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/fontconv.c 2013-01-18 16:57:47.990050472 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: util/geticonset.c +=================================================================== +--- util/geticonset.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/geticonset.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/getstyle.c +=================================================================== +--- util/getstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/getstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/seticons.c +=================================================================== +--- util/seticons.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/seticons.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/setstyle.c +=================================================================== +--- util/setstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/setstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/wdread.c +=================================================================== +--- util/wdread.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdread.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + * WindowMaker defaults DB reader + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wdwrite.c +=================================================================== +--- util/wdwrite.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdwrite.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wmagnify.c +=================================================================== +--- util/wmagnify.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmagnify.c 2013-01-18 16:57:47.991050502 +0100 +@@ -6,6 +6,10 @@ + * This program is in the Public Domain. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xproto.h> + + #include <WINGs/WINGs.h> +Index: util/wmgenmenu.c +=================================================================== +--- util/wmgenmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmgenmenu.c 2013-01-18 16:57:47.992050532 +0100 +@@ -4,6 +4,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <ctype.h> + #include <getopt.h> + #include <limits.h> +Index: util/wmmenugen.c +=================================================================== +--- util/wmmenugen.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen.c 2013-01-18 16:57:47.992050532 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_misc.c +=================================================================== +--- util/wmmenugen_misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_misc.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <libgen.h> + #include <stdlib.h> + #include <string.h> +Index: util/wmmenugen_parse_wmconfig.c +=================================================================== +--- util/wmmenugen_parse_wmconfig.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_wmconfig.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_parse_xdg.c +=================================================================== +--- util/wmmenugen_parse_xdg.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_xdg.c 2013-01-18 16:57:47.992050532 +0100 +@@ -36,6 +36,10 @@ + * Basic validation of the .desktop file is done. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wxcopy.c +=================================================================== +--- util/wxcopy.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wxcopy.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/app.c +=================================================================== +--- wmlib/app.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/app.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/command.c +=================================================================== +--- wmlib/command.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/command.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + +Index: wmlib/event.c +=================================================================== +--- wmlib/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/event.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <X11/Xlib.h> +Index: wmlib/menu.c +=================================================================== +--- wmlib/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/menu.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +Index: wrlib/alpha_combine.c +=================================================================== +--- wrlib/alpha_combine.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/alpha_combine.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wraster.h" + + void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +Index: wrlib/tests/testdraw.c +=================================================================== +--- wrlib/tests/testdraw.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testdraw.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testgrad.c +=================================================================== +--- wrlib/tests/testgrad.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testgrad.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testrot.c +=================================================================== +--- wrlib/tests/testrot.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testrot.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: wrlib/tests/view.c +=================================================================== +--- wrlib/tests/view.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/view.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-01-09 22:42:49.000000000 +0100 ++++ configure.ac 2013-01-18 16:57:47.994050592 +0100 +@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by + + dnl Checks for programs. + dnl =================== +-AC_ISC_POSIX +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_LN_S + AC_PROG_GCC_TRADITIONAL + AC_PROG_LIBTOOL +Index: wrlib/gif.c +=================================================================== +--- wrlib/gif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/gif.c 2013-01-18 16:57:47.994050592 +0100 +@@ -50,17 +50,24 @@ RImage *RLoadGIF(char *file, int index) + unsigned char rmap[256]; + unsigned char gmap[256]; + unsigned char bmap[256]; ++ int dgiferr; + + if (index < 0) + index = 0; + + /* default error message */ + RErrorCode = RERR_BADINDEX; +- ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileName(file, &dgiferr); ++#else + gif = DGifOpenFileName(file); +- ++#endif + if (!gif) { ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (dgiferr) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; +@@ -197,7 +204,11 @@ RImage *RLoadGIF(char *file, int index) + /* yuck! */ + goto did_not_get_any_errors; + giferr: ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (gif->Error) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch deleted file mode 100644 index 0b8b91363..000000000 --- a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200 -+++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200 -@@ -5,8 +5,21 @@ - - =head1 SYNOPSIS - --B<asn2deb> [-aI<ASN.1file>] [--asn=I<ASN.1file>] [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>] --[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] -+B<asn2deb> -+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]> -+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]> -+S<[ B<-d> E<lt>optsE<gt> ]> -+S<[ B<--dbopts>=E<lt>optsE<gt> ]> -+S<[ B<-e> E<lt>addressE<gt> ]> -+S<[ B<--email>=E<lt>addressE<gt> ]> -+S<[ B<-h> ]> -+S<[ B<--help> ]> -+S<[ B<-n> E<lt>nameE<gt> ]> -+S<[ B<--name>=E<lt>nameE<gt> ]> -+S<[ B<-p> ]> -+S<[ B<--preserve> ]> -+S< [B<-v> ]> -+S<[ B<--version> ]> - - =head1 DESCRIPTION - -@@ -19,31 +32,31 @@ - - =over 4 - --=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file> -+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt> - - ASN.1 file to use (mandatory). - --=item B<-d >I<opts> B<--dbopts=>I<opts> -+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> - - options for dpkg-buildpackage. - --=item B<-e >I<address> B<--email=>I<address> -+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> - - use e-mail address. - --=item B<-h> B<--help> -+=item -h --help - - print help and exit. - --=item B<-n >I<name> B<--name=>I<name> -+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> - - use user name. - --=item B<-p> B<--preserve> -+=item -p --preserve - - do not overwrite files. - --=item B<-v> B<--version> -+=item -v --version - - print version and exit. - -@@ -68,8 +81,8 @@ - - =head1 AUTHOR - --B<W. Borgert> Author. -+B<W. Borgert> Author. - - =head1 COPYRIGHT - --Copyright (C) 2003, 2005 W. Borger -\ No newline at end of file -+Copyright (C) 2003, 2005 W. Borger diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch new file mode 100644 index 000000000..f75f4c0bf --- /dev/null +++ b/extra/wireshark/01_fix_pod_file.patch @@ -0,0 +1,11 @@ +--- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435 ++++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436 +@@ -40,6 +40,8 @@ + When the B<-n> option is used, B<reordercap> will not write out the output + file if it finds that the input file is already in order. + ++=back ++ + =head1 SEE ALSO + + pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch deleted file mode 100644 index bc4000b8f..000000000 --- a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200 -+++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200 -@@ -5,9 +5,21 @@ - - =head1 SYNOPSIS - --B<idl2deb> [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>] [B<--email=>I<address>] [-iI<idlfile>] --[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] -- -+B<idl2deb> -+S< [ B<-d> E<lt>optsE<gt> ]> -+S< [ B<--dbopts>=E<lt>optsE<gt> ]> -+S< [ B<-e> E<lt>addressE<gt> ]> -+S< [ B<--email>=E<lt>addressE<gt> ]> -+S< [ B<-h> ]> -+S< [ B<--help> ]> -+S< [ B<-i> E<lt>idlfileE<gt> ]> -+S< [ B<--idl>=E<lt>idlfileE<gt> ]> -+S< [ B<-n> E<lt>nameE<gt> ]> -+S< [ B<--name>=E<lt>nameE<gt> ]> -+S< [ B<-p> ]> -+S< [ B<--preserve> ]> -+S< [ B<-v> ]> -+S< [ B<--version> ]> - - =head1 DESCRIPTION - -@@ -19,31 +31,31 @@ - - =over 4 - --=item B<-d>I<opts> B<--dbopts=>I<opts> -+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> - - options for dpkg-buildpackage. - --=item B<-e >I<address> B<--email=>I<address> -+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> - - use e-mail address. - --=item B<-i >I<idlfile> B<--idl=>I<idlfile> -+=item -h --help - --IDL file to use (mandatory) -+print help and exit. - --=item B<-h> B<--help> -+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt> - --print help and exit. -+IDL file to use (mandatory) - --=item B<-n >I<name> B<--name=>I<name> -+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> - - use user name. - --=item B<-p> B<--preserve> -+=item -p --preserve - - do not overwrite files. - --=item B<-v> B<--version> -+=item -v --version - - print version and exit. - -@@ -67,7 +79,7 @@ - - =head1 AUTHOR - --B<W. Borgert> Author. -+B<W. Borgert> Author. - - =head1 COPYRIGHT - diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch deleted file mode 100644 index ace641100..000000000 --- a/extra/wireshark/03_force_utf8_for_pod2man.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- doc/Makefile.am (revision 49837) -+++ doc/Makefile.am (working copy) -@@ -123,6 +123,7 @@ - $(AM_V_POD2MAN)$(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ -+ --utf8 \ - $< > $@ - - .pod.html: ../config.h $(top_srcdir)/docbook/ws.css ---- doc/wireshark.pod.template (revision 49837) -+++ doc/wireshark.pod.template (working copy) -@@ -1,4 +1,9 @@ -+=begin man -+ -+=encoding utf8 -+ -+=end man - - =head1 NAME - - wireshark - Interactively dump and analyze network traffic diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index be063f430..7492f64d4 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $ +# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.0 -pkgrel=3 +pkgver=1.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -12,24 +12,14 @@ makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_fix_encoding_asn2deb_pod.patch - 02_fix_encoding_idl2deb_pod.patch - 03_force_utf8_for_pod2man.patch) -sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add' - '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d' - 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27' - '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf') + 01_fix_pod_file.patch) +sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc' + '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774 - for p in 01_fix_encoding_asn2deb_pod.patch \ - 02_fix_encoding_idl2deb_pod.patch \ - 03_force_utf8_for_pod2man.patch; - do - patch -p0 <${srcdir}/${p} - done + patch -p1 <${srcdir}/01_fix_pod_file.patch ./autogen.sh ./configure \ diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 499536e98..0e3a76672 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=12.09.0 -pkgrel=1.1 +pkgver=13.04.1 +pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64' 'mips64el') url="http://wxmaxima.sourceforge.net/" @@ -13,7 +13,7 @@ license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install -sha1sums=('9b56f674392eabb75183b228757df8834b45b2a6') +sha1sums=('c1d8be28f92820d0e447d186271a48a72545c887') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index d353a86a8..eb9471cdf 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 168731 2012-10-15 02:00:18Z bisson $ +# $Id: PKGBUILD 191363 2013-07-24 02:13:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=3 +pkgrel=4 pkgdesc='VNC server for real X displays' url='http://www.karlrunge.com/x11vnc/' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') -backup=('etc/conf.d/x11vnc') +depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'conf.d' - 'rc.d') + 'service') sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' - '53e1ed7f84518a699a29607a03bee2321f9f9624' - '11011cce06511e9ba61672a1c80bb63a3a187539' - '477892cf0f0020043444b7493c80684762ded506') + '53e1ed7f84518a699a29607a03bee2321f9f9624') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,8 +25,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver } diff --git a/extra/x11vnc/conf.d b/extra/x11vnc/conf.d deleted file mode 100644 index 8a81e3286..000000000 --- a/extra/x11vnc/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to x11vnc -# - -X11VNC_ARGS="" diff --git a/extra/x11vnc/rc.d b/extra/x11vnc/rc.d deleted file mode 100644 index b5f2a6464..000000000 --- a/extra/x11vnc/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/x11vnc - -PID=$(pidof -o %PPID /usr/bin/x11vnc) -case "$1" in - start) - stat_busy "Starting x11vnc" - [[ -z "$PID" ]] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null & - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon x11vnc - stat_done - fi - ;; - stop) - stat_busy "Stopping x11vnc" - [[ ! -z "$PID" ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon x11vnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 0effd2cac..4a06db7df 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,37 +1,41 @@ -# $Id: PKGBUILD 178144 2013-02-16 22:49:02Z ioni $ +# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20130206 -pkgrel=1 +pkgver=20130702 +pkgrel=2 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') makedepends=('yasm' 'git') -source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('f952248492745a077ad6a77465276166') +source=(git://git.videolan.org/x264.git#commit=585324fee3) +md5sums=('SKIP') -build() { - cd $pkgname - - [ "$CARCH" = "mips64el" ] && extra="--enable-pic" +pkgver() { + cd $pkgname + git log -1 --format="%cd" --date=short | sed 's|-||g' +} - ./configure --enable-shared $extra +build() { + cd $pkgname - make + ./configure --enable-shared \ + --enable-pic + make } + package() { - cd $pkgname + cd $pkgname - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install } # vim:set ts=2 sw=2 et: diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 34c426773..dba40a0bf 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188846 2013-06-22 19:39:32Z andyrtr $ +# $Id: PKGBUILD 191716 2013-07-29 13:47:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,7 +7,7 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.1.3 +pkgver=4.0.1.6 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('494b2d0435f7a11bc68a5d1d2a8a5f33' +md5sums=('61f2248fb16bc035f92b9588ab19c35e' 'f76081c01e40b6206895d194dc949707') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 013ddac45..eeb25cf03 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189300 2013-07-02 19:56:50Z lcarlier $ +# $Id: PKGBUILD 191785 2013-07-30 19:12:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.11 +pkgver=2.21.13 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22') +sha256sums=('76e17cebf79d3c3c98af246fcfb55018aa12e2d56fe5f3b6d54b93e90837efa8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index c3a3570fb..558680093 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $ +# $Id: PKGBUILD 191802 2013-07-30 21:14:54Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.8 +pkgver=1.0.9 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=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617') +sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482') build() { cd $pkgname-$pkgver diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 2553045d2..882e858d0 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $ +# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 pkgver=6.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,17 +14,23 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('r128-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + no-mibstore.patch) +sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c' + '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../no-mibstore.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch new file mode 100644 index 000000000..b6f18031e --- /dev/null +++ b/extra/xf86-video-r128/no-mibstore.patch @@ -0,0 +1,24 @@ +From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001 +From: Connor Behan <connor.behan@gmail.com> +Date: Wed, 19 Dec 2012 18:41:14 +0000 +Subject: Remove call to obsolete miInitializeBackingStore() + +Definition was deleted from Xorg during 1.14 merge window, but has been +a no-op since 1.10 merge window. + +Signed-off-by: Connor Behan <connor.behan@gmail.com> +--- +diff --git a/src/r128_driver.c b/src/r128_driver.c +index a062a60..f47c7e3 100644 +--- a/src/r128_driver.c ++++ b/src/r128_driver.c +@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL) + R128DGAInit(pScreen); + + /* Backing store setup */ +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Set Silken Mouse */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 46c21bb73..7f0efbbb5 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ +# $Id: PKGBUILD 191912 2013-08-01 06:53:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 5aa39e9c4..4860a675c 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ +# $Id: PKGBUILD 191580 2013-07-25 21:13:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.5 -pkgrel=1.1 +pkgver=1.0.6 +pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') +sha256sums=('bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4') build() { cd "${srcdir}/iceauth-${pkgver}" diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD index ebe951978..964796cf6 100644 --- a/extra/xorg-mkfontscale/PKGBUILD +++ b/extra/xorg-mkfontscale/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149834 2012-02-11 10:04:54Z andyrtr $ +# $Id: PKGBUILD 190802 2013-07-17 06:37:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-mkfontscale -pkgver=1.1.0 -pkgrel=1.2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Create an index of scalable font files for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) -sha1sums=('ba021369ae3b364ba083b9eb5e570e54b21fd583') +sha1sums=('ad1887ca253b9234ab6a6989de53d3127e302c6c') build() { cd "${srcdir}/mkfontscale-${pkgver}" diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD index 5ca23dfab..cd09847f6 100644 --- a/extra/xorg-xconsole/PKGBUILD +++ b/extra/xorg-xconsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175083 2013-01-13 09:45:06Z andyrtr $ +# $Id: PKGBUILD 191215 2013-07-21 06:57:40Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xconsole -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Monitor system console messages with X" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xconsole-${pkgver}.tar.bz2) -sha256sums=('195fad7a1ca274835fc346c82acce90a0c2e9f288e85bd1a3c256dbc1c8c11e5') +sha256sums=('e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1') build() { cd "${srcdir}/xconsole-${pkgver}" diff --git a/extra/xorg-xfd/PKGBUILD b/extra/xorg-xfd/PKGBUILD index ab5daa42e..6892d54de 100644 --- a/extra/xorg-xfd/PKGBUILD +++ b/extra/xorg-xfd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150433 2012-02-17 16:53:03Z andyrtr $ +# $Id: PKGBUILD 190804 2013-07-17 06:52:57Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xfd -pkgver=1.1.1 -pkgrel=1.1 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Displays all the characters in a font using either the X11 core protocol or libXft2" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'fontconfig' 'libxft' 'libxrender' 'libxmu') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xfd-${pkgver}.tar.bz2) -sha256sums=('3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73') +sha256sums=('c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759') build() { cd "${srcdir}/xfd-${pkgver}" diff --git a/extra/xorg-xhost/PKGBUILD b/extra/xorg-xhost/PKGBUILD index a7ea1e8bf..0b546f80e 100644 --- a/extra/xorg-xhost/PKGBUILD +++ b/extra/xorg-xhost/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154154 2012-03-23 19:23:30Z andyrtr $ +# $Id: PKGBUILD 190806 2013-07-17 06:56:33Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xhost -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Server access control program for X" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libx11' 'libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xhost-${pkgver}.tar.bz2) -sha1sums=('c9ad0447c709fc7a9a2afbbca712cf47fbb29757') +sha1sums=('6224c8bcd909bf205c7e92dbdc349356890c4428') build() { cd "${srcdir}/xhost-${pkgver}" diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD index 1ca040ad8..43fe711f3 100644 --- a/extra/xorg-xrandr/PKGBUILD +++ b/extra/xorg-xrandr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178018 2013-02-13 16:44:53Z andyrtr $ +# $Id: PKGBUILD 190808 2013-07-17 07:01:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrandr -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Primitive command line interface to RandR extension" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('libxrandr' 'libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) -sha256sums=('a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693') +sha256sums=('67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50') build() { cd "${srcdir}/xrandr-${pkgver}" diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD index 0fa260fa5..d1b42a8e8 100644 --- a/extra/zeitgeist/PKGBUILD +++ b/extra/zeitgeist/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 183481 2013-04-21 22:21:01Z heftig $ +# $Id: PKGBUILD 191639 2013-07-28 19:42:13Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=zeitgeist -pkgver=0.9.12 +pkgver=0.9.14 pkgrel=1 pkgdesc="Service logging user activities and events" arch=(i686 x86_64 mips64el) url="http://zeitgeist-project.com/" license=(GPL2 LGPL2.1) -depends=(sqlite json-glib telepathy-glib gtk3) +depends=(json-glib telepathy-glib gtk3) makedepends=(intltool gobject-introspection vala raptor python2-rdflib) provides=(zeitgeist-datahub) conflicts=(zeitgeist-datahub) replaces=(zeitgeist-datahub) options=('!libtool') source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz") -sha256sums=('f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd') +sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061') prepare() { cd $pkgname-$pkgver @@ -41,6 +41,5 @@ check() { package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install #zeitgeistdocdir=/usr/share/doc/zeitgeist install - #install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon" + make DESTDIR="$pkgdir" install } diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index c3d69e79f..badb6d2c6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.9 -pkgver=${_basekernel}.9 +_basekernel=3.10 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -21,9 +21,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'e143fc381f4d2fdfc18686b867a5e6a5' - '8df88bbf19a8fdc4e4eb5f173c8d3e6c' +md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' + '4741e325185acae5498cfc77a5e8f55b' + 'ead29a0206b79cc56ab97930e5d517ae' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -38,7 +38,7 @@ prepare() { patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) @@ -290,7 +290,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 1894c1983..ea4a90c1f 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.7-1 Kernel Configuration +# Linux/x86 3.10.0-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -17,12 +17,10 @@ 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_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 @@ -98,6 +96,9 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -126,6 +127,9 @@ CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +# CONFIG_RCU_NOCB_CPU_ZERO is not set +# CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -172,19 +176,19 @@ 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_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +# CONFIG_EXPERT is not set 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 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 @@ -193,6 +197,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -202,7 +207,6 @@ CONFIG_HAVE_PERF_EVENTS=y 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 @@ -331,16 +335,16 @@ CONFIG_X86_MPPARSE=y 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_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_XEN is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_M486 is not set @@ -407,12 +411,9 @@ CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_MICROCODE_INTEL_LIB=y -CONFIG_MICROCODE_INTEL_EARLY=y -CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -588,6 +589,7 @@ CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=m @@ -684,8 +686,6 @@ CONFIG_HOTPLUG_PCI=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 @@ -696,6 +696,7 @@ 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_ENUM_BASIC=m CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_CPS_XX=y CONFIG_RAPIDIO_TSI568=y @@ -708,6 +709,7 @@ CONFIG_RAPIDIO_TSI500=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y @@ -743,6 +745,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m # CONFIG_NET_IPGRE_BROADCAST is not set CONFIG_IP_MROUTE=y @@ -1139,7 +1142,6 @@ 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_PHONET=m @@ -1208,10 +1210,13 @@ CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1391,15 +1396,17 @@ 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_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m # # Device Drivers @@ -1446,7 +1453,6 @@ 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 @@ -1528,9 +1534,6 @@ 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 @@ -1539,7 +1542,6 @@ CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m # 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 @@ -1640,6 +1642,7 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1670,6 +1673,7 @@ CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1697,7 +1701,7 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1795,6 +1799,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1985,6 +1990,10 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -2055,6 +2064,7 @@ CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m @@ -2111,6 +2121,10 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m # # Distributed Switch Architecture drivers @@ -2145,6 +2159,7 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_ALX=m CONFIG_NET_CADENCE=y CONFIG_ARM_AT91_ETHER=m CONFIG_MACB=m @@ -2259,6 +2274,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2293,8 +2309,6 @@ CONFIG_STMMAC_ETH=m 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 @@ -2372,6 +2386,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX88179_178A=m @@ -2450,6 +2465,7 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y @@ -2484,7 +2500,6 @@ 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_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set @@ -2494,20 +2509,12 @@ CONFIG_HOSTAP_FIRMWARE=y 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_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y # # Debugging Options @@ -2560,6 +2567,7 @@ CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_MMIO=m @@ -2576,6 +2584,7 @@ CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8188EE=m CONFIG_RTL8192CU=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y @@ -2960,6 +2969,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m +# CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -2977,6 +2987,7 @@ CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_ARC_PS2=m +CONFIG_SERIO_APBPS2=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -3188,6 +3199,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set @@ -3202,6 +3214,11 @@ CONFIG_SPI_MASTER=y # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set + +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set # CONFIG_HSI is not set # @@ -3246,6 +3263,7 @@ CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_LYNXPOINT is not set +# CONFIG_GPIO_GRGPIO is not set # # I2C GPIO expanders: @@ -3333,6 +3351,8 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m @@ -3379,6 +3399,7 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m # CONFIG_SENSORS_MAX1111 is not set @@ -3391,6 +3412,7 @@ CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m @@ -3564,47 +3586,50 @@ CONFIG_BCMA_DRIVER_GPIO=y # Multifunction device drivers # CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m +CONFIG_ABX500_CORE=y +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set CONFIG_MFD_TI_AM335X_TSCADC=m -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_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_VX855=m CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m # CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -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_MFD_SYSCON is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3632,6 +3657,7 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -3790,7 +3816,6 @@ 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 @@ -3936,16 +3961,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3959,9 +3987,11 @@ CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m # # RDS decoders @@ -3978,6 +4008,9 @@ CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_VPX3220=m # @@ -3997,6 +4030,7 @@ CONFIG_VIDEO_ADV7175=m # # Camera sensor devices # +CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_MT9V011=m # @@ -4017,7 +4051,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4047,6 +4080,8 @@ CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m # # Multistandard (satellite) frontends @@ -4228,10 +4263,9 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_OF_DISPLAY_TIMING is not set -# CONFIG_OF_VIDEOMODE is not set CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y @@ -4246,7 +4280,6 @@ 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 @@ -4291,7 +4324,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set @@ -4307,12 +4340,15 @@ CONFIG_FB_VIRTUAL=m # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI922X is not set # CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set @@ -4582,6 +4618,7 @@ CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4677,10 +4714,9 @@ CONFIG_USB=m # # Miscellaneous USB options # +CONFIG_USB_DEFAULT_PERSIST=y 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 @@ -4696,6 +4732,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4703,7 +4740,6 @@ 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 @@ -4720,10 +4756,10 @@ CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m # @@ -4763,6 +4799,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set # # USB port drivers @@ -4834,6 +4874,7 @@ CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m @@ -4865,19 +4906,21 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +# CONFIG_OMAP_CONTROL_USB is not set +# CONFIG_OMAP_USB3 is not set +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4891,7 +4934,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_FUSB300=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m @@ -4904,6 +4949,8 @@ CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4930,13 +4977,6 @@ 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 @@ -5003,6 +5043,7 @@ CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m @@ -5017,11 +5058,11 @@ CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m @@ -5034,6 +5075,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # iptables trigger is under Netfilter config (LED target) # CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -5155,6 +5197,7 @@ CONFIG_DW_DMAC=m CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y CONFIG_DMA_OF=y # @@ -5183,6 +5226,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y # @@ -5260,6 +5304,7 @@ CONFIG_COMEDI_NI_AT_A2150=m CONFIG_COMEDI_NI_AT_AO=m CONFIG_COMEDI_NI_ATMIO=m CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_NI_LABPC_ISA=m CONFIG_COMEDI_PCMAD=m CONFIG_COMEDI_PCMDA12=m CONFIG_COMEDI_PCMMIO=m @@ -5287,6 +5332,7 @@ CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m CONFIG_COMEDI_ADV_PCI1710=m CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m CONFIG_COMEDI_AMPLC_DIO200_PCI=m CONFIG_COMEDI_AMPLC_PC236_PCI=m @@ -5315,7 +5361,7 @@ 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_LABPC_PCI=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m @@ -5342,8 +5388,8 @@ 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_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m @@ -5366,9 +5412,9 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5410,14 +5456,8 @@ CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=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 @@ -5449,7 +5489,9 @@ CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y +CONFIG_ZCACHE=m +# CONFIG_ZCACHE_DEBUG is not set +# CONFIG_USB_DWC2 is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5499,6 +5541,7 @@ CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m CONFIG_APPLE_GMUX=m +CONFIG_PVPANIC=m # # Hardware Spinlock drivers @@ -5525,7 +5568,6 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -5541,6 +5583,7 @@ CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -5548,9 +5591,6 @@ CONFIG_SERIAL_IPOCTAL=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -5560,6 +5600,13 @@ CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y + +# # File systems # CONFIG_DCACHE_WORD_ACCESS=y @@ -5588,6 +5635,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_DLM=y @@ -5600,6 +5648,8 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5726,6 +5776,7 @@ CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5928,6 +5979,8 @@ CONFIG_LKDTM=m # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -5957,6 +6010,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5973,6 +6027,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -5985,6 +6040,7 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y @@ -5997,6 +6053,7 @@ CONFIG_DEBUG_RODATA=y # 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 @@ -6012,7 +6069,6 @@ 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 # @@ -6051,8 +6107,6 @@ 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 # @@ -6105,6 +6159,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -6184,6 +6239,7 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y @@ -6195,8 +6251,7 @@ 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_KVM_DEVICE_ASSIGNMENT=y CONFIG_LGUEST=m CONFIG_BINARY_PRINTF=y diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index f7b3cf6f4..5f2b0d2c1 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -4,13 +4,13 @@ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 _releasever=13 -_rtpatchver=rt13 +_rtpatchver=rt14 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 @@ -34,9 +34,9 @@ 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=('5c7787be882c343e41fb49136ff60aec' '2242024493dcb72a8777e11198f5e743' - '977361725db4bbd680797a794d7aa398' - '293b9b28b2c5c8f52e374b50dc5437ac' - '4986bd75ff1b6a69606b4ffd235af192' + 'cdd69c475b036523e6225774e500192e' + '3c07a864994cf367aa863f26feca6609' + '226f8caf681661cff8055eff384060a7' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -44,7 +44,7 @@ md5sums=('5c7787be882c343e41fb49136ff60aec' 'f3def2cefdcbb954c21d8505d23cc83c' '0bb62b946f06edc2f5b0249b7fc773e4') if [ "$CARCH" != "mips64el" ]; then - # Don't use the Loongson-specific patches on non-mips64el arches. + # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi @@ -62,7 +62,7 @@ prepare() { # add realtime patch patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch" - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) @@ -78,10 +78,10 @@ prepare() { patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i lxo-config.patch -# ensure N32, add localversion, remove uevent helper as per -# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) + # ensure N32, add localversion, remove uevent helper as per + # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + # and make USB storage support builtin (e.g. for booting from USB + # disks without slowly loading an initramfs) sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ @@ -204,7 +204,7 @@ _package() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" -# mkinitcpio 0.7 relies on bzImage to find the kernel version + # mkinitcpio 0.7 relies on bzImage to find the kernel version if [ "$CARCH" == "mips64el" ]; then sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" @@ -238,7 +238,7 @@ _package-headers() { KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips -# In case of repackaging this is empty + # in case of repackaging this is empty if [ -z "${_kernver}" ]; then cd "${srcdir}/linux-${_basekernel}" _kernver="$(make LOCALVERSION= kernelrelease)" diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 3286e32e9..2d191dbbe 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -399,8 +399,8 @@ CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -2466,17 +2466,8 @@ CONFIG_HOSTAP_FIRMWARE=y 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_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m @@ -4177,7 +4168,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -4238,7 +4229,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index af01ee790..40ef0a87d 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -386,8 +386,8 @@ CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_THERMAL_VECTOR=y CONFIG_I8K=m CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -2357,17 +2357,8 @@ CONFIG_HOSTAP_FIRMWARE=y 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_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m @@ -4016,7 +4007,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -4074,7 +4065,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 0769fd17e..5583ffba0 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.9 -pkgver=${_basekernel}.9 +_basekernel=3.10 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -21,9 +21,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'e143fc381f4d2fdfc18686b867a5e6a5' - '4d358ed3083b766cdc507a06a3a544ca' +md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' + '4741e325185acae5498cfc77a5e8f55b' + 'e2cb9d4092685c2a4216de9bbe8b72f1' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -38,7 +38,7 @@ prepare() { patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) @@ -290,7 +290,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 37b2b4a47..0c5724fc9 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.7-1 Kernel Configuration +# Linux/x86 3.10.0-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -17,12 +17,10 @@ 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_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 @@ -98,6 +96,9 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -126,6 +127,9 @@ CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +# CONFIG_RCU_NOCB_CPU_ZERO is not set +# CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -172,19 +176,19 @@ 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_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +# CONFIG_EXPERT is not set 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 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 @@ -193,6 +197,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -202,7 +207,6 @@ CONFIG_HAVE_PERF_EVENTS=y 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 @@ -331,8 +335,10 @@ CONFIG_X86_MPPARSE=y 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_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PRIVILEGED_GUEST=y @@ -342,10 +348,8 @@ CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_M486 is not set @@ -593,6 +597,7 @@ CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=m @@ -691,8 +696,6 @@ CONFIG_HOTPLUG_PCI=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 @@ -703,6 +706,7 @@ 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_ENUM_BASIC=m CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_CPS_XX=y CONFIG_RAPIDIO_TSI568=y @@ -715,6 +719,7 @@ CONFIG_RAPIDIO_TSI500=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y @@ -750,6 +755,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m # CONFIG_NET_IPGRE_BROADCAST is not set CONFIG_IP_MROUTE=y @@ -1146,7 +1152,6 @@ 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_PHONET=m @@ -1215,10 +1220,13 @@ CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1398,15 +1406,17 @@ 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_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m # # Device Drivers @@ -1453,7 +1463,6 @@ 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 @@ -1535,9 +1544,6 @@ 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 @@ -1546,7 +1552,6 @@ CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m # 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 @@ -1649,6 +1654,7 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1679,6 +1685,7 @@ CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1706,7 +1713,7 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1804,6 +1811,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1994,6 +2002,10 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -2063,6 +2075,7 @@ CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m @@ -2119,6 +2132,10 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m # # Distributed Switch Architecture drivers @@ -2153,6 +2170,7 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_ALX=m CONFIG_NET_CADENCE=y CONFIG_ARM_AT91_ETHER=m CONFIG_MACB=m @@ -2267,6 +2285,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2301,8 +2320,6 @@ CONFIG_STMMAC_ETH=m 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 @@ -2380,6 +2397,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX88179_178A=m @@ -2458,6 +2476,7 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y @@ -2492,7 +2511,6 @@ 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_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set @@ -2516,6 +2534,7 @@ CONFIG_LIBIPW=m CONFIG_IWLWIFI=m CONFIG_IWLDVM=m CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y # # Debugging Options @@ -2568,6 +2587,7 @@ CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_MMIO=m @@ -2584,6 +2604,7 @@ CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8188EE=m CONFIG_RTL8192CU=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y @@ -2970,6 +2991,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m +# CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m @@ -2988,6 +3010,7 @@ CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_ARC_PS2=m +CONFIG_SERIO_APBPS2=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -3201,6 +3224,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set @@ -3215,6 +3239,11 @@ CONFIG_SPI_MASTER=y # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set + +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set # CONFIG_HSI is not set # @@ -3259,6 +3288,7 @@ CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_LYNXPOINT is not set +# CONFIG_GPIO_GRGPIO is not set # # I2C GPIO expanders: @@ -3346,6 +3376,8 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m @@ -3392,6 +3424,7 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m # CONFIG_SENSORS_MAX1111 is not set @@ -3404,7 +3437,7 @@ CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -3578,47 +3611,50 @@ CONFIG_BCMA_DRIVER_GPIO=y # Multifunction device drivers # CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m +CONFIG_ABX500_CORE=y +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set CONFIG_MFD_TI_AM335X_TSCADC=m -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_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_VX855=m CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m # CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -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_MFD_SYSCON is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3646,6 +3682,7 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -3804,7 +3841,6 @@ 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 @@ -3950,16 +3986,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3973,9 +4012,11 @@ CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m # # RDS decoders @@ -3992,6 +4033,9 @@ CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_VPX3220=m # @@ -4011,6 +4055,7 @@ CONFIG_VIDEO_ADV7175=m # # Camera sensor devices # +CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_MT9V011=m # @@ -4031,7 +4076,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4061,6 +4105,8 @@ CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m # # Multistandard (satellite) frontends @@ -4242,10 +4288,9 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_OF_DISPLAY_TIMING is not set -# CONFIG_OF_VIDEOMODE is not set CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y @@ -4260,7 +4305,6 @@ 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 @@ -4322,12 +4366,15 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI922X is not set # CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set @@ -4597,6 +4644,7 @@ CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4692,10 +4740,9 @@ CONFIG_USB=m # # Miscellaneous USB options # +CONFIG_USB_DEFAULT_PERSIST=y 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 @@ -4711,6 +4758,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4718,7 +4766,6 @@ 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 @@ -4735,10 +4782,10 @@ CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m # @@ -4778,6 +4825,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set # # USB port drivers @@ -4849,6 +4900,7 @@ CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m @@ -4880,19 +4932,21 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +# CONFIG_OMAP_CONTROL_USB is not set +# CONFIG_OMAP_USB3 is not set +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4906,7 +4960,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_FUSB300=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m @@ -4919,6 +4975,8 @@ CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4945,13 +5003,6 @@ 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 @@ -5018,6 +5069,7 @@ CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m @@ -5032,11 +5084,11 @@ CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m @@ -5049,6 +5101,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # iptables trigger is under Netfilter config (LED target) # CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -5170,6 +5223,7 @@ CONFIG_DW_DMAC=m CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y CONFIG_DMA_OF=y # @@ -5198,6 +5252,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y # @@ -5231,7 +5286,7 @@ 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_TMEM=m CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m @@ -5298,6 +5353,7 @@ CONFIG_COMEDI_NI_AT_A2150=m CONFIG_COMEDI_NI_AT_AO=m CONFIG_COMEDI_NI_ATMIO=m CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_NI_LABPC_ISA=m CONFIG_COMEDI_PCMAD=m CONFIG_COMEDI_PCMDA12=m CONFIG_COMEDI_PCMMIO=m @@ -5325,6 +5381,7 @@ CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m CONFIG_COMEDI_ADV_PCI1710=m CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m CONFIG_COMEDI_AMPLC_DIO200_PCI=m CONFIG_COMEDI_AMPLC_PC236_PCI=m @@ -5353,7 +5410,7 @@ 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_LABPC_PCI=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m @@ -5380,8 +5437,8 @@ 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_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m @@ -5404,9 +5461,9 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5448,14 +5505,8 @@ CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=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 @@ -5487,7 +5538,9 @@ CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y +CONFIG_ZCACHE=m +# CONFIG_ZCACHE_DEBUG is not set +# CONFIG_USB_DWC2 is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5537,6 +5590,7 @@ CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m CONFIG_APPLE_GMUX=m +CONFIG_PVPANIC=m # # Hardware Spinlock drivers @@ -5563,7 +5617,6 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -5579,6 +5632,7 @@ CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -5586,9 +5640,6 @@ CONFIG_SERIAL_IPOCTAL=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -5598,6 +5649,13 @@ CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y + +# # File systems # CONFIG_DCACHE_WORD_ACCESS=y @@ -5626,6 +5684,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_DLM=y @@ -5638,6 +5697,8 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5764,6 +5825,7 @@ CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5966,6 +6028,8 @@ CONFIG_LKDTM=m # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -5995,6 +6059,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -6011,6 +6076,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -6023,6 +6089,7 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y @@ -6035,6 +6102,7 @@ CONFIG_DEBUG_RODATA=y # 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 @@ -6050,7 +6118,6 @@ 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 # @@ -6089,8 +6156,6 @@ 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 # @@ -6143,6 +6208,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -6222,6 +6288,7 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y @@ -6233,8 +6300,7 @@ 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_KVM_DEVICE_ASSIGNMENT=y CONFIG_LGUEST=m CONFIG_BINARY_PRINTF=y diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD index cdc3483d5..8a8845f0b 100644 --- a/libre-testing/syslinux/PKGBUILD +++ b/libre-testing/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.01" -pkgrel="2" +pkgrel="4.1" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -22,6 +22,10 @@ optdepends=('perl-passwd-md5: For md5pass' 'util-linux: For isohybrid' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') +md5sums=('5fe8959b92255143a334167ca1c395a6' + 'f048880b57e2c5a7017ff8804bfda327' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + 'cb46ca47c6b6323127d908440057d98f') install="${pkgname}.install" @@ -30,11 +34,6 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve 'syslinux-install_update' 'splash.png') -sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4' - 'a0238479aa2ed0bbd91d879d35bf7fce2600830f' - 'b1d915045fe3094f5359df043c53e73a4dc32745' - '1be7066848f2d58d67c63436294de5322ca34318') - _build_syslinux_bios() { rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre-testing/syslinux/splash.png +++ b/libre-testing/syslinux/splash.png diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre-testing/syslinux/splash.xcf diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update index c32ccf18a..4dc09696a 100644 --- a/libre-testing/syslinux/syslinux-install_update +++ b/libre-testing/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 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 @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux/bios" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -core_modules=(ldlinux.c32) -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: 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) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -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" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,79 +293,65 @@ install_mbr() { return 0 } -_install() { +install_modules() { # Copy all com32 files to /boot - for file in "${libpath}"/*.c32; do + for file in "${bios_libpath}"/*.c32; do file=${file##*/} - # Symlink files if /boot resides on the same partition as root + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done # Copy / Symlink pci.ids if pci.ids exists on the FS if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update c32 files in /boot, if /boot is not on same fs - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.c32; do - file=${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 - - # Ensure core modules exist and if not install them - for file in "${core_modules[@]}"; do - if [[ ! -f $bootpath/$file ]]; then - if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" - fi - fi - done + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -400,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -432,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg index 64d6596e3..0c0c6339a 100644 --- a/libre-testing/syslinux/syslinux.cfg +++ b/libre-testing/syslinux/syslinux.cfg @@ -32,15 +32,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre 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 +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -51,13 +51,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 8108a95bf..533ce1e06 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -7,12 +7,12 @@ _pkgname=abuse pkgname=abuse-libre pkgver=0.8 -pkgrel=3.1 -pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"' +pkgrel=3.2 +pkgdesc='A side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support' arch=('i686' 'x86_64' 'mips64el') url='http://abuse.zoy.org/' license=('GPL' 'custom') -depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer') +depends=('gcc-libs' 'glu' 'sdl' 'sdl_mixer') provides=('$_pkgname=$pkgver') replaces=('$_pkgname') conflicts=('$_pkgname') @@ -25,7 +25,7 @@ md5sums=('ec678b8dc8d00e0382d8c805c6438489' build() { cd "${srcdir}/${_pkgname}-${pkgver}" -# Remove the unfree 'claudio' addon +# Remove the nonfree claudio addon rm -rvf ./data/addon/claudio patch -Np1 -i "$srcdir/non-claudio.patch" diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index 0745630ad..b2b3097b9 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -1,15 +1,16 @@ -# $Id$ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: leif_thande <leif.thande@gmail.com> # Contributor: tranquility <trankas@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=atool pkgname=atool-libre pkgver=0.39.0 -pkgrel=1 -pkgdesc="A script for managing file archives of various types" +pkgrel=1.2 +pkgdesc="A script for managing file archives of various types, with unar support included and nonfree unace recommendation removed" arch=('any') url="http://www.nongnu.org/atool/" license=('GPL3') @@ -25,12 +26,19 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives' 'lzop: for using atool with lzop compressed archives' 'p7zip: for using atool with 7z archives' 'tar: for using atool with tar archives' + 'unar: for using atool for unpacking rar archives' 'zip: for using atool for creating zip archives' - 'unzip: for using atool for unpacking archives') + 'unzip: for using atool for unpacking zip archives') source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz) sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b') +prepare() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # replace nonfree unrar to unar + sed -i 's|unrar|unar|g' $(grep -rlI 'unrar') +} build() { cd ${srcdir}/${_pkgname}-${pkgver} diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 97ac9a8e8..6b4fe0458 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189804 2013-07-08 12:09:48Z bisson $ +# $Id: PKGBUILD 189986 2013-07-12 14:00:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 475a7a7ec..3cdb513cb 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') pkgver=2.5.6 -pkgrel=6.1 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -21,7 +21,9 @@ build() { cd "${srcdir}/${_pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix @@ -74,7 +76,7 @@ package_avidemux-libre-cli() { } package_avidemux-libre-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') replaces=('avidemux-gtk') conflicts=('avidemux-gtk') @@ -97,7 +99,7 @@ package_avidemux-libre-gtk() { } package_avidemux-libre-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'qt4') replaces=('avidemux-qt') conflicts=('avidemux-qt') diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index c96084eb8..65499e1ef 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -1,36 +1,42 @@ # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.6.1 +_pkgbase=avidemux +pkgbase=avidemux-libre +pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') +pkgver=2.6.4 pkgrel=1 arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec') -#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) -#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) +#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') -build() { -#mv snapshot_8273 ${pkgbase}_${pkgver} - - cd "${srcdir}/${pkgbase}_${pkgver}" +prepare() { +# mv 2.6_snapshot ${_pkgbase}_${pkgver} + cd ${_pkgbase}_${pkgver} sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { + cd ${_pkgbase}_${pkgver} bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins } -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" +package_avidemux-libre-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' 'faad2: for the corresponding audio decoder plugin' 'opencore-amr: for the corresponding audio decoder plugin' 'jack: for the corresponding audio device plugin' @@ -38,11 +44,14 @@ package_avidemux-cli() { 'sdl: for the corresponding audio device plugin' 'x264: for the corresponding video encoder plugin' 'xvidcore: for the corresponding video encoder plugin' - 'qt: for the QtScript scripting support' + 'qt4: for the QtScript scripting support' 'libdca: for the corresponding audio decoder plugin' 'fribidi: for the corresponding video filter plugin') + provides=('avidemux' 'avidemux-cli') + conflicts=('avidemux' 'avidemux-cli') + replaces=('avidemux' "avidemux-cli=$pkgver") - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildCli; make DESTDIR="${pkgdir}" install) (cd buildCore; make DESTDIR="${pkgdir}" install) (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) @@ -52,32 +61,34 @@ package_avidemux-cli() { install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" } -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') +package_avidemux-libre-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + replaces=('avidemux-gtk') + conflicts=('avidemux-gtk') + provides=("avidemux-gtk=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildGtk; make DESTDIR="${pkgdir}" install) (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" } -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu') +package_avidemux-libre-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu') + replaces=('avidemux-qt') + conflicts=('avidemux-qt') + provides=("avidemux-qt=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildQt4; make DESTDIR="${pkgdir}" install) (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index f8e66c762..eadfd8214 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -6,14 +6,14 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 -_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=4 +_extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install +pkgrel=6 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") license=('GPL') -depends=('linux-libre>=3.9' 'linux-libre<3.10') -makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10') +depends=('linux-libre>=3.10' 'linux-libre<3.11') +makedepends=('linux-libre-headers>=3.10' 'linux-libre-headers<3.11') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install index e25d40b44..ec796a1b4 100644 --- a/libre/bbswitch-libre/bbswitch.install +++ b/libre/bbswitch-libre/bbswitch.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.9-LIBRE' + EXTRAMODULES='extramodules-3.10-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index b37990c09..88f78e318 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93080 2013-06-24 09:39:28Z tredaelli $ +# $Id: PKGBUILD 94236 2013-07-17 13:44:25Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.1.1 +pkgver=3.1.3 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') @@ -18,8 +18,8 @@ license=('GPL3') options=(!libtool) source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('3c70b017b6c02e22864d4b597ef19608ca3221c9d2547215c5bd05418561a2a3' - 'c47eb443b870262e3e1a5d6441a06f72c9ca06c0abae459ab577a3f289a91e7a') +sha256sums=('07964687daf8c6ba0a11f349b6b139e4d35078cdd013935f9331b28feced0500' + 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch index b56cb21ba..abd815141 100644 --- a/libre/bfgminer-libre/remove-dangerous-rpath.patch +++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch @@ -4,7 +4,7 @@ ]) else libblkmaker_CFLAGS='-Ilibblkmaker' -- libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs' +- libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS" + libblkmaker_LDFLAGS='-Llibblkmaker/.libs' libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1' AC_CONFIG_SUBDIRS([libblkmaker]) diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 040eeccf4..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,35 +1,37 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> -pkgname=blender-addon-luxrender -_pkgname=${pkgname:14:3}${pkgname::5}25 +_srcname=luxrender +_pkgver=1.2.1 +_bldname=blender +_bldver=2.68 +_bldep=9 +_pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 -pkgver=1.2.1.v2.67 -_pkgver=${pkgver::5} -_reqname=${pkgname::7} -_reqver=${pkgver:7} -_reqep=8 -pkgrel=1 -pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)" + +pkgname=$_bldname-addon-$_srcname +pkgver=$_pkgver.v$_bldver +pkgrel=3 +pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any -url=http://www.${pkgname:14}.net/ +url=http://www.$_srcname.net/ license=GPL depends=( - ${pkgname:14}=$_pkgver - "$_reqname>=$(($_reqep-1)):$_reqver" - "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))" + $_srcname=$_pkgver + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname replaces=$_pkgname -source=http://src.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2 +source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2 sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 package() { - a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14} - b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons + a=$srcdir/$_pkgname-$_srcver/src/$_srcname + b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons install -d -m755 $b && cp -a $a $b # change the search path in exporter so it finds pylux in its new location - sed -i 's|from.*import pylux|import pylux|' $b/${pkgname:14}/outputs/pure_api.py + sed -i 's|from.*import pylux|import pylux|' $b/$_srcname/outputs/pure_api.py } # vim:set ts=2 sw=2 et: diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 435a1b4a7..90df03528 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,28 +1,28 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> -_spacenav=false -_pkgname=blender-libre -_pkgflag=libre -if [ $_spacenav == true ]; then - pkgname=blender-spacenav-libre - _spndesc=' (with spacenav support)' -else - pkgname=blender-libre - _spndesc='' -fi -epoch=8 -pkgver=2.67b +_pkgname=blender +epoch=10 +_pkgver=2.68a +pkgrel=3 _jpgver=1.5 _pyver=3.3 -pkgrel=2 -pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc" + +_spn=false +[[ $_spn == true ]] && { + _spnname=-spacenav + _spndesc=' (with spacenav support)' +} + +pkgname=$_pkgname$_spnname-libre +pkgver=$_pkgver +pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) license=GPL -url=http://www.${_pkgname%-$_pkgflag}.org +url=http://www.$_pkgname.org depends=( desktop-file-utils ffmpeg @@ -30,10 +30,11 @@ depends=( freetype2 hicolor-icon-theme jack + #jemalloc libpng libtiff openal - openexr + openexr-libre openimageio 'opencollada=20130413' opencolorio @@ -41,9 +42,7 @@ depends=( shared-mime-info xdg-utils ) -if [ $_spacenav == true ]; then - depends+=(libspnav) -fi +[[ $_spn == true ]] && depends+=(libspnav) optdepends=( 'bullet: for Rigid Bodies and Physics Simulation' 'xcftools: for import GIMP images to scene (pcr repo)' @@ -52,24 +51,51 @@ makedepends=( boost cmake mesa - subversion ) -provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver) -conflicts=${_pkgname%-$_pkgflag} -replaces=${_pkgname%-$_pkgflag} +provides=($_pkgname) +[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver") +conflicts=($_pkgname) +[[ $_spn == true ]] && conflicts+=($_pkgname-libre) +replaces=$_pkgname install=$_pkgname.install -source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz -sha512sums=d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 +source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz +sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 prepare() { - mkdir $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build + cd $srcdir/$_pkgname-$pkgver + + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c + [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c + sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre| + s|Linux, FreeBSD|GNU, GNU/Linux-libre| + s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| + \|Windows|d;\|Mac OS X|d + s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| + ' release/text/readme.html + sed -i 's|Linux|GNU/Linux-libre| + ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py + sed -i 's| (.so under Linux, .dll under windows...)|| + ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py + + msg 'removing Open Source term' + sed -i 's|free, open source|free| + s|free and open-source|free| + s|open-source and free|free| + ' release/text/readme.html + + mkdir -v build + + msg 'Remove nonfree povray render support' + rm -vr release/scripts/addons/render_povray } build() { - cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build - - [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' + cd $srcdir/$_pkgname-$pkgver/build + [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF + [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF cmake ..\ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr\ @@ -78,8 +104,10 @@ build() { -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\ -DPYTHON_LIBPATH=/usr/lib\ -DPYTHON_LIBRARY=python${_pyver}m\ - -DPYTHON_VERSION=${_pyver}\ - $DSUPPORT_SSE2_BUILD\ + -DPYTHON_VERSION=$_pyver\ + -DSUPPORT_SSE_BUILD=$_SSE\ + -DSUPPORT_SSE2_BUILD=$_SSE2\ + -DWITH_BULLET=ON\ -DWITH_CODEC_FFMPEG=ON\ -DWITH_CODEC_SNDFILE=ON\ -DWITH_CYCLES=ON\ @@ -88,23 +116,24 @@ build() { -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ -DWITH_IMAGE_REDCODE=ON\ + -DWITH_INPUT_NDOF=$_NDOF\ -DWITH_INSTALL_PORTABLE=OFF\ -DWITH_JACK=ON\ + -DWITH_JACK_DYNLOAD=OFF\ + -DWITH_MEM_JEMALLOC=OFF\ -DWITH_MOD_OCEANSIM=ON\ -DWITH_OPENCOLLADA=ON\ -DWITH_PLAYER=ON\ -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON - make $MAKEFLAGS make } package() { - cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build + cd $srcdir/$_pkgname-$pkgver/build make DESTDIR=$pkgdir install - rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray # drop nonfree povray render support - python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} || return 0 + python -m compileall $pkgdir/usr/share/$_pkgname } # vim:set ts=2 sw=2 et: diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 652d6a6ba..af128c250 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94003 2013-07-13 08:59:42Z jelle $ +# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.39 +pkgver=0.9.41 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('7ac795465e8e28da415141f1ad15dd2d' +md5sums=('2037b44c90a66e97823a637edfa194ca' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 89591f416..4cc986be1 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,72 +1,84 @@ -# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle <ike.devolder@gmail.com> -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> -#Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -#Contributor (Parabola): Kete <kete@ninthfloor.org> -#Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: BlackEagle <ike.devolder@gmail.com> +# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Kete <kete@ninthfloor.org> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=8 +pkgrel=9 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' - 'sparsehash' 'qjson' 'libcdio-paranoia' '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-libre-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +arch=('i686' 'x86_64') +depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib') +makedepends=('cmake' 'boost' 'mesa' 'sparsehash') +optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gvfs: Various devices support') replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") -source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz +install=clementine.install +source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" 'clementine-1.1.1-libimobiledevice-fix.patch' 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -install=clementine.install +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9' + '9ccfe62f8784a1ccbe8c96f8cacad9d0' + '59a8c0d7659898c457b95f877718cf1c') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} - patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch - # Remove nonfree nonfree artwork and spotify references on files - patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch + # remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - # Remove nonfree spotifyblob folders - rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} + # remove nonfree spotifyblob folders + rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} - # Remove nonfree spotify files - rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-core-logo-128x128.png - rm -v data/icons/svg/spotify.svg - rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + # remove nonfree spotify files + rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-core-logo-128x128.png + rm -v data/icons/svg/spotify.svg + rm -v data/schema/schema-30.sql + rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - ## Remove nonfree nyancat.png - rm -v data/nyancat.png + ## remove nonfree nyancat.png + rm -v data/nyancat.png - ## Put moognu.png to the source code - cp -v ../moognu.png data + ## rut moognu.png to the source code + install -m644 -v ../moognu.png data - # Create a blank file due that is a dependency for clementine - touch data/schema/schema-30.sql + # create a blank file due which is a dependency for clementine + touch data/schema/schema-30.sql +} - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 - make +build() { + cd ${_pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${_pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install } -md5sums=('28e4afb822388bd337a761db8f86febf' - '736df6cd828a3172701f63c8dc978cb9' - '5cc8f800dd4df7bd5548196009ab68e0' - '59a8c0d7659898c457b95f877718cf1c') + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install index 2f0338d8a..927a10258 100644 --- a/libre/clementine-libre/clementine.install +++ b/libre/clementine-libre/clementine.install @@ -1,13 +1,15 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -ftq usr/share/icons/hicolor update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 6008b2d28..3a948bf96 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1. if (version < kVersion) { diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 -@@ -29,7 +29,7 @@ ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 +@@ -23,13 +23,13 @@ + #include <QTimerEvent> + #include <QBrush> + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) : Analyzer::Base(parent, 9), diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index a311ba26b..9c51e7fbf 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -1,12 +1,12 @@ # vim:set ft=sh: -# $Id: PKGBUILD 93493 2013-07-04 12:38:15Z idevolder $ +# $Id: PKGBUILD 94327 2013-07-20 16:50:58Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) _pkgbase=doublecmd pkgbase=doublecmd-libre -pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre') -pkgver=0.5.5 +pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') +pkgver=0.5.6 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -24,7 +24,7 @@ source=( "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434' +sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { @@ -47,11 +47,11 @@ build() { ./build.sh beta qt } -package_doublecmd-gtk2-libre() { +package_doublecmd-libre-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation" depends=('gtk2') - conflicts=('doublecmd-gtk2') - replaces=('doublecmd-gtk2') + conflicts=('doublecmd-gtk2' 'doublecmd-gtk2-libre') + replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') provides=("doublecmd-gtk2=${pkgver}") cd "$srcdir/$_pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh @@ -62,11 +62,11 @@ package_doublecmd-gtk2-libre() { cp -a * "$pkgdir/usr/share/$_pkgbase/doc/" } -package_doublecmd-qt-libre() { +package_doublecmd-libre-qt() { pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation" depends=('qt4pas') - conflicts=('doublecmd-qt') - replaces=('doublecmd-qt') + conflicts=('doublecmd-qt' 'doublecmd-qt-libre') + replaces=('doublecmd-qt' 'doublecmd-qt-libre') provides=("doublecmd-qt=${pkgver}") cd "$srcdir/$_pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 56d994beb..2221fb7fe 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=2 +pkgrel=3 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage' source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default') + 'grub.default' + 'grub-2.00-mkinitcpio-0.15.patch') +md5sums=('SKIP' + 'b3068b52b6f1dcd2850b5c7585bb185f' + 'be55eabc102f2c60b38ed35c203686d6' + '52d374e0194e3f2e39ff7c92ecd58a6c' + 'd25d2dcf8ba708dcf768fcaea799f59c' + 'SKIP' + 'SKIP') for _DIR_ in 915resolution ntldr-img ; do source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' -sha1sums=('SKIP' - '513172d91d1a2e2cda7c0a744c766d5868cb28bf' - '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'SKIP' - 'SKIP') _build_grub-common_and_bios() { @@ -173,6 +174,9 @@ prepare() { ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo + + ## fix 10_linux + patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## 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-${pkgver}/configure.ac" diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch new file mode 100644 index 000000000..1af848fa3 --- /dev/null +++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200 ++++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200 +@@ -138,7 +138,7 @@ + message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ++ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index eac23b4be..6477c774c 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,70 +1,25 @@ -# $Id: PKGBUILD 190001 2013-07-12 20:00:03Z 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.8 +_pkgname=gst-plugins-bad +pkgname=$_pkgname-libre +pkgver=1.0.9 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' -arch=( - i686 - x86_64 - mips64el -) -license=( - LGPL -) +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=( - celt - chromaprint - curl - faad2 - gst-plugins-base-libs - libdca - libdvdnav - libgme - libmms - libmodplug - libofa - neon - mjpegtools - mpg123 - opus - soundtouch - spandsp - wayland -) -makedepends=( - libdvdread - libexif - libmpeg2 - libvdpau - schroedinger -) -provides=( - $pkgbase=$pkgver -) -conflicts=( - $pkgbase -) -replaces=( - $pkgbase -) -options=( - '!libtool' - '!emptydirs' -) -source=( - "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" -) -sha256sums=( - 6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc -) +depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +options=(!libtool !emptydirs) +source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz) +sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75') build() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf @@ -78,11 +33,11 @@ build() { } check() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver make check } package() { - cd $pkgbase-$pkgver - make DESTDIR=$pkgdir install + cd $_pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 968110d3e..b4108f01f 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $ +# $Id: PKGBUILD 191569 2013-07-25 20:33:03Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,7 +6,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.6 +pkgver=3.13.7 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} hp-mkuri.patch) -md5sums=('3dd5052864052b8cd4ce013bb71f4d6c' +md5sums=('e834c8dd270f441c963f5d883d2d48f3' 'SKIP' '0bd7779fdbc4d7a9386df04dce2cb8d4') diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 9508d8e15..3c078997c 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 019d1edd2..81648fbcd 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 8cdf5228e..1a5692b89 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191727 2013-07-29 18:37:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -30,7 +30,7 @@ sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 @@ -40,7 +40,6 @@ prepare() { } build() { - cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3b4295415..4f4f0edf9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,25 +6,29 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ -# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch + cd ../../ + # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook" diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/libre/kdenetwork-kopete-libre/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/libre/libclc-git/PKGBUILD b/libre/libclc-git/PKGBUILD new file mode 100644 index 000000000..432751146 --- /dev/null +++ b/libre/libclc-git/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +_pkgname=libclc +pkgname=$_pkgname-git +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 +arch=( + mips64el + x86_64 + i686 +) +pkgdesc='Library requirements of the OpenCL C programming language.' +url=( + http://cgit.freedesktop.org/~tstellar/$_pkgname + http://libclc.llvm.org/ +) +license=MIT +depends=clang +makedepends=( + git + python2 +) +provides=($_pkgname) +conflicts=$_pkgname +source=git://people.freedesktop.org/~tstellar/$_pkgname.git +sha512sums=SKIP + +prepare() { + sed -i 's|/usr/bin/python|/usr/bin/python2|g; + ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py +} + +build() { + cd $srcdir/$_pkgname + ./configure.py --prefix=/usr + make +} + +package() { + cd $srcdir/$_pkgname + make DESTDIR=$pkgdir install + install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 8f08669c1..68412355b 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# $Id: PKGBUILD 94168 2013-07-15 13:24:41Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> @@ -6,19 +6,27 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=6 +pkgrel=7 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://libquicktime.sourceforge.net/" depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') +makedepends=('mesa-libgl') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz" + ffmpeg2.0.patch) +sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368' + 'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) replaces=($_pkgname) +prepare() { + cd $_pkgname-$pkgver + patch -Np1 -i ../ffmpeg2.0.patch +} + build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-libre/ffmpeg2.0.patch new file mode 100644 index 000000000..6bec4d99a --- /dev/null +++ b/libre/libquicktime-libre/ffmpeg2.0.patch @@ -0,0 +1,135 @@ +Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ +diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h +--- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/ffmpeg.h 2013-07-15 15:05:19.307534593 +0200 +@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + + + #endif ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#define CODEC_FLAG2_STRICT_GOP 0x00000002 ++#define CODEC_FLAG_QP_RD 0x08000000 ++#define CODEC_FLAG_CBP_RD 0x04000000 +diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c +--- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/lqt_ffmpeg.c 2013-07-15 15:19:09.730831655 +0200 +@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1; + PARAM_QSCALE, \ + PARAM_QCOMPRESS, \ + PARAM_QBLUR, \ +- PARAM_QUANTIZER_NOISE_SHAPING, \ + PARAM_TRELLIS + +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \ +- ENCODE_PARAM_VIDEO_QUANTIZER_I, \ +- PARAM_I_QUANT_FACTOR, \ +- PARAM_I_QUANT_OFFSET +- +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \ +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, \ +- PARAM_B_QUANT_FACTOR, \ +- PARAM_B_QUANT_OFFSET +- + #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \ + { \ + .name = "frame_types", \ +@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod + ENCODE_PARAM_VIDEO_FRAMETYPES_IPB, + PARAM_FLAG_AC_PRED_MPEG4, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IPB, + PARAM_FLAG_CBP_RD, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_GMC, +@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_dx50[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263p[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c +--- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 ++++ b/plugins/ffmpeg/params.c 2013-07-15 15:09:38.214189953 +0200 +@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++#if #if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h +--- a/plugins/ffmpeg/params.h 2011-05-11 17:13:39.000000000 +0200 ++++ b/plugins/ffmpeg/params.h 2013-07-15 15:09:04.860858069 +0200 +@@ -177,6 +177,7 @@ the reference. Unused for constant quant + .val_max = { .val_int = 1 }, \ + } + ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_LUMA_ELIM_THRESHOLD \ + { \ + .name = "ff_luma_elim_threshold", \ +@@ -202,6 +203,7 @@ recommendation") \ + chrominamce. Negative values also consider dc \ + coefficient. 7 is JVT recommendation") \ + } ++#endif + + #define PARAM_STRICT_STANDARD_COMPLIANCE \ + { \ +@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b + + /* Does nothing */ + /** Frame types */ ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_INTER_THRESHOLD \ + { \ + .name = "ff_inter_threshold", \ +@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b + .help_string = TRS("Choose quantization such that noise will be masked by " \ + "similar-frequency content in the image") \ + } ++#endif + + /** Motion estimation */ + #define PARAM_ME_THRESHOLD \ diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 562692e48..c362ea2e1 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130706 -_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b +pkgver=20130727.1 +_libretools_commit=b853e0a808ed5c2fe4c1850d46eb2370c967f46d _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -19,7 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') -makedepends=(emacs) # emacs --batch is used during the build to process text +makedepends=(emacs ronn) # emacs --batch is used during the build to process text checkdepends=(sh-roundup) build() { @@ -54,7 +54,7 @@ package_libretools() { depends=( "librelib=$pkgver" arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` (also mips-add in -mips64el) + git # `createworkdir` and `libregit` (also mips-add in -mips64el) openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('f30fbc4011acdd9065310f8295267bdd' +md5sums=('8e802315aa3b3437460c11234385db56' 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index a5a75d2e4..c59e1d08a 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $ +# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z 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.15 +pkgver=1.10.1.a pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') @@ -14,28 +14,29 @@ provides=("liferea=$pkgver") replaces=('liferea') conflicts=('liferea') license=('GPL') -depends=('gconf' 'webkitgtk2' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme' - 'desktop-file-utils') +depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' + 'gnome-icon-theme' 'desktop-file-utils') makedepends=('intltool') +optdepends=('gnome-keyring: for keyring plugin support' + 'libgnome-keyring: for keyring plugin support' + 'gst-plugins-base: for media player plugin support' + 'gst-plugins-good: for media player plugin support' + 'gst-plugins-bad-libre: for media player plugin support') options=('!libtool' '!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f' - '0d68c567c3d37932a49709c58c37c3f138fd19cb') +sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c' + '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a 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/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 327c567d2..7fff91b49 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -1,24 +1,21 @@ pkgname=liferea post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas usr/share/glib-2.0/schemas 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/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi } 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 - update-desktop-database -q + post_install $1 } diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch index 325017567..5024f19ee 100644 --- a/libre/liferea-libre/remove-non-free-suggestions.patch +++ b/libre/liferea-libre/remove-non-free-suggestions.patch @@ -1,28 +1,29 @@ ---- liferea-1.8.0/src/browser.c_orig 2011-11-28 19:50:57.000000000 -0200 -+++ liferea-1.8.0/src/browser.c 2012-03-07 14:49:31.862987204 -0200 -@@ -35,24 +35,16 @@ +diff --git a/src/browser.c b/src/browser.c +index f91901f..28b0c2b 100644 +--- a/src/browser.c ++++ b/src/browser.c +@@ -35,23 +35,16 @@ static struct browser browsers[] = { NULL, NULL }, { -- /* tested with SeaMonkey 1.0.6 */ -- "mozilla", "Mozilla", "mozilla %s", -- NULL, "mozilla -remote openURL(%s)", -- NULL, "mozilla -remote 'openURL(%s,new-window)'", -- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- /* tested with Firefox 1.5 and 2.0 */ +- "firefox", "Firefox", "firefox \"%s\"", +- NULL, "firefox -a firefox -remote \"openURL(%s)\"", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" + "iceweasel", "Iceweasel", "iceweasel %s", + NULL, "iceweasel \"%s\"", + NULL, "iceweasel -new-window \"%s\"", + NULL, "iceweasel -new-tab \"%s\"" }, { -- /* tested with Firefox 1.5 and 2.0 */ -- "firefox", "Firefox","firefox \"%s\"", -- NULL, "firefox -a firefox -remote \"openURL(%s)\"", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" -- }, +- "google-chrome", "Chrome", "google-chrome \"%s\"", +- NULL, NULL, +- NULL, NULL, +- NULL, NULL +- }, - { -- "opera", "Opera","opera \"%s\"", +- "opera", "Opera", "opera \"%s\"", - "opera \"%s\"", "opera -remote \"openURL(%s)\"", - "opera -newwindow \"%s\"", NULL, - "opera -newpage \"%s\"", NULL @@ -32,4 +33,18 @@ + NULL, "icecat -new-tab \"%s\"" }, { - "epiphany", "Epiphany","epiphany \"%s\"", + "epiphany", "Epiphany", "epiphany \"%s\"", +@@ -60,13 +53,6 @@ static struct browser browsers[] = { + "epiphany -n \"%s\"", NULL + }, + { +- /* tested with SeaMonkey 1.0.6 */ +- "mozilla", "Mozilla", "mozilla %s", +- NULL, "mozilla -remote openURL(%s)", +- NULL, "mozilla -remote 'openURL(%s,new-window)'", +- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- }, +- { + "konqueror", "Konqueror", "kfmclient openURL \"%s\"", + NULL, NULL, + NULL, NULL, diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 2ddc046b6..8bd7c5989 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Márcio Silva <coadde@lavabit.com> pkgname=linux-libre-firmware -pkgver=3.9 -pkgrel=2 +pkgver=3.10 +pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') url=('http://linux-libre.fsfla.org/') @@ -37,7 +37,7 @@ replaces=('linux-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('120df29f88622dabf7015a22c7cc8e25') +md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c') package() { diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 457227e70..269fe1327 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.85 +_kernver=3.0.87 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=9 -pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' +pkgrel=11 +pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index b8127136b..92400b2ba 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189672 2013-07-04 11:25:41Z tpowa $ +# $Id: PKGBUILD 191275 2013-07-23 04:52:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,10 +8,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=85 +_sublevel=87 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.84 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.86 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,9 +33,9 @@ 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}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '19d15be63712a9d1508a72062dc3da7e' - '6ab0f1a509481d93117b7630105757cc' - '18dfa330a7da88d7c09c3e24a5cd608f' + '82d8645c9b101791f0cd9b41a6f6b538' + '7373cc3ac66342156a7fc32af8577b46' + 'b7229f80282337979514f9640a969ff5' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -45,9 +45,9 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '4cd1209f2b4eab4f26f82e7208c53d28') + '43654f921934c885642aa7890a223ab0') if [ "$CARCH" != "mips64el" ]; then - # Don't use the Loongson-specific patches on non-mips64el arches. + # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi @@ -62,7 +62,7 @@ prepare() { patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # Some chips detect a ghost TV output @@ -96,10 +96,10 @@ prepare() { patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i lxo-config.patch -# ensure N32, add localversion, remove uevent helper as per -# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) + # ensure N32, add localversion, remove uevent helper as per + # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + # and make USB storage support builtin (e.g. for booting from USB + # disks without slowly loading an initramfs) sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ @@ -224,7 +224,7 @@ _package() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" -# mkinitcpio 0.7 relies on bzImage to find the kernel version + # mkinitcpio 0.7 relies on bzImage to find the kernel version if [ "$CARCH" == "mips64el" ]; then sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" @@ -258,7 +258,7 @@ _package-headers() { KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips -# In case of repackaging this is empty + # in case of repackaging this is empty if [ -z "${_kernver}" ]; then cd "${srcdir}/linux-${_basekernel}" _kernver="$(make LOCALVERSION= kernelrelease)" diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index a1d065a1a..47ddf3921 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -379,8 +379,8 @@ CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -2117,17 +2117,8 @@ CONFIG_HOSTAP_FIRMWARE=y 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_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLAGN=m # @@ -3737,7 +3728,7 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -3797,7 +3788,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index a5dc36205..092d3f4fa 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -357,8 +357,8 @@ CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_THERMAL_VECTOR=y CONFIG_I8K=m CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -2004,17 +2004,8 @@ CONFIG_HOSTAP_FIRMWARE=y 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_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLAGN=m # @@ -3570,7 +3561,7 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -3627,7 +3618,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index 12f517b4f..7bff7d34d 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,8 +1,12 @@ -2012-04-30 André Silva <emulatorman@lavabit.com> +2013-07-15 André Silva <emulatorman@lavabit.com> - * linux-libre-3.9-2 - * Removed CONFIG_STUB_POULSBO module from config files + * linux-libre-3.10.1-1 + * Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel. + +2013-04-30 André Silva <emulatorman@lavabit.com> + * linux-libre-3.9-2 + * Removed CONFIG_STUB_POULSBO module from config files. 2012-12-19 André Silva <emulatorman@lavabit.com> @@ -31,5 +35,5 @@ 2012-03-03 André Silva <emulatorman@lavabit.com> - * linux-libre-2.3.9-2 + * linux-libre-3.2.9-2 * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ef81f6eca..fd791dc79 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -9,11 +9,11 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.9 -_sublevel=9 +_basekernel=3.10 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,18 +30,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'e143fc381f4d2fdfc18686b867a5e6a5' - '5bb868d38a27edafac1eb114cd2f3659' - 'c180de34b0450d7eef8e0c1a68433d7c' +md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' + '4741e325185acae5498cfc77a5e8f55b' + '542fc77350e62009bca7af080359b286' + 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '30092ce96affb12f89a9eddfad966741') + 'dd620e4cb68341f847686c000d8038e8') if [ "$CARCH" != "mips64el" ]; then - # Don't use the Loongson-specific patches on non-mips64el arches. + # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi @@ -56,7 +56,7 @@ prepare() { patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) @@ -72,11 +72,11 @@ prepare() { patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i config.patch -# ensure N32, add localversion, remove uevent helper as per -# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) -# since 3.4 rtl8187 supports adhoc mode, so batman-adv is enabled again + # ensure N32, add localversion, remove uevent helper as per + # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + # and make USB storage support builtin (e.g. for booting from USB + # disks without slowly loading an initramfs) + # since 3.4 rtl8187 supports adhoc mode, so batman-adv is enabled again sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ @@ -160,6 +160,11 @@ _package() { replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgbase}.install + if [ "$CARCH" != "mips64el" ]; then + provides+=('linux-libre-kmod-alx') + conflicts+=('linux-libre-kmod-alx') + replaces+=('linux-libre-kmod-alx') + fi if [ "$CARCH" = "mips64el" ]; then optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') conflicts+=('mkinitcpio<0.7') @@ -207,7 +212,7 @@ _package() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" -# mkinitcpio 0.7 relies on bzImage to find the kernel version + # mkinitcpio 0.7 relies on bzImage to find the kernel version if [ "$CARCH" == "mips64el" ]; then sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" @@ -241,7 +246,7 @@ _package-headers() { KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips -# In case of repackaging this is empty + # in case of repackaging this is empty if [ -z "${_kernver}" ]; then cd "${srcdir}/linux-${_basekernel}" _kernver="$(make LOCALVERSION= kernelrelease)" @@ -384,7 +389,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index e84812997..f73d96675 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.7-1 Kernel Configuration +# Linux/x86 3.10.0-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -17,12 +17,10 @@ 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_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 @@ -98,6 +96,9 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -126,6 +127,9 @@ CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +# CONFIG_RCU_NOCB_CPU_ZERO is not set +# CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -172,19 +176,19 @@ 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_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +# CONFIG_EXPERT is not set 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 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 @@ -193,6 +197,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -202,7 +207,6 @@ CONFIG_HAVE_PERF_EVENTS=y 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 @@ -331,15 +335,15 @@ CONFIG_X86_MPPARSE=y 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_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_M486 is not set @@ -584,6 +588,7 @@ CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=m @@ -680,8 +685,6 @@ CONFIG_HOTPLUG_PCI=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 @@ -692,6 +695,7 @@ 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_ENUM_BASIC=m CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_CPS_XX=y CONFIG_RAPIDIO_TSI568=y @@ -704,6 +708,7 @@ CONFIG_RAPIDIO_TSI500=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y @@ -739,6 +744,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m # CONFIG_NET_IPGRE_BROADCAST is not set CONFIG_IP_MROUTE=y @@ -1135,7 +1141,6 @@ 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_PHONET=m @@ -1204,10 +1209,13 @@ CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1387,15 +1395,17 @@ 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_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m # # Device Drivers @@ -1442,7 +1452,6 @@ 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 @@ -1524,9 +1533,6 @@ 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 @@ -1535,7 +1541,6 @@ CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m # 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 @@ -1636,6 +1641,7 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1666,6 +1672,7 @@ CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1693,7 +1700,7 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1791,6 +1798,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1981,6 +1989,10 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -2050,6 +2062,7 @@ CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m @@ -2106,6 +2119,10 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m # # Distributed Switch Architecture drivers @@ -2140,6 +2157,7 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_ALX=m CONFIG_NET_CADENCE=y CONFIG_ARM_AT91_ETHER=m CONFIG_MACB=m @@ -2254,6 +2272,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2288,8 +2307,6 @@ CONFIG_STMMAC_ETH=m 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 @@ -2367,6 +2384,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX88179_178A=m @@ -2445,6 +2463,7 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y @@ -2479,7 +2498,6 @@ 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_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set @@ -2494,6 +2512,7 @@ CONFIG_HOSTAP_CS=m CONFIG_IWLWIFI=m CONFIG_IWLDVM=m CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y # # Debugging Options @@ -2546,6 +2565,7 @@ CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_MMIO=m @@ -2562,6 +2582,7 @@ CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8188EE=m CONFIG_RTL8192CU=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y @@ -2946,6 +2967,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m +# CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -2963,6 +2985,7 @@ CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_ARC_PS2=m +CONFIG_SERIO_APBPS2=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -3174,6 +3197,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set @@ -3188,6 +3212,11 @@ CONFIG_SPI_MASTER=y # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set + +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set # CONFIG_HSI is not set # @@ -3232,6 +3261,7 @@ CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_LYNXPOINT is not set +# CONFIG_GPIO_GRGPIO is not set # # I2C GPIO expanders: @@ -3319,6 +3349,8 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m @@ -3365,6 +3397,7 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m # CONFIG_SENSORS_MAX1111 is not set @@ -3377,7 +3410,7 @@ CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -3550,47 +3583,50 @@ CONFIG_BCMA_DRIVER_GPIO=y # Multifunction device drivers # CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m +CONFIG_ABX500_CORE=y +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set CONFIG_MFD_TI_AM335X_TSCADC=m -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_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_VX855=m CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m # CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -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_MFD_SYSCON is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3618,6 +3654,7 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -3776,7 +3813,6 @@ 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 @@ -3922,16 +3958,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3945,9 +3984,11 @@ CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m # # RDS decoders @@ -3964,6 +4005,9 @@ CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_VPX3220=m # @@ -3983,6 +4027,7 @@ CONFIG_VIDEO_ADV7175=m # # Camera sensor devices # +CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_MT9V011=m # @@ -4003,7 +4048,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4033,6 +4077,8 @@ CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m # # Multistandard (satellite) frontends @@ -4214,10 +4260,9 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_OF_DISPLAY_TIMING is not set -# CONFIG_OF_VIDEOMODE is not set CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y @@ -4232,7 +4277,6 @@ 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 @@ -4293,12 +4337,15 @@ CONFIG_FB_VIRTUAL=m # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI922X is not set # CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set @@ -4568,6 +4615,7 @@ CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4663,10 +4711,9 @@ CONFIG_USB=m # # Miscellaneous USB options # +CONFIG_USB_DEFAULT_PERSIST=y 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 @@ -4682,6 +4729,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4689,7 +4737,6 @@ 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 @@ -4706,10 +4753,10 @@ CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m # @@ -4749,6 +4796,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set # # USB port drivers @@ -4820,6 +4871,7 @@ CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m @@ -4851,19 +4903,21 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +# CONFIG_OMAP_CONTROL_USB is not set +# CONFIG_OMAP_USB3 is not set +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4877,7 +4931,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_FUSB300=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m @@ -4890,6 +4946,8 @@ CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4916,13 +4974,6 @@ 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 @@ -4989,6 +5040,7 @@ CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m @@ -5003,11 +5055,11 @@ CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m @@ -5020,6 +5072,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # iptables trigger is under Netfilter config (LED target) # CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -5141,6 +5194,7 @@ CONFIG_DW_DMAC=m CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y CONFIG_DMA_OF=y # @@ -5169,6 +5223,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y # @@ -5246,6 +5301,7 @@ CONFIG_COMEDI_NI_AT_A2150=m CONFIG_COMEDI_NI_AT_AO=m CONFIG_COMEDI_NI_ATMIO=m CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_NI_LABPC_ISA=m CONFIG_COMEDI_PCMAD=m CONFIG_COMEDI_PCMDA12=m CONFIG_COMEDI_PCMMIO=m @@ -5273,6 +5329,7 @@ CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m CONFIG_COMEDI_ADV_PCI1710=m CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m CONFIG_COMEDI_AMPLC_DIO200_PCI=m CONFIG_COMEDI_AMPLC_PC236_PCI=m @@ -5301,7 +5358,7 @@ 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_LABPC_PCI=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m @@ -5328,8 +5385,8 @@ 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_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m @@ -5352,9 +5409,9 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5396,14 +5453,8 @@ CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=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 @@ -5435,7 +5486,9 @@ CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y +CONFIG_ZCACHE=m +# CONFIG_ZCACHE_DEBUG is not set +# CONFIG_USB_DWC2 is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5485,6 +5538,7 @@ CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m CONFIG_APPLE_GMUX=m +CONFIG_PVPANIC=m # # Hardware Spinlock drivers @@ -5511,7 +5565,6 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -5527,6 +5580,7 @@ CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -5534,9 +5588,6 @@ CONFIG_SERIAL_IPOCTAL=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -5546,6 +5597,13 @@ CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y + +# # File systems # CONFIG_DCACHE_WORD_ACCESS=y @@ -5574,6 +5632,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_DLM=y @@ -5586,6 +5645,8 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5712,6 +5773,7 @@ CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5914,6 +5976,8 @@ CONFIG_LKDTM=m # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -5943,6 +6007,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5959,6 +6024,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -5971,6 +6037,7 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y @@ -5983,6 +6050,7 @@ CONFIG_DEBUG_RODATA=y # 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 @@ -5998,7 +6066,6 @@ 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 # @@ -6037,8 +6104,6 @@ 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 # @@ -6091,6 +6156,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -6170,6 +6236,7 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y @@ -6181,8 +6248,7 @@ 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_KVM_DEVICE_ASSIGNMENT=y CONFIG_LGUEST=m CONFIG_BINARY_PRINTF=y diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10 deleted file mode 100644 index 9eaa84b4f..000000000 --- a/libre/linux-libre/config.i686.3.10 +++ /dev/null @@ -1,6325 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc7 Kernel Configuration -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -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_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=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_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-LIBRE" -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_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -CONFIG_AUDIT_LOGINUID_IMMUTABLE=y -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_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -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_STALL_COMMON=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_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set -# CONFIG_RCU_NOCB_CPU_ALL is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=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_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_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HOTPLUG=y -CONFIG_HAVE_PCSPKR_PLATFORM=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_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_PCI_QUIRKS=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_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_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=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_KPROBES_ON_FTRACE=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_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_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 -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=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_MODULE_SIG 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_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -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_GOLDFISH is not set -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_X86_32_IRIS=m -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set -# CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PARAVIRT_CLOCK=y -CONFIG_NO_BOOTMEM=y -# CONFIG_MEMTEST 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_L1_CACHE_SHIFT=6 -# CONFIG_X86_PPRO_FENCE is not set -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_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# 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 is not set -# CONFIG_MICROCODE_AMD is not set -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_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_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_BALLOON_COMPACTION=y -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_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 -# 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_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# 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=y -CONFIG_PM_TRACE_RTC=y -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_I2C=m -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_INITRD_TABLE_OVERRIDE=y -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -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_GOV_COMMON=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_INTEL_PSTATE=y -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 -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_AMD_FREQ_SENSITIVITY=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_MULTIPLE_DRIVERS is not set -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_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_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_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_ENUM_BASIC=m -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_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=y -CONFIG_COREDUMP=y -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_HAVE_TEXT_POKE_SMP=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -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_IP_TUNNEL=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=y -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_GRE=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_CONNTRACK_LABELS=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_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 - -# -# 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_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 -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_BPF=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=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_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_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_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=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_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 -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 -# -# 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_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# 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_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_VLAN_8021Q_MVRP=y -# 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_X25 is not set -# CONFIG_LAPB 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_DAT=y -CONFIG_BATMAN_ADV_NC=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y -CONFIG_NETLINK_DIAG=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 - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_MEI=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_FW_LOADER_USER_HELPER is not set -# 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_MMIO=m -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_CMA is not set - -# -# Bus devices -# -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_CMDLINE_PARTS=m -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -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_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L 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_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_ECC_BCH is not set -CONFIG_MTD_SM_COMMON=m -# 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_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# 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 is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -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_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_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_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -# CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_DUMMY_IRQ is not set -# 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_ATMEL_SSC is not set -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_TI_DAC7512 is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -# CONFIG_BMP085_SPI is not set -# CONFIG_PCH_PHUB is not set -CONFIG_USB_SWITCH_FSA9480=m -# CONFIG_LATTICE_ECP3_CONFIG is not set -# CONFIG_SRAM is not set -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -# CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -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=y -CONFIG_INTEL_MEI_ME=y -CONFIG_VMWARE_VMCI=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_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_UFSHCD_PLATFORM=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_CHELSIO_FCOE=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_ZPODD=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_HIGHBANK=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_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_EDEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -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 -CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=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_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_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -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 -# 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_CAIF_VIRTIO=m -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_RING=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -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_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_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=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_BNX2X_SRIOV=y -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_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_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_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -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 is not set -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -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_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_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_QLCNIC_SRIOV=y -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_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_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_AT803X_PHY=m -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_MDIO_BUS_MUX_MMIOREG=m -# CONFIG_MICREL_KS8995MA 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_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=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_CARDS=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_LEGACY_RATE_CONTROL is not set -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_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -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_USB=y -# CONFIG_BRCM_TRACING is not set -# 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 is not set -# CONFIG_IPW2200 is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEVICE_TRACING=y -# CONFIG_IWLWIFI_P2P 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_SPI is not set -# 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_SPI is not set -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_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_MMIO=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_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -# CONFIG_WL1251_SPI is not set -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -# CONFIG_WLCORE_SPI is not set -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_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_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_MRF24J40 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_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_CYPRESS=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_CYAPA=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_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -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_CYTTSP_SPI is not set -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_TI_AM335X_TSC=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_TSC2005 is not set -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_AD714X_SPI=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_RETU_PWRBUTTON=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_PWM_BEEPER=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -# CONFIG_INPUT_IMS_PCU is not set -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_SERIO_ARC_PS2=m -CONFIG_SERIO_APBPS2=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -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_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=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_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -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_SCCNXP=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_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -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_HW_RANDOM_TPM=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_TIS_I2C_INFINEON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=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_ISMT=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_CBUS_GPIO is not set -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 -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_ISA=m -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 -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set - -# -# Qualcomm MSM SSBI bus support -# -# CONFIG_SSBI 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_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_ACPI=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_TS5500 is not set -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -# CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT is not set -# CONFIG_GPIO_GRGPIO 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 -# CONFIG_GPIO_ADNP 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_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y - -# -# MODULbus GPIO expanders: -# - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -# 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_BQ2415X is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_GPIO=y -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_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set -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_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=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_LM70 is not set -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_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -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 -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=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_ADS7871 is not set -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=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_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_CPU_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_RETU_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_SSB_DRIVER_GPIO=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_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -# CONFIG_MFD_CROS_EC is not set -# CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_EZX_PCAP is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_ABX500_CORE=y -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set -CONFIG_MFD_TI_AM335X_TSCADC=m -# CONFIG_TPS6105X is not set -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -# CONFIG_MFD_TPS65912 is not set -# CONFIG_MFD_TPS65912_SPI is not set -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -# CONFIG_MFD_ARIZONA_SPI is not set -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM831X_SPI is not set -# 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_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_VIDEOBUF2_DMA_SG=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set - -# -# Media drivers -# -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_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=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 - -# -# Analog TV USB devices -# -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_USBVISION=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_AC97=y - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -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 - -# -# 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_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 -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_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 - -# -# Media digital TV PCI Adapters -# -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_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=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 -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_USB_MA901=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 - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# 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_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -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_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# -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 -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m - -# -# 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_TS2020=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 - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -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_DRM_QXL=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y -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_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=m -# 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_GOLDFISH is not set -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_FB_HYPERV=m -# CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI922X is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -CONFIG_LCD_PLATFORM=m -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_HX8357 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PWM=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 -# -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_FB_SSD1307=m -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_CMI8328=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_DSP_LOADER=y -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_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=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_SPI=y -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_SCS1X=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_APPLEIR=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_ICADE=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_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_PS3REMOTE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=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_THINGM=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 -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -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_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=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_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -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_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_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -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 - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -# CONFIG_USB_DWC3 is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -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_XSENS_MT=m -CONFIG_USB_SERIAL_ZIO=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=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 -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -# CONFIG_OMAP_CONTROL_USB is not set -# CONFIG_OMAP_USB3 is not set -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m -# CONFIG_USB_GPIO_VBUS is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=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_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=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_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -# 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_MASS_STORAGE=m -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 -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_ACPI=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_MMC_REALTEK_PCI=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_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -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 -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA9633=m -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_PWM is not set -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_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -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 - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y -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_SYSTOHC=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_PCF8523=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 -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_RX4581 is not set - -# -# 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_DS2404=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_SNVS=m - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC=m -# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m -CONFIG_DMA_ENGINE=y -CONFIG_DMA_ACPI=y -CONFIG_DMA_OF=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_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=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_HYPERV_BALLOON=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_NI_LABPC_ISA=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_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=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_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=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_PCI7X3X=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_PCI1724=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_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_PCI=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_DAS08=m -CONFIG_COMEDI_NI_LABPC=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_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZSMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -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_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -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_ZILOG=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=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_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y -# CONFIG_ZCACHE_DEBUG is not set -# CONFIG_USB_DWC2 is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_CHROMEOS_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 -CONFIG_PVPANIC=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKSRC_I8253=y -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -# CONFIG_MAILBOX is not set -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 -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -# CONFIG_PM_DEVFREQ is not set -CONFIG_EXTCON=m - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_MEMORY=y -# CONFIG_IIO is not set -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_IRQCHIP=y -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -# CONFIG_RESET_CONTROLLER is not set - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -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 - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=m -CONFIG_EFI_VARS_PSTORE=m -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y - -# -# 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_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_WARN is not set -# 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_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG 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=y -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=y -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -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_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_EFIVAR_FS=y -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=y -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="linux-libre.fsfla.org" -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=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_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -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_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=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_HAVE_DEBUG_KMEMLEAK=y -# 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_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 - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER 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_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS 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_DYNAMIC_FTRACE_WITH_REGS=y -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_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_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -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_DYNAMIC_FTRACE_WITH_REGS=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_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -CONFIG_DYNAMIC_DEBUG=y -# 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_STRING_HELPERS is not set -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_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="/usr/bin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set -# 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_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_CMAC=m -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=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=y -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_CAST_COMMON=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_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_IRQ_ROUTING=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_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_MMU_AUDIT=y -CONFIG_KVM_DEVICE_ASSIGNMENT=y -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_PERCPU_RWSEM=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_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m -CONFIG_UCS2_STRING=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 0937bed6f..3876cbaa8 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.7-1 Kernel Configuration +# Linux/x86 3.10.0-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -18,12 +18,10 @@ 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_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 @@ -100,6 +98,10 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -130,6 +132,9 @@ CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +# CONFIG_RCU_NOCB_CPU_ZERO is not set +# CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -179,19 +184,19 @@ 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_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +# CONFIG_EXPERT is not set 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 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 @@ -200,6 +205,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -209,7 +215,6 @@ CONFIG_HAVE_PERF_EVENTS=y 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 @@ -336,8 +341,10 @@ CONFIG_X86_MPPARSE=y # CONFIG_X86_INTEL_LPSS 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_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PRIVILEGED_GUEST=y @@ -346,10 +353,8 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_MK8 is not set @@ -538,7 +543,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -577,6 +582,7 @@ CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -649,8 +655,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=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 @@ -661,6 +665,7 @@ 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_ENUM_BASIC=m CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_CPS_XX=y CONFIG_RAPIDIO_TSI568=y @@ -674,6 +679,7 @@ 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_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y @@ -716,6 +722,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m # CONFIG_NET_IPGRE_BROADCAST is not set CONFIG_IP_MROUTE=y @@ -1108,7 +1115,6 @@ 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_PHONET=m @@ -1177,10 +1183,13 @@ CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1356,15 +1365,17 @@ 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_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m CONFIG_HAVE_BPF_JIT=y # @@ -1410,7 +1421,6 @@ 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 @@ -1491,9 +1501,6 @@ 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 @@ -1502,7 +1509,6 @@ CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m # 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 @@ -1585,6 +1591,7 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1615,6 +1622,7 @@ CONFIG_BMP085_I2C=m CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1642,7 +1650,7 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1736,6 +1744,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m CONFIG_VMWARE_PVSCSI=m @@ -1905,6 +1914,10 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -1975,6 +1988,7 @@ CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m @@ -2031,6 +2045,10 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m # # Distributed Switch Architecture drivers @@ -2061,6 +2079,7 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +CONFIG_ALX=m CONFIG_NET_CADENCE=y CONFIG_ARM_AT91_ETHER=m CONFIG_MACB=m @@ -2169,6 +2188,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2202,8 +2222,6 @@ CONFIG_STMMAC_ETH=m 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 @@ -2278,6 +2296,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX88179_178A=m @@ -2356,6 +2375,7 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y @@ -2390,7 +2410,6 @@ 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_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set @@ -2405,6 +2424,7 @@ CONFIG_HOSTAP_CS=m CONFIG_IWLWIFI=m CONFIG_IWLDVM=m CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y # # Debugging Options @@ -2457,6 +2477,7 @@ CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_MMIO=m @@ -2473,6 +2494,7 @@ CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8188EE=m CONFIG_RTL8192CU=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y @@ -2834,6 +2856,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m +# CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m @@ -3071,6 +3094,11 @@ CONFIG_SPI_PXA2XX_PCI=m # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set + +# +# Qualcomm MSM SSBI bus support +# +CONFIG_SSBI=m # CONFIG_HSI is not set # @@ -3197,6 +3225,8 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m @@ -3243,6 +3273,7 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m # CONFIG_SENSORS_MAX1111 is not set @@ -3255,6 +3286,7 @@ CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m @@ -3421,46 +3453,50 @@ CONFIG_BCMA_DRIVER_GPIO=y # Multifunction device drivers # CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_RTSX_PCI=m +CONFIG_ABX500_CORE=y +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set CONFIG_MFD_TI_AM335X_TSCADC=m -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_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_STMPE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_VX855=m CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m # CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -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_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3488,6 +3524,7 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -3646,7 +3683,6 @@ 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 @@ -3790,16 +3826,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3813,9 +3852,11 @@ CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m # # RDS decoders @@ -3832,6 +3873,9 @@ CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_VPX3220=m # @@ -3851,6 +3895,7 @@ CONFIG_VIDEO_ADV7175=m # # Camera sensor devices # +CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_MT9V011=m # @@ -3871,7 +3916,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -3901,6 +3945,8 @@ CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m # # Multistandard (satellite) frontends @@ -4076,6 +4122,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_HDMI=y @@ -4092,7 +4139,6 @@ 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 @@ -4151,12 +4197,14 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI922X is not set # CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set @@ -4385,6 +4433,7 @@ CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4480,10 +4529,9 @@ CONFIG_USB=m # # Miscellaneous USB options # +CONFIG_USB_DEFAULT_PERSIST=y 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 @@ -4499,6 +4547,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m @@ -4506,7 +4555,6 @@ 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 @@ -4523,10 +4571,10 @@ CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m # @@ -4566,6 +4614,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set # # USB port drivers @@ -4637,6 +4689,7 @@ CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m @@ -4668,19 +4721,21 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m - -# -# USB Physical Layer drivers -# -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +# CONFIG_OMAP_CONTROL_USB is not set +# CONFIG_OMAP_USB3 is not set +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4693,7 +4748,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m @@ -4706,6 +4763,8 @@ CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4732,13 +4791,6 @@ 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 @@ -4806,6 +4858,7 @@ CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m @@ -4819,11 +4872,11 @@ CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_TRIGGERS=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m @@ -4836,6 +4889,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # iptables trigger is under Netfilter config (LED target) # CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -4954,6 +5008,7 @@ CONFIG_DW_DMAC=m CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y # # DMA Clients @@ -4981,6 +5036,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=m # @@ -5014,7 +5070,7 @@ 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_TMEM=m CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m @@ -5062,6 +5118,7 @@ CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m CONFIG_COMEDI_ADV_PCI1710=m CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m CONFIG_COMEDI_AMPLC_DIO200_PCI=m CONFIG_COMEDI_AMPLC_PC236_PCI=m @@ -5090,7 +5147,7 @@ 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_LABPC_PCI=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m @@ -5117,8 +5174,8 @@ 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_LABPC=m CONFIG_COMEDI_NI_TIO=m CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set @@ -5140,9 +5197,9 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5184,14 +5241,8 @@ CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=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 @@ -5223,8 +5274,11 @@ CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y -CONFIG_RAMSTER=y +CONFIG_ZCACHE=m +# CONFIG_ZCACHE_DEBUG is not set +CONFIG_RAMSTER=m +# CONFIG_RAMSTER_DEBUG is not set +# CONFIG_USB_DWC2 is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5272,6 +5326,7 @@ CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m CONFIG_APPLE_GMUX=m +CONFIG_PVPANIC=m # # Hardware Spinlock drivers @@ -5300,7 +5355,6 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set CONFIG_EXTCON=m @@ -5316,6 +5370,7 @@ CONFIG_MEMORY=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -5323,9 +5378,6 @@ CONFIG_SERIAL_IPOCTAL=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -5335,6 +5387,13 @@ CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y + +# # File systems # CONFIG_DCACHE_WORD_ACCESS=y @@ -5363,6 +5422,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_DLM=y @@ -5375,6 +5435,8 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5502,6 +5564,7 @@ CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -5703,6 +5766,8 @@ CONFIG_LKDTM=m # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -5733,6 +5798,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5749,6 +5815,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -5761,6 +5828,7 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y @@ -5789,7 +5857,6 @@ 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 # @@ -5828,8 +5895,6 @@ 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 # @@ -5841,7 +5906,7 @@ CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y @@ -5882,6 +5947,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -5890,7 +5956,6 @@ CONFIG_CRYPTO_VMAC=m # Digest # CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_X86_64=y CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m @@ -5904,6 +5969,8 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m @@ -5924,6 +5991,7 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5_AVX_X86_64=m @@ -5938,6 +6006,7 @@ CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m @@ -5969,6 +6038,7 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y @@ -5980,8 +6050,7 @@ 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_KVM_DEVICE_ASSIGNMENT=y CONFIG_BINARY_PRINTF=y # diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10 deleted file mode 100644 index ed592fa43..000000000 --- a/libre/linux-libre/config.x86_64.3.10 +++ /dev/null @@ -1,6125 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc7 Kernel Configuration -# -CONFIG_64BIT=y -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_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=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_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-LIBRE" -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_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -CONFIG_AUDIT_LOGINUID_IMMUTABLE=y -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_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# 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_STALL_COMMON=y -# CONFIG_RCU_USER_QS is not set -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_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set -# CONFIG_RCU_NOCB_CPU_ALL is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_ARCH_USES_NUMA_PROT_NONE=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_NUMA_BALANCING=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_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_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HOTPLUG=y -CONFIG_HAVE_PCSPKR_PLATFORM=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_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_PCI_QUIRKS=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_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_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=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_KPROBES_ON_FTRACE=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_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_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=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_MODULE_SIG 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_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -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_INTEL_LPSS is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set -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_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PARAVIRT_CLOCK=y -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_L1_CACHE_SHIFT=6 -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_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 is not set -# CONFIG_MICROCODE_AMD is not set -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_MOVABLE_NODE is not set -CONFIG_HAVE_BOOTMEM_INFO_NODE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_BALLOON_COMPACTION=y -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_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 -# 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_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# 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=y -CONFIG_PM_TRACE_RTC=y -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_I2C=m -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_INITRD_TABLE_OVERRIDE=y -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -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_GOV_COMMON=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_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ_CPB=y -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_AMD_FREQ_SENSITIVITY=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_MULTIPLE_DRIVERS is not set -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_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_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_ENUM_BASIC=m -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_BINFMT_SCRIPT=y -# 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 -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_PACKET_DIAG=m -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_IP_TUNNEL=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=y -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_GRE=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_CONNTRACK_LABELS=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_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 - -# -# 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_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 -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_BPF=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=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_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_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_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=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_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 -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 -# -# 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_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# 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_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_VLAN_8021Q_MVRP=y -# 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_X25 is not set -# CONFIG_LAPB 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_DAT=y -CONFIG_BATMAN_ADV_NC=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y -CONFIG_NETLINK_DIAG=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 - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_MEI=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_FW_LOADER_USER_HELPER is not set -# 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_MMIO=m -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y - -# -# Bus devices -# -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_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -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_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L 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_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_ECC_BCH is not set -CONFIG_MTD_SM_COMMON=m -# 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_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -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_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_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -# CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_DUMMY_IRQ is not set -# 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_ATMEL_SSC is not set -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_TI_DAC7512 is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -# CONFIG_BMP085_SPI is not set -CONFIG_PCH_PHUB=m -CONFIG_USB_SWITCH_FSA9480=m -# CONFIG_LATTICE_ECP3_CONFIG is not set -# CONFIG_SRAM is not set -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -# CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -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=y -CONFIG_INTEL_MEI_ME=y -CONFIG_VMWARE_VMCI=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_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_UFSHCD_PLATFORM=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_CHELSIO_FCOE=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_ZPODD=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_HIGHBANK=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_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_EDEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -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 -CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=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_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_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -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 -# 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_CAIF_VIRTIO=m -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_RING=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=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_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=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_BNX2X_SRIOV=y -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_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_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -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 is not set -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -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_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_QLCNIC_SRIOV=y -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_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_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_AT803X_PHY=m -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_MICREL_KS8995MA 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_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=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_CARDS=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_LEGACY_RATE_CONTROL is not set -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_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -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_USB=y -# CONFIG_BRCM_TRACING is not set -# 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 is not set -# CONFIG_IPW2200 is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEVICE_TRACING=y -# CONFIG_IWLWIFI_P2P 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_SPI is not set -# 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_SPI is not set -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_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_MMIO=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_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -# CONFIG_WL1251_SPI is not set -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -# CONFIG_WLCORE_SPI is not set -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_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_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_MRF24J40 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_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_CYPRESS=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_CYAPA=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_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -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_CYTTSP_SPI is not set -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=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_TI_AM335X_TSC=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_TSC2005 is not set -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_AD714X_SPI=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_RETU_PWRBUTTON=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_ADXL34X_SPI=m -# CONFIG_INPUT_IMS_PCU is not set -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_SERIO_ARC_PS2=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -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_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=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_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -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 -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -# CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -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_HW_RANDOM_TPM=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_TIS_I2C_INFINEON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=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_ISMT=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_CBUS_GPIO is not set -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 -CONFIG_I2C_VIPERBOARD=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=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set - -# -# Qualcomm MSM SSBI bus support -# -CONFIG_SSBI=m -# 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_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_ACPI=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_TS5500 is not set -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -# CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT 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_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=y - -# -# MODULbus GPIO expanders: -# - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -# 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_BQ2415X is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set -CONFIG_POWER_RESET=y -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_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set -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_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=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_LM70 is not set -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_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -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 -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=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_ADS7871 is not set -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=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_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_CPU_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_RETU_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_SSB_DRIVER_GPIO=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_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -# CONFIG_MFD_CROS_EC is not set -# CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -# CONFIG_MFD_MC13XXX_SPI is not set -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_EZX_PCAP is not set -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_ABX500_CORE=y -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set -CONFIG_MFD_TI_AM335X_TSCADC=m -# CONFIG_TPS6105X is not set -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -# CONFIG_MFD_TPS65912 is not set -# CONFIG_MFD_TPS65912_SPI is not set -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -# CONFIG_MFD_ARIZONA_SPI is not set -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM831X_SPI is not set -# 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_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_VIDEOBUF2_DMA_SG=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set - -# -# Media drivers -# -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_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=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 - -# -# Analog TV USB devices -# -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_USBVISION=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_AC97=y - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -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 - -# -# 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_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 -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_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 - -# -# Media digital TV PCI Adapters -# -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_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=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 -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_USB_MA901=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 - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# 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_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -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_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# -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 -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m - -# -# 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_TS2020=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 - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -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_DRM_QXL=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y -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_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=m -# 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_GOLDFISH is not set -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_FB_HYPERV=m -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI922X is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -CONFIG_LCD_PLATFORM=m -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_HX8357 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_LM3533=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 -# -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_DSP_LOADER=y -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_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=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_SPI=y -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_SCS1X=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_APPLEIR=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_ICADE=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_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_PS3REMOTE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=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_THINGM=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 -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -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_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=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_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -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_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_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -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 - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -# CONFIG_USB_DWC3 is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -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_XSENS_MT=m -CONFIG_USB_SERIAL_ZIO=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=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 -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -# CONFIG_OMAP_CONTROL_USB is not set -# CONFIG_OMAP_USB3 is not set -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m -# CONFIG_USB_GPIO_VBUS is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=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_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=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_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -# 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_MASS_STORAGE=m -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 -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_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -# CONFIG_MMC_SPI is not set -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_REALTEK_PCI=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_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -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 -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA9633=m -# CONFIG_LEDS_DAC124S085 is not set -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_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -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 - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set -CONFIG_EDAC=y -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_SYSTOHC=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_PCF8523=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 -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_RX4581 is not set - -# -# 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_DS2404=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MC13XXX=m - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC=m -# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m -CONFIG_DMA_ENGINE=y -CONFIG_DMA_ACPI=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_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=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 -CONFIG_HYPERV_BALLOON=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=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=m -# CONFIG_XEN_MCE_LOG is not set -CONFIG_XEN_HAVE_PVMMU=y -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_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=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_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=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_PCI7X3X=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_PCI1724=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_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_PCI=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_DAS08=m -CONFIG_COMEDI_NI_LABPC=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_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZSMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -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_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -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_ZILOG=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=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_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_ZCACHE=y -# CONFIG_ZCACHE_DEBUG is not set -CONFIG_RAMSTER=y -# CONFIG_RAMSTER_DEBUG is not set -# CONFIG_USB_DWC2 is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_CHROMEOS_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 -CONFIG_PVPANIC=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -# CONFIG_MAILBOX is not set -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 -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -# CONFIG_PM_DEVFREQ is not set -CONFIG_EXTCON=m - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_MEMORY=y -# CONFIG_IIO is not set -# CONFIG_NTB is not set -# CONFIG_VME_BUS is not set -# CONFIG_PWM is not set -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -# CONFIG_RESET_CONTROLLER is not set - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -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 - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=m -CONFIG_EFI_VARS_PSTORE=m -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y - -# -# 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_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_WARN is not set -# 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_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG 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=y -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=y -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -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_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_EFIVAR_FS=y -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=y -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="linux-libre.fsfla.org" -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=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_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -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_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=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_HAVE_DEBUG_KMEMLEAK=y -# 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_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 - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER 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_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS 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_DYNAMIC_FTRACE_WITH_REGS=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_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_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -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_DYNAMIC_FTRACE_WITH_REGS=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_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -CONFIG_DYNAMIC_DEBUG=y -# 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_STRING_HELPERS is not set -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_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="/usr/bin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set -# 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_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_CMAC=m -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=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_SSSE3=m -CONFIG_CRYPTO_SHA512_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=y -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_CAMELLIA_AESNI_AVX_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m -CONFIG_CRYPTO_CAST_COMMON=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 -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_SERPENT_AVX2_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_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_IRQ_ROUTING=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_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_MMU_AUDIT=y -CONFIG_KVM_DEVICE_ASSIGNMENT=y -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_PERCPU_RWSEM=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_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m -CONFIG_UCS2_STRING=y diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index fc749260c..d7a86197a 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189186 2013-06-28 18:41:29Z foutrelis $ +# $Id: PKGBUILD 191260 2013-07-22 12:53:01Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=49 +pkgrel=52 epoch=1 -_extramodules=extramodules-3.9-LIBRE +_extramodules=extramodules-3.10-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre>=3.9' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.10' 'linux-libre<3.11' 'linux-libre-headers>=3.10' 'linux-libre-headers<3.11' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -59,7 +59,7 @@ build() { package_lirc-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.9' 'linux-libre<3.10') + depends=('lirc-utils-libre' 'linux-libre>=3.10' 'linux-libre<3.11') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index cd4a57231..09c6c1750 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.9-LIBRE +EXTRAMODULES=extramodules-3.10-LIBRE post_install() { # updating module dependencies diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 443f45485..0c109a5d1 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,54 +1,61 @@ -# $Id: PKGBUILD 93800 2013-07-10 11:24:05Z stativ $ +# $Id$ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgname=luxrender-libre -_pkgflag=libre +_pkgname=luxrender +pkgname=$_pkgname-libre pkgver=1.2.1 _pkgver=3066b2161439 pkgrel=5 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') -url="http://www.${pkgname%-$_pkgflag}.net/" +url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') -provides=(${pkgname%-$_pkgflag}=$pkgver) -conflicts=${pkgname%-$_pkgflag} -replaces=${pkgname%-$_pkgflag} -source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends+=('gcc-lts') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 boost-1.53-shared_array_constructor.diff) md5sums=( '87958798c164ad14f92fb4af2595d332' 'dd19c7ac2ba8c9b703018a176ef77f98') -build() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver +prepare() { + cd "$srcdir"/$_pkgname-lux-$_pkgver # fix the installation - sed -i '/.*wxgui.*/ d' CMakeLists.txt + sed -i '/.*wxgui.*/ d + s|-ftree-vectorize || + ' CMakeLists.txt # fix for boost 1.53 patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" - setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \ +} + +build() { + cd "$srcdir"/$_pkgname-lux-$_pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ - . - setarch $CARCH make + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m + make } package() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver + cd "$srcdir"/$_pkgname-lux-$_pkgver setarch $CARCH make DESTDIR="$pkgdir" install - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + # fix library path on 64bit + [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch new file mode 100644 index 000000000..c8a527cf3 --- /dev/null +++ b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch @@ -0,0 +1,34 @@ +From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl> +Date: Sun, 14 Jul 2013 10:51:11 +0200 +Subject: [PATCH] demux_gif: declare missing PrintGifError + +Apparently it has been removed from newer Giflib releases. +--- + libmpdemux/demux_gif.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c +index eee7a85..3d761c0 100644 +--- a/libmpdemux/demux_gif.c ++++ b/libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++static void PrintGifError(void) ++{ ++ char *Err = GifErrorString(); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +-- +1.8.3.2 + diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index a49b889bd..36bf2f4ff 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ +# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -18,15 +18,18 @@ url="http://www.mplayerhq.hu/" options=('!buildflags' '!emptydirs') source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop - cdio-includes.patch) + cdio-includes.patch + 0001-demux_gif-declare-missing-PrintGifError.patch) md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc') + '7b5be7191aafbea64218dc4916343bbc' + '12a2a5b79849d57eab60a1bfec2978c4') prepare() { cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch + patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch } build() { diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 311c469ca..9923b356b 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $ +# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +_pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre -pkgver=35107 -pkgrel=8 -pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" +pkgver=36265 +pkgrel=3 +pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') @@ -19,25 +20,26 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver") conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz +source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} cdio-includes.patch tweak-desktop-file.patch subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install -sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' +sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' + 'SKIP' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') prepare() { - cd "$srcdir/mplayer-vaapi-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" @@ -47,13 +49,14 @@ prepare() { } build() { - cd "$srcdir/mplayer-vaapi-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" ./configure \ --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ --disable-arts \ + --disable-gif \ --disable-liblzo \ --enable-speex \ --disable-cdparanoia \ @@ -78,7 +81,7 @@ build() { } package() { - cd "$srcdir/mplayer-vaapi-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index 05e7d8cbb..f0ff93a83 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -1,29 +1,28 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> + +_bldname=blender +_bldver=2.68 +_bldep=10 + +# ($srcdir/Tools/${_bldname^}2.5Export/__init__.py:bl_info>version) +_addver=2.0.1 +_addrel=1 pkgbase=ogre pkgname=( - ogre-libre - #ogre-docs -) -pkgflag=( - -libre - -docs + $pkgbase-libre + #$_bldname-addon-$pkgbase # package unstable ) pkgver=1.8.1 -pkgrel=4 -pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts' +pkgrel=5 +pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) -url="http://www.${pkgbase}3d.org" -license=( - 'MIT:(software)' - 'cc by-sa:(sinbad character)' -) +url=http://www.${pkgbase}3d.org +license=MIT depends=( boost-libs freeimage @@ -39,26 +38,20 @@ makedepends=( cmake doxygen graphviz - intel-tbb mesa - #poco ttf-dejavu ) -install=$pkgbase.install -source=( - "https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2" -) -sha512sums=( - 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 -) +source=https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2 +sha512sums=0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 build() { cd $srcdir/${pkgbase}_src_v${pkgver//./-} # get a clean build dir - [[ -d build ]] && rm -rf build - mkdir build && cd build + [[ -d build ]] && rm -vrf build + mkdir -v build && cd build + # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree cmake .. \ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr\ @@ -67,120 +60,72 @@ build() { -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ - -D${pkgbase^^}_BUILD_PLATFORM_APPLE_IOS=FALSE\ + -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_CG=FALSE\ -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D9=FALSE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D11=FALSE\ -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ - -D${pkgbase^^}_BUILD_SAMPLES=TRUE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_SAMPLES=FALSE\ -D${pkgbase^^}_BUILD_TESTS=FALSE\ -D${pkgbase^^}_BUILD_TOOLS=TRUE\ -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\ -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_GLES2_CG_SUPPORT=FALSE\ - -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=FALSE\ + -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\ -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\ -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\ -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\ -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\ - -D${pkgbase^^}_INSTALL_DOCS=TRUE\ - -D${pkgbase^^}_INSTALL_SAMPLES=TRUE\ - -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=TRUE\ + -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\ + -D${pkgbase^^}_INSTALL_DOCS=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\ -D${pkgbase^^}_INSTALL_TOOLS=TRUE\ -D${pkgbase^^}_LIB_DIRECTORY=lib\ -D${pkgbase^^}_PROFILING=TRUE\ -D${pkgbase^^}_USE_BOOST=TRUE make V=0 - - # generate docs - if [[ $(which dot) && $(which doxygen) ]]; then - make V=0 doc - fi } package_ogre-libre() { optdepends=( - 'intel-tbb: better threading support' - #'poco: portability' "boost: for developing using $pkgbase" - "$pkgbase${pkgflag[1]}: documentation" - ) - provides=( - $pkgbase=$pkgver - ) - conflicts=( - $pkgbase - ) - replaces=( - $pkgbase + "$pkgbase-docs: documentation" ) + provides=($pkgbase=$pkgver) + conflicts=$pkgbase + replaces=$pkgbase cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build make DESTDIR=$pkgdir install - # fix samplebrowser name - mv $pkgdir/usr/bin/SampleBrowser $pkgdir/usr/bin/${pkgbase^}SampleBrowser - - ## LIBRE PATCH ## - # drop cg shaders, hlsl shaders, unusable headers, unusable samples, nonfree fonts and nonfree arts - rm -fv $pkgdir/usr/include/${pkgbase^^}/RTShaderSystem/${pkgbase^}Shader{CG,HLSL}Program{Processor,Writer}.h - rm -fv $pkgdir/usr/lib/${pkgbase^^}/Samples/Sample_{BSP,CelShading,Dot3Bump,Fresnel,SSAO}.so - rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/{BSP,CelShading,Dot3Bump,Fresnel,SSAO} - rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/materials/textures/nvidia - rm -fv $pkgdir/usr/share/${pkgbase^^}/media/packs/{chiropteraDM.{pk3,txt},cubemapsJS.zip} - rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/fonts - sed -i -e ' - /BSP/d - /CelShading/d - /Dot3Bump/d - /Fresnel/d - /SSAO/d - ' $pkgdir/usr/share/${pkgbase^^}/samples.cfg - sed -i -e ' - /Direct3D9/d - /Direct3D11/d - /CgProgramManager/d - ' $pkgdir/usr/share/${pkgbase^^}/plugins.cfg - sed -i -e ' - /cubemapsJS/d - /fonts/d - /nvidia/d - ' $pkgdir/usr/share/${pkgbase^^}/resources.cfg - find $pkgdir -type f -name *.cg -delete - find $pkgdir -type f -name *.hlsl -delete - rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/Android - rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/include/SampleBrowser_{NaCl,OSX,iOS}.h - rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/src/FileSystemLayerImpl_{{Android,NaCl,OSX,WIN32}.cpp,iOS.mm} - # install license - install -Dm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html + install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html - # move docs out of this package - mv $pkgdir/usr/share/${pkgbase^^}/docs $srcdir/docs + # remove nonfree files + rm -vr $pkgdir/usr/lib/OGRE/cmake + rm -v $pkgdir/usr/include/OGRE/Example*.h } -package_ogre-docs() { - pkgdesc="Documentation for $pkgbase" +package_blender-addon-ogre() { + pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)" + arch=any depends=( + "$_bldname-libre>=$(($_bldep-1)):$_bldver" + "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" ) + _pkgver=$pkgver + pkgver=$_addver.v$_bldver + pkgrel=$_addrel - 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/${pkgbase^^} - - # symlink for docs - install -dm755 $pkgdir/usr/share/${pkgbase^^} - cd $pkgdir/usr/share - ln -s doc/${pkgbase^^} ${pkgbase^^}/docs + cd $srcdir/${pkgbase}_src_v${_pkgver//./-} + a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons + install -vd $a && cp -va Tools/${_bldname^}2.5Export $a/$pkgbase } # vim:set ts=2 sw=2 et: diff --git a/libre/ogre-libre/ogre.install b/libre/ogre-libre/ogre.install deleted file mode 100644 index c05ad1ed3..000000000 --- a/libre/ogre-libre/ogre.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "To view the OGRE samples just run OgreSampleBrowser" -} diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD new file mode 100644 index 000000000..ff25fb014 --- /dev/null +++ b/libre/openexr-libre/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=openexr +pkgname=openexr-libre +pkgver=2.0.1 +pkgrel=1 +pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" +url="http://www.openexr.com/" +arch=('i686' 'x86_64' 'mips64el') +license=('BSD') +depends=('zlib' 'ilmbase') +makedepends=('libreoffice-writer' 'jre7-openjdk-headless' 'libcups' 'libxinerama') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +options=('!libtool') +source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") +noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # remove documentation with embedded nonfree fonts + rm -rv "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.pdf + + # add source documentation with free fonts + install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc + + # convert documentation to pdf format + cd doc + + for x in ${noextract[@]}; do + libreoffice --headless --invisible --convert-to pdf ${x} + done + + cd .. + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + + install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" +} +md5sums=('4387e6050d2faa65dd5215618ff2ddce' + '69f117d3c91827e5de47f1e00137a4cc' + '4d5ffa31f9af63bd5c621c6cbac6c673' + 'de099240193d8a51086dfae914fff3cf' + 'ece8bf90d438b89c6bd9fe4a89cc318a') diff --git a/extra/openexr/gcc43.patch b/libre/openexr-libre/gcc43.patch index ab99eb9a1..ab99eb9a1 100644 --- a/extra/openexr/gcc43.patch +++ b/libre/openexr-libre/gcc43.patch diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 212c3beb0..408b6a5eb 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('d876a03f772de98905fd7eadf0ad5e1c' +md5sums=('d50f8ba9f108b38c0e084d21742ea059' 'SKIP') diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index 4220394dc..0a49ce048 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -1,63 +1,37 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -. "${startdir:-.}/helper.sh" -# provides: -# _get_depends -# _get_depends_nover (no version requirements) - -pkgname=parabolaweb-utils -pkgver=20120425.0657 -pkgdesc="Utils for the Parabola website" -url="https://projects.parabolagnulinux.org/parabolaweb.git/" +pkgname=(parabolaweb-utils parabolaweb-dev) +pkgver=20130717 +pkgdesc="Utilities for managing the parabolaweb website application" +url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/" license=('GPL2') pkgrel=1 epoch=1 arch=('any') -depends=( - 'python2' # duh - 'python2-flup' # for fcgi - 'postgresql' # for database - 'git' # used in parabolaweb-download - 'libretools' # used in parabolaweb-{download,update} (libremessages) - `_get_depends`) -conflicts=('django>=1.5') # hold it at 1.4 -makedepends=(makepkg-git) -backup=('etc/conf.d/parabolaweb') -source=(git://parabolagnulinux.org/parabolaweb.git - parabolaweb-download - parabolaweb-update - parabolaweb-fcgi - parabolaweb.rc - parabolaweb.service - parabolaweb.conf) +source=( + "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" + "https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt" +) -pkgver() { - cd "$srcdir/parabolaweb" - # get the date requirements_prod.txt was last modified - gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)" - date -u +%Y%m%d.%H%M -d "$gitdate" +build() { + cd "$srcdir/$pkgname-$pkgver" + prod_file="file://${srcdir}/requirements_prod.txt" make } -build() { - : +package_parabolaweb-utils() { + cd "$srcdir/$pkgbase-$pkgver" + depends=($(cat depends.txt)) + backup=('etc/conf.d/parabolaweb') + make install DESTDIR="$pkgdir" } -package() { - cd "${srcdir}" - install -Dm755 parabolaweb-download "${pkgdir}/usr/sbin/parabolaweb-download" - install -Dm755 parabolaweb-update "${pkgdir}/usr/sbin/parabolaweb-update" - install -Dm755 parabolaweb-fcgi "${pkgdir}/usr/sbin/parabolaweb-fcgi" - install -Dm755 parabolaweb.rc "${pkgdir}/etc/rc.d/parabolaweb" - install -Dm644 parabolaweb.service "${pkgdir}/usr/lib/systemd/system/parabolaweb.service" - install -Dm644 parabolaweb.conf "${pkgdir}/etc/conf.d/parabolaweb" +package_parabolaweb-dev() { + cd "$srcdir/$pkgbase-$pkgver" + pkgdesc="Depends on packages needed to develop parabolaweb" + depends=($(sed -r -e 's/\s*#.*//' depends_make.txt)) } -md5sums=('SKIP' - 'f162c2ce49b4cafe0a14bd4767dfea04' - '7c212024c134fdd0d0318b52a5448ddb' - 'd5294495f42df29d29519ebd0a8f6093' - 'cc15e153f99fba82e7bb032896f655c2' - 'a468016a7155b5da46521dcfc6428384' - 'ffd37a19b1a72fbac2c58504aa17b355') +md5sums=('a6734335001c7695d5a57fb509f8a745' + 'c84e52d81683cb3d572571ac19be89ac') diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh deleted file mode 100644 index ce8638e7e..000000000 --- a/libre/parabolaweb-utils/helper.sh +++ /dev/null @@ -1,25 +0,0 @@ -_mksource() { - pushd "${startdir:-.}" >/dev/null - if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then - local flags=(-o) - (( EUID )) || flags+=(--asroot) - _DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}" - fi - popd >/dev/null -} - -_get_depends() { - _mksource 1>&2 - if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then - pushd "${srcdir:-src}" >/dev/null - < parabolaweb/requirements_prod.txt sed -r \ - -e 's/.*/\L&/' -e 's/==/>=/' \ - -e 's/^(python2?-)?/python2-/' \ - -e 's/python2-django/django/' - popd >/dev/null - fi -} - -_get_depends_nover() { - _get_depends | sed 's/[<>=].*//' -} diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download deleted file mode 100644 index e124295d4..000000000 --- a/libre/parabolaweb-utils/parabolaweb-download +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/parabolaweb -. /usr/bin/libremessages - -dir=$WEBDIR -repo=$GITURL -ref=$GITREF - -cd_safe() { - if ! cd "$1"; then - error "$(gettext "Failed to change to directory %s")" "$1" - plain "$(gettext "Aborting...")" - exit 1 - fi -} - -download_git() { - if [[ ! -d "$dir/.git" ]] ; then - msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone "$repo" "$dir"; then - error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi - else - cd_safe "$dir" - # Make sure we are fetching the right repo - if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then - error "$(gettext "%s is not a clone of %s")" "$dir" "$repo" - plain "$(gettext "Aborting...")" - exit 1 - fi - msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" - if ! git pull origin "$ref"; then - # only warn on failure to allow offline builds - warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" - fi - fi -} - -main() { - [[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}" - download_git -} - -main "$@" diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi deleted file mode 100644 index e42aec3cd..000000000 --- a/libre/parabolaweb-utils/parabolaweb-fcgi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -. /etc/conf.d/parabolaweb - -[[ -e ${WEBDIR}/manage.py ]] - -sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \ - host=${HOST} \ - port=${PORT} \ - --settings=settings \ - "$@" diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update deleted file mode 100644 index 2da9eea8a..000000000 --- a/libre/parabolaweb-utils/parabolaweb-update +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -set -e - -. /etc/conf.d/parabolaweb -. /usr/bin/libremessages - -find_makefiles() { - pushd "$WEBDIR" > /dev/null - echo ./sitestatic - find . -name static -type d | while read dir; do - if [[ -e "$WEBDIR/$dir/Makefile" ]]; then - printf '%s\n' "$dir" - fi - done -} - -clean() { - cd "$WEBDIR" - msg "Purging old .pyc files..." - find . -name '*.pyc' -delete - msg "Purging old GNU Make generated files..." - for dir in `find_makefiles`; do - make -C "$WEBDIR/$dir" clean - done -} - -configure() { - cd "$WEBDIR" - msg "Checking configuration..." - if [[ ! -f local_settings.py ]]; then - msg2 "Configuration file missing, opening editor..." - cp local_settings.py.example local_settings.tmp.$$.py - if "$EDITOR" local_settings.tmp.$$.py; then - mv local_settings.tmp.$$.py local_settings.py - else - rm local_settings.tmp.$$.py - msg "Failed to configure, exiting" - exit 1 - fi - msg2 "Creating database..." - ./manage.py syncdb - else - msg2 "Current configuration checks out" - fi -} - -update-database() { - cd "$WEBDIR" - msg "Updating database..." - msg2 "Running migrations..." - ./manage.py migrate - if [[ -f devel/management/commands/update_types_permissions.py ]]; then - msg2 "Updating permissions..." - ./manage.py update_types_permissions - fi - msg2 "Loading fixtures..." - ./manage.py loaddata */fixtures/*.json -} - -update-filesystem() { - msg "Updating filesystem..." - for dir in `find_makefiles`; do - msg2 "Updating $dir with GNU Make..." - make -C "$WEBDIR/$dir" - done - cd "$WEBDIR" - msg2 "Collecting static files..." - echo yes | ./manage.py collectstatic -l -} - -main() { - if [[ -z "$EDITOR" ]]; then - error 'Please set the $EDITOR variable' - exit 1 - fi - - if [[ -d "$WEBDIR" ]]; then - clean - fi - parabolaweb-download - configure - update-database - update-filesystem -} - -main "$@" diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf deleted file mode 100644 index 5363479b3..000000000 --- a/libre/parabolaweb-utils/parabolaweb.conf +++ /dev/null @@ -1,6 +0,0 @@ -HOST=127.0.0.1 -PORT=8090 # 80 is nginx -WEBDIR=/srv/http/web -WEBUSER=nobody -GITURL=git://parabolagnulinux.org/parabolaweb.git -GITREF=master diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc deleted file mode 100644 index 5e310b01d..000000000 --- a/libre/parabolaweb-utils/parabolaweb.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/run/web/parabolaweb.pid - -case $1 in -start) - stat_busy "Starting ParabolaWeb" - install -dm777 ${PIDFILE%/*} - if parabolaweb-fcgi pidfile=${PIDFILE}; then - add_daemon parabolaweb - stat_done - exit 0 - else - stat_fail - exit 1 - fi - ;; - -stop) - stat_busy "Stopping ParabolaWeb" - if [[ -f ${PIDFILE} ]]; then - pid=$(cat ${PIDFILE}) - kill ${pid} - rm_daemon parabolaweb - stat_done - else - stat_fail - exit 1 - fi - ;; - -restart) - $0 stop - $0 start - ;; - -*) - echo "Usage: $0 {start|stop|restart}" >&2 - exit 1 - -esac diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service deleted file mode 100644 index a59d58512..000000000 --- a/libre/parabolaweb-utils/parabolaweb.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Requires=postgresql.service -After=postgresql.service -Description=ParabolaWeb - -[Service] -Type=forking -PIDFile=/run/web/parabolaweb.pid -ExecStartPre=/usr/bin/install -dm777 /run/web -ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid - -[Install] -WantedBy=multi-user.target diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index b8872fa5d..5e87a1e8c 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $ +# $Id: PKGBUILD 94548 2013-07-26 17:20:11Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('1c18d9227bac57a910e2a7b2e18870d8') +md5sums=('8b6684e693bf1af604dec8fab837447b') build() { cd "$srcdir"/$_pkgname-$pkgver @@ -47,6 +47,6 @@ build() { } package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd "$srcdir"/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD new file mode 100644 index 000000000..52e5783bf --- /dev/null +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=stuntrally-data-libre +_pkgname=stuntrally-data +pkgver=2.0 +pkgrel=1 +pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files" +arch=('any') +license=('GPL3' 'custom') +url="http://code.google.com/p/vdrift-ogre" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor') +source=(StuntRally-$pkgver-sources.tar.xz::http://sourceforge.net/projects/stuntrally/files/$pkgver/StuntRally-$pkgver-sources.tar.xz/download + libre.patch ) +md5sums=('22eb331c4401a0ed03e7a9e916fdb60c' + 'e96df3ba70d6fd0949bb92f4dd609497') +prepare() { + # patch some data files and remove nonfree data files + cd $srcdir/StuntRally-$pkgver-sources + + patch -Np1 -i $srcdir/libre.patch + + rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM},tracks/{detroit,ruudskogen,virginia,weekend}} +} + +build() { + # build the sources + cd $srcdir/StuntRally-$pkgver-sources + + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DSHARE_INSTALL="share/stuntrally" + make +} + +package() { + #install the sources + cd $srcdir/StuntRally-$pkgver-sources/build + make DESTDIR="$pkgdir" install + + # clean up + rm -rf "$pkgdir/usr/share/stuntrally/tracks/build" + rm -rf "$pkgdir/usr/share/icons" + rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir/usr/bin" +} diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch new file mode 100644 index 000000000..642188f05 --- /dev/null +++ b/libre/stuntrally-data-libre/libre.patch @@ -0,0 +1,72 @@ +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index e01fc1b..853ebf7 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) + + # Install data files + # TODO: make this use all data/* subdirs without tracks, not entered by hand .. +-foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2) ++foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees) + install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL}) + endforeach() + +diff --git a/data/grass/_grass.txt b/data/grass/_grass.txt +index 787737e..84197af 100644 +--- a/data/grass/_grass.txt ++++ b/data/grass/_grass.txt +@@ -10,10 +10,3 @@ http://opengameart.org/content/plants-textures-pack-03 + http://opengameart.org/content/plants-textures-pack-04 + + many colored by CryHam for SR +- +----- Old +-grassJungle.png rest is colored +- +-This grass texture included with PagedGeometry was kindly provided by +-Agnisola Philippe (http://www.blitz3dfr.com/portal_joomla/) for +-commercial or non-commercial use. +diff --git a/data/sounds/_sounds_info.txt b/data/sounds/_sounds_info.txt +index 2cab386..eb4e086 100644 +--- a/data/sounds/_sounds_info.txt ++++ b/data/sounds/_sounds_info.txt +@@ -7,39 +7,3 @@ grass + gravel + tire_squeal + wind +- +--- new sounds from +-http://www.freesound.org/ +- +-various smaller cuts, from: +-[author soundname] +- +- metal hits 01..12: +-halleck metal-medium-hit +-halleck metal-hits-medium-1 +-halleck metal-hits-light-1 +-halleck metal-thump +-sagetyrtle crash-1 +-sagetyrtle crash-2 +-halleck big-metal-side-impact-1 +-halleck big-metal-side-impact-2 +-halleck metal-crash-1 +- metal scrap,screech +-halleck metal-roll-cage-hits-heavy +-halleck metal-screech-and-scraping +- +- water,mud: +-cgeffex large-splashes +- +- mud_cont, water_cont +-justinbw water-spigget-onto-mud-1 +-justinbw water-spigget-onto-mud-2 +- +- terrain,dirt: +-halleck hit-with-dirt-spray-1 +-halleck hit-with-dirt-spray-1-body +-halleck hit-with-dirt-spray-2-body +-halleck hit-with-dirt-spray-3 +- +- boost +-nathanshadow thruster-level-ii diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ecee94e9b..01505c5d2 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=4.06 -pkgrel=2 +pkgver=4.07 +pkgrel=1.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 (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -24,11 +24,11 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('0384ef35b724615074e77b1fc89d5b47' +md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '31fe4d80ad74b01e5bc8fccc1d32cccd' + 'a43bd903face611bcc148522265dfe6c' '8559fb3daf3afa8688600d8a38118918' - 'befd0e7c38a03442b791f2a530b4dd2d') + 'cb46ca47c6b6323127d908440057d98f') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre/syslinux/splash.png +++ b/libre/syslinux/splash.png diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre/syslinux/splash.xcf diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index cb5afb371..e7199438f 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -33,15 +33,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre 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 +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -52,13 +52,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index f726d9a8c..23900636f 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=12 +pkgrel=11 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' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index d1f32979d..138962ca3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93220 2013-06-28 18:55:23Z foutrelis $ +# $Id: PKGBUILD 94377 2013-07-22 13:48:54Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,13 +12,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=25 +pkgrel=27 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.9' 'linux-libre<3.10') -makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10') +depends=('linux-libre>=3.10' 'linux-libre<3.11') +makedepends=('linux-libre-headers>=3.10' 'linux-libre-headers<3.11') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 49d1bf656..0ce579ffb 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.9-LIBRE +extramodules=/usr/lib/modules/extramodules-3.10-LIBRE post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index caa3016d1..0f2f8b581 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93222 2013-06-28 18:56:50Z foutrelis $ +# $Id: PKGBUILD 94379 2013-07-22 13:49:30Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -7,13 +7,13 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 -_extramodules=extramodules-3.9-LIBRE -pkgrel=4 +_extramodules=extramodules-3.10-LIBRE +pkgrel=6 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') -depends=('linux-libre>=3.9' 'linux-libre<3.10') +depends=('linux-libre>=3.10' 'linux-libre<3.11') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 07cb8a71e..1d985f296 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.16 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install index 54a052390..923bd68e3 100644 --- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install +++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install @@ -1,16 +1,21 @@ -EXTRAMODULES='extramodules-3.0-LIBRE-LTS' +_depmod() { + EXTRAMODULES='extramodules-3.0-LIBRE-LTS' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + _depmod } post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + _depmod } post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + _depmod } + +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install index 4503996e8..97212dba1 100644 --- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install +++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install @@ -1,18 +1,23 @@ -EXTRAMODULES='extramodules-3.0-LIBRE-LTS' +_depmod() { + EXTRAMODULES='extramodules-3.0-LIBRE-LTS' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + _depmod } post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' + _depmod + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + _depmod } + +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d5a9a62bd..e7278298b 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93523 2013-07-05 00:43:32Z seblu $ +# $Id: PKGBUILD 94381 2013-07-22 13:58:51Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,12 +7,12 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.16 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-libre' - 'linux-libre-headers' +makedepends=('linux-libre>=3.10' 'linux-libre<3.11' + 'linux-libre-headers>=3.10' 'linux-libre-headers<3.11' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" 'expac' @@ -20,7 +20,7 @@ makedepends=('linux-libre' 'bc') # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.9-LIBRE +_extramodules=extramodules-3.10-LIBRE build() { _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') @@ -41,7 +41,7 @@ package_virtualbox-libre-host-modules(){ _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") - depends=('linux-libre>=3.9' 'linux-libre<3.10') + depends=('linux-libre>=3.10' 'linux-libre<3.11') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -60,7 +60,7 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") - depends=('linux-libre>=3.9' 'linux-libre<3.10') + depends=('linux-libre>=3.10' 'linux-libre<3.11') 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') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index d2e34dfc1..eb1707471 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,18 +1,21 @@ -VERSION='3.9.7-1-LIBRE' +_depmod() { + EXTRAMODULES='extramodules-3.10-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index b1d86b9e6..df643c9a6 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,20 +1,23 @@ -VERSION='3.9.7-1-LIBRE' +_depmod() { + EXTRAMODULES='extramodules-3.10-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 4bf584f15..cb48c5d90 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ +# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -10,7 +10,7 @@ _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre pkgver=12.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 96c0f3537..1dc040d92 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ +# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.21 +pkgver=5.22 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ - 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm' 'mesa') +depends=('libglade' 'xorg-appres' 'perl-libwww') +makedepends=('bc' 'libxpm' 'gdm') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE) -sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' - '677496218b81a42d90bee400026e94dd87fb8ffb' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + xscreensaver-add-electricsheep.diff LICENSE) +sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec' + 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '4209ea586b204fd1d81c382a0522c654f9fd9134') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/add-electricsheep.diff" - - # Deleting dmsc.asm file due that don't have source code supplied +prepare() { + cd ${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" + + # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm +} +build() { + cd ${_pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ @@ -40,10 +41,10 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} + install -d "${pkgdir}/etc/pam.d" make install_prefix="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" - install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" } diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff deleted file mode 100644 index 18b4dea97..000000000 --- a/libre/xscreensaver-libre/add-electricsheep.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400 -+++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400 -@@ -347,7 +347,8 @@ - @GL_KLUDGE@ GL: rubikblocks -root \n\ - @GL_KLUDGE@ GL: companioncube -root \n\ - @GL_KLUDGE@ GL: hilbert -root \n\ --@GL_KLUDGE@ GL: tronbit -root \n -+@GL_KLUDGE@ GL: tronbit -root \n\ -+ electricsheep --root 1 \n - - - diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff new file mode 100644 index 000000000..0c5c3ff40 --- /dev/null +++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff @@ -0,0 +1,10 @@ +--- driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400 ++++ driver/XScreenSaver.ad.in 2013-07-16 16:48:23.293473297 -0400 +@@ -157,6 +157,7 @@ + ! + *programs: \ + maze -root \n\ ++ electricsheep --root 1 \n\ + @GL_KLUDGE@ GL: superquadrics -root \n\ + attraction -root \n\ + blitspin -root \n\ diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/libre/xscreensaver-libre/xscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD new file mode 100644 index 000000000..4baf8ca39 --- /dev/null +++ b/pcr/blender-addon-ogre/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +_bldname=blender +_bldver=2.68 +_bldep=9 + +_pkgname=ogre +pkgname=$_bldname-addon-$_pkgname +pkgver=0.6.0 +pkgrel=2 +pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)" +arch=any +url=https://code.google.com/p/${_bldname}2$_pkgname +license=LGPL2.1 +depends=( + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" +) +source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip +sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712 + +prepare() { + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py +} + +package() { + cd $srcdir + a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname + install -vd $a && cp -va io_export_${_pkgname}DotScene.py $a/__init__.py +} diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index 1b42c921c..7fceb3678 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=collada-dom pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="An API that provides a C++ object representation of a ${pkgname::7} XML instance document" url=http://sourceforge.net/projects/$pkgname license=MIT arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) depends=( boost-libs @@ -26,23 +26,23 @@ sha512sums=4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9 prepare() { cd $srcdir/$pkgname-$pkgver-libsrc - [[ -d build ]] && rm -r build - mkdir build + [[ -d build ]] && rm -vr build + mkdir -v build } build() { cd $srcdir/$pkgname-$pkgver-libsrc/build - setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr - setarch $CARCH make + cmake .. -DCMAKE_INSTALL_PREFIX=/usr + make } package() { cd $srcdir/$pkgname-$pkgver-libsrc/build - setarch $CARCH make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install a=$pkgdir/usr/share/licenses/$pkgname - install -d $a && cp -a ../{dom/license.txt,License_Folder/license_e.txt} $a + install -vd $a && cp -va ../{dom/license.txt,License_Folder/license_e.txt} $a } # vim:set ts=2 sw=2 et: diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index d43b73c0e..e2131a3d5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,47 +1,32 @@ +# Maintainer: Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Diogo Leal <estranho@diogoleal.com> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Matthias Maennich <arch@maennich.net> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> pkgname=command-not-found -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" -license=('GPL') +license=('GPL3') depends=('boost-libs' 'tdb' 'libarchive' 'wget') -makedepends=('boost' 'tdb' 'cmake' 'git') -source=('install') -md5sums=('2ea3c216fb0b7f8449f0225ece33210c') +makedepends=('boost' 'cmake') install='install' -_gitrepo="https://github.com/metti/$pkgname.git" +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") +mkmd5sums=('SKIP') build() { - cd $srcdir - msg "Connecting to the GIT server ..." - - if [[ -d $srcdir/$pkgname ]] ; then - cd $pkgname - git fetch origin - else - git clone $_gitrepo - cd $pkgname - fi - - git checkout v$pkgver - - msg "GIT checkout done" - - mkdir -p $srcdir/build - cd $srcdir/build - - cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="" $srcdir/$pkgname/src - make - + cd "$srcdir/$pkgname-$pkgver" + cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src + make } package(){ - cd $srcdir/build - - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install index 26f49fa50..50e601258 100644 --- a/pcr/command-not-found/install +++ b/pcr/command-not-found/install @@ -7,8 +7,7 @@ post_upgrade() { } pre_remove() { - rm -rf /var/lib/cnf/*.db - rm -rf /var/lib/cnf/*.tdb + rm -f /var/lib/cnf/*.{db,tbd} } # vim:set ts=2 sw=2 et: diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD new file mode 100644 index 000000000..df08feb00 --- /dev/null +++ b/pcr/cpptest/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> +pkgname=cpptest +pkgver=1.1.2 +pkgrel=2 +pkgdesc="CppTest is a portable and powerful unit testing framework for handling automated tests in C++. with focus on usability and extendability." +url="http://cpptest.sourceforge.net/" +depends=(gcc-libs) +makedepends=(pkgconfig) +source=(http://downloads.sourceforge.net/sourceforge/cpptest/$pkgname-$pkgver.tar.gz) +md5sums=('79b9bff371d182f11a3235969f84ccb6') +arch=('i686' 'x86_64') +license="LGPL" + +build() { + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} diff --git a/pcr/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD new file mode 100644 index 000000000..8562f2fb5 --- /dev/null +++ b/pcr/culmus-latex/PKGBUILD @@ -0,0 +1,21 @@ +#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot com> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# taken from https://aur.archlinux.org/packages/culmus-latex/ + +pkgname=culmus-latex +pkgver=0.7.1 +pkgrel=1 +pkgdesc="Culmus Hebrew fonts for LaTeX" +arch=('i686' 'x86_64') +url="http://ivritex.sourceforge.net/" +depends=('culmus' 'texlive-core' 'texlive-bin') +install=culmus-latex.install +license=('GPL') +source=(http://downloads.sourceforge.net/project/ivritex/culmus-latex/culmus-latex-0.7/culmus-latex-0.7-r1.tar.gz) +md5sums=('0c6f6d5b9e7a0d6ba59fc55680ed48a5') + +build(){ + cd ${srcdir}/${pkgname}-0.7-r1 || return 1 + mkdir -p $pkgdir/usr/share/texmf || return 1 + make DESTDIR=$pkgdir pkginstall +} diff --git a/pcr/culmus-latex/culmus-latex.install b/pcr/culmus-latex/culmus-latex.install new file mode 100644 index 000000000..4c6529865 --- /dev/null +++ b/pcr/culmus-latex/culmus-latex.install @@ -0,0 +1,22 @@ + +## arg 1: the new package version +#pre_install() { + # do something here +#} + +## arg 1: the new package version +post_install() { + mktexlsr + updmap-sys --enable Map=culmus.map +} + +post_upgrade() { + mktexlsr + updmap-sys --enable Map=culmus.map +} + +## arg 1: the old package version +post_remove() { + mktexlsr + updmap-sys --disable culmus.map +} diff --git a/pcr/culmus/PKGBUILD b/pcr/culmus/PKGBUILD new file mode 100644 index 000000000..3d1a5f567 --- /dev/null +++ b/pcr/culmus/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (Arch): Ivan Puntiy <ivan.puntiy at gmail> +# Contributor (Arch): <francois.archlinux.org> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# taken from https://aur.archlinux.org/packages/culmus/ + +pkgname=culmus +pkgver=0.130 +pkgrel=1 +pkgdesc="A collection of Type1 and TrueType Hebrew fonts" +arch=('any') +url="http://culmus.sourceforge.net" +license=('GPL2') +depends=('fontconfig' 'xorg-fonts-alias' 'xorg-font-utils' 'xorg-fonts-encodings') +install=${pkgname}.install +source=( + "http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "$pkgname-0.121-fontconfig_fix.patch" +) +md5sums=('58e672defde4caeae42017cd2f9436a6' + '6db715a072d9602a54c69a7e31a6428f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix due to fontconfig 2.10.1 update - patch mailed to upstream + patch culmus.conf "$srcdir/$pkgname-0.121-fontconfig_fix.patch" +} + +package() { + # install Type1 fonts + install -d ${pkgdir}/usr/share/fonts/Type1 + install -m644 ${srcdir}/culmus-$pkgver/*.{afm,pfa} \ + ${pkgdir}/usr/share/fonts/Type1 + + # install ttf fonts + install -d ${pkgdir}/usr/share/fonts/TTF + install -m644 ${srcdir}/culmus-$pkgver/*.ttf \ + ${pkgdir}/usr/share/fonts/TTF + + # install provided config file with priority 61 + install -d ${pkgdir}/etc/fonts/conf.avail/ + install -m644 ${srcdir}/culmus-$pkgver/culmus.conf \ + ${pkgdir}/etc/fonts/conf.avail/61-culmus.conf +} diff --git a/pcr/culmus/culmus-0.121-fontconfig_fix.patch b/pcr/culmus/culmus-0.121-fontconfig_fix.patch new file mode 100644 index 000000000..d303cbb09 --- /dev/null +++ b/pcr/culmus/culmus-0.121-fontconfig_fix.patch @@ -0,0 +1,203 @@ +--- culmus.conf.original 2011-12-20 22:21:43.509488367 +0200 ++++ culmus.conf.fixed 2012-09-09 21:14:42.401273058 +0300 +@@ -8,6 +8,17 @@ + <match target="pattern" > + <test name="family" > + <string>Guttman Adii</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>David CLM</string> ++ </edit> ++ <edit mode="assign" binding="same" name="slant" > ++ <const>italic</const> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Adii-Light</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -30,6 +41,14 @@ + <match target="pattern" > + <test name="family" > + <string>Guttman Stam</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Stam Ashkenaz CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Stam1</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -40,6 +59,14 @@ + <match target="pattern" > + <test name="family" > + <string>Guttman Hodes</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Hadasim CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Monotype Hadassah</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -50,7 +77,23 @@ + <match target="pattern" > + <test name="family" > + <string>Aharoni</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Aharoni CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Aharoni</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Aharoni CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman-Aharoni</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -61,7 +104,23 @@ + <match target="pattern" > + <test name="family" > + <string>FrankRuehl</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Frank Ruehl CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Frank</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Frank Ruehl CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Frnew</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -72,7 +131,23 @@ + <match target="pattern" > + <test name="family" > + <string>David</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>David CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>David Transparent</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>David CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman David</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -83,8 +158,32 @@ + <match target="pattern" > + <test name="family" > + <string>Fixed Miriam Transparent</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam Mono CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Myamfix</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam Mono CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman-CourMir</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam Mono CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Miriam Fixed</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -95,8 +194,32 @@ + <match target="pattern" > + <test name="family" > + <string>Guttman Miryam</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Levenim MT</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Miriam</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Miriam CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Miriam Transparent</string> + </test> + <edit mode="append" binding="same" name="family" > +@@ -107,6 +230,14 @@ + <match target="pattern" > + <test name="family" > + <string>Guttman Drogolin</string> ++ </test> ++ <edit mode="append" binding="same" name="family" > ++ <string>Drugulin CLM</string> ++ </edit> ++ </match> ++ ++ <match target="pattern" > ++ <test name="family" > + <string>Guttman Vilna</string> + </test> + <edit mode="append" binding="same" name="family" > diff --git a/pcr/culmus/culmus.install b/pcr/culmus/culmus.install new file mode 100644 index 000000000..1376ca5ce --- /dev/null +++ b/pcr/culmus/culmus.install @@ -0,0 +1,41 @@ +configs=('61-culmus.conf') + +update_fontcache() { + fc-cache -fs + mkfontscale /usr/share/fonts/Type1 + mkfontdir /usr/share/fonts/Type1 + mkfontscale /usr/share/fonts/TTF + mkfontdir /usr/share/fonts/TTF +} + +post_install() { + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + ln -sf ../conf.avail/${config} . + done + popd > /dev/null + + update_fontcache +} + +post_upgrade() { + if [ "`vercmp 0.102-1 $2`" != "-1" ] || [ ! -L /etc/fonts/conf.d/61-culmus.conf ]; then + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + ln -sf ../conf.avail/${config} . + done + popd > /dev/null + fi + + update_fontcache +} + +post_remove() { + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + rm -f ${config} + done + popd > /dev/null + + update_fontcache +} diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD index 4a55012f6..2f2841e11 100644 --- a/pcr/drumkv1/PKGBUILD +++ b/pcr/drumkv1/PKGBUILD @@ -1,17 +1,16 @@ -# Maintainer: Guest One <theguestone at gmail dot com> pkgname=drumkv1 -pkgver=0.3.3 +pkgver=0.3.4 pkgrel=1 pkgdesc="An old-school drum-kit sampler" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://$pkgname.sourceforge.net/$pkgname-index.html" license=('GPL') groups=('lv2-plugins') -depends=('jack' 'liblo' 'lv2' 'qt4') +depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info') install="$pkgname.install" source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('d7c7270fdd01552b74eead36dd638ea4') +md5sums=('d94b9c5b21bfdbf0f57cf811273b1fcd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install index 029294d67..ec1a84bbb 100644 --- a/pcr/drumkv1/drumkv1.install +++ b/pcr/drumkv1/drumkv1.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-mime-database usr/share/mime update-desktop-database -q } diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD index 163c320db..09a5d4d15 100644 --- a/pcr/etckeeper/PKGBUILD +++ b/pcr/etckeeper/PKGBUILD @@ -1,13 +1,12 @@ -# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (AUR): Buce <dmbuce@gmail.com> # Contributor: Danie Roux <accounts@danieroux.com> - -# This requires makepkg newer than 4.0.3, which at this time means from git +# Contributor: Diogo Leal <estranho@diogoleal.com> pkgname=etckeeper -pkgver=0.64 -pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." -url="http://kitenet.net/~joey/code/etckeeper/" +pkgver=1.4 +pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." +url="http://joeyh.name/code/etckeeper/" license=('GPL2') pkgrel=1 @@ -16,28 +15,28 @@ depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') backup=(etc/etckeeper/etckeeper.conf) -source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" - etckeeper-pacman.patch - etckeeper-archlinux.conf) +source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf) + +mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}") +mkmd5sums=('SKIP') build() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - # add pacman support to list-to `list-installed` - patch -p0 -i "$srcdir/etckeeper-pacman.patch" + # add pacman support to `list-installed` + patch -p0 -i "${srcdir}/${pkgname}-pacman.patch" # use python2 sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py - - make CONFFILE="$srcdir/etckeeper-archlinux.conf" build + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build } package() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install } -md5sums=('SKIP' +md5sums=('74be692fdb2d3352324e9332a270635d' 'f1f00bf9331d1ef7f29b0ac29cdfcbda' '99d8d2838f49fa0f2f21c9e37948100d') diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD new file mode 100644 index 000000000..b1280fad9 --- /dev/null +++ b/pcr/gcc-lts/PKGBUILD @@ -0,0 +1,299 @@ +# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: libtool requires rebuilt with each new gcc version + +#pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go') +pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go') +pkgver=4.7.3 +pkgrel=3 +pkgdesc="The GNU Compiler Collection" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +#makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen') +makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'doxygen') +checkdepends=('dejagnu' 'inetutils') +options=('!libtool' '!emptydirs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) +md5sums=('86f428a30379bdee0224e353ee2f999e') +_basedir=gcc-${pkgver} + +prepare() { + cd ${srcdir}/${_basedir} + + # Do not install libiberty + #sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + # Parabola installs x86_64 libraries /lib + [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + + echo ${pkgver} > gcc/BASE-VER + + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + # fix texinfo "@itemx" and "@item" + sed -i "s|[@]itemx|@item|; + " gcc/doc/{cppopts,generic,invoke,sourcebuild}.texi + + mkdir ${srcdir}/gcc-build +} + +build() { + cd ${srcdir}/gcc-build + + # using -pipe causes spurious test-suite failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 + CFLAGS=${CFLAGS/-pipe/} + CXXFLAGS=${CXXFLAGS/-pipe/} + + ${srcdir}/${_basedir}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://labs.parabola.nu/ \ + --enable-languages=c,c++,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --enable-libstdcxx-time \ + --enable-gnu-unique-object --enable-linker-build-id \ + --with-ppl --enable-cloog-backend=isl \ + --disable-ppl-version-check --disable-cloog-version-check \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu \ + --disable-multilib --disable-libssp \ + --disable-build-with-cxx --disable-build-poststage1-with-cxx \ + --disable-install-libiberty \ + --disable-werror \ + --enable-checking=release + #--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + make + + # make documentation + cd $CHOST/libstdc++-v3 + make doc-man-doxygen +} + +check() { + cd ${srcdir}/gcc-build + + # increase stack size to prevent test failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 + ulimit -s 32768 + + # do not abort on error as some are "expected" + make -k check || true + ${srcdir}/${_basedir}/contrib/test_summary +} + +package_gcc-lts-libs() +{ + pkgdesc="Runtime libraries shipped by GCC" + groups=('lts') + depends=('glibc>=2.17') + provides=("gcc-libs=$pkgver") + conflicts=('gcc-libs') + install=gcc-libs.install + + cd ${srcdir}/gcc-build + make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared + #for lib in libmudflap libgomp libstdc++-v3/src libitm libsanitizer/asan; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; do + make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + + #[[ $CARCH == "x86_64" ]] && \ + # make -j1 -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + + make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install + make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info + + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libgfortran + make -j1 DESTDIR=${pkgdir} install-target-libobjc + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + + # remove static libraries + find ${pkgdir} -name *.a -delete + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-lts() +{ + pkgdesc="The GNU Compiler Collection - C and C++ frontends" + depends=("gcc-lts-libs=$pkgver" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl') + provides=("gcc=$pkgver") + conflicts=('gcc') + groups=('lts-devel') + install=gcc.install + + cd ${srcdir}/gcc-build + + make -j1 DESTDIR=${pkgdir} install + + install -d $pkgdir/usr/share/gdb/auto-load/usr/lib + mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py + + # unfortunately it is much, much easier to install the lot and clean-up the mess... + #rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo} + rm $pkgdir/usr/lib/*.so* + #rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a + rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},iberty,objc}.a + rm $pkgdir/usr/lib/libgfortran.spec + #rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h + #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,go1} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a + rm -r $pkgdir/usr/lib/go + #rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info + rm $pkgdir/usr/share/info/{gccgo,gfortran,libgomp,libquadmath,libitm}.info + rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/share/man/man3/ffi* + + # many packages expect this symlinks + ln -s gcc ${pkgdir}/usr/bin/cc + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/c{8,9}9 + + # install the libstdc++ man pages + install -dm755 ${pkgdir}/usr/share/man/man3 + install -m644 -t ${pkgdir}/usr/share/man/man3 \ + ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3 + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-lts-fortran() +{ + pkgdesc="Fortran front-end for GCC" + depends=("gcc-lts=$pkgver") + provides=("gcc-fortran=$pkgver") + conflicts=('gcc-fortran') + install=gcc-fortran.install + + cd ${srcdir}/gcc-build + 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 + + ln -s gfortran ${pkgdir}/usr/bin/f95 + + # remove files included in gcc-libs or gcc + #rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* + rm ${pkgdir}/usr/lib/libgfortran.so* + #rm ${pkgdir}/usr/lib/libquadmath.{a,so*} + #rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} + #rm ${pkgdir}/usr/share/info/libquadmath.info + #rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-lts-objc() +{ + pkgdesc="Objective-C front-end for GCC" + depends=("gcc-lts=$pkgver") + provides=("gcc-objc=$pkgver") + conflicts=('gcc-objc') + + cd ${srcdir}/gcc-build + make -j1 DESTDIR=$pkgdir install-target-libobjc + install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + + # remove files included in gcc-libs or gcc + #rm ${pkgdir}/usr/lib/lib{gcc_s,objc}.so* + rm ${pkgdir}/usr/lib/libobjc.so* + #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{*.o,lib*} + #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/unwind.h + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-lts-ada() +{ + pkgdesc="Ada front-end for GCC (GNAT)" + depends=("gcc-lts=$pkgver") + provides=("gcc-ada=$pkgver") + conflicts=('gcc-ada') + install=gcc-ada.install + + cd ${srcdir}/gcc-build/gcc + make -j1 DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver + + ln -s gcc ${pkgdir}/usr/bin/gnatgcc + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-lts-go() +{ + pkgdesc="Go front-end for GCC" + depends=("gcc-lts=$pkgver") + provides=("gcc-go=$pkgver") + conflicts=('gcc-go') + install=gcc-go.install + + cd ${srcdir}/gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/pcr/gcc-lts/gcc-ada.install b/pcr/gcc-lts/gcc-ada.install new file mode 100644 index 000000000..df0553a4f --- /dev/null +++ b/pcr/gcc-lts/gcc-ada.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gnat-style.info gnat_rm.info gnat_ugn.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/pcr/gcc-lts/gcc-fortran.install b/pcr/gcc-lts/gcc-fortran.install new file mode 100644 index 000000000..b15d89a97 --- /dev/null +++ b/pcr/gcc-lts/gcc-fortran.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file="gfortran.info" + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} diff --git a/pcr/gcc-lts/gcc-go.install b/pcr/gcc-lts/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/pcr/gcc-lts/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.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/pcr/gcc-lts/gcc-libs.install b/pcr/gcc-lts/gcc-libs.install new file mode 100644 index 000000000..23553b8f0 --- /dev/null +++ b/pcr/gcc-lts/gcc-libs.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +filelist=(libgomp.info libquadmath.info) + +post_upgrade() { + [ -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/pcr/gcc-lts/gcc.install b/pcr/gcc-lts/gcc.install new file mode 100644 index 000000000..3407a5e1f --- /dev/null +++ b/pcr/gcc-lts/gcc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD deleted file mode 100644 index 9f5784608..000000000 --- a/pcr/gimp-toolkit-gps/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> - -pkgname=gimp-toolkit-gps -_pkgname=${pkgname:13} -_reqname=${pkgname::4} -pkgver=2.0 -_pkgver=${pkgver/./_} -pkgrel=1 -_pkgsrc1=${_pkgname^^}%20$_pkgver%20final -_pkgsrc2=${_pkgname^^}%20extras -pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.' -arch=any -license=( - GPL2 - CCPL:by-sa -) -url=https://code.google.com/p/$_pkgname-gimp-paint-studio -depends=gimp -conflicts=${pkgname/kit/set} -replaces=${pkgname/kit/set} -makedepends=unzip-libre -noextract=( - $_pkgsrc1.zip - $_pkgsrc2.zip -) -source=( - https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip - https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip -) -sha512sums=( - b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112 - c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f -) - -prepare() { - a=$srcdir/$_pkgname-$pkgver - mkdir $a - unzip $srcdir/$_pkgsrc1.zip -d $a - unzip $srcdir/$_pkgsrc2.zip -d $a - # drop useless splashes - rm -v $a/splashes/* && rmdir -v $a/splashes - # fix perm for custom umask - find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\ - find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \; -} - -package() { - b=$pkgdir/usr/share/gimp/2.0 - install -d $b - cp -va $srcdir/$_pkgname-$pkgver/* $b -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD deleted file mode 100644 index e5e489950..000000000 --- a/pcr/kervalasquish-hg/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# Maintainer: Jorge Araya <jorgean@lavabit.com> - -pkgname=kervalasquish-hg -pkgver=220 -pkgrel=2 -pkgdesc="Free Software DXT compression library, kervala's version" -arch=('i686' 'x86_64') -url="http://code.google.com/p/libsquish/" -license=('MIT') -makedepends=('mercurial' 'gcc-libs' 'cmake') -provides=('libsquish') -conflicts=('libsquish' - 'kervala_libsquish-hg' - 'kervalasquish-hg') - -_hgroot="http://hg.kervala.net" -_hgrepo="packaging" -cmakerepo="cmake" - -build() { - cd "$srcdir" - msg "Connecting to Kervala's Mercurial server for libsquish..." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "${_hgroot}/${_hgrepo}" - fi - - msg "Connecting to Kervala's Mercurial server for cmake modules..." - - if [[ -d $srcdir/$cmakerepo ]]; then - cd $srcdir/$cmakerepo - hg pull -u - msg "The local files are updated." - else - cd $srcdir - hg clone ${_hgroot}/${cmakerepo} - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - if [[ -d $_hgrepo-build ]]; then - rm -rf "$srcdir/$_hgrepo-build" - fi - - cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build" - - if [[ ! -d $_hgrepo-build/CMakeModules ]]; then - mkdir "$srcdir/$_hgrepo-build/CMakeModules" - cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/ - fi - - if [[ -d $srcdir/$_hgrepo-build/build ]]; then - rm -rf $srcdir/$_hgrepo-build/build - fi - - mkdir "$srcdir/$_hgrepo-build/build" - cd "$srcdir/$_hgrepo-build/build" - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd "$srcdir/$_hgrepo-build/build" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 782e12a15..c0fb9e062 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,23 +1,15 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> -static=false -_pkgname=libav -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - pkgname=libav-static - pkgflag=-static - staticdesc=', with static library' -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - pkgname=libav -fi -pkgver=9.7 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" +pkgname=libav +pkgver=9.8 +pkgrel=3 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux" arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) -url=http://$_pkgname.org/ +url=http://$pkgname.org/ license=GPL3 depends=( alsa-lib @@ -45,20 +37,33 @@ makedepends=( yasm libvdpau ) -source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz -sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4 +source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz +sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae build() { - cd $_pkgname-$pkgver - - [[ $static == false ]] && sttcv=disable || sttcv=enable - - setarch $CARCH ./configure\ - --prefix=/opt/$pkgname\ + cd $pkgname-$pkgver + if [[ $CARCH == x86_64 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --enable-avx --enable-fma4 --enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42' + elif [[ $CARCH == i686 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --disable-avx --disable-fma4 --disable-sse3 --disable-ssse3 --disable-sse4 --disable-sse42' + else + _asm='--disable-asm' + fi + [[ $_static == false ]] && _stf='--disable-static' + ./configure\ + $_asm $_stf\ + --prefix=/usr\ + --bindir=/opt/$pkgname/bin\ + --incdir=/opt/$pkgname/include\ + --libdir=/opt/$pkgname/lib\ + --shlibdir=/opt/$pkgname/lib\ + --disable-avserver\ --disable-debug\ - --$sttcv-static\ --enable-avresample\ - --enable-avserver\ --enable-dxva2\ --enable-gpl\ --enable-libfreetype\ @@ -77,32 +82,27 @@ build() { --enable-libvpx\ --enable-libx264\ --enable-libxvid\ + --enable-pic\ --enable-runtime-cpudetect\ --enable-shared\ + --enable-vdpau\ --enable-version3\ --enable-x11grab - setarch $CARCH make - setarch $CARCH make tools/qt-faststart - setarch $CARCH make doc/av{conv,play,server}.1 + make + make tools/qt-faststart + make doc/av{conv,play}.1 # doc/avserver.1 } package() { - cd $_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install install-man - install -m755 -d $pkgdir/etc/ld.so.conf.d - install -m755 -d $pkgdir/usr/bin - install -m755 -d $pkgdir/usr/share/man/man1 - install -Dm755 tools/qt-faststart $pkgdir/opt/$pkgname/bin - ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag - ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag - ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag - ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag - ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname - ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 - echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf + cd $pkgname-$pkgver + + make DESTDIR=$pkgdir install install-man + install -vD tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname + + for _bin in conv play probe; do + echo -e "#!/usr/bin/env bash\nLD_LIBRARY_PATH=/opt/$pkgname/lib /opt/$pkgname/bin/av$_bin \$@" > $pkgdir/usr/bin/av$_bin + done + chmod -v +x $pkgdir/usr/bin/* } # vim:set ts=2 sw=2 et: diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE new file mode 100644 index 000000000..dd0f22eb9 --- /dev/null +++ b/pcr/libsquish-svn/LICENSE @@ -0,0 +1,24 @@ +/* ----------------------------------------------------------------------------- + + Copyright (c) 2006 Simon Brown si@sjbrown.co.uk + + 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. + + -------------------------------------------------------------------------- */ diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD new file mode 100644 index 000000000..17af64a96 --- /dev/null +++ b/pcr/libsquish-svn/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com> +pkgname=libsquish-svn +pkgver=48 +pkgrel=5 +pkgdesc="DXT compression library - svn build" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libsquish" +makedepends=('subversion' ) +license=('MIT') +provides=('libsquish') +conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg') +mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver) +mkmd5sums=('SKIP') + +source=("libre://$pkgname-$pkgver.tar.gz" + LICENSE) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + # make install + mkdir -p $pkgdir/usr/local/{include,lib} + + install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h + install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0 + install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f' + 'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75') diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD new file mode 100644 index 000000000..9fc91e231 --- /dev/null +++ b/pcr/libwww-hg/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Maintainer (Archlinux): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Buharev Vasilij <buharev.v.p@gmail.com> + +pkgname=libwww-hg +pkgver=20130730 +_changeset=facbea79943a +pkgrel=11 +pkgdesc="A general-purpose client side WEB API" +arch=('i686' 'x86_64') +url="http://hg.kervala.net/packaging/" +license=('W3C') +depends=() +conflicts=("libwww") +provides=("libwww") +makedepends=('gcc' 'pkgconfig' 'perl' 'zlib') +options=('!libtool') +source=("http://hg.kervala.net/packaging/archive/${_changeset}.tar.gz") +sha256sums=('26adbb77c4ecb3df3a074597a8dfc45b7215879fbc0447cb086199c17ae8ba8d') + + +build() { + cd "$srcdir/packaging-${_changeset}/libwww" + ./autogen.sh + ./configure --prefix=/usr/ \ + --with-ssl=no --with-zlib --with-expat --with-gnu-ld \ + --enable-shared --enable-static + #sed -i 's#Examples##' Library/Makefile + make +} + +package() { + cd "$srcdir/packaging-${_changeset}/libwww" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD new file mode 100644 index 000000000..47f581fa1 --- /dev/null +++ b/pcr/mathjax/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer (Arch): Tianjiao Yin <ytj000@gmail.com> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +#taken from https://aur.archlinux.org/packages/mathjax/ + +pkgname=mathjax +pkgver=2.1 +pkgrel=1 +pkgdesc='An open source JavaScript display engine for mathematics that works in all modern browsers' +url='http://www.mathjax.org/' +arch=('any') +license=('apache') +options=('!strip') +source=('https://github.com/mathjax/MathJax/archive/v2.1.tar.gz') + +build() { + mkdir -p $pkgdir/usr/share + mv $srcdir/MathJax-* $pkgdir/usr/share/mathjax +} + + +md5sums=('8e7ad1b8f3a69be8ec83f21d3e2a509c') diff --git a/pcr/mimms/PKGBUILD b/pcr/mimms/PKGBUILD new file mode 100644 index 000000000..3697c1a3b --- /dev/null +++ b/pcr/mimms/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# taken from https://aur.archlinux.org/packages/mimms/ + +pkgname=mimms +pkgver=3.2.1 +pkgrel=2 +pkgdesc="Download streams using the MMS protocol and save them to your +computer" +arch=('any') +url="http://savannah.nongnu.org/projects/mimms/" +license=('GPL3') +depends=('libmms' 'python2') +source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('ec629d8899551b4789ba15c17402c36f') + +build() { + cd ${srcdir}/$pkgname-$pkgver + +#Python2 fix + sed -i "s/python/python2/g" Makefile + + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD index da6f373c9..e88427488 100644 --- a/pcr/miniupnpd/PKGBUILD +++ b/pcr/miniupnpd/PKGBUILD @@ -1,8 +1,8 @@ # $Id$ # Maintainer: fauno <fauno@parabola.nu> pkgname=miniupnpd -pkgver=1.8.20130503 -pkgrel=3 +pkgver=1.8.20130607 +pkgrel=1 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" @@ -12,8 +12,6 @@ depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.systemd) -md5sums=('484dbda7c428b2d5f3768500a48d3375' - '0c3f1777b6c043dd5029092d62896660') build() { cd "$srcdir/$pkgname-$pkgver" @@ -41,5 +39,5 @@ package() { cd "$pkgdir" mv usr/sbin usr/bin } -md5sums=('484dbda7c428b2d5f3768500a48d3375' - 'f862f79b673359adc80faf0be914394f') +md5sums=('55688b5eb5025095b1da49f841e62792' + '0c3f1777b6c043dd5029092d62896660') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index f2d7f83b0..0961ef11d 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -1,25 +1,31 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> -pkgname=( - mitsuba - blender-addon-mitsuba -) -_pkgname=${pkgname[0]} -_bldname=${pkgname[1]::7} +_pkgname=mitsuba +_pkgver=0.4.4 +_pkgrel=4 +_bldname=blender +_bldver=2.68 +_bldep=9 _addname=$_pkgname-$_bldname -pkgver=0.4.4 -_bldver=2.67 -_addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version) _adddat=20130320 _addrev=40 -_bldep=8 +_addrel=3 _pyver=3.3 -pkgrel=3 + +# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version) +_addver=0.2.1 + +pkgname=( + $_pkgname + $_bldname-addon-$_pkgname +) +pkgver=$_pkgver +pkgrel=$_pkgrel pkgdesc='A physically based renderer' arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) url=https://www.$_pkgname-renderer.org/ license=GPL3 @@ -28,7 +34,7 @@ depends=( collada-dom glew libxxf86vm - openexr + openexr-libre qt4 xerces-c ) @@ -43,86 +49,93 @@ makedepends=( mercurial python ) -install=$_pkgname.install source=( - ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 - hg+${url}hg/$_addname - ${pkgname[1]}.install + $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 + $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2 ) sha512sums=( 66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c - SKIP SKIP + c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e ) prepare() { - mv $srcdir/${pkgname[1]}.install $startdir - cd $srcdir/$_pkgname-v$pkgver - [[ -d build ]] && rm -r build - mkdir build + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp + [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp + sed -i 's|Linux/|Linux,| + s|Linux|GNU/Linux| + ' include/$_pkgname/core/{atomic,fstream,random,thread}.h - cd $startdir/../srcdest/$_addname + msg 'removing Open Source term' + sed -i 's|free-software/open-source|free-software| + ' include/$_pkgname/core/quad.h - msg "${pkgname[1]}" - hg update -c -r $_addrev - hg log -l 1 -r $_addrev + [[ -d build ]] && rm -vr build + mkdir -v build } build() { cd $srcdir/$_pkgname-v$pkgver/build - [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF' + [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF + # i686: MTS_SSE disabled - setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ - $DMTS_SSE\ + cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\ + -DMTS_SSE=$_SSE\ -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\ -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so - setarch $CARCH make + make } package_mitsuba() { cd $srcdir/$_pkgname-v$pkgver/build - setarch $CARCH make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install + install=$_pkgname.install - #fixing files and folders location + msg 'fixing files and folders location' a=$pkgdir/usr b=$srcdir/$_pkgname-v$pkgver - install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}} - install -m644 $b/data/linux/$_pkgname.desktop $a/share/applications - install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps - install -m644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE - mv $a/{m{itsuba,ts{gui,import,srv,util}},bin} - mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,} - mv $a/{{data,plugins},share/$_pkgname} - mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload} - mv $a/{sdk/include,} - rmdir $a/{python,sdk} + install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}} + install -vm644 $b/data/linux/$_pkgname.desktop $a/share/applications + install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps + install -vm644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE + mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin} + mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,} + mv -v $a/{{data,plugins},share/$_pkgname} + mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload} + mv -v $a/{sdk/include,} + rmdir -v $a/{python,sdk} } package_blender-addon-mitsuba() { - _pkgname=${pkgname:14} - _pkgver=$pkgver - pkgver=$_addver.r$_addrev.v$_bldver pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname-libre package)" arch=any depends=( - $_pkgname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + $_pkgname=$pkgver + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) + _pkgver=$pkgver + pkgver=$_addver.r$_addrev.v$_bldver + pkgrel=$_addrel optdepends= - install=$pkgname.install - cd $srcdir/$_addname + cd $srcdir/$_addname-$_addrev + + msg 'fixing binary path' + sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'| + ' $_pkgname/properties/engine.py a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons b=$pkgdir/usr/share/licenses/$pkgname c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt - install -d $a && cp -a $_pkgname $a - install -d $b && install -m644 $c $b/LICENSE + install -vd $a && cp -a $_pkgname $a + install -vd $b && install -m644 $c $b/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/pcr/mitsuba/blender-addon-mitsuba.install b/pcr/mitsuba/blender-addon-mitsuba.install deleted file mode 100644 index 41d69870d..000000000 --- a/pcr/mitsuba/blender-addon-mitsuba.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - cat << EOF -## Please type "/usr/bin" in -## "Mitsuba Engine Settings" > "Executable path:" option -## to correct fuction. -EOF -} - -post_upgrade() { - post_install -} diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD new file mode 100644 index 000000000..6a9b2d62c --- /dev/null +++ b/pcr/otf-stix/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer (Arch): ezzetabi <ezzetabi at gawab dot com> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# taken from https://aur.archlinux.org/packages/otf-stix/ + +pkgname=otf-stix +pkgver=1.1.0 +#_pkgver=${pkgver//_/-} +pkgrel=2 +epoch=2 +pkgdesc='A comprehensive set of fonts that serve the scientific and +engineering community.' +arch=('any') +url="http://www.stixfonts.org" +license=('Custom: OFL') +depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils') +makedepends=('unzip') +install=otf-stix.install +source=("http://downloads.sourceforge.net/stixfonts/STIXv$pkgver.zip" +'http://www.stixfonts.org/STIXFontLicense2010.txt') + +build() { + /bin/true +} + +package() { + cd "$srcdir" + + install -m755 -d "$pkgdir/usr/share/fonts/OTF" + install -m644 Fonts/STIX-General/*.otf "$pkgdir/usr/share/fonts/OTF" + install -m644 Fonts/STIX-Word/*.otf "$pkgdir/usr/share/fonts/OTF" + install -Dm644 "$srcdir"/STIXFontLicense2010.txt \ + "$pkgdir"/usr/share/licenses/"$pkgname"/license.txt +} + +md5sums=('e5ebc8ef9b7df0f0bac0fd90bce95295' +'b1af7bbd3cea93a60bf68cf571ad6cab') + diff --git a/pcr/otf-stix/otf-stix.install b/pcr/otf-stix/otf-stix.install new file mode 100644 index 000000000..5d66bc226 --- /dev/null +++ b/pcr/otf-stix/otf-stix.install @@ -0,0 +1,16 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -s + mkfontscale /usr/share/fonts/OTF + mkfontdir /usr/share/fonts/OTF + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/pcr/python-blinker/PKGBUILD b/pcr/python-blinker/PKGBUILD new file mode 100644 index 000000000..00dc3cdad --- /dev/null +++ b/pcr/python-blinker/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=python-blinker +pkgver=1.3 +pkgrel=1 +pkgdesc="Fast, simple object-to-object and broadcast signaling" +arch=("any") +url="http://pythonhosted.org/blinker/" +license=('custom') +depends=('python') +options=(!emptydirs) +source=("https://pypi.python.org/packages/source/b/blinker/blinker-$pkgver.tar.gz") +md5sums=('66e9688f2d287593a0e698cd8a5fbc57') + +package() { + cd "$srcdir/blinker-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python-feedgenerator/PKGBUILD b/pcr/python-feedgenerator/PKGBUILD new file mode 100644 index 000000000..0f0d65952 --- /dev/null +++ b/pcr/python-feedgenerator/PKGBUILD @@ -0,0 +1,18 @@ +pkgname=python-feedgenerator +pkgver=1.6 +pkgrel=1 +pkgdesc="Standalone version of django.utils.feedgenerator" +arch=("any") +url="https://github.com/dmdm/feedgenerator-py3k.git" +license=('custom:BSD') +depends=('python' 'python-distribute' 'python-pytz' 'python-six') +options=(!emptydirs) +source=("https://pypi.python.org/packages/source/f/feedgenerator/feedgenerator-$pkgver.tar.gz") +md5sums=('63f6f8529a1ae877715124328edea196') + +package() { + cd "$srcdir/feedgenerator-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python-pelican/PKGBUILD b/pcr/python-pelican/PKGBUILD new file mode 100644 index 000000000..6d250a014 --- /dev/null +++ b/pcr/python-pelican/PKGBUILD @@ -0,0 +1,20 @@ +pkgname=python-pelican +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Static blog generator" +arch=("any") +url="http://getpelican.com/" +license=('AGPL3') +depends=('python' 'python-feedgenerator' 'python-jinja' 'python-pygments' + 'python-docutils' 'python-pytz' 'python-blinker' 'python-unidecode' + 'python-six' 'python-distribute') +options=(!emptydirs) +source=("https://pypi.python.org/packages/source/p/pelican/pelican-$pkgver.tar.gz") +md5sums=('cf9af2669dbd84c3e83b546b70b1a78c') + +package() { + cd "$srcdir/pelican-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD new file mode 100644 index 000000000..c48317b19 --- /dev/null +++ b/pcr/python-pygame-hg/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +_pkgname=pygame +_pkgver=1.9.2 +_pyname=python +_py3ver=3.3 +_py2ver=2.7 +_pkg3name=$_pyname-$_pkgname +_pkg2name=${_pyname}2-$_pkgname +_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d) + +pkgbase=$_pyname-$_pkgname +pkgname=( + $_pkg3name-hg + $_pkg2name-hg +) +pkgver=$_pkgver$_srcver +pkgrel=1 +pkgdesc="${_pyname^} game library" +arch=( + mips64el + x86_64 + i686 +) +url=http://www.$_pkgname.org/ +license=LGPL2.1 +depends=( + ffmpeg + portmidi + python + python2 + #sdl_gfx + sdl_image + sdl_mixer + sdl_ttf +) +makedepends=mercurial +source=hg+https://bitbucket.org/$_pkgname/$_pkgname +sha512sums=SKIP + +package_python-pygame-hg() { + # disabled, due which conflicts with $_pkg2name + #provides=("$_pkg3name=$_pkgver") + #conflicts=$_pkg3name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} + + $_pyname config.py -auto + $_pyname setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests +} + +package_python2-pygame-hg() { + provides=("$_pkg2name=$_pkgver") + conflicts=$_pkg2name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} + + ${_pyname}2 config.py -auto + ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests +} diff --git a/pcr/python-unidecode/PKGBUILD b/pcr/python-unidecode/PKGBUILD new file mode 100644 index 000000000..1a605c28e --- /dev/null +++ b/pcr/python-unidecode/PKGBUILD @@ -0,0 +1,18 @@ +pkgname=python-unidecode +pkgver=0.04.13 +pkgrel=1 +pkgdesc="ASCII transliterations of Unicode text" +arch=("any") +url="https://pypi.python.org/pypi/Unidecode" +license=('GPL2') +depends=('python') +options=(!emptydirs) +source=("https://pypi.python.org/packages/source/U/Unidecode/Unidecode-$pkgver.tar.gz") +md5sums=('74fabcc0aa3c3b185181df7fce8cab09') + +package() { + cd "$srcdir/Unidecode-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD deleted file mode 100644 index 294e28024..000000000 --- a/pcr/ryzom-hg-client/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorge@abril> -pkgname=ryzom-hg-client -pkgver=20130706 -pkgrel=2 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('ryzom-hg-nel' 'expat') -makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel') -provides=("ryzom-hg-client") -conflicts=("ryzom-hg-client") -replaces=("ryzom-hg-client") -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') -mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client - -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client - -build() { - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-client" - make DESTDIR="$pkgdir" install - install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD deleted file mode 100644 index c66aaf567..000000000 --- a/pcr/ryzom-hg-nel/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=ryzom-hg-nel -pkgver=20130706 -pkgrel=5 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') -makedepends=('cpptest' 'cmake' 'bison') -provides=("ryzom-hg-nel") -conflicts=("ryzom-hg-nel") -replaces=("ryzom-hg-nel") - -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') - -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") - -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client - -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON') - -build() { - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-nel" - make DESTDIR="$pkgdir" install - # WWWInit.h is in /usr/include/w3c-libwww according to libwww package! - sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h -} - -# vim:set ts=2 sw=2 et: - diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 8277ccf17..0951e474d 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,64 +1,50 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com> -pkgname=('ryzom-hg-nel' 'ryzom-hg-client') -pkgbase="ryzom-hg" -pkgver=20130706 -pkgrel=2 +pkgname='ryzom-hg' +_hgver=ce26956d3a4a +pkgver=20130727 +pkgrel=7 pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') -groups=('ryzom-hg') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -# ryzom-20130706-2-any.src.tar.gz -source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz" - 'ryzom.sh' - 'ryzom.desktop') -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475' - 'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') +depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data') +conflicts=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost') +source=("libre://$pkgname-$pkgver.tar.gz") -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") +mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}") -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client - -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON') - -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client +mksource() { + rm -rf "$srcdir/$pkgname-$pkgver" + cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}" +} -package_ryzom-hg-nel() { - # options and directives that can be overridden - #pkgver=20130706 - #pkgrel=0 - pkgdesc="An awesome free software 3D MMORPG game. NeL library." - #depends=() +build() { + mkdir -p "$srcdir/build" + cd "$srcdir/build" + cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - provides=('ryzom-hg-nel') - conflicts=('ryzom-hg-nel') - replaces=('ryzom-hg-nel') - - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" - - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make - make DESTDIR="$pkgdir" install + make all } -package_ryzom-hg-client() { - # options and directives overrides - pkgdesc="An awesome free software 3D MMORPG game. Game client." - provides=('ryzom-hg-client') - conflicts=('ryzom-hg-client') - replaces=('ryzom-hg-client') - depends=('ryzom-hg-nel') - - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" - - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make +package() { + cd "$srcdir/build" make DESTDIR="$pkgdir" install + cd "$pkgdir/etc/ryzom/" + # instead of the open shard, we point to the actual ryzom shard. + # this cannot be on prepare(), I tried that already and didn't work + sed -i 's|"ryzom_open"|"ryzom_live"|g' client_default.cfg + sed -i 's|PatchServer = "";|PatchServer = "http://dl.ryzom.com/patch_live";|g' client_default.cfg + sed -i 's|SignUpURL = "";|SignUpURL = "http://www.ryzom.com/subscribe";|g' client_default.cfg + sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg + sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg + sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg + sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg + sed -i 's|atys.|app.|g' client_default.cfg + sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg } + +mksha256sums=('SKIP') +sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402') diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD deleted file mode 100644 index a04662b0d..000000000 --- a/pcr/ryzom-hg/SRCBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=("ryzom-hg") -pkgver=20130708 -pkgrel=3 -pkgdesc="An awesome free software 3D MMORPG game" -arch=(any) -url="https://www.ryzom.com/" -license=('AGPL3') -makedepends=('mercurial') - -source=("ryzom.sh" - "ryzom.desktop") - -_hgroot='https://bitbucket.org/ryzom/ryzomcore' -_hgrepo='ryzomcore' - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" -} - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp ${srcdir}/ryzom.sh ${pkgdir}/ - cp ${srcdir}/ryzom.desktop ${pkgdir}/ - cp -a ${srcdir}/ryzomcore/code ${pkgdir}/ -} -sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh deleted file mode 100644 index e3cff2c64..000000000 --- a/pcr/ryzom-hg/ryzom.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -if groups | grep games > /dev/null 2>&1 ; then - ryzom_sync - exec ryzom_client - -else - echo "you need to be in games group to run ryzom" - exit 1 -fi diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD index e2258a88b..33be54edf 100644 --- a/pcr/samplv1/PKGBUILD +++ b/pcr/samplv1/PKGBUILD @@ -1,17 +1,16 @@ -# Maintainer: Guest One <theguestone at gmail dot com> pkgname=samplv1 -pkgver=0.3.3 +pkgver=0.3.4 pkgrel=1 pkgdesc="Polyphonic sampler synthesizer with stereo fx" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://$pkgname.sourceforge.net/$pkgname-index.html" license=('GPL') groups=('lv2-plugins') -depends=('jack' 'liblo' 'lv2' 'qt4') +depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info') install="$pkgname.install" source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('2540ab3ef3da39bd4da8a1ab8ff9334d') +md5sums=('32e920ff8457bb94f301a657d55f90a8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install index 029294d67..ec1a84bbb 100644 --- a/pcr/samplv1/samplv1.install +++ b/pcr/samplv1/samplv1.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-mime-database usr/share/mime update-desktop-database -q } diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD index 1a96b84f8..2cce2ef0b 100644 --- a/pcr/synthv1/PKGBUILD +++ b/pcr/synthv1/PKGBUILD @@ -1,17 +1,16 @@ -# Maintainer: Guest One <theguestone at gmail dot com> pkgname=synthv1 -pkgver=0.3.3 +pkgver=0.3.4 pkgrel=1 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://$pkgname.sourceforge.net/$pkgname-index.html" license=('GPL') groups=('lv2-plugins') -depends=('jack' 'liblo' 'lv2' 'qt4') +depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info') install="$pkgname.install" source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('18bd21921ee65b718b2feb1d0ab03ac7') +md5sums=('63ca2f7961bbc708928d2f792e32d166') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install index 029294d67..ec1a84bbb 100644 --- a/pcr/synthv1/synthv1.install +++ b/pcr/synthv1/synthv1.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-mime-database usr/share/mime update-desktop-database -q } diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD new file mode 100644 index 000000000..23e20cd6c --- /dev/null +++ b/pcr/tanglet/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer (Arch): Graeme Gott <graeme@gottcode.org> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# Based on https://aur.archlinux.org/packages.php?ID=32311 + +pkgname=tanglet +pkgver=1.2.1 +pkgrel=3 +pkgdesc="A single player word finding game based on Boggle." +arch=('i686' 'x86_64') +url="http://gottcode.org/${pkgname}/" +license=('GPL3') +depends=('qt4') +install=${pkgname}.install +source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2) +md5sums=('109ad08a03cc64808fa2caad6c3a4a7c') +sha256sums=('94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake-qt4 PREFIX=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}/" install +} + diff --git a/pcr/tanglet/tanglet.install b/pcr/tanglet/tanglet.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/pcr/tanglet/tanglet.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/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD new file mode 100644 index 000000000..b8bd85dcc --- /dev/null +++ b/pcr/ttf-asana-math/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer (Arch): GordonGR <gordongr@freemail.gr> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# taken from https://aur.archlinux.org/packages/ttf-asana-math/ + +pkgname=ttf-asana-math +pkgver=000.949 +pkgrel=1 +license=('Custom: OFL') +depends=('fontconfig' 'xorg-font-utils') +pkgdesc="A font to typeset maths in Xe(La)TeX and Lua(La)TeX by Apostolos Syropoulos" +arch=('any') +url="http://www.ctan.org/pkg/asana-math" +source=("ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.otf" +"ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.ttf" +"http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt") +md5sums=('d9f9faa296a12a14354d9e83c90f167b' + 'd7a05892aeed8bbe4b410bf845ce9882' + '6ed93967ff0dc6dd9c8d31c17f817a06') +install=$pkgname.install + +build() +{ + mkdir -p $pkgdir/usr/share/fonts/TTF + mkdir -p $pkgdir/usr/share/fonts/OTF + cp *.ttf $pkgdir/usr/share/fonts/TTF + cp *.otf $pkgdir/usr/share/fonts/OTF + mkdir -p $pkgdir/usr/share/licenses/custom/ttf-asana-math/ + mv 'render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt' LICENSE + cp LICENSE $pkgdir/usr/share/licenses/custom/ttf-asana-math/ +} diff --git a/pcr/ttf-asana-math/ttf-asana-math.install b/pcr/ttf-asana-math/ttf-asana-math.install new file mode 100644 index 000000000..506595662 --- /dev/null +++ b/pcr/ttf-asana-math/ttf-asana-math.install @@ -0,0 +1,11 @@ + post_install() { + echo -n "Updating font cache... " + fc-cache -fs >/dev/null + mkfontscale /usr/share/fonts/TTF /usr/share/fonts/Type1 + mkfontdir /usr/share/fonts/TTF /usr/share/fonts/Type1 + echo "done" +} + +post_upgrade() { + post_install +}
\ No newline at end of file diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index e3c0381d8..458181279 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,33 +1,42 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> -pkgname=( - yafaray - blender-addon-yafaray -) -_pkgname=${pkgname[0]} -_bldname=${pkgname[1]::7} +_pkgname=yafaray +_pkgver=1.5 +_pkgrel=3 +_pkgdate=20130510 +_bldname=blender +_bldver=2.68 +_bldep=9 _gitname=Core _addname=${_bldname^}-Exporter -_pkgdate=20130510 -pkgver=1.5.$_pkgdate -_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background -_bldver=2.67 -_bldep=8 +_addrel=1 +_adddate=20130623 _pyver=3.3 -pkgrel=1 -pkgdesc='A libre software raytracing engine' + +# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background +_srcver=44323def5b3866ff601fd401ef2160b80ced8141 +# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator +_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb + +pkgname=( + $_pkgname + $_bldname-addon-$_pkgname +) +pkgver=$_pkgver.$_pkgdate +pkgrel=$_pkgrel +pkgdesc='A free software raytracing engine' arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) -url="http://www.$_pkgname.org" +url=http://www.$_pkgname.org license=LGPL2.1 depends=( freetype2 libjpeg libxml2 - openexr + openexr-libre ) optdepends=( 'python: Python bindings' @@ -42,58 +51,62 @@ makedepends=( swig ) source=( - git://github.com/YafaRay/$_gitname.git - git://github.com/YafaRay/$_addname.git + $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz + $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz +) +sha512sums=( + 5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6 + 59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c ) -sha512sums=(SKIP SKIP) prepare() { - cd $srcdir/$_gitname + cd $srcdir/$_gitname-$_srcver + + msg 'Renaming addon dir' + mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname - git checkout $_srcver + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux| + ' $srcdir/$_pkgname/prop/yaf_scene.py - [[ -d build ]] && rm -r build - mkdir build + [[ -d build ]] && rm -vr build + mkdir -v build } build() { - cd $srcdir/$_gitname/build - - setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ + cd $srcdir/$_gitname-$_srcver/build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver - setarch $CARCH make + make } package_yafaray() { - cd $srcdir/$_gitname/build - setarch $CARCH make DESTDIR=$pkgdir install + cd $srcdir/$_gitname-$_srcver/build + make DESTDIR=$pkgdir install } package_blender-addon-yafaray() { - pkgver=$pkgver.v$_bldver - _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)" arch=any depends=( - ${pkgname:14}=${pkgver%.v$_bldver} - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + $_pkgname=$pkgver + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) + pkgver=$_pkgver.$_adddate.v$_bldver + pkgrel=$_addrel optdepends= - cd $srcdir/$_addname + cd $srcdir a=/usr/lib b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout $_srcver - git checkout-index -a -f --prefix=${b%bin} - - install -d $b - ln -sf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so - ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so - ln -sf $a/$_pkgname $b/plugins + install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin} + ln -vsf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so + ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so + ln -vsf $a/$_pkgname $b/plugins } # vim:set ts=2 sw=2 et: diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD new file mode 100644 index 000000000..311e554e7 --- /dev/null +++ b/pcr/youtube-dl-current/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer (Arch): Eric Bélanger <eric@archlinux.org> +# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# Based on https://www.archlinux.org/packages/community/any/youtube-dl/ + +pkgname=youtube-dl-current +_pkgname=youtube-dl +provides=(youtube-dl) +pkgver=2013.08.02 +pkgrel=1 +pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" +arch=('any') +url="http://rg3.github.io/youtube-dl/" +license=('custom') +depends=('python') +makedepends=('python-distribute') +source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('772d2bbf3e9bcfc3da05d956cf6d8705' + 'SKIP') + +prepare() { + cd ${_pkgname} + sed -i 's|etc/bash_completion.d|share/bash-completion/completions|' setup.py +} + +package() { + cd ${_pkgname} + python setup.py install --root="${pkgdir}/" --optimize=1 + mv "${pkgdir}/usr/share/bash-completion/completions/youtube-dl.bash-completion" \ + "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" +} diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index bf03b4133..ede03dd77 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -7,27 +7,24 @@ # based of debian squeeze package -pkgbase=zoneminder +_automake=1.14 + pkgname=zoneminder pkgver=1.25.0 -pkgrel=27 +pkgrel=28 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( - i686 - x86_64 mips64el - arm -) -backup=( - etc/zm.conf -) -url="http://www.$pkgbase.com" -license=( - GPL + x86_64 + i686 ) +backup=etc/zm.conf +url=http://www.$pkgname.com +license=GPL2 depends=( apache cambozola + ffmpeg gnutls mariadb perl-archive-zip @@ -48,108 +45,158 @@ depends=( php-gd php-mcrypt ) -makedepends=( - netpbm -) -optdepends=( - netpbm -) -install=$pkgbase.install +makedepends=netpbm +optdepends=netpbm +options=(!libtool) +install=$pkgname.install source=( - http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz - httpd-$pkgbase.conf - $pkgbase - $pkgbase.service - zoneminder-1.25.0-kernel35.patch - zoneminder-1.25.0-gcc47.patch - zoneminder-1.25.0-ffmpeg.patch - zoneminder-1.25-text.patch - zoneminder-1.25-fixwarning.patch - zoneminder-1.25.0-gcrypt.patch + http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz + httpd-$pkgname.conf + $pkgname.service + sysctl-$pkgname.conf + $pkgname-$pkgver-ffmpeg.patch + $pkgname-$pkgver-gcrypt.patch ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 - ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf - 4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775 - 3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d + 7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044 7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4 - 17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf - 8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c 8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675 ) +prepare() { + cd $srcdir/ZoneMinder-$pkgver + + # Patch for automake + sed -i "\|^am__api_version=| s|1[.]11|$_automake|; + " configure + + # Patch for GCC + sed -i 's|^#include [<]errno[.]h[>]$|#include <errno.h>\n#include <unistd.h>|; + ' src/zm_logger.cpp + sed -i 's|^#include [<]pthread[.]h[>]$|#include <pthread.h>\n#include <unistd.h>|; + ' src/zm_thread.h + sed -i 's|^#include [<]fcntl[.]h[>]$|#include <fcntl.h>\n#include <limits.h>|; + ' src/zm_local_camera.cpp + + # Patch for type cast in linux-libre kernel 3.5 and for wrong type "suppported" + sed -i 's|enum v4l2_buf_type type = v4l2_data[.]fmt[.]type|enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type|; + s|suppported|supported|; + ' src/zm_local_camera.cpp + + # configure crash on i686 + [[ $CARCH != i686 ]] && { + # Patch for fixing warning + sed -i 's|pdest[+][+] = ([*]blend_ptr)\[[*]pdest]\[[*]psrc[+][+]]|pdest = (*blend_ptr)[*pdest][*psrc++];\n pdest++|; + ' src/zm_image.cpp + } + + # Patch for support ffmpeg with <libavutil/mathematics.h> + #sed -i 's|^extern "C" {|extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>|; + # s|^#include <libavutil/avutil[.]h>|#include <libavutil/avutil.h>\n#include <libavutil/mathematics.h>|; + # ' src/zm_ffmpeg.h + + # Patch for support C library + #sed -i 's|^AM_CONFIG_HEADER(config[.]h)|AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])|; + # s|^AC_CHECK_HEADERS(mysql/mysql[.]h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)|AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])|; + # s|^AC_CHECK_HEADERS(libswscale/swscale[.]h,,,)|AC_CHECK_HEADERS(libswscale/swscale.h,,,)\nAC_LANG_POP([C])|; + # ' configure.ac + + # Patch for disable ZM_CHECK_FOR_UPDATES + sed -i '\|ZM_CHECK_FOR_UPDATES|,+1 s|yes|no|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for support html5 video and flv + sed -i '\|ZM_MPEG_LIVE_FORMAT|,+1 s|swf|webm|; + \|ZM_MPEG_REPLAY_FORMAT|,+1 s|swf|webm|; + \|ZM_FFMPEG_FORMATS|,+1 s|mpg mpeg wmv asf avi[*] mov swf 3gp[*][*]|mpg mpeg wmv asf avi* mov flv swf 3gp** webm ogg h264|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for change path run dir and for change ZM name to ZoneMinder + sed -i '\|ZM_PATH_SOCKS|,+1 s|TMP|RUN|; + \|ZM_WEB_TITLE_PREFIX|,+1 s|"ZM"|"ZoneMinder"|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for v4l2 convert support + sed -i 's|^$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL}|$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = '"'/usr/lib/libv4l/v4l2convert.so'"' |; + ' scripts/zmdc.pl.in + + # Patch for add more socket tries + sed -i '\|^$max_socket_tries = | s|3|15|; + ' web/ajax/stream.php + + # Patch for text + sed -i 's|if ( fwrite( buffer, n_bytes, 1, stdout ) )|if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )|; + ' src/zm_stream.cpp + + # Patch for remove HACK in Makefile.* + sed -i '\|This is a HACK|d; + \|^install-data-hook:$|,+5 d; + s| install-data-hook||; + \|^uninstall-hook:$|,+5 d; + s| uninstall-hook||; + ' Makefile.{am,in} + + # Patch + for _patch in ffmpeg gcrypt; do + patch -Np1 -F99 -i $srcdir/$pkgname-$pkgver-$_patch.patch + done +} + build() { cd $srcdir/ZoneMinder-$pkgver - # Patch for change ZM name to ZoneMinder - sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\ - configure || read - # Patch for add more socket tries - sed -i -e '/$max_socket_tries/ s/3/15/'\ - web/ajax/stream.php || read - # Patch for support html5 video and flv - sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - # Patch for wrong "suppported" - sed -i -e 's/suppported/supported/'\ - src/zm_local_camera.cpp || read - - - patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch - patch -Np1 -F99 -i ../zoneminder-1.25-text.patch - patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch - -export CXXFLAGS=-D__STDC_CONSTANT_MACROS -./configure --prefix=/usr\ + + # ZM_RUNDIR need change to run dir + export CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"\ + OPT_FFMPEG=yes\ + PATH_FFMPEG=/usr/bin/ffmpeg\ + ZM_LOGDIR=/var/log/$pkgname\ + ZM_RUNDIR=/tmp/$pkgname\ + ZM_SSL_LIB=libgcrypt\ + ZM_TMPDIR=/tmp/$pkgname + + ./configure --prefix=/usr\ --enable-crashtrace=no\ --enable-debug=no\ --enable-mmap=yes\ --sysconfdir=/etc\ --with-cgidir=/srv/http/cgi-bin\ --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ + --with-ffmpeg=/usr\ --with-libarch=lib\ - --with-ffmpeg=/usr \ --with-mysql=/usr\ - --with-webdir=/srv/http/$pkgbase\ + --with-webdir=/srv/http/$pkgname\ --with-webgroup=http\ --with-webhost=localhost\ - --with-webuser=http \ - + --with-webuser=http make V=0 } package() { cd $srcdir/ZoneMinder-$pkgver - make DESTDIR=$pkgdir install - mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}} - mkdir -p $pkgdir/srv/zoneminder/socks - chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} - chown -R http.http $pkgdir/srv/zoneminder/socks - chmod 0700 $pkgdir/etc/zm.conf + mkdir -vp $pkgdir/{etc/{httpd/conf/extra,sysctl.d},srv/http/{cgi-bin,$pkgname/socks},usr/{lib/systemd/system,share/{licenses/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} + chown -vR http.http $pkgdir/{etc/zm.conf,srv/http/$pkgname/socks,var/{cache/$pkgname,log/$pkgname}} + chmod -v 0700 $pkgdir/etc/zm.conf for i in events images temp; do - mv $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i - ln -s /var/cache/$pkgbase/$i $pkgdir/srv/http/$pkgbase/$i - chown -h http.http $pkgdir/srv/http/$pkgbase/$i + mv -v $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i + ln -vs /var/cache/$pkgname/$i $pkgdir/srv/http/$pkgname/$i + chown -vh http.http $pkgdir/srv/http/$pkgname/$i done - ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgbase - chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} + ln -vs /srv/http/cgi-bin $pkgdir/srv/http/$pkgname + chown -vh http.http $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin} - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase + ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname - install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgbase $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db + install -vDm644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra + install -vDm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/etc/sysctl.d + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/srv/http/$pkgname + install -vDm644 COPYING $pkgdir/usr/share/licenses/$pkgname + install -vDm644 db/zm*.sql $pkgdir/usr/share/$pkgname/db } diff --git a/pcr/zoneminder/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf new file mode 100644 index 000000000..ec1407dee --- /dev/null +++ b/pcr/zoneminder/sysctl-zoneminder.conf @@ -0,0 +1,3 @@ +# For Zoneminder Monitor +#kernel.shmall = 524288000 +#kernel.shmmax = 524288000 diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index 899e2a5d1..66109d5fa 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,3 +1,4 @@ +#!/usr/bin/bash pre_install() { set -e abort=false @@ -27,20 +28,20 @@ EOF post_install() { if [[ -d /var/log/zoneminder ]]; then - chmod 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + chmod -v 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder else - mkdir -m 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + mkdir -vm 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder fi if [[ -d /tmp/zoneminder ]]; then - chmod 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + chmod -v 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder else - mkdir -m 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + mkdir -vm 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder fi - sed -i -e ' + sed -i ' /^;extension=mysql.so/ s/^;//; /^#extension=mysql.so/ s/^#//; /^;extension=mysqli.so/ s/^;//; @@ -69,8 +70,11 @@ post_install() { /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; /^open_basedir/ s/$/:\/srv\/http\/zoneminder/; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder//; + /^open_basedir/ s/:\/var\/cache\/zoneminder\///; + /^open_basedir/ s/$/:\/var\/cache\/zoneminder/; + ' /etc/php/php.ini + sed -i ' /^LoadModule php5_module modules\/libphp5.so/d; /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/; /^# PHP 5/d; @@ -78,11 +82,12 @@ post_install() { /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d; /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/; - ' /etc/httpd/conf/httpd.conf || read + ' /etc/httpd/conf/httpd.conf + gpasswd -a http video cat << EOF Note for mysql: ==> To run Zoneminder, you must install the database running mysql service (as root): -==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) +==> "systemctl start mysqld.service" ==> and add Zoneminder database typing (with passsword): ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" @@ -92,6 +97,11 @@ Note for mysql: ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf" ==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" +Note for sysctl: +==> You must uncomment that line in /etc/sysctl.d/sysctl-zoneminder.conf: +==> "kernel.shmall = 524288000" +==> "kernel.shmmax = 524288000" + Note for php: ==> You must uncomment that line in /etc/php/php.ini: ==> "extension=mysql.so" @@ -105,11 +115,11 @@ Note for php: ==> "extension=openssl.so" ==> "extension=ftp.so" ==> "extension=zip.so" -==> check and add to open_basedir "/etc" and -==> "/srv/http/zoneminder" like so -==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder" +==> check and add to open_basedir "/etc", +==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so +==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder" ==> and set your timezone in php.ini: -==> "date.timezone = <your_country>/<your_city>" +==> "date.timezone = <your_zone>/<your_city>" Note for apache: ==> You must edit /etc/httpd/conf/httpd.conf and add the line: @@ -122,21 +132,25 @@ EOF post_upgrade() { post_install + _mysqld=$(systemctl status mysqld.service | grep -o 'inactive (dead)') + [[ _mysqld == 'inactive (dead)' ]] && systemctl start mysqld.service /usr/bin/zmupdate.pl -f >/dev/null + [[ _mysqld == 'inactive (dead)' ]] && systemctl stop mysqld.service } post_remove() { - if [[ -d /tmp/zoneminder ]]; then - rm -vr /tmp/zoneminder - fi - sed -i -e ' + _zms=$(systemctl status zoneminder.service | grep -o 'active (running)') + [[ _zms == 'active (running)' ]] && systemctl stop zoneminder.service + [[ -d /tmp/zoneminder ]] && rm -vr /tmp/zoneminder + sed -i ' /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder\/// + ' /etc/php/php.ini + sed -i ' /^# ZoneMinder/d; /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; - ' /etc/httpd/conf/httpd.conf || read + ' /etc/httpd/conf/httpd.conf cat << EOF Note: ==> To clean Zoneminder mysql database, run as root (with password): @@ -165,9 +179,12 @@ Note: ==> "extension=mysqli.so" ==> "extension=session.so" ==> "extension=sockets.so" -==> "date.timezone = <my_country>/<my_city>" +==> "date.timezone = <my_zone>/<my_city>" + +==> Drop http user on video group if it isn't needed with others servers: +==> gpasswd -d http video -==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder" +==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder" ==> in the "open_basedir". ==> Remove log files and "zonemider" directory in "/var/log/zoneminder". diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD index cb84cae3a..e1a8985f3 100644 --- a/~coadde/cross-binutils/PKGBUILD +++ b/~coadde/cross-binutils/PKGBUILD @@ -13,8 +13,7 @@ # | * | mipsel | mipsel | unknown | elf | no | bin/sys | # | * | mips | mips | unknown | elf | no | bin/sys | # | x86_64 | x86_64 | x86_64 | unknown | linux-gnu|gnu<|elf | yes | bin/sys | -# | i[5-7]86 | i[5-7]86 | i[5-7]86 | pc | linux-gnu|gnu|elf | no | bin/sys | -# | * | i486 | i486 | unknown | elf | no | bin/sys | +# | i[5-7]86 | i[5-7]86 | i[5-7]86 | pc | linux-gnu|gnu| | no | bin/sys | # | * | i386 | i386 | unknown | elf | no | bin/sys | # | armv8-a | aarch64 | aarch64 | unknown | linux-gnu|elf | yes | - | # | armv8-a | aarch64_be | aarch64_be | unknown | linux-gnu|elf | yes | - | @@ -45,6 +44,17 @@ # | - | or32 | or32 | unknown | linux-gnu<|elf< | no | bin/sys | # +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ +# For "DOSBox" +# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ +# | * | i386 | i386 | pc | msdosdjgpp | no | bin/sys | +# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ + +# For "Wine" +# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ +# | * | x86_64 | x86_64 | unknown | mingw64 | yes | bin/sys | +# | * | i386 | i386 | unknown | mingw32 | no | bin/sys | +# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ + # * : Any supported by architecture. # - : None. # @ : bin/sys (Only sh4 and sh4l support) @@ -57,47 +67,64 @@ _multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'i #--------------------------------------------------------------------------------------------------------------------------------------------- -_pkgname="binutils" - ### Base FLAGS: ### -_CARCH="x86_64" +# For custom name. +_pkgname="binutils" +_pkgver="2.23.2" +_pkgrel="2" +# For binutils-common ("${_pkgname}-common${_pkgflag}${_verflag}") release. +_pkgrelb="2" +# For _target-binutils ("${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}") release. +_pkgrelc="2" +# For older version. +_add_version_name="no" +# For custom pkg. +_pkgflag="" + +### Architecture FLAGS: ### +# CARCH flag +_CARCH="mips64" +# CHOST flags _host="${_CARCH}" _machine="unknown" _system="linux-gnu" -_multilib="no" +# Multilib flag +_multilib="yes" ### Patch FLAGS: ### _patch_ath9k_htc_fw="no" #--------------------------------------------------------------------------------------------------------------------------------------------- -_target="${_host}-${_machine}-${_system}" +# For older version. +[[ ${_add_version_name} == yes ]] && _verflag="-v${_pkgver}" -# For "_multilib" -[[ ${_multilib} == "yes" ]] && { - _multilib_name="-multilib" - _multilib_desc=" for multilib" -} -for _arch_multilib in ${_multilib_list[@]}; do - [[ ${_CARCH} != ${_arch_multilib} ]] && _multilib="no" -done +# For Architecture. +_target="${_host}-${_machine}-${_system}" # For "_patch_ath9k_htc_fw" +[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no" [[ ${_patch_ath9k_htc_fw} == "yes" ]] && { _ath9k_htc_name="-ath9k-htc" _ath9k_htc_desc=" adapted for ath9k-htc firmware" _multilib="no" } -[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no" + +# For "_multilib" +[[ ${_CARCH} != $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]] && _multilib="no" +[[ ${_multilib} == "yes" ]] && { + _multilib_name="-multilib" + _multilib_desc=" for multilib" +} #--------------------------------------------------------------------------------------------------------------------------------------------- pkgname=( - "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}" - "${_pkgname}-common" + "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}" + "${_pkgname}-common${_pkgflag}${_verflag}" ) -pkgver=2.23.2 -pkgrel=2 +pkgver=${_pkgver} +pkgrel=${_pkgrel} arch=("${_carch_list[@]}") url="http://www.gnu.org/software/${_pkgname}/" license=('GPL2') @@ -142,13 +169,11 @@ build() { cd ${srcdir}/${_pkgname}-build [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}" - for _arch_multilib2 in ${_multilib_list[@]}; do - if [[ ${_CARCH} == ${_arch_multilib2} ]]; then - _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32" - else - _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib" - fi - done + if [[ ${_CARCH} == $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]]; then + _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32" + else + _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib" + fi if [[ ${_multilib} == "yes" ]]; then _MULTILIB='--enable-multilib' @@ -156,7 +181,7 @@ build() { _MULTILIB='--disable-multilib' fi - ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \ + ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]/${_verflag}/}/${pkgver} \ $_TARGET $_LIB_PATH \ --program-prefix=${_target}- \ --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \ @@ -171,7 +196,7 @@ build() { msg "Check the host environment and makes sure all the necessary tools are available" make configure-host - make tooldir=/opt/${pkgname[0]}/${pkgver} + make tooldir=/opt/${pkgname[0]/${_verflag}/}/${pkgver} } #--------------------------------------------------------------------------------------------------------------------------------------------- @@ -187,7 +212,7 @@ check() { #--------------------------------------------------------------------------------------------------------------------------------------------- _target-binutils() { - pkgrel=$pkgrel + pkgrel=${_pkgrelc} pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)" depends=('glibc>=2.17' 'zlib' "${_pkgname}-common") [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}") @@ -200,7 +225,7 @@ _target-binutils() { install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install" cd ${srcdir}/${_pkgname}-build - make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install + make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install # temp # msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!" @@ -215,8 +240,8 @@ _target-binutils() { [[ $CARCH != ${_CARCH} ]] && { msg "Move 'lib' files and directories, and remove architecture directories" - mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/lib/*,lib} - rmdir -v ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST/{${_target}/{lib,},} + mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/lib/*,lib} + rmdir -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST/{${_target}/{lib,},} } msg "Change lib-path on ldscripts files" @@ -224,7 +249,7 @@ _target-binutils() { /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g; /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g; /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g; - " ${pkgdir}/opt/${pkgname}/${pkgver}/lib/ldscripts/* + " ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib/ldscripts/* _removebin=(ar as nm objcopy objdump ranlib strip) for _rbin in ${_removebin[@]}; do @@ -235,10 +260,10 @@ _target-binutils() { msg "Create links for libraries" install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d} ln -vs ../lib ${pkgdir}/usr/${_target}/lib - echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf + echo /opt/${pkgname/${_verflag}/}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf msg "Install PIC libiberty.a" - install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname[0]}/${pkgver}/lib + install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib msg "Remove unnecessaries manuals and create links for manuals" _man=$(ls -1A ${pkgdir}/usr/share/man/man1) @@ -348,34 +373,34 @@ package_or32-unknown-elf-binutils() { _target-binutils; } #--------------------------------------------------------------------------------------------------------------------------------------------- package_binutils-common() { - pkgrel=$pkgrel + pkgrel=${_pkgrelb} pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)" arch=('any') depends=('linktools') install="${_pkgname}.install" cd ${srcdir}/${_pkgname}-build - make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install + make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install [[ $CARCH != ${_CARCH} ]] && { msg "Move 'include' files and directories" - mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/include,} + mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/include,} } msg "Add some useful headers" - install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname}/${pkgver}/include + install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/include msg "Remove unnecessaries files and directories" - rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/{bin,lib} + rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{bin,lib} [[ $CARCH != ${_CARCH} ]] && { - rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST + rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST } msg "Rename manuals" - _man=$(ls -1A ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1) + _man=$(ls -1A ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1) for _man_stage1 in ${_man[@]}; do _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/} _manuals=${_man_stage2/${_target}-/} - mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}} + mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}} done } diff --git a/~smv/sword-svn/PKGBUILD b/~smv/sword-svn/PKGBUILD new file mode 100644 index 000000000..b5ddc53f4 --- /dev/null +++ b/~smv/sword-svn/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org> +pkgname=sword-svn +pkgver=2904 +pkgrel=1 +pkgdesc="Libraries for Bible programs -- svn version" +arch=('i686' 'x86_64') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('subversion') +provides=('sword') +conflicts=('sword') +source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/') +md5sums=('SKIP') +options=('!makeflags') +_svnmod=sword + +pkgver() { + cd $SRCDEST/${_svnmod} + svnversion +} + +build() { + cd "$srcdir/$_svnmod" + ./autogen.sh + CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$_svnmod" + make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install_config +} diff --git a/~smv/xiphos-svn/PKGBUILD b/~smv/xiphos-svn/PKGBUILD new file mode 100644 index 000000000..699990fec --- /dev/null +++ b/~smv/xiphos-svn/PKGBUILD @@ -0,0 +1,35 @@ +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org> +pkgname=xiphos-svn +pkgver=4482 +pkgrel=1 +pkgdesc="A Bible study tool -- svn version" +arch=('i686' 'x86_64') +url="http://xiphos.org" +license=('GPL') +depends=('webkitgtk' 'libgsf' 'gconf' 'sword-svn' 'gtkhtml4') +makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'subversion') +provides=('gnomesword' 'xiphos') +conflicts=('gnomesword' 'xiphos') +install=xiphos-svn.install +source=('xiphos::svn://svn.code.sf.net/p/gnomesword/code/trunk') +md5sums=('SKIP') +_svnmod=xiphos + +pkgver() { + cd $SRCDEST/${_svnmod} + svnversion +} + +build() { + cd "$srcdir/$_svnmod" + sed -i 's+/usr/bin/env python+/usr/bin/env python2+' waf + + ./waf --prefix=/usr --gtk=3 configure + ./waf --prefix=/usr build +} + +package() { + cd "$srcdir/$_svnmod" + ./waf --destdir=$pkgdir --no-post-install install +} diff --git a/~smv/xiphos-svn/xiphos-svn.install b/~smv/xiphos-svn/xiphos-svn.install new file mode 100644 index 000000000..0cbac7465 --- /dev/null +++ b/~smv/xiphos-svn/xiphos-svn.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() { + update-desktop-database -q +} |
